diff --git a/.coderabbit.yaml b/.coderabbit.yaml
index ccfeca966dfa..bf28b1b342d2 100644
--- a/.coderabbit.yaml
+++ b/.coderabbit.yaml
@@ -1,4 +1,5 @@
 reviews:
+  high_level_summary: false
   review_status: false
   auto_review:
     enabled: true
diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 6781356cf58d..9df6050347e8 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -68,6 +68,7 @@ github:realAhmedRoach
 github:Rishet11
 github:ryanrhughes
 github:saphid
+github:scratchyone
 github:sethwebster
 github:shiroyasha9
 github:shivamhwp
diff --git a/.github/triage/PLAYBOOK.md b/.github/triage/PLAYBOOK.md
index 39bf3ea01052..32def6bc0c16 100644
--- a/.github/triage/PLAYBOOK.md
+++ b/.github/triage/PLAYBOOK.md
@@ -59,8 +59,9 @@ different code depending on it:
 
 Then work from evidence, not assumption. In rough order of value:
 
-- The server log and the trace file (`server.trace.ndjson`) around the time of the
-  problem. Recent failures usually leave a trail here.
+- The trace file (`server.trace.ndjson`) around the time of the problem, plus the
+  service log or desktop backend logs from the context file if they exist. Recent
+  failures usually leave a trail here.
 - The provider event log, for problems with claude/codex/cursor sessions.
 - The SQLite database. Read it freely, but only write when a write is necessary
   to fix the problem the user described, and get their explicit permission
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9de774a2e3ee..ab2280b8e703 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,9 +52,6 @@ jobs:
       - name: Check
         run: vp check
 
-      - name: Check className overrides on components/ui do not grow
-        run: vp run lint:restyle-ceiling
-
       - name: Typecheck
         run: vpr typecheck
 
diff --git a/.github/workflows/deploy-relay.yml b/.github/workflows/deploy-relay.yml
index a3f89b615c2b..6209661e5e97 100644
--- a/.github/workflows/deploy-relay.yml
+++ b/.github/workflows/deploy-relay.yml
@@ -12,8 +12,15 @@ on:
     paths:
       - "infra/relay/**"
       - ".github/workflows/deploy-relay.yml"
+  # Alchemy does not redeploy the Worker when only a Config value read in its
+  # Init changes (alchemy-run/alchemy#1831), so a changed repository variable
+  # needs a forced deploy to reach production.
   workflow_dispatch:
     inputs:
+      force:
+        description: Redeploy every resource, including ones with no detected changes
+        type: boolean
+        default: true
       skip_external_migrations:
         description: >-
           Skip the external Postgres migrations step. Use only when the runner cannot reach the
@@ -34,6 +41,8 @@ concurrency:
 jobs:
   deploy_relay:
     name: Deploy production relay
+    # A manual run from another branch would deploy that branch to production.
+    if: github.ref == 'refs/heads/turbo'
     runs-on: ubuntu-24.04
     timeout-minutes: 15
     environment:
@@ -51,6 +60,7 @@ jobs:
       RELAY_DOMAIN: ${{ vars.RELAY_DOMAIN }}
       RELAY_API_ZONE_NAME: ${{ vars.RELAY_API_ZONE_NAME }}
       RELAY_TUNNEL_ZONE_NAME: ${{ vars.RELAY_TUNNEL_ZONE_NAME }}
+      RELAY_TUNNEL_CLEANUP_MODE: ${{ vars.RELAY_TUNNEL_CLEANUP_MODE }}
       CLERK_PUBLISHABLE_KEY: ${{ vars.CLERK_PUBLISHABLE_KEY }}
       CLERK_JWT_AUDIENCE: ${{ vars.CLERK_JWT_AUDIENCE }}
       # Optional Android push; without FCM_SERVICE_ACCOUNT the FCM resources stay off.
@@ -121,7 +131,7 @@ jobs:
 
       - name: Deploy production relay stage
         if: steps.cloudflare_config.outputs.enabled == 'true'
-        run: vp run --filter t3code-relay deploy --stage prod --yes --no-input
+        run: vp run --filter t3code-relay deploy --stage prod --yes --no-input ${{ inputs.force && '--force' || '' }}
         env:
           # The PublishClientConfig action writes the client env here instead
           # of the repo-root .env; nothing on the runner reads it.
diff --git a/.github/workflows/mobile-eas-preview.yml b/.github/workflows/mobile-eas-preview.yml
index e22d21f4788b..91fa1c235f79 100644
--- a/.github/workflows/mobile-eas-preview.yml
+++ b/.github/workflows/mobile-eas-preview.yml
@@ -78,7 +78,19 @@ jobs:
         working-directory: apps/mobile
         env:
           EXPO_TOKEN: ${{ secrets.EXPO_TOKEN }}
-        run: eas env:pull preview --non-interactive
+        run: |
+          eas env:pull preview --non-interactive
+          # EAS Update disables dotenv loading. Keep the downloaded native config
+          # in its process environment so Android build and OTA fingerprints match.
+          node --input-type=module <<'NODE'
+          import { appendFileSync, readFileSync } from "node:fs";
+          import { parseEnv } from "node:util";
+          const env = parseEnv(readFileSync(".env.local", "utf8"));
+          const googleServicesFile = env.T3CODE_ANDROID_GOOGLE_SERVICES_FILE;
+          if (googleServicesFile) {
+            appendFileSync(process.env.GITHUB_ENV, `T3CODE_ANDROID_GOOGLE_SERVICES_FILE=${googleServicesFile}\n`);
+          }
+          NODE
 
       - name: Deploy with fingerprint check
         if: steps.expo-token.outputs.present == 'true'
diff --git a/.github/workflows/mobile-showcase-screenshots.yml b/.github/workflows/mobile-showcase-screenshots.yml
index ab7cd4a5f0a0..958738276a9e 100644
--- a/.github/workflows/mobile-showcase-screenshots.yml
+++ b/.github/workflows/mobile-showcase-screenshots.yml
@@ -76,6 +76,17 @@ jobs:
           echo "$vp_pnpm_bin" >> "$GITHUB_PATH"
           "$vp_pnpm_bin/pnpm" --version
 
+      - name: Install AXe
+        # Locks the simulator and answers the notification prompt for the
+        # agent-activity scene.
+        # Homebrew refuses third-party tap formulae until they are trusted;
+        # older releases have no trust command and install them as is.
+        run: |
+          brew tap cameroncooke/axe
+          if brew commands | grep -qx trust; then brew trust --formula cameroncooke/axe/axe; fi
+          brew install cameroncooke/axe/axe
+          axe --version
+
       - name: Capture iOS showcase
         run: pnpm screenshots:mobile --platform ios --appearance "${{ inputs.appearance }}" --theme "${{ inputs.theme }}"
 
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index c374a8692db6..c743b961560b 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -510,6 +510,7 @@ jobs:
             "release/*.dmg"
             "release/*.zip"
             "release/*.AppImage"
+            "release/*.deb"
             "release/*.exe"
           )
           # Preview builds have no publish config, so electron-builder writes
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4b74b167761d..162263d18691 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -317,13 +317,76 @@ jobs:
       - name: Typecheck
         run: vp run typecheck
 
+  # Keep tests on their own runners, using the same package split and server
+  # shards as CI, so the release check job does not spend its budget on tests.
+  test:
+    name: Release tests
+    needs: [preflight]
+    if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' }}
+    runs-on: ${{ github.repository == 'pingdotgg/t3code' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }}
+    timeout-minutes: 10
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.preflight.outputs.ref }}
+          sparse-checkout: |
+            /*
+            !/.repos/
+          sparse-checkout-cone-mode: false
+
+      - name: Setup Vite+
+        uses: voidzero-dev/setup-vp@v1
+        with:
+          node-version-file: package.json
+          cache: true
+          run-install: true
+
+      - name: Ensure Electron runtime is installed
+        run: vp run --filter @t3tools/desktop ensure:electron
+
       - uses: ./.github/actions/setup-apt-mirrors
 
       - name: Install browser secret helper build libraries
-        run: sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config
+        run: |
+          sudo sed -i 's|http://|https://|g' /etc/apt/blacksmith-ubuntu-mirrors.txt /etc/apt/sources.list.d/ubuntu.sources
+          sudo apt-get update && sudo apt-get install -y libsecret-1-dev pkg-config build-essential
+
+      - name: Test
+        run: vp run --parallel --concurrency-limit 4 --filter '!t3' --filter '!@t3tools/monorepo' test
+
+  test_server:
+    name: Release server tests ${{ matrix.shard }}
+    needs: [preflight]
+    if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' }}
+    runs-on: ${{ github.repository == 'pingdotgg/t3code' && 'blacksmith-8vcpu-ubuntu-2404' || 'ubuntu-24.04' }}
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2, 3]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ needs.preflight.outputs.ref }}
+          sparse-checkout: |
+            /*
+            !/.repos/
+          sparse-checkout-cone-mode: false
+
+      - name: Setup Vite+
+        uses: voidzero-dev/setup-vp@v1
+        with:
+          node-version-file: package.json
+          cache: true
+          run-install: true
 
+      # No Electron setup here: `t3` (apps/server) has no Electron dependency
+      # and none of its tests touch the runtime. Only the non-server `test`
+      # job, which covers @t3tools/desktop, needs the download.
       - name: Test
-        run: vp run test
+        run: vp run --filter t3 test --shard ${{ matrix.shard }}/${{ strategy.job-total }}
 
   relay_public_config:
     name: Resolve T3 Connect public config
@@ -675,7 +738,7 @@ jobs:
       # No relay stack, no tracing artifact to download.
       relay_client_tracing: ${{ needs.preflight.outputs.connect_enabled == 'true' }}
       label: Linux arm64
-      runner: ubuntu-24.04-arm
+      runner: ${{ github.repository == 'pingdotgg/t3code' && 'blacksmith-16vcpu-ubuntu-2404-arm' || 'ubuntu-24.04-arm' }}
       platform: linux
       target: AppImage
       arch: arm64
@@ -881,6 +944,7 @@ jobs:
             echo 'release-assets/*.dmg'
             echo 'release-assets/*.zip'
             echo 'release-assets/*.AppImage'
+            echo 'release-assets/*.deb'
             echo 'release-assets/*.exe'
             if [[ "${{ needs.preflight.outputs.release_channel }}" != "preview" ]]; then
               echo 'release-assets/*.blockmap'
diff --git a/.macroscope/check-run-agents/effect-service-conventions.md b/.macroscope/check-run-agents/effect-service-conventions.md
index e38c0b040af0..66ee81306a5a 100644
--- a/.macroscope/check-run-agents/effect-service-conventions.md
+++ b/.macroscope/check-run-agents/effect-service-conventions.md
@@ -1,7 +1,7 @@
 ---
 title: Effect Service Conventions
-model: gpt-5-6-sol
-effort: medium
+model: gpt-6-sol
+effort: max
 input: incremental
 tools:
   - browse_code
diff --git a/.macroscope/check-run-agents/ui-consistency.md b/.macroscope/check-run-agents/ui-consistency.md
index b90c81ab0a49..ab37120ff344 100644
--- a/.macroscope/check-run-agents/ui-consistency.md
+++ b/.macroscope/check-run-agents/ui-consistency.md
@@ -1,7 +1,7 @@
 ---
 title: UI Consistency
-model: gpt-5-6-sol
-effort: medium
+model: gpt-6-sol
+effort: max
 input: incremental
 tools:
   - browse_code
diff --git a/.t3-turbo/customizations.json b/.t3-turbo/customizations.json
index 57aea73d7873..94db28b7c7d5 100644
--- a/.t3-turbo/customizations.json
+++ b/.t3-turbo/customizations.json
@@ -1175,6 +1175,10 @@
         {
           "path": "apps/web/src/components/chat/providerIconUtils.ts",
           "markers": ["[ProviderDriverKind.make(\"openrouter\")]: OpenRouterIcon,"]
+        },
+        {
+          "path": "apps/server/src/provider/model-manifest.json",
+          "markers": ["\"driver\": \"openrouter\""]
         }
       ]
     },
@@ -1206,21 +1210,6 @@
         }
       ]
     },
-    {
-      "id": "restyle-ceiling-fork-delta",
-      "status": "implemented",
-      "summary": "Upstream's shadcn no-restyle ceiling counts upstream code only; the fork's own UI adds a fixed number of className overrides, expressed as UPSTREAM_RESTYLE_CEILING + TURBO_RESTYLE_OVERRIDES so upstream changes to the ceiling merge cleanly.",
-      "checks": [
-        {
-          "path": "scripts/lint-restyle-ceiling.ts",
-          "markers": [
-            "export const UPSTREAM_RESTYLE_CEILING = ",
-            "export const TURBO_RESTYLE_OVERRIDES = 6;",
-            "export const RESTYLE_CEILING = UPSTREAM_RESTYLE_CEILING + TURBO_RESTYLE_OVERRIDES;"
-          ]
-        }
-      ]
-    },
     {
       "id": "release-from-turbo-branch",
       "status": "policy",
diff --git a/AGENTS.md b/AGENTS.md
index 7c4229c8663f..bb10431bca9f 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -240,7 +240,7 @@ Full glossary with file links: `docs/internals/glossary.md`
 ## Taste
 
 - Complexity belongs at the adapter boundary. Orchestration stays pure, UI stays dumb.
-- `apps/web/src/components/ui` exports own their look. Pick a `variant` or `size`; do not restyle one with `className`. If none fits, add a variant to the component, not classes at the call site. Layout classes (width, flex, margin, position) belong on the parent. `shadcn/no-restyle` reports violations and CI caps their count.
+- `apps/web/src/components/ui` exports own their look. Pick a `variant` or `size`; do not restyle one with `className`. If none fits and the look is a generic concept, add a variant to the component; a look that belongs to one feature stays in that feature's own component, not in `components/ui`. Layout classes (width, flex, margin, position) belong on the parent. `shadcn/no-restyle` fails lint on violations.
 - Inferred types over annotations. `any` is the enemy.
 - Comments describe how a thing is used, and move when the code moves. To be used mostly to describe functions, not to annotate every line of behavior.
 - Our users drive agents all day and notice a dropped frame, a lying spinner, and a stale label. No continuously repainting animations; they peg the GPU on high-refresh displays.
diff --git a/README.md b/README.md
index f30b9dc95102..9bb934ec710e 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,14 @@ winget install T3Tools.T3Code
 brew install --cask t3-code
 ```
 
+#### Debian, Ubuntu (`.deb`)
+
+Download the `.deb` from [GitHub Releases](https://github.com/pingdotgg/t3code/releases), then:
+
+```bash
+sudo apt install ./T3-Code-*.deb
+```
+
 #### Arch Linux (AUR)
 
 Stable:
diff --git a/SEAM.md b/SEAM.md
index 4fdafb2850cc..cdd4db57d186 100644
--- a/SEAM.md
+++ b/SEAM.md
@@ -22,9 +22,10 @@ fork's change.
   groups.
 - **Optional** `infra/relay/alchemy.run.ts` — provider layers and tracing outputs exist only when
   configured.
-- **Tuned** `scripts/lint-restyle-ceiling.ts` — `RESTYLE_CEILING = UPSTREAM_RESTYLE_CEILING +
-TURBO_RESTYLE_OVERRIDES` (6 fork className overrides on components/ui exports). On conflict,
-  take upstream's new number into `UPSTREAM_RESTYLE_CEILING` and keep the sum.
+- **Retired 2026-09-29** `scripts/lint-restyle-ceiling.ts` (seam `restyle-ceiling-fork-delta`) —
+  upstream #13210 deleted the ceiling gate and made `shadcn/no-restyle` a lint error in
+  `vite.config.ts`. There is no ceiling left to tune; fork UI must use variants/sizes like upstream
+  code. On conflict, do not resurrect the script.
 - **Additive** `infra/relay/scripts/apply-external-migrations.ts` (+ test) — applies
   `infra/relay/migrations/postgres` to the self-hosted Supabase Postgres from `deploy-relay.yml`
   before `alchemy deploy`, one transaction per folder, ledger table `relay_external_migrations`,
@@ -367,6 +368,9 @@ Built to survive orchestrator v2 (pingdotgg/t3code#2829):
   `components/chat/providerIconUtils.ts`, `components/settings/providerDriverMeta.ts`,
   `session-logic.ts` (picker option), `composerDraftStore.ts` (provider option keys), and
   `lib/contextWindow.ts` (display name).
+- **Additive** `apps/server/src/provider/model-manifest.json` — an `openrouter` bundled
+  compatibility policy mirroring `claudeAgent` (the driver probes the same `claude` binary), so
+  every built-in harness has a bundled policy.
 - **Additive, V1-shim (retires at v2 cutover)** `Drivers/OpenRouterDriver.ts` — the
   `ProviderDriver` registration. v2's `ClaudeAdapterV2` already imports the same
   `makeClaudeEnvironment`/`mergeProviderInstanceEnvironment` plumbing and accepts per-instance
@@ -376,7 +380,8 @@ Built to survive orchestrator v2 (pingdotgg/t3code#2829):
   driver identity on events and sessions, keeping the churn-heavy file merge-clean.
 
 On a nightly-sync conflict: everything here is additive except `builtInDrivers.ts`,
-`settings.ts`/`model.ts` map entries, and the six web wiring files above — re-add the fork lines
+`settings.ts`/`model.ts` map entries, the `model-manifest.json` policy entry, and the six web
+wiring files above — re-add the fork lines
 after upstream's. If upstream ships its own OpenRouter or the ACP registry (#6071) covers it,
 prefer upstream and retire the shim first.
 
@@ -536,7 +541,7 @@ settles "do nothing".
 Two fork-owned constants, no product behavior change:
 
 - **`packages/client-runtime/src/state/shellSnapshotHttp.ts`** - `DEFAULT_SHELL_SNAPSHOT_TIMEOUT_MS`
-  is 30s (upstream: 6s) and exported. The cached shell still renders while the request runs.
+  is 30s (upstream: 6s, raised to 20s and made private in the 2026-09-30 ingest) and exported. The cached shell still renders while the request runs.
 - **`apps/server/src/project/RepositoryIdentityResolver.ts`** - `DEFAULT_POSITIVE_CACHE_TTL` is 12h
   and `DEFAULT_NEGATIVE_CACHE_TTL` is 10min (upstream: 1min each), both exported. A repository's
   remote does not change minute to minute, the identity is cosmetic (PR links, icons), and a
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 2fc62f3adce4..9bd6a34965c7 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@t3tools/desktop",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "private": true,
   "type": "module",
-  "main": "dist-electron/main.cjs",
+  "main": "dist-electron/boot.cjs",
   "scripts": {
     "ensure:electron": "node scripts/ensure-electron-runtime.mjs",
     "start": "node scripts/start-electron.mjs",
diff --git a/apps/desktop/scripts/main-process-bundle.test.mjs b/apps/desktop/scripts/main-process-bundle.test.mjs
index 28d8e37d7a9e..678b62f58aac 100644
--- a/apps/desktop/scripts/main-process-bundle.test.mjs
+++ b/apps/desktop/scripts/main-process-bundle.test.mjs
@@ -1,3 +1,4 @@
+import * as NodeChildProcess from "node:child_process";
 import * as NodeFSP from "node:fs/promises";
 import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
@@ -108,3 +109,65 @@ void import("./linux.ts").then(({ result }) => process.emit("ready", result));`,
     await NodeFSP.rm(directory, { recursive: true, force: true });
   }
 });
+
+it("loads the emitted packaged boot entry and backend cache preload", async () => {
+  const directory = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-desktop-boot-"));
+  try {
+    const entries = ["src/boot.ts", "src/compileCache.ts"];
+    await NodeFSP.mkdir(NodePath.join(directory, "src"));
+    await Promise.all(
+      entries.map((entry) =>
+        NodeFSP.copyFile(new URL(`../${entry}`, import.meta.url), NodePath.join(directory, entry)),
+      ),
+    );
+    assert.ok(Array.isArray(desktopConfig.pack));
+    for (const packConfig of desktopConfig.pack) {
+      if (!Array.isArray(packConfig.entry)) continue;
+      if (!packConfig.entry.some((entry) => entries.includes(entry))) continue;
+      await build({
+        ...packConfig,
+        config: false,
+        cwd: directory,
+        tsconfig: false,
+        sourcemap: false,
+        onSuccess: undefined,
+        logLevel: "silent",
+      });
+    }
+    const outputDirectory = NodePath.join(directory, "dist-electron");
+    const fixture = `console.log(require('node:module').getCompileCacheDir() ? 'cached' : 'uncached');`;
+    await NodeFSP.writeFile(NodePath.join(outputDirectory, "main.cjs"), fixture);
+    await NodeFSP.writeFile(
+      NodePath.join(outputDirectory, "backend.mjs"),
+      `import { getCompileCacheDir } from 'node:module'; console.log(getCompileCacheDir() ? 'cached' : 'uncached');`,
+    );
+    for (const disabled of [false, true]) {
+      for (const args of [
+        [NodePath.join(outputDirectory, "boot.cjs")],
+        [
+          "--require",
+          NodePath.join(outputDirectory, "compileCache.cjs"),
+          NodePath.join(outputDirectory, "backend.mjs"),
+        ],
+      ]) {
+        const child = NodeChildProcess.spawnSync(process.execPath, args, {
+          encoding: "utf8",
+          env: {
+            ...process.env,
+            APPIMAGE: "",
+            NODE_COMPILE_CACHE: undefined,
+            NODE_DISABLE_COMPILE_CACHE: disabled ? "1" : undefined,
+            XDG_CACHE_HOME: directory,
+            TMPDIR: directory,
+            TEMP: directory,
+            TMP: directory,
+          },
+        });
+        assert.equal(child.status, 0, child.stderr);
+        assert.equal(child.stdout.trim(), disabled ? "uncached" : "cached");
+      }
+    }
+  } finally {
+    await NodeFSP.rm(directory, { recursive: true, force: true });
+  }
+});
diff --git a/apps/desktop/scripts/smoke-test.mjs b/apps/desktop/scripts/smoke-test.mjs
index fea5f0a120e5..05195bb8d8cd 100644
--- a/apps/desktop/scripts/smoke-test.mjs
+++ b/apps/desktop/scripts/smoke-test.mjs
@@ -5,7 +5,7 @@ import { resolveElectronLaunchCommand } from "./electron-launcher.mjs";
 
 const __dirname = NodePath.dirname(NodeURL.fileURLToPath(import.meta.url));
 const desktopDir = NodePath.resolve(__dirname, "..");
-const mainJs = NodePath.resolve(desktopDir, "dist-electron/main.cjs");
+const mainJs = NodePath.resolve(desktopDir, "dist-electron/boot.cjs");
 
 console.log("\nLaunching Electron smoke test...");
 
diff --git a/apps/desktop/src/app/CodexAuthCallback.test.ts b/apps/desktop/src/app/CodexAuthCallback.test.ts
new file mode 100644
index 000000000000..6d8a905885ac
--- /dev/null
+++ b/apps/desktop/src/app/CodexAuthCallback.test.ts
@@ -0,0 +1,112 @@
+// @effect-diagnostics nodeBuiltinImport:off globalFetch:off - Tests exercise the real native loopback listener without an OpenAI account.
+import * as NodeHttp from "node:http";
+import { describe, expect, it } from "vite-plus/test";
+import { codexAuthDeliveryUrl, readCodexAuthDelivery } from "@t3tools/shared/codexAuthHandoff";
+import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
+import { receiveCodexAuthCallback, cancelCodexAuthCallback } from "./CodexAuthCallback.ts";
+
+async function freePort() {
+  const server = NodeHttp.createServer();
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("address");
+  await new Promise<void>((resolve) => server.close(() => resolve()));
+  return address.port;
+}
+function request(port: number, state = "a".repeat(43)) {
+  const url = new URL("https://auth.openai.com/api/accounts/authorize");
+  url.search = new URLSearchParams({
+    client_id: "dynamic_agent_client",
+    response_type: "code",
+    redirect_uri: `http://127.0.0.1:${port}/auth/callback`,
+    state,
+    code_challenge_method: "S256",
+    code_challenge: "b".repeat(43),
+  }).toString();
+  return url.toString();
+}
+function callback(authorizationUrl: string) {
+  const request = new URL(authorizationUrl);
+  const url = new URL(request.searchParams.get("redirect_uri")!);
+  url.search = new URLSearchParams({
+    state: request.searchParams.get("state")!,
+    code: "test-code",
+    client_id: "oaiapp_test",
+  }).toString();
+  return url.toString();
+}
+
+describe("desktop Codex callback helper", () => {
+  it("binds before opening sign-in, ignores a foreign response, and returns only the code callback", async () => {
+    const authorizationUrl = request(await freePort());
+    const expected = callback(authorizationUrl);
+    const received = await receiveCodexAuthCallback(authorizationUrl, async () => {
+      const invalid = new URL(expected);
+      invalid.searchParams.set("state", "foreign");
+      expect((await fetch(invalid)).status).toBe(400);
+      const response = await fetch(expected);
+      expect(response.headers.get("cache-control")).toBe("no-store");
+      expect(await response.text()).not.toContain("test-code");
+      return true;
+    });
+    expect(received).toBe(expected);
+  });
+  it("returns hosted web to the exact instance and environment without putting the code in its query", async () => {
+    const authorizationUrl = request(await freePort());
+    const expected = callback(authorizationUrl);
+    const input = {
+      authorizationUrl,
+      returnUrl: "https://app.t3.codes/settings/providers?environmentId=remote-one&instanceId=work",
+      environmentId: EnvironmentId.make("remote-one"),
+      instanceId: ProviderInstanceId.make("work"),
+      flowId: "flow-one",
+    };
+    await receiveCodexAuthCallback(
+      authorizationUrl,
+      async () => {
+        const response = await fetch(expected, { redirect: "manual" });
+        expect(response.status).toBe(303);
+        const delivery = response.headers.get("location")!;
+        expect(new URL(delivery).searchParams.has("code")).toBe(false);
+        expect(readCodexAuthDelivery(delivery)?.callbackUrl).toBe(expected);
+        expect(readCodexAuthDelivery(delivery)?.returnUrl).toBe(input.returnUrl);
+        return true;
+      },
+      (url) => codexAuthDeliveryUrl(input, url),
+    );
+  });
+  it("cancels and releases its listener so exact-port reauthorization can run again", async () => {
+    const authorizationUrl = request(await freePort());
+    await expect(
+      receiveCodexAuthCallback(authorizationUrl, async () => {
+        cancelCodexAuthCallback(authorizationUrl);
+        return true;
+      }),
+    ).rejects.toThrow("cancelled");
+    expect(
+      await receiveCodexAuthCallback(authorizationUrl, async () => {
+        await fetch(callback(authorizationUrl));
+        return true;
+      }),
+    ).toBe(callback(authorizationUrl));
+  });
+  it("allows two accounts to complete independently", async () => {
+    const a = request(await freePort(), "a".repeat(43));
+    const b = request(await freePort(), "c".repeat(43));
+    const openedA = Promise.withResolvers<void>();
+    const openedB = Promise.withResolvers<void>();
+    const receiveA = receiveCodexAuthCallback(a, async () => {
+      openedA.resolve();
+      await openedB.promise;
+      await fetch(callback(a));
+      return true;
+    });
+    const receiveB = receiveCodexAuthCallback(b, async () => {
+      openedB.resolve();
+      await openedA.promise;
+      await fetch(callback(b));
+      return true;
+    });
+    expect(await Promise.all([receiveA, receiveB])).toEqual([callback(a), callback(b)]);
+  });
+});
diff --git a/apps/desktop/src/app/CodexAuthCallback.ts b/apps/desktop/src/app/CodexAuthCallback.ts
new file mode 100644
index 000000000000..a2fda9ab68cc
--- /dev/null
+++ b/apps/desktop/src/app/CodexAuthCallback.ts
@@ -0,0 +1,5 @@
+export {
+  CodexAuthCallbackError,
+  cancelCodexAuthCallback,
+  receiveCodexAuthCallback,
+} from "@t3tools/shared/codexAuthCallback";
diff --git a/apps/desktop/src/app/DesktopAppActivation.test.ts b/apps/desktop/src/app/DesktopAppActivation.test.ts
index d6ce80322798..8ab165afce0a 100644
--- a/apps/desktop/src/app/DesktopAppActivation.test.ts
+++ b/apps/desktop/src/app/DesktopAppActivation.test.ts
@@ -44,6 +44,25 @@ function request(requestId: string, platform: NodeJS.Platform): DesktopAppActiva
   };
 }
 
+function startOkServer(target: ReturnType<typeof makeTarget>, userId: number | undefined) {
+  return startDesktopAppControlServer({
+    ...target,
+    userId,
+    handle: async (input) => ({
+      version: 1,
+      requestId: input.requestId,
+      ok: true,
+      projectId: ProjectId.make("project-1"),
+      threadId: ThreadId.make("thread-1"),
+    }),
+    cancel: () => undefined,
+    onReclaimError: () => undefined,
+  }).then((server) => {
+    openServers.push(server);
+    return server;
+  });
+}
+
 function exchange(address: string, payload: DesktopAppActivationRequest) {
   return new Promise<DesktopAppActivationResponse>((resolve, reject) => {
     const socket = NodeNet.createConnection(address);
@@ -84,6 +103,7 @@ describe("desktop app control server", () => {
             };
           },
           cancel: () => undefined,
+          onReclaimError: () => undefined,
         });
         openServers.push(server);
 
@@ -117,6 +137,7 @@ describe("desktop app control server", () => {
           userId,
           handle: () => new Promise(() => undefined),
           cancel: resolveCanceled,
+          onReclaimError: () => undefined,
         });
         openServers.push(server);
         const socket = NodeNet.createConnection(target.address);
@@ -137,4 +158,50 @@ describe("desktop app control server", () => {
       });
     }),
   );
+
+  // Two desktop apps can share one state dir, such as nightly and a preview build.
+  it.effect("keeps a newer app's socket when an older app on the same state dir quits", () =>
+    Effect.gen(function* () {
+      const platform = yield* HostProcessPlatform;
+      const userId = yield* HostProcessUserId;
+      if (platform === "win32") return;
+      yield* Effect.promise(async () => {
+        const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-app-takeover-test-"));
+        const target = makeTarget(NodePath.join(root, "userdata"), platform, userId);
+        const older = await startOkServer(target, userId);
+        await startOkServer(target, userId);
+
+        await older.close();
+
+        await expect(
+          exchange(target.address, request("after-quit", platform)),
+        ).resolves.toMatchObject({ ok: true, requestId: "after-quit" });
+        await NodeFSP.rm(root, { recursive: true, force: true });
+      });
+    }),
+  );
+
+  it.effect("binds its address again after the socket file is removed", () =>
+    Effect.gen(function* () {
+      const platform = yield* HostProcessPlatform;
+      const userId = yield* HostProcessUserId;
+      if (platform === "win32") return;
+      yield* Effect.promise(async () => {
+        const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-app-reclaim-test-"));
+        const target = makeTarget(NodePath.join(root, "userdata"), platform, userId);
+        const server = await startOkServer(target, userId);
+
+        await NodeFSP.unlink(target.address);
+        await server.reclaim();
+
+        await expect(
+          exchange(target.address, request("reclaimed", platform)),
+        ).resolves.toMatchObject({
+          ok: true,
+          requestId: "reclaimed",
+        });
+        await NodeFSP.rm(root, { recursive: true, force: true });
+      });
+    }),
+  );
 });
diff --git a/apps/desktop/src/app/DesktopAppActivation.ts b/apps/desktop/src/app/DesktopAppActivation.ts
index 50fc70d783e4..740799955da2 100644
--- a/apps/desktop/src/app/DesktopAppActivation.ts
+++ b/apps/desktop/src/app/DesktopAppActivation.ts
@@ -1,7 +1,10 @@
-// @effect-diagnostics nodeBuiltinImport:off -- Local socket ownership checks need lstat uid and an atomic stale-socket unlink at the Node adapter boundary.
+// @effect-diagnostics nodeBuiltinImport:off -- Local socket ownership checks need lstat, an atomic rename, and a directory watch at the Node adapter boundary.
+import * as NodeCrypto from "node:crypto";
+import * as NodeFS from "node:fs";
 import * as NodeFSP from "node:fs/promises";
 import * as NodeNet from "node:net";
 import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
 
 import {
   DESKTOP_APP_ACTIVATION_PROTOCOL_VERSION,
@@ -44,6 +47,8 @@ export class DesktopAppActivationStartError extends Schema.TaggedError<DesktopAp
 }
 
 interface RunningControlServer {
+  /** Binds the address again if its socket file is gone. Directory changes run this too. */
+  readonly reclaim: () => Promise<void>;
   readonly close: () => Promise<void>;
 }
 
@@ -70,12 +75,12 @@ function requestIdFromUnknown(value: unknown): string {
   return "invalid-request";
 }
 
-async function prepareUnixSocket(input: {
-  readonly address: string;
+/** Makes sure the socket directory is safe to use. Returns true when it had to create it. */
+async function prepareUnixDirectory(input: {
   readonly directory: string;
   readonly userId: number | undefined;
-}): Promise<void> {
-  await NodeFSP.mkdir(input.directory, { recursive: true, mode: 0o700 });
+}): Promise<boolean> {
+  const created = await NodeFSP.mkdir(input.directory, { recursive: true, mode: 0o700 });
   const stat = await NodeFSP.lstat(input.directory);
   if (!stat.isDirectory() || stat.isSymbolicLink()) {
     throw new Error(`${input.directory} is not a directory.`);
@@ -84,28 +89,43 @@ async function prepareUnixSocket(input: {
     throw new Error(`${input.directory} is owned by another user.`);
   }
   await NodeFSP.chmod(input.directory, 0o700);
-  await NodeFSP.unlink(input.address).catch((error: NodeJS.ErrnoException) => {
-    if (error.code !== "ENOENT") throw error;
-  });
+  return created !== undefined;
+}
+
+async function inodeAt(path: string): Promise<number | null> {
+  return NodeFSP.lstat(path).then(
+    (stat) => stat.ino,
+    (error: NodeJS.ErrnoException) => {
+      if (error.code === "ENOENT") return null;
+      throw error;
+    },
+  );
+}
+
+function closeServer(server: NodeNet.Server): Promise<void> {
+  return new Promise((resolve) => server.close(() => resolve()));
 }
 
+/**
+ * Serves `t3 app` requests on the local control address until `close`.
+ *
+ * Two desktop apps can share one state dir, for example nightly and a preview
+ * build. They share one socket path, so on Unix:
+ * - The newest app takes the path over.
+ * - `close` removes the socket file only while it is still this app's socket.
+ * - An app binds the path again when it is gone, for example after the app that
+ *   took it over quits.
+ */
 export async function startDesktopAppControlServer(input: {
   readonly address: string;
   readonly directory: string | null;
   readonly userId: number | undefined;
   readonly handle: (request: DesktopAppActivationRequest) => Promise<DesktopAppActivationResponse>;
   readonly cancel: (requestId: string) => void;
+  readonly onReclaimError: (error: unknown) => void;
 }): Promise<RunningControlServer> {
-  if (input.directory !== null) {
-    await prepareUnixSocket({
-      address: input.address,
-      directory: input.directory,
-      userId: input.userId,
-    });
-  }
-
   const sockets = new Set<NodeNet.Socket>();
-  const server = NodeNet.createServer((socket) => {
+  const handleConnection = (socket: NodeNet.Socket) => {
     sockets.add(socket);
     socket.setEncoding("utf8");
     let buffer = "";
@@ -160,40 +180,116 @@ export async function startDesktopAppControlServer(input: {
       sockets.delete(socket);
       if (!responseSent && activeRequestId !== null) input.cancel(activeRequestId);
     });
-  });
+  };
 
-  await new Promise<void>((resolve, reject) => {
-    const onError = (error: Error) => {
-      server.removeListener("listening", onListening);
-      reject(error);
-    };
-    const onListening = () => {
-      server.removeListener("error", onError);
-      resolve();
-    };
-    server.once("error", onError);
-    server.once("listening", onListening);
-    server.listen(input.address);
-  });
+  const listen = (address: string) =>
+    new Promise<NodeNet.Server>((resolve, reject) => {
+      const server = NodeNet.createServer(handleConnection);
+      const onError = (error: Error) => {
+        server.removeListener("listening", onListening);
+        reject(error);
+      };
+      const onListening = () => {
+        server.removeListener("error", onError);
+        resolve(server);
+      };
+      server.once("error", onError);
+      server.once("listening", onListening);
+      server.listen(address);
+    });
 
-  try {
-    if (input.directory !== null) {
-      await NodeFSP.chmod(input.address, 0o600);
+  // Closing a Unix socket server unlinks the path it was bound to, even when
+  // another app's socket lives there now. Bind a staging path and move it onto
+  // the address instead, so a later close only unlinks the staging path, which
+  // is already gone. `rename` takes the address over in one step. `link` claims
+  // it only while it is free, and fails with EEXIST otherwise.
+  const bindUnix = async (directory: string, mode: "take-over" | "claim-free") => {
+    const staging = NodePath.join(directory, `${NodeCrypto.randomBytes(6).toString("hex")}.tmp`);
+    const server = await listen(staging);
+    try {
+      await NodeFSP.chmod(staging, 0o600);
+      const inode = await inodeAt(staging);
+      if (mode === "take-over") {
+        await NodeFSP.rename(staging, input.address);
+      } else {
+        await NodeFSP.link(staging, input.address);
+        await NodeFSP.unlink(staging);
+      }
+      return { server, inode };
+    } catch (error) {
+      await closeServer(server);
+      throw error;
     }
-  } catch (error) {
-    await new Promise<void>((resolve) => server.close(() => resolve()));
-    throw error;
+  };
+
+  let server: NodeNet.Server;
+  let inode: number | null = null;
+  if (input.directory === null) {
+    // Named pipes close with the app that owns them, so no other app can remove this one.
+    server = await listen(input.address);
+  } else {
+    await prepareUnixDirectory({ directory: input.directory, userId: input.userId });
+    ({ server, inode } = await bindUnix(input.directory, "take-over"));
   }
 
   let closed = false;
+  const reclaimOnce = async () => {
+    // Never replace a socket that exists, so two apps cannot trade the path back and forth.
+    if (closed || input.directory === null || (await inodeAt(input.address)) !== null) return;
+    if (await prepareUnixDirectory({ directory: input.directory, userId: input.userId })) {
+      // A watch follows the directory's inode, so a recreated directory needs a new one.
+      watchDirectory(input.directory);
+    }
+    const next = await bindUnix(input.directory, "claim-free").catch(
+      (error: NodeJS.ErrnoException) => {
+        // Another app bound the address first.
+        if (error.code === "EEXIST") return null;
+        throw error;
+      },
+    );
+    if (next === null) return;
+    const previous = server;
+    ({ server, inode } = next);
+    previous.close();
+  };
+  let pendingReclaim = Promise.resolve();
+  const reclaim = () => {
+    const run = pendingReclaim.then(reclaimOnce);
+    pendingReclaim = run.catch(() => undefined);
+    return run;
+  };
+  let watcher: NodeFS.FSWatcher | null = null;
+  const watchDirectory = (directory: string) => {
+    watcher?.close();
+    watcher = null;
+    try {
+      watcher = NodeFS.watch(directory, { persistent: false }, () => {
+        reclaim().catch(input.onReclaimError);
+      });
+      watcher.on("error", input.onReclaimError);
+    } catch (error) {
+      // The socket still works without a watcher. It only cannot recover after removal.
+      input.onReclaimError(error);
+    }
+  };
+  if (input.directory !== null) {
+    watchDirectory(input.directory);
+    // Catch a removal that happened before the watcher started.
+    reclaim().catch(input.onReclaimError);
+  }
+
   return {
+    reclaim,
     close: async () => {
       if (closed) return;
       closed = true;
+      // A running reclaim can replace the watcher, so close the watcher after it.
+      await pendingReclaim;
+      watcher?.close();
       for (const socket of sockets) socket.destroy();
-      await new Promise<void>((resolve) => server.close(() => resolve()));
+      await closeServer(server);
       server.removeAllListeners();
-      if (input.directory !== null) {
+      if (inode !== null && (await inodeAt(input.address)) === inode) {
         await NodeFSP.unlink(input.address).catch((error: NodeJS.ErrnoException) => {
           if (error.code !== "ENOENT") throw error;
         });
@@ -258,6 +354,10 @@ export const make = Effect.gen(function* () {
             userId,
             handle: (request) => broker.request(request),
             cancel: (requestId) => broker.cancel(requestId),
+            onReclaimError: (cause) =>
+              void runPromise(
+                logWarning("failed to restore the desktop app control socket", { cause }),
+              ),
           }),
         catch: (cause) => new DesktopAppActivationStartError({ address: address.address, cause }),
       }),
diff --git a/apps/desktop/src/app/DesktopAppIdentity.test.ts b/apps/desktop/src/app/DesktopAppIdentity.test.ts
index 40e9bf00c0dd..8312e7870490 100644
--- a/apps/desktop/src/app/DesktopAppIdentity.test.ts
+++ b/apps/desktop/src/app/DesktopAppIdentity.test.ts
@@ -76,7 +76,7 @@ const makeAssetsLayer = (png: Option.Option<string>) =>
       icns: Option.none(),
       png,
     }),
-    resolveResourcePath: () => Effect.succeed(Option.none()),
+    resolveResourcePath: () => Effect.succeedNone,
   } satisfies DesktopAssets.DesktopAssets["Service"]);
 
 const makeEnvironmentLayer = (overrides: TestEnvironmentInput = {}) => {
diff --git a/apps/desktop/src/app/DesktopClerk.test.ts b/apps/desktop/src/app/DesktopClerk.test.ts
index e3edecc1a1f2..da300cfde762 100644
--- a/apps/desktop/src/app/DesktopClerk.test.ts
+++ b/apps/desktop/src/app/DesktopClerk.test.ts
@@ -1,3 +1,8 @@
+// @effect-diagnostics nodeBuiltinImport:off globalFetchInEffect:off - Hosted handoff test uses a real localhost listener without an OpenAI account.
+import * as NodeHttp from "node:http";
+import { codexAuthHandoffUrl, readCodexAuthDelivery } from "@t3tools/shared/codexAuthHandoff";
+import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
+import { HostProcessArguments } from "@t3tools/shared/hostProcess";
 import { assert, describe, it } from "@effect/vitest";
 import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
@@ -22,14 +27,24 @@ vi.mock("@clerk/electron/storage", () => ({
   storage: storageMock,
 }));
 
+import * as Option from "effect/Option";
 import * as Exit from "effect/Exit";
 import * as FileSystem from "effect/FileSystem";
 import * as ElectronApp from "../electron/ElectronApp.ts";
+import * as ElectronShell from "../electron/ElectronShell.ts";
 import * as ElectronWindow from "../electron/ElectronWindow.ts";
 import * as DesktopClerk from "./DesktopClerk.ts";
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
 
-const makeDesktopClerkLayer = (isDevelopment = true, events: string[] = []) => {
+const makeDesktopClerkLayer = (
+  isDevelopment = true,
+  events: string[] = [],
+  shell: ElectronShell.ElectronShell["Service"] = {
+    openExternal: () => Effect.succeed(true),
+    openSystemSettings: () => Effect.succeed(false),
+    copyText: () => Effect.void,
+  },
+) => {
   const environment = DesktopEnvironment.DesktopEnvironment.of({
     stateDir: "/tmp/t3-state",
     isDevelopment,
@@ -51,6 +66,7 @@ const makeDesktopClerkLayer = (isDevelopment = true, events: string[] = []) => {
       Layer.mergeAll(
         Layer.succeed(DesktopEnvironment.DesktopEnvironment, environment),
         Layer.succeed(ElectronApp.ElectronApp, electronApp),
+        Layer.succeed(ElectronShell.ElectronShell, shell),
         FileSystem.layerNoop({ exists: () => Effect.succeed(false) }),
       ),
     ),
@@ -162,7 +178,7 @@ describe("DesktopClerk", () => {
 
       assert.isTrue(Exit.isSuccess(exit));
       assert.equal(quit.mock.calls.length, 0);
-      assert.deepEqual(registeredEvents, ["second-instance"]);
+      assert.deepEqual(registeredEvents, ["open-url", "second-instance"]);
     }).pipe(
       Effect.provide(makeDesktopClerkLayer()),
       Effect.provideService(ElectronApp.ElectronApp, electronApp),
@@ -198,3 +214,131 @@ describe("DesktopClerk", () => {
     );
   });
 });
+
+it.effect(
+  "provider auth deep links navigate and reveal the running desktop without handling Clerk URLs",
+  () => {
+    storageMock.mockReturnValue(storageAdapter);
+    createClerkBridgeMock.mockReturnValue({ cleanup: vi.fn(), isPrimaryInstance: true });
+    const listeners = new Map<string, (...args: unknown[]) => void>();
+    const revealed = Promise.withResolvers<void>();
+    const loadURL = vi.fn(async (_url: string) => undefined);
+    const window = { loadURL };
+    const electronApp = {
+      on: (name: string, listener: (...args: unknown[]) => void) =>
+        Effect.sync(() => {
+          listeners.set(name, listener);
+        }),
+    } as unknown as ElectronApp.ElectronApp["Service"];
+    const electronWindow = {
+      currentMainOrFirst: Effect.succeed(Option.some(window)),
+      reveal: () => Effect.sync(() => revealed.resolve()),
+    } as unknown as ElectronWindow.ElectronWindow["Service"];
+    return Effect.gen(function* () {
+      const clerk = yield* DesktopClerk.DesktopClerk;
+      yield* clerk.configure;
+      const event = { preventDefault: vi.fn() };
+      listeners.get("open-url")!(event, "t3code-dev://app/auth/callback?code=clerk-code");
+      listeners.get("open-url")!(event, "t3code://app/welcome");
+      assert.equal(loadURL.mock.calls.length, 0);
+      assert.equal(event.preventDefault.mock.calls.length, 0);
+      listeners.get("second-instance")!({}, [
+        "t3",
+        "t3code-dev://app/settings/providers?instanceId=work&code=never-forward",
+      ]);
+      yield* Effect.promise(() => revealed.promise);
+      assert.deepEqual(loadURL.mock.calls, [
+        ["t3code-dev://app/settings/providers?instanceId=work"],
+      ]);
+      listeners.get("open-url")!(event, "t3code-dev://app/welcome#agents:machine-id");
+      assert.equal(event.preventDefault.mock.calls.length, 1);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(makeDesktopClerkLayer()),
+      Effect.provideService(ElectronApp.ElectronApp, electronApp),
+      Effect.provideService(ElectronWindow.ElectronWindow, electronWindow),
+    );
+  },
+);
+
+for (const entry of ["startup", "open-url"] as const) {
+  it.effect(`receives hosted web sign-in through the desktop ${entry} handler`, () =>
+    Effect.gen(function* () {
+      storageMock.mockReturnValue(storageAdapter);
+      createClerkBridgeMock.mockReturnValue({ cleanup: vi.fn(), isPrimaryInstance: true });
+      const port = yield* Effect.promise(async () => {
+        const server = NodeHttp.createServer();
+        await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+        const address = server.address();
+        if (!address || typeof address === "string") throw new Error("address");
+        await new Promise<void>((resolve) => server.close(() => resolve()));
+        return address.port;
+      });
+      const authorize = new URL("https://auth.openai.com/api/accounts/authorize");
+      authorize.search = new URLSearchParams({
+        client_id: "dynamic_agent_client",
+        response_type: "code",
+        redirect_uri: `http://127.0.0.1:${port}/auth/callback`,
+        state: "a".repeat(43),
+        code_challenge_method: "S256",
+        code_challenge: "b".repeat(43),
+      }).toString();
+      const request = {
+        authorizationUrl: authorize.toString(),
+        returnUrl: "https://app.t3.codes/welcome#agents:remote-one",
+        environmentId: EnvironmentId.make("remote-one"),
+        instanceId: ProviderInstanceId.make("work"),
+        flowId: "flow-one",
+      };
+      const link = codexAuthHandoffUrl(request, true);
+      const delivered = Promise.withResolvers<string>();
+      const shell = ElectronShell.ElectronShell.of({
+        openExternal: (value) =>
+          Effect.promise(async () => {
+            const url = new URL(String(value));
+            const callback = new URL(url.searchParams.get("redirect_uri")!);
+            callback.search = new URLSearchParams({
+              state: url.searchParams.get("state")!,
+              code: "test-code",
+              client_id: "oaiapp_test",
+            }).toString();
+            const response = await fetch(callback, { redirect: "manual" });
+            delivered.resolve(response.headers.get("location")!);
+            return true;
+          }),
+        openSystemSettings: () => Effect.succeed(false),
+        copyText: () => Effect.void,
+      });
+      const listeners = new Map<string, (...args: unknown[]) => void>();
+      const electronApp = {
+        whenReady: Effect.void,
+        on: (name: string, listener: (...args: unknown[]) => void) =>
+          Effect.sync(() => {
+            listeners.set(name, listener);
+          }),
+      } as unknown as ElectronApp.ElectronApp["Service"];
+      yield* Effect.gen(function* () {
+        const clerk = yield* DesktopClerk.DesktopClerk;
+        yield* clerk.configure;
+        if (entry === "open-url") {
+          const event = { preventDefault: vi.fn() };
+          listeners.get("open-url")!(event, link);
+          assert.strictEqual(event.preventDefault.mock.calls.length, 1);
+        }
+        const delivery = readCodexAuthDelivery(yield* Effect.promise(() => delivered.promise));
+        assert.strictEqual(delivery?.environmentId, request.environmentId);
+        assert.strictEqual(delivery?.instanceId, request.instanceId);
+        assert.strictEqual(delivery?.flowId, request.flowId);
+        assert.strictEqual(delivery?.returnUrl, request.returnUrl);
+      }).pipe(
+        Effect.provide(makeDesktopClerkLayer(true, [], shell)),
+        Effect.provideService(HostProcessArguments, entry === "startup" ? ["t3", link] : ["t3"]),
+        Effect.provideService(ElectronApp.ElectronApp, electronApp),
+        Effect.provideService(
+          ElectronWindow.ElectronWindow,
+          {} as ElectronWindow.ElectronWindow["Service"],
+        ),
+      );
+    }).pipe(Effect.scoped),
+  );
+}
diff --git a/apps/desktop/src/app/DesktopClerk.ts b/apps/desktop/src/app/DesktopClerk.ts
index 26054b74440f..61be28c811c6 100644
--- a/apps/desktop/src/app/DesktopClerk.ts
+++ b/apps/desktop/src/app/DesktopClerk.ts
@@ -7,6 +7,11 @@ import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
 
+import { codexAuthDeliveryUrl, readCodexAuthHandoff } from "@t3tools/shared/codexAuthHandoff";
+import { receiveCodexAuthCallback, CodexAuthCallbackError } from "./CodexAuthCallback.ts";
+import * as ElectronShell from "../electron/ElectronShell.ts";
+import { providerAuthReturnUrl } from "@t3tools/shared/providerAuthReturnUrl";
+import { HostProcessArguments } from "@t3tools/shared/hostProcess";
 import { clerkFrontendApiHostnameFromPublishableKey } from "@t3tools/shared/relayAuth";
 import * as ElectronApp from "../electron/ElectronApp.ts";
 import * as ElectronProtocol from "../electron/ElectronProtocol.ts";
@@ -87,6 +92,7 @@ function createDesktopClerkBridge(stateDir: string, isDevelopment: boolean) {
 export const make = Effect.gen(function* () {
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
   const electronApp = yield* ElectronApp.ElectronApp;
+  const shell = yield* ElectronShell.ElectronShell;
 
   // Electron scopes the single-instance lock to the userData directory and
   // creates that directory when the lock is acquired. The SDK bridge takes
@@ -136,13 +142,62 @@ export const make = Effect.gen(function* () {
         return yield* Effect.interrupt;
       }
 
-      yield* electronApp.on("second-instance", () => {
+      const startProviderAuthHandoff = (value: string | undefined) => {
+        if (!value) return false;
+        const request = readCodexAuthHandoff(value, environment.isDevelopment);
+        if (!request) return false;
+        void runPromise(
+          Effect.gen(function* () {
+            yield* electronApp.whenReady;
+            yield* Effect.tryPromise({
+              try: () =>
+                receiveCodexAuthCallback(
+                  request.authorizationUrl,
+                  (url) => runPromise(shell.openExternal(url)),
+                  (callbackUrl) => codexAuthDeliveryUrl(request, callbackUrl),
+                ),
+              catch: () =>
+                new CodexAuthCallbackError({
+                  detail:
+                    "Could not receive hosted web ChatGPT sign-in. Retry or use the redirect URL in the web app.",
+                }),
+            });
+          }).pipe(
+            Effect.catch(() => Effect.logWarning("Could not complete ChatGPT desktop handoff.")),
+          ),
+        );
+        return true;
+      };
+      const resumeProviderAuth = (value: string | undefined) => {
+        const destination = providerAuthReturnUrl(value);
+        const expectedOrigin = `${ElectronProtocol.getDesktopScheme(environment.isDevelopment)}://app`;
+        if (!destination?.startsWith(`${expectedOrigin}/`)) return false;
+        void runPromise(
+          Effect.gen(function* () {
+            const mainWindow = yield* electronWindow.currentMainOrFirst;
+            if (Option.isNone(mainWindow)) return;
+            yield* Effect.promise(() => mainWindow.value.loadURL(destination));
+            yield* electronWindow.reveal(mainWindow.value);
+          }).pipe(
+            Effect.catchCause((cause) =>
+              Effect.logWarning("Could not return to provider setup", cause),
+            ),
+          ),
+        );
+        return true;
+      };
+      const args = yield* HostProcessArguments;
+      args.some((value) => startProviderAuthHandoff(value));
+      yield* electronApp.on("open-url", (event: { preventDefault: () => void }, url: string) => {
+        if (startProviderAuthHandoff(url) || resumeProviderAuth(url)) event.preventDefault();
+      });
+      yield* electronApp.on("second-instance", (_event: unknown, argv: readonly string[]) => {
+        if (argv?.some((value) => startProviderAuthHandoff(value) || resumeProviderAuth(value)))
+          return;
         void runPromise(
           Effect.gen(function* () {
             const mainWindow = yield* electronWindow.currentMainOrFirst;
-            if (Option.isSome(mainWindow)) {
-              yield* electronWindow.reveal(mainWindow.value);
-            }
+            if (Option.isSome(mainWindow)) yield* electronWindow.reveal(mainWindow.value);
           }),
         );
       });
diff --git a/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts b/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
index fdc69841343c..5cb7aafbbd20 100644
--- a/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
+++ b/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
@@ -46,7 +46,7 @@ function makeSafeStorageLayer(available: boolean, failDecrypt: Ref.Ref<boolean>
         return decoded.slice("encrypted:".length);
       });
     },
-    selectedStorageBackend: Effect.succeed(Option.none()),
+    selectedStorageBackend: Effect.succeedNone,
   } satisfies ElectronSafeStorage.ElectronSafeStorage["Service"]);
 }
 
diff --git a/apps/desktop/src/app/DesktopConnectionCatalogStore.ts b/apps/desktop/src/app/DesktopConnectionCatalogStore.ts
index e2e0cd413bd9..46b2546e681c 100644
--- a/apps/desktop/src/app/DesktopConnectionCatalogStore.ts
+++ b/apps/desktop/src/app/DesktopConnectionCatalogStore.ts
@@ -205,7 +205,7 @@ const readDocument = (
       raw === null
         ? Effect.succeed(Option.none<EncryptedConnectionCatalogDocument>())
         : decodeEncryptedConnectionCatalogDocumentJson(raw).pipe(
-            Effect.map(Option.some),
+            Effect.asSome,
             Effect.mapError(
               (cause) =>
                 new DesktopConnectionCatalogStoreDocumentDecodeError({
diff --git a/apps/desktop/src/app/DesktopEnvironment.ts b/apps/desktop/src/app/DesktopEnvironment.ts
index bb380b70a856..8fbf9609f95e 100644
--- a/apps/desktop/src/app/DesktopEnvironment.ts
+++ b/apps/desktop/src/app/DesktopEnvironment.ts
@@ -66,6 +66,8 @@ export class DesktopEnvironment extends Context.Service<
     readonly clientAssetsDir: string;
     readonly backendCwd: string;
     readonly preloadPath: string;
+    // Preload that turns on the V8 compile cache for the local backend.
+    readonly compileCachePath: string;
     readonly appUpdateYmlPath: string;
     readonly devServerUrl: Option.Option<URL>;
     readonly devRemoteT3ServerEntryPath: Option.Option<string>;
@@ -225,6 +227,7 @@ const make = Effect.fn("desktop.environment.make")(function* (
     clientAssetsDir: path.join(serverRoot, "apps/server/dist/client"),
     backendCwd: input.isPackaged ? homeDirectory : appRoot,
     preloadPath: path.join(input.dirname, "preload.cjs"),
+    compileCachePath: path.join(input.dirname, "compileCache.cjs"),
     appUpdateYmlPath: input.isPackaged
       ? path.join(resourcesPath, "app-update.yml")
       : path.join(input.appPath, "dev-app-update.yml"),
diff --git a/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts b/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
index f0b88101587c..893c1aaebe1d 100644
--- a/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
+++ b/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
@@ -1,23 +1,29 @@
 import { assert, describe, it } from "@effect/vitest";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
+import * as Path from "effect/Path";
 import * as PlatformError from "effect/PlatformError";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
 import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
+import * as DesktopAssets from "./DesktopAssets.ts";
 import * as DesktopLinuxUrlHandler from "./DesktopLinuxUrlHandler.ts";
 
 interface RecordedRegistration {
   readonly directories: string[];
   readonly files: Array<{ readonly path: string; readonly content: string }>;
   readonly commands: Array<{ readonly command: string; readonly args: ReadonlyArray<string> }>;
+  readonly copies: Array<{ readonly source: string; readonly destination: string }>;
 }
 
-const makeEnvironment = (overrides: Record<string, unknown> = {}) =>
+const makeEnvironment = (path: Path.Path, overrides: Record<string, unknown> = {}) =>
   DesktopEnvironment.DesktopEnvironment.of({
     platform: "linux",
     isPackaged: true,
@@ -27,14 +33,14 @@ const makeEnvironment = (overrides: Record<string, unknown> = {}) =>
     linuxWmClass: "t3code",
     linuxApplicationsDir: "/home/alice/.local/share/applications",
     appImagePath: Option.some("/home/alice/Applications/T3-Code.AppImage"),
-    path: { join: (...parts: ReadonlyArray<string>) => parts.join("/") },
+    path,
     ...overrides,
   } as unknown as DesktopEnvironment.DesktopEnvironment["Service"]);
 
-const mockProcess = (exitCode: number) =>
+const mockProcess = (exitCode: number, stalled = false) =>
   ChildProcessSpawner.makeHandle({
     pid: ChildProcessSpawner.ProcessId(1),
-    exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(exitCode)),
+    exitCode: stalled ? Effect.never : Effect.succeed(ChildProcessSpawner.ExitCode(exitCode)),
     isRunning: Effect.succeed(false),
     kill: () => Effect.void,
     unref: Effect.succeed(Effect.void),
@@ -50,16 +56,41 @@ const makeHandlerLayer = (
   recorded: RecordedRegistration,
   input: {
     readonly environment?: Record<string, unknown>;
+    readonly updateDesktopDatabaseExitCode?: number;
+    readonly updateDesktopDatabaseStalled?: boolean;
+    readonly updateDesktopDatabaseStarted?: Deferred.Deferred<void>;
     readonly xdgMimeExitCode?: number;
     readonly writeError?: PlatformError.PlatformError;
     readonly existingEntry?: string;
+    readonly iconSource?: string;
+    readonly iconCopyError?: PlatformError.PlatformError;
   } = {},
 ) =>
   DesktopLinuxUrlHandler.layer.pipe(
     Layer.provide(
       Layer.mergeAll(
-        Layer.succeed(DesktopEnvironment.DesktopEnvironment, makeEnvironment(input.environment)),
+        Layer.effect(
+          DesktopEnvironment.DesktopEnvironment,
+          Path.Path.pipe(
+            Effect.map((path) => makeEnvironment(path, input.environment)),
+            Effect.provide(Path.layer),
+          ),
+        ),
+        Layer.succeed(DesktopAssets.DesktopAssets, {
+          iconPaths: Effect.succeed({
+            png: Option.fromUndefinedOr(input.iconSource),
+            ico: Option.none(),
+            icns: Option.none(),
+          }),
+          resolveResourcePath: () => Effect.succeedNone,
+        }),
         FileSystem.layerNoop({
+          copyFile: (source, destination) =>
+            input.iconCopyError
+              ? Effect.fail(input.iconCopyError)
+              : Effect.sync(() => {
+                  recorded.copies.push({ source, destination });
+                }),
           readFileString: () => Effect.succeed(input.existingEntry ?? ""),
           makeDirectory: (path) =>
             Effect.sync(() => {
@@ -79,11 +110,31 @@ const makeHandlerLayer = (
               readonly command: string;
               readonly args: ReadonlyArray<string>;
             };
+            if (childProcess.command === "update-desktop-database") {
+              assert.isTrue(
+                recorded.files.length > 0 || input.existingEntry !== undefined,
+                "the desktop entry must exist before refreshing the MIME cache",
+              );
+            }
             recorded.commands.push({
               command: childProcess.command,
               args: childProcess.args,
             });
-            return Effect.succeed(mockProcess(input.xdgMimeExitCode ?? 0));
+            const exitCode =
+              childProcess.command === "update-desktop-database"
+                ? (input.updateDesktopDatabaseExitCode ?? 0)
+                : (input.xdgMimeExitCode ?? 0);
+            const handle = mockProcess(
+              exitCode,
+              childProcess.command === "update-desktop-database" &&
+                input.updateDesktopDatabaseStalled === true,
+            );
+            return childProcess.command === "update-desktop-database" &&
+              input.updateDesktopDatabaseStarted
+              ? Deferred.succeed(input.updateDesktopDatabaseStarted, undefined).pipe(
+                  Effect.as(handle),
+                )
+              : Effect.succeed(handle);
           }),
         ),
       ),
@@ -103,6 +154,7 @@ const emptyRecording = (): RecordedRegistration => ({
   directories: [],
   files: [],
   commands: [],
+  copies: [],
 });
 
 describe("DesktopLinuxUrlHandler", () => {
@@ -111,6 +163,7 @@ describe("DesktopLinuxUrlHandler", () => {
       displayName: "T3 Code (Nightly)",
       execTarget: '/home/al ice/Apps/T3 "100%" $HOME\\x.AppImage',
       scheme: "t3code",
+      iconPath: "/home/al ice/icons/T3\\x.png",
     });
 
     assert.include(entry, "[Desktop Entry]");
@@ -125,6 +178,7 @@ describe("DesktopLinuxUrlHandler", () => {
     assert.include(entry, "NoDisplay=true");
     assert.notInclude(entry, "StartupWMClass=");
     assert.include(entry, "MimeType=x-scheme-handler/t3code;");
+    assert.include(entry, "Icon=/home/al ice/icons/T3\\\\x.png");
   });
 
   it("carries structured context on registration errors", () => {
@@ -154,31 +208,38 @@ describe("DesktopLinuxUrlHandler", () => {
     );
   });
 
-  it.effect("writes the handler entry and claims the scheme default via xdg-mime", () => {
-    const recorded = emptyRecording();
+  it.effect(
+    "writes the handler entry, refreshes the MIME cache, and claims the scheme default",
+    () => {
+      const recorded = emptyRecording();
 
-    return Effect.gen(function* () {
-      yield* runRegister(recorded);
+      return Effect.gen(function* () {
+        yield* runRegister(recorded);
 
-      assert.deepEqual(recorded.directories, ["/home/alice/.local/share/applications"]);
-      assert.equal(recorded.files.length, 1);
-      assert.equal(
-        recorded.files[0]?.path,
-        "/home/alice/.local/share/applications/com.t3tools.T3Code.desktop",
-      );
-      assert.include(
-        recorded.files[0]?.content,
-        'Exec="/home/alice/Applications/T3-Code.AppImage" %U',
-      );
-      assert.include(recorded.files[0]?.content, "MimeType=x-scheme-handler/t3code;");
-      assert.deepEqual(recorded.commands, [
-        {
-          command: "xdg-mime",
-          args: ["default", "com.t3tools.T3Code.desktop", "x-scheme-handler/t3code"],
-        },
-      ]);
-    });
-  });
+        assert.deepEqual(recorded.directories, ["/home/alice/.local/share/applications"]);
+        assert.equal(recorded.files.length, 1);
+        assert.equal(
+          recorded.files[0]?.path,
+          "/home/alice/.local/share/applications/com.t3tools.T3Code.desktop",
+        );
+        assert.include(
+          recorded.files[0]?.content,
+          'Exec="/home/alice/Applications/T3-Code.AppImage" %U',
+        );
+        assert.include(recorded.files[0]?.content, "MimeType=x-scheme-handler/t3code;");
+        assert.deepEqual(recorded.commands, [
+          {
+            command: "update-desktop-database",
+            args: ["/home/alice/.local/share/applications"],
+          },
+          {
+            command: "xdg-mime",
+            args: ["default", "com.t3tools.T3Code.desktop", "x-scheme-handler/t3code"],
+          },
+        ]);
+      });
+    },
+  );
 
   it.effect("falls back to the process executable outside an AppImage", () => {
     const recorded = emptyRecording();
@@ -202,12 +263,63 @@ describe("DesktopLinuxUrlHandler", () => {
           displayName: "T3 Code (Alpha)",
           execTarget: "/home/alice/Applications/T3-Code.AppImage",
           scheme: "t3code",
+          iconPath: "/home/alice/.local/share/icons/com.t3tools.T3Code.desktop.png",
         }),
       });
 
       assert.deepEqual(recorded.files, []);
       assert.deepEqual(recorded.directories, []);
-      assert.equal(recorded.commands.length, 1);
+      assert.deepEqual(recorded.commands, [
+        {
+          command: "update-desktop-database",
+          args: ["/home/alice/.local/share/applications"],
+        },
+        {
+          command: "xdg-mime",
+          args: ["default", "com.t3tools.T3Code.desktop", "x-scheme-handler/t3code"],
+        },
+      ]);
+    });
+  });
+
+  it.effect("installs a persistent icon even when the desktop entry is already current", () => {
+    const recorded = emptyRecording();
+    const iconPath = "/home/alice/.local/share/icons/com.t3tools.T3Code.desktop.png";
+    return Effect.gen(function* () {
+      yield* runRegister(recorded, {
+        iconSource: "/tmp/.mount_T3/resources/icon.png",
+        existingEntry: DesktopLinuxUrlHandler.renderUrlHandlerDesktopEntry({
+          displayName: "T3 Code (Alpha)",
+          execTarget: "/home/alice/Applications/T3-Code.AppImage",
+          scheme: "t3code",
+          iconPath,
+        }),
+      });
+      assert.deepEqual(recorded.files, []);
+      assert.deepEqual(recorded.copies, [
+        { source: "/tmp/.mount_T3/resources/icon.png", destination: iconPath },
+      ]);
+      assert.equal(recorded.commands.at(-1)?.command, "xdg-mime");
+    });
+  });
+
+  it.effect("still registers the handler when copying its icon fails", () => {
+    const recorded = emptyRecording();
+    return Effect.gen(function* () {
+      yield* runRegister(recorded, {
+        iconSource: "/tmp/.mount_T3/resources/icon.png",
+        iconCopyError: PlatformError.systemError({
+          _tag: "PermissionDenied",
+          module: "FileSystem",
+          method: "copyFile",
+          description: "read-only icon directory",
+        }),
+      });
+      assert.equal(recorded.files.length, 1);
+      assert.deepEqual(
+        recorded.commands.map(({ command }) => command),
+        ["update-desktop-database", "xdg-mime"],
+      );
     });
   });
 
@@ -234,10 +346,12 @@ describe("DesktopLinuxUrlHandler", () => {
   });
 
   it.effect("never fails startup when registration cannot complete", () => {
+    const desktopDatabaseFailed = emptyRecording();
     const xdgMimeFailed = emptyRecording();
     const writeFailed = emptyRecording();
 
     return Effect.gen(function* () {
+      yield* runRegister(desktopDatabaseFailed, { updateDesktopDatabaseExitCode: 1 });
       yield* runRegister(xdgMimeFailed, { xdgMimeExitCode: 1 });
       yield* runRegister(writeFailed, {
         writeError: PlatformError.systemError({
@@ -249,8 +363,32 @@ describe("DesktopLinuxUrlHandler", () => {
         }),
       });
 
+      assert.deepEqual(
+        desktopDatabaseFailed.commands.map(({ command }) => command),
+        ["update-desktop-database", "xdg-mime"],
+      );
       assert.equal(xdgMimeFailed.files.length, 1);
       assert.deepEqual(writeFailed.commands, []);
     });
   });
+
+  it.effect("continues to xdg-mime when the desktop MIME cache refresh stalls", () =>
+    Effect.gen(function* () {
+      const recorded = emptyRecording();
+      const started = yield* Deferred.make<void>();
+      const registration = yield* runRegister(recorded, {
+        updateDesktopDatabaseStalled: true,
+        updateDesktopDatabaseStarted: started,
+      }).pipe(Effect.forkChild);
+
+      yield* Deferred.await(started);
+      yield* TestClock.adjust("5 seconds");
+      yield* Fiber.join(registration);
+
+      assert.deepEqual(
+        recorded.commands.map(({ command }) => command),
+        ["update-desktop-database", "xdg-mime"],
+      );
+    }),
+  );
 });
diff --git a/apps/desktop/src/app/DesktopLinuxUrlHandler.ts b/apps/desktop/src/app/DesktopLinuxUrlHandler.ts
index 404aff34c6bf..f01e81d890bc 100644
--- a/apps/desktop/src/app/DesktopLinuxUrlHandler.ts
+++ b/apps/desktop/src/app/DesktopLinuxUrlHandler.ts
@@ -8,6 +8,7 @@ import * as ChildProcess from "effect/unstable/process/ChildProcess";
 import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 
 import * as ElectronProtocol from "../electron/ElectronProtocol.ts";
+import * as DesktopAssets from "./DesktopAssets.ts";
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
 import { makeComponentLogger } from "./DesktopObservability.ts";
 
@@ -17,9 +18,9 @@ import { makeComponentLogger } from "./DesktopObservability.ts";
 // Electron's app.setAsDefaultProtocolClient resolves the desktop id from
 // setDesktopName, which cannot match those files — so the browser keeps
 // prompting "Choose an application" for every OAuth callback. Instead, write
-// our own handler entry pointing at the current AppImage and claim the
-// scheme default via xdg-mime, exactly what the file manager's "set as
-// default" checkbox would record in mimeapps.list.
+// our own handler entry pointing at the current AppImage, refresh the desktop
+// MIME cache so desktop environments recognize that entry as a handler, and
+// use xdg-mime to record it as the scheme default in mimeapps.list.
 const { logInfo, logWarning } = makeComponentLogger("desktop-linux-url-handler");
 
 export class DesktopLinuxUrlHandlerRegistrationError extends Schema.TaggedError<DesktopLinuxUrlHandlerRegistrationError>()(
@@ -40,6 +41,23 @@ export class DesktopLinuxUrlHandlerRegistrationError extends Schema.TaggedError<
 
 const isRegistrationError = Schema.is(DesktopLinuxUrlHandlerRegistrationError);
 
+export class DesktopLinuxUrlHandlerCacheRefreshError extends Schema.TaggedError<DesktopLinuxUrlHandlerCacheRefreshError>()(
+  "DesktopLinuxUrlHandlerCacheRefreshError",
+  {
+    applicationsDir: Schema.String,
+    exitCode: Schema.optionalKey(Schema.Number),
+    cause: Schema.optionalKey(Schema.Defect()),
+  },
+) {
+  override get message(): string {
+    const exitCode =
+      this.exitCode === undefined ? "" : `, update-desktop-database exit code ${this.exitCode}`;
+    return `Failed to refresh the desktop MIME cache at ${this.applicationsDir}${exitCode}.`;
+  }
+}
+
+const isCacheRefreshError = Schema.is(DesktopLinuxUrlHandlerCacheRefreshError);
+
 const escapeDesktopEntryString = (value: string): string =>
   value
     .replaceAll("\\", "\\\\")
@@ -63,18 +81,20 @@ export function escapeDesktopEntryExecArgument(value: string): string {
   return escapeDesktopEntryString(`"${quoted}"`);
 }
 
-// The AppImage integration entry owns the window identity and icon. This
+// The AppImage integration entry owns the window identity. This
 // hidden URL-only entry must not compete with it for StartupWMClass matching.
 export function renderUrlHandlerDesktopEntry(input: {
   readonly displayName: string;
   readonly execTarget: string;
   readonly scheme: string;
+  readonly iconPath?: string;
 }): string {
   return [
     "[Desktop Entry]",
     "Type=Application",
     `Name=${escapeDesktopEntryString(input.displayName)}`,
     `Exec=${escapeDesktopEntryExecArgument(input.execTarget)} %U`,
+    ...(input.iconPath === undefined ? [] : [`Icon=${escapeDesktopEntryString(input.iconPath)}`]),
     "Terminal=false",
     "NoDisplay=true",
     "StartupNotify=false",
@@ -95,12 +115,15 @@ export const make = Effect.gen(function* () {
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
   const fileSystem = yield* FileSystem.FileSystem;
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const assets = yield* DesktopAssets.DesktopAssets;
 
   const scheme = ElectronProtocol.getDesktopScheme(environment.isDevelopment);
   const desktopEntryPath = environment.path.join(
     environment.linuxApplicationsDir,
     environment.linuxDesktopEntryName,
   );
+  const iconsDir = environment.path.join(environment.linuxApplicationsDir, "..", "icons");
+  const iconPath = environment.path.join(iconsDir, `${environment.linuxDesktopEntryName}.png`);
 
   const writeDesktopEntry = Effect.gen(function* () {
     // Inside the mounted AppImage, process.execPath points at a transient
@@ -110,6 +133,7 @@ export const make = Effect.gen(function* () {
       displayName: environment.displayName,
       execTarget,
       scheme,
+      ...(environment.isPackaged ? { iconPath } : {}),
     });
     // Pre-ready setup normally wrote this already. Avoid truncating a valid
     // entry while the portal may be reading it during startup.
@@ -131,6 +155,37 @@ export const make = Effect.gen(function* () {
     ),
   );
 
+  const updateDesktopDatabase = Effect.scoped(
+    Effect.gen(function* () {
+      const command = ChildProcess.make(
+        "update-desktop-database",
+        [environment.linuxApplicationsDir],
+        {
+          stdin: "ignore",
+          stdout: "ignore",
+          stderr: "ignore",
+        },
+      );
+      const handle = yield* spawner.spawn(command);
+      const exitCode = yield* handle.exitCode.pipe(Effect.timeout("5 seconds"));
+      if (exitCode !== 0) {
+        return yield* new DesktopLinuxUrlHandlerCacheRefreshError({
+          applicationsDir: environment.linuxApplicationsDir,
+          exitCode,
+        });
+      }
+    }),
+  ).pipe(
+    Effect.mapError((error) =>
+      isCacheRefreshError(error)
+        ? error
+        : new DesktopLinuxUrlHandlerCacheRefreshError({
+            applicationsDir: environment.linuxApplicationsDir,
+            cause: error,
+          }),
+    ),
+  );
+
   const setDefaultHandler = Effect.scoped(
     Effect.gen(function* () {
       const command = ChildProcess.make(
@@ -170,6 +225,33 @@ export const make = Effect.gen(function* () {
     }
     yield* writeDesktopEntry;
     if (!environment.isPackaged) return;
+
+    yield* Effect.gen(function* () {
+      const { png } = yield* assets.iconPaths;
+      if (Option.isNone(png)) return;
+      // The AppImage mount is temporary; the chooser needs the icon after exit.
+      yield* fileSystem.makeDirectory(iconsDir, { recursive: true });
+      yield* fileSystem.copyFile(png.value, iconPath);
+    }).pipe(
+      Effect.catch((error) =>
+        logWarning("URL handler icon copy failed", { iconPath, category: error.reason._tag }),
+      ),
+    );
+
+    yield* updateDesktopDatabase.pipe(
+      // Some MIME implementations, including GIO, use mimeinfo.cache to verify
+      // that a desktop entry is associated with a scheme. Cache refresh is
+      // independently best-effort so a missing update-desktop-database executable
+      // does not prevent xdg-mime from recording the requested default.
+      Effect.catch((error) =>
+        logWarning("desktop MIME cache refresh failed", {
+          applicationsDir: environment.linuxApplicationsDir,
+          message: error.message,
+          ...(error.exitCode === undefined ? {} : { exitCode: error.exitCode }),
+        }),
+      ),
+    );
+
     yield* setDefaultHandler;
     yield* logInfo("registered URL scheme handler", { scheme });
   }).pipe(
diff --git a/apps/desktop/src/app/DesktopObservability.test.ts b/apps/desktop/src/app/DesktopObservability.test.ts
index d7ccfc43b185..e23d78aa2161 100644
--- a/apps/desktop/src/app/DesktopObservability.test.ts
+++ b/apps/desktop/src/app/DesktopObservability.test.ts
@@ -1,6 +1,7 @@
 import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
+import * as ConfigProvider from "effect/ConfigProvider";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
@@ -92,6 +93,9 @@ const collectorLayer = (requests: Array<ExportedRequest>) =>
     ),
   );
 
+// A developer's own OTEL_* variables would otherwise pick the endpoints.
+const emptyEnv = ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} }));
+
 const encodeObservabilitySettingsFile = Schema.encodeSync(
   Schema.fromJsonString(
     Schema.Struct({ observability: Schema.Record(Schema.String, Schema.String) }),
@@ -181,7 +185,7 @@ describe("DesktopObservability", () => {
       assert.isFalse(yield* fileSystem.exists(logPath));
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici)),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici, emptyEnv)),
     ),
   );
 
@@ -259,7 +263,7 @@ describe("DesktopObservability", () => {
       );
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici)),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici, emptyEnv)),
     ),
   );
 
@@ -299,7 +303,7 @@ describe("DesktopObservability", () => {
       assert.equal(records.at(-1)?.annotations.details, "code=1");
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici)),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici, emptyEnv)),
     ),
   );
 
@@ -343,7 +347,7 @@ describe("DesktopObservability", () => {
       assert.isFalse(text.includes("y"));
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici)),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici, emptyEnv)),
     ),
   );
 
@@ -377,7 +381,7 @@ describe("DesktopObservability", () => {
       assert.equal(lines.length, 258);
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici)),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, NodeHttpClient.layerUndici, emptyEnv)),
     ),
   );
 
@@ -423,7 +427,166 @@ describe("DesktopObservability", () => {
       assert.lengthOf(record?.events ?? [], 0);
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests), emptyEnv)),
+    );
+  });
+
+  it.effect("exports to an OTEL endpoint over Settings, with its own headers and protocol", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir, true, {
+        T3CODE_OTLP_HEADERS: "x-scope=desktop",
+      });
+      yield* writeObservabilitySettings(environmentLayer, {
+        otlpLogsUrl: "https://settings.example.com/v1/logs",
+      });
+
+      yield* Effect.scoped(
+        Effect.logInfo("desktop otel export").pipe(
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.lengthOf(requests, 1);
+      const [request] = requests;
+      assert.strictEqual(request?.url, "https://collector.example.com/v1/logs");
+      assert.strictEqual(request?.headers["x-otel"], "desktop");
+      assert.strictEqual(request?.headers["x-scope"], undefined);
+      assert.strictEqual(request?.headers["content-type"], "application/json");
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        Layer.mergeAll(
+          NodeServices.layer,
+          collectorLayer(requests),
+          ConfigProvider.layer(
+            ConfigProvider.fromEnv({
+              env: {
+                OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector.example.com",
+                OTEL_EXPORTER_OTLP_HEADERS: "x-otel=desktop",
+                OTEL_EXPORTER_OTLP_LOGS_PROTOCOL: "http/json",
+              },
+            }),
+          ),
+        ),
+      ),
+    );
+  });
+
+  it.effect("keeps its service name while OTEL resource attributes add dimensions", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir, true, {
+        T3CODE_OTLP_LOGS_URL: "https://collector.example.com/v1/logs",
+      });
+
+      yield* Effect.scoped(
+        Effect.logInfo("desktop service name").pipe(
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.lengthOf(requests, 1);
+      const body = requests[0]?.body ?? "";
+      assert.include(body, '"stringValue":"t3code-desktop"');
+      assert.include(body, "deployment.environment.name");
+      assert.include(body, '"key":"service.namespace","value":{"stringValue":"t3code"}');
+      assert.notInclude(body, "renamed");
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        Layer.mergeAll(
+          NodeServices.layer,
+          collectorLayer(requests),
+          ConfigProvider.layer(
+            ConfigProvider.fromEnv({
+              env: {
+                OTEL_SERVICE_NAME: "renamed",
+                OTEL_RESOURCE_ATTRIBUTES:
+                  "service.name=renamed,service.namespace=renamed,deployment.environment.name=development",
+              },
+            }),
+          ),
+        ),
+      ),
+    );
+  });
+
+  it.effect("exports nothing to Settings for logs an unusable OTEL endpoint claimed", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir, true, {
+        T3CODE_OTLP_HEADERS: "x-scope=desktop",
+      });
+      yield* writeObservabilitySettings(environmentLayer, {
+        otlpLogsUrl: "https://settings.example.com/v1/logs",
+      });
+
+      yield* Effect.scoped(
+        Effect.logInfo("desktop otel off").pipe(
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.lengthOf(requests, 0);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        Layer.mergeAll(
+          NodeServices.layer,
+          collectorLayer(requests),
+          ConfigProvider.layer(
+            ConfigProvider.fromEnv({
+              env: {
+                OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector.example.com",
+                OTEL_EXPORTER_OTLP_LOGS_PROTOCOL: "grpc",
+              },
+            }),
+          ),
+        ),
+      ),
+    );
+  });
+
+  it.effect("exports kill switch warnings through the configured logger", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir, true, {
+        T3CODE_OTLP_LOGS_URL: "https://collector.example.com/v1/logs",
+      });
+
+      yield* Effect.scoped(
+        Effect.void.pipe(
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.include(requests[0]?.body ?? "", "OTEL_SDK_DISABLED=1 was read as false");
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        Layer.mergeAll(
+          NodeServices.layer,
+          collectorLayer(requests),
+          ConfigProvider.layer(ConfigProvider.fromEnv({ env: { OTEL_SDK_DISABLED: "1" } })),
+        ),
+      ),
     );
   });
 
@@ -464,7 +627,7 @@ describe("DesktopObservability", () => {
       );
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests), emptyEnv)),
     );
   });
 
@@ -488,7 +651,40 @@ describe("DesktopObservability", () => {
       assert.lengthOf(requests, 0);
     }).pipe(
       Effect.scoped,
-      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests))),
+      Effect.provide(Layer.mergeAll(NodeServices.layer, collectorLayer(requests), emptyEnv)),
+    );
+  });
+
+  it.effect("stops every export when the OpenTelemetry SDK is disabled", () => {
+    const requests: Array<ExportedRequest> = [];
+    return Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-observability-test-",
+      });
+      const environmentLayer = makeEnvironmentLayer(baseDir);
+      yield* writeObservabilitySettings(environmentLayer, {
+        otlpTracesUrl: "https://settings.example.com/v1/traces",
+        otlpLogsUrl: "https://settings.example.com/v1/logs",
+      });
+
+      yield* Effect.scoped(
+        Effect.logInfo("desktop log stays local when disabled").pipe(
+          Effect.withSpan("desktop-disabled-test"),
+          Effect.provide(DesktopObservability.layer.pipe(Layer.provideMerge(environmentLayer))),
+        ),
+      );
+
+      assert.lengthOf(requests, 0);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        Layer.mergeAll(
+          NodeServices.layer,
+          collectorLayer(requests),
+          ConfigProvider.layer(ConfigProvider.fromEnv({ env: { OTEL_SDK_DISABLED: "true" } })),
+        ),
+      ),
     );
   });
 });
diff --git a/apps/desktop/src/app/DesktopObservability.ts b/apps/desktop/src/app/DesktopObservability.ts
index 96657215748b..ce8233e56612 100644
--- a/apps/desktop/src/app/DesktopObservability.ts
+++ b/apps/desktop/src/app/DesktopObservability.ts
@@ -3,7 +3,9 @@ import {
   makeLocalFileTracer,
   makeTraceSink,
   otlpSerializationLayer,
+  type SignalExport,
 } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 import {
   parsePersistedServerObservabilitySettings,
   type PersistedServerObservabilitySettings,
@@ -349,16 +351,51 @@ const readPersistedObservabilitySettings: Effect.Effect<
 });
 
 /**
- * Settings is read once for every signal, so the main process cannot
- * resolve traces against one revision of the file and logs against another.
+ * Resolved as the server resolves them, with persisted Settings as the
+ * fallback. Settings is read once for every signal, so the main process
+ * cannot resolve traces against one revision of the file and logs against
+ * another.
  */
 const resolveOtlpEndpoints = Effect.gen(function* () {
+  const otel = yield* OtelEnvironment.load;
+  if (otel.disabled) {
+    return {
+      traces: undefined,
+      metrics: undefined,
+      logs: undefined,
+      warnings: otel.warnings,
+      resourceAttributes: otel.resourceAttributes,
+    };
+  }
+
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
   const persisted = yield* readPersistedObservabilitySettings;
+  const signalExport: SignalExport = {
+    protocol: environment.otlpProtocol,
+    headers: Option.getOrUndefined(environment.otlpHeaders),
+    exportIntervalMs: environment.otlpExportIntervalMs,
+  };
   return {
-    traces: Option.getOrUndefined(environment.otlpTracesUrl) ?? persisted.otlpTracesUrl,
-    metrics: Option.getOrUndefined(environment.otlpMetricsUrl) ?? persisted.otlpMetricsUrl,
-    logs: Option.getOrUndefined(environment.otlpLogsUrl) ?? persisted.otlpLogsUrl,
+    traces: OtelEnvironment.resolveSignalEndpoint(
+      otel,
+      "traces",
+      { url: Option.getOrUndefined(environment.otlpTracesUrl), export: signalExport },
+      persisted.otlpTracesUrl,
+    ),
+    metrics: OtelEnvironment.resolveSignalEndpoint(
+      otel,
+      "metrics",
+      { url: Option.getOrUndefined(environment.otlpMetricsUrl), export: signalExport },
+      persisted.otlpMetricsUrl,
+    ),
+    logs: OtelEnvironment.resolveSignalEndpoint(
+      otel,
+      "logs",
+      { url: Option.getOrUndefined(environment.otlpLogsUrl), export: signalExport },
+      persisted.otlpLogsUrl,
+    ),
+    warnings: otel.warnings,
+    resourceAttributes: otel.resourceAttributes,
   };
 });
 
@@ -588,11 +625,10 @@ const telemetryLayer = Layer.unwrap(
   Effect.gen(function* () {
     const environment = yield* DesktopEnvironment.DesktopEnvironment;
     const endpoints = yield* resolveOtlpEndpoints;
-    const headers = Option.getOrUndefined(environment.otlpHeaders);
-    const serializationLayer = otlpSerializationLayer(environment.otlpProtocol);
     const resource = {
-      serviceName: "desktop",
+      serviceName: "t3code-desktop",
       attributes: {
+        "service.namespace": "t3code",
         "service.runtime": "desktop",
         "service.mode": environment.isDevelopment ? "development" : "packaged",
       },
@@ -615,14 +651,19 @@ const telemetryLayer = Layer.unwrap(
         : [
             Logger.consolePretty(),
             OtlpLogger.make({
-              url: endpoints.logs,
-              exportInterval: `${environment.otlpExportIntervalMs} millis`,
-              headers,
+              url: endpoints.logs.url,
+              exportInterval: `${endpoints.logs.export.exportIntervalMs} millis`,
+              headers: endpoints.logs.export.headers,
               resource,
             }),
           ],
       { mergeWithExisting: false },
-    ).pipe(Layer.provide(OtlpExporter.layerFlusher), Layer.provide(serializationLayer));
+    ).pipe(
+      Layer.provide(OtlpExporter.layerFlusher),
+      Layer.provide(
+        otlpSerializationLayer(endpoints.logs?.export.protocol ?? environment.otlpProtocol),
+      ),
+    );
 
     const tracerLayer = Layer.unwrap(
       Effect.gen(function* () {
@@ -637,11 +678,11 @@ const telemetryLayer = Layer.unwrap(
           endpoints.traces === undefined
             ? undefined
             : yield* OtlpTracer.make({
-                url: endpoints.traces,
-                exportInterval: `${environment.otlpExportIntervalMs} millis`,
-                headers,
+                url: endpoints.traces.url,
+                exportInterval: `${endpoints.traces.export.exportIntervalMs} millis`,
+                headers: endpoints.traces.export.headers,
                 resource,
-              }).pipe(Effect.provide(serializationLayer));
+              }).pipe(Effect.provide(otlpSerializationLayer(endpoints.traces.export.protocol)));
         const tracer = yield* makeLocalFileTracer({
           filePath: tracePath,
           maxBytes: DESKTOP_LOG_FILE_MAX_BYTES,
@@ -665,13 +706,21 @@ const telemetryLayer = Layer.unwrap(
     //   endpoints.metrics === undefined
     //     ? Layer.empty
     //     : OtlpMetrics.layer({
-    //         url: endpoints.metrics,
-    //         exportInterval: `${environment.otlpExportIntervalMs} millis`,
-    //         headers,
+    //         url: endpoints.metrics.url,
+    //         exportInterval: `${endpoints.metrics.export.exportIntervalMs} millis`,
+    //         headers: endpoints.metrics.export.headers,
     //         resource,
-    //       }).pipe(Layer.provide(serializationLayer));
+    //       }).pipe(Layer.provide(otlpSerializationLayer(endpoints.metrics.export.protocol)));
 
-    return Layer.mergeAll(loggerLayer, tracerLayer);
+    // Logged once the loggers above are installed, so the warnings use them.
+    const otelWarningsLayer = Layer.effectDiscard(
+      Effect.forEach(endpoints.warnings, (warning) => Effect.logWarning(warning)),
+    );
+
+    return otelWarningsLayer.pipe(
+      Layer.provideMerge(Layer.mergeAll(loggerLayer, tracerLayer)),
+      Layer.provide(OtelEnvironment.layerResourceAttributes(endpoints.resourceAttributes)),
+    );
   }),
 );
 
diff --git a/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts b/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts
index ef216adbcbec..8d3fd9a18adc 100644
--- a/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts
+++ b/apps/desktop/src/app/DesktopPreReadyPlatform.test.ts
@@ -13,6 +13,7 @@ const {
   setDesktopNameMock,
   mkdirSyncMock,
   writeFileSyncMock,
+  copyFileSyncMock,
 } = vi.hoisted(() => ({
   appendSwitchMock: vi.fn(),
   getSwitchValueMock: vi.fn(),
@@ -21,12 +22,15 @@ const {
   setDesktopNameMock: vi.fn(),
   mkdirSyncMock: vi.fn(),
   writeFileSyncMock: vi.fn(),
+  copyFileSyncMock: vi.fn(),
 }));
 
 vi.mock("electron", () => ({
   app: {
     setDesktopName: setDesktopNameMock,
     getVersion: () => "0.0.37",
+    isPackaged: true,
+    getAppPath: () => "/tmp/.mount_T3/resources/app.asar",
     commandLine: {
       appendSwitch: appendSwitchMock,
       getSwitchValue: getSwitchValueMock,
@@ -42,8 +46,10 @@ vi.mock("node:fs", () => ({
   readFileSync: () => "{}",
   mkdirSync: mkdirSyncMock,
   writeFileSync: writeFileSyncMock,
+  copyFileSync: copyFileSyncMock,
 }));
 
+import { resolveLinuxDesktopEntryName } from "./DesktopEarlyElectronStartup.ts";
 import * as DesktopPreReadyPlatform from "./DesktopPreReadyPlatform.ts";
 
 describe("DesktopPreReadyPlatform", () => {
@@ -55,6 +61,7 @@ describe("DesktopPreReadyPlatform", () => {
     setDesktopNameMock.mockReset();
     mkdirSyncMock.mockReset();
     writeFileSyncMock.mockReset();
+    copyFileSyncMock.mockReset();
   });
 
   it.effect("preserves an explicit Linux password-store switch", () => {
@@ -83,8 +90,13 @@ describe("DesktopPreReadyPlatform", () => {
         vi.stubEnv("XDG_DATA_HOME", "/xdg");
         vi.stubEnv("APPIMAGE", "/Applications/current.AppImage");
         getSwitchValueMock.mockReturnValue("");
+        const expectedIconPath = `/xdg/icons/${resolveLinuxDesktopEntryName(false)}.png`;
         let desktopName = "t3code.desktop";
         let desktopEntry = previousEntry;
+        let iconInstalled = false;
+        copyFileSyncMock.mockImplementation((_source: string, destination: string) => {
+          iconInstalled = destination === expectedIconPath;
+        });
         setDesktopNameMock.mockImplementation((name: string) => {
           desktopName = name;
         });
@@ -94,7 +106,11 @@ describe("DesktopPreReadyPlatform", () => {
 
         return Effect.scoped(
           Effect.gen(function* () {
-            const portalIdentity = Promise.resolve().then(() => ({ desktopName, desktopEntry }));
+            const portalIdentity = Promise.resolve().then(() => ({
+              desktopName,
+              desktopEntry,
+              iconInstalled,
+            }));
             yield* Layer.build(
               DesktopPreReadyPlatform.layer.pipe(
                 Layer.provide(Layer.succeed(HostProcessPlatform, "linux")),
@@ -105,6 +121,8 @@ describe("DesktopPreReadyPlatform", () => {
             assert.include(identity.desktopEntry ?? "", 'Exec="/Applications/current.AppImage" %U');
             assert.include(identity.desktopEntry ?? "", "Name=T3 Turbo");
             assert.include(identity.desktopEntry ?? "", "MimeType=x-scheme-handler/t3code;");
+            assert.include(identity.desktopEntry ?? "", `Icon=${expectedIconPath}`);
+            assert.isTrue(identity.iconInstalled);
           }),
         ).pipe(Effect.ensuring(Effect.sync(() => vi.unstubAllEnvs())));
       },
@@ -123,6 +141,20 @@ describe("DesktopPreReadyPlatform", () => {
     );
   });
 
+  it.effect("still prepares the portal entry when the bundled icon cannot be copied", () => {
+    getSwitchValueMock.mockReturnValue("");
+    copyFileSyncMock.mockImplementation(() => {
+      throw new Error("missing bundled icon");
+    });
+    return Effect.gen(function* () {
+      yield* DesktopPreReadyPlatform.make;
+      const contents = writeFileSyncMock.mock.calls[0]?.[1];
+      assert.include(contents, "MimeType=x-scheme-handler/t3code;");
+      assert.include(contents, "Icon=");
+      assert.equal(setDesktopNameMock.mock.calls.length, 1);
+    }).pipe(Effect.provideService(HostProcessPlatform, "linux"));
+  });
+
   it.effect(
     "acquires a synchronous pre-ready layer before an asynchronous Clerk-shaped layer",
     () =>
diff --git a/apps/desktop/src/app/DesktopPreReadyPlatform.ts b/apps/desktop/src/app/DesktopPreReadyPlatform.ts
index c07334f33bbb..9b73a5d825bf 100644
--- a/apps/desktop/src/app/DesktopPreReadyPlatform.ts
+++ b/apps/desktop/src/app/DesktopPreReadyPlatform.ts
@@ -68,6 +68,28 @@ export const make = Effect.gen(function* () {
           "applications",
         );
         NodeFS.mkdirSync(applicationsDir, { recursive: true });
+        const iconPath = Electron.app.isPackaged
+          ? NodePath.posix.join(
+              applicationsDir,
+              "..",
+              "icons",
+              `${linux.linuxDesktopEntryName}.png`,
+            )
+          : undefined;
+        if (iconPath !== undefined) {
+          try {
+            NodeFS.mkdirSync(NodePath.posix.dirname(iconPath), { recursive: true });
+            NodeFS.copyFileSync(
+              NodePath.posix.join(
+                Electron.app.getAppPath(),
+                "apps/desktop/prod-resources/icon.png",
+              ),
+              iconPath,
+            );
+          } catch {
+            // Icon installation is optional; registration retries after readiness.
+          }
+        }
         NodeFS.writeFileSync(
           NodePath.posix.join(applicationsDir, linux.linuxDesktopEntryName),
           renderUrlHandlerDesktopEntry({
@@ -77,6 +99,7 @@ export const make = Effect.gen(function* () {
             }).displayName,
             execTarget: process.env.APPIMAGE?.trim() || process.execPath,
             scheme: ElectronProtocol.getDesktopScheme(linux.isDevelopment),
+            ...(iconPath === undefined ? {} : { iconPath }),
           }),
           "utf8",
         );
diff --git a/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts b/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts
index 4289ef881eef..2998f6d8f4e8 100644
--- a/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts
@@ -235,6 +235,11 @@ describe("DesktopBackendConfiguration", () => {
         const second = yield* configuration.resolvePrimary;
 
         assert.equal(first.executablePath, process.execPath);
+        assert.deepEqual(first.args.slice(0, 3), [
+          "--require",
+          environment.compileCachePath,
+          environment.backendEntryPath,
+        ]);
         assert.equal(first.entryPath, environment.backendEntryPath);
         assert.equal(first.cwd, environment.backendCwd);
         assert.equal(first.captureOutput, true);
@@ -776,12 +781,11 @@ describe("DesktopBackendConfiguration", () => {
         const config = yield* configuration.resolveWsl({ port: 5050, distro: null });
 
         // No settings.json exists here: the endpoints come from the desktop
-        // process's env, which a WSL child cannot inherit, so the bootstrap
-        // has to carry them or log export stays off inside the distro.
+        // environment, and the bootstrap carries them for a WSL child that
+        // lacks the variables.
         assert.equal(config.bootstrap.otlpTracesUrl, "http://127.0.0.1:4318/v1/traces");
         assert.equal(config.bootstrap.otlpMetricsUrl, "http://127.0.0.1:4318/v1/metrics");
         assert.equal(config.bootstrap.otlpLogsUrl, "http://127.0.0.1:4318/v1/logs");
-        assert.notInclude(config.env.WSLENV ?? "", "T3CODE_OTLP_LOGS_URL");
       }).pipe(
         Effect.provide(
           DesktopBackendConfiguration.layer.pipe(
@@ -928,6 +932,8 @@ describe("DesktopBackendConfiguration", () => {
         const configuration = yield* DesktopBackendConfiguration.DesktopBackendConfiguration;
         const config = yield* configuration.resolvePrimary;
         assert.equal(config.captureOutput, true);
+        // Dev never shares the prod compile cache.
+        assert.notInclude(config.args, "--require");
       }).pipe(
         Effect.provide(
           DesktopBackendConfiguration.layer.pipe(
@@ -947,6 +953,116 @@ describe("DesktopBackendConfiguration", () => {
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
 
+  it.effect("resolveWsl carries the kill switch into the distro", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-desktop-backend-config-test-",
+      });
+
+      const previousWslEnv = process.env.WSLENV;
+      const previousDisabled = process.env.OTEL_SDK_DISABLED;
+      try {
+        delete process.env.WSLENV;
+        process.env.OTEL_SDK_DISABLED = "true";
+
+        yield* Effect.gen(function* () {
+          const configuration = yield* DesktopBackendConfiguration.DesktopBackendConfiguration;
+          const config = yield* configuration.resolveWsl({ port: 5050, distro: null });
+
+          assert.equal(config.env.OTEL_SDK_DISABLED, "true");
+          assert.include((config.env.WSLENV ?? "").split(":"), "OTEL_SDK_DISABLED");
+        }).pipe(
+          Effect.provide(
+            DesktopBackendConfiguration.layer.pipe(
+              Layer.provideMerge(serverExposureLayer),
+              Layer.provideMerge(DesktopAppSettings.layerTest()),
+              Layer.provideMerge(DesktopWslServerTree.layerTest()),
+              Layer.provideMerge(
+                DesktopWslEnvironment.layerTest({
+                  isAvailable: true,
+                  windowsToWslPath: () => Option.some("/mnt/c/repo/apps/server/src/index.ts"),
+                  getDistroIp: () => Option.some("172.27.0.99"),
+                }),
+              ),
+              Layer.provideMerge(makeEnvironmentLayer(baseDir, { platform: "win32" })),
+            ),
+          ),
+        );
+      } finally {
+        restoreEnv("WSLENV", previousWslEnv);
+        restoreEnv("OTEL_SDK_DISABLED", previousDisabled);
+      }
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect(
+    "resolveWsl carries the standard OTLP endpoint, headers, and protocol into the distro",
+    () =>
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const baseDir = yield* fileSystem.makeTempDirectoryScoped({
+          prefix: "t3-desktop-backend-config-test-",
+        });
+
+        const standard = {
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector.example.com:4318/base?api_key=secret",
+          OTEL_EXPORTER_OTLP_LOGS_HEADERS: "authorization=Bearer%20token",
+          T3CODE_OTLP_TRACES_URL: "http://t3.example.com:4318/v1/traces",
+        };
+        const previousWslEnv = process.env.WSLENV;
+        // A developer's own OTLP variables would be forwarded too.
+        const ambientOtel = Object.entries(process.env).filter(
+          ([name]) => name.startsWith("OTEL_") || name.startsWith("T3CODE_OTLP_"),
+        );
+        try {
+          for (const [name] of ambientOtel) delete process.env[name];
+          delete process.env.WSLENV;
+          Object.assign(process.env, standard);
+
+          yield* Effect.gen(function* () {
+            const configuration = yield* DesktopBackendConfiguration.DesktopBackendConfiguration;
+            const config = yield* configuration.resolveWsl({ port: 5050, distro: null });
+
+            assert.equal(
+              config.env.OTEL_EXPORTER_OTLP_ENDPOINT,
+              "https://collector.example.com:4318/base?api_key=secret",
+            );
+            assert.equal(
+              config.env.OTEL_EXPORTER_OTLP_LOGS_HEADERS,
+              "authorization=Bearer%20token",
+            );
+            // Without a flag, WSL passes the values through untranslated.
+            const wslEnv = (config.env.WSLENV ?? "").split(":");
+            assert.include(wslEnv, "OTEL_EXPORTER_OTLP_ENDPOINT");
+            assert.include(wslEnv, "OTEL_EXPORTER_OTLP_LOGS_HEADERS");
+            assert.equal(config.env.T3CODE_OTLP_TRACES_URL, "http://t3.example.com:4318/v1/traces");
+            assert.include(wslEnv, "T3CODE_OTLP_TRACES_URL");
+          }).pipe(
+            Effect.provide(
+              DesktopBackendConfiguration.layer.pipe(
+                Layer.provideMerge(serverExposureLayer),
+                Layer.provideMerge(DesktopAppSettings.layerTest()),
+                Layer.provideMerge(DesktopWslServerTree.layerTest()),
+                Layer.provideMerge(
+                  DesktopWslEnvironment.layerTest({
+                    isAvailable: true,
+                    windowsToWslPath: () => Option.some("/mnt/c/repo/apps/server/src/index.ts"),
+                    getDistroIp: () => Option.some("172.27.0.99"),
+                  }),
+                ),
+                Layer.provideMerge(makeEnvironmentLayer(baseDir, { platform: "win32" })),
+              ),
+            ),
+          );
+        } finally {
+          for (const name of Object.keys(standard)) delete process.env[name];
+          restoreEnv("WSLENV", previousWslEnv);
+          for (const [name, value] of ambientOtel) restoreEnv(name, value);
+        }
+      }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
   it.effect("resolveWsl preserves existing WSLENV entries when forwarding backend secrets", () =>
     Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
@@ -959,7 +1075,10 @@ describe("DesktopBackendConfiguration", () => {
       const previousAnthropicKey = process.env.ANTHROPIC_API_KEY;
       const previousOtlpHeaders = process.env.T3CODE_OTLP_HEADERS;
       const previousOtlpProtocol = process.env.T3CODE_OTLP_PROTOCOL;
+      // A developer's own OTEL_* variables would be forwarded too.
+      const ambientOtel = Object.entries(process.env).filter(([name]) => name.startsWith("OTEL_"));
       try {
+        for (const [name] of ambientOtel) delete process.env[name];
         process.env.WSLENV = "GOPATH/p:OPENAI_API_KEY/u:EMPTY::AZURE_DEVOPS_EXT_PAT/u";
         process.env.OPENAI_API_KEY = "openai-key";
         process.env.ANTHROPIC_API_KEY = "anthropic-key";
@@ -1016,6 +1135,7 @@ describe("DesktopBackendConfiguration", () => {
         restoreEnv("ANTHROPIC_API_KEY", previousAnthropicKey);
         restoreEnv("T3CODE_OTLP_HEADERS", previousOtlpHeaders);
         restoreEnv("T3CODE_OTLP_PROTOCOL", previousOtlpProtocol);
+        for (const [name, value] of ambientOtel) restoreEnv(name, value);
       }
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
diff --git a/apps/desktop/src/backend/DesktopBackendConfiguration.ts b/apps/desktop/src/backend/DesktopBackendConfiguration.ts
index d670e91076b3..853c539f9968 100644
--- a/apps/desktop/src/backend/DesktopBackendConfiguration.ts
+++ b/apps/desktop/src/backend/DesktopBackendConfiguration.ts
@@ -90,14 +90,37 @@ const DESKTOP_BACKEND_ENV_NAMES = [
 ] as const;
 
 // Env vars that the WSL backend needs but Windows process.env won't forward
-// across the wsl.exe boundary without WSLENV. The dev-server URL is handled
-// separately via a `--dev-url` CLI flag because WSLENV translation of
-// URL-shaped values (colons / slashes) is unreliable.
+// across the wsl.exe boundary without WSLENV. The dev-server URL travels as
+// the `--dev-url` CLI flag instead.
 const WSL_FORWARDED_ENV_NAMES = [
   "OPENAI_API_KEY",
   "ANTHROPIC_API_KEY",
+  // Otherwise the WSL server keeps exporting to endpoints from the bootstrap.
+  "T3CODE_OTEL_SDK_DISABLED",
+  "OTEL_SDK_DISABLED",
   "T3CODE_OTLP_HEADERS",
   "T3CODE_OTLP_PROTOCOL",
+  // Forwarded without a WSLENV flag, so the values arrive untranslated. The
+  // server prefers an OTEL endpoint over the bootstrap envelope, so the T3 URLs
+  // travel as variables to keep winning inside the distro as they do on Windows.
+  "T3CODE_OTLP_TRACES_URL",
+  "T3CODE_OTLP_METRICS_URL",
+  "T3CODE_OTLP_LOGS_URL",
+  "OTEL_EXPORTER_OTLP_ENDPOINT",
+  "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT",
+  "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT",
+  "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT",
+  "OTEL_EXPORTER_OTLP_HEADERS",
+  "OTEL_EXPORTER_OTLP_TRACES_HEADERS",
+  "OTEL_EXPORTER_OTLP_METRICS_HEADERS",
+  "OTEL_EXPORTER_OTLP_LOGS_HEADERS",
+  "OTEL_EXPORTER_OTLP_PROTOCOL",
+  "OTEL_EXPORTER_OTLP_TRACES_PROTOCOL",
+  "OTEL_EXPORTER_OTLP_METRICS_PROTOCOL",
+  "OTEL_EXPORTER_OTLP_LOGS_PROTOCOL",
+  "OTEL_TRACES_EXPORTER",
+  "OTEL_METRICS_EXPORTER",
+  "OTEL_LOGS_EXPORTER",
 ] as const;
 
 const WSL_SERVER_SYSTEM_PATH = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
@@ -196,11 +219,11 @@ const readPersistedBackendObservabilitySettings = Effect.gen(function* () {
   const fileSystem = yield* FileSystem.FileSystem;
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
   const raw = yield* fileSystem.readFileString(environment.serverSettingsPath).pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catchTags({
       PlatformError: (cause) =>
         cause.reason._tag === "NotFound"
-          ? Effect.succeed(Option.none())
+          ? Effect.succeedNone
           : logBackendObservabilitySettingsReadFailure(environment.serverSettingsPath, cause).pipe(
               Effect.as(Option.none()),
             ),
@@ -218,12 +241,11 @@ const readPersistedBackendObservabilitySettings = Effect.gen(function* () {
   };
 });
 
-// The bootstrap is the only channel that carries an OTLP endpoint to every
-// backend. A Windows-native child inherits the desktop process's env, but a
-// WSL child gets nothing across wsl.exe that WSLENV does not declare, and
-// WSLENV translation of URL-shaped values is unreliable, so the endpoints are
-// deliberately not forwarded that way. Env beats the persisted settings file,
-// matching the precedence resolveServerConfig and DesktopObservability apply.
+// The bootstrap carries the OTLP endpoints to every backend, including a WSL
+// child that lacks the variables. The T3 URLs also travel as variables in
+// WSL_FORWARDED_ENV_NAMES so they outrank a forwarded OTEL endpoint. Env beats
+// the persisted settings file, matching the precedence resolveServerConfig and
+// DesktopObservability apply.
 const readBackendObservabilitySettings = Effect.gen(function* () {
   const environment = yield* DesktopEnvironment.DesktopEnvironment;
   const persisted = yield* readPersistedBackendObservabilitySettings;
@@ -547,7 +569,16 @@ const resolvePrimaryStartConfig = Effect.fn("desktop.backendConfiguration.resolv
 
     return {
       executablePath: process.execPath,
-      args: [environment.backendEntryPath, "--bootstrap-fd", "3"],
+      // Packaged builds only, so a dev instance never shares the cache with the
+      // prod app it is often run from. `--require` rather than NODE_COMPILE_CACHE,
+      // so the setting does not leak into the provider and terminal processes
+      // the backend starts.
+      args: [
+        ...(environment.isPackaged ? ["--require", environment.compileCachePath] : []),
+        environment.backendEntryPath,
+        "--bootstrap-fd",
+        "3",
+      ],
       entryPath: environment.backendEntryPath,
       cwd: environment.backendCwd,
       env: {
@@ -730,10 +761,8 @@ const resolveWslStartConfig = Effect.fn("desktop.backendConfiguration.resolveWsl
   };
 
   // Forward the dev-server URL as an explicit CLI flag so the WSL backend's
-  // config resolution lands in dev/ instead of userdata/. Inheriting through
-  // WSLENV is unreliable in practice (URL-shaped values with colons /
-  // slashes get translated unpredictably depending on flags), and the
-  // packaged build leaves devServerUrl as None anyway.
+  // config resolution lands in dev/ instead of userdata/. The packaged build
+  // leaves devServerUrl as None.
   const devUrlArgs = Option.match(environment.devServerUrl, {
     onNone: () => [] as ReadonlyArray<string>,
     onSome: (url) => ["--dev-url", url.href],
diff --git a/apps/desktop/src/backend/DesktopBackendManager.test.ts b/apps/desktop/src/backend/DesktopBackendManager.test.ts
index df2001f1ac20..901d9f4a2708 100644
--- a/apps/desktop/src/backend/DesktopBackendManager.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendManager.test.ts
@@ -162,7 +162,7 @@ function makeTestInstance(input: MakeInstanceInput) {
       forInstance: () => Effect.succeed(stubLog),
     } satisfies DesktopObservability.DesktopBackendOutputLogFactory["Service"]),
     Layer.succeed(DesktopTelemetryPublisher.DesktopTelemetryPublisher, {
-      latest: Effect.succeed(Option.none()),
+      latest: Effect.succeedNone,
       changes: Stream.empty,
       encoded: input.desktopTelemetryStream ?? Stream.empty,
       handleControlForSource: () => Effect.void,
@@ -1545,7 +1545,7 @@ describe("DesktopBackendManager", () => {
 
         const mockPool = Layer.succeed(DesktopBackendPool.DesktopBackendPool, {
           list: Effect.succeed([instance1, instance2]),
-          get: () => Effect.succeed(Option.none()),
+          get: () => Effect.succeedNone,
           primary: Effect.die(new Error("primary not implemented")),
           register: () => Effect.die(new Error("register not implemented")),
           unregister: () => Effect.die(new Error("unregister not implemented")),
diff --git a/apps/desktop/src/backend/DesktopBackendPool.test.ts b/apps/desktop/src/backend/DesktopBackendPool.test.ts
index 7859223161b7..8373437ae312 100644
--- a/apps/desktop/src/backend/DesktopBackendPool.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendPool.test.ts
@@ -67,7 +67,7 @@ function makePoolLayer(
             } satisfies DesktopObservability.DesktopBackendOutputLogShape),
         } satisfies DesktopObservability.DesktopBackendOutputLogFactory["Service"]),
         Layer.succeed(DesktopTelemetryPublisher.DesktopTelemetryPublisher, {
-          latest: Effect.succeed(Option.none()),
+          latest: Effect.succeedNone,
           changes: Stream.empty,
           encoded: Stream.empty,
           handleControlForSource: () => Effect.void,
@@ -135,9 +135,7 @@ describe("DesktopBackendPool", () => {
 
   it.effect("layerTest dies when no instances are supplied", () =>
     Effect.exit(
-      Effect.gen(function* () {
-        yield* DesktopBackendPool.DesktopBackendPool;
-      }).pipe(Effect.provide(DesktopBackendPool.layerTest([]))),
+      DesktopBackendPool.DesktopBackendPool.pipe(Effect.provide(DesktopBackendPool.layerTest([]))),
     ).pipe(Effect.map((exit) => assert.equal(exit._tag, "Failure"))),
   );
 
diff --git a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts
index e7a58baef140..ed71bd332d24 100644
--- a/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts
+++ b/apps/desktop/src/backend/DesktopLocalEnvironmentAuth.test.ts
@@ -1,7 +1,6 @@
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as Ref from "effect/Ref";
 import * as HttpClient from "effect/unstable/http/HttpClient";
 import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
@@ -60,7 +59,7 @@ describe("DesktopLocalEnvironmentAuth", () => {
           {
             id: PRIMARY_LOCAL_ENVIRONMENT_ID,
             label: Effect.succeed("Windows"),
-            currentConfig: Effect.succeed(Option.some(config)),
+            currentConfig: Effect.succeedSome(config),
           },
         ]),
       } as unknown as DesktopBackendPool.DesktopBackendPool["Service"]);
diff --git a/apps/desktop/src/boot.ts b/apps/desktop/src/boot.ts
new file mode 100644
index 000000000000..c9eb35b24e5f
--- /dev/null
+++ b/apps/desktop/src/boot.ts
@@ -0,0 +1,4 @@
+// Packaged app entry. Enables the compile cache before the main bundle loads,
+// so the cache also covers main.cjs itself.
+require("./compileCache.cjs");
+require("./main.cjs");
diff --git a/apps/desktop/src/compileCache.ts b/apps/desktop/src/compileCache.ts
new file mode 100644
index 000000000000..20f942db7db9
--- /dev/null
+++ b/apps/desktop/src/compileCache.ts
@@ -0,0 +1,28 @@
+// @effect-diagnostics nodeBuiltinImport:off
+// Runs before any Effect runtime exists, so it stays on Node built-ins.
+import * as NodeModule from "node:module";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+
+// Turns on Node's on-disk V8 code cache for every module loaded after this one,
+// so later launches skip recompiling the large main and server bundles.
+// Packaged builds only: boot.ts loads it for the main process, and the local
+// backend gets it with `--require`. Dev launches main.cjs directly and skips it.
+// Linux uses the user's cache dir because /tmp is shared between users; the
+// macOS and Windows temp dirs are already per user.
+//
+// Skipped under AppImage: it mounts the app at a new /tmp/.mount_* path each
+// launch, and Node keys entries by path, so every launch would miss and leave
+// another copy behind. The backend inherits APPIMAGE, so this covers it too.
+try {
+  if (!process.env.APPIMAGE) {
+    const cacheRoot =
+      // oxlint-disable-next-line t3code/no-global-process-runtime -- Loads before any Effect runtime.
+      process.platform === "linux"
+        ? process.env.XDG_CACHE_HOME || NodePath.join(NodeOS.homedir(), ".cache")
+        : NodeOS.tmpdir();
+    NodeModule.enableCompileCache(NodePath.join(cacheRoot, "t3code", "compile-cache"));
+  }
+} catch {
+  // The cache is only a speedup. Never let it stop the app from starting.
+}
diff --git a/apps/desktop/src/electron/ElectronMenu.ts b/apps/desktop/src/electron/ElectronMenu.ts
index ce9e0fb48979..401e0c27ccd8 100644
--- a/apps/desktop/src/electron/ElectronMenu.ts
+++ b/apps/desktop/src/electron/ElectronMenu.ts
@@ -80,6 +80,7 @@ function normalizeContextMenuItems(source: readonly ContextMenuItem[]): ContextM
       destructive: sourceItem.destructive === true,
       disabled: sourceItem.disabled === true,
       ...(sourceItem.separatorBefore === true ? { separatorBefore: true } : {}),
+      ...(typeof sourceItem.checked === "boolean" ? { checked: sourceItem.checked } : {}),
     };
 
     if (sourceItem.children) {
@@ -168,6 +169,7 @@ export const make = Effect.gen(function* () {
       const itemOption: Electron.MenuItemConstructorOptions = {
         label: item.label,
         enabled: !item.disabled,
+        ...(typeof item.checked === "boolean" ? { type: "checkbox", checked: item.checked } : {}),
       };
       if (item.children && item.children.length > 0) {
         itemOption.submenu = buildTemplate(item.children, complete);
@@ -224,7 +226,7 @@ export const make = Effect.gen(function* () {
       Effect.callback<Option.Option<string>>((resume) => {
         const normalizedItems = normalizeContextMenuItems(input.items);
         if (normalizedItems.length === 0) {
-          resume(Effect.succeed(Option.none()));
+          resume(Effect.succeedNone);
           return;
         }
 
diff --git a/apps/desktop/src/electron/ElectronProtocol.test.ts b/apps/desktop/src/electron/ElectronProtocol.test.ts
index 508a5c296898..0c2cb2bb7d17 100644
--- a/apps/desktop/src/electron/ElectronProtocol.test.ts
+++ b/apps/desktop/src/electron/ElectronProtocol.test.ts
@@ -105,7 +105,7 @@ describe("ElectronProtocol", () => {
           );
           assert.include(
             response.headers.get("content-security-policy") ?? "",
-            "connect-src 'self' http: https: ws: wss:",
+            "connect-src 'self' blob: http: https: ws: wss:",
           );
           assert.include(
             response.headers.get("content-security-policy") ?? "",
@@ -255,7 +255,14 @@ describe("ElectronProtocol", () => {
       "https://clerk.t3.codes",
       "https://challenges.cloudflare.com",
     ]);
-    assert.deepEqual(directives["connect-src"], ["'self'", "http:", "https:", "ws:", "wss:"]);
+    assert.deepEqual(directives["connect-src"], [
+      "'self'",
+      "blob:",
+      "http:",
+      "https:",
+      "ws:",
+      "wss:",
+    ]);
     assert.deepEqual(directives["img-src"], [
       "'self'",
       "t3code:",
diff --git a/apps/desktop/src/electron/ElectronProtocol.ts b/apps/desktop/src/electron/ElectronProtocol.ts
index 96cd462bd156..30feb85043f8 100644
--- a/apps/desktop/src/electron/ElectronProtocol.ts
+++ b/apps/desktop/src/electron/ElectronProtocol.ts
@@ -84,7 +84,8 @@ export function makeDesktopContentSecurityPolicy(input: DesktopProtocolRegistrat
   // the build-configured Clerk, relay, and OTLP endpoints. Those environment
   // origins are not known when this response policy is created, so restrict
   // connections by the network schemes the client supports instead of by host.
-  const connectSources = ["'self'", "http:", "https:", "ws:", "wss:"];
+  // GLTFLoader fetches embedded textures through blob URLs after parsing the model.
+  const connectSources = ["'self'", "blob:", "http:", "https:", "ws:", "wss:"];
 
   return [
     "default-src 'self'",
@@ -125,6 +126,9 @@ function registerDesktopSchemePrivilegesSync(): void {
         supportFetchAPI: true,
         corsEnabled: true,
         stream: true,
+        // Custom schemes skip Chromium's V8 code cache unless they opt in.
+        // Dev stays off: Vite serves changing code at stable URLs.
+        codeCache: true,
       },
     },
     {
diff --git a/apps/desktop/src/ipc/DesktopIpcHandlers.ts b/apps/desktop/src/ipc/DesktopIpcHandlers.ts
index 58ba07f6fd31..45b6b1da41c1 100644
--- a/apps/desktop/src/ipc/DesktopIpcHandlers.ts
+++ b/apps/desktop/src/ipc/DesktopIpcHandlers.ts
@@ -1,5 +1,6 @@
 import * as Effect from "effect/Effect";
 
+import { receiveProviderAuthCallback, cancelProviderAuthCallback } from "./methods/providerAuth.ts";
 import * as DesktopIpc from "./DesktopIpc.ts";
 import { installNotificationBadge } from "./methods/notificationBadge.ts";
 import { getClientSettings, setClientSettings } from "./methods/clientSettings.ts";
@@ -134,6 +135,8 @@ export const installDesktopIpcHandlers = Effect.fn("desktop.ipc.installHandlers"
   yield* ipc.handle(setTheme);
   yield* ipc.handle(showContextMenu);
   yield* ipc.handle(openExternal);
+  yield* ipc.handle(receiveProviderAuthCallback);
+  yield* ipc.handle(cancelProviderAuthCallback);
   yield* ipc.handle(openSystemSettings);
   yield* ipc.handle(checkSystemPermission);
   yield* ipc.handle(pasteAsText);
diff --git a/apps/desktop/src/ipc/channels.ts b/apps/desktop/src/ipc/channels.ts
index d765e24eefbc..e9053c6ff85e 100644
--- a/apps/desktop/src/ipc/channels.ts
+++ b/apps/desktop/src/ipc/channels.ts
@@ -11,6 +11,7 @@ export const MENU_ACTION_CHANNEL = "desktop:menu-action";
 export const PASTE_AS_TEXT_CHANNEL = "desktop:paste-as-text";
 export const SNAP_SHOT_EVENT_CHANNEL = "desktop:snap-shot-event";
 export const QUIT_SHORTCUT_CHANNEL = "desktop:quit-shortcut";
+export const TRACKPAD_SCROLL_END_CHANNEL = "desktop:trackpad-scroll-end";
 export const GET_WINDOW_FULLSCREEN_STATE_CHANNEL = "desktop:get-window-fullscreen-state";
 export const WINDOW_FULLSCREEN_STATE_CHANNEL = "desktop:window-fullscreen-state";
 export const DESKTOP_APP_ACTIVATION_READY_CHANNEL = "desktop:app-activation-ready";
@@ -117,3 +118,6 @@ export const MAC_PERMISSION_HELPER_CHANNEL = "desktop:mac-permission-helper";
 export const CHECK_SYSTEM_PERMISSION_CHANNEL = "desktop:check-system-permission";
 
 export const PREVIEW_RECORDING_INPUT_CHANNEL = "desktop:preview-recording-input";
+
+export const RECEIVE_PROVIDER_AUTH_CALLBACK_CHANNEL = "desktop:receive-provider-auth-callback";
+export const CANCEL_PROVIDER_AUTH_CALLBACK_CHANNEL = "desktop:cancel-provider-auth-callback";
diff --git a/apps/desktop/src/ipc/methods/providerAuth.ts b/apps/desktop/src/ipc/methods/providerAuth.ts
new file mode 100644
index 000000000000..fbde6a409f3f
--- /dev/null
+++ b/apps/desktop/src/ipc/methods/providerAuth.ts
@@ -0,0 +1,49 @@
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as Option from "effect/Option";
+import {
+  receiveCodexAuthCallback,
+  cancelCodexAuthCallback,
+  CodexAuthCallbackError,
+} from "../../app/CodexAuthCallback.ts";
+import * as ElectronShell from "../../electron/ElectronShell.ts";
+import * as ElectronWindow from "../../electron/ElectronWindow.ts";
+import * as DesktopIpc from "../DesktopIpc.ts";
+import * as IpcChannels from "../channels.ts";
+
+const Request = Schema.String.check(Schema.isMaxLength(16_384));
+
+export const receiveProviderAuthCallback = DesktopIpc.makeIpcMethod({
+  channel: IpcChannels.RECEIVE_PROVIDER_AUTH_CALLBACK_CHANNEL,
+  payload: Request,
+  result: Schema.String,
+  handler: Effect.fn("desktop.ipc.providerAuth.receive")(function* (authorizationUrl) {
+    const shell = yield* ElectronShell.ElectronShell;
+    const windows = yield* ElectronWindow.ElectronWindow;
+    const context = yield* Effect.context<ElectronShell.ElectronShell>();
+    const runPromise = Effect.runPromiseWith(context);
+    const callbackUrl = yield* Effect.tryPromise({
+      try: () =>
+        receiveCodexAuthCallback(authorizationUrl, (url) => runPromise(shell.openExternal(url))),
+      catch: () =>
+        new CodexAuthCallbackError({
+          detail:
+            "Could not receive ChatGPT sign-in on this computer. Try again or paste the redirect URL.",
+        }),
+    });
+    const window = yield* windows.currentMainOrFirst;
+    if (Option.isSome(window)) yield* windows.reveal(window.value);
+    return callbackUrl;
+  }),
+});
+
+export const cancelProviderAuthCallback = DesktopIpc.makeIpcMethod({
+  channel: IpcChannels.CANCEL_PROVIDER_AUTH_CALLBACK_CHANNEL,
+  payload: Request,
+  result: Schema.Void,
+  handler: (authorizationUrl) =>
+    Effect.try({
+      try: () => cancelCodexAuthCallback(authorizationUrl),
+      catch: () => new CodexAuthCallbackError({ detail: "Invalid ChatGPT sign-in request." }),
+    }),
+});
diff --git a/apps/desktop/src/ipc/methods/snapShot.test.ts b/apps/desktop/src/ipc/methods/snapShot.test.ts
index 7e20890ef554..138bcbc36d30 100644
--- a/apps/desktop/src/ipc/methods/snapShot.test.ts
+++ b/apps/desktop/src/ipc/methods/snapShot.test.ts
@@ -51,7 +51,7 @@ describe("window capture IPC", () => {
       Effect.provide(
         Layer.mergeAll(
           Layer.succeed(ElectronWindow.ElectronWindow, {
-            main: Effect.succeed(Option.some({ webContents: { id: 7 } })),
+            main: Effect.succeedSome({ webContents: { id: 7 } }),
           } as ElectronWindow.ElectronWindow["Service"]),
           Layer.succeed(DesktopSnapShot.DesktopSnapShot, {
             previewConfig: () =>
@@ -87,7 +87,7 @@ describe("window capture IPC", () => {
       Effect.provide(
         Layer.mergeAll(
           Layer.succeed(ElectronWindow.ElectronWindow, {
-            main: Effect.succeed(Option.some({ webContents: { id: 7 } })),
+            main: Effect.succeedSome({ webContents: { id: 7 } }),
           } as ElectronWindow.ElectronWindow["Service"]),
           Layer.succeed(DesktopSnapShot.DesktopSnapShot, {
             state: Effect.succeed({
@@ -120,7 +120,7 @@ describe("window capture IPC", () => {
       Effect.provide(
         Layer.mergeAll(
           Layer.succeed(ElectronWindow.ElectronWindow, {
-            main: Effect.succeed(Option.some({ webContents: { id: 7 } })),
+            main: Effect.succeedSome({ webContents: { id: 7 } }),
           } as ElectronWindow.ElectronWindow["Service"]),
           Layer.succeed(DesktopSnapShot.DesktopSnapShot, {
             state: Effect.succeed({ linuxBackend: "niri" }),
@@ -156,13 +156,11 @@ describe("window capture IPC", () => {
       Layer.succeed(
         ElectronWindow.ElectronWindow,
         ElectronWindow.ElectronWindow.of({
-          main: Effect.succeed(
-            Option.some({
-              getBounds: () => ({ x: 100, y: 80, width: 1_000, height: 700 }),
-              getContentBounds: () => ({ x: 100, y: 118, width: 1_000, height: 662 }),
-              webContents,
-            }),
-          ),
+          main: Effect.succeedSome({
+            getBounds: () => ({ x: 100, y: 80, width: 1_000, height: 700 }),
+            getContentBounds: () => ({ x: 100, y: 118, width: 1_000, height: 662 }),
+            webContents,
+          }),
         } as ElectronWindow.ElectronWindow["Service"]),
       ),
       Layer.succeed(
@@ -220,7 +218,7 @@ describe("window capture IPC", () => {
       Layer.succeed(
         ElectronWindow.ElectronWindow,
         ElectronWindow.ElectronWindow.of({
-          main: Effect.succeed(Option.some({ webContents })),
+          main: Effect.succeedSome({ webContents }),
         } as ElectronWindow.ElectronWindow["Service"]),
       ),
       Layer.succeed(
@@ -256,7 +254,7 @@ describe("window capture IPC", () => {
       Effect.provideService(
         ElectronWindow.ElectronWindow,
         ElectronWindow.ElectronWindow.of({
-          main: Effect.succeed(Option.some({ webContents: { id: 7 } })),
+          main: Effect.succeedSome({ webContents: { id: 7 } }),
         } as ElectronWindow.ElectronWindow["Service"]),
       ),
       Effect.provideService(DesktopSnapShot.DesktopSnapShot, null as never),
@@ -277,7 +275,7 @@ describe("window capture IPC", () => {
       Effect.provide(
         Layer.mergeAll(
           Layer.succeed(ElectronWindow.ElectronWindow, {
-            main: Effect.succeed(Option.some({ webContents: { id: 7 } })),
+            main: Effect.succeedSome({ webContents: { id: 7 } }),
           } as ElectronWindow.ElectronWindow["Service"]),
           Layer.succeed(DesktopSnapShot.DesktopSnapShot, {
             setup: (action: string) =>
@@ -295,7 +293,7 @@ describe("window capture IPC", () => {
       Layer.succeed(
         ElectronWindow.ElectronWindow,
         ElectronWindow.ElectronWindow.of({
-          main: Effect.succeed(Option.some({ webContents: { id: 7 } })),
+          main: Effect.succeedSome({ webContents: { id: 7 } }),
         } as ElectronWindow.ElectronWindow["Service"]),
       ),
       Layer.succeed(
@@ -320,7 +318,7 @@ describe("window capture IPC", () => {
       Layer.succeed(
         ElectronWindow.ElectronWindow,
         ElectronWindow.ElectronWindow.of({
-          main: Effect.succeed(Option.some({ webContents: { id: 7 } })),
+          main: Effect.succeedSome({ webContents: { id: 7 } }),
         } as ElectronWindow.ElectronWindow["Service"]),
       ),
       Layer.succeed(
diff --git a/apps/desktop/src/ipc/methods/sshEnvironment.ts b/apps/desktop/src/ipc/methods/sshEnvironment.ts
index cfb993d35cfa..e9535300104d 100644
--- a/apps/desktop/src/ipc/methods/sshEnvironment.ts
+++ b/apps/desktop/src/ipc/methods/sshEnvironment.ts
@@ -137,13 +137,11 @@ export const ensureSshEnvironment = DesktopIpc.makeIpcMethod({
   }) {
     const sshEnvironment = yield* DesktopSshEnvironment.DesktopSshEnvironment;
     return yield* sshEnvironment.ensureEnvironment(target, options).pipe(
-      Effect.catch((error) =>
-        DesktopSshEnvironment.isDesktopSshPasswordPromptCancellation(error)
-          ? Effect.succeed({
-              type: DesktopSshPasswordPromptCancelledType,
-              message: error.message,
-            })
-          : Effect.fail(error),
+      Effect.catchIf(DesktopSshEnvironment.isDesktopSshPasswordPromptCancellation, (error) =>
+        Effect.succeed({
+          type: DesktopSshPasswordPromptCancelledType,
+          message: error.message,
+        }),
       ),
     );
   }),
diff --git a/apps/desktop/src/ipc/methods/window.test.ts b/apps/desktop/src/ipc/methods/window.test.ts
index 2618aa8eadb2..a46d1316b325 100644
--- a/apps/desktop/src/ipc/methods/window.test.ts
+++ b/apps/desktop/src/ipc/methods/window.test.ts
@@ -61,7 +61,7 @@ const defaultWslInstance: DesktopBackendManager.DesktopBackendInstance = {
   label: Effect.succeed("WSL (default distro)"),
   start: Effect.void,
   stop: () => Effect.void,
-  currentConfig: Effect.succeed(Option.some(readyWslConfig)),
+  currentConfig: Effect.succeedSome(readyWslConfig),
   snapshot: Effect.succeed({
     desiredRunning: true,
     ready: true,
@@ -101,7 +101,7 @@ describe("getLocalEnvironmentBootstraps", () => {
     };
     const retryingInstance: DesktopBackendManager.DesktopBackendInstance = {
       ...defaultWslInstance,
-      currentConfig: Effect.succeed(Option.some(retryingConfig)),
+      currentConfig: Effect.succeedSome(retryingConfig),
       snapshot: Effect.succeed({
         desiredRunning: true,
         ready: false,
@@ -128,16 +128,14 @@ describe("getLocalEnvironmentBootstraps", () => {
   it.effect("omits a bounded transient bootstrap after retries stop", () => {
     const stoppedInstance: DesktopBackendManager.DesktopBackendInstance = {
       ...defaultWslInstance,
-      currentConfig: Effect.succeed(
-        Option.some({
-          ...readyWslConfig,
-          preflightFailure: Option.some({
-            reason: "WSL probe timed out",
-            fatal: false,
-            retryLimit: 12,
-          }),
+      currentConfig: Effect.succeedSome({
+        ...readyWslConfig,
+        preflightFailure: Option.some({
+          reason: "WSL probe timed out",
+          fatal: false,
+          retryLimit: 12,
         }),
-      ),
+      }),
       snapshot: Effect.succeed({
         desiredRunning: false,
         ready: false,
@@ -163,7 +161,7 @@ describe("getWindowFullscreenState", () => {
     }).pipe(
       Effect.provide(
         Layer.mock(ElectronWindow.ElectronWindow)({
-          currentMainOrFirst: Effect.succeed(Option.some(window)),
+          currentMainOrFirst: Effect.succeedSome(window),
         }),
       ),
     );
@@ -206,7 +204,7 @@ describe("pasteAsText", () => {
       }).pipe(
         Effect.provide(
           Layer.mock(ElectronWindow.ElectronWindow)({
-            main: Effect.succeed(Option.some(window)),
+            main: Effect.succeedSome(window),
           }),
         ),
       );
@@ -219,7 +217,7 @@ describe("pickProjectFavicon", () => {
     Layer.mergeAll(
       Layer.mock(ElectronDialog.ElectronDialog)({ pickFiles }),
       Layer.mock(ElectronWindow.ElectronWindow)({
-        focusedMainOrFirst: Effect.succeed(Option.none()),
+        focusedMainOrFirst: Effect.succeedNone,
       }),
       DesktopAppSettings.layerTest(settings),
     );
diff --git a/apps/desktop/src/ipc/methods/wsl.test.ts b/apps/desktop/src/ipc/methods/wsl.test.ts
index bfd1a6e679d9..65137cbbd895 100644
--- a/apps/desktop/src/ipc/methods/wsl.test.ts
+++ b/apps/desktop/src/ipc/methods/wsl.test.ts
@@ -2,7 +2,6 @@ import { DesktopWslStateSchema } from "@t3tools/contracts";
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 
 import * as DesktopEnvironment from "../../app/DesktopEnvironment.ts";
@@ -34,7 +33,7 @@ function makeWslBackendLayer(input: { readonly onReconcile?: Effect.Effect<void>
     DesktopWslBackend.DesktopWslBackend,
     DesktopWslBackend.DesktopWslBackend.of({
       reconcile: input.onReconcile ?? Effect.void,
-      lastPreflightError: Effect.succeed(Option.none()),
+      lastPreflightError: Effect.succeedNone,
     }),
   );
 }
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index 0d626a51955d..35e15e700ff4 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -205,6 +205,7 @@ const desktopApplicationLayer = Layer.mergeAll(
 );
 
 const desktopClerkLayer = DesktopClerk.layer.pipe(
+  Layer.provideMerge(ElectronShell.layer),
   Layer.provideMerge(desktopEnvironmentLayer),
   Layer.provideMerge(NodeServices.layer),
   Layer.provideMerge(ElectronApp.layer),
diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
index 85b3f0f8f52c..1202d7950911 100644
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -79,6 +79,11 @@ contextBridge.exposeInMainWorld("desktopBridge", {
     ipcRenderer.on(IpcChannels.SET_NOTIFICATION_BADGE_CHANNEL, handler);
     return () => ipcRenderer.removeListener(IpcChannels.SET_NOTIFICATION_BADGE_CHANNEL, handler);
   },
+  onTrackpadScrollEnd: (listener) => {
+    const handler = () => listener();
+    ipcRenderer.on(IpcChannels.TRACKPAD_SCROLL_END_CHANNEL, handler);
+    return () => ipcRenderer.removeListener(IpcChannels.TRACKPAD_SCROLL_END_CHANNEL, handler);
+  },
   getSystemLocale: () => {
     const result = ipcRenderer.sendSync(IpcChannels.GET_SYSTEM_LOCALE_CHANNEL);
     return typeof result === "string" ? result : null;
@@ -181,6 +186,10 @@ contextBridge.exposeInMainWorld("desktopBridge", {
       items,
       ...(position === undefined ? {} : { position }),
     }),
+  receiveProviderAuthCallback: (url: string) =>
+    ipcRenderer.invoke(IpcChannels.RECEIVE_PROVIDER_AUTH_CALLBACK_CHANNEL, url),
+  cancelProviderAuthCallback: (url: string) =>
+    ipcRenderer.invoke(IpcChannels.CANCEL_PROVIDER_AUTH_CALLBACK_CHANNEL, url),
   openExternal: (url: string) => ipcRenderer.invoke(IpcChannels.OPEN_EXTERNAL_CHANNEL, url),
   checkSystemPermission: (pane: string) =>
     ipcRenderer.invoke(IpcChannels.CHECK_SYSTEM_PERMISSION_CHANNEL, pane),
diff --git a/apps/desktop/src/preview/BrowserImport/ChromiumKeys.module.test.ts b/apps/desktop/src/preview/BrowserImport/ChromiumKeys.module.test.ts
index cc7aac6cfd30..0420e755d92b 100644
--- a/apps/desktop/src/preview/BrowserImport/ChromiumKeys.module.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/ChromiumKeys.module.test.ts
@@ -7,10 +7,6 @@ vi.mock("@napi-rs/keyring", () => {
   throw new Error("Cannot find native binding");
 });
 
-it("loads browser import code without a keyring native binding", async () => {
-  await expect(import("./ChromiumKeys.ts")).resolves.toBeDefined();
-});
-
 it.effect("reports an unavailable keychain when the macOS binding cannot load", () =>
   Effect.gen(function* () {
     const { ChromiumKeyError, resolveChromiumKeys } = yield* Effect.promise(
diff --git a/apps/desktop/src/preview/BrowserImport/ChromiumKeys.ts b/apps/desktop/src/preview/BrowserImport/ChromiumKeys.ts
index 9310fd1c92f7..9c03523191a3 100644
--- a/apps/desktop/src/preview/BrowserImport/ChromiumKeys.ts
+++ b/apps/desktop/src/preview/BrowserImport/ChromiumKeys.ts
@@ -315,8 +315,9 @@ export const resolveChromiumKeys = Effect.fn("ChromiumKeys.resolveChromiumKeys")
           // v10 remains importable when Secret Service is absent or does not
           // contain a key. An explicit denial/lock/cancel remains a consent
           // failure rather than being silently downgraded.
-          Effect.catch((error) =>
-            error.reason === "needsKeychainApproval" ? Effect.fail(error) : Effect.succeed(error),
+          Effect.catchIf(
+            (error) => error.reason !== "needsKeychainApproval",
+            (error) => Effect.succeed(error),
           ),
         )
       : undefined;
diff --git a/apps/desktop/src/preview/BrowserImport/FirefoxCookies.ts b/apps/desktop/src/preview/BrowserImport/FirefoxCookies.ts
index 96d27129b78a..0db4fc9096ec 100644
--- a/apps/desktop/src/preview/BrowserImport/FirefoxCookies.ts
+++ b/apps/desktop/src/preview/BrowserImport/FirefoxCookies.ts
@@ -114,56 +114,55 @@ const expiryToSeconds = (expiry: number, schemaVersion: number): number | undefi
   return schemaVersion >= FIREFOX_EXPIRY_MILLISECONDS_SCHEMA ? Math.floor(expiry / 1000) : expiry;
 };
 
-export const readFirefoxCookies = Effect.fn("FirefoxCookies.readFirefoxCookies")(function* (
-  cookieDatabasePath: string,
-) {
-  const snapshotPath = yield* snapshotCookieDatabase(cookieDatabasePath).pipe(
-    Effect.mapError((cause) => new FirefoxCookieReadError({ cookieDatabasePath, cause })),
-  );
+export const readFirefoxCookies = Effect.fn("FirefoxCookies.readFirefoxCookies")(
+  function* (cookieDatabasePath: string) {
+    const snapshotPath = yield* snapshotCookieDatabase(cookieDatabasePath);
 
-  const { rows, schemaVersion } = yield* Effect.gen(function* () {
-    const sql = yield* SqlClient.SqlClient;
-    const [versionRow] = yield* decodeUserVersion(yield* sql`pragma user_version`);
-    const schemaVersion = versionRow?.user_version ?? 0;
-    const hasRawSameSite =
-      schemaVersion >= FIREFOX_RAW_SAMESITE_FIRST_SCHEMA &&
-      schemaVersion <= FIREFOX_RAW_SAMESITE_LAST_SCHEMA;
-    // Only the default container. Firefox isolates cookies per container and
-    // per private window via `originAttributes` (`^userContextId=2`,
-    // `^privateBrowsingId=1`); Electron has no equivalent, so importing them
-    // all would collapse several identities onto one host/name/path and hand
-    // the profile an arbitrary container's session.
-    const raw = hasRawSameSite
-      ? yield* sql`
+    const { rows, schemaVersion } = yield* Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      const [versionRow] = yield* decodeUserVersion(yield* sql`pragma user_version`);
+      const schemaVersion = versionRow?.user_version ?? 0;
+      const hasRawSameSite =
+        schemaVersion >= FIREFOX_RAW_SAMESITE_FIRST_SCHEMA &&
+        schemaVersion <= FIREFOX_RAW_SAMESITE_LAST_SCHEMA;
+      // Only the default container. Firefox isolates cookies per container and
+      // per private window via `originAttributes` (`^userContextId=2`,
+      // `^privateBrowsingId=1`); Electron has no equivalent, so importing them
+      // all would collapse several identities onto one host/name/path and hand
+      // the profile an arbitrary container's session.
+      const raw = hasRawSameSite
+        ? yield* sql`
           select host, name, value, path, expiry, isSecure, isHttpOnly, sameSite, rawSameSite
             from moz_cookies
            where originAttributes = ''
         `
-      : yield* sql`
+        : yield* sql`
           select host, name, value, path, expiry, isSecure, isHttpOnly, sameSite,
                  null as rawSameSite
             from moz_cookies
            where originAttributes = ''
         `;
-    return { rows: yield* decodeCookieRows(raw), schemaVersion };
-  }).pipe(
-    Effect.provide(NodeSqliteClient.layer({ filename: snapshotPath, readonly: true })),
-    Effect.mapError((cause) => new FirefoxCookieReadError({ cookieDatabasePath, cause })),
-  );
+      return { rows: yield* decodeCookieRows(raw), schemaVersion };
+    }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: snapshotPath, readonly: true })));
 
-  return rows.map((row) => {
-    const secure = row.isSecure === 1;
-    const scope = cookieScope(row.host, row.path, secure);
-    return {
-      url: scope.url,
-      name: row.name,
-      value: row.value,
-      domain: scope.domain,
-      path: row.path,
-      secure,
-      httpOnly: row.isHttpOnly === 1,
-      expirationDate: expiryToSeconds(row.expiry, schemaVersion),
-      sameSite: sameSiteFromColumn(row.sameSite, row.rawSameSite),
-    } satisfies ImportedCookie;
-  });
-});
+    return rows.map((row) => {
+      const secure = row.isSecure === 1;
+      const scope = cookieScope(row.host, row.path, secure);
+      return {
+        url: scope.url,
+        name: row.name,
+        value: row.value,
+        domain: scope.domain,
+        path: row.path,
+        secure,
+        httpOnly: row.isHttpOnly === 1,
+        expirationDate: expiryToSeconds(row.expiry, schemaVersion),
+        sameSite: sameSiteFromColumn(row.sameSite, row.rawSameSite),
+      } satisfies ImportedCookie;
+    });
+  },
+  (effect, cookieDatabasePath) =>
+    effect.pipe(
+      Effect.mapError((cause) => new FirefoxCookieReadError({ cookieDatabasePath, cause })),
+    ),
+);
diff --git a/apps/desktop/src/preview/BrowserSession.ts b/apps/desktop/src/preview/BrowserSession.ts
index 930c13990d51..664302d7f83b 100644
--- a/apps/desktop/src/preview/BrowserSession.ts
+++ b/apps/desktop/src/preview/BrowserSession.ts
@@ -231,8 +231,9 @@ export const make = Effect.gen(function* BrowserSessionMake() {
     getSession,
     clearCookies: Effect.fn("BrowserSession.clearCookies")(function* (partitions?) {
       const sessions = yield* SynchronizedRef.get(sessionsRef);
-      yield* Effect.all(
-        selectSessions(sessions, partitions).map(([partition, browserSession]) =>
+      yield* Effect.forEach(
+        selectSessions(sessions, partitions),
+        ([partition, browserSession]) =>
           Effect.tryPromise({
             try: () =>
               browserSession.clearStorageData({
@@ -244,14 +245,14 @@ export const make = Effect.gen(function* BrowserSessionMake() {
                 cause,
               }),
           }),
-        ),
         { concurrency: "unbounded", discard: true },
       );
     }),
     clearCache: Effect.fn("BrowserSession.clearCache")(function* (partitions?) {
       const sessions = yield* SynchronizedRef.get(sessionsRef);
-      yield* Effect.all(
-        selectSessions(sessions, partitions).map(([partition, browserSession]) =>
+      yield* Effect.forEach(
+        selectSessions(sessions, partitions),
+        ([partition, browserSession]) =>
           Effect.tryPromise({
             try: () => browserSession.clearCache(),
             catch: (cause) =>
@@ -260,7 +261,6 @@ export const make = Effect.gen(function* BrowserSessionMake() {
                 cause,
               }),
           }),
-        ),
         { concurrency: "unbounded", discard: true },
       );
     }),
diff --git a/apps/desktop/src/preview/Manager.ts b/apps/desktop/src/preview/Manager.ts
index 468c47065315..b97af6f05204 100644
--- a/apps/desktop/src/preview/Manager.ts
+++ b/apps/desktop/src/preview/Manager.ts
@@ -942,14 +942,14 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
     delivery: () => Effect.Effect<void>,
   ) =>
     Effect.suspend(delivery).pipe(
-      Effect.catchCause((cause) =>
-        Cause.hasInterrupts(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("Desktop preview event listener failed.", {
-              eventKind,
-              tabId,
-              cause,
-            }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterrupts(cause),
+        (cause) =>
+          Effect.logWarning("Desktop preview event listener failed.", {
+            eventKind,
+            tabId,
+            cause,
+          }),
       ),
     );
 
@@ -1115,15 +1115,13 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
       }
       return resolvedPath;
     }).pipe(
-      Effect.flatMap((resolvedPath) =>
-        resolvedPath === null
-          ? Effect.fail(
-              new PreviewArtifactPathOutsideDirectoryError({
-                artifactPath,
-                artifactDirectory: resolvedArtifactDirectory,
-              }),
-            )
-          : Effect.succeed(resolvedPath),
+      Effect.filterOrFail(
+        (resolvedPath) => resolvedPath !== null,
+        () =>
+          new PreviewArtifactPathOutsideDirectoryError({
+            artifactPath,
+            artifactDirectory: resolvedArtifactDirectory,
+          }),
       ),
     );
 
@@ -1404,14 +1402,13 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
               wcDebugger.on("message", onMessage);
               wcDebugger.attach("1.3");
             });
-            yield* Effect.all(
-              ["Runtime.enable", "Accessibility.enable", "Network.enable", "Log.enable"].map(
-                (method) =>
-                  attemptPromise(
-                    { operation: `initializeDebugger.${method}`, webContentsId: wc.id },
-                    () => wcDebugger.sendCommand(method),
-                  ),
-              ),
+            yield* Effect.forEach(
+              ["Runtime.enable", "Accessibility.enable", "Network.enable", "Log.enable"],
+              (method) =>
+                attemptPromise(
+                  { operation: `initializeDebugger.${method}`, webContentsId: wc.id },
+                  () => wcDebugger.sendCommand(method),
+                ),
               { concurrency: "unbounded", discard: true },
             );
             return [
@@ -4056,13 +4053,13 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
         receiptKey: JSON.stringify(`__t3NativeKey_${NodeCrypto.randomUUID()}`),
       })),
       ({ frames, receiptKey }) =>
-        Effect.all(
-          frames.map((frame) =>
+        Effect.forEach(
+          frames,
+          (frame) =>
             evaluate(frame, `globalThis[${receiptKey}]?.dispose()`).pipe(
               Effect.timeoutOption(1_000),
               Effect.ignore,
             ),
-          ),
           { concurrency: "unbounded", discard: true },
         ),
     );
diff --git a/apps/desktop/src/settings/DesktopClientSettings.ts b/apps/desktop/src/settings/DesktopClientSettings.ts
index e199f2b2f32e..cd7fea6ca116 100644
--- a/apps/desktop/src/settings/DesktopClientSettings.ts
+++ b/apps/desktop/src/settings/DesktopClientSettings.ts
@@ -75,7 +75,7 @@ const readClientSettings = (
   settingsPath: string,
 ): Effect.Effect<Option.Option<ClientSettings>, DesktopClientSettingsReadError> =>
   fileSystem.readFileString(settingsPath).pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catchTags({
       PlatformError: (cause) =>
         cause.reason._tag === "NotFound"
@@ -98,7 +98,7 @@ const readClientSettings = (
         onNone: () => Effect.succeed(Option.none<ClientSettings>()),
         onSome: (raw) =>
           decodeClientSettingsJson(raw).pipe(
-            Effect.map((settings) => Option.some(settings)),
+            Effect.asSome,
             Effect.catchTags({
               SchemaError: (cause) =>
                 Effect.logWarning("Could not decode desktop client settings.", cause).pipe(
diff --git a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
index dad53815f3a6..b1e467869e8e 100644
--- a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
+++ b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
@@ -94,7 +94,7 @@ function makeSafeStorageLayer(input: {
       }
       return Effect.succeed(decoded.slice("enc:".length));
     },
-    selectedStorageBackend: Effect.succeed(Option.none()),
+    selectedStorageBackend: Effect.succeedNone,
   } satisfies ElectronSafeStorage.ElectronSafeStorage["Service"]);
 }
 
diff --git a/apps/desktop/src/snapShot/DesktopSnapShot.ts b/apps/desktop/src/snapShot/DesktopSnapShot.ts
index d7634f980e25..7ee455756930 100644
--- a/apps/desktop/src/snapShot/DesktopSnapShot.ts
+++ b/apps/desktop/src/snapShot/DesktopSnapShot.ts
@@ -820,7 +820,7 @@ export const make = Effect.gen(function* () {
   };
 
   const emit = (event: DesktopSnapShotEvent) =>
-    desktopWindow.dispatchSnapShotEvent(event).pipe(Effect.catchCause(() => Effect.void));
+    desktopWindow.dispatchSnapShotEvent(event).pipe(Effect.ignoreCause);
   const setFailure = (message: string, captureId?: string) =>
     Ref.update(stateRef, (state) => ({ ...state, message })).pipe(
       Effect.andThen(
@@ -846,10 +846,9 @@ export const make = Effect.gen(function* () {
   const discardCapture = Effect.fn("desktop.snapShot.discardCapture")(function* (id: string) {
     closeLinuxFeedback(id);
     transition.dismiss(id);
-    yield* Effect.all(
-      [`${id}.png`, `${id}.tmp.png`, `${id}.json`, `${id}.json.tmp`].map((name) =>
-        fileSystem.remove(path.join(captureDirectory, name), { force: true }),
-      ),
+    yield* Effect.forEach(
+      [`${id}.png`, `${id}.tmp.png`, `${id}.json`, `${id}.json.tmp`],
+      (name) => fileSystem.remove(path.join(captureDirectory, name), { force: true }),
       { concurrency: "unbounded", discard: true },
     ).pipe(Effect.ignore);
   });
@@ -904,7 +903,7 @@ export const make = Effect.gen(function* () {
       if (snapshot.animationStarted) {
         yield* emit({ type: "started", id: id as DesktopSnapShotId });
       } else {
-        yield* desktopWindow.activate.pipe(Effect.catchCause(() => Effect.void));
+        yield* desktopWindow.activate.pipe(Effect.ignoreCause);
       }
       return { id, capturedAt, ...snapshot };
     }).pipe(Effect.mapError((cause) => captureFailure(cause, id)));
@@ -1511,7 +1510,7 @@ export const make = Effect.gen(function* () {
             null,
           ),
         ),
-        Effect.catch(() => Effect.void),
+        Effect.ignore,
       ),
     ),
     configure,
diff --git a/apps/desktop/src/snapShot/MacModifierPairShortcutProcess.ts b/apps/desktop/src/snapShot/MacModifierPairShortcutProcess.ts
index 1c638f2444de..ad7b2e03c495 100644
--- a/apps/desktop/src/snapShot/MacModifierPairShortcutProcess.ts
+++ b/apps/desktop/src/snapShot/MacModifierPairShortcutProcess.ts
@@ -11,7 +11,11 @@ const MAC_MODIFIER_PAIR_DEVICE_MASKS: Record<SnapShotModifier, readonly [number,
   meta: [0x8, 0x10],
 };
 
+// The CoreGraphics query connects osascript to the window server, which registers it as a
+// foreground app attributed to T3 Code. Go background-only first so it never gets a Dock tile.
 const POLLER_SCRIPT = `
+ObjC.import("AppKit");
+$.NSApplication.sharedApplication.setActivationPolicy($.NSApplicationActivationPolicyProhibited);
 ObjC.import("CoreGraphics");
 ObjC.import("unistd");
 function run(argv) {
diff --git a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts
index aa3b7c0b4d99..27ab73d2e5e2 100644
--- a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts
+++ b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts
@@ -4,7 +4,6 @@ import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as TestClock from "effect/testing/TestClock";
 import type * as Electron from "electron";
 
@@ -92,9 +91,9 @@ function makeElectronWindowLayer(window: ReturnType<typeof makeTestWindow>["wind
     ElectronWindow.ElectronWindow,
     ElectronWindow.ElectronWindow.of({
       create: () => Effect.die("unexpected BrowserWindow creation"),
-      main: Effect.succeed(Option.some(window as Electron.BrowserWindow)),
-      currentMainOrFirst: Effect.succeed(Option.some(window as Electron.BrowserWindow)),
-      focusedMainOrFirst: Effect.succeed(Option.some(window as Electron.BrowserWindow)),
+      main: Effect.succeedSome(window as Electron.BrowserWindow),
+      currentMainOrFirst: Effect.succeedSome(window as Electron.BrowserWindow),
+      focusedMainOrFirst: Effect.succeedSome(window as Electron.BrowserWindow),
       setMain: () => Effect.void,
       clearMain: () => Effect.void,
       prepareReveal: () => Effect.succeed(false),
diff --git a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts
index 18ea0a8380a3..a191a0d586ae 100644
--- a/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts
+++ b/apps/desktop/src/telemetry/DesktopTelemetryPublisher.ts
@@ -289,12 +289,12 @@ export const make = Effect.fn("desktop.telemetryPublisher.make")(function* () {
       yield* Ref.set(latest, Option.some(snapshot));
       yield* PubSub.publish(changes, snapshot);
     }).pipe(
-      Effect.catchCause((cause) =>
-        Cause.hasInterrupts(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("Failed to sample Electron telemetry", {
-              cause: String(cause),
-            }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterrupts(cause),
+        (cause) =>
+          Effect.logWarning("Failed to sample Electron telemetry", {
+            cause: String(cause),
+          }),
       ),
     );
 
@@ -306,6 +306,7 @@ export const make = Effect.fn("desktop.telemetryPublisher.make")(function* () {
         Ref.get(diagnosticsDemandSources).pipe(Effect.map((sources) => sources.size > 0)),
         Ref.get(hostPowerIntervals),
       ]);
+      // @effect-diagnostics-next-line raceFirstWithSleepToTimeout:off - races a trigger queue against the interval; both arms are real outcomes, not a timeout
       const allowSuspendRecovery = yield* Effect.raceFirst(
         Queue.take(sampleTriggers).pipe(Effect.as(false)),
         Effect.sleep(sampleInterval(currentPower, demand, intervals)).pipe(Effect.as(true)),
diff --git a/apps/desktop/src/updates/DesktopUpdates.test.ts b/apps/desktop/src/updates/DesktopUpdates.test.ts
index ea1092bb23be..3664ea171c94 100644
--- a/apps/desktop/src/updates/DesktopUpdates.test.ts
+++ b/apps/desktop/src/updates/DesktopUpdates.test.ts
@@ -1,4 +1,5 @@
 import { assert, describe, it } from "@effect/vitest";
+import { DESKTOP_UPDATE_RESTART_MARKER_FILE } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
 import * as Deferred from "effect/Deferred";
 import * as Duration from "effect/Duration";
@@ -14,6 +15,7 @@ import * as TestClock from "effect/testing/TestClock";
 
 import * as ElectronUpdater from "../electron/ElectronUpdater.ts";
 import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts";
+import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
 import * as DesktopState from "../app/DesktopState.ts";
 import * as DesktopUpdates from "./DesktopUpdates.ts";
 import { flushCallbacks, makeHarness } from "./updatesTestHarness.ts";
@@ -85,6 +87,25 @@ describe("DesktopUpdates", () => {
     }).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
   });
 
+  it.effect("updates Linux .deb installs and leaves other non-AppImage installs off", () =>
+    Effect.gen(function* () {
+      const linuxState = (packageType: string | undefined) =>
+        Effect.scoped(
+          Effect.gen(function* () {
+            const updates = yield* DesktopUpdates.DesktopUpdates;
+            yield* updates.configure;
+            return yield* updates.getState;
+          }),
+        ).pipe(Effect.provide(makeHarness({ platform: "linux", packageType }).layer));
+
+      const deb = yield* linuxState("deb\n");
+      assert.equal(deb.status, "idle");
+
+      const unmarked = yield* linuxState(undefined);
+      assert.equal(unmarked.status, "disabled");
+    }),
+  );
+
   it.effect("subscribe delivers the latest state plus subsequent changes", () => {
     const harness = makeHarness();
 
@@ -560,6 +581,55 @@ describe("DesktopUpdates", () => {
     ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
   });
 
+  it.effect("marks the backend stop for an install as an update restart", () => {
+    let markersAtStop: ReadonlyArray<string> = [];
+    const harness = makeHarness({
+      stopBackend: Effect.sync(() => {
+        markersAtStop = [...harness.updateRestartMarkers];
+      }),
+    });
+
+    return Effect.scoped(
+      Effect.gen(function* () {
+        const environment = yield* DesktopEnvironment.DesktopEnvironment;
+        const updates = yield* DesktopUpdates.DesktopUpdates;
+        yield* updates.configure;
+        harness.emit("update-downloaded", { version: "1.2.4" });
+        yield* flushCallbacks;
+
+        assert.isTrue((yield* updates.install).accepted);
+        assert.deepEqual(markersAtStop, [
+          environment.path.join(environment.baseDir, "runtime", DESKTOP_UPDATE_RESTART_MARKER_FILE),
+        ]);
+      }),
+    ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
+  });
+
+  it.effect("drops the update restart marker when an install is interrupted", () =>
+    Effect.gen(function* () {
+      const stopping = yield* Deferred.make<void>();
+      const harness = makeHarness({
+        stopBackend: Deferred.succeed(stopping, undefined).pipe(Effect.andThen(Effect.never)),
+      });
+
+      yield* Effect.scoped(
+        Effect.gen(function* () {
+          const updates = yield* DesktopUpdates.DesktopUpdates;
+          yield* updates.configure;
+          harness.emit("update-downloaded", { version: "1.2.4" });
+          yield* flushCallbacks;
+
+          const installFiber = yield* updates.install.pipe(Effect.forkScoped);
+          yield* Deferred.await(stopping);
+          assert.equal(harness.updateRestartMarkers.size, 1);
+
+          yield* Fiber.interrupt(installFiber);
+          assert.equal(harness.updateRestartMarkers.size, 0);
+        }),
+      ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
+    }),
+  );
+
   it.effect("keeps windows and restarts backends when quitAndInstall fails", () => {
     const harness = makeHarness({
       quitAndInstall: Effect.fail(
@@ -584,6 +654,8 @@ describe("DesktopUpdates", () => {
         assert.isTrue(result.accepted);
         assert.isFalse(yield* Ref.get(desktopState.quitting));
         assert.deepEqual(harness.installSteps, ["quitAndInstall", "startBackend"]);
+        // The restarted old backend must release its tunnel on a later quit.
+        assert.equal(harness.updateRestartMarkers.size, 0);
       }),
     ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
   });
diff --git a/apps/desktop/src/updates/DesktopUpdates.ts b/apps/desktop/src/updates/DesktopUpdates.ts
index c35b52e8343d..245925a6e731 100644
--- a/apps/desktop/src/updates/DesktopUpdates.ts
+++ b/apps/desktop/src/updates/DesktopUpdates.ts
@@ -1,4 +1,5 @@
 import {
+  DESKTOP_UPDATE_RESTART_MARKER_FILE,
   DesktopUpdateChannelSchema,
   type DesktopRuntimeInfo,
   type DesktopUpdateActionResult,
@@ -249,6 +250,7 @@ function getAutoUpdateDisabledReason(args: {
   isPackaged: boolean;
   platform: NodeJS.Platform;
   appImage?: string | undefined;
+  isDebPackage: boolean;
   disabledByEnv: boolean;
   hasUpdateFeedConfig: boolean;
 }): string | null {
@@ -261,8 +263,8 @@ function getAutoUpdateDisabledReason(args: {
   if (args.disabledByEnv) {
     return "Automatic updates are disabled by the T3CODE_DISABLE_AUTO_UPDATE setting.";
   }
-  if (args.platform === "linux" && !args.appImage) {
-    return "Automatic updates on Linux require running the AppImage build.";
+  if (args.platform === "linux" && !args.appImage && !args.isDebPackage) {
+    return "Automatic updates on Linux require the AppImage or the .deb package.";
   }
   return null;
 }
@@ -331,6 +333,18 @@ export const make = Effect.gen(function* () {
     ),
   );
 
+  // The .deb carries electron-builder's resources/package-type marker.
+  // electron-updater reads the same file and installs updates with dpkg.
+  const isDebPackage =
+    environment.platform === "linux" && environment.isPackaged
+      ? yield* fileSystem
+          .readFileString(environment.path.join(environment.resourcesPath, "package-type"))
+          .pipe(
+            Effect.map((packageType) => packageType.trim() === "deb"),
+            Effect.orElseSucceed(() => false),
+          )
+      : false;
+
   const hasUpdateFeedConfig = Ref.get(appUpdateYmlConfigRef).pipe(
     Effect.map((appUpdateYmlConfig) => Option.isSome(appUpdateYmlConfig) || config.mockUpdates),
   );
@@ -343,6 +357,7 @@ export const make = Effect.gen(function* () {
         isPackaged: environment.isPackaged,
         platform: environment.platform,
         appImage: Option.getOrUndefined(config.appImagePath),
+        isDebPackage,
         disabledByEnv: config.disableAutoUpdate,
         hasUpdateFeedConfig: hasFeedConfig,
       }),
@@ -501,8 +516,35 @@ export const make = Effect.gen(function* () {
     );
   }).pipe(Effect.withSpan("desktop.updates.downloadAvailableUpdate"));
 
+  // Tells the primary backend that the coming stop is an update restart, so it
+  // keeps its managed tunnel for the backend the updated app starts. Best
+  // effort: without the marker the backend only re-provisions its tunnel.
+  const updateRestartMarkerDir = environment.path.join(environment.baseDir, "runtime");
+  const updateRestartMarkerPath = environment.path.join(
+    updateRestartMarkerDir,
+    DESKTOP_UPDATE_RESTART_MARKER_FILE,
+  );
+  const writeUpdateRestartMarker = fileSystem
+    .makeDirectory(updateRestartMarkerDir, { recursive: true })
+    .pipe(
+      Effect.andThen(fileSystem.writeFileString(updateRestartMarkerPath, "")),
+      Effect.catch((error) =>
+        logUpdaterWarning("Could not write the update restart marker.", { errorTag: error._tag }),
+      ),
+    );
+
+  // A failed or interrupted install brings no updated backend, so a later
+  // quit must release the tunnel.
+  const removeUpdateRestartMarker = fileSystem
+    .remove(updateRestartMarkerPath, { force: true })
+    .pipe(Effect.ignore);
+
   const resetInstallAction = Effect.all(
-    [finishUpdateAction("install"), Ref.set(desktopState.quitting, false)],
+    [
+      finishUpdateAction("install"),
+      Ref.set(desktopState.quitting, false),
+      removeUpdateRestartMarker,
+    ],
     { discard: true },
   );
 
@@ -517,6 +559,7 @@ export const make = Effect.gen(function* () {
     if (!ownsRecovery) return;
 
     yield* Ref.set(desktopState.quitting, false);
+    yield* removeUpdateRestartMarker;
     yield* Effect.gen(function* () {
       const instances = yield* pool.list;
       const restartExit = yield* Effect.forEach(instances, (instance) => instance.start, {
@@ -586,6 +629,7 @@ export const make = Effect.gen(function* () {
         yield* Ref.set(desktopState.quitting, true);
 
         return yield* Effect.gen(function* () {
+          yield* writeUpdateRestartMarker;
           // Stop every backend in the pool, not just the primary. With
           // parallel WSL + Windows backends, leaving the WSL instance up
           // means quitAndInstall's app.quit() exits before the pool's
@@ -638,24 +682,25 @@ export const make = Effect.gen(function* () {
       }),
     ).pipe(Effect.withSpan("desktop.updates.installDownloadedUpdate"));
 
-  const installWithExpectedVersion = (expectedVersion?: string) =>
-    Effect.gen(function* () {
-      if (yield* Ref.get(desktopState.quitting)) {
-        return {
-          accepted: false,
-          completed: false,
-          failed: false,
-          state: yield* Ref.get(updateStateRef),
-        };
-      }
-      const result = yield* installDownloadedUpdate(expectedVersion);
+  const installWithExpectedVersion = Effect.fn("desktop.updates.install")(function* (
+    expectedVersion?: string,
+  ) {
+    if (yield* Ref.get(desktopState.quitting)) {
       return {
-        accepted: result.accepted,
-        completed: result.completed,
-        failed: result.failed,
+        accepted: false,
+        completed: false,
+        failed: false,
         state: yield* Ref.get(updateStateRef),
       };
-    }).pipe(Effect.withSpan("desktop.updates.install"));
+    }
+    const result = yield* installDownloadedUpdate(expectedVersion);
+    return {
+      accepted: result.accepted,
+      completed: result.completed,
+      failed: result.failed,
+      state: yield* Ref.get(updateStateRef),
+    };
+  });
 
   const startUpdatePollers: Effect.Effect<void, never, Scope.Scope> = Effect.gen(function* () {
     yield* Effect.sleep(AUTO_UPDATE_STARTUP_DELAY).pipe(
diff --git a/apps/desktop/src/updates/updatesTestHarness.ts b/apps/desktop/src/updates/updatesTestHarness.ts
index fbcbb349f9e7..5455f1602855 100644
--- a/apps/desktop/src/updates/updatesTestHarness.ts
+++ b/apps/desktop/src/updates/updatesTestHarness.ts
@@ -1,6 +1,8 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import type { DesktopUpdateState } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as PlatformError from "effect/PlatformError";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 
@@ -32,6 +34,9 @@ export interface UpdatesHarnessOptions {
   readonly stopBackend?: Effect.Effect<void>;
   readonly startBackend?: Effect.Effect<void>;
   readonly env?: Record<string, string | undefined>;
+  readonly platform?: NodeJS.Platform;
+  /** Contents of the resources/package-type marker a Linux package ships. */
+  readonly packageType?: string | undefined;
 }
 
 export function makeHarness(options: UpdatesHarnessOptions = {}) {
@@ -106,9 +111,9 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
 
   const windowLayer = Layer.succeed(ElectronWindow.ElectronWindow, {
     create: () => Effect.die("unexpected BrowserWindow creation"),
-    main: Effect.succeed(Option.none()),
-    currentMainOrFirst: Effect.succeed(Option.none()),
-    focusedMainOrFirst: Effect.succeed(Option.none()),
+    main: Effect.succeedNone,
+    currentMainOrFirst: Effect.succeedNone,
+    focusedMainOrFirst: Effect.succeedNone,
     setMain: () => Effect.void,
     clearMain: () => Effect.void,
     prepareReveal: () => Effect.succeed(false),
@@ -130,7 +135,7 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
       installSteps.push("startBackend");
     }).pipe(Effect.andThen(options.startBackend ?? Effect.void)),
     stop: () => options.stopBackend ?? Effect.void,
-    currentConfig: Effect.succeed(Option.none()),
+    currentConfig: Effect.succeedNone,
     snapshot: Effect.succeed({
       desiredRunning: false,
       ready: false,
@@ -145,7 +150,7 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
   const environmentLayer = DesktopEnvironment.layer({
     dirname: "/repo/apps/desktop/src",
     homeDirectory: `/tmp/t3-desktop-updates-home-${process.pid}`,
-    platform: "darwin",
+    platform: options.platform ?? "darwin",
     processArch: "x64",
     appVersion: "1.2.3",
     appPath: "/repo",
@@ -203,7 +208,34 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
         } satisfies DesktopAppSettings.DesktopAppSettings["Service"])
       : DesktopAppSettings.layer;
 
+  // Tracks the restart markers installs leave, so installs stay free of real
+  // disk I/O that would outrun the tests' settle loops.
+  const updateRestartMarkers = new Set<string>();
+  const fileSystemLayer = FileSystem.layerNoop({
+    readFileString: (path) =>
+      path === "/missing/resources/package-type" && options.packageType !== undefined
+        ? Effect.succeed(options.packageType)
+        : Effect.fail(
+            PlatformError.systemError({
+              module: "FileSystem",
+              method: "readFileString",
+              _tag: "NotFound",
+              pathOrDescriptor: path,
+            }),
+          ),
+    makeDirectory: () => Effect.void,
+    writeFileString: (path) =>
+      Effect.sync(() => {
+        updateRestartMarkers.add(path);
+      }),
+    remove: (path) =>
+      Effect.sync(() => {
+        updateRestartMarkers.delete(path);
+      }),
+  });
+
   const layer = DesktopUpdates.layer.pipe(
+    Layer.provide(fileSystemLayer),
     Layer.provideMerge(updaterLayer),
     Layer.provideMerge(windowLayer),
     Layer.provideMerge(backendLayer),
@@ -226,8 +258,9 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
     checkCount: () => checkCount,
     quitAndInstalls: () => quitAndInstallCount,
     installSteps,
+    updateRestartMarkers,
     downloadCount: () => downloadCount,
-    feedUrls: () => feedUrls,
+    feedUrls: (): ElectronUpdater.ElectronUpdaterFeedUrl[] => feedUrls,
     fullChangelog: () => fullChangelog,
     listenerCount: () =>
       Array.from(listeners.values()).reduce(
diff --git a/apps/desktop/src/window/DesktopApplicationMenu.test.ts b/apps/desktop/src/window/DesktopApplicationMenu.test.ts
index 3e107d971866..70e879b75075 100644
--- a/apps/desktop/src/window/DesktopApplicationMenu.test.ts
+++ b/apps/desktop/src/window/DesktopApplicationMenu.test.ts
@@ -3,7 +3,6 @@ import { assert, describe, it } from "@effect/vitest";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 
 import type * as Electron from "electron";
 
@@ -51,7 +50,7 @@ const electronAppLayer = Layer.succeed(ElectronApp.ElectronApp, {
 } satisfies ElectronApp.ElectronApp["Service"]);
 
 const electronDialogLayer = Layer.succeed(ElectronDialog.ElectronDialog, {
-  pickFolder: () => Effect.succeed(Option.none()),
+  pickFolder: () => Effect.succeedNone,
   pickFiles: () => Effect.succeed([]),
   showMessageBox: () => Effect.succeed({ response: 0, checkboxChecked: false }),
   showErrorBox: () => Effect.void,
@@ -63,7 +62,7 @@ const desktopUpdatesLayer = Layer.succeed(DesktopUpdates.DesktopUpdates, {
   isInstallActive: Effect.succeed(false),
   subscribe: Effect.die("unexpected subscribe"),
   emitState: Effect.void,
-  disabledReason: Effect.succeed(Option.none()),
+  disabledReason: Effect.succeedNone,
   configure: Effect.void,
   setChannel: () => Effect.die("unexpected setChannel"),
   check: () => Effect.die("unexpected check"),
@@ -98,7 +97,7 @@ const makeElectronMenuLayer = (
     setApplicationMenu: (template) =>
       Deferred.succeed(applicationMenuTemplate, template).pipe(Effect.asVoid),
     popupTemplate: () => Effect.void,
-    showContextMenu: () => Effect.succeed(Option.none()),
+    showContextMenu: () => Effect.succeedNone,
   } satisfies ElectronMenu.ElectronMenu["Service"]);
 
 const configureMenu = (
diff --git a/apps/desktop/src/window/DesktopWindow.test.ts b/apps/desktop/src/window/DesktopWindow.test.ts
index 78834a55690e..5df400b90c44 100644
--- a/apps/desktop/src/window/DesktopWindow.test.ts
+++ b/apps/desktop/src/window/DesktopWindow.test.ts
@@ -49,6 +49,7 @@ import * as ElectronWindow from "../electron/ElectronWindow.ts";
 import {
   MENU_ACTION_CHANNEL,
   SNAP_SHOT_EVENT_CHANNEL,
+  TRACKPAD_SCROLL_END_CHANNEL,
   WINDOW_FULLSCREEN_STATE_CHANNEL,
 } from "../ipc/channels.ts";
 import * as DesktopServerExposure from "../backend/DesktopServerExposure.ts";
@@ -150,7 +151,7 @@ function makeFakeBrowserWindow() {
 }
 
 const desktopClientSettingsLayer = Layer.mock(DesktopClientSettings.DesktopClientSettings)({
-  get: Effect.succeed(Option.none()),
+  get: Effect.succeedNone,
 });
 
 const electronAppLayer = Layer.mock(ElectronApp.ElectronApp)({
@@ -184,7 +185,7 @@ const desktopServerExposureLayer = Layer.succeed(DesktopServerExposure.DesktopSe
 const electronMenuLayer = Layer.succeed(ElectronMenu.ElectronMenu, {
   setApplicationMenu: () => Effect.void,
   popupTemplate: () => Effect.void,
-  showContextMenu: () => Effect.succeed(Option.none()),
+  showContextMenu: () => Effect.succeedNone,
 } satisfies ElectronMenu.ElectronMenu["Service"]);
 
 const electronThemeLayer = Layer.succeed(ElectronTheme.ElectronTheme, {
@@ -293,7 +294,7 @@ function makeTestLayer(input: {
         electronAppLayer,
         Layer.succeed(ElectronMenu.ElectronMenu, {
           setApplicationMenu: () => Effect.void,
-          showContextMenu: () => Effect.succeed(Option.none()),
+          showContextMenu: () => Effect.succeedNone,
           popupTemplate: input.onPopupTemplate ?? (() => Effect.void),
         }),
         Layer.succeed(ElectronShell.ElectronShell, {
@@ -709,6 +710,30 @@ describe("DesktopWindow", () => {
     }),
   );
 
+  it.effect("forwards native trackpad release to the renderer", () =>
+    Effect.gen(function* () {
+      const fakeWindow = makeFakeBrowserWindow();
+      const send = vi.spyOn(fakeWindow.window.webContents, "send");
+      const createCount = yield* Ref.make(0);
+      const mainWindow = yield* Ref.make<Option.Option<Electron.BrowserWindow>>(Option.none());
+      const layer = makeTestLayer({ window: fakeWindow.window, createCount, mainWindow });
+
+      yield* Effect.gen(function* () {
+        const desktopWindow = yield* DesktopWindow.DesktopWindow;
+        yield* desktopWindow.handleBackendReady(new URL("http://127.0.0.1:3773"));
+        const onInput = fakeWindow.webContentsListeners.get("input-event");
+        if (!onInput) return yield* Effect.die("input-event listener was not registered");
+        onInput({}, { type: "gestureScrollUpdate" });
+        assert.notInclude(
+          send.mock.calls.map(([channel]) => channel),
+          TRACKPAD_SCROLL_END_CHANNEL,
+        );
+        onInput({}, { type: "gestureScrollEnd" });
+        assert.isTrue(send.mock.calls.some(([channel]) => channel === TRACKPAD_SCROLL_END_CHANNEL));
+      }).pipe(Effect.provide(layer));
+    }),
+  );
+
   // Chromium hands the main window's zoom level down to embedded preview
   // guests, so every app zoom has to put the preview browser back at its own
   // zoom or zooming the UI drags the previewed page with it.
diff --git a/apps/desktop/src/window/DesktopWindow.ts b/apps/desktop/src/window/DesktopWindow.ts
index b3964cb929c7..754de3caa727 100644
--- a/apps/desktop/src/window/DesktopWindow.ts
+++ b/apps/desktop/src/window/DesktopWindow.ts
@@ -22,6 +22,7 @@ import {
   MENU_ACTION_CHANNEL,
   QUIT_SHORTCUT_CHANNEL,
   SNAP_SHOT_EVENT_CHANNEL,
+  TRACKPAD_SCROLL_END_CHANNEL,
   WINDOW_FULLSCREEN_STATE_CHANNEL,
 } from "../ipc/channels.ts";
 import * as PreviewManager from "../preview/Manager.ts";
@@ -661,6 +662,9 @@ export const make = Effect.gen(function* () {
         event.preventDefault();
       }
     });
+    window.webContents.on("input-event", (_event, input) => {
+      if (input.type === "gestureScrollEnd") window.webContents.send(TRACKPAD_SCROLL_END_CHANNEL);
+    });
 
     window.on("page-title-updated", (event) => {
       event.preventDefault();
diff --git a/apps/desktop/src/wsl/DesktopWslBackend.ts b/apps/desktop/src/wsl/DesktopWslBackend.ts
index 3f20e58aa680..72bad30c06cc 100644
--- a/apps/desktop/src/wsl/DesktopWslBackend.ts
+++ b/apps/desktop/src/wsl/DesktopWslBackend.ts
@@ -138,7 +138,7 @@ export const layer = Layer.effect(
       const primaryConfig = yield* serverExposure.backendConfig;
       const port = yield* scanForWslPort(primaryConfig.port + 1).pipe(
         Effect.provideService(NetService.NetService, net),
-        Effect.map((value) => Option.some(value)),
+        Effect.asSome,
         Effect.catch((error) =>
           logWslBackendWarning("could not allocate port for WSL backend", {
             error: error.message,
@@ -171,7 +171,7 @@ export const layer = Layer.effect(
           onReady: () => Ref.set(preflightErrorRef, Option.none()),
         })
         .pipe(
-          Effect.map((registered) => Option.some(registered)),
+          Effect.asSome,
           Effect.catch((error) =>
             logWslBackendWarning("WSL backend already registered, skipping start", {
               id: targetId,
diff --git a/apps/desktop/src/wsl/DesktopWslEnvironment.ts b/apps/desktop/src/wsl/DesktopWslEnvironment.ts
index 6907d8d6db4e..cca5a61cc566 100644
--- a/apps/desktop/src/wsl/DesktopWslEnvironment.ts
+++ b/apps/desktop/src/wsl/DesktopWslEnvironment.ts
@@ -1040,11 +1040,7 @@ const preWarmImpl = (
       const handle = yield* spawner.spawn(command);
       yield* handle.exitCode;
     }),
-  ).pipe(
-    Effect.timeoutOption(PRE_WARM_TIMEOUT),
-    Effect.asVoid,
-    Effect.catch(() => Effect.void),
-  );
+  ).pipe(Effect.timeoutOption(PRE_WARM_TIMEOUT), Effect.ignore);
 
 const windowsToWslPathImpl = (
   distro: string | null,
@@ -1272,15 +1268,14 @@ export const layer = Layer.effect(
     // distro. Negative results aren't cached so a transient wsl.exe failure
     // doesn't permanently disable tilde expansion.
     const userHomeCache = new Map<string, string>();
-    const getUserHome = (distro: string | null) =>
-      Effect.gen(function* () {
-        const key = distro ?? "__default__";
-        const cached = userHomeCache.get(key);
-        if (cached !== undefined) return Option.some(cached);
-        const resolved = yield* provideSpawner(getUserHomeImpl(distro));
-        if (Option.isSome(resolved)) userHomeCache.set(key, resolved.value);
-        return resolved;
-      }).pipe(Effect.withSpan("desktop.wsl.getUserHome"));
+    const getUserHome = Effect.fn("desktop.wsl.getUserHome")(function* (distro: string | null) {
+      const key = distro ?? "__default__";
+      const cached = userHomeCache.get(key);
+      if (cached !== undefined) return Option.some(cached);
+      const resolved = yield* provideSpawner(getUserHomeImpl(distro));
+      if (Option.isSome(resolved)) userHomeCache.set(key, resolved.value);
+      return resolved;
+    });
 
     const getDistroIp = (distro: string | null) =>
       provideSpawner(getDistroIpImpl(distro)).pipe(Effect.withSpan("desktop.wsl.getDistroIp"));
diff --git a/apps/desktop/vite.config.ts b/apps/desktop/vite.config.ts
index c451a89b5767..17ce805ffe16 100644
--- a/apps/desktop/vite.config.ts
+++ b/apps/desktop/vite.config.ts
@@ -85,6 +85,19 @@ export default defineConfig({
         onlyBundle: false,
       },
     },
+    {
+      // boot.cjs requires the other two at runtime, so all three stay separate files.
+      format: "cjs",
+      outDir: "dist-electron",
+      dts: false,
+      sourcemap: true,
+      outExtensions: () => ({ js: ".cjs" }),
+      entry: ["src/boot.ts", "src/compileCache.ts"],
+      clean: false,
+      deps: {
+        neverBundle: (id) => id === "./main.cjs" || id === "./compileCache.cjs",
+      },
+    },
     {
       format: "cjs",
       outDir: "dist-electron",
diff --git a/apps/marketing/public/harnesses/antigravity.png b/apps/marketing/public/harnesses/antigravity.png
deleted file mode 100644
index df1e22dbbd21..000000000000
Binary files a/apps/marketing/public/harnesses/antigravity.png and /dev/null differ
diff --git a/apps/marketing/public/harnesses/antigravity.svg b/apps/marketing/public/harnesses/antigravity.svg
new file mode 100644
index 000000000000..13e1ec9e9849
--- /dev/null
+++ b/apps/marketing/public/harnesses/antigravity.svg
@@ -0,0 +1 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Antigravity</title><mask height="23" id="lobe-icons-antigravity-0-_R_0_" maskUnits="userSpaceOnUse" width="24" x="0" y="1"><path d="M21.751 22.607c1.34 1.005 3.35.335 1.508-1.508C17.73 15.74 18.904 1 12.037 1 5.17 1 6.342 15.74.815 21.1c-2.01 2.009.167 2.511 1.507 1.506 5.192-3.517 4.857-9.714 9.715-9.714 4.857 0 4.522 6.197 9.714 9.715z" fill="#fff"></path></mask><g mask="url(#lobe-icons-antigravity-0-_R_0_)"><g filter="url(#lobe-icons-antigravity-1-_R_0_)"><path d="M-1.018-3.992c-.408 3.591 2.686 6.89 6.91 7.37 4.225.48 7.98-2.043 8.387-5.633.408-3.59-2.686-6.89-6.91-7.37-4.225-.479-7.98 2.043-8.387 5.633z" fill="#FFE432"></path></g><g filter="url(#lobe-icons-antigravity-2-_R_0_)"><path d="M15.269 7.747c1.058 4.557 5.691 7.374 10.348 6.293 4.657-1.082 7.575-5.653 6.516-10.21-1.058-4.556-5.691-7.374-10.348-6.292-4.657 1.082-7.575 5.653-6.516 10.21z" fill="#FC413D"></path></g><g filter="url(#lobe-icons-antigravity-3-_R_0_)"><path d="M-12.443 10.804c1.338 4.703 7.36 7.11 13.453 5.378 6.092-1.733 9.947-6.95 8.61-11.652C8.282-.173 2.26-2.58-3.833-.848-9.925.884-13.78 6.1-12.443 10.804z" fill="#00B95C"></path></g><g filter="url(#lobe-icons-antigravity-4-_R_0_)"><path d="M-12.443 10.804c1.338 4.703 7.36 7.11 13.453 5.378 6.092-1.733 9.947-6.95 8.61-11.652C8.282-.173 2.26-2.58-3.833-.848-9.925.884-13.78 6.1-12.443 10.804z" fill="#00B95C"></path></g><g filter="url(#lobe-icons-antigravity-5-_R_0_)"><path d="M-7.608 14.703c3.352 3.424 9.126 3.208 12.896-.483 3.77-3.69 4.108-9.459.756-12.883C2.69-2.087-3.083-1.871-6.853 1.82c-3.77 3.69-4.108 9.458-.755 12.883z" fill="#00B95C"></path></g><g filter="url(#lobe-icons-antigravity-6-_R_0_)"><path d="M9.932 27.617c1.04 4.482 5.384 7.303 9.7 6.3 4.316-1.002 6.971-5.448 5.93-9.93-1.04-4.483-5.384-7.304-9.7-6.301-4.316 1.002-6.971 5.448-5.93 9.93z" fill="#3186FF"></path></g><g filter="url(#lobe-icons-antigravity-7-_R_0_)"><path d="M2.572-8.185C.392-3.329 2.778 2.472 7.9 4.771c5.122 2.3 11.042.227 13.222-4.63 2.18-4.855-.205-10.656-5.327-12.955-5.122-2.3-11.042-.227-13.222 4.63z" fill="#FBBC04"></path></g><g filter="url(#lobe-icons-antigravity-8-_R_0_)"><path d="M-3.267 38.686c-5.277-2.072 3.742-19.117 5.984-24.83 2.243-5.712 8.34-8.664 13.616-6.592 5.278 2.071 11.533 13.482 9.29 19.195-2.242 5.713-23.613 14.298-28.89 12.227z" fill="#3186FF"></path></g><g filter="url(#lobe-icons-antigravity-9-_R_0_)"><path d="M28.71 17.471c-1.413 1.649-5.1.808-8.236-1.878-3.135-2.687-4.531-6.201-3.118-7.85 1.412-1.649 5.1-.808 8.235 1.878s4.532 6.2 3.119 7.85z" fill="#749BFF"></path></g><g filter="url(#lobe-icons-antigravity-10-_R_0_)"><path d="M18.163 9.077c5.81 3.93 12.502 4.19 14.946.577 2.443-3.612-.287-9.727-6.098-13.658-5.81-3.931-12.502-4.19-14.946-.577-2.443 3.612.287 9.727 6.098 13.658z" fill="#FC413D"></path></g><g filter="url(#lobe-icons-antigravity-11-_R_0_)"><path d="M-.915 2.684c-1.44 3.473-.97 6.967 1.05 7.804 2.02.837 4.824-1.3 6.264-4.772 1.44-3.473.97-6.967-1.05-7.804-2.02-.837-4.824 1.3-6.264 4.772z" fill="#FFEE48"></path></g></g><defs><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="17.587" id="lobe-icons-antigravity-1-_R_0_" width="19.838" x="-3.288" y="-11.917"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="1.117"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="38.565" id="lobe-icons-antigravity-2-_R_0_" width="38.9" x="4.251" y="-13.493"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="5.4"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="36.517" id="lobe-icons-antigravity-3-_R_0_" width="40.955" x="-21.889" y="-10.592"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="4.591"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="36.517" id="lobe-icons-antigravity-4-_R_0_" width="40.955" x="-21.889" y="-10.592"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="4.591"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="36.595" id="lobe-icons-antigravity-5-_R_0_" width="36.632" x="-19.099" y="-10.278"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="4.591"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="34.087" id="lobe-icons-antigravity-6-_R_0_" width="33.533" x=".981" y="8.758"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="4.363"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="35.276" id="lobe-icons-antigravity-7-_R_0_" width="35.978" x="-6.143" y="-21.659"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="3.954"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="46.523" id="lobe-icons-antigravity-8-_R_0_" width="45.114" x="-11.96" y="-.46"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="3.531"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="24.054" id="lobe-icons-antigravity-9-_R_0_" width="25.094" x="10.485" y=".58"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="3.159"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="30.007" id="lobe-icons-antigravity-10-_R_0_" width="33.508" x="5.833" y="-12.467"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="2.669"></feGaussianBlur></filter><filter color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse" height="26.151" id="lobe-icons-antigravity-11-_R_0_" width="22.194" x="-8.355" y="-8.876"><feFlood flood-opacity="0" result="BackgroundImageFix"></feFlood><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"></feBlend><feGaussianBlur result="effect1_foregroundBlur_977_115" stdDeviation="3.303"></feGaussianBlur></filter></defs></svg>
\ No newline at end of file
diff --git a/apps/marketing/public/harnesses/openai_dark.svg b/apps/marketing/public/harnesses/openai_dark.svg
index b78a51db7bc6..956f87c99f60 100644
--- a/apps/marketing/public/harnesses/openai_dark.svg
+++ b/apps/marketing/public/harnesses/openai_dark.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="260" preserveAspectRatio="xMidYMid" viewBox="0 0 256 260"><path fill="#fff" d="M239.184 106.203a64.716 64.716 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.716 64.716 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.665 64.665 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.767 64.767 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483Zm-97.56 136.338a48.397 48.397 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.595 8.595 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601Zm-104.466-44.61a48.345 48.345 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.339 8.339 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803ZM23.549 85.38a48.499 48.499 0 0 1 25.58-21.333v61.39a8.288 8.288 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.819.819 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405v.256Zm179.466 41.695-63.08-36.63L161.73 77.86a.819.819 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.544 8.544 0 0 0-4.4-7.213Zm21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.716.716 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391v.205ZM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.595 8.595 0 0 0-4.246 7.367l-.051 72.697Zm11.868-25.58 28.138-16.217 28.188 16.218v32.434l-28.086 16.218-28.188-16.218-.052-32.434Z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" preserveAspectRatio="xMidYMid" viewBox="100 100 411 411">
+  <path fill="#fff" fill-rule="evenodd" clip-rule="evenodd" d="M252.794 108.802C289.191 99.0484 326.265 110.305 351.148 135.135C385.113 126.072 422.85 134.862 449.492 161.505C476.136 188.149 484.925 225.888 475.862 259.85V259.854C500.696 284.735 511.95 321.81 502.198 358.207C492.447 394.602 464.161 421.084 430.215 430.217C421.083 464.162 394.603 492.448 358.206 502.199C321.812 511.951 284.734 500.693 259.852 475.864C225.887 484.927 188.15 476.137 161.507 449.495C134.864 422.851 126.073 385.111 135.136 351.149C110.304 326.266 99.0496 289.192 108.801 252.795C118.552 216.4 146.84 189.918 180.784 180.785C189.917 146.841 216.396 118.553 252.794 108.802ZM374.292 407.145C374.292 411.271 372.092 415.086 368.517 417.148L283.723 466.102C302.487 480.585 327.555 486.459 352.217 479.852C386.997 470.532 410.068 439.312 410.555 405.006V317.717C410.555 315.08 409.125 312.621 406.843 311.303L374.292 292.509V407.145ZM251.868 415.897C248.296 417.959 243.893 417.959 240.317 415.897L155.526 366.942C152.366 390.436 159.811 415.08 177.866 433.136H177.863C203.325 458.594 241.896 462.962 271.85 446.232L347.449 402.586C349.735 401.268 351.148 398.8 351.148 396.163V358.579L251.868 415.897ZM368.602 220.628C366.319 219.309 363.474 219.318 361.191 220.637L328.641 239.431L427.921 296.749C431.496 298.811 433.697 302.627 433.697 306.752V404.661C455.622 395.654 473.244 376.881 479.851 352.218C489.169 317.442 473.668 281.85 444.201 264.274L368.602 220.628ZM177.303 206.34C155.377 215.348 137.756 234.122 131.148 258.783C121.832 293.561 137.331 329.153 166.799 346.727L242.398 390.373C244.68 391.692 247.525 391.684 249.807 390.366L282.357 371.572L183.078 314.253C179.504 312.189 177.303 308.375 177.303 304.251V206.34ZM259.849 279.145V331.858L305.5 358.213L351.15 331.858V279.145L305.5 252.789L259.849 279.145ZM327.276 144.9C308.512 130.418 283.445 124.543 258.782 131.15C224.002 140.471 200.931 171.691 200.445 205.995V293.286C200.445 295.923 201.875 298.381 204.158 299.7L236.707 318.493V203.856C236.707 199.731 238.909 195.916 242.483 193.853L327.276 144.9ZM433.137 177.867C407.675 152.407 369.103 148.038 339.149 164.769L263.55 208.415C261.265 209.734 259.852 212.202 259.852 214.838V252.423L359.132 195.105C362.703 193.041 367.108 193.041 370.682 195.105L455.473 244.06C458.635 220.567 451.189 195.922 433.135 177.867H433.137Z" />
+</svg>
diff --git a/apps/marketing/public/harnesses/opencode-dark.svg b/apps/marketing/public/harnesses/opencode-dark.svg
index fc467bf84407..8c5e734ece6c 100644
--- a/apps/marketing/public/harnesses/opencode-dark.svg
+++ b/apps/marketing/public/harnesses/opencode-dark.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512"><svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg"><rect width="512" height="512" fill="#131010"></rect><path d="M320 224V352H192V224H320Z" fill="#5A5858"></path><path fill-rule="evenodd" clip-rule="evenodd" d="M384 416H128V96H384V416ZM320 160H192V352H320V160Z" fill="white"></path></svg></svg>
\ No newline at end of file
+<svg width='375' height='375' viewBox='-67.5 -37.5 375 375' fill='none' xmlns='http://www.w3.org/2000/svg'><g clip-path='url(#clip0_1401_86283)'><mask id='mask0_1401_86283' style='mask-type:luminance' maskUnits='userSpaceOnUse' x='0' y='0' width='240' height='300'><path d='M240 0H0V300H240V0Z' fill='white'/></mask><g mask='url(#mask0_1401_86283)'><path d='M180 240H60V120H180V240Z' fill='#4B4646'/><path d='M180 60H60V240H180V60ZM240 300H0V0H240V300Z' fill='#F1ECEC'/></g></g><defs><clipPath id='clip0_1401_86283'><rect width='240' height='300' fill='white'/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/apps/marketing/src/pages/download.astro b/apps/marketing/src/pages/download.astro
index c8391953203d..dca3e9528689 100644
--- a/apps/marketing/src/pages/download.astro
+++ b/apps/marketing/src/pages/download.astro
@@ -91,6 +91,16 @@ const imageProps = {
           <h2 class="platform-name">Linux</h2>
         </div>
         <div class="download-cards">
+          <a class="download-card" data-asset="amd64.deb" href={RELEASES_URL}>
+            <span class="card-icon">
+              <Image class="card-icon--stable" src={iconStable} width={28} height={28} loading="lazy" {...imageProps} />
+              <Image class="card-icon--nightly" src={iconNightly} width={28} height={28} loading="lazy" {...imageProps} />
+            </span>
+            <span class="card-text">
+              <span class="card-arch">Debian, Ubuntu</span>
+              <span class="card-format">.deb</span>
+            </span>
+          </a>
           <a class="download-card" data-asset="x86_64.AppImage" href={RELEASES_URL}>
             <span class="card-icon">
               <Image class="card-icon--stable" src={iconStable} width={28} height={28} loading="lazy" {...imageProps} />
@@ -102,6 +112,10 @@ const imageProps = {
             </span>
           </a>
         </div>
+        <p class="intel-note">
+          On ARM? Download the arm64 <a data-asset="arm64.deb" href={RELEASES_URL}>.deb</a> or
+          <a data-asset="arm64.AppImage" href={RELEASES_URL}>AppImage</a>.
+        </p>
       </section>
 
       <!-- Mobile. Stable only, there is no nightly mobile build. -->
diff --git a/apps/marketing/src/pages/index.astro b/apps/marketing/src/pages/index.astro
index 2da4319b4c28..7ba29ba30d80 100644
--- a/apps/marketing/src/pages/index.astro
+++ b/apps/marketing/src/pages/index.astro
@@ -38,7 +38,7 @@ const mobileEndorsementRows = [
     <div class="hero-float" aria-hidden="true">
       {[
         { key: "opencode", icon: "/harnesses/opencode-dark.svg", cls: "hf-opencode" },
-        { key: "antigravity", icon: "/harnesses/antigravity.png", cls: "hf-antigravity" },
+        { key: "antigravity", icon: "/harnesses/antigravity.svg", cls: "hf-antigravity" },
         { key: "claude", icon: "/harnesses/claude-ai-icon.svg", cls: "hf-claude" },
         { key: "codex", icon: "/harnesses/openai_dark.svg", cls: "hf-codex" },
         { key: "grok", icon: "/harnesses/grok-dark.svg", cls: "hf-grok" },
@@ -248,7 +248,7 @@ const mobileEndorsementRows = [
           </div>
         </div>
         <div class="harness">
-          <div class="harness-mark"><img src="/harnesses/antigravity.png" alt="" /></div>
+          <div class="harness-mark"><img src="/harnesses/antigravity.svg" alt="" /></div>
           <div class="harness-meta">
             <div class="harness-name">Antigravity</div>
             <div class="harness-tag">Google sign-in</div>
@@ -710,11 +710,6 @@ const mobileEndorsementRows = [
     object-fit: contain;
   }
 
-  /* The Antigravity icon ships with its own rounded dark tile, so it fills the
-     card edge to edge instead of sitting inside it. */
-  .hf-antigravity .hero-float-card { background: #0d0d10; border-color: rgba(255, 255, 255, 0.1); }
-  .hf-antigravity .hero-float-card img { width: 100%; height: 100%; border-radius: inherit; object-fit: cover; }
-
   @keyframes mark-in {
     from { opacity: 0; transform: translate(var(--fx), var(--fy)) rotate(calc(var(--rot) + 24deg)) scale(0.6); }
     to { opacity: 1; transform: translate(0, 0) rotate(var(--rot)) scale(1); }
@@ -830,7 +825,7 @@ const mobileEndorsementRows = [
     flex-shrink: 0; width: 28px; height: 28px;
     display: grid; place-items: center;
   }
-  .harness-mark img { width: 22px; height: 22px; object-fit: contain; border-radius: 5px; }
+  .harness-mark img { width: 22px; height: 22px; object-fit: contain; }
 
   .harness-meta { flex: 1; min-width: 0; }
   .harness-name {
diff --git a/apps/mobile/app.config.ts b/apps/mobile/app.config.ts
index e3b05d805765..76d48ffbff5f 100644
--- a/apps/mobile/app.config.ts
+++ b/apps/mobile/app.config.ts
@@ -217,7 +217,7 @@ const config: ExpoConfig = {
   slug: "t3-code",
   platforms: ["ios", "android"],
   scheme: variant.scheme,
-  version: "1.3.0",
+  version: "1.3.1",
   runtimeVersion: {
     // Development manifests resolve on every launch, so avoid fingerprint's
     // expensive native-project calculation there. Preview and production stay
diff --git a/apps/mobile/assets/antigravity.png b/apps/mobile/assets/antigravity.png
index df1e22dbbd21..ecf863511c66 100644
Binary files a/apps/mobile/assets/antigravity.png and b/apps/mobile/assets/antigravity.png differ
diff --git a/apps/mobile/deps/react-native-nitro-markdown-0.5.0.tgz b/apps/mobile/deps/react-native-nitro-markdown-0.5.0.tgz
deleted file mode 100644
index 8fafc3896813..000000000000
Binary files a/apps/mobile/deps/react-native-nitro-markdown-0.5.0.tgz and /dev/null differ
diff --git a/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/AgentNotifications.kt b/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/AgentNotifications.kt
index 35086bbd75f9..00af98ac4b28 100644
--- a/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/AgentNotifications.kt
+++ b/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/AgentNotifications.kt
@@ -138,17 +138,7 @@ object AgentNotifications {
       // Match iOS foreground presentation. Consume suppressed alerts as well,
       // so a delivery retry cannot surface them after the app backgrounds.
       if (!ProcessLifecycleOwner.get().lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
-        val title = data["alert_title"].orEmpty().take(120)
-        // Grouped alerts list up to five 120-character thread titles.
-        val body = data["alert_body"].orEmpty().take(608)
-        val id = alertId.hashCode()
-        val notification = base(context, ALERT_CHANNEL)
-          .setContentTitle(title).setContentText(body)
-          .setStyle(NotificationCompat.BigTextStyle().bigText(body))
-          .setAutoCancel(true)
-          .setContentIntent(contentIntent(context, scheme, data["alert_path"], id))
-          .build()
-        manager(context).notify(ALERT_TAG, id, notification)
+        postAlert(context, scheme, data, alertId)
       }
       prefs.edit().remove("seenAlerts").putString(
         "seenAlertsOrdered",
@@ -157,6 +147,36 @@ object AgentNotifications {
     }
   }
 
+  private fun postAlert(
+    context: Context,
+    scheme: String,
+    data: Map<String, String>,
+    alertId: String
+  ) {
+    val title = data["alert_title"].orEmpty().take(120)
+    // Grouped alerts list up to five 120-character thread titles.
+    val body = data["alert_body"].orEmpty().take(608)
+    val id = alertId.hashCode()
+    val notification = base(context, ALERT_CHANNEL)
+      .setContentTitle(title).setContentText(body)
+      .setStyle(NotificationCompat.BigTextStyle().bigText(body))
+      .setAutoCancel(true)
+      .setContentIntent(contentIntent(context, scheme, data["alert_path"], id))
+      .build()
+    manager(context).notify(ALERT_TAG, id, notification)
+  }
+
+  /**
+   * Renders a relay-shaped payload without the registration, freshness and
+   * foreground checks, for the showcase capture's staged notifications.
+   */
+  @Synchronized
+  fun showcase(context: Context, scheme: String, data: Map<String, String>) {
+    channels(context)
+    data["alert_id"]?.let { postAlert(context, scheme, data, it) }
+    showActivity(context, scheme, data, data["active"] == "true", RUNNING_LIFETIME_MS)
+  }
+
   private fun updateActivity(
     context: Context,
     prefs: SharedPreferences,
diff --git a/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/T3AgentNotificationsModule.kt b/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/T3AgentNotificationsModule.kt
index 246db274a195..0a2d2b30589f 100644
--- a/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/T3AgentNotificationsModule.kt
+++ b/apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/T3AgentNotificationsModule.kt
@@ -26,6 +26,10 @@ class T3AgentNotificationsModule : Module() {
       appContext.reactContext?.let { AgentNotifications.clear(it) }
     }
 
+    Function("showShowcaseActivity") { scheme: String, data: Map<String, String> ->
+      appContext.reactContext?.let { AgentNotifications.showcase(it, scheme, data) }
+    }
+
     Function("openLiveUpdateSettings") {
       val context = appContext.reactContext
       if (context == null || Build.VERSION.SDK_INT < 36) {
diff --git a/apps/mobile/modules/t3-subscription-widget/android/src/main/AndroidManifest.xml b/apps/mobile/modules/t3-subscription-widget/android/src/main/AndroidManifest.xml
index e66f03cffae5..e98c1ad6b312 100644
--- a/apps/mobile/modules/t3-subscription-widget/android/src/main/AndroidManifest.xml
+++ b/apps/mobile/modules/t3-subscription-widget/android/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <application>
-    <receiver android:name="expo.modules.t3subscriptionwidget.SubscriptionUsageWidget" android:exported="false" android:label="@string/t3_subscription_widget_name">
+    <receiver android:name="expo.modules.t3subscriptionwidget.SubscriptionUsageWidget" android:enabled="@bool/t3_subscription_widget_enabled" android:exported="false" android:label="@string/t3_subscription_widget_name">
       <intent-filter><action android:name="android.appwidget.action.APPWIDGET_UPDATE" /></intent-filter>
       <meta-data android:name="android.appwidget.provider" android:resource="@xml/t3_subscription_widget_info" />
     </receiver>
diff --git a/apps/mobile/modules/t3-subscription-widget/android/src/main/java/expo/modules/t3subscriptionwidget/SubscriptionUsageWidget.kt b/apps/mobile/modules/t3-subscription-widget/android/src/main/java/expo/modules/t3subscriptionwidget/SubscriptionUsageWidget.kt
index ef33a5d7c25d..b8a916129ea7 100644
--- a/apps/mobile/modules/t3-subscription-widget/android/src/main/java/expo/modules/t3subscriptionwidget/SubscriptionUsageWidget.kt
+++ b/apps/mobile/modules/t3-subscription-widget/android/src/main/java/expo/modules/t3subscriptionwidget/SubscriptionUsageWidget.kt
@@ -8,7 +8,7 @@ import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Bundle
+import android.os.Build
 import android.view.View
 import android.widget.RemoteViews
 import org.json.JSONObject
@@ -29,15 +29,6 @@ class SubscriptionUsageWidget : AppWidgetProvider() {
     context.getSystemService(AlarmManager::class.java).cancel(expiryIntent(context))
   }
 
-  override fun onAppWidgetOptionsChanged(
-    context: Context,
-    manager: AppWidgetManager,
-    id: Int,
-    options: Bundle
-  ) {
-    update(context, manager, id)
-  }
-
   companion object {
     const val PREFERENCES = "t3_subscription_widget"
     private const val EXPIRE = "expo.modules.t3subscriptionwidget.EXPIRE"
@@ -56,59 +47,68 @@ class SubscriptionUsageWidget : AppWidgetProvider() {
     }
 
     private fun update(context: Context, manager: AppWidgetManager, id: Int) {
+      // The receiver is disabled below 12L (values-v32/bools.xml), but the module still calls in.
+      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2) return
       val saved = context.getSharedPreferences(PREFERENCES, 0).getString("snapshot", null)
       val snapshot = runCatching { JSONObject(saved.orEmpty()) }.getOrNull()
-      val views = RemoteViews(context.packageName, R.layout.t3_subscription_widget)
-      openAppIntent(context, id, snapshot)?.let {
-        views.setOnClickPendingIntent(R.id.t3_widget_root, it)
-      }
+      val openApp = openAppIntent(context, id, snapshot)
       val providers = snapshot?.optJSONArray("providers")
       val now = System.currentTimeMillis()
       var nextExpiry = Long.MAX_VALUE
-      var totalRows = 0
       val groups = (0 until (providers?.length() ?: 0)).mapNotNull { index ->
         val provider = providers?.optJSONObject(index) ?: return@mapNotNull null
         val windows = provider.optJSONArray("windows")
         val expiresAt = provider.optLong("expiresAt")
         if (expiresAt > now && windows != null && windows.length() > 0) {
           nextExpiry = minOf(nextExpiry, expiresAt)
-          totalRows += provider.optInt("totalWindows", windows.length())
           (0 until windows.length()).map { provider to windows.optJSONObject(it) }
         } else {
-          totalRows++
           listOf(provider to null)
         }
       }
-      // Show each provider before filling spare space with its other windows.
+      // Keep the first quota from each provider near the top of the list.
       val rows = (0 until (groups.maxOfOrNull { it.size } ?: 0)).flatMap { index ->
         groups.mapNotNull { it.getOrNull(index) }
       }
-      if (rows.isNotEmpty()) {
-        views.removeAllViews(R.id.t3_widget_rows)
-        val options = manager.getAppWidgetOptions(id)
-        val height = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, 180)
-        val count = ((height - 64) / 66).coerceIn(1, 12).coerceAtMost(rows.size)
-        for ((provider, window) in rows.take(count)) {
-          views.addView(R.id.t3_widget_rows, rowView(context, provider, window))
-        }
-        val remaining = totalRows - count
-        val checkedAt = snapshot?.optLong("checkedAt") ?: 0
+      val views = RemoteViews(context.packageName, R.layout.t3_subscription_widget)
+      // Count limits only; "Open app to refresh" placeholders are not entries.
+      val limits = rows.count { (_, window) -> window != null }
+      // Without limits the layout's plain title stays.
+      if (limits > 0) {
+        views.setTextViewText(
+          R.id.t3_widget_title,
+          context.getString(R.string.t3_subscription_widget_title_count, limits)
+        )
+        views.setContentDescription(
+          R.id.t3_widget_title,
+          context.resources.getQuantityString(
+            R.plurals.t3_subscription_widget_title_description,
+            limits,
+            limits
+          )
+        )
+      }
+      openApp?.let { views.setOnClickPendingIntent(R.id.t3_widget_root, it) }
+      openAppIntent(context, id, snapshot, forCollection = true)?.let {
+        views.setPendingIntentTemplate(R.id.t3_widget_rows, it)
+      }
+      val items = RemoteViews.RemoteCollectionItems.Builder()
+      rows.forEachIndexed { index, (provider, window) ->
+        items.addItem(index.toLong(), rowView(context, provider, window))
+      }
+      views.setRemoteAdapter(R.id.t3_widget_rows, items.build())
+      views.setEmptyView(R.id.t3_widget_rows, R.id.t3_widget_empty)
+      val checkedAt = snapshot?.optLong("checkedAt") ?: 0
+      val checked = if (checkedAt > 0) {
         val formatted = DateFormat.getDateTimeInstance(
           DateFormat.SHORT,
           DateFormat.SHORT
         ).format(Date(checkedAt))
-        val more = if (remaining > 0) {
-          context.getString(R.string.t3_subscription_widget_more, remaining)
-        } else {
-          ""
-        }
-        val checked = if (checkedAt > 0) {
-          context.getString(R.string.t3_subscription_widget_as_of, formatted)
-        } else {
-          context.getString(R.string.t3_subscription_widget_unknown_check)
-        }
-        views.setTextViewText(R.id.t3_widget_footer, checked + more)
+        context.getString(R.string.t3_subscription_widget_last_checked, formatted)
+      } else {
+        context.getString(R.string.t3_subscription_widget_unknown_check)
       }
+      views.setTextViewText(R.id.t3_widget_footer, checked)
       val alarms = context.getSystemService(AlarmManager::class.java)
       alarms.cancel(expiryIntent(context))
       // Inexact and non-wakeup: the timestamp remains visible if Android delays expiry.
@@ -118,7 +118,12 @@ class SubscriptionUsageWidget : AppWidgetProvider() {
       manager.updateAppWidget(id, views)
     }
 
-    private fun openAppIntent(context: Context, id: Int, snapshot: JSONObject?): PendingIntent? {
+    private fun openAppIntent(
+      context: Context,
+      id: Int,
+      snapshot: JSONObject?,
+      forCollection: Boolean = false
+    ): PendingIntent? {
       // Target this variant's launcher so co-installed builds cannot steal the tap.
       val intent =
         context.packageManager.getLaunchIntentForPackage(context.packageName) ?: return null
@@ -129,9 +134,14 @@ class SubscriptionUsageWidget : AppWidgetProvider() {
       intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
       return PendingIntent.getActivity(
         context,
-        id,
+        id * 2 + if (forCollection) 1 else 0,
         intent,
-        PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+        PendingIntent.FLAG_UPDATE_CURRENT or if (forCollection) {
+          // Collection rows use fill-in intents with an explicit app target.
+          PendingIntent.FLAG_MUTABLE
+        } else {
+          PendingIntent.FLAG_IMMUTABLE
+        }
       )
     }
 
@@ -153,6 +163,7 @@ class SubscriptionUsageWidget : AppWidgetProvider() {
       val reset = window?.optString("reset")
         ?: context.getString(R.string.t3_subscription_widget_refresh)
       child.setTextViewText(R.id.t3_widget_reset, reset)
+      child.setOnClickFillInIntent(R.id.t3_widget_row, Intent())
       child.setContentDescription(
         R.id.t3_widget_row,
         "$label. $windowLabel. $percent. $reset. $detail"
diff --git a/apps/mobile/modules/t3-subscription-widget/android/src/main/res/layout/t3_subscription_widget.xml b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/layout/t3_subscription_widget.xml
index 58e55bc2c81e..bf800d249fe0 100644
--- a/apps/mobile/modules/t3-subscription-widget/android/src/main/res/layout/t3_subscription_widget.xml
+++ b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/layout/t3_subscription_widget.xml
@@ -1,9 +1,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/t3_widget_root" android:layout_width="match_parent" android:layout_height="match_parent"
   android:orientation="vertical" android:padding="16dp" android:background="@drawable/t3_subscription_widget_background">
-  <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/t3_subscription_widget_name" android:textStyle="bold" android:textSize="16sp" android:textColor="@color/t3_widget_foreground" android:maxLines="1" android:ellipsize="end" />
-  <LinearLayout android:id="@+id/t3_widget_rows" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" android:orientation="vertical">
-    <TextView android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/t3_subscription_widget_empty" android:textSize="13sp" android:textColor="@color/t3_widget_secondary" />
-  </LinearLayout>
+  <TextView android:id="@+id/t3_widget_title" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/t3_subscription_widget_name" android:textStyle="bold" android:textSize="16sp" android:textColor="@color/t3_widget_foreground" android:maxLines="1" android:ellipsize="end" />
+  <FrameLayout android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1">
+    <ListView android:id="@+id/t3_widget_rows" android:layout_width="match_parent" android:layout_height="match_parent" android:divider="@null" android:scrollbars="vertical" />
+    <TextView android:id="@+id/t3_widget_empty" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/t3_subscription_widget_empty" android:textSize="13sp" android:textColor="@color/t3_widget_secondary" />
+  </FrameLayout>
   <TextView android:id="@+id/t3_widget_footer" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/t3_subscription_widget_open" android:textSize="10sp" android:textColor="@color/t3_widget_secondary" android:maxLines="1" android:ellipsize="end" />
 </LinearLayout>
diff --git a/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values-v32/bools.xml b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values-v32/bools.xml
new file mode 100644
index 000000000000..dc1751bcc4f0
--- /dev/null
+++ b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values-v32/bools.xml
@@ -0,0 +1,4 @@
+<resources>
+  <!-- Android 12L is the first release whose collection widgets need no compat service. -->
+  <bool name="t3_subscription_widget_enabled">true</bool>
+</resources>
diff --git a/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/bools.xml b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/bools.xml
new file mode 100644
index 000000000000..8d74a0fd7d17
--- /dev/null
+++ b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/bools.xml
@@ -0,0 +1,3 @@
+<resources>
+  <bool name="t3_subscription_widget_enabled">false</bool>
+</resources>
diff --git a/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/strings.xml b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/strings.xml
index 7ef70aa44a46..586b82595345 100644
--- a/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/strings.xml
+++ b/apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/strings.xml
@@ -1,11 +1,15 @@
 <resources>
   <string name="t3_subscription_widget_unknown_check">Last checked unavailable</string>
   <string name="t3_subscription_widget_name">Subscription usage</string>
+  <string name="t3_subscription_widget_title_count">Subscription usage (%1$d)</string>
+  <plurals name="t3_subscription_widget_title_description">
+    <item quantity="one">Subscription usage, %1$d entry</item>
+    <item quantity="other">Subscription usage, %1$d entries</item>
+  </plurals>
   <string name="t3_subscription_widget_description">Saved subscription quotas from your T3 Code environments. Tap to refresh in the app.</string>
-  <string name="t3_subscription_widget_empty">Open T3 Code and connect an environment to see limits.</string>
+  <string name="t3_subscription_widget_empty">No subscription limits available. Open T3 Code to connect.</string>
   <string name="t3_subscription_widget_open">Tap to open Usage</string>
   <string name="t3_subscription_widget_refresh">Open app to refresh</string>
   <string name="t3_subscription_widget_remaining">%1$d%% remaining</string>
-  <string name="t3_subscription_widget_as_of">As of %1$s</string>
-  <string name="t3_subscription_widget_more"> · +%1$d more</string>
+  <string name="t3_subscription_widget_last_checked">Last checked %1$s</string>
 </resources>
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index dba137f30472..99d06e089e3a 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -49,7 +49,6 @@
     "@clerk/expo": "catalog:",
     "@effect/atom-react": "catalog:",
     "@expo-google-fonts/dm-sans": "^0.4.2",
-    "@expo/metro-runtime": "~57.0.14",
     "@expo/ui": "~57.0.14",
     "@legendapp/list": "catalog:",
     "@material/material-color-utilities": "0.3.0",
@@ -137,9 +136,6 @@
     "tailwindcss": "^4.0.0",
     "typescript": "catalog:"
   },
-  "overrides": {
-    "react-native-nitro-markdown": "file:deps/react-native-nitro-markdown-0.5.0.tgz"
-  },
   "expo": {
     "install": {
       "exclude": [
diff --git a/apps/mobile/src/Stack.tsx b/apps/mobile/src/Stack.tsx
index 1537606b3df2..1487ea9c467e 100644
--- a/apps/mobile/src/Stack.tsx
+++ b/apps/mobile/src/Stack.tsx
@@ -10,7 +10,7 @@ import {
   createNativeStackScreen,
   type NativeStackNavigationOptions,
 } from "@react-navigation/native-stack";
-import { useEffect, useRef } from "react";
+import { useEffect, useRef, type ReactNode } from "react";
 import {
   Platform,
   Pressable,
@@ -23,6 +23,11 @@ import { useResolveClassNames } from "uniwind";
 
 import { AppText as Text } from "./components/AppText";
 import { getCompactBrandHeaderOptions } from "./components/CompactBrandTitle";
+import {
+  RenderErrorBoundary,
+  RenderFailureView,
+  type RenderFailureProps,
+} from "./components/RenderErrorBoundary";
 import { ArchivedThreadsRouteScreen } from "./features/archive/ArchivedThreadsRouteScreen";
 import { useAgentNotificationNavigation } from "./features/agent-awareness/notificationNavigation";
 import { ConnectOnboardingRouteScreen } from "./features/cloud/ConnectOnboardingRouteScreen";
@@ -66,6 +71,7 @@ import { SettingsAppearanceRouteScreen } from "./features/settings/SettingsAppea
 import { SettingsClientStorageRouteScreen } from "./features/settings/SettingsClientStorageRouteScreen";
 import { SettingsDiagnosticsRouteScreen } from "./features/diagnostics/SettingsDiagnosticsRouteScreen";
 import { SettingsAuthRouteScreen } from "./features/settings/SettingsAuthRouteScreen";
+import { SettingsEnvironmentDetailRouteScreen } from "./features/settings/SettingsEnvironmentDetailRouteScreen";
 import { SettingsEnvironmentsRouteScreen } from "./features/settings/SettingsEnvironmentsRouteScreen";
 import {
   SettingsEnvironmentAgentBehaviorRouteScreen,
@@ -189,6 +195,11 @@ const SettingsContentStack = createNativeStackNavigator({
         title: "Environments",
       },
     }),
+    SettingsEnvironmentDetail: createNativeStackScreen({
+      screen: SettingsEnvironmentDetailRouteScreen,
+      linking: "environments/:environmentId",
+      options: { title: "Environment" },
+    }),
     SettingsEnvironmentNewThreads: createNativeStackScreen({
       screen: SettingsEnvironmentNewThreadsRouteScreen,
       linking: "new-threads",
@@ -285,6 +296,15 @@ const SettingsContentStack = createNativeStackNavigator({
         title: "Diagnostics",
       },
     }),
+    // Deliberately the one settings screen with no `linking:` path. Its params
+    // are a tap-time snapshot, not a stable resource address: `now` is the
+    // wall-clock of the tap, `environmentIds` is the usage screen's local
+    // filter selection, and the window id/kind identify freshly aggregated
+    // pools. React Navigation round-trips non-path params through the URL as
+    // query strings, so a path here would bake in a permanently stale
+    // timestamp and filter. The deep linkable surface is the list at
+    // `settings/usage`, which rebuilds this state and pushes the detail from a
+    // tapped account segment.
     SettingsUsageAccount: createNativeStackScreen({
       screen: UsageLimitAccountScreen,
       options: { title: "Account" },
@@ -650,6 +670,14 @@ const RootStackConfig = createNativeStackNavigator({
       linking: `${THREAD_LINKING_PREFIX}/attachments/:attachmentId`,
       options: SOLID_HEADER_OPTIONS,
     }),
+    // Deliberately the one root route with no `linking:` path. The route
+    // carries zero params: its content is a session object (staged model,
+    // provider groups, and live update callbacks) that the active
+    // ThreadComposer presents into ExistingThreadSettingsRouteProvider before
+    // pushing this screen — state no URL can reconstruct. Reached without a
+    // presented session the screen navigates straight back, so a path would
+    // only produce a flash-and-dismiss link. Deep links to a thread land on
+    // `threads/:environmentId/:threadId`, where this sheet is one tap away.
     ThreadSettingsSheet: createNativeStackScreen({
       screen: ExistingThreadSettingsRouteScreen,
       options: {
@@ -761,10 +789,13 @@ const RootStackConfig = createNativeStackNavigator({
       // The whole new-task flow (choose project → draft → add project) shares
       // draft state via NewTaskFlowProvider. The expo-router era mounted it in
       // app/new/_layout.tsx; this layout wrapper is the native-stack equivalent.
-      layout: ({ children }) => (
-        <NewTaskFlowProvider>
-          <View className="flex-1 bg-sheet-solid">{children}</View>
-        </NewTaskFlowProvider>
+      // A screen's layout replaces the navigator's screenLayout.
+      layout: ({ children, route }) => (
+        <GuardedScreenLayout route={route}>
+          <NewTaskFlowProvider>
+            <View className="flex-1 bg-sheet-solid">{children}</View>
+          </NewTaskFlowProvider>
+        </GuardedScreenLayout>
       ),
       options: {
         gestureEnabled: true,
@@ -778,6 +809,33 @@ const RootStackConfig = createNativeStackNavigator({
   },
 });
 
+function GuardedScreenLayout(props: {
+  readonly children: ReactNode;
+  readonly route: { readonly name: string; readonly params?: object | undefined };
+}) {
+  return (
+    <RenderErrorBoundary
+      resetKeys={[props.route.params]}
+      renderFallback={(fallback) => (
+        <ScreenRenderFallback {...fallback} routeName={props.route.name} />
+      )}
+    >
+      {props.children}
+    </RenderErrorBoundary>
+  );
+}
+
+function ScreenRenderFallback(props: RenderFailureProps & { readonly routeName: string }) {
+  const navigation = useNavigation();
+  const exit = navigation.canGoBack()
+    ? { label: "Go back", onPress: () => navigation.goBack() }
+    : props.routeName === "Home"
+      ? { label: "Open settings", onPress: () => navigation.navigate("SettingsSheet") }
+      : { label: "Return home", onPress: () => navigation.dispatch(StackActions.replace("Home")) };
+
+  return <RenderFailureView {...props} exit={exit} />;
+}
+
 export const RootStack = RootStackConfig.with(function AdaptiveRootStack({ Navigator }) {
   const { width, height } = useWindowDimensions();
   const usesWorkspaceFlowScreens =
@@ -785,6 +843,7 @@ export const RootStack = RootStackConfig.with(function AdaptiveRootStack({ Navig
 
   return (
     <Navigator
+      screenLayout={GuardedScreenLayout}
       screenOptions={({ route }) => {
         if (route.name !== "SettingsSheet" && route.name !== "NewTaskSheet") {
           return {};
diff --git a/apps/mobile/src/components/AndroidAnchoredMenu.tsx b/apps/mobile/src/components/AndroidAnchoredMenu.tsx
index dfa0dea8d05a..4c465a9f9ef4 100644
--- a/apps/mobile/src/components/AndroidAnchoredMenu.tsx
+++ b/apps/mobile/src/components/AndroidAnchoredMenu.tsx
@@ -7,9 +7,9 @@ import { useKeyboardState } from "react-native-keyboard-controller";
 import Animated, { FadeIn } from "react-native-reanimated";
 
 import { OverlayPortal } from "./OverlayPortal";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 import { MaterialMenuPopup } from "./MaterialMenuPopup";
 
-const MENU_WIDTH = 250;
 const SCREEN_MARGIN = 12;
 const ANCHOR_GAP = 6;
 
@@ -55,6 +55,7 @@ export type AndroidAnchoredMenuProps = {
  * menus use the native popup for placement, animation and dismissal.
  */
 export function AndroidAnchoredMenu(props: AndroidAnchoredMenuProps) {
+  const { scale, menuWidth: desiredMenuWidth } = useAndroidControlSizing();
   const [anchor, setAnchor] = useState<AnchorSnapshot | null>(null);
   const [path, setPath] = useState<readonly MenuAction[]>([]);
   // Height of the modal's root view, in the modal's own coordinate space.
@@ -68,6 +69,10 @@ export function AndroidAnchoredMenu(props: AndroidAnchoredMenuProps) {
   // are converted into this frame, so the menu lands correctly no matter
   // where the portal host sits (status bar, keyboard resize, etc.).
   const [overlay, setOverlay] = useState<OverlayFrame | null>(null);
+  const menuWidth =
+    overlay === null
+      ? desiredMenuWidth
+      : Math.min(desiredMenuWidth, Math.max(0, overlay.width - 2 * SCREEN_MARGIN));
   const anchorRef = useRef<View>(null);
   const overlayRef = useRef<View>(null);
 
@@ -131,14 +136,11 @@ export function AndroidAnchoredMenu(props: AndroidAnchoredMenuProps) {
       ? 0
       : local.x + local.width / 2 <= overlay.width / 2
         ? local.x
-        : local.x + local.width - MENU_WIDTH;
+        : local.x + local.width - menuWidth;
   const left =
     overlay === null
       ? 0
-      : Math.min(
-          Math.max(preferredLeft, SCREEN_MARGIN),
-          overlay.width - MENU_WIDTH - SCREEN_MARGIN,
-        );
+      : Math.min(Math.max(preferredLeft, SCREEN_MARGIN), overlay.width - menuWidth - SCREEN_MARGIN);
   // The keyboard stays up while the menu is open (in-window overlay, no
   // focus change), so the space it covers is not usable — without this the
   // composer-pill menus "open down" into the IME and can't be tapped.
@@ -201,6 +203,7 @@ export function AndroidAnchoredMenu(props: AndroidAnchoredMenuProps) {
             {!placeable || local === null ? null : !anchor.keyboardWasVisible ? (
               <MaterialMenuPopup
                 anchor={local}
+                menuWidth={menuWidth}
                 actions={levelActions}
                 title={props.title}
                 parent={parent}
@@ -211,10 +214,12 @@ export function AndroidAnchoredMenu(props: AndroidAnchoredMenuProps) {
             ) : (
               <Animated.View
                 entering={FadeIn.duration(120)}
-                className="absolute w-[250px] overflow-hidden rounded-[4px] bg-card-alt shadow-md"
+                className="absolute overflow-hidden bg-card-alt shadow-md"
                 style={{
                   left,
                   maxHeight,
+                  width: menuWidth,
+                  borderRadius: 4 * scale,
                   ...(opensDown
                     ? { top: local.y + local.height + ANCHOR_GAP }
                     : { bottom: (rootHeight ?? 0) - local.y + ANCHOR_GAP }),
@@ -227,7 +232,7 @@ export function AndroidAnchoredMenu(props: AndroidAnchoredMenuProps) {
                   active editor; the first item tap must act, not just
                   dismiss the keyboard. */}
                 <ScrollView
-                  contentContainerClassName="py-2"
+                  contentContainerStyle={{ paddingVertical: 7 * scale }}
                   bounces={false}
                   keyboardShouldPersistTaps="always"
                   showsVerticalScrollIndicator={false}
@@ -235,6 +240,7 @@ export function AndroidAnchoredMenu(props: AndroidAnchoredMenuProps) {
                   <MaterialMenuPopup
                     inline
                     anchor={local}
+                    menuWidth={menuWidth}
                     actions={levelActions}
                     title={props.title}
                     parent={parent}
diff --git a/apps/mobile/src/components/AndroidScreenHeader.tsx b/apps/mobile/src/components/AndroidScreenHeader.tsx
index 6e2095009b3d..a8841f390612 100644
--- a/apps/mobile/src/components/AndroidScreenHeader.tsx
+++ b/apps/mobile/src/components/AndroidScreenHeader.tsx
@@ -1,6 +1,5 @@
 import { useState, type ReactNode } from "react";
 import { View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import type { AppSymbolName } from "./AppSymbol";
 import { AppText as Text } from "./AppText";
@@ -8,7 +7,7 @@ import { cn } from "../lib/cn";
 import { MaterialIconButton } from "./MaterialIconButton";
 import { AndroidAnchoredMenu } from "./AndroidAnchoredMenu";
 import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
-import { useMaterialToolbarHeight } from "./useMaterialToolbarHeight";
+import { useMaterialToolbarLayout } from "./useMaterialToolbarLayout";
 
 export interface AndroidHeaderAction {
   readonly accessibilityLabel: string;
@@ -38,10 +37,11 @@ export function AndroidScreenHeader(props: {
   readonly embedded?: boolean;
   readonly hideBottomBorder?: boolean;
 }) {
-  const insets = useSafeAreaInsets();
   const titleTypography = useScaledTextRole("title");
   const subtitleTypography = useScaledTextRole("label");
-  const materialToolbarHeight = useMaterialToolbarHeight();
+  const { height: materialToolbarHeight, ...headerPadding } = useMaterialToolbarLayout(
+    props.embedded,
+  );
   const [headerWidth, setHeaderWidth] = useState(0);
   const actions = props.actions ?? [];
   const directCount = actions.length > 2 ? (headerWidth >= 600 ? 3 : 1) : actions.length;
@@ -51,16 +51,13 @@ export function AndroidScreenHeader(props: {
   return (
     <View
       onLayout={(event) => setHeaderWidth(event.nativeEvent.layout.width)}
-      className="border-b border-header-border bg-header px-2 pb-2"
+      className="border-b border-header-border bg-header px-2"
       style={{
-        paddingTop: props.embedded ? 8 : Math.max(insets.top, 12),
+        ...headerPadding,
         borderBottomWidth: props.hideBottomBorder ? 0 : undefined,
       }}
     >
-      <View
-        style={{ minHeight: materialToolbarHeight }}
-        className="min-h-14 flex-row items-center gap-1"
-      >
+      <View style={{ minHeight: materialToolbarHeight }} className="flex-row items-center gap-1">
         {props.onBack ? (
           <MaterialIconButton
             accessibilityLabel="Navigate up"
diff --git a/apps/mobile/src/components/AppSymbol.tsx b/apps/mobile/src/components/AppSymbol.tsx
index 7e31c2c6ea91..60b7dd84ffe4 100644
--- a/apps/mobile/src/components/AppSymbol.tsx
+++ b/apps/mobile/src/components/AppSymbol.tsx
@@ -142,6 +142,7 @@ const ANDROID_ICON_BY_SF_SYMBOL = {
   "checkmark.circle": IconCircleCheck,
   circle: IconCircle,
   clock: IconClock,
+  timer: IconClock,
   ticket: IconTicket,
   cloud: IconCloud,
   cube: IconBox,
diff --git a/apps/mobile/src/components/CompactBrandTitle.tsx b/apps/mobile/src/components/CompactBrandTitle.tsx
index 53ef8c38a77b..018c2ed5a33d 100644
--- a/apps/mobile/src/components/CompactBrandTitle.tsx
+++ b/apps/mobile/src/components/CompactBrandTitle.tsx
@@ -6,11 +6,7 @@ import { AppText as Text } from "./AppText";
 import { T3Wordmark } from "./T3Wordmark";
 import { IPAD_HOME_TITLE_OFFSET } from "../lib/layoutMetrics";
 import { MOBILE_PRODUCT_NAME, resolveMobileStageLabel } from "../lib/mobileBranding";
-import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../native/native-glass";
-
-// Native leading items inherit different UIKit margins than title views.
-const IOS_NATIVE_LEADING_TITLE_OFFSET = -6;
-const IPAD_NATIVE_LEADING_TITLE_OFFSET = 7;
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 
 /**
  * Horizontal correction applied to content rendered in the brand title slot,
@@ -31,6 +27,7 @@ export function CompactBrandTitle(
 ) {
   const stageLabel = resolveMobileStageLabel(Constants.expoConfig?.extra?.appVariant);
   const titleOffset = brandTitleOffset();
+  const { scale } = useAndroidControlSizing();
 
   return (
     <View
@@ -39,19 +36,28 @@ export function CompactBrandTitle(
       accessible
       role="heading"
       className="flex-row items-center gap-1.5"
-      style={{ marginLeft: titleOffset }}
+      style={[{ marginLeft: titleOffset }, Platform.OS === "android" && { gap: 5.25 * scale }]}
     >
-      <T3Wordmark colorClassName="accent-icon" height={15} />
+      <T3Wordmark colorClassName="accent-icon" height={Math.round(15 * scale)} />
       <Text
         allowFontScaling={props.allowFontScaling}
-        className="font-t3-medium text-[21px] tracking-[-0.5px] text-foreground-muted"
+        className="font-t3-medium text-foreground-muted"
+        style={{ fontSize: 21 * scale, letterSpacing: -0.5 * scale }}
       >
         Turbo
       </Text>
-      <View className="rounded-full bg-subtle px-1.5 py-0.5">
+      <View
+        className="rounded-full bg-subtle px-1.5 py-0.5"
+        style={
+          Platform.OS === "android"
+            ? { paddingHorizontal: 5.25 * scale, paddingVertical: 1.75 * scale }
+            : undefined
+        }
+      >
         <Text
           allowFontScaling={props.allowFontScaling}
-          className="font-t3-bold text-[9px] tracking-[0.9px] text-foreground-muted uppercase"
+          className="font-t3-bold text-foreground-muted uppercase"
+          style={{ fontSize: 9 * scale, letterSpacing: 0.9 * scale }}
         >
           {stageLabel}
         </Text>
diff --git a/apps/mobile/src/components/ComposerAttachmentButton.tsx b/apps/mobile/src/components/ComposerAttachmentButton.tsx
index 8ea70a45c020..b6b3d6e78a49 100644
--- a/apps/mobile/src/components/ComposerAttachmentButton.tsx
+++ b/apps/mobile/src/components/ComposerAttachmentButton.tsx
@@ -1,6 +1,7 @@
 import type { MenuAction } from "@react-native-menu/menu";
 import { Pressable } from "react-native";
 
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 import { SymbolView } from "./AppSymbol";
 import { ControlPillMenu } from "./ControlPill";
 
@@ -15,6 +16,7 @@ export function ComposerAttachmentButton(props: {
   readonly onPickMedia: () => Promise<void>;
   readonly onPickFiles: () => Promise<void>;
 }) {
+  const { scale } = useAndroidControlSizing();
   const button = (
     <Pressable
       accessibilityLabel="Add attachment"
@@ -26,7 +28,7 @@ export function ComposerAttachmentButton(props: {
     >
       <SymbolView
         name="plus"
-        size={20}
+        size={Math.round(20 * scale)}
         weight="regular"
         tintColorClassName="accent-icon"
         type="monochrome"
diff --git a/apps/mobile/src/components/ComposerToolbar.tsx b/apps/mobile/src/components/ComposerToolbar.tsx
index 50fbcd253a47..f8a8fb7b66d6 100644
--- a/apps/mobile/src/components/ComposerToolbar.tsx
+++ b/apps/mobile/src/components/ComposerToolbar.tsx
@@ -1,6 +1,7 @@
 import type { ComponentProps, ReactNode } from "react";
 import { useCallback, useMemo, useState } from "react";
 import {
+  Platform,
   Pressable,
   ScrollView,
   View,
@@ -14,6 +15,7 @@ import {
 import { cn } from "../lib/cn";
 import { AppText as Text } from "./AppText";
 import { SymbolView } from "./AppSymbol";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 
 const COMPOSER_TOOLBAR_GAP = 8;
 const COMPOSER_TOOLBAR_FADE_WIDTH = 18;
@@ -30,7 +32,7 @@ export function ComposerInlineControl(props: {
   readonly disabled?: boolean;
   readonly emphasized?: boolean;
   readonly icon?: ComponentProps<typeof SymbolView>["name"];
-  readonly iconNode?: ReactNode;
+  readonly renderIcon?: (size: number) => ReactNode;
   readonly label: string;
   readonly maxWidth?: ViewStyle["maxWidth"];
   readonly onPress?: () => void;
@@ -39,6 +41,7 @@ export function ComposerInlineControl(props: {
   readonly chevronDirection?: "down" | "right";
   readonly showChevron?: boolean;
 }) {
+  const { scale, smallIconSize } = useAndroidControlSizing();
   return (
     <Pressable
       accessibilityLabel={props.accessibilityLabel ?? props.label}
@@ -52,12 +55,17 @@ export function ComposerInlineControl(props: {
       onPress={props.onPress}
       style={{ maxWidth: props.maxWidth ?? 190, opacity: props.disabled ? 0.45 : 1 }}
     >
-      {props.iconNode ? (
-        <View className="size-4 shrink-0 items-center justify-center">{props.iconNode}</View>
+      {props.renderIcon ? (
+        <View
+          className="size-4 shrink-0 items-center justify-center"
+          style={Platform.OS === "android" ? { width: 14 * scale, height: 14 * scale } : undefined}
+        >
+          {props.renderIcon(smallIconSize)}
+        </View>
       ) : props.icon ? (
         <SymbolView
           name={props.icon}
-          size={16}
+          size={smallIconSize}
           tintColorClassName={
             props.emphasized || props.selected ? "accent-icon" : "accent-icon-muted"
           }
@@ -76,7 +84,7 @@ export function ComposerInlineControl(props: {
       {props.showChevron === false ? null : (
         <SymbolView
           name={props.chevronDirection === "right" ? "chevron.right" : "chevron.down"}
-          size={10}
+          size={Math.round(10 * scale)}
           tintColorClassName={
             props.emphasized || props.selected ? "accent-icon" : "accent-icon-muted"
           }
@@ -224,6 +232,8 @@ export function ComposerActionButton(props: {
   readonly onPress: () => void;
   readonly variant?: "primary" | "danger";
 }) {
+  const { scale, smallIconSize } = useAndroidControlSizing();
+  const circleSize = Math.round(30 * scale);
   return (
     <Pressable
       accessibilityLabel={props.accessibilityLabel}
@@ -234,8 +244,9 @@ export function ComposerActionButton(props: {
       onPress={props.onPress}
     >
       <View
+        style={{ width: circleSize, height: circleSize }}
         className={cn(
-          "size-[30px] items-center justify-center rounded-full",
+          "items-center justify-center rounded-full",
           props.variant === "danger"
             ? "bg-danger"
             : props.disabled
@@ -245,7 +256,7 @@ export function ComposerActionButton(props: {
       >
         <SymbolView
           name={props.icon}
-          size={16}
+          size={smallIconSize}
           weight="semibold"
           tintColorClassName={
             props.variant === "danger" ? "accent-danger-foreground" : "accent-primary-foreground"
diff --git a/apps/mobile/src/components/ConfirmDialog.types.ts b/apps/mobile/src/components/ConfirmDialog.types.ts
new file mode 100644
index 000000000000..7a32787cc32d
--- /dev/null
+++ b/apps/mobile/src/components/ConfirmDialog.types.ts
@@ -0,0 +1,18 @@
+export type ConfirmDialogRequest = {
+  readonly title: string;
+  readonly message?: string;
+  readonly cancelText?: string;
+  readonly confirmText: string;
+  readonly destructive?: boolean;
+  readonly onConfirm: () => void;
+  readonly onCancel?: () => void;
+};
+
+export type TextInputDialogRequest = {
+  readonly title: string;
+  readonly initialValue: string;
+  readonly cancelText?: string;
+  readonly confirmText: string;
+  readonly onConfirm: (value: string) => void;
+  readonly onCancel?: () => void;
+};
diff --git a/apps/mobile/src/components/ConfirmDialogHost.tsx b/apps/mobile/src/components/ConfirmDialogHost.tsx
index aa1653055b59..67e9d465c573 100644
--- a/apps/mobile/src/components/ConfirmDialogHost.tsx
+++ b/apps/mobile/src/components/ConfirmDialogHost.tsx
@@ -4,25 +4,9 @@ import { Platform, Modal, Pressable, TextInput, View } from "react-native";
 import { cn } from "../lib/cn";
 import { AppText } from "./AppText";
 import { MaterialConfirmDialog } from "./MaterialConfirmDialog";
+import type { ConfirmDialogRequest, TextInputDialogRequest } from "./ConfirmDialog.types";
 
-export type ConfirmDialogRequest = {
-  readonly title: string;
-  readonly message?: string;
-  readonly cancelText?: string;
-  readonly confirmText: string;
-  readonly destructive?: boolean;
-  readonly onConfirm: () => void;
-  readonly onCancel?: () => void;
-};
-
-export type TextInputDialogRequest = {
-  readonly title: string;
-  readonly initialValue: string;
-  readonly cancelText?: string;
-  readonly confirmText: string;
-  readonly onConfirm: (value: string) => void;
-  readonly onCancel?: () => void;
-};
+export type { ConfirmDialogRequest, TextInputDialogRequest } from "./ConfirmDialog.types";
 
 type DialogRequest =
   | { readonly kind: "confirm"; readonly request: ConfirmDialogRequest }
diff --git a/apps/mobile/src/components/ControlPill.tsx b/apps/mobile/src/components/ControlPill.tsx
index d8217ab67df5..95a8feb10a23 100644
--- a/apps/mobile/src/components/ControlPill.tsx
+++ b/apps/mobile/src/components/ControlPill.tsx
@@ -5,6 +5,7 @@ import { SymbolView } from "./AppSymbol";
 import { AppText as Text } from "./AppText";
 import { MaterialIconButton } from "./MaterialIconButton";
 import { MaterialButton } from "./MaterialButton";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 
 export { ControlPillMenu } from "./ControlPillMenu";
 
@@ -20,6 +21,7 @@ export function ControlPill(props: {
   readonly className?: string;
 }) {
   const variant = props.variant ?? "circle";
+  const { smallIconSize } = useAndroidControlSizing();
   const activatedOnPressInRef = useRef(false);
 
   const handlePressIn = () => {
@@ -133,7 +135,7 @@ export function ControlPill(props: {
       ) : props.icon ? (
         <SymbolView
           name={props.icon}
-          size={16}
+          size={smallIconSize}
           tintColorClassName={iconTintClassName}
           type="monochrome"
         />
diff --git a/apps/mobile/src/components/FilePreview.ios.tsx b/apps/mobile/src/components/FilePreview.ios.tsx
index e2bae6101b60..4f06319a6846 100644
--- a/apps/mobile/src/components/FilePreview.ios.tsx
+++ b/apps/mobile/src/components/FilePreview.ios.tsx
@@ -2,7 +2,7 @@ import { requireNativeModule } from "expo";
 import { useEffect, useEffectEvent, useId } from "react";
 import { Alert } from "react-native";
 
-import type { ResolvedFilePreviewSource } from "./FilePreviewModal";
+import type { ResolvedFilePreviewSource } from "./FilePreviewModal.types";
 
 const NativeControls = requireNativeModule<{
   presentFile(
diff --git a/apps/mobile/src/components/FilePreview.tsx b/apps/mobile/src/components/FilePreview.tsx
index 337699e8a61e..85286dbda891 100644
--- a/apps/mobile/src/components/FilePreview.tsx
+++ b/apps/mobile/src/components/FilePreview.tsx
@@ -3,7 +3,7 @@ import { Alert, Modal, Pressable, View } from "react-native";
 import ImageViewing from "react-native-image-viewing";
 
 import { openAttachmentInViewer } from "../lib/attachmentDownload";
-import type { ResolvedFilePreviewSource } from "./FilePreviewModal";
+import type { ResolvedFilePreviewSource } from "./FilePreviewModal.types";
 import { MediaImagePreview } from "./MediaImagePreview";
 import { AppText as Text } from "./AppText";
 
diff --git a/apps/mobile/src/components/FilePreviewModal.tsx b/apps/mobile/src/components/FilePreviewModal.tsx
index 77dd5600bc15..0692109cacde 100644
--- a/apps/mobile/src/components/FilePreviewModal.tsx
+++ b/apps/mobile/src/components/FilePreviewModal.tsx
@@ -1,30 +1,13 @@
 import { useIsFocused } from "@react-navigation/native";
-import type { AssetResource, EnvironmentId } from "@t3tools/contracts";
 import { useEffect, useEffectEvent, useState } from "react";
 import { Alert, Keyboard } from "react-native";
 
-import type { FileBackedComposerAttachment } from "../lib/composerImages";
 import { loadLocalAttachmentPreview } from "../lib/localAttachmentPreview";
-import type { MediaActionsSource } from "../lib/mediaActions";
 import { useRefreshAssetUrl } from "../state/assets";
 import { FilePreview } from "./FilePreview";
+import type { FilePreviewSource } from "./FilePreviewModal.types";
 
-export interface ResolvedFilePreviewSource {
-  readonly kind: "image" | "pdf" | "document";
-  readonly mimeType?: string;
-  readonly uri: string;
-  readonly name?: string;
-  readonly sourceIdentifier?: string;
-  readonly srcFragment?: string;
-  readonly actionsSource?: MediaActionsSource;
-}
-
-export type FilePreviewSource = Omit<ResolvedFilePreviewSource, "uri"> &
-  (
-    | { readonly uri: string }
-    | { readonly attachment: FileBackedComposerAttachment }
-    | { readonly environmentId: EnvironmentId; readonly resource: AssetResource }
-  );
+export type { FilePreviewSource, ResolvedFilePreviewSource } from "./FilePreviewModal.types";
 
 function ResolvedFilePreview(props: {
   readonly source: FilePreviewSource;
diff --git a/apps/mobile/src/components/FilePreviewModal.types.ts b/apps/mobile/src/components/FilePreviewModal.types.ts
new file mode 100644
index 000000000000..6d125125c80f
--- /dev/null
+++ b/apps/mobile/src/components/FilePreviewModal.types.ts
@@ -0,0 +1,21 @@
+import type { AssetResource, EnvironmentId } from "@t3tools/contracts";
+
+import type { FileBackedComposerAttachment } from "../lib/composerImages";
+import type { MediaActionsSource } from "../lib/mediaActions";
+
+export interface ResolvedFilePreviewSource {
+  readonly kind: "image" | "pdf" | "document";
+  readonly mimeType?: string;
+  readonly uri: string;
+  readonly name?: string;
+  readonly sourceIdentifier?: string;
+  readonly srcFragment?: string;
+  readonly actionsSource?: MediaActionsSource;
+}
+
+export type FilePreviewSource = Omit<ResolvedFilePreviewSource, "uri"> &
+  (
+    | { readonly uri: string }
+    | { readonly attachment: FileBackedComposerAttachment }
+    | { readonly environmentId: EnvironmentId; readonly resource: AssetResource }
+  );
diff --git a/apps/mobile/src/components/MaterialButton.android.tsx b/apps/mobile/src/components/MaterialButton.android.tsx
index f2df6464f103..f7a62f1ecb0b 100644
--- a/apps/mobile/src/components/MaterialButton.android.tsx
+++ b/apps/mobile/src/components/MaterialButton.android.tsx
@@ -14,10 +14,12 @@ import { View } from "react-native";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
 import type { MaterialButtonProps } from "./MaterialButton";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 
 export function MaterialButton(props: MaterialButtonProps) {
   const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
   const typography = useScaledTextRole("footnote");
+  const { scale, mediumIconSize } = useAndroidControlSizing();
   const tone = props.tone ?? "secondary";
   const Component =
     tone === "text" ? TextButton : tone === "secondary" ? FilledTonalButton : Button;
@@ -77,11 +79,11 @@ export function MaterialButton(props: MaterialButtonProps) {
               {props.loading ? (
                 <>
                   <CircularProgressIndicator
-                    modifiers={[size(18, 18)]}
+                    modifiers={[size(mediumIconSize, mediumIconSize)]}
                     strokeWidth={2}
                     color={colors["--color-foreground-muted"]}
                   />
-                  <Box modifiers={[size(8, 1)]} />
+                  <Box modifiers={[size(8 * scale, 1)]} />
                 </>
               ) : null}
               <Text style={{ ...typography, fontWeight: "500" }}>{props.label}</Text>
diff --git a/apps/mobile/src/components/MaterialConfirmDialog.tsx b/apps/mobile/src/components/MaterialConfirmDialog.tsx
index c21ad042c39c..7154c7d716d8 100644
--- a/apps/mobile/src/components/MaterialConfirmDialog.tsx
+++ b/apps/mobile/src/components/MaterialConfirmDialog.tsx
@@ -1,4 +1,4 @@
-import type { ConfirmDialogRequest } from "./ConfirmDialogHost";
+import type { ConfirmDialogRequest } from "./ConfirmDialog.types";
 
 export interface MaterialConfirmDialogProps {
   readonly request: Pick<
diff --git a/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx b/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx
index 2882d0d91ec0..29f396fc9d6d 100644
--- a/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx
+++ b/apps/mobile/src/components/MaterialFloatingActionButton.android.tsx
@@ -6,8 +6,9 @@ import {
   LargeFloatingActionButton,
   Text,
 } from "@expo/ui/jetpack-compose";
-import { size } from "@expo/ui/jetpack-compose/modifiers";
+import { defaultMinSize, height, size, width } from "@expo/ui/jetpack-compose/modifiers";
 import { View, type StyleProp, type ViewStyle } from "react-native";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
 import { SymbolView, type AppSymbolName } from "./AppSymbol";
@@ -24,6 +25,8 @@ export function MaterialFloatingActionButton(props: {
 }) {
   const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
   const typography = useScaledTextRole("footnote");
+  const { scale, iconSize: standardIconSize, fabSize, largeFabSize } = useAndroidControlSizing();
+  const buttonSize = props.variant === "large" ? largeFabSize : fabSize;
   const primary = props.tone === "primary";
   const containerColor = colors[primary ? "--color-primary" : "--color-secondary"];
   const contentColor =
@@ -34,7 +37,7 @@ export function MaterialFloatingActionButton(props: {
       : props.variant === "large"
         ? LargeFloatingActionButton
         : FloatingActionButton;
-  const iconSize = props.variant === "large" ? 36 : 24;
+  const iconSize = props.variant === "large" ? Math.round(36 * scale) : standardIconSize;
   return (
     <View
       accessible
@@ -48,6 +51,11 @@ export function MaterialFloatingActionButton(props: {
       <View importantForAccessibility="no-hide-descendants">
         <Host matchContents colorScheme={themeAppearance} ignoreSafeAreaKeyboardInsets>
           <Component
+            modifiers={[
+              defaultMinSize({ minWidth: buttonSize }),
+              height(buttonSize),
+              ...(props.variant === "extended" ? [] : [width(buttonSize)]),
+            ]}
             containerColor={containerColor}
             onClick={props.onPress}
             expanded={props.expanded}
diff --git a/apps/mobile/src/components/MaterialIconButton.android.tsx b/apps/mobile/src/components/MaterialIconButton.android.tsx
index 21284249f79d..64387e3a4f48 100644
--- a/apps/mobile/src/components/MaterialIconButton.android.tsx
+++ b/apps/mobile/src/components/MaterialIconButton.android.tsx
@@ -8,6 +8,7 @@ import { size } from "@expo/ui/jetpack-compose/modifiers";
 import { View } from "react-native";
 
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 import { SymbolView, type AppSymbolName } from "./AppSymbol";
 
 export function MaterialIconButton(props: {
@@ -20,6 +21,7 @@ export function MaterialIconButton(props: {
   readonly tintColorClassName?: string;
 }) {
   const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
+  const { iconSize, buttonSize } = useAndroidControlSizing();
   const variant = props.variant ?? "standard";
   const Component =
     variant === "standard"
@@ -52,18 +54,18 @@ export function MaterialIconButton(props: {
       onAccessibilityAction={() => {
         if (!props.disabled) props.onPress?.();
       }}
-      style={{ width: 48, height: 48 }}
+      style={{ width: buttonSize, height: buttonSize }}
     >
       <View importantForAccessibility="no-hide-descendants">
         <Host
           colorScheme={themeAppearance}
           ignoreSafeAreaKeyboardInsets
-          style={{ width: 48, height: 48 }}
+          style={{ width: buttonSize, height: buttonSize }}
         >
           <Component
             onClick={props.onPress}
             enabled={!props.disabled}
-            modifiers={[size(48, 48)]}
+            modifiers={[size(buttonSize, buttonSize)]}
             colors={
               variant === "standard"
                 ? undefined
@@ -78,7 +80,7 @@ export function MaterialIconButton(props: {
       <View pointerEvents="none" className="absolute inset-0 items-center justify-center">
         <SymbolView
           name={props.icon === "ellipsis" ? { ios: "ellipsis", android: "more_vert" } : props.icon}
-          size={24}
+          size={iconSize}
           tintColorClassName={iconTint}
           type="monochrome"
         />
diff --git a/apps/mobile/src/components/MaterialListRow.tsx b/apps/mobile/src/components/MaterialListRow.tsx
index 539472e4bd96..cef104a02f50 100644
--- a/apps/mobile/src/components/MaterialListRow.tsx
+++ b/apps/mobile/src/components/MaterialListRow.tsx
@@ -5,6 +5,7 @@ import { useAppearancePreferences } from "../features/settings/appearance/Appear
 import { cn } from "../lib/cn";
 import { AppText } from "./AppText";
 import { SymbolView } from "./AppSymbol";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 
 /** Shared geometry for Material navigation and selection lists. Group rows in one card. */
 export function MaterialListRow({
@@ -23,6 +24,7 @@ export function MaterialListRow({
   readonly trailing?: ReactNode;
 }) {
   const { themeVariables } = useAppearancePreferences();
+  const { smallIconSize } = useAndroidControlSizing();
   return (
     <Pressable
       accessibilityRole="button"
@@ -52,7 +54,7 @@ export function MaterialListRow({
       {trailing !== undefined ? (
         trailing
       ) : !props.disabled ? (
-        <SymbolView name="chevron.right" size={16} tintColorClassName="accent-chevron" />
+        <SymbolView name="chevron.right" size={smallIconSize} tintColorClassName="accent-chevron" />
       ) : null}
     </Pressable>
   );
diff --git a/apps/mobile/src/components/MaterialMenuPopup.android.tsx b/apps/mobile/src/components/MaterialMenuPopup.android.tsx
index c49db1815039..4f9fe3d1ada4 100644
--- a/apps/mobile/src/components/MaterialMenuPopup.android.tsx
+++ b/apps/mobile/src/components/MaterialMenuPopup.android.tsx
@@ -7,9 +7,11 @@ import {
   RNHostView,
   Text,
 } from "@expo/ui/jetpack-compose";
-import { padding, size, width } from "@expo/ui/jetpack-compose/modifiers";
+import { defaultMinSize, padding, size, width } from "@expo/ui/jetpack-compose/modifiers";
 import { View } from "react-native";
+import { resolveScaledTextRole } from "../lib/appearancePreferences";
 
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 import type { MaterialMenuPopupProps } from "./MaterialMenuPopup";
 import { isAppSymbolName, SymbolView, type AppSymbolName } from "./AppSymbol";
@@ -19,12 +21,16 @@ function MenuIcon(props: {
   readonly destructive?: boolean;
   readonly disabled?: boolean;
 }) {
+  const { iconSize } = useAndroidControlSizing();
   return (
-    <RNHostView matchContents modifiers={[size(24, 24)]}>
-      <View style={{ width: 24, height: 24 }} importantForAccessibility="no-hide-descendants">
+    <RNHostView matchContents modifiers={[size(iconSize, iconSize)]}>
+      <View
+        style={{ width: iconSize, height: iconSize }}
+        importantForAccessibility="no-hide-descendants"
+      >
         <SymbolView
           name={props.name}
-          size={24}
+          size={iconSize}
           type="monochrome"
           tintColorClassName={
             props.disabled
@@ -41,24 +47,33 @@ function MenuIcon(props: {
 
 /** Native popup positioned at the original trigger, outside virtualized rows. */
 export function MaterialMenuPopup(props: MaterialMenuPopupProps) {
-  const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
+  const { appearance, themeAppearance, themeVariables: colors } = useAppearancePreferences();
+  const { scale, menuItemHeight } = useAndroidControlSizing();
+  const body = resolveScaledTextRole("body", appearance.baseFontSize);
+  const caption = resolveScaledTextRole("caption", appearance.baseFontSize);
   const foreground = colors["--color-foreground"];
   const muted = colors["--color-foreground-muted"];
+  // A fixed native item height clips wrapped labels; a minimum lets each row grow.
+  const itemModifiers = [width(props.menuWidth), defaultMinSize({ minHeight: menuItemHeight })];
   const items = (
     <>
       {props.parent ? (
-        <DropdownMenuItem onClick={props.onBack} modifiers={[width(250)]}>
+        <DropdownMenuItem onClick={props.onBack} modifiers={itemModifiers}>
           <DropdownMenuItem.LeadingIcon>
             <MenuIcon name="arrow.left" />
           </DropdownMenuItem.LeadingIcon>
           <DropdownMenuItem.Text>
-            <Text color={foreground} style={{ typography: "bodyLarge" }}>
+            <Text color={foreground} style={{ typography: "bodyLarge", ...body }}>
               {props.parent.title}
             </Text>
           </DropdownMenuItem.Text>
         </DropdownMenuItem>
       ) : props.title ? (
-        <Text color={muted} style={{ typography: "bodySmall" }} modifiers={[padding(16, 8, 16, 8)]}>
+        <Text
+          color={muted}
+          style={{ typography: "bodySmall", ...caption }}
+          modifiers={[padding(16 * scale, 8 * scale, 16 * scale, 8 * scale)]}
+        >
           {props.title}
         </Text>
       ) : null}
@@ -66,19 +81,22 @@ export function MaterialMenuPopup(props: MaterialMenuPopupProps) {
         <DropdownMenuItem
           key={action.id ?? `${index}-${action.title}`}
           enabled={!action.attributes?.disabled}
-          modifiers={[width(250)]}
-          elementColors={{
-            textColor: action.attributes?.destructive
-              ? colors["--color-danger-foreground"]
-              : foreground,
-            disabledTextColor: muted,
-          }}
+          modifiers={itemModifiers}
           onClick={() => props.onPress(action)}
         >
+          {action.image && isAppSymbolName(action.image) ? (
+            <DropdownMenuItem.LeadingIcon>
+              <MenuIcon
+                name={action.image}
+                destructive={action.attributes?.destructive}
+                disabled={action.attributes?.disabled}
+              />
+            </DropdownMenuItem.LeadingIcon>
+          ) : null}
           <DropdownMenuItem.Text>
             <Column>
               <Text
-                style={{ typography: "bodyLarge" }}
+                style={{ typography: "bodyLarge", ...body }}
                 color={
                   action.attributes?.disabled
                     ? muted
@@ -90,21 +108,12 @@ export function MaterialMenuPopup(props: MaterialMenuPopupProps) {
                 {action.title}
               </Text>
               {action.subtitle ? (
-                <Text color={muted} style={{ typography: "bodySmall" }}>
+                <Text color={muted} style={{ typography: "bodySmall", ...caption }}>
                   {action.subtitle}
                 </Text>
               ) : null}
             </Column>
           </DropdownMenuItem.Text>
-          {action.image && isAppSymbolName(action.image) ? (
-            <DropdownMenuItem.LeadingIcon>
-              <MenuIcon
-                name={action.image}
-                destructive={action.attributes?.destructive}
-                disabled={action.attributes?.disabled}
-              />
-            </DropdownMenuItem.LeadingIcon>
-          ) : null}
           {(action.subactions?.length ?? 0) > 0 ? (
             <DropdownMenuItem.TrailingIcon>
               <MenuIcon name="chevron.right" disabled={action.attributes?.disabled} />
@@ -124,7 +133,7 @@ export function MaterialMenuPopup(props: MaterialMenuPopupProps) {
         colorScheme={themeAppearance}
         ignoreSafeAreaKeyboardInsets
         matchContents
-        style={{ width: 250 }}
+        style={{ width: props.menuWidth }}
       >
         <Column>{items}</Column>
       </Host>
diff --git a/apps/mobile/src/components/MaterialMenuPopup.tsx b/apps/mobile/src/components/MaterialMenuPopup.tsx
index 3a23e5de7ab4..06019a0e1512 100644
--- a/apps/mobile/src/components/MaterialMenuPopup.tsx
+++ b/apps/mobile/src/components/MaterialMenuPopup.tsx
@@ -1,6 +1,7 @@
 import type { MenuAction } from "@react-native-menu/menu";
 
 export interface MaterialMenuPopupProps {
+  readonly menuWidth: number;
   readonly anchor: {
     readonly x: number;
     readonly y: number;
diff --git a/apps/mobile/src/components/MaterialScrollComposeButton.android.tsx b/apps/mobile/src/components/MaterialScrollComposeButton.android.tsx
index 018dbdc19b42..8c653e67ee9a 100644
--- a/apps/mobile/src/components/MaterialScrollComposeButton.android.tsx
+++ b/apps/mobile/src/components/MaterialScrollComposeButton.android.tsx
@@ -1,9 +1,17 @@
 import { Box, ExtendedFloatingActionButton, Host, Icon, Text } from "@expo/ui/jetpack-compose";
-import { fillMaxWidth, onSizeChanged, size } from "@expo/ui/jetpack-compose/modifiers";
+import {
+  defaultMinSize,
+  fillMaxWidth,
+  graphicsLayer,
+  height,
+  onSizeChanged,
+  size,
+} from "@expo/ui/jetpack-compose/modifiers";
 import { useCallback, useState } from "react";
 import { Pressable, View, type StyleProp, type ViewStyle } from "react-native";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
-import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
+import { resolveScaledTextRole } from "../lib/appearancePreferences";
 
 /** Keep the animated width and icon positioning entirely inside Compose, not Yoga. */
 export function MaterialScrollComposeButton(props: {
@@ -12,14 +20,23 @@ export function MaterialScrollComposeButton(props: {
   readonly className?: string;
   readonly style?: StyleProp<ViewStyle>;
 }) {
-  const { themeAppearance, themeVariables: colors } = useAppearancePreferences();
-  const typography = useScaledTextRole("footnote");
-  const [expandedWidth, setExpandedWidth] = useState(56);
+  const { appearance, themeAppearance, themeVariables: colors } = useAppearancePreferences();
+  const typography = resolveScaledTextRole("footnote", appearance.baseFontSize);
+  const { iconSize, fabSize } = useAndroidControlSizing();
+  // Scale the native 56dp minimum; keep text and icons at their requested sizes.
+  const nativeSize = Math.max(56, fabSize);
+  const scale = fabSize / nativeSize;
+  const nativeIconSize = Math.round(iconSize / scale);
+  const [buttonWidth, setButtonWidth] = useState(nativeSize);
   const rememberWidth = useCallback(({ width }: { width: number }) => {
-    setExpandedWidth((previous) => Math.max(previous, width));
+    setButtonWidth((previous) => Math.max(previous, width));
   }, []);
   return (
-    <View pointerEvents="box-none" className={props.className} style={[props.style, { left: 20 }]}>
+    <View
+      pointerEvents="box-none"
+      className={props.className}
+      style={[props.style, { left: 20, height: fabSize }]}
+    >
       <View pointerEvents="none" importantForAccessibility="no-hide-descendants">
         <Host
           matchContents={{ vertical: true }}
@@ -31,13 +48,23 @@ export function MaterialScrollComposeButton(props: {
             <ExtendedFloatingActionButton
               expanded={props.expanded}
               containerColor={colors["--color-primary"]}
-              modifiers={[onSizeChanged(rememberWidth)]}
+              modifiers={[
+                defaultMinSize({ minWidth: nativeSize }),
+                height(nativeSize),
+                graphicsLayer({
+                  scaleX: scale,
+                  scaleY: scale,
+                  transformOriginX: 1,
+                  transformOriginY: 0,
+                }),
+                onSizeChanged(rememberWidth),
+              ]}
             >
               <ExtendedFloatingActionButton.Icon>
-                <Box modifiers={[size(24, 24)]}>
+                <Box modifiers={[size(nativeIconSize, nativeIconSize)]}>
                   <Icon
                     source={require("../../assets/icons/compose.xml")}
-                    size={24}
+                    size={nativeIconSize}
                     tint={colors["--color-primary-foreground"]}
                   />
                 </Box>
@@ -45,7 +72,11 @@ export function MaterialScrollComposeButton(props: {
               <ExtendedFloatingActionButton.Text>
                 <Text
                   color={colors["--color-primary-foreground"]}
-                  style={{ ...typography, fontWeight: "500" }}
+                  style={{
+                    fontSize: typography.fontSize / scale,
+                    lineHeight: typography.lineHeight / scale,
+                    fontWeight: "500",
+                  }}
                 >
                   New thread
                 </Text>
@@ -65,8 +96,9 @@ export function MaterialScrollComposeButton(props: {
           right: 0,
           top: 0,
           bottom: 0,
-          width: props.expanded ? expandedWidth : 56,
-          borderRadius: 16,
+          // Release the label area as soon as collapse starts, before native measurements arrive.
+          width: props.expanded ? buttonWidth * scale : fabSize,
+          borderRadius: 16 * scale,
           overflow: "hidden",
         }}
       />
diff --git a/apps/mobile/src/components/MaterialSearchField.tsx b/apps/mobile/src/components/MaterialSearchField.tsx
index ab96440f5f09..3609430a6e1a 100644
--- a/apps/mobile/src/components/MaterialSearchField.tsx
+++ b/apps/mobile/src/components/MaterialSearchField.tsx
@@ -2,6 +2,7 @@ import type { RefObject } from "react";
 import { Pressable, TextInput, View } from "react-native";
 
 import { SymbolView } from "./AppSymbol";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 
 export function MaterialSearchField({
   inputRef,
@@ -18,9 +19,21 @@ export function MaterialSearchField({
   readonly value: string;
   readonly onChangeText: (value: string) => void;
 }) {
+  const { scale, mediumIconSize } = useAndroidControlSizing();
   return (
-    <View className="h-12 min-w-0 flex-1 flex-row items-center gap-2 rounded-full border border-input-border bg-input px-3">
-      <SymbolView name="magnifyingglass" size={18} tintColorClassName="accent-foreground-muted" />
+    <View
+      className="min-w-0 flex-1 flex-row items-center rounded-full border border-input-border bg-input"
+      style={{
+        minHeight: Math.max(48, 42 * scale),
+        gap: 7 * scale,
+        paddingHorizontal: 10.5 * scale,
+      }}
+    >
+      <SymbolView
+        name="magnifyingglass"
+        size={mediumIconSize}
+        tintColorClassName="accent-foreground-muted"
+      />
       <TextInput
         ref={inputRef}
         accessibilityLabel={accessibilityLabel}
@@ -33,7 +46,8 @@ export function MaterialSearchField({
         selectionColorClassName="accent-focus/32"
         cursorColorClassName="accent-focus"
         selectionHandleColorClassName="accent-focus"
-        className="min-w-0 flex-1 py-2 font-sans text-base text-foreground"
+        className="min-w-0 flex-1 font-sans text-base text-foreground"
+        style={{ paddingVertical: 7 * scale }}
         value={value}
         onChangeText={onChangeText}
       />
@@ -49,7 +63,7 @@ export function MaterialSearchField({
         >
           <SymbolView
             name="xmark.circle.fill"
-            size={18}
+            size={mediumIconSize}
             tintColorClassName="accent-foreground-muted"
           />
         </Pressable>
diff --git a/apps/mobile/src/components/MaterialSegmentedButtons.android.tsx b/apps/mobile/src/components/MaterialSegmentedButtons.android.tsx
index ceea91b24447..e941fc52eef1 100644
--- a/apps/mobile/src/components/MaterialSegmentedButtons.android.tsx
+++ b/apps/mobile/src/components/MaterialSegmentedButtons.android.tsx
@@ -2,7 +2,7 @@ import { SegmentedButton, SingleChoiceSegmentedButtonRow, Text } from "@expo/ui/
 import { defaultMinSize, fillMaxWidth } from "@expo/ui/jetpack-compose/modifiers";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
-import type { SegmentedControlProps } from "./SegmentedControl";
+import type { SegmentedControlProps } from "./SegmentedControl.types";
 
 /** Compose content shared by screen controls and native dialogs, inside their existing Host. */
 export function MaterialSegmentedButtons<Value extends number | string>(
diff --git a/apps/mobile/src/components/MaterialSegmentedControl.android.tsx b/apps/mobile/src/components/MaterialSegmentedControl.android.tsx
index 16ec879821e1..76734e14d763 100644
--- a/apps/mobile/src/components/MaterialSegmentedControl.android.tsx
+++ b/apps/mobile/src/components/MaterialSegmentedControl.android.tsx
@@ -3,7 +3,7 @@ import { MaterialSegmentedButtons } from "./MaterialSegmentedButtons.android";
 import { View } from "react-native";
 
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
-import type { SegmentedControlProps } from "./SegmentedControl";
+import type { SegmentedControlProps } from "./SegmentedControl.types";
 
 export function MaterialSegmentedControl<Value extends number | string>(
   props: SegmentedControlProps<Value>,
diff --git a/apps/mobile/src/components/MaterialSegmentedControl.tsx b/apps/mobile/src/components/MaterialSegmentedControl.tsx
index eca51d2d3f26..0935da6cd66c 100644
--- a/apps/mobile/src/components/MaterialSegmentedControl.tsx
+++ b/apps/mobile/src/components/MaterialSegmentedControl.tsx
@@ -1,4 +1,4 @@
-import type { SegmentedControlProps } from "./SegmentedControl";
+import type { SegmentedControlProps } from "./SegmentedControl.types";
 
 export function MaterialSegmentedControl<Value extends number | string>(
   _props: SegmentedControlProps<Value>,
diff --git a/apps/mobile/src/components/MaterialSwitch.android.tsx b/apps/mobile/src/components/MaterialSwitch.android.tsx
index 2bc9d11130d7..f08fa78690f7 100644
--- a/apps/mobile/src/components/MaterialSwitch.android.tsx
+++ b/apps/mobile/src/components/MaterialSwitch.android.tsx
@@ -1,6 +1,6 @@
 import { Host, Switch as ComposeSwitch } from "@expo/ui/jetpack-compose";
 import { View } from "react-native";
-import type { ThemedSwitchProps } from "./ThemedSwitch";
+import type { ThemedSwitchProps } from "./MaterialSwitch.types";
 
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
 
diff --git a/apps/mobile/src/components/MaterialSwitch.types.ts b/apps/mobile/src/components/MaterialSwitch.types.ts
new file mode 100644
index 000000000000..657a2139a69e
--- /dev/null
+++ b/apps/mobile/src/components/MaterialSwitch.types.ts
@@ -0,0 +1,12 @@
+import type { SwitchProps } from "react-native";
+
+export type ThemedSwitchProps = Pick<
+  SwitchProps,
+  | "accessibilityHint"
+  | "accessibilityLabel"
+  | "disabled"
+  | "onValueChange"
+  | "style"
+  | "testID"
+  | "value"
+>;
diff --git a/apps/mobile/src/components/MediaImagePreview.tsx b/apps/mobile/src/components/MediaImagePreview.tsx
index 03e317c296af..09bebcb28b66 100644
--- a/apps/mobile/src/components/MediaImagePreview.tsx
+++ b/apps/mobile/src/components/MediaImagePreview.tsx
@@ -6,7 +6,7 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useMediaActions } from "../lib/mediaActions";
 import { AppText } from "./AppText";
 import { SymbolView } from "./AppSymbol";
-import type { ResolvedFilePreviewSource } from "./FilePreviewModal";
+import type { ResolvedFilePreviewSource } from "./FilePreviewModal.types";
 import { MediaActionsMenu } from "./MediaActionsMenu";
 import { MediaSourceCaption } from "./MediaSourceCaption";
 
diff --git a/apps/mobile/src/components/ProjectFavicon.tsx b/apps/mobile/src/components/ProjectFavicon.tsx
index 932fc6779f20..83505730d808 100644
--- a/apps/mobile/src/components/ProjectFavicon.tsx
+++ b/apps/mobile/src/components/ProjectFavicon.tsx
@@ -1,8 +1,9 @@
 import { SymbolView } from "./AppSymbol";
+import { AppText } from "./AppText";
 import { Image } from "expo-image";
 import { useLayoutEffect, useMemo, useState } from "react";
 import { View } from "react-native";
-import type { EnvironmentId } from "@t3tools/contracts";
+import type { EnvironmentId, ProjectIconOverride } from "@t3tools/contracts";
 import {
   getProjectFaviconCacheKey,
   getProjectFaviconResourceKey,
@@ -11,6 +12,12 @@ import {
 import { useAtomValue } from "@effect/atom-react";
 import { Atom } from "effect/unstable/reactivity";
 import { projectFaviconUrlAtom } from "../state/assets";
+import {
+  countGlyphs,
+  projectIconColorClassNames,
+  resolveProjectIconGlyph,
+  type ProjectIconGlyph,
+} from "../lib/projectIcon";
 
 import {
   beginProjectFaviconRequest,
@@ -18,7 +25,7 @@ import {
   hasLoadedProjectFavicon,
   markProjectFaviconFailed,
   markProjectFaviconLoaded,
-} from "./projectFaviconCache";
+} from "../lib/projectFaviconRequests";
 
 const EMPTY_FAVICON_URL = Atom.make<string | null>(null);
 
@@ -30,10 +37,12 @@ export function ProjectFavicon(props: {
   readonly projectTitle: string;
   readonly workspaceRoot?: string | null;
   readonly faviconPath?: string | null;
+  readonly projectIcon?: ProjectIconOverride | null;
 }) {
   const size = props.size ?? 42;
+  const glyph = resolveProjectIconGlyph(props.projectIcon, props.projectTitle);
   const faviconUrl = useAtomValue(
-    props.workspaceRoot == null
+    props.workspaceRoot == null || glyph !== null
       ? EMPTY_FAVICON_URL
       : projectFaviconUrlAtom({
           environmentId: props.environmentId,
@@ -51,6 +60,10 @@ export function ProjectFavicon(props: {
         : getProjectFaviconCacheKey(props.environmentId, props.workspaceRoot, renderableFaviconUrl)
       : null;
 
+  if (glyph !== null) {
+    return <ProjectIconGlyphView glyph={glyph} size={size} />;
+  }
+
   return (
     <ProjectFaviconImage
       key={cacheKey}
@@ -63,6 +76,56 @@ export function ProjectFavicon(props: {
   );
 }
 
+function ProjectIconGlyphView(props: { readonly glyph: ProjectIconGlyph; readonly size: number }) {
+  const { glyph, size } = props;
+  if (glyph.kind === "emoji") {
+    return (
+      <View style={{ width: size, height: size, alignItems: "center", justifyContent: "center" }}>
+        <AppText
+          allowFontScaling={false}
+          style={{
+            fontSize: size * 0.8,
+            lineHeight: size,
+            textAlign: "center",
+            includeFontPadding: false,
+          }}
+        >
+          {glyph.emoji}
+        </AppText>
+      </View>
+    );
+  }
+
+  const colors = projectIconColorClassNames(glyph.color);
+  return (
+    <View
+      className={colors.background}
+      style={{
+        width: size,
+        height: size,
+        borderRadius: size * 0.25,
+        alignItems: "center",
+        justifyContent: "center",
+      }}
+    >
+      <AppText
+        allowFontScaling={false}
+        numberOfLines={1}
+        className={`font-mono ${colors.text}`}
+        style={{
+          fontWeight: "700",
+          fontSize: size * (countGlyphs(glyph.text) === 1 ? 0.6 : 0.515625),
+          lineHeight: size,
+          textAlign: "center",
+          includeFontPadding: false,
+        }}
+      >
+        {glyph.text}
+      </AppText>
+    </View>
+  );
+}
+
 function ProjectFaviconImage(props: {
   readonly cacheKey: string | null;
   readonly faviconUrl: string | null;
@@ -105,7 +168,7 @@ function ProjectFaviconImage(props: {
       {!showImage ? (
         <SymbolView
           name={{ ios: "folder.fill", android: props.open ? "folder_open" : "folder" }}
-          size={props.size * 0.78}
+          size={props.size}
           tintColorClassName={"accent-icon-subtle"}
           type="monochrome"
         />
diff --git a/apps/mobile/src/components/ProviderIcon.tsx b/apps/mobile/src/components/ProviderIcon.tsx
index 374738d0aeca..49de96a8d74c 100644
--- a/apps/mobile/src/components/ProviderIcon.tsx
+++ b/apps/mobile/src/components/ProviderIcon.tsx
@@ -75,10 +75,12 @@ export function ProviderIcon(props: ProviderIconProps) {
 
   // codex (and unknown drivers)
   return (
-    <Svg width={size} height={size} viewBox="0 0 256 260" fill="none">
+    <Svg width={size} height={size} viewBox="100 100 411 411" fill="none">
       <Path
         fill={mono}
-        d="M239.184 106.203a64.716 64.716 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.716 64.716 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.665 64.665 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.767 64.767 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483Zm-97.56 136.338a48.397 48.397 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.595 8.595 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601Zm-104.466-44.61a48.345 48.345 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.339 8.339 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803ZM23.549 85.38a48.499 48.499 0 0 1 25.58-21.333v61.39a8.288 8.288 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.819.819 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405v.256Zm179.466 41.695-63.08-36.63L161.73 77.86a.819.819 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.544 8.544 0 0 0-4.4-7.213Zm21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.716.716 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391v.205ZM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.595 8.595 0 0 0-4.246 7.367l-.051 72.697Zm11.868-25.58 28.138-16.217 28.188 16.218v32.434l-28.086 16.218-28.188-16.218-.052-32.434Z"
+        fillRule="evenodd"
+        clipRule="evenodd"
+        d="M252.794 108.802C289.191 99.0484 326.265 110.305 351.148 135.135C385.113 126.072 422.85 134.862 449.492 161.505C476.136 188.149 484.925 225.888 475.862 259.85V259.854C500.696 284.735 511.95 321.81 502.198 358.207C492.447 394.602 464.161 421.084 430.215 430.217C421.083 464.162 394.603 492.448 358.206 502.199C321.812 511.951 284.734 500.693 259.852 475.864C225.887 484.927 188.15 476.137 161.507 449.495C134.864 422.851 126.073 385.111 135.136 351.149C110.304 326.266 99.0496 289.192 108.801 252.795C118.552 216.4 146.84 189.918 180.784 180.785C189.917 146.841 216.396 118.553 252.794 108.802ZM374.292 407.145C374.292 411.271 372.092 415.086 368.517 417.148L283.723 466.102C302.487 480.585 327.555 486.459 352.217 479.852C386.997 470.532 410.068 439.312 410.555 405.006V317.717C410.555 315.08 409.125 312.621 406.843 311.303L374.292 292.509V407.145ZM251.868 415.897C248.296 417.959 243.893 417.959 240.317 415.897L155.526 366.942C152.366 390.436 159.811 415.08 177.866 433.136H177.863C203.325 458.594 241.896 462.962 271.85 446.232L347.449 402.586C349.735 401.268 351.148 398.8 351.148 396.163V358.579L251.868 415.897ZM368.602 220.628C366.319 219.309 363.474 219.318 361.191 220.637L328.641 239.431L427.921 296.749C431.496 298.811 433.697 302.627 433.697 306.752V404.661C455.622 395.654 473.244 376.881 479.851 352.218C489.169 317.442 473.668 281.85 444.201 264.274L368.602 220.628ZM177.303 206.34C155.377 215.348 137.756 234.122 131.148 258.783C121.832 293.561 137.331 329.153 166.799 346.727L242.398 390.373C244.68 391.692 247.525 391.684 249.807 390.366L282.357 371.572L183.078 314.253C179.504 312.189 177.303 308.375 177.303 304.251V206.34ZM259.849 279.145V331.858L305.5 358.213L351.15 331.858V279.145L305.5 252.789L259.849 279.145ZM327.276 144.9C308.512 130.418 283.445 124.543 258.782 131.15C224.002 140.471 200.931 171.691 200.445 205.995V293.286C200.445 295.923 201.875 298.381 204.158 299.7L236.707 318.493V203.856C236.707 199.731 238.909 195.916 242.483 193.853L327.276 144.9ZM433.137 177.867C407.675 152.407 369.103 148.038 339.149 164.769L263.55 208.415C261.265 209.734 259.852 212.202 259.852 214.838V252.423L359.132 195.105C362.703 193.041 367.108 193.041 370.682 195.105L455.473 244.06C458.635 220.567 451.189 195.922 433.135 177.867H433.137Z"
       />
     </Svg>
   );
diff --git a/apps/mobile/src/components/RenderErrorBoundary.tsx b/apps/mobile/src/components/RenderErrorBoundary.tsx
new file mode 100644
index 000000000000..9b71916d01e7
--- /dev/null
+++ b/apps/mobile/src/components/RenderErrorBoundary.tsx
@@ -0,0 +1,127 @@
+import { Component, type ReactNode } from "react";
+import { ScrollView, View } from "react-native";
+
+import { AppText as Text } from "./AppText";
+import { MaterialButton } from "./MaterialButton";
+import { copyTextWithHaptic } from "../lib/copyTextWithHaptic";
+
+interface RenderErrorBoundaryProps {
+  readonly children: ReactNode;
+  readonly resetKeys?: ReadonlyArray<unknown>;
+  readonly renderFallback?: (props: RenderFailureProps) => ReactNode;
+}
+
+interface RenderErrorBoundaryState {
+  readonly failed: boolean;
+  readonly error: unknown;
+  readonly componentStack?: string;
+  readonly resetKeys?: ReadonlyArray<unknown>;
+}
+
+export interface RenderFailureProps {
+  readonly details: string;
+  readonly retry: () => void;
+}
+
+function errorDetails(error: unknown, componentStack?: string): string {
+  let description: string;
+  try {
+    description = error instanceof Error ? (error.stack ?? error.message) : String(error);
+  } catch {
+    description = "Unknown render error";
+  }
+  return componentStack ? `${description}\nComponent stack:\n${componentStack}` : description;
+}
+
+/** A failed subtree remounts on retry or when its identifying inputs change. */
+export class RenderErrorBoundary extends Component<
+  RenderErrorBoundaryProps,
+  RenderErrorBoundaryState
+> {
+  override state: RenderErrorBoundaryState = {
+    failed: false,
+    error: null,
+    resetKeys: this.props.resetKeys,
+  };
+
+  static getDerivedStateFromProps(
+    { resetKeys }: RenderErrorBoundaryProps,
+    state: RenderErrorBoundaryState,
+  ): Partial<RenderErrorBoundaryState> | null {
+    if (
+      resetKeys?.length !== state.resetKeys?.length ||
+      resetKeys?.some((key, index) => !Object.is(key, state.resetKeys?.[index]))
+    ) {
+      return { failed: false, error: null, componentStack: undefined, resetKeys };
+    }
+    return null;
+  }
+
+  static getDerivedStateFromError(error: unknown): Partial<RenderErrorBoundaryState> {
+    return { failed: true, error };
+  }
+
+  override componentDidCatch(_error: unknown, info: { componentStack?: string }) {
+    this.setState({ componentStack: info.componentStack });
+  }
+
+  private readonly retry = () => {
+    this.setState({ failed: false, error: null, componentStack: undefined });
+  };
+
+  override render() {
+    if (!this.state.failed) return this.props.children;
+    const fallback =
+      this.props.renderFallback ??
+      ((props: RenderFailureProps) => <RenderFailureView {...props} />);
+    return fallback({
+      details: errorDetails(this.state.error, this.state.componentStack),
+      retry: this.retry,
+    });
+  }
+}
+
+export function RenderFailureView(
+  props: RenderFailureProps & {
+    readonly title?: string;
+    readonly bottomInset?: number;
+    readonly exit?: { readonly label: string; readonly onPress: () => void };
+  },
+) {
+  const title = props.title ?? "This screen couldn't be displayed";
+  return (
+    <ScrollView
+      className="flex-1 bg-screen"
+      contentContainerClassName="flex-grow items-center justify-center gap-5 px-6 py-8"
+      contentContainerStyle={
+        props.bottomInset ? { paddingBottom: 32 + props.bottomInset } : undefined
+      }
+    >
+      <Text accessibilityRole="header" className="text-center text-xl font-t3-bold">
+        {title}
+      </Text>
+      <Text className="text-center text-sm text-foreground-muted">
+        Try again. If it keeps happening, copy the details for a bug report.
+      </Text>
+      <Text selectable className="text-center font-mono text-xs text-danger-foreground">
+        {props.details.split("\n", 1)[0]?.slice(0, 300)}
+      </Text>
+      <View className="w-full max-w-xs gap-2">
+        <MaterialButton label="Try again" onPress={props.retry} tone="primary" fullWidth />
+        <MaterialButton
+          label="Copy details"
+          onPress={() => copyTextWithHaptic(props.details, { target: "error details" })}
+          fullWidth
+        />
+        {props.exit ? (
+          <MaterialButton
+            label={props.exit.label}
+            onPress={props.exit.onPress}
+            tone="text"
+            fullWidth
+          />
+        ) : null}
+      </View>
+    </ScrollView>
+  );
+}
diff --git a/apps/mobile/src/components/ScreenHeader.android.tsx b/apps/mobile/src/components/ScreenHeader.android.tsx
index 61a38c3a00c2..1d3232fd1641 100644
--- a/apps/mobile/src/components/ScreenHeader.android.tsx
+++ b/apps/mobile/src/components/ScreenHeader.android.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { BackHandler, Keyboard, Pressable, TextInput, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useMaterialToolbarLayout } from "./useMaterialToolbarLayout";
 import { NativeStackScreenOptions } from "../native/StackHeader";
 import { AndroidWorkspaceSidebarButton } from "../features/layout/workspace-sidebar-toolbar";
 import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
@@ -11,10 +11,12 @@ import { ControlPillMenu } from "./ControlPill";
 import { MaterialSearchField } from "./MaterialSearchField";
 import { androidHeaderMenuActions, findHeaderMenuAction } from "./headerMenu.android";
 import type { ScreenHeaderProps } from "./ScreenHeader.types";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
 
 export function ScreenHeader(props: ScreenHeaderProps) {
   const { search } = props;
-  const insets = useSafeAreaInsets();
+  const { paddingTop, paddingBottom } = useMaterialToolbarLayout();
+  const { scale, buttonSize, iconSize, smallIconSize } = useAndroidControlSizing();
   const { themeVariables } = useAppearancePreferences();
   const inputRef = useRef<TextInput>(null);
   const [searchOpen, setSearchOpen] = useState(false);
@@ -48,11 +50,12 @@ export function ScreenHeader(props: ScreenHeaderProps) {
         <Pressable
           accessibilityLabel={menu.title}
           accessibilityRole="button"
-          className="size-11 items-center justify-center rounded-full bg-subtle"
+          className="items-center justify-center rounded-full bg-subtle"
+          style={{ width: buttonSize, height: buttonSize }}
         >
           <SymbolView
             name={menu.icon}
-            size={16}
+            size={smallIconSize}
             tintColorClassName="accent-header-foreground"
             type="monochrome"
           />
@@ -80,30 +83,43 @@ export function ScreenHeader(props: ScreenHeaderProps) {
       <>
         {options}
         <View
-          className="border-b border-header-border bg-header px-3 pb-2.5"
-          style={{ paddingTop: Math.max(insets.top, 12), borderBottomWidth: 0 }}
+          className="border-b border-header-border bg-header px-3"
+          style={{
+            paddingTop,
+            paddingBottom: 8.75 * scale,
+            borderBottomWidth: 0,
+          }}
         >
-          <View className="min-h-12 flex-row items-center gap-2">
+          <View className="flex-row items-center gap-2" style={{ minHeight: buttonSize }}>
             {props.onBack ? (
               <Pressable
                 accessibilityLabel="Navigate up"
                 accessibilityRole="button"
                 hitSlop={8}
                 onPress={props.onBack}
-                className="size-11 items-center justify-center"
+                className="items-center justify-center"
+                style={{ width: buttonSize, height: buttonSize }}
               >
                 <SymbolView
                   name="chevron.left"
-                  size={24}
+                  size={iconSize}
                   tintColorClassName="accent-header-foreground"
                   type="monochrome"
                 />
               </Pressable>
             ) : null}
-            <View className="min-h-11 flex-1 flex-row items-center gap-2.5 rounded-2xl bg-input px-3.5">
+            <View
+              className="flex-1 flex-row items-center bg-input"
+              style={{
+                minHeight: Math.max(48, 38.5 * scale),
+                gap: 8.75 * scale,
+                borderRadius: 14 * scale,
+                paddingHorizontal: 12.25 * scale,
+              }}
+            >
               <SymbolView
                 name="magnifyingglass"
-                size={17}
+                size={Math.round(17 * scale)}
                 tintColorClassName="accent-header-foreground"
                 type="monochrome"
               />
@@ -112,9 +128,14 @@ export function ScreenHeader(props: ScreenHeaderProps) {
                 autoCapitalize="none"
                 onChangeText={search.onChangeText}
                 value={search.value}
-                placeholder={search.placeholder}
+                placeholder={
+                  search.compactToolbar
+                    ? (search.compactPlaceholder ?? search.placeholder)
+                    : search.placeholder
+                }
                 placeholderTextColorClassName="accent-placeholder"
-                className="flex-1 py-2 text-base font-sans text-header-foreground"
+                className="flex-1 text-base font-sans text-header-foreground"
+                style={{ paddingVertical: 7 * scale }}
               />
             </View>
             {menuView}
@@ -173,11 +194,8 @@ export function ScreenHeader(props: ScreenHeaderProps) {
             {header}
           </View>
           {searching ? (
-            <View
-              className="absolute inset-0 bg-header px-2 pb-2"
-              style={{ paddingTop: Math.max(insets.top, 12) }}
-            >
-              <View className="min-h-14 flex-1 flex-row items-center gap-1">
+            <View className="absolute inset-0 bg-header px-2" style={{ paddingTop, paddingBottom }}>
+              <View className="flex-1 flex-row items-center gap-1">
                 <ScreenHeaderButton
                   accessibilityLabel={search.closeAccessibilityLabel ?? "Close search"}
                   icon="arrow.left"
diff --git a/apps/mobile/src/components/SegmentedControl.tsx b/apps/mobile/src/components/SegmentedControl.tsx
index e1e61cda26df..8e4d6c3130bc 100644
--- a/apps/mobile/src/components/SegmentedControl.tsx
+++ b/apps/mobile/src/components/SegmentedControl.tsx
@@ -3,21 +3,9 @@ import Animated, { Easing, LinearTransition, ReduceMotion } from "react-native-r
 import { AppText as Text } from "./AppText";
 import { cn } from "../lib/cn";
 import { MaterialSegmentedControl } from "./MaterialSegmentedControl";
+import type { SegmentedControlProps } from "./SegmentedControl.types";
 
-export interface SegmentedControlProps<Value extends number | string> {
-  readonly options: readonly {
-    readonly value: Value;
-    readonly label: string;
-    readonly accessibilityLabel?: string;
-  }[];
-  readonly selected: Value;
-  readonly onSelect: (value: Value) => void;
-  /** Compact sizing applies to the non-Material control. */
-  readonly size?: "default" | "compact";
-  /** "tab" for the view switcher; filters stay plain buttons. */
-  readonly role?: "tab" | "button";
-  readonly className?: string;
-}
+export type { SegmentedControlProps } from "./SegmentedControl.types";
 
 export function SegmentedControl<Value extends number | string>(
   props: SegmentedControlProps<Value>,
diff --git a/apps/mobile/src/components/SegmentedControl.types.ts b/apps/mobile/src/components/SegmentedControl.types.ts
new file mode 100644
index 000000000000..921dcdb1cbde
--- /dev/null
+++ b/apps/mobile/src/components/SegmentedControl.types.ts
@@ -0,0 +1,14 @@
+export interface SegmentedControlProps<Value extends number | string> {
+  readonly options: readonly {
+    readonly value: Value;
+    readonly label: string;
+    readonly accessibilityLabel?: string;
+  }[];
+  readonly selected: Value;
+  readonly onSelect: (value: Value) => void;
+  /** Compact sizing applies to the non-Material control. */
+  readonly size?: "default" | "compact";
+  /** "tab" for the view switcher; filters stay plain buttons. */
+  readonly role?: "tab" | "button";
+  readonly className?: string;
+}
diff --git a/apps/mobile/src/components/ThemedSwitch.tsx b/apps/mobile/src/components/ThemedSwitch.tsx
index f0cf8701e50c..d88ace54cb49 100644
--- a/apps/mobile/src/components/ThemedSwitch.tsx
+++ b/apps/mobile/src/components/ThemedSwitch.tsx
@@ -1,17 +1,9 @@
-import { Platform, Switch, type SwitchProps } from "react-native";
+import { Platform, Switch } from "react-native";
 
 import { MaterialSwitch } from "./MaterialSwitch";
+import type { ThemedSwitchProps } from "./MaterialSwitch.types";
 
-export type ThemedSwitchProps = Pick<
-  SwitchProps,
-  | "accessibilityHint"
-  | "accessibilityLabel"
-  | "disabled"
-  | "onValueChange"
-  | "style"
-  | "testID"
-  | "value"
->;
+export type { ThemedSwitchProps } from "./MaterialSwitch.types";
 
 export function ThemedSwitch(props: ThemedSwitchProps) {
   if (Platform.OS === "android") {
diff --git a/apps/mobile/src/components/useAndroidControlSizing.ts b/apps/mobile/src/components/useAndroidControlSizing.ts
new file mode 100644
index 000000000000..e2e586bb07a6
--- /dev/null
+++ b/apps/mobile/src/components/useAndroidControlSizing.ts
@@ -0,0 +1,13 @@
+import { Platform } from "react-native";
+
+import { useAppearancePreferences } from "../features/settings/appearance/AppearancePreferencesProvider";
+import { DEFAULT_BASE_FONT_SIZE } from "../lib/appearancePreferences";
+import { resolveAndroidControlSizing } from "../lib/androidControlSizing";
+
+/** Shared layouts keep their existing dimensions on iOS. */
+export function useAndroidControlSizing() {
+  const { appearance } = useAppearancePreferences();
+  return resolveAndroidControlSizing(
+    Platform.OS === "android" ? appearance.baseFontSize : DEFAULT_BASE_FONT_SIZE,
+  );
+}
diff --git a/apps/mobile/src/components/useMaterialToolbarHeight.ts b/apps/mobile/src/components/useMaterialToolbarHeight.ts
deleted file mode 100644
index 26e8510a82ff..000000000000
--- a/apps/mobile/src/components/useMaterialToolbarHeight.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { useWindowDimensions } from "react-native";
-
-import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
-
-/** Reserve the same title/subtitle space in every pane, including icon-only and search headers. */
-export function useMaterialToolbarHeight() {
-  const title = useScaledTextRole("title");
-  const subtitle = useScaledTextRole("label");
-  const { fontScale } = useWindowDimensions();
-  return Math.ceil(Math.max(56, (title.lineHeight + subtitle.lineHeight) * fontScale + 1));
-}
diff --git a/apps/mobile/src/components/useMaterialToolbarLayout.ts b/apps/mobile/src/components/useMaterialToolbarLayout.ts
new file mode 100644
index 000000000000..f68a6eec7a46
--- /dev/null
+++ b/apps/mobile/src/components/useMaterialToolbarLayout.ts
@@ -0,0 +1,21 @@
+import { useWindowDimensions } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+import { useScaledTextRole } from "../features/settings/appearance/useScaledTextRole";
+import { useAndroidControlSizing } from "./useAndroidControlSizing";
+
+/** Shared Android header geometry; class-based spacing uses the app's 14dp rem. */
+export function useMaterialToolbarLayout(embedded = false) {
+  const insets = useSafeAreaInsets();
+  const title = useScaledTextRole("title");
+  const subtitle = useScaledTextRole("label");
+  const { scale } = useAndroidControlSizing();
+  const { fontScale } = useWindowDimensions();
+  return {
+    height: Math.ceil(
+      Math.max(48, 56 * scale, (title.lineHeight + subtitle.lineHeight) * fontScale + 1),
+    ),
+    paddingTop: embedded ? 8 * scale : Math.max(insets.top, 12 * scale),
+    paddingBottom: 7 * scale,
+  };
+}
diff --git a/apps/mobile/src/connection/environment-cache-store.ts b/apps/mobile/src/connection/environment-cache-store.ts
index c4a7cbdcce06..6e56524770b6 100644
--- a/apps/mobile/src/connection/environment-cache-store.ts
+++ b/apps/mobile/src/connection/environment-cache-store.ts
@@ -1,6 +1,7 @@
 import {
   ConnectionPersistenceError,
   EnvironmentCacheStore,
+  encodeShellSnapshotForCache,
 } from "@t3tools/client-runtime/platform";
 import {
   type EnvironmentId,
@@ -15,7 +16,10 @@ import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 
 import * as MobileDatabase from "../persistence/mobile-database";
-import { attachProjectFaviconDatabase, projectFaviconCache } from "../lib/projectFaviconCache";
+import {
+  attachProjectFaviconDatabase,
+  projectFaviconDatabaseCache,
+} from "../lib/projectFaviconDatabaseCache";
 
 const SHELL_SNAPSHOT_CACHE_SCHEMA_VERSION = 1;
 // v3 adds windowed (paginated) snapshots carrying `page` metadata; the bump
@@ -53,7 +57,6 @@ const StoredVcsRefs = Schema.Struct({
 const decodeStoredShellSnapshot = Schema.decodeUnknownEffect(
   Schema.fromJsonString(StoredShellSnapshot),
 );
-const encodeStoredShellSnapshot = Schema.encodeEffect(Schema.fromJsonString(StoredShellSnapshot));
 const decodeStoredThreadSnapshot = Schema.decodeUnknownEffect(
   Schema.fromJsonString(StoredThreadSnapshot),
 );
@@ -130,14 +133,21 @@ export const make = Effect.fn("MobileEnvironmentCacheStore.make")(function* () {
         decode: decodeStoredShellSnapshot,
         select: (stored) =>
           stored.environmentId === environmentId ? Option.some(stored.snapshot) : Option.none(),
-      }).pipe(Effect.tap(() => Effect.promise(() => projectFaviconCache.hydrate()))),
+      }).pipe(Effect.tap(() => Effect.promise(() => projectFaviconDatabaseCache.hydrate()))),
     ),
     saveShell: Effect.fn("MobileEnvironmentCache.saveShell")(function* (environmentId, snapshot) {
-      const payload = yield* encodeStoredShellSnapshot({
-        schemaVersion: SHELL_SNAPSHOT_CACHE_SCHEMA_VERSION,
-        environmentId,
-        snapshot,
-      }).pipe(Effect.mapError((cause) => persistenceError("save-shell", cause)));
+      const encodedSnapshot = yield* encodeShellSnapshotForCache(snapshot).pipe(
+        Effect.mapError((cause) => persistenceError("save-shell", cause)),
+      );
+      const payload = yield* Effect.try({
+        try: () =>
+          JSON.stringify({
+            schemaVersion: SHELL_SNAPSHOT_CACHE_SCHEMA_VERSION,
+            environmentId,
+            snapshot: encodedSnapshot,
+          } satisfies typeof StoredShellSnapshot.Encoded),
+        catch: (cause) => persistenceError("save-shell", cause),
+      });
       yield* database
         .saveCache(environmentId, "shell", "snapshot", SHELL_SNAPSHOT_CACHE_SCHEMA_VERSION, payload)
         .pipe(Effect.mapError(mapDatabaseError("save-shell")));
@@ -241,7 +251,7 @@ export const make = Effect.fn("MobileEnvironmentCacheStore.make")(function* () {
         .pipe(Effect.mapError(mapDatabaseError("clear-vcs-refs"))),
     ),
     clear: Effect.fn("MobileEnvironmentCache.clear")((environmentId) =>
-      Effect.promise(() => projectFaviconCache.clearEnvironment(environmentId)).pipe(
+      Effect.promise(() => projectFaviconDatabaseCache.clearEnvironment(environmentId)).pipe(
         Effect.andThen(database.clearEnvironmentCache(environmentId)),
         Effect.mapError(mapDatabaseError("clear-environment")),
       ),
diff --git a/apps/mobile/src/dependency-graph.test.ts b/apps/mobile/src/dependency-graph.test.ts
new file mode 100644
index 000000000000..f4c953925bcc
--- /dev/null
+++ b/apps/mobile/src/dependency-graph.test.ts
@@ -0,0 +1,288 @@
+import * as NodeFS from "node:fs";
+import * as NodePath from "node:path";
+import { describe, expect, it } from "vite-plus/test";
+
+/**
+ * Dependency-graph guards for the mobile source tree (audit #13).
+ *
+ * 1. No circular imports, checked once per platform the way Metro resolves
+ *    modules (`<name>.<platform>.*` before `<name>.native.*` before the
+ *    generic file). A cycle can hide behind platform resolution: a `.tsx`
+ *    base importing a component whose `.android.tsx` variant type-imports
+ *    back into the base is acyclic on iOS but circular on Android.
+ *    Dynamic `import("...")` calls are excluded from this rule on purpose:
+ *    they are the deliberate async escape hatch (e.g. composer-draft cleanup
+ *    reaching `lib/attachmentUpload`), and Metro resolves them after both
+ *    modules have initialized, so they cannot create an initialization cycle.
+ *
+ * 2. Cross-layer edges are ceilinged, not yet banned. `state`, `lib`,
+ *    `native`, and `components` still reach upward into `features` at known
+ *    sites (the app composition root `lib/runtime.ts` legitimately wires
+ *    feature layers). Ceilings count unique `from -> to` module pairs across
+ *    all platforms, including dynamic imports, and may only shrink: when you
+ *    remove one of these imports, lower the constant in the same PR.
+ *
+ * Runs in CI as part of the `Test` job (`vp run --filter '!t3' test` picks up
+ * the `@t3tools/mobile` package test task).
+ */
+
+const SOURCE_ROOT = __dirname;
+
+/** Metro candidate order per platform (platform, then native, then generic). */
+const PLATFORM_EXTENSION_ORDER = {
+  android: [".android.ts", ".android.tsx", ".native.ts", ".native.tsx", ".ts", ".tsx"],
+  ios: [".ios.ts", ".ios.tsx", ".native.ts", ".native.tsx", ".ts", ".tsx"],
+} as const;
+
+type Platform = keyof typeof PLATFORM_EXTENSION_ORDER;
+
+const PLATFORMS = Object.keys(PLATFORM_EXTENSION_ORDER) as ReadonlyArray<Platform>;
+
+const isGraphFile = (filePath: string): boolean =>
+  /\.tsx?$/.test(filePath) &&
+  !filePath.includes(".test.") &&
+  !filePath.includes("test-support") &&
+  !filePath.endsWith(".d.ts");
+
+/** Files Metro would not even bundle for the other platform. */
+function isRelevantForPlatform(filePath: string, platform: Platform): boolean {
+  const name = NodePath.basename(filePath);
+  if (platform === "android") {
+    return !name.includes(".ios.");
+  }
+  return !name.includes(".android.");
+}
+
+function collectSourceFiles(dir: string, out: string[] = []): string[] {
+  for (const entry of NodeFS.readdirSync(dir)) {
+    const filePath = NodePath.join(dir, entry);
+    if (NodeFS.statSync(filePath).isDirectory()) {
+      collectSourceFiles(filePath, out);
+    } else if (isGraphFile(filePath)) {
+      out.push(filePath);
+    }
+  }
+  return out;
+}
+
+function resolveRelative(
+  fromFile: string,
+  specifier: string,
+  extensionOrder: ReadonlyArray<string>,
+): string | null {
+  if (!specifier.startsWith(".")) {
+    return null;
+  }
+  const base = NodePath.resolve(NodePath.dirname(fromFile), specifier);
+  for (const ext of extensionOrder) {
+    for (const candidate of [base + ext, NodePath.join(base, `index${ext}`)]) {
+      try {
+        if (NodeFS.statSync(candidate).isFile()) {
+          const resolved = NodePath.resolve(candidate);
+          return resolved.startsWith(SOURCE_ROOT + NodePath.sep) ? resolved : null;
+        }
+      } catch {
+        // Candidate does not exist; try the next one.
+      }
+    }
+  }
+  return null;
+}
+
+interface ParsedImport {
+  readonly specifier: string;
+  readonly isDynamic: boolean;
+}
+
+function parseImports(source: string): ParsedImport[] {
+  const parsed: ParsedImport[] = [];
+  const staticRe = /(?:^|\n)\s*(?:import|export)[\s\S]*?from\s+["']([^"']+)["']/g;
+  const bareRe = /(?:^|\n)\s*import\s+["']([^"']+)["']/g;
+  const dynamicRe = /\bimport\s*\(\s*["']([^"']+)["']\s*\)/g;
+  for (const match of source.matchAll(staticRe)) {
+    parsed.push({ specifier: match[1]!, isDynamic: false });
+  }
+  for (const match of source.matchAll(bareRe)) {
+    parsed.push({ specifier: match[1]!, isDynamic: false });
+  }
+  for (const match of source.matchAll(dynamicRe)) {
+    parsed.push({ specifier: match[1]!, isDynamic: true });
+  }
+  return parsed;
+}
+
+type Layer = "state" | "lib" | "components" | "native" | "features" | "other";
+
+function layerOf(relativePath: string): Layer {
+  const top = relativePath.split(NodePath.sep)[0]!;
+  if (top === "features") return "features";
+  return top === "state" || top === "lib" || top === "components" || top === "native"
+    ? (top as Layer)
+    : "other";
+}
+
+interface PlatformGraph {
+  readonly platform: Platform;
+  readonly files: ReadonlyArray<string>;
+  /** Static (type or value) import edges keyed by source file. */
+  readonly staticEdges: ReadonlyMap<string, ReadonlyArray<string>>;
+  /** Unique cross-layer edges, static and dynamic, as "fromRel -> toRel". */
+  readonly crossLayerEdges: ReadonlySet<string>;
+}
+
+function buildPlatformGraph(platform: Platform): PlatformGraph {
+  const extensionOrder = PLATFORM_EXTENSION_ORDER[platform];
+  const files = collectSourceFiles(SOURCE_ROOT)
+    .filter((file) => isRelevantForPlatform(file, platform))
+    .sort();
+  const staticEdges = new Map<string, string[]>();
+  const crossLayerEdges = new Set<string>();
+  for (const file of files) {
+    const targets = new Set<string>();
+    for (const { specifier, isDynamic } of parseImports(NodeFS.readFileSync(file, "utf8"))) {
+      const resolved = resolveRelative(file, specifier, extensionOrder);
+      if (resolved === null || resolved === file) {
+        continue;
+      }
+      const from = NodePath.relative(SOURCE_ROOT, file);
+      const to = NodePath.relative(SOURCE_ROOT, resolved);
+      const fromLayer = layerOf(from);
+      const toLayer = layerOf(to);
+      const upward =
+        (fromLayer === "state" ||
+          fromLayer === "lib" ||
+          fromLayer === "components" ||
+          fromLayer === "native") &&
+        (toLayer === "features" || (fromLayer === "lib" && toLayer === "state"));
+      if (upward) {
+        crossLayerEdges.add(`${from} -> ${to}`);
+      }
+      if (!isDynamic) {
+        targets.add(resolved);
+      }
+    }
+    staticEdges.set(file, [...targets]);
+  }
+  return { platform, files, staticEdges, crossLayerEdges };
+}
+
+/** Tarjan strongly-connected components, iterative to bound stack depth. */
+function findCycles(graph: PlatformGraph): ReadonlyArray<ReadonlyArray<string>> {
+  const index = new Map<string, number>();
+  const low = new Map<string, number>();
+  const onStack = new Set<string>();
+  const stack: string[] = [];
+  const cycles: string[][] = [];
+  let nextIndex = 0;
+
+  const enter = (node: string): void => {
+    index.set(node, nextIndex);
+    low.set(node, nextIndex);
+    nextIndex += 1;
+    stack.push(node);
+    onStack.add(node);
+  };
+
+  for (const root of graph.files) {
+    if (index.has(root)) continue;
+    const work: Array<[string, number]> = [[root, 0]];
+    enter(root);
+    while (work.length > 0) {
+      const frame = work[work.length - 1]!;
+      const neighbors = graph.staticEdges.get(frame[0]) ?? [];
+      let advanced = false;
+      for (let i = frame[1]; i < neighbors.length; i += 1) {
+        const child = neighbors[i]!;
+        if (!graph.staticEdges.has(child)) continue;
+        if (!index.has(child)) {
+          work[work.length - 1] = [frame[0], i + 1];
+          work.push([child, 0]);
+          enter(child);
+          advanced = true;
+          break;
+        } else if (onStack.has(child)) {
+          low.set(frame[0], Math.min(low.get(frame[0])!, index.get(child)!));
+        }
+      }
+      if (advanced) continue;
+      work.pop();
+      const parent = work[work.length - 1];
+      if (parent) {
+        low.set(parent[0], Math.min(low.get(parent[0])!, low.get(frame[0])!));
+      }
+      if (low.get(frame[0]) === index.get(frame[0])) {
+        const component: string[] = [];
+        let member: string;
+        do {
+          member = stack.pop()!;
+          onStack.delete(member);
+          component.push(member);
+        } while (member !== frame[0]);
+        if (component.length > 1) {
+          cycles.push(component.sort().map((file) => NodePath.relative(SOURCE_ROOT, file)));
+        }
+      }
+    }
+  }
+  return cycles;
+}
+
+const graphs = PLATFORMS.map(buildPlatformGraph);
+
+/** Unique upward edge pairs across every platform, sorted for stable diffs. */
+function upwardEdges(): string[] {
+  const union = new Set<string>();
+  for (const graph of graphs) {
+    for (const edge of graph.crossLayerEdges) {
+      union.add(edge);
+    }
+  }
+  return [...union].sort();
+}
+
+describe("mobile dependency graph", () => {
+  it.each(PLATFORMS)("has no circular imports under %s resolution", (platform) => {
+    const graph = graphs.find((candidate) => candidate.platform === platform)!;
+    // The graph must see real files; a resolution regression here would make
+    // both rules vacuously pass.
+    expect(graph.files.length).toBeGreaterThan(500);
+    expect(findCycles(graph)).toEqual([]);
+  });
+
+  it("keeps upward imports from state/lib/components/native into features at the ceiling", () => {
+    const edges = upwardEdges();
+    const edgesFor = (from: Layer, to: Layer): string[] =>
+      edges.filter((edge) => {
+        const [source, target] = edge.split(" -> ");
+        return layerOf(source!) === from && layerOf(target!) === to;
+      });
+
+    const ceilings: ReadonlyArray<readonly [Layer, Layer, number, string]> = [
+      // state -> features: thread ordering reaching the thread-list model,
+      // the incoming-share store, the connection controller hook, the
+      // terminal launch context, and the pending message feed.
+      // (legacy-plan-mode was pure model logic and moved into state/.)
+      ["state", "features", 6, "state must not add imports from features"],
+      // lib -> features: lib/runtime.ts is the app composition root and
+      // legitimately wires cloud/observability features; the appearance
+      // helpers and terminal preferences still need untangling.
+      ["lib", "features", 7, "lib must not add imports from features"],
+      // components -> features: mostly the appearance preferences provider
+      // and the layout toolbar bridges.
+      ["components", "features", 33, "components must not add imports from features"],
+      // native -> features: native glue reading appearance/keyboard/review features.
+      ["native", "features", 8, "native must not add imports from features"],
+      // lib -> state: attachment/session plumbing that predates the cycle
+      // cleanup; each remaining edge needs a real owner-side seam.
+      ["lib", "state", 11, "lib must not add imports from state"],
+    ];
+
+    for (const [from, to, ceiling, message] of ceilings) {
+      const layerEdges = edgesFor(from, to);
+      expect(
+        layerEdges.length,
+        `${message}. ${layerEdges.length} edges remain:\n${layerEdges.join("\n")}`,
+      ).toBeLessThanOrEqual(ceiling);
+    }
+  });
+});
diff --git a/apps/mobile/src/features/agent-awareness/androidNotifications.ts b/apps/mobile/src/features/agent-awareness/androidNotifications.ts
index 9ffe586ecb81..a2a0945faaf1 100644
--- a/apps/mobile/src/features/agent-awareness/androidNotifications.ts
+++ b/apps/mobile/src/features/agent-awareness/androidNotifications.ts
@@ -6,6 +6,7 @@ interface AndroidAgentNotifications {
   configure(deviceId: string, userId: string, scheme: string, ongoingEnabled: boolean): void;
   clear(): void;
   openLiveUpdateSettings?(): boolean;
+  showShowcaseActivity?(scheme: string, data: Record<string, string>): void;
 }
 
 const native =
@@ -17,18 +18,24 @@ export function supportsAndroidAgentNotifications(): boolean {
   return typeof native?.configure === "function" && typeof native?.clear === "function";
 }
 
+function appScheme(): string {
+  const scheme = Constants.expoConfig?.scheme;
+  return (Array.isArray(scheme) ? scheme[0] : scheme) ?? "t3code";
+}
+
 export function configureAndroidAgentNotifications(
   deviceId: string,
   userId: string,
   ongoingEnabled: boolean,
 ): void {
-  const scheme = Constants.expoConfig?.scheme;
-  native?.configure?.(
-    deviceId,
-    userId,
-    (Array.isArray(scheme) ? scheme[0] : scheme) ?? "t3code",
-    ongoingEnabled,
-  );
+  native?.configure?.(deviceId, userId, appScheme(), ongoingEnabled);
+}
+
+/** Posts a staged relay payload for the showcase capture; false when unsupported. */
+export function showAndroidShowcaseAgentActivity(data: Record<string, string>): boolean {
+  if (!native?.showShowcaseActivity) return false;
+  native.showShowcaseActivity(appScheme(), data);
+  return true;
 }
 
 export function clearAndroidAgentNotifications(): void {
diff --git a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
index ea150180393c..b786f9f4066c 100644
--- a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
+++ b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
@@ -151,6 +151,7 @@ function ProjectGroupLabel(props: {
       <ProjectFavicon
         environmentId={props.project.environmentId}
         faviconPath={props.project.faviconPath}
+        projectIcon={props.project.projectIcon}
         projectTitle={props.project.title}
         size={18}
         workspaceRoot={props.project.workspaceRoot}
diff --git a/apps/mobile/src/features/cloud/cloudDebugLog.ts b/apps/mobile/src/features/cloud/cloudDebugLog.ts
index 840a3db55680..7e57b39b7bb8 100644
--- a/apps/mobile/src/features/cloud/cloudDebugLog.ts
+++ b/apps/mobile/src/features/cloud/cloudDebugLog.ts
@@ -1,18 +1,14 @@
+import { createDebugLogger } from "../../lib/debugLog";
+
+const logger = createDebugLogger("cloud", {
+  enabledInDev: true,
+  legacyGlobalFlag: "__T3_CLOUD_DEBUG__",
+});
+
 export function isCloudDebugEnabled(): boolean {
-  return (
-    (typeof __DEV__ !== "undefined" && __DEV__) ||
-    (typeof globalThis !== "undefined" &&
-      (globalThis as { __T3_CLOUD_DEBUG__?: boolean }).__T3_CLOUD_DEBUG__ === true)
-  );
+  return logger.isEnabled();
 }
 
 export function cloudDebugLog(event: string, data?: Record<string, unknown>): void {
-  if (!isCloudDebugEnabled()) {
-    return;
-  }
-  if (data) {
-    console.log(`[t3-cloud] ${event}`, data);
-  } else {
-    console.log(`[t3-cloud] ${event}`);
-  }
+  logger.log(event, data);
 }
diff --git a/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx b/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
index 2828392ba8f3..d362b78a9360 100644
--- a/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
+++ b/apps/mobile/src/features/connection/CloudEnvironmentRows.tsx
@@ -35,6 +35,7 @@ import { type RelayEnvironmentView, useConnectionController } from "./useConnect
 
 interface CloudEnvironmentRowsProps {
   readonly connectedCloudEnvironments: ReadonlyArray<ConnectedEnvironmentSummary>;
+  readonly onOpenEnvironment?: (environmentId: EnvironmentId) => void;
   readonly onSetEnvironmentEnabled: (environmentId: EnvironmentId, enabled: boolean) => void;
   /** Long-press on a saved row. The callback owns the confirm. */
   readonly onRemoveEnvironment: (environmentId: EnvironmentId) => void;
@@ -124,26 +125,30 @@ function CloudEnvironmentRowsContent(
       ) : null}
 
       {hasCloudRows ? (
-        <View collapsable={false} className="overflow-hidden rounded-[24px] bg-card">
-          {props.connectedCloudEnvironments.map((environment, index) => (
+        <View collapsable={false} className="overflow-hidden rounded-[24px] bg-grouped-card">
+          {props.connectedCloudEnvironments.map((environment) => (
             <ConnectedCloudEnvironmentRow
               key={environment.environmentId}
               environment={environment}
               descriptor={discoveredDescriptors.get(environment.environmentId)}
-              borderTop={index !== 0}
               onSetEnabled={(enabled) =>
                 props.onSetEnvironmentEnabled(environment.environmentId, enabled)
               }
               onRemove={() => props.onRemoveEnvironment(environment.environmentId)}
+              onOpen={
+                props.onOpenEnvironment
+                  ? () => props.onOpenEnvironment?.(environment.environmentId)
+                  : undefined
+              }
               errorExpanded={expandedErrorId === environment.environmentId}
               onToggleError={() => handleToggleCloudError(environment.environmentId)}
             />
           ))}
-          {availableCloudEnvironments.map((environment, index) => (
+          {availableCloudEnvironments.map((environment) => (
             <CloudEnvironmentRow
               key={environment.environment.environmentId}
               environment={environment}
-              borderTop={props.connectedCloudEnvironments.length > 0 || index !== 0}
+              showChevron={props.onOpenEnvironment !== undefined}
               onConnect={() => handleConnectCloudEnvironment(environment)}
               errorExpanded={expandedErrorId === environment.environment.environmentId}
               onToggleError={() => handleToggleCloudError(environment.environment.environmentId)}
@@ -151,14 +156,14 @@ function CloudEnvironmentRowsContent(
           ))}
         </View>
       ) : controller.relayDiscovery.isRefreshing ? (
-        <View collapsable={false} className="items-center gap-3 rounded-[24px] bg-card p-6">
+        <View collapsable={false} className="items-center gap-3 rounded-[24px] bg-grouped-card p-6">
           <ActivityIndicator colorClassName={"accent-icon"} />
           <Text className="text-center text-sm leading-normal text-foreground-muted">
             Loading linked cloud environments.
           </Text>
         </View>
       ) : controller.relayDiscovery.error ? null : (
-        <View collapsable={false} className="rounded-[24px] bg-card p-5">
+        <View collapsable={false} className="rounded-[24px] bg-grouped-card p-5">
           <Text className="text-sm leading-normal text-foreground-muted">
             No additional linked cloud environments.
           </Text>
@@ -170,7 +175,7 @@ function CloudEnvironmentRowsContent(
       {discoveryAvailable &&
       controller.relayDiscovery.error &&
       !controller.relayDiscovery.isRefreshing ? (
-        <View collapsable={false} className="gap-3 rounded-[24px] bg-card p-5">
+        <View collapsable={false} className="gap-3 rounded-[24px] bg-grouped-card p-5">
           <Text className="text-base font-t3-bold text-foreground">
             Could not load T3 Connect environments
           </Text>
@@ -202,10 +207,10 @@ function ConnectedCloudEnvironmentRow(props: {
   readonly environment: ConnectedEnvironmentSummary;
   /** Discovery's view of the server, for the glyph before the first connection. */
   readonly descriptor: ExecutionEnvironmentDescriptor | undefined;
-  readonly borderTop: boolean;
   readonly errorExpanded: boolean;
   readonly onSetEnabled: (enabled: boolean) => void;
   readonly onRemove: () => void;
+  readonly onOpen?: (() => void) | undefined;
   readonly onToggleError: () => void;
 }) {
   const serverConfig = useAtomValue(
@@ -222,10 +227,13 @@ function ConnectedCloudEnvironmentRow(props: {
   return (
     <Pressable
       accessibilityHint="Long press to remove from this device"
+      accessibilityRole={props.onOpen ? "button" : undefined}
+      accessibilityLabel={props.onOpen ? `Manage ${props.environment.environmentLabel}` : undefined}
+      onPress={props.onOpen}
       onLongPress={props.onRemove}
     >
       <CloudEnvironmentRowShell
-        borderTop={props.borderTop}
+        opensDetails={props.onOpen !== undefined}
         connectionError={enabled || unsupported ? props.environment.connectionError : null}
         connectionErrorTraceId={enabled ? props.environment.connectionErrorTraceId : null}
         connectionState={enabled || unsupported ? props.environment.connectionState : "available"}
@@ -246,7 +254,7 @@ function ConnectedCloudEnvironmentRow(props: {
 
 function CloudEnvironmentRow(props: {
   readonly environment: RelayEnvironmentView;
-  readonly borderTop: boolean;
+  readonly showChevron: boolean;
   readonly errorExpanded: boolean;
   readonly onConnect: () => void;
   readonly onToggleError: () => void;
@@ -260,7 +268,7 @@ function CloudEnvironmentRow(props: {
 
   return (
     <CloudEnvironmentRowShell
-      borderTop={props.borderTop}
+      showChevron={props.showChevron}
       connectionError={presentation.connectionError}
       connectionErrorTraceId={presentation.connectionErrorTraceId}
       connectionState={presentation.connectionState}
@@ -285,7 +293,8 @@ function CloudEnvironmentRow(props: {
 }
 
 function CloudEnvironmentRowShell(props: {
-  readonly borderTop: boolean;
+  readonly showChevron?: boolean;
+  readonly opensDetails?: boolean;
   readonly connectionError: string | null;
   readonly connectionErrorTraceId: string | null;
   readonly connectionState: EnvironmentConnectionPhase;
@@ -340,13 +349,7 @@ function CloudEnvironmentRowShell(props: {
     [measuredErrorText, props.connectionError],
   );
   return (
-    <View
-      collapsable={false}
-      className={cn(
-        "flex-row items-center gap-3 bg-card px-4 py-3.5",
-        props.borderTop && "border-t border-border",
-      )}
-    >
+    <View collapsable={false} className="flex-row items-center gap-3 bg-grouped-card px-4 py-3.5">
       <View className="min-w-0 flex-1 gap-0.5">
         <View className="min-w-0 flex-row items-center gap-2">
           <ConnectionStatusDot state={props.connectionState} pulse={shouldPulse} size={7} />
@@ -409,10 +412,16 @@ function CloudEnvironmentRowShell(props: {
         </StatusContainer>
       </View>
       <ThemedSwitch
+        style={{ alignSelf: "center" }}
         disabled={props.disabled}
         onValueChange={props.onValueChange}
         value={props.value}
       />
+      {props.opensDetails || props.showChevron ? (
+        <View style={{ opacity: props.opensDetails ? 1 : 0.4 }}>
+          <SymbolView name="chevron.right" size={12} tintColorClassName="accent-icon-subtle" />
+        </View>
+      ) : null}
     </View>
   );
 }
diff --git a/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx b/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx
index cf90cd42a0ad..28b34fdec6d3 100644
--- a/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx
+++ b/apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx
@@ -35,6 +35,7 @@ function connectionStatusLabel(environment: ConnectedEnvironmentSummary): string
 export function ConnectionEnvironmentRow(props: {
   readonly environment: ConnectedEnvironmentSummary;
   readonly expanded: boolean;
+  readonly opensDetails?: boolean;
   readonly onToggle: () => void;
   readonly onReconnect: (environmentId: EnvironmentId) => void;
   readonly onRemove: (environmentId: EnvironmentId) => void;
@@ -76,19 +77,22 @@ export function ConnectionEnvironmentRow(props: {
   }, [label, url, props]);
 
   return (
-    <Animated.View layout={LinearTransition.duration(250)} className="bg-card">
+    <Animated.View layout={LinearTransition.duration(250)} className="bg-grouped-card">
       <Pressable
         className="flex-row items-center gap-3 px-4 py-3.5 active:opacity-70"
+        accessibilityRole="button"
+        accessibilityLabel={
+          props.opensDetails ? `Manage ${props.environment.environmentLabel}` : undefined
+        }
         onPress={props.onToggle}
       >
-        <ConnectionStatusDot
-          state={enabled || unsupported ? props.environment.connectionState : "available"}
-          pulse={isRetrying}
-          size={8}
-        />
-
         <View className="flex-1 gap-0.5">
           <View className="flex-row items-center gap-1.5">
+            <ConnectionStatusDot
+              state={enabled || unsupported ? props.environment.connectionState : "available"}
+              pulse={isRetrying}
+              size={8}
+            />
             <EnvironmentMachineSymbol
               kind={resolveEnvironmentMachineKind(serverConfig)}
               size={14}
@@ -101,9 +105,11 @@ export function ConnectionEnvironmentRow(props: {
               {props.environment.environmentLabel}
             </Text>
           </View>
-          <Text className="text-xs text-foreground-muted" numberOfLines={1}>
-            {props.environment.displayUrl}
-          </Text>
+          {!props.environment.isRelayManaged && props.environment.displayUrl.trim() ? (
+            <Text className="text-xs text-foreground-muted" numberOfLines={1}>
+              {props.environment.displayUrl}
+            </Text>
+          ) : null}
           {statusLabel ? (
             <Text
               className={cn(
@@ -126,12 +132,13 @@ export function ConnectionEnvironmentRow(props: {
         </View>
 
         <ThemedSwitch
+          style={{ alignSelf: "center" }}
           disabled={unsupported}
           onValueChange={(next) => props.onSetEnabled(props.environment.environmentId, next)}
           value={enabled}
         />
         <SymbolView
-          name="chevron.down"
+          name={props.opensDetails ? "chevron.right" : "chevron.down"}
           size={12}
           tintColorClassName="accent-icon-subtle"
           type="monochrome"
diff --git a/apps/mobile/src/features/connection/ConnectionFormField.test.tsx b/apps/mobile/src/features/connection/ConnectionFormField.test.tsx
new file mode 100644
index 000000000000..343d44cf376b
--- /dev/null
+++ b/apps/mobile/src/features/connection/ConnectionFormField.test.tsx
@@ -0,0 +1,42 @@
+import type { ReactNode } from "react";
+import { renderToStaticMarkup } from "react-dom/server";
+import { describe, expect, it, vi } from "vite-plus/test";
+
+vi.mock("react-native", () => ({
+  View: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+}));
+vi.mock("../../components/AppText", () => ({
+  AppText: ({
+    accessibilityElementsHidden,
+    importantForAccessibility,
+    children,
+  }: {
+    accessibilityElementsHidden?: boolean;
+    importantForAccessibility?: string;
+    children: ReactNode;
+  }) => (
+    <span
+      aria-hidden={
+        accessibilityElementsHidden || importantForAccessibility === "no-hide-descendants"
+      }
+    >
+      {children}
+    </span>
+  ),
+  AppTextInput: ({ accessibilityLabel }: { accessibilityLabel?: string }) => (
+    <input aria-label={accessibilityLabel} />
+  ),
+}));
+
+import { ConnectionFormField } from "./ConnectionFormField";
+
+describe("ConnectionFormField accessibility", () => {
+  it.each(["Host", "Pairing code"])("exposes %s once as the input name", (label) => {
+    const markup = renderToStaticMarkup(
+      <ConnectionFormField label={label} placeholder="Not an accessible name" />,
+    );
+
+    expect(markup).toContain(`<span aria-hidden="true">${label}</span>`);
+    expect(markup).toContain(`<input aria-label="${label}"/>`);
+  });
+});
diff --git a/apps/mobile/src/features/connection/ConnectionFormField.tsx b/apps/mobile/src/features/connection/ConnectionFormField.tsx
index 0d5e21148e54..b492dd9ce43c 100644
--- a/apps/mobile/src/features/connection/ConnectionFormField.tsx
+++ b/apps/mobile/src/features/connection/ConnectionFormField.tsx
@@ -3,7 +3,7 @@ import { View } from "react-native";
 import { AppText, AppTextInput, type AppTextInputProps } from "../../components/AppText";
 import { cn } from "../../lib/cn";
 
-type ConnectionFormFieldProps = Omit<AppTextInputProps, "className"> & {
+type ConnectionFormFieldProps = Omit<AppTextInputProps, "accessibilityLabel" | "className"> & {
   readonly label: string;
   readonly className?: string;
 };
@@ -12,12 +12,16 @@ type ConnectionFormFieldProps = Omit<AppTextInputProps, "className"> & {
 export function ConnectionFormField({ label, className, ...inputProps }: ConnectionFormFieldProps) {
   return (
     <View collapsable={false} className={cn("gap-1.5", className)}>
-      <AppText className="text-2xs font-t3-bold tracking-[0.8px] uppercase text-foreground-muted">
+      <AppText
+        accessibilityElementsHidden
+        importantForAccessibility="no-hide-descendants"
+        className="text-2xs font-t3-bold tracking-[0.8px] uppercase text-foreground-muted"
+      >
         {label}
       </AppText>
       <AppTextInput
-        accessibilityLabel={label}
         {...inputProps}
+        accessibilityLabel={label}
         className="rounded-[14px] px-4 py-3.5"
       />
     </View>
diff --git a/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx b/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
index 5c58dfc1eaf9..bfcaf4013ab1 100644
--- a/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
+++ b/apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
@@ -264,7 +264,7 @@ export function ConnectionsNewRouteScreen({
 
               {pairingConnectionError ? <ErrorBanner message={pairingConnectionError} /> : null}
 
-              <View className={Platform.OS === "android" ? "flex-row justify-end" : undefined}>
+              <View className="android:flex-row android:justify-end">
                 <ConnectionSheetButton
                   icon="plus"
                   label={isSubmitting ? "Pairing..." : "Add environment"}
diff --git a/apps/mobile/src/features/connection/GitHubRoutingSettings.tsx b/apps/mobile/src/features/connection/GitHubRoutingSettings.tsx
index 764a7d1a0d55..3358fa1995d6 100644
--- a/apps/mobile/src/features/connection/GitHubRoutingSettings.tsx
+++ b/apps/mobile/src/features/connection/GitHubRoutingSettings.tsx
@@ -43,15 +43,12 @@ export function GitHubRoutingSettings() {
   return (
     <View className="mt-5 gap-3">
       <SettingsSection title="GitHub routing">
-        {[...catalog.entries.values()].map((entry, index) => {
+        {[...catalog.entries.values()].map((entry) => {
           const environmentId = entry.target.environmentId;
           const selected = gitHubRoutingPermissionFor(entry, permissions);
           const disabled = !catalog.isReady || saving || gitHubRoutingConnectionKey(entry) === null;
           return (
-            <View
-              key={environmentId}
-              className={index === 0 ? undefined : "border-t border-border-subtle"}
-            >
+            <View key={environmentId}>
               <Pressable
                 accessibilityRole="button"
                 accessibilityLabel={`${entry.target.label} GitHub routing`}
@@ -83,7 +80,7 @@ export function GitHubRoutingSettings() {
                       accessibilityRole="radio"
                       accessibilityState={{ checked: selected === option.value, disabled }}
                       disabled={disabled}
-                      className="flex-row items-center gap-4 border-t border-border-subtle p-4 disabled:opacity-50"
+                      className="flex-row items-center gap-4 p-4 disabled:opacity-50"
                       onPress={() => {
                         setSaving(true);
                         void update({ environmentId, permission: option.value }).then((result) => {
diff --git a/apps/mobile/src/features/connection/LocalEnvironmentList.tsx b/apps/mobile/src/features/connection/LocalEnvironmentList.tsx
index dca29e092f64..bec038390a9e 100644
--- a/apps/mobile/src/features/connection/LocalEnvironmentList.tsx
+++ b/apps/mobile/src/features/connection/LocalEnvironmentList.tsx
@@ -4,7 +4,6 @@ import { View } from "react-native";
 
 import { SymbolView } from "../../components/AppSymbol";
 import { AppText as Text } from "../../components/AppText";
-import { cn } from "../../lib/cn";
 import { ConnectionEnvironmentRow } from "./ConnectionEnvironmentRow";
 
 type EnvironmentRowProps = ComponentProps<typeof ConnectionEnvironmentRow>;
@@ -15,14 +14,20 @@ export function LocalEnvironmentList({
   expandedId,
   onToggle,
   ...rowActions
-}: Pick<EnvironmentRowProps, "onReconnect" | "onRemove" | "onSetEnabled" | "onUpdate"> & {
+}: Pick<
+  EnvironmentRowProps,
+  "onReconnect" | "onRemove" | "onSetEnabled" | "onUpdate" | "opensDetails"
+> & {
   readonly environments: ReadonlyArray<EnvironmentRowProps["environment"]>;
   readonly expandedId: EnvironmentId | null;
   readonly onToggle: (environmentId: EnvironmentId) => void;
 }) {
   if (environments.length === 0) {
     return (
-      <View collapsable={false} className="items-center gap-3 rounded-[24px] bg-card px-6 py-8">
+      <View
+        collapsable={false}
+        className="items-center gap-3 rounded-[24px] bg-grouped-card px-6 py-8"
+      >
         <View className="h-12 w-12 items-center justify-center rounded-[16px] bg-subtle">
           <SymbolView
             name="point.3.connected.trianglepath.dotted"
@@ -40,13 +45,9 @@ export function LocalEnvironmentList({
   }
 
   return (
-    <View collapsable={false} className="overflow-hidden rounded-[24px] bg-card">
-      {environments.map((environment, index) => (
-        <View
-          key={environment.environmentId}
-          collapsable={false}
-          className={cn(index !== 0 && "border-t border-border")}
-        >
+    <View collapsable={false} className="overflow-hidden rounded-[24px] bg-grouped-card">
+      {environments.map((environment) => (
+        <View key={environment.environmentId} collapsable={false}>
           <ConnectionEnvironmentRow
             environment={environment}
             expanded={expandedId === environment.environmentId}
diff --git a/apps/mobile/src/features/files/MaterialFilesHeader.tsx b/apps/mobile/src/features/files/MaterialFilesHeader.tsx
index 61d007ea5c3e..c652ab67d377 100644
--- a/apps/mobile/src/features/files/MaterialFilesHeader.tsx
+++ b/apps/mobile/src/features/files/MaterialFilesHeader.tsx
@@ -1,10 +1,10 @@
 import { useCallback, useEffect, useRef, useState, type ReactNode } from "react";
 import { BackHandler, Keyboard, type TextInput, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { AndroidHeaderIconButton, AndroidScreenHeader } from "../../components/AndroidScreenHeader";
 import { AndroidAnchoredMenu } from "../../components/AndroidAnchoredMenu";
 import { MaterialSearchField } from "../../components/MaterialSearchField";
+import { useMaterialToolbarLayout } from "../../components/useMaterialToolbarLayout";
 
 /** Keep Files search in the same header row on compact and expanded layouts. */
 export function MaterialFilesHeader(props: {
@@ -15,7 +15,7 @@ export function MaterialFilesHeader(props: {
   readonly onBack?: () => void;
   readonly leading?: ReactNode;
 }) {
-  const insets = useSafeAreaInsets();
+  const { paddingTop, paddingBottom } = useMaterialToolbarLayout();
   const searchRef = useRef<TextInput>(null);
   const [searchOpen, setSearchOpen] = useState(false);
   const searching = searchOpen || props.searchQuery.length > 0;
@@ -77,11 +77,8 @@ export function MaterialFilesHeader(props: {
         />
       </View>
       {searching ? (
-        <View
-          className="absolute inset-0 bg-header px-2 pb-2"
-          style={{ paddingTop: Math.max(insets.top, 12) }}
-        >
-          <View className="min-h-14 flex-1 flex-row items-center gap-1">
+        <View className="absolute inset-0 bg-header px-2" style={{ paddingTop, paddingBottom }}>
+          <View className="flex-1 flex-row items-center gap-1">
             <AndroidHeaderIconButton
               accessibilityLabel="Close file search"
               icon="arrow.left"
diff --git a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
index 06ef8f6ba4d9..06b6664431b5 100644
--- a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
+++ b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
@@ -417,7 +417,6 @@ export function ThreadFilesTreeScreen(props: ThreadFilesRouteScreenProps) {
   const { fileInspector, layout, showAuxiliaryPane } = useAdaptiveWorkspaceLayout();
   const [searchQuery, setSearchQuery] = useState("");
   const { themeAppearance: highlightTheme } = useAppearancePreferences();
-  const headerColor = useUniwindTheme()["--color-header"];
   const { cwd, environmentId, projectName, selectedThread, threadId } = useThreadFilesWorkspace(
     props.route.params,
   );
@@ -554,13 +553,7 @@ export function ThreadFilesTreeScreen(props: ThreadFilesRouteScreenProps) {
     </>
   );
 
-  return Platform.OS === "android" ? (
-    <View className="flex-1" style={{ backgroundColor: headerColor }}>
-      {content}
-    </View>
-  ) : (
-    content
-  );
+  return Platform.OS === "android" ? <View className="flex-1 bg-header">{content}</View> : content;
 }
 
 export function ThreadFileScreen(props: ThreadFileRouteScreenProps) {
diff --git a/apps/mobile/src/features/files/thread-file-navigator-pane.tsx b/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
index c3c906e3d515..dfe0c05743c2 100644
--- a/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
+++ b/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
@@ -147,7 +147,7 @@ export function ThreadFileNavigatorPane(props: {
       }
     >
       <View
-        className={Platform.OS === "android" ? "bg-header" : "border-b border-border"}
+        className="ios:border-b ios:border-border android:bg-header"
         style={{ paddingTop: Platform.OS === "android" ? 0 : props.headerInset }}
       >
         {Platform.OS === "android" ? (
diff --git a/apps/mobile/src/features/home/AndroidHomeFab.android.tsx b/apps/mobile/src/features/home/AndroidHomeFab.android.tsx
index 012feb5ff68b..bf466a78e978 100644
--- a/apps/mobile/src/features/home/AndroidHomeFab.android.tsx
+++ b/apps/mobile/src/features/home/AndroidHomeFab.android.tsx
@@ -1,14 +1,23 @@
 import { useCallback, useRef, useState, type ComponentProps } from "react";
-import { View, type NativeScrollEvent, type NativeSyntheticEvent } from "react-native";
+import {
+  useWindowDimensions,
+  View,
+  type NativeScrollEvent,
+  type NativeSyntheticEvent,
+} from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { MaterialNewThreadButton } from "../../components/MaterialNewThreadButton";
 import type { AndroidHomeFabLayout as SharedAndroidHomeFabLayout } from "./AndroidHomeFab.shared";
 import { useWorkspaceState } from "../../state/workspace";
 import { MaterialFabScrollContext } from "./MaterialFabScrollContext";
 import { updateMaterialFabScroll } from "./material-fab-scroll";
+import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
 
 export function AndroidHomeFabLayout(props: ComponentProps<typeof SharedAndroidHomeFabLayout>) {
   const insets = useSafeAreaInsets();
+  const { appearance } = useAppearancePreferences();
+  const { fontScale } = useWindowDimensions();
+  const [layoutWidth, setLayoutWidth] = useState<number | null>(null);
   const { state } = useWorkspaceState();
   const [expanded, setExpanded] = useState(true);
   const scrollState = useRef({ anchor: 0, expanded: true });
@@ -23,11 +32,13 @@ export function AndroidHomeFabLayout(props: ComponentProps<typeof SharedAndroidH
     scrollState.current = next;
   }, []);
 
+  // Remount only the FAB when its font or pane changes to clear the cached expanded width.
   return (
-    <View className="flex-1">
+    <View className="flex-1" onLayout={(event) => setLayoutWidth(event.nativeEvent.layout.width)}>
       <MaterialFabScrollContext value={onScroll}>{props.children}</MaterialFabScrollContext>
-      {state.hasConnections ? (
+      {state.hasConnections && layoutWidth !== null ? (
         <MaterialNewThreadButton
+          key={`${appearance.baseFontSize}:${fontScale}:${layoutWidth}`}
           extended
           expanded={expanded}
           onPress={props.onStartNewTask}
diff --git a/apps/mobile/src/features/home/HomeHeader.android.tsx b/apps/mobile/src/features/home/HomeHeader.android.tsx
index 78e87431b471..0c15bcc09ce7 100644
--- a/apps/mobile/src/features/home/HomeHeader.android.tsx
+++ b/apps/mobile/src/features/home/HomeHeader.android.tsx
@@ -1,13 +1,7 @@
 import type { MenuAction } from "@react-native-menu/menu";
 import { useCallback, useMemo } from "react";
 import { NativeStackScreenOptions } from "../../native/StackHeader";
-import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { MaterialThreadListToolbar } from "./MaterialThreadListToolbar";
-import {
-  hasCustomHomeListOptions,
-  PROJECT_SORT_OPTIONS,
-  THREAD_SORT_OPTIONS,
-} from "./home-list-options";
 import type { HomeHeaderProps } from "./HomeHeader.types";
 
 export type { HomeHeaderEnvironment } from "./HomeHeader.types";
@@ -17,13 +11,11 @@ function checkedMenuState(checked: boolean) {
 }
 
 export function HomeHeader(props: HomeHeaderProps) {
-  // Thread List v2 lays the list out in fixed creation order, so the
-  // sort/group filter controls would be silently ignored — hide them and
-  // key the "customized" icon state off the environment filter alone.
-  const threadListV2Enabled = useThreadListV2Enabled();
-  const hasCustomListOptions = threadListV2Enabled
-    ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
-    : hasCustomHomeListOptions(props);
+  // The list uses a fixed creation order and ignores sort/group options, so
+  // the filter menu only carries the filters and the "customized" icon state
+  // keys off those alone.
+  const hasCustomListOptions =
+    props.selectedEnvironmentId !== null || props.selectedProjectKey !== null;
   const menuActions = useMemo<MenuAction[]>(
     () => [
       {
@@ -62,38 +54,8 @@ export function HomeHeader(props: HomeHeaderProps) {
               ],
             },
           ] satisfies MenuAction[])),
-      ...(threadListV2Enabled
-        ? []
-        : ([
-            {
-              id: "project-sort",
-              title: "Sort projects",
-              subactions: PROJECT_SORT_OPTIONS.map((option) => ({
-                id: `project-sort:${option.value}`,
-                title: option.label,
-                state: checkedMenuState(props.projectSortOrder === option.value),
-              })),
-            },
-            {
-              id: "thread-sort",
-              title: "Sort threads",
-              subactions: THREAD_SORT_OPTIONS.map((option) => ({
-                id: `thread-sort:${option.value}`,
-                title: option.label,
-                state: checkedMenuState(props.threadSortOrder === option.value),
-              })),
-            },
-          ] satisfies MenuAction[])),
-    ],
-    [
-      props.environments,
-      props.projectSortOrder,
-      props.projects,
-      props.selectedEnvironmentId,
-      props.selectedProjectKey,
-      props.threadSortOrder,
-      threadListV2Enabled,
     ],
+    [props.environments, props.projects, props.selectedEnvironmentId, props.selectedProjectKey],
   );
   const handleMenuAction = useCallback(
     (event: { nativeEvent: { event: string } }) => {
@@ -126,20 +88,6 @@ export function HomeHeader(props: HomeHeaderProps) {
         }
         return;
       }
-
-      const projectSort = PROJECT_SORT_OPTIONS.find(
-        (option) => id === `project-sort:${option.value}`,
-      );
-      if (projectSort) {
-        props.onProjectSortOrderChange(projectSort.value);
-        return;
-      }
-
-      const threadSort = THREAD_SORT_OPTIONS.find((option) => id === `thread-sort:${option.value}`);
-      if (threadSort) {
-        props.onThreadSortOrderChange(threadSort.value);
-        return;
-      }
     },
     [props],
   );
diff --git a/apps/mobile/src/features/home/HomeHeader.tsx b/apps/mobile/src/features/home/HomeHeader.tsx
index 2f044862f703..e1cc7448eb59 100644
--- a/apps/mobile/src/features/home/HomeHeader.tsx
+++ b/apps/mobile/src/features/home/HomeHeader.tsx
@@ -2,7 +2,6 @@ import { NativeHeaderToolbar, NativeStackScreenOptions } from "../../native/Stac
 import { useCallback, useRef } from "react";
 import type { SearchBarCommands } from "react-native-screens";
 import { useUniwindTheme } from "../../lib/useUniwindTheme";
-import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
 import {
@@ -10,11 +9,6 @@ import {
   NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED,
 } from "../layout/native-mail-search-toolbar";
 import { buildHomeListFilterMenu } from "./home-list-filter-menu";
-import {
-  hasCustomHomeListOptions,
-  PROJECT_SORT_OPTIONS,
-  THREAD_SORT_OPTIONS,
-} from "./home-list-options";
 import type { HomeHeaderProps } from "./HomeHeader.types";
 
 export type { HomeHeaderEnvironment } from "./HomeHeader.types";
@@ -22,22 +16,17 @@ export type { HomeHeaderEnvironment } from "./HomeHeader.types";
 export function HomeHeader(props: HomeHeaderProps) {
   const searchBarRef = useRef<SearchBarCommands>(null);
   const iconColor = useUniwindTheme()["--color-icon"];
-  // Thread List v2 lays the list out in fixed creation order, so the
-  // sort/group filter controls would be silently ignored — hide them and
-  // key the "customized" icon state off the environment filter alone.
-  const threadListV2Enabled = useThreadListV2Enabled();
-  const hasCustomListOptions = threadListV2Enabled
-    ? props.selectedEnvironmentId !== null || props.selectedProjectKey !== null
-    : hasCustomHomeListOptions(props);
+  // The list uses a fixed creation order and ignores sort/group options, so
+  // the filter menu only carries the filters and the "customized" icon state
+  // keys off those alone.
+  const hasCustomListOptions =
+    props.selectedEnvironmentId !== null || props.selectedProjectKey !== null;
   const focusSearch = useCallback(() => {
     searchBarRef.current?.focus();
     return searchBarRef.current !== null;
   }, []);
   useHardwareKeyboardCommand("focusSearch", focusSearch);
-  const filterMenu = buildHomeListFilterMenu({
-    ...props,
-    listOrganization: !threadListV2Enabled,
-  });
+  const filterMenu = buildHomeListFilterMenu(props);
 
   return (
     <>
@@ -100,7 +89,7 @@ export function HomeHeader(props: HomeHeaderProps) {
       {NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED ? null : (
         <NativeHeaderToolbar placement="bottom">
           <NativeHeaderToolbar.Menu
-            accessibilityLabel="Filter and sort threads"
+            accessibilityLabel="Filter threads"
             icon={
               hasCustomListOptions
                 ? "line.3.horizontal.decrease.circle.fill"
@@ -150,36 +139,6 @@ export function HomeHeader(props: HomeHeaderProps) {
                 ))}
               </NativeHeaderToolbar.Menu>
             ) : null}
-
-            {threadListV2Enabled ? null : (
-              <NativeHeaderToolbar.Menu title="Sort projects">
-                <NativeHeaderToolbar.Label>Sort projects</NativeHeaderToolbar.Label>
-                {PROJECT_SORT_OPTIONS.map((option) => (
-                  <NativeHeaderToolbar.MenuAction
-                    key={option.value}
-                    isOn={props.projectSortOrder === option.value}
-                    onPress={() => props.onProjectSortOrderChange(option.value)}
-                  >
-                    <NativeHeaderToolbar.Label>{option.label}</NativeHeaderToolbar.Label>
-                  </NativeHeaderToolbar.MenuAction>
-                ))}
-              </NativeHeaderToolbar.Menu>
-            )}
-
-            {threadListV2Enabled ? null : (
-              <NativeHeaderToolbar.Menu title="Sort threads">
-                <NativeHeaderToolbar.Label>Sort threads</NativeHeaderToolbar.Label>
-                {THREAD_SORT_OPTIONS.map((option) => (
-                  <NativeHeaderToolbar.MenuAction
-                    key={option.value}
-                    isOn={props.threadSortOrder === option.value}
-                    onPress={() => props.onThreadSortOrderChange(option.value)}
-                  >
-                    <NativeHeaderToolbar.Label>{option.label}</NativeHeaderToolbar.Label>
-                  </NativeHeaderToolbar.MenuAction>
-                ))}
-              </NativeHeaderToolbar.Menu>
-            )}
           </NativeHeaderToolbar.Menu>
           <NativeHeaderToolbar.Spacer flexible />
           <NativeHeaderToolbar.Button
diff --git a/apps/mobile/src/features/home/HomeHeader.types.ts b/apps/mobile/src/features/home/HomeHeader.types.ts
index 0545db092817..3c5f580f9eef 100644
--- a/apps/mobile/src/features/home/HomeHeader.types.ts
+++ b/apps/mobile/src/features/home/HomeHeader.types.ts
@@ -1,5 +1,4 @@
-import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
-import type { HomeProjectSortOrder } from "./homeThreadList";
+import type { EnvironmentId } from "@t3tools/contracts";
 import type {
   HomeListFilterMenuEnvironment,
   HomeListFilterMenuProject,
@@ -13,13 +12,9 @@ export interface HomeHeaderProps {
   readonly searchQuery: string;
   readonly selectedEnvironmentId: EnvironmentId | null;
   readonly selectedProjectKey: string | null;
-  readonly projectSortOrder: HomeProjectSortOrder;
-  readonly threadSortOrder: SidebarThreadSortOrder;
   readonly onSearchQueryChange: (query: string) => void;
   readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
   readonly onProjectChange: (projectKey: string | null) => void;
-  readonly onProjectSortOrderChange: (sortOrder: HomeProjectSortOrder) => void;
-  readonly onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
   readonly onOpenEnvironments: () => void;
   readonly onOpenSettings: () => void;
   readonly onStartNewTask: () => void;
diff --git a/apps/mobile/src/features/home/HomeRouteScreen.tsx b/apps/mobile/src/features/home/HomeRouteScreen.tsx
index 1ef8ea7b286b..05070397cef5 100644
--- a/apps/mobile/src/features/home/HomeRouteScreen.tsx
+++ b/apps/mobile/src/features/home/HomeRouteScreen.tsx
@@ -49,6 +49,7 @@ export function HomeRouteScreen() {
     unsnoozeThread,
     pinThread,
     unpinThread,
+    setThreadAutoSettle,
     moveThread,
     renameThread,
     regenerateThreadTitle,
@@ -76,12 +77,8 @@ export function HomeRouteScreen() {
     () => new Set(environments.map((environment) => environment.environmentId)),
     [environments],
   );
-  const {
-    options: listOptions,
-    setSelectedEnvironmentId,
-    setProjectSortOrder,
-    setThreadSortOrder,
-  } = useHomeListOptions(availableEnvironmentIds);
+  const { options: listOptions, setSelectedEnvironmentId } =
+    useHomeListOptions(availableEnvironmentIds);
   const selectedEnvironmentId = listOptions.selectedEnvironmentId;
   const [selectedProjectKey, setSelectedProjectKey] = useState<string | null>(null);
   const projectFilterOptions = useMemo(
@@ -175,8 +172,6 @@ export function HomeRouteScreen() {
           searchQuery={searchQuery}
           selectedEnvironmentId={selectedEnvironmentId}
           selectedProjectKey={selectedProjectKey}
-          projectSortOrder={listOptions.projectSortOrder}
-          threadSortOrder={listOptions.threadSortOrder}
           onEnvironmentChange={setSelectedEnvironmentId}
           onProjectChange={setSelectedProjectKey}
           onOpenEnvironments={() =>
@@ -191,10 +186,8 @@ export function HomeRouteScreen() {
               params: { screen: "Settings" },
             })
           }
-          onProjectSortOrderChange={setProjectSortOrder}
           onSearchQueryChange={setSearchQuery}
           onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
-          onThreadSortOrderChange={setThreadSortOrder}
         />
 
         <HomeScreen
@@ -214,6 +207,7 @@ export function HomeRouteScreen() {
           onUnsettleThread={unsettleThread}
           onPinThread={pinThread}
           onUnpinThread={unpinThread}
+          onSetThreadAutoSettle={setThreadAutoSettle}
           onMoveThread={moveThread}
           onRenameThread={renameThread}
           onRegenerateThreadTitle={regenerateThreadTitle}
@@ -225,7 +219,6 @@ export function HomeRouteScreen() {
               params: { screen: "Settings" },
             })
           }
-          onProjectSortOrderChange={setProjectSortOrder}
           onSearchQueryChange={setSearchQuery}
           onSelectThread={handleSelectThread}
           onSelectPendingTask={openPendingTask}
@@ -252,7 +245,6 @@ export function HomeRouteScreen() {
             });
           }}
           onStartNewTask={() => navigation.navigate("NewTaskSheet", { screen: "NewTask" })}
-          onThreadSortOrderChange={setThreadSortOrder}
           pendingTasks={pendingTasks}
           projectGroupingMode={listOptions.projectGroupingMode}
           projects={projects}
@@ -262,7 +254,6 @@ export function HomeRouteScreen() {
           selectedEnvironmentId={selectedEnvironmentId}
           selectedProjectKey={selectedProjectKey}
           threads={threads}
-          threadSortOrder={listOptions.threadSortOrder}
         />
       </>
     </AndroidHomeFabLayout>
diff --git a/apps/mobile/src/features/home/HomeScreen.tsx b/apps/mobile/src/features/home/HomeScreen.tsx
index a01f5fbe606e..75be079f0de8 100644
--- a/apps/mobile/src/features/home/HomeScreen.tsx
+++ b/apps/mobile/src/features/home/HomeScreen.tsx
@@ -1,10 +1,7 @@
+import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
 import type { ThreadMoveDestination } from "../threads/threadOrder";
-import { createThreadMovePlanner } from "../threads/threadOrder";
-import {
-  LegendList,
-  type LegendListRef,
-  type LegendListRenderItemProps,
-} from "@legendapp/list/react-native";
+import { computeThreadMoveAvailability } from "../threads/threadOrder";
+import { LegendList, type LegendListRef } from "@legendapp/list/react-native";
 import {
   type EnvironmentProject,
   type EnvironmentThreadShell,
@@ -17,13 +14,18 @@ import {
   type EnvironmentId,
   resolveEnvironmentMachineKind,
   type SidebarProjectGroupingMode,
-  type SidebarThreadSortOrder,
 } from "@t3tools/contracts";
-import { useAtomSet, useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
+import { useAtomValue } from "@effect/atom-react";
 import { useFocusEffect } from "@react-navigation/native";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { ActivityIndicator, FlatList, Platform, View } from "react-native";
+import {
+  ActivityIndicator,
+  Platform,
+  View,
+  type GestureResponderEvent,
+  type NativeScrollEvent,
+  type NativeSyntheticEvent,
+} from "react-native";
 import type { SwipeableMethods } from "react-native-gesture-handler/ReanimatedSwipeable";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
@@ -34,20 +36,12 @@ import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspace
 import type { SavedRemoteConnection } from "../../lib/connection";
 import { scopedProjectKey } from "../../lib/scopedEntities";
 import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
-import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
 import { useThreadSearch } from "../../state/queries";
 import { useThreadJumpShortcuts } from "../keyboard/threadKeyboardShortcuts";
-import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { usePendingThreadOrder } from "../../state/thread-order";
 import { environmentServerConfigsAtom } from "../../state/server";
 import type { PendingNewTask } from "../../state/use-pending-new-tasks";
 import { useQueuedThreadKeys } from "../../state/use-thread-outbox";
-import {
-  PendingTaskListRow,
-  ThreadListGroupHeader,
-  ThreadListRow,
-  ThreadListShowMoreRow,
-} from "../threads/thread-list-items";
 import {
   ThreadListV2PendingRow,
   ThreadListV2Row,
@@ -55,33 +49,24 @@ import {
   ThreadListV2ShowMoreRow,
   ThreadListV2SnoozedShelfHeader,
 } from "../threads/thread-list-v2-items";
-import { resolveThreadProviderInstance } from "../threads/thread-provider-instance";
+import { useThreadRowProviderInstanceResolver } from "../threads/thread-provider-instance";
 import {
   buildThreadListV2Items,
   getThreadListV2OrderedSection,
   buildThreadListV2ListItems,
+  threadListV2ListItemsAreEqual,
   THREAD_LIST_V2_SETTLED_INITIAL_COUNT,
   THREAD_LIST_V2_SETTLED_PAGE_COUNT,
   type ThreadListV2ListItem,
 } from "../threads/threadListV2";
 import { useThreadListV2ShelfPreferences } from "../threads/use-thread-list-v2-shelf-preferences";
 import type { HomeListFilterMenuEnvironment } from "./home-list-filter-menu";
-import {
-  buildHomeListLayout,
-  DEFAULT_GROUP_DISPLAY_STATE,
-  EMPTY_HOME_LIST_LAYOUT,
-  homeListItemsAreEqual,
-  nextGroupDisplayState,
-  type HomeGroupDisplayAction,
-  type HomeGroupDisplayState,
-  type HomeListItem,
-} from "./homeListItems";
 import {
   buildHomeProjectScopes,
-  buildHomeThreadGroups,
   sortHomeProjectScopes,
   type HomeProjectSortOrder,
 } from "./homeThreadList";
+import { createSwipeRowActivation } from "./swipe-row-activation";
 import { SwipeableScrollGateProvider, useSwipeableScrollGate } from "./thread-swipe-actions";
 import { useMaterialFabScroll } from "./MaterialFabScrollContext";
 
@@ -100,13 +85,10 @@ interface HomeScreenProps {
   readonly selectedEnvironmentId: EnvironmentId | null;
   readonly selectedProjectKey: string | null;
   readonly projectSortOrder: HomeProjectSortOrder;
-  readonly threadSortOrder: SidebarThreadSortOrder;
   readonly projectGroupingMode: SidebarProjectGroupingMode;
   readonly onSearchQueryChange: (query: string) => void;
   readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
   readonly onProjectChange: (projectKey: string | null) => void;
-  readonly onProjectSortOrderChange: (sortOrder: HomeProjectSortOrder) => void;
-  readonly onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
   readonly onAddConnection: () => void;
   readonly onOpenSettings: () => void;
   readonly onStartNewTask: () => void;
@@ -123,6 +105,10 @@ interface HomeScreenProps {
   readonly onUnsettleThread: (thread: EnvironmentThreadShell) => void;
   readonly onPinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
   readonly onUnpinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
+  readonly onSetThreadAutoSettle: (
+    thread: EnvironmentThreadShell,
+    enabled: boolean,
+  ) => Promise<boolean>;
   readonly onMoveThread: (
     thread: EnvironmentThreadShell,
     direction: ThreadMoveDestination,
@@ -137,7 +123,25 @@ interface HomeScreenProps {
 
 /* ─── Layout constants ───────────────────────────────────────────────── */
 
-const ESTIMATED_THREAD_ROW_HEIGHT = 72;
+// v2 rows are mixed-height: settled slim rows run ~60dp, single-line cards
+// measured ~74dp on device (252px on the Pixel 10 Pro screenshot), two-line
+// cards ~94dp. The estimate seeds the recycler's initial container count,
+// `ceil((scrollLength + 2 * INITIAL_DRAW_DISTANCE) / estimate)` with the
+// initial draw distance capped at 50, so an estimate at or below the average
+// row height starts the pool at or above the item count for the short lists
+// that LegendList otherwise keeps pooling to exactly its item count — that is
+// what stopped the dev-mode "no unused container available" warning on the
+// seeded short-list device passes. It is a mitigation, not an elimination:
+// after first layout the full drawDistance applies, and a sudden expansion
+// past the pooled headroom (~25+ items appearing at once) still creates a
+// container on demand with the dev-only warning one pass ahead of the
+// measured-height pool expansion. The old tallest-card estimate (~92) fired
+// that warning on every ordinary shelf expand, so the average wins.
+const ESTIMATED_THREAD_LIST_V2_ROW_HEIGHT = 72;
+// Rows away from the viewport are cheap dormant frames (see
+// swipe-row-activation), so render further ahead: a fast fling then reaches
+// rows that are already built instead of rows still being rebuilt.
+const THREAD_LIST_V2_DRAW_DISTANCE = 1_000;
 const PRE_LIQUID_GLASS_BOTTOM_TOOLBAR_HEIGHT = 44;
 /**
  * Top spacing between the list and the Android custom header. The Android
@@ -220,16 +224,10 @@ function HomeTopContentSpacer() {
 /* ─── Main screen ────────────────────────────────────────────────────── */
 
 export function HomeScreen(props: HomeScreenProps) {
-  const [groupDisplayStates, setGroupDisplayStates] = useState<
-    ReadonlyMap<string, HomeGroupDisplayState>
-  >(() => new Map());
-  const preferencesResult = useAtomValue(mobilePreferencesAtom);
-  const threadListV2Enabled = useThreadListV2Enabled();
   const queuedThreadKeys = useQueuedThreadKeys();
-  const savePreferences = useAtomSet(updateMobilePreferencesAtom);
   const openSwipeableRef = useRef<SwipeableMethods | null>(null);
-  const listRef = useRef<LegendListRef | null>(null);
   const insets = useSafeAreaInsets();
+  const { fabClearance } = useAndroidControlSizing();
   const iosBottomToolbarClearance =
     Platform.OS === "ios" && !NATIVE_LIQUID_GLASS_SUPPORTED
       ? PRE_LIQUID_GLASS_BOTTOM_TOOLBAR_HEIGHT
@@ -263,42 +261,6 @@ export function HomeScreen(props: HomeScreenProps) {
     () => new Set(threadSearch.matches.map(threadSearchMatchKey)),
     [threadSearch.matches],
   );
-  const effectiveGroupDisplayStates = useMemo(() => {
-    const next = new Map(groupDisplayStates);
-    if (!AsyncResult.isSuccess(preferencesResult)) {
-      return next;
-    }
-    for (const key of preferencesResult.value.collapsedProjectGroups ?? []) {
-      const existing = next.get(key);
-      next.set(key, {
-        ...(existing ?? DEFAULT_GROUP_DISPLAY_STATE),
-        collapsed: true,
-      });
-    }
-    return next;
-  }, [groupDisplayStates, preferencesResult]);
-  const effectiveGroupDisplayStatesRef = useRef(effectiveGroupDisplayStates);
-  effectiveGroupDisplayStatesRef.current = effectiveGroupDisplayStates;
-
-  const updateGroupDisplay = useCallback(
-    (key: string, action: HomeGroupDisplayAction) => {
-      const next = new Map(effectiveGroupDisplayStatesRef.current);
-      next.set(key, nextGroupDisplayState(next.get(key) ?? DEFAULT_GROUP_DISPLAY_STATE, action));
-      effectiveGroupDisplayStatesRef.current = next;
-      setGroupDisplayStates(next);
-      if (action === "toggle-collapsed") {
-        const collapsedProjectGroups: string[] = [];
-        for (const [groupKey, state] of next) {
-          if (state.collapsed) {
-            collapsedProjectGroups.push(groupKey);
-          }
-        }
-        savePreferences({ collapsedProjectGroups });
-      }
-    },
-    [savePreferences],
-  );
-
   const handleSwipeableWillOpen = useCallback((methods: SwipeableMethods) => {
     if (openSwipeableRef.current !== methods) {
       openSwipeableRef.current?.close();
@@ -316,8 +278,45 @@ export function HomeScreen(props: HomeScreenProps) {
     openSwipeableRef.current?.close();
   }, []);
   const onMaterialFabScroll = useMaterialFabScroll();
+  const listRef = useRef<LegendListRef>(null);
+  const swipeRowActivation = useMemo(() => createSwipeRowActivation(), []);
+  const activateVisibleRows = useCallback(
+    (rows: ReadonlyArray<ThreadListV2ListItem>) => {
+      const state = listRef.current?.getState();
+      if (state === undefined || !(state.end >= 0)) return;
+      swipeRowActivation.activate(
+        rows.slice(Math.max(0, state.start - 2), state.end + 3).map((row) => row.key),
+      );
+    },
+    [swipeRowActivation],
+  );
+  // Status-bar, accessibility and programmatic scrolls never arm the scroll
+  // gate, so every scroll also activates the visible rows once it settles.
+  const activationTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+  useEffect(() => () => clearTimeout(activationTimerRef.current), []);
+  const handleListScroll = useCallback(
+    (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+      onMaterialFabScroll?.(event);
+      clearTimeout(activationTimerRef.current);
+      activationTimerRef.current = setTimeout(
+        () => activateVisibleRows(listRef.current?.getState().data ?? []),
+        200,
+      );
+    },
+    [activateVisibleRows, onMaterialFabScroll],
+  );
+  const trackListTouches = useCallback(
+    (event: GestureResponderEvent, started: boolean) => {
+      const { changedTouches, touches } = event.nativeEvent;
+      swipeRowActivation.trackTouches(
+        started ? changedTouches.map((touch) => touch.identifier) : [],
+        touches.map((touch) => touch.identifier),
+      );
+    },
+    [swipeRowActivation],
+  );
   const { swipeEnabled, scrollGateHandlers } = useSwipeableScrollGate({
-    onScroll: onMaterialFabScroll,
+    onScroll: handleListScroll,
     onScrollBeginDrag: handleScrollBeginDrag,
   });
 
@@ -330,112 +329,7 @@ export function HomeScreen(props: HomeScreenProps) {
       }),
     [props.projectGroupingMode, props.projects, props.selectedEnvironmentId],
   );
-  const selectedProjectScope = useMemo(
-    () =>
-      props.selectedProjectKey === null
-        ? null
-        : (projectScopes.find(
-            (scope) =>
-              scope.key === props.selectedProjectKey ||
-              scope.projectRefs.some(
-                (projectRef) =>
-                  scopedProjectKey(projectRef.environmentId, projectRef.projectId) ===
-                  props.selectedProjectKey,
-              ),
-          ) ?? null),
-    [projectScopes, props.selectedProjectKey],
-  );
-  const selectedProjectRefKeys = useMemo(
-    () =>
-      selectedProjectScope === null
-        ? null
-        : new Set(
-            selectedProjectScope.projectRefs.map((projectRef) =>
-              scopedProjectKey(projectRef.environmentId, projectRef.projectId),
-            ),
-          ),
-    [selectedProjectScope],
-  );
-  const scopedProjects = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : selectedProjectRefKeys === null
-          ? props.projects
-          : props.projects.filter((project) =>
-              selectedProjectRefKeys.has(scopedProjectKey(project.environmentId, project.id)),
-            ),
-    [threadListV2Enabled, props.projects, selectedProjectRefKeys],
-  );
-  const scopedThreads = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : selectedProjectRefKeys === null
-          ? props.threads
-          : props.threads.filter((thread) =>
-              selectedProjectRefKeys.has(scopedProjectKey(thread.environmentId, thread.projectId)),
-            ),
-    [threadListV2Enabled, props.threads, selectedProjectRefKeys],
-  );
-  const scopedPendingTasks = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : selectedProjectRefKeys === null
-          ? props.pendingTasks
-          : props.pendingTasks.filter((pendingTask) =>
-              selectedProjectRefKeys.has(
-                scopedProjectKey(pendingTask.environmentId, pendingTask.projectId),
-              ),
-            ),
-    [threadListV2Enabled, props.pendingTasks, selectedProjectRefKeys],
-  );
-
-  const projectGroups = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : buildHomeThreadGroups({
-            projects: scopedProjects,
-            threads: scopedThreads,
-            pendingTasks: scopedPendingTasks,
-            queuedThreadKeys,
-            environmentId: props.selectedEnvironmentId,
-            searchQuery: props.searchQuery,
-            matchedThreadKeys,
-            projectSortOrder: props.projectSortOrder,
-            threadSortOrder: props.threadSortOrder,
-            projectGroupingMode: props.projectGroupingMode,
-          }),
-    [
-      threadListV2Enabled,
-      queuedThreadKeys,
-      props.projectGroupingMode,
-      props.projectSortOrder,
-      props.searchQuery,
-      props.selectedEnvironmentId,
-      props.threadSortOrder,
-      matchedThreadKeys,
-      scopedPendingTasks,
-      scopedProjects,
-      scopedThreads,
-    ],
-  );
-
   const hasSearchQuery = props.searchQuery.trim().length > 0;
-  const listLayout = useMemo(
-    () =>
-      threadListV2Enabled
-        ? EMPTY_HOME_LIST_LAYOUT
-        : buildHomeListLayout({
-            groups: projectGroups,
-            displayStates: effectiveGroupDisplayStates,
-            showAllThreads: hasSearchQuery,
-          }),
-    [threadListV2Enabled, projectGroups, effectiveGroupDisplayStates, hasSearchQuery],
-  );
-
   const projectByKey = useMemo(() => {
     const map = new Map<string, EnvironmentProject>();
     for (const project of props.projects) {
@@ -539,6 +433,12 @@ export function HomeScreen(props: HomeScreenProps) {
     },
     [props.onUnpinThread],
   );
+  const handleSetThreadAutoSettle = useCallback(
+    (thread: EnvironmentThreadShell, enabled: boolean) => {
+      void props.onSetThreadAutoSettle(thread, enabled);
+    },
+    [props.onSetThreadAutoSettle],
+  );
   const handleRegenerateThreadTitle = useCallback(
     (thread: EnvironmentThreadShell) => {
       void props.onRegenerateThreadTitle(thread);
@@ -581,12 +481,11 @@ export function HomeScreen(props: HomeScreenProps) {
   const [snoozeWakeTick, bumpSnoozeWakeTick] = useState(0);
   useFocusEffect(
     useCallback(() => {
-      if (!threadListV2Enabled) return;
       // Refresh immediately on enable or focus because the previous value can be hours old.
       setNowMinute(new Date().toISOString().slice(0, 16));
       const id = setInterval(() => setNowMinute(new Date().toISOString().slice(0, 16)), 60_000);
       return () => clearInterval(id);
-    }, [threadListV2Enabled]),
+    }, []),
   );
   // Threads on servers without the settlement capability never classify as
   // settled (the user could neither un-settle nor pin them).
@@ -618,6 +517,15 @@ export function HomeScreen(props: HomeScreenProps) {
     }
     return supported;
   }, [serverConfigs]);
+  const autoSettleOptOutEnvironmentIds = useMemo(() => {
+    const supported = new Set<EnvironmentId>();
+    for (const [environmentId, config] of serverConfigs) {
+      if (config.environment.capabilities.threadAutoSettleOptOut === true) {
+        supported.add(environmentId);
+      }
+    }
+    return supported;
+  }, [serverConfigs]);
   const pinReorderEnvironmentIds = useMemo(() => {
     const supported = new Set<EnvironmentId>();
     for (const [environmentId, config] of serverConfigs) {
@@ -655,12 +563,19 @@ export function HomeScreen(props: HomeScreenProps) {
       ),
     [serverConfigs],
   );
+  // Reference-stable provider glyphs: a fresh object per render would break
+  // the memoized rows' props comparison on every parent render.
+  const resolveProviderInstance = useThreadRowProviderInstanceResolver(serverConfigs);
   const pendingOrder = usePendingThreadOrder(nowMinute, snoozeWakeTick);
-  const threadMovePlanners = useMemo(() => {
-    const sectionPlanner = (section: "pinned" | "active") =>
-      createThreadMovePlanner({
+  // Up/down menu availability for every card, computed once per section per
+  // rebuild (see computeThreadMoveAvailability): per-thread planner calls made
+  // list construction quadratic, and this list rebuilds on every minute tick.
+  const threadMoveAvailability = useMemo(() => {
+    const sectionAvailability = (section: "pinned" | "active") =>
+      computeThreadMoveAvailability({
         allThreads: props.threads,
         section,
+        pendingOrder,
         reorderableEnvironmentIds: new Set(
           [...serverConfigs].flatMap(([id, config]) =>
             (section === "pinned"
@@ -680,7 +595,7 @@ export function HomeScreen(props: HomeScreenProps) {
           queuedThreadKeys,
         }),
       });
-    return { pinned: sectionPlanner("pinned"), active: sectionPlanner("active") };
+    return new Map([...sectionAvailability("pinned"), ...sectionAvailability("active")]);
   }, [
     serverConfigs,
     props.threads,
@@ -692,16 +607,6 @@ export function HomeScreen(props: HomeScreenProps) {
     snoozeWakeTick,
   ]);
   const threadListV2Layout = useMemo(() => {
-    if (!threadListV2Enabled)
-      return {
-        items: [],
-        hiddenSettledCount: 0,
-        snoozedCount: 0,
-        snoozedShelfHeaderIndex: null,
-        settledCount: 0,
-        settledShelfHeaderIndex: null,
-        nextSnoozeWakeAt: null,
-      };
     // Settled threads are live shells; archived threads keep their original
     // "hidden from lists" meaning.
     return buildThreadListV2Items({
@@ -734,7 +639,6 @@ export function HomeScreen(props: HomeScreenProps) {
     props.selectedEnvironmentId,
     props.threads,
     matchedThreadKeys,
-    threadListV2Enabled,
     v2ScopedProjectGroup,
   ]);
   // Re-partition the moment the earliest snooze expires (clamped to the
@@ -783,21 +687,31 @@ export function HomeScreen(props: HomeScreenProps) {
         settledShelfExpanded,
         settledShelfHeaderIndex: threadListV2Layout.settledShelfHeaderIndex,
         snoozeLabelNow: `${nowMinute}:00.000Z`,
+        snoozeEnvironmentIds,
+        queuedThreadKeys,
+        moveAvailability: threadMoveAvailability,
+        shelfPreferencesLoading: !shelfPreferencesLoaded,
       }),
-    [settledShelfExpanded, snoozedShelfExpanded, threadListV2Layout, v2PendingTasks],
+    [
+      nowMinute,
+      queuedThreadKeys,
+      threadMoveAvailability,
+      settledShelfExpanded,
+      shelfPreferencesLoaded,
+      snoozedShelfExpanded,
+      snoozeEnvironmentIds,
+      threadListV2Layout,
+      v2PendingTasks,
+    ],
   );
 
-  useThreadJumpShortcuts(
-    threadListV2Enabled ? threadListV2Items : listLayout.items,
-    props.onSelectThread,
-  );
+  useThreadJumpShortcuts(threadListV2Items, props.onSelectThread);
+  useEffect(() => {
+    if (swipeEnabled) activateVisibleRows(threadListV2Items);
+  }, [activateVisibleRows, swipeEnabled, threadListV2Items]);
 
   const renderV2Item = useCallback(
-    ({ item, index }: { readonly item: ThreadListV2ListItem; readonly index: number }) => {
-      const nextItem = threadListV2Items[index + 1];
-      const showTrailingDivider =
-        nextItem?.type === "v2-thread" ||
-        (nextItem?.type === "v2-pending" && !nextItem.showPendingDivider);
+    ({ item }: { readonly item: ThreadListV2ListItem }) => {
       if (item.type === "v2-pending") {
         const pendingScopeKey = scopedProjectKey(
           item.pendingTask.environmentId,
@@ -816,7 +730,7 @@ export function HomeScreen(props: HomeScreenProps) {
             }
             environmentMachine={machineByEnvironmentId.get(item.pendingTask.environmentId)}
             showPendingDivider={item.showPendingDivider}
-            showTrailingDivider={showTrailingDivider}
+            showTrailingDivider={item.showTrailingDivider}
             onSelectPendingTask={props.onSelectPendingTask}
             onDeletePendingTask={props.onDeletePendingTask}
           />
@@ -826,7 +740,7 @@ export function HomeScreen(props: HomeScreenProps) {
         return (
           <ThreadListV2SnoozedShelfHeader
             count={item.count}
-            disabled={!shelfPreferencesLoaded}
+            disabled={item.disabled}
             expanded={item.expanded}
             onToggle={toggleSnoozedShelf}
           />
@@ -836,33 +750,32 @@ export function HomeScreen(props: HomeScreenProps) {
         return (
           <ThreadListV2SettledShelfHeader
             count={item.count}
-            disabled={!shelfPreferencesLoaded}
+            disabled={item.disabled}
             expanded={item.expanded}
             onToggle={toggleSettledShelf}
           />
         );
       }
       const thread = item.item.thread;
-      const movePlanner = item.item.pinned ? threadMovePlanners.pinned : threadMovePlanners.active;
-      const movedId = `${thread.environmentId}:${thread.id}`;
       return (
         <ThreadListV2Row
           onNewThreadOnBranch={props.onNewThreadOnBranch}
           thread={thread}
           variant={item.item.variant}
-          hasQueuedMessages={queuedThreadKeys.has(movedId)}
+          hasQueuedMessages={item.hasQueuedMessages}
           snoozed={item.item.snoozed}
           pinned={item.item.pinned}
-          snoozePresetMinute={nowMinute}
+          snoozePresetMinute={item.snoozePresetMinute ?? ""}
           snoozeWakeLabelText={item.snoozeWakeLabelText}
-          showTrailingDivider={showTrailingDivider}
+          timeLabel={item.timeLabel}
+          showTrailingDivider={item.showTrailingDivider}
           project={
             projectByKey.get(scopedProjectKey(thread.environmentId, thread.projectId)) ?? null
           }
           projectTitle={v2ProjectTitleByProjectKey.get(
             scopedProjectKey(thread.environmentId, thread.projectId),
           )}
-          providerInstance={resolveThreadProviderInstance(serverConfigs, thread)}
+          providerInstance={resolveProviderInstance(thread)}
           environmentLabel={
             Object.keys(props.savedConnectionsById).length > 1
               ? (props.savedConnectionsById[thread.environmentId]?.environmentLabel ?? null)
@@ -886,30 +799,30 @@ export function HomeScreen(props: HomeScreenProps) {
           onSettleThread={handleSettleThread}
           snoozeSupported={snoozeEnvironmentIds.has(thread.environmentId)}
           pinningSupported={pinningEnvironmentIds.has(thread.environmentId)}
+          autoSettleOptOutSupported={autoSettleOptOutEnvironmentIds.has(thread.environmentId)}
           reorderSupported={
             item.item.pinned
               ? pinReorderEnvironmentIds.has(thread.environmentId)
               : activeReorderEnvironmentIds.has(thread.environmentId)
           }
-          canMoveUp={pendingOrder === null && movePlanner(movedId, "up") !== null}
-          canMoveDown={pendingOrder === null && movePlanner(movedId, "down") !== null}
+          canMoveUp={item.canMoveUp}
+          canMoveDown={item.canMoveDown}
           onSnoozeThread={handleSnoozeThread}
           onUnsnoozeThread={handleUnsnoozeThread}
           onUnsettleThread={handleUnsettleThread}
           onPinThread={handlePinThread}
           onUnpinThread={handleUnpinThread}
+          onSetThreadAutoSettle={handleSetThreadAutoSettle}
           onMoveThread={handleMoveThread}
           onSwipeableClose={handleSwipeableClose}
           onSwipeableWillOpen={handleSwipeableWillOpen}
+          activationKey={item.key}
         />
       );
     },
     [
       handleDeleteThread,
       activeReorderEnvironmentIds,
-      threadMovePlanners,
-      pendingOrder,
-      queuedThreadKeys,
       handleMoveThread,
       handlePinThread,
       handleRegenerateThreadTitle,
@@ -921,6 +834,8 @@ export function HomeScreen(props: HomeScreenProps) {
       handleSwipeableClose,
       handleSwipeableWillOpen,
       handleUnsettleThread,
+      handleSetThreadAutoSettle,
+      autoSettleOptOutEnvironmentIds,
       pinningEnvironmentIds,
       machineByEnvironmentId,
       pinReorderEnvironmentIds,
@@ -931,25 +846,23 @@ export function HomeScreen(props: HomeScreenProps) {
       props.onSelectThread,
       props.onNewThreadOnBranch,
       props.savedConnectionsById,
-      serverConfigs,
-      shelfPreferencesLoaded,
+      resolveProviderInstance,
       settlementEnvironmentIds,
       snoozeEnvironmentIds,
-      threadListV2Items,
       threadSearchMatchByKey,
       titleRegenerationEnvironmentIds,
       toggleSettledShelf,
       toggleSnoozedShelf,
       v2ProjectTitleByProjectKey,
       props.searchQuery,
-      nowMinute,
     ],
   );
   const v2KeyExtractor = useCallback((item: ThreadListV2ListItem) => item.key, []);
 
-  // FlatList treats a changed extraData identity as "re-render every visible
-  // row", so an inline object literal would invalidate all rows on every
-  // HomeScreen render.
+  // FlatList/LegendList treat a changed extraData identity as "re-render every
+  // visible row", so an inline object literal would invalidate all rows on
+  // every HomeScreen render — and the minute clock must stay out of it for
+  // the same reason: the clock text is precomputed per item instead.
   const v2ExtraData = useMemo(
     () => ({
       projectByKey,
@@ -957,7 +870,6 @@ export function HomeScreen(props: HomeScreenProps) {
       serverConfigs,
       savedConnectionsById: props.savedConnectionsById,
       searchQuery: props.searchQuery,
-      snoozePresetMinute: nowMinute,
       threadSearchMatchByKey,
     }),
     [
@@ -965,132 +877,18 @@ export function HomeScreen(props: HomeScreenProps) {
       props.searchQuery,
       props.savedConnectionsById,
       serverConfigs,
-      nowMinute,
       threadSearchMatchByKey,
       v2ProjectTitleByProjectKey,
     ],
   );
 
-  const extraData = useMemo(
-    () => ({
-      savedConnectionsById: props.savedConnectionsById,
-      searchQuery: props.searchQuery,
-      threadSearchMatchByKey,
-    }),
-    [props.savedConnectionsById, props.searchQuery, threadSearchMatchByKey],
-  );
-
-  const renderItem = useCallback(
-    ({ item }: LegendListRenderItemProps<HomeListItem>) => {
-      switch (item.type) {
-        case "header":
-          return (
-            <ThreadListGroupHeader
-              variant="compact"
-              collapsed={item.collapsed}
-              isFirst={item.isFirst}
-              groupKey={item.group.key}
-              onGroupAction={updateGroupDisplay}
-              // Aggregated groups (same repo across machines) have no single
-              // target project, and `pending-project:` groups hold a placeholder
-              // built from queued-task metadata rather than a real project shell,
-              // so the quick new-thread button is single-real-project only.
-              newThreadTarget={item.group.newThreadTarget}
-              onNewThread={props.onNewThreadInProject}
-              project={item.group.representative}
-              threadCount={item.group.threads.length + item.group.pendingTasks.length}
-              title={item.group.title}
-            />
-          );
-        case "pending-task":
-          return (
-            <PendingTaskListRow
-              variant="compact"
-              pendingTask={item.pendingTask}
-              environmentLabel={
-                props.savedConnectionsById[item.pendingTask.environmentId]?.environmentLabel ?? null
-              }
-              environmentMachine={machineByEnvironmentId.get(item.pendingTask.environmentId)}
-              isLast={item.isLast}
-              onSelectPendingTask={props.onSelectPendingTask}
-              onDeletePendingTask={props.onDeletePendingTask}
-            />
-          );
-        case "thread": {
-          const thread = item.thread;
-          return (
-            <ThreadListRow
-              onNewThreadOnBranch={props.onNewThreadOnBranch}
-              variant="compact"
-              thread={thread}
-              hasQueuedMessages={queuedThreadKeys.has(`${thread.environmentId}:${thread.id}`)}
-              environmentLabel={
-                props.savedConnectionsById[thread.environmentId]?.environmentLabel ?? null
-              }
-              environmentMachine={machineByEnvironmentId.get(thread.environmentId)}
-              isLast={item.isLast}
-              searchMatch={threadSearchMatchByKey.get(
-                threadSearchMatchKey({
-                  environmentId: thread.environmentId,
-                  threadId: thread.id,
-                }),
-              )}
-              searchQuery={props.searchQuery}
-              onArchiveThread={props.onArchiveThread}
-              onDeleteThread={props.onDeleteThread}
-              onRenameThread={handleRenameThread}
-              onRegenerateThreadTitle={handleRegenerateThreadTitle}
-              titleRegenerationSupported={titleRegenerationEnvironmentIds.has(thread.environmentId)}
-              onSelectThread={props.onSelectThread}
-              onSwipeableClose={handleSwipeableClose}
-              onSwipeableWillOpen={handleSwipeableWillOpen}
-            />
-          );
-        }
-        case "show-more":
-          return (
-            <ThreadListShowMoreRow
-              variant="compact"
-              hiddenCount={item.hiddenCount}
-              canShowLess={item.canShowLess}
-              groupKey={item.groupKey}
-              onGroupAction={updateGroupDisplay}
-            />
-          );
-      }
-    },
-    [
-      handleSwipeableClose,
-      handleSwipeableWillOpen,
-      handleRegenerateThreadTitle,
-      handleRenameThread,
-      machineByEnvironmentId,
-      queuedThreadKeys,
-      props.onArchiveThread,
-      props.onDeletePendingTask,
-      props.onDeleteThread,
-      props.onNewThreadInProject,
-      props.onSelectPendingTask,
-      props.onSelectThread,
-      props.onNewThreadOnBranch,
-      props.searchQuery,
-      props.savedConnectionsById,
-      threadSearchMatchByKey,
-      titleRegenerationEnvironmentIds,
-      updateGroupDisplay,
-    ],
-  );
-
-  const keyExtractor = useCallback((item: HomeListItem) => item.key, []);
-
   /* Empty states */
   // The signal must ignore the search/environment filters: an active query
   // that matches nothing needs the in-list "No results" state, not the
   // full-page "No threads yet". Settled threads are unarchived live shells,
-  // so the v1 check already covers v2.
+  // so the archived-at check already covers the settled shelf.
   const hasAnyThreads =
     props.threads.some((thread) => thread.archivedAt === null) || props.pendingTasks.length > 0;
-  const hasResults = threadListV2Enabled ? threadListV2Items.length > 0 : projectGroups.length > 0;
   const selectedEnvironmentLabel =
     props.selectedEnvironmentId === null
       ? null
@@ -1106,7 +904,7 @@ export function HomeScreen(props: HomeScreenProps) {
 
   if (!hasAnyThreads) {
     return (
-      <View className={Platform.OS === "android" ? "flex-1 bg-header" : "flex-1 bg-screen"}>
+      <View className="flex-1 bg-screen android:bg-header">
         <View
           className={cn(
             "flex-1 items-center justify-center bg-screen px-8",
@@ -1153,16 +951,18 @@ export function HomeScreen(props: HomeScreenProps) {
   // mobile — the menu is the one filter surface).
   const v2ListHeader = listHeader;
 
-  const listEmpty = !hasResults ? (
+  // Use the v2 project scope for its empty state. Snoozed threads need no
+  // special empty state: their shelf header is a list row even while collapsed.
+  const v2ListEmpty =
     hasSearchQuery && threadSearch.isPending ? null : hasSearchQuery ? (
       <EmptyState
         title="No results"
         detail={`No threads matching "${props.searchQuery}".`}
         variant={Platform.OS === "android" ? "plain" : undefined}
       />
-    ) : selectedProjectScope !== null ? (
+    ) : v2ScopedProjectGroup !== null ? (
       <EmptyState
-        title={`No threads in ${selectedProjectScope.title}`}
+        title={`No threads in ${v2ScopedProjectGroup.title}`}
         detail="Choose another project or create a new task."
         variant={Platform.OS === "android" ? "plain" : undefined}
       />
@@ -1178,92 +978,23 @@ export function HomeScreen(props: HomeScreenProps) {
         detail="Create a task to start a new coding session."
         variant={Platform.OS === "android" ? "plain" : undefined}
       />
-    )
-  ) : null;
-  // Use the v2 project scope for its empty state. Snoozed threads need no
-  // special empty state: their shelf header is a list row even while collapsed.
-  const v2ListEmpty =
-    hasSearchQuery && threadSearch.isPending ? null : hasSearchQuery ? (
-      <EmptyState
-        title="No results"
-        detail={`No threads matching "${props.searchQuery}".`}
-        variant={Platform.OS === "android" ? "plain" : undefined}
-      />
-    ) : v2ScopedProjectGroup !== null ? (
-      <EmptyState
-        title={`No threads in ${v2ScopedProjectGroup.title}`}
-        detail="Choose another project or create a new task."
-        variant={Platform.OS === "android" ? "plain" : undefined}
-      />
-    ) : (
-      listEmpty
     );
 
-  if (
-    Platform.OS === "android" &&
-    (threadListV2Enabled ? threadListV2Items.length === 0 : listLayout.items.length === 0)
-  ) {
+  if (Platform.OS === "android" && threadListV2Items.length === 0) {
     return (
       <View className="flex-1 bg-header">
         <View
           className="flex-1 items-center justify-center overflow-hidden rounded-t-[28px] bg-screen px-4"
           style={{ paddingBottom: insets.bottom }}
         >
-          {threadListV2Enabled ? v2ListEmpty : listEmpty}
-        </View>
-      </View>
-    );
-  }
-
-  if (threadListV2Enabled) {
-    return (
-      <View className={Platform.OS === "android" ? "flex-1 bg-header" : "flex-1 bg-screen"}>
-        <View
-          className={
-            Platform.OS === "android"
-              ? "flex-1 overflow-hidden rounded-t-[28px] bg-screen"
-              : "flex-1 bg-screen"
-          }
-        >
-          <SwipeableScrollGateProvider enabled={swipeEnabled}>
-            <FlatList
-              data={threadListV2Items}
-              renderItem={renderV2Item}
-              keyExtractor={v2KeyExtractor}
-              extraData={v2ExtraData}
-              ListHeaderComponent={v2ListHeader}
-              ListFooterComponent={
-                settledShelfExpanded && threadListV2Layout.hiddenSettledCount > 0 ? (
-                  <ThreadListV2ShowMoreRow
-                    hiddenCount={threadListV2Layout.hiddenSettledCount}
-                    onPress={showMoreSettled}
-                  />
-                ) : null
-              }
-              ListEmptyComponent={v2ListEmpty}
-              style={{ flex: 1 }}
-              automaticallyAdjustsScrollIndicatorInsets={Platform.OS === "ios"}
-              contentInsetAdjustmentBehavior={Platform.OS === "ios" ? "automatic" : "never"}
-              showsVerticalScrollIndicator={false}
-              keyboardDismissMode="on-drag"
-              keyboardShouldPersistTaps="handled"
-              {...scrollGateHandlers}
-              scrollEventThrottle={16}
-              contentContainerStyle={{
-                paddingBottom:
-                  Platform.OS === "ios"
-                    ? Math.max(insets.bottom, 24) + 96 + iosBottomToolbarClearance
-                    : Math.max(insets.bottom, 16) + (Platform.OS === "android" ? 148 : 88),
-              }}
-            />
-          </SwipeableScrollGateProvider>
+          {v2ListEmpty}
         </View>
       </View>
     );
   }
 
   return (
-    <View className={Platform.OS === "android" ? "flex-1 bg-header" : "flex-1 bg-screen"}>
+    <View className="flex-1 bg-screen android:bg-header">
       <View
         className={
           Platform.OS === "android"
@@ -1271,52 +1002,49 @@ export function HomeScreen(props: HomeScreenProps) {
             : "flex-1 bg-screen"
         }
       >
-        {/* Sticky headers are deliberately not wired up: LegendList's JS sticky
-          implementation mispositions pinned headers at mount under iOS
-          automatic content insets (headers render one nav-inset too low until
-          the first scroll event) and blanks non-pinned headers after
-          collapse/expand data changes. The flattened layout still exposes
-          `stickyHeaderIndices` if this gets revisited. */}
-        <SwipeableScrollGateProvider enabled={swipeEnabled}>
+        {/* Shared with the iPad sidebar: cells are reused across data
+            rebuilds and `itemsAreEqual` keeps a minute tick (or an unrelated
+            shell update) from re-rendering untouched rows. */}
+        <SwipeableScrollGateProvider enabled={swipeEnabled} activation={swipeRowActivation}>
           <LegendList
             ref={listRef}
-            data={listLayout.items}
-            renderItem={renderItem}
-            keyExtractor={keyExtractor}
-            itemsAreEqual={homeListItemsAreEqual}
-            drawDistance={500}
-            estimatedItemSize={ESTIMATED_THREAD_ROW_HEIGHT}
-            extraData={extraData}
-            ListHeaderComponent={listHeader}
-            ListEmptyComponent={listEmpty}
+            onLoad={() => activateVisibleRows(threadListV2Items)}
+            onTouchStart={(event) => trackListTouches(event, true)}
+            onTouchEnd={(event) => trackListTouches(event, false)}
+            onTouchCancel={(event) => trackListTouches(event, false)}
+            data={threadListV2Items}
+            renderItem={renderV2Item}
+            keyExtractor={v2KeyExtractor}
+            getItemType={(item) => item.type}
+            itemsAreEqual={threadListV2ListItemsAreEqual}
+            estimatedItemSize={ESTIMATED_THREAD_LIST_V2_ROW_HEIGHT}
+            drawDistance={THREAD_LIST_V2_DRAW_DISTANCE}
+            recycleItems
+            extraData={v2ExtraData}
+            ListHeaderComponent={v2ListHeader}
+            ListFooterComponent={
+              settledShelfExpanded && threadListV2Layout.hiddenSettledCount > 0 ? (
+                <ThreadListV2ShowMoreRow
+                  hiddenCount={threadListV2Layout.hiddenSettledCount}
+                  onPress={showMoreSettled}
+                />
+              ) : null
+            }
+            ListEmptyComponent={v2ListEmpty}
             style={{ flex: 1 }}
-            automaticallyAdjustsScrollIndicatorInsets={NATIVE_LIQUID_GLASS_SUPPORTED}
-            contentInsetAdjustmentBehavior={NATIVE_LIQUID_GLASS_SUPPORTED ? "automatic" : "never"}
+            automaticallyAdjustsScrollIndicatorInsets={Platform.OS === "ios"}
+            contentInsetAdjustmentBehavior={Platform.OS === "ios" ? "automatic" : "never"}
             showsVerticalScrollIndicator={false}
             keyboardDismissMode="on-drag"
             keyboardShouldPersistTaps="handled"
             {...scrollGateHandlers}
-            recycleItems
             scrollEventThrottle={16}
             contentContainerStyle={{
-              // Android reserves room for the floating new-task FAB
-              // (56 button + 16 gap + bottom inset). Pre-glass iOS shows a
-              // standard 44pt bottom toolbar that overlays the list and is not
-              // reflected in insets while contentInsetAdjustmentBehavior is
-              // "never".
               paddingBottom:
                 Platform.OS === "ios"
-                  ? Math.max(insets.bottom, 24) + 24 + iosBottomToolbarClearance
-                  : Math.max(insets.bottom, 16) + (Platform.OS === "android" ? 148 : 88),
+                  ? Math.max(insets.bottom, 24) + 96 + iosBottomToolbarClearance
+                  : Math.max(insets.bottom, 16) + (Platform.OS === "android" ? fabClearance : 88),
             }}
-            scrollIndicatorInsets={
-              Platform.OS === "ios"
-                ? {
-                    bottom: Math.max(insets.bottom, 16) + 24 + iosBottomToolbarClearance,
-                    top: 0,
-                  }
-                : undefined
-            }
           />
         </SwipeableScrollGateProvider>
       </View>
diff --git a/apps/mobile/src/features/home/MaterialThreadListToolbar.tsx b/apps/mobile/src/features/home/MaterialThreadListToolbar.tsx
index 72671bc046d3..6cea625aced9 100644
--- a/apps/mobile/src/features/home/MaterialThreadListToolbar.tsx
+++ b/apps/mobile/src/features/home/MaterialThreadListToolbar.tsx
@@ -12,7 +12,8 @@ import { MaterialSearchField } from "../../components/MaterialSearchField";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { WorkspaceConnectionTitle } from "./WorkspaceConnectionTitle";
 import { useWorkspaceState } from "../../state/workspace";
-import { useMaterialToolbarHeight } from "../../components/useMaterialToolbarHeight";
+import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
+import { useMaterialToolbarLayout } from "../../components/useMaterialToolbarLayout";
 
 /** One toolbar height for the compact list and expanded sidebar, including search. */
 export function MaterialThreadListToolbar(props: {
@@ -28,7 +29,8 @@ export function MaterialThreadListToolbar(props: {
   readonly onRequestVisibility?: () => void;
 }) {
   const insets = useSafeAreaInsets();
-  const toolbarHeight = useMaterialToolbarHeight();
+  const { fabSize } = useAndroidControlSizing();
+  const { height: toolbarHeight, ...headerPadding } = useMaterialToolbarLayout();
   const { state } = useWorkspaceState();
   const { onRequestVisibility, onSearchQueryChange } = props;
   const searchRef = useRef<TextInput>(null);
@@ -76,11 +78,9 @@ export function MaterialThreadListToolbar(props: {
       <View
         onLayout={props.onLayout}
         className={
-          props.sidebar
-            ? "absolute inset-x-0 top-0 z-[4] bg-header px-2 pb-2"
-            : "bg-header px-2 pb-2"
+          props.sidebar ? "absolute inset-x-0 top-0 z-[4] bg-header px-2" : "bg-header px-2"
         }
-        style={{ paddingTop: Math.max(insets.top, 12) }}
+        style={headerPadding}
       >
         <View className="flex-row items-center gap-1" style={{ minHeight: toolbarHeight }}>
           {searching ? (
@@ -116,21 +116,21 @@ export function MaterialThreadListToolbar(props: {
           )}
         </View>
       </View>
-      {/* Sit 8dp above the 56dp extended New thread FAB. */}
+      {/* Keep the filter above the New thread FAB at every text size. */}
       {state.hasConnections ? (
         <View
           className="absolute right-5 z-[5]"
           style={{
             bottom:
               (props.sidebar ? Math.max(insets.bottom, 12) + 6 : Math.max(insets.bottom, 16) + 16) +
-              56 +
+              fabSize +
               8,
           }}
         >
           <AndroidAnchoredMenu actions={props.filterActions} onPressAction={props.onFilterAction}>
             {(open) => (
               <MaterialFloatingActionButton
-                label="Filter and sort threads"
+                label="Filter threads"
                 icon={filterIcon}
                 onPress={open}
               />
diff --git a/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx b/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx
index 9b9333b46c7f..d2b068a07c59 100644
--- a/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx
+++ b/apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx
@@ -1,9 +1,10 @@
 import type { NativeStackNavigationOptions } from "@react-navigation/native-stack";
 import { useEffect, useRef, useState, type ReactNode } from "react";
-import { ActivityIndicator, Animated, Pressable, View } from "react-native";
+import { ActivityIndicator, Animated, Platform, Pressable, View } from "react-native";
 
 import { SymbolView } from "../../components/AppSymbol";
 import { AppText as Text } from "../../components/AppText";
+import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
 import {
   brandTitleOffset,
   CompactBrandTitle,
@@ -105,6 +106,7 @@ export function WorkspaceConnectionTitle(props: {
 }) {
   const status = useDelayedConnectionStatus();
   const size = props.size ?? "navbar";
+  const { scale } = useAndroidControlSizing();
 
   if (status === null) {
     return props.grow ? (
@@ -126,26 +128,28 @@ export function WorkspaceConnectionTitle(props: {
         hitSlop={8}
         onPress={props.onPress}
         className="flex-row items-center gap-2"
-        style={{ flexShrink: 1, marginLeft: props.statusOffset ?? 0 }}
+        style={[
+          { flexShrink: 1, marginLeft: props.statusOffset ?? 0 },
+          Platform.OS === "android" && { gap: 7 * scale },
+        ]}
       >
         {status.showsProgress ? (
-          <ActivityIndicator colorClassName={"accent-icon-muted"} size="small" />
+          <ActivityIndicator
+            colorClassName={"accent-icon-muted"}
+            size={Platform.OS === "android" ? Math.round(20 * scale) : "small"}
+          />
         ) : (
           <SymbolView
             name="wifi.slash"
-            size={size === "pageTitle" ? 17 : 15}
+            size={Math.round((size === "pageTitle" ? 17 : 15) * scale)}
             tintColorClassName={"accent-icon-muted"}
             type="monochrome"
           />
         )}
         <Text
-          className={
-            size === "pageTitle"
-              ? "text-[20px] font-t3-bold text-foreground-muted"
-              : "text-[16px] font-t3-bold text-foreground-muted"
-          }
+          className="font-t3-bold text-foreground-muted"
           numberOfLines={1}
-          style={{ flexShrink: 1 }}
+          style={{ flexShrink: 1, fontSize: (size === "pageTitle" ? 20 : 16) * scale }}
         >
           {status.label}
         </Text>
diff --git a/apps/mobile/src/features/home/home-list-filter-menu.test.ts b/apps/mobile/src/features/home/home-list-filter-menu.test.ts
index 99e3cb36c072..0febe8e31031 100644
--- a/apps/mobile/src/features/home/home-list-filter-menu.test.ts
+++ b/apps/mobile/src/features/home/home-list-filter-menu.test.ts
@@ -13,12 +13,8 @@ describe("buildHomeListFilterMenu", () => {
       ],
       selectedEnvironmentId: null,
       selectedProjectKey: "environment-1:project-1",
-      projectSortOrder: "updated_at",
-      threadSortOrder: "updated_at",
       onEnvironmentChange: vi.fn(),
       onProjectChange,
-      onProjectSortOrderChange: vi.fn(),
-      onThreadSortOrderChange: vi.fn(),
     });
 
     const projectMenu = menu.items.find(
diff --git a/apps/mobile/src/features/home/home-list-filter-menu.ts b/apps/mobile/src/features/home/home-list-filter-menu.ts
index edd0176f8627..ac53e427d21f 100644
--- a/apps/mobile/src/features/home/home-list-filter-menu.ts
+++ b/apps/mobile/src/features/home/home-list-filter-menu.ts
@@ -1,7 +1,4 @@
-import type { EnvironmentId, SidebarThreadSortOrder } from "@t3tools/contracts";
-
-import type { HomeProjectSortOrder } from "./homeThreadList";
-import { PROJECT_SORT_OPTIONS, THREAD_SORT_OPTIONS } from "./home-list-options";
+import type { EnvironmentId } from "@t3tools/contracts";
 
 export interface HomeListFilterMenuEnvironment {
   readonly environmentId: EnvironmentId;
@@ -37,16 +34,8 @@ export function buildHomeListFilterMenu(props: {
   readonly projects: ReadonlyArray<HomeListFilterMenuProject>;
   readonly selectedEnvironmentId: EnvironmentId | null;
   readonly selectedProjectKey: string | null;
-  readonly projectSortOrder: HomeProjectSortOrder;
-  readonly threadSortOrder: SidebarThreadSortOrder;
   readonly onEnvironmentChange: (environmentId: EnvironmentId | null) => void;
   readonly onProjectChange: (projectKey: string | null) => void;
-  readonly onProjectSortOrderChange: (sortOrder: HomeProjectSortOrder) => void;
-  readonly onThreadSortOrderChange: (sortOrder: SidebarThreadSortOrder) => void;
-  /** False hides the sort/group submenus. Thread List v2 uses a fixed
-      creation-order layout, so offering those controls while it silently
-      ignores them would be a lie; the environment filter still applies. */
-  readonly listOrganization?: boolean;
 }): HomeListFilterMenu {
   const items: Array<HomeListFilterMenuAction | HomeListFilterMenuSubmenu> = [];
 
@@ -95,31 +84,6 @@ export function buildHomeListFilterMenu(props: {
     });
   }
 
-  if (props.listOrganization !== false) {
-    items.push(
-      {
-        type: "submenu",
-        title: "Sort projects",
-        items: PROJECT_SORT_OPTIONS.map((option) => ({
-          type: "action",
-          title: option.label,
-          state: props.projectSortOrder === option.value ? "on" : "off",
-          onPress: () => props.onProjectSortOrderChange(option.value),
-        })),
-      },
-      {
-        type: "submenu",
-        title: "Sort threads",
-        items: THREAD_SORT_OPTIONS.map((option) => ({
-          type: "action",
-          title: option.label,
-          state: props.threadSortOrder === option.value ? "on" : "off",
-          onPress: () => props.onThreadSortOrderChange(option.value),
-        })),
-      },
-    );
-  }
-
   return {
     title: "Thread list options",
     items,
diff --git a/apps/mobile/src/features/home/home-list-options.test.ts b/apps/mobile/src/features/home/home-list-options.test.ts
deleted file mode 100644
index ac3893956ca7..000000000000
--- a/apps/mobile/src/features/home/home-list-options.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import {
-  DEFAULT_SIDEBAR_PROJECT_SORT_ORDER,
-  DEFAULT_SIDEBAR_THREAD_SORT_ORDER,
-} from "@t3tools/contracts";
-import { describe, expect, it } from "vite-plus/test";
-
-import { hasCustomHomeListOptions, type HomeListOptions } from "./home-list-options";
-
-const defaults: HomeListOptions = {
-  selectedEnvironmentId: null,
-  projectSortOrder:
-    DEFAULT_SIDEBAR_PROJECT_SORT_ORDER === "manual"
-      ? "updated_at"
-      : DEFAULT_SIDEBAR_PROJECT_SORT_ORDER,
-  threadSortOrder: DEFAULT_SIDEBAR_THREAD_SORT_ORDER,
-};
-
-describe("home list options", () => {
-  it("recognizes default options", () => {
-    expect(hasCustomHomeListOptions(defaults)).toBe(false);
-  });
-
-  it("marks environment filters as customized", () => {
-    expect(
-      hasCustomHomeListOptions({ ...defaults, selectedEnvironmentId: "environment-1" as never }),
-    ).toBe(true);
-    expect(
-      hasCustomHomeListOptions({ ...defaults, selectedProjectKey: "environment-1:project-1" }),
-    ).toBe(true);
-  });
-});
diff --git a/apps/mobile/src/features/home/home-list-options.ts b/apps/mobile/src/features/home/home-list-options.ts
index 14f842d73e2c..d280c05ee0b1 100644
--- a/apps/mobile/src/features/home/home-list-options.ts
+++ b/apps/mobile/src/features/home/home-list-options.ts
@@ -1,12 +1,5 @@
-import type {
-  EnvironmentId,
-  SidebarProjectGroupingMode,
-  SidebarThreadSortOrder,
-} from "@t3tools/contracts";
-import {
-  DEFAULT_SIDEBAR_PROJECT_SORT_ORDER,
-  DEFAULT_SIDEBAR_THREAD_SORT_ORDER,
-} from "@t3tools/contracts";
+import type { EnvironmentId, SidebarProjectGroupingMode } from "@t3tools/contracts";
+import { DEFAULT_SIDEBAR_PROJECT_SORT_ORDER } from "@t3tools/contracts";
 import {
   createContext,
   createElement,
@@ -24,29 +17,12 @@ import type { HomeProjectSortOrder } from "./homeThreadList";
 export interface HomeListOptions {
   readonly selectedEnvironmentId: EnvironmentId | null;
   readonly projectSortOrder: HomeProjectSortOrder;
-  readonly threadSortOrder: SidebarThreadSortOrder;
 }
 
 export interface ResolvedHomeListOptions extends HomeListOptions {
   readonly projectGroupingMode: SidebarProjectGroupingMode;
 }
 
-export const PROJECT_SORT_OPTIONS: ReadonlyArray<{
-  readonly value: HomeProjectSortOrder;
-  readonly label: string;
-}> = [
-  { value: "updated_at", label: "Last user message" },
-  { value: "created_at", label: "Created at" },
-];
-
-export const THREAD_SORT_OPTIONS: ReadonlyArray<{
-  readonly value: SidebarThreadSortOrder;
-  readonly label: string;
-}> = [
-  { value: "updated_at", label: "Last user message" },
-  { value: "created_at", label: "Created at" },
-];
-
 function defaultHomeListOptions(): HomeListOptions {
   return {
     selectedEnvironmentId: null,
@@ -54,7 +30,6 @@ function defaultHomeListOptions(): HomeListOptions {
       DEFAULT_SIDEBAR_PROJECT_SORT_ORDER === "manual"
         ? "updated_at"
         : DEFAULT_SIDEBAR_PROJECT_SORT_ORDER,
-    threadSortOrder: DEFAULT_SIDEBAR_THREAD_SORT_ORDER,
   };
 }
 
@@ -81,23 +56,6 @@ export function HomeListOptionsProvider({
   return createElement(HomeListOptionsContext, { value }, children);
 }
 
-export function hasCustomHomeListOptions(
-  options: HomeListOptions & {
-    readonly selectedProjectKey?: string | null;
-  },
-): boolean {
-  const defaultProjectSortOrder =
-    DEFAULT_SIDEBAR_PROJECT_SORT_ORDER === "manual"
-      ? "updated_at"
-      : DEFAULT_SIDEBAR_PROJECT_SORT_ORDER;
-  return (
-    options.selectedEnvironmentId !== null ||
-    (options.selectedProjectKey !== null && options.selectedProjectKey !== undefined) ||
-    options.projectSortOrder !== defaultProjectSortOrder ||
-    options.threadSortOrder !== DEFAULT_SIDEBAR_THREAD_SORT_ORDER
-  );
-}
-
 export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<EnvironmentId>) {
   const shared = useContext(HomeListOptionsContext);
   const [localOptions, setLocalOptions] = useState<HomeListOptions>(defaultHomeListOptions);
@@ -123,13 +81,9 @@ export function useHomeListOptions(availableEnvironmentIds: ReadonlySet<Environm
   const setProjectSortOrder = useCallback((value: HomeProjectSortOrder) => {
     setOptions((current) => ({ ...current, projectSortOrder: value }));
   }, []);
-  const setThreadSortOrder = useCallback((value: SidebarThreadSortOrder) => {
-    setOptions((current) => ({ ...current, threadSortOrder: value }));
-  }, []);
   return {
     options: resolvedOptions,
     setSelectedEnvironmentId,
     setProjectSortOrder,
-    setThreadSortOrder,
   } as const;
 }
diff --git a/apps/mobile/src/features/home/homeListItems.test.ts b/apps/mobile/src/features/home/homeListItems.test.ts
deleted file mode 100644
index d1e3315fd59a..000000000000
--- a/apps/mobile/src/features/home/homeListItems.test.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-import type {
-  EnvironmentProject,
-  EnvironmentThreadShell,
-} from "@t3tools/client-runtime/state/shell";
-import { EnvironmentId, ProjectId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
-import { describe, expect, it } from "vite-plus/test";
-
-import {
-  buildHomeListLayout,
-  DEFAULT_GROUP_DISPLAY_STATE,
-  HOME_INITIAL_VISIBLE_THREADS,
-  HOME_SHOW_MORE_STEP,
-  nextGroupDisplayState,
-  type HomeGroupDisplayState,
-  type HomeListItem,
-} from "./homeListItems";
-import type { HomeThreadGroup } from "./homeThreadList";
-import { threadJumpTarget } from "../keyboard/threadKeyboardShortcuts";
-
-const environmentId = EnvironmentId.make("environment-1");
-
-function makeProject(id: string, title: string): EnvironmentProject {
-  return {
-    environmentId,
-    id: ProjectId.make(id),
-    title,
-    workspaceRoot: `/workspaces/${id}`,
-    repositoryIdentity: null,
-    defaultModelSelection: null,
-    scripts: [],
-    createdAt: "2026-06-01T00:00:00.000Z",
-    updatedAt: "2026-06-01T00:00:00.000Z",
-  };
-}
-
-function makeThread(id: string, projectId: ProjectId): EnvironmentThreadShell {
-  return {
-    environmentId,
-    id: ThreadId.make(id),
-    projectId,
-    title: `Thread ${id}`,
-    modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
-    runtimeMode: "full-access",
-    interactionMode: "default",
-    branch: null,
-    worktreePath: null,
-    pullRequests: [],
-    latestTurn: null,
-    createdAt: "2026-06-01T00:00:00.000Z",
-    updatedAt: "2026-06-01T00:00:00.000Z",
-    archivedAt: null,
-    settledOverride: null,
-    settledAt: null,
-    session: null,
-    latestUserMessageAt: null,
-    hasPendingApprovals: false,
-    hasPendingUserInput: false,
-    hasActionableProposedPlan: false,
-  };
-}
-
-function makeGroup(key: string, threadCount: number): HomeThreadGroup {
-  const project = makeProject(key, key);
-  const threads = Array.from({ length: threadCount }, (_, index) =>
-    makeThread(`${key}-thread-${index}`, project.id),
-  );
-  return {
-    key,
-    title: key,
-    representative: project,
-    projects: [project],
-    pendingTasks: [],
-    threads,
-    // All threads inside the recency window, so the baseline stays at the
-    // initial page size and the pagination expectations below hold.
-    recentThreads: threads,
-    newThreadTarget: project,
-  };
-}
-
-function itemTypes(items: ReadonlyArray<HomeListItem>): string[] {
-  return items.map((item) => item.type);
-}
-
-function displayStates(
-  entries: Record<string, HomeGroupDisplayState>,
-): ReadonlyMap<string, HomeGroupDisplayState> {
-  return new Map(Object.entries(entries));
-}
-
-describe("threadJumpTarget", () => {
-  it("numbers only displayed threads across groups, skipping collapsed groups and pagination rows", () => {
-    const layout = buildHomeListLayout({
-      groups: [makeGroup("collapsed", 3), makeGroup("alpha", 8), makeGroup("beta", 3)],
-      displayStates: displayStates({ collapsed: { collapsed: true, visibleCount: 6 } }),
-    });
-    expect(threadJumpTarget(layout.items, "thread.jump.1")?.id).toBe("alpha-thread-0");
-    expect(threadJumpTarget(layout.items, "thread.jump.7")?.id).toBe("beta-thread-0");
-    expect(threadJumpTarget(layout.items, "thread.jump.9")?.id).toBe("beta-thread-2");
-  });
-
-  it("ignores missing positions and unrelated commands", () => {
-    const layout = buildHomeListLayout({
-      groups: [makeGroup("alpha", 1)],
-      displayStates: displayStates({}),
-    });
-    expect(threadJumpTarget(layout.items, "thread.jump.2")).toBeNull();
-    expect(threadJumpTarget([], "thread.jump.1")).toBeNull();
-    expect(threadJumpTarget(layout.items, "commandPalette")).toBeNull();
-  });
-});
-
-describe("buildHomeListLayout", () => {
-  it("renders a header plus all threads for a small group without a show-more row", () => {
-    const layout = buildHomeListLayout({
-      groups: [makeGroup("alpha", 3)],
-      displayStates: displayStates({}),
-    });
-
-    expect(itemTypes(layout.items)).toEqual(["header", "thread", "thread", "thread"]);
-    expect(layout.stickyHeaderIndices).toEqual([0]);
-    expect(layout.items.at(-1)).toMatchObject({ type: "thread", isLast: true });
-  });
-
-  it("limits large groups to the initial visible count with a show-more row", () => {
-    const layout = buildHomeListLayout({
-      groups: [makeGroup("alpha", 133)],
-      displayStates: displayStates({}),
-    });
-
-    const threadItems = layout.items.filter((item) => item.type === "thread");
-    expect(threadItems).toHaveLength(HOME_INITIAL_VISIBLE_THREADS);
-    expect(layout.items.at(-1)).toMatchObject({
-      type: "show-more",
-      groupKey: "alpha",
-      hiddenCount: 133 - HOME_INITIAL_VISIBLE_THREADS,
-      canShowLess: false,
-    });
-    // The show-more row takes over the last slot, so no thread is marked last.
-    expect(threadItems.every((item) => item.type === "thread" && !item.isLast)).toBe(true);
-  });
-
-  it("reveals more threads per show-more step and offers show-less when exhausted", () => {
-    const group = makeGroup("alpha", 20);
-
-    const expandedOnce = buildHomeListLayout({
-      groups: [group],
-      displayStates: displayStates({
-        alpha: nextGroupDisplayState(DEFAULT_GROUP_DISPLAY_STATE, "show-more"),
-      }),
-    });
-    expect(expandedOnce.items.filter((item) => item.type === "thread")).toHaveLength(
-      HOME_INITIAL_VISIBLE_THREADS + HOME_SHOW_MORE_STEP,
-    );
-    expect(expandedOnce.items.at(-1)).toMatchObject({
-      type: "show-more",
-      hiddenCount: 4,
-      canShowLess: true,
-    });
-
-    const fullyExpanded = buildHomeListLayout({
-      groups: [group],
-      displayStates: displayStates({
-        alpha: nextGroupDisplayState(
-          nextGroupDisplayState(DEFAULT_GROUP_DISPLAY_STATE, "show-more"),
-          "show-more",
-        ),
-      }),
-    });
-    expect(fullyExpanded.items.filter((item) => item.type === "thread")).toHaveLength(20);
-    expect(fullyExpanded.items.at(-1)).toMatchObject({
-      type: "show-more",
-      hiddenCount: 0,
-      canShowLess: true,
-    });
-
-    const reset = nextGroupDisplayState(
-      nextGroupDisplayState(
-        nextGroupDisplayState(DEFAULT_GROUP_DISPLAY_STATE, "show-more"),
-        "show-more",
-      ),
-      "show-less",
-    );
-    expect(reset.visibleCount).toBe(HOME_INITIAL_VISIBLE_THREADS);
-  });
-
-  it("offers show-less after expanding a stale group whose baseline is below the page size", () => {
-    // Stale project: 10 threads total but only 3 within the recency window.
-    const project = makeProject("stale", "stale");
-    const threads = Array.from({ length: 10 }, (_, index) =>
-      makeThread(`stale-thread-${index}`, project.id),
-    );
-    const group: HomeThreadGroup = {
-      key: "stale",
-      title: "stale",
-      representative: project,
-      projects: [project],
-      pendingTasks: [],
-      threads,
-      recentThreads: threads.slice(0, 3),
-      newThreadTarget: project,
-    };
-
-    const collapsedToRecent = buildHomeListLayout({
-      groups: [group],
-      displayStates: displayStates({}),
-    });
-    expect(collapsedToRecent.items.filter((item) => item.type === "thread")).toHaveLength(3);
-    expect(collapsedToRecent.items.at(-1)).toMatchObject({
-      type: "show-more",
-      hiddenCount: 7,
-      canShowLess: false,
-    });
-
-    const expanded = buildHomeListLayout({
-      groups: [group],
-      displayStates: displayStates({
-        stale: nextGroupDisplayState(DEFAULT_GROUP_DISPLAY_STATE, "show-more"),
-      }),
-    });
-    expect(expanded.items.filter((item) => item.type === "thread")).toHaveLength(10);
-    expect(expanded.items.at(-1)).toMatchObject({
-      type: "show-more",
-      hiddenCount: 0,
-      canShowLess: true,
-    });
-  });
-
-  it("hides threads and the show-more row for collapsed groups", () => {
-    const layout = buildHomeListLayout({
-      groups: [makeGroup("alpha", 12), makeGroup("beta", 2)],
-      displayStates: displayStates({
-        alpha: nextGroupDisplayState(DEFAULT_GROUP_DISPLAY_STATE, "toggle-collapsed"),
-      }),
-    });
-
-    expect(itemTypes(layout.items)).toEqual(["header", "header", "thread", "thread"]);
-    expect(layout.items[0]).toMatchObject({ type: "header", collapsed: true, isFirst: true });
-    expect(layout.items[1]).toMatchObject({ type: "header", collapsed: false, isFirst: false });
-    expect(layout.stickyHeaderIndices).toEqual([0, 1]);
-  });
-
-  it("suspends collapse and pagination while searching", () => {
-    const layout = buildHomeListLayout({
-      groups: [makeGroup("alpha", 12)],
-      displayStates: displayStates({
-        alpha: nextGroupDisplayState(DEFAULT_GROUP_DISPLAY_STATE, "toggle-collapsed"),
-      }),
-      showAllThreads: true,
-    });
-
-    expect(layout.items.filter((item) => item.type === "thread")).toHaveLength(12);
-    expect(layout.items.some((item) => item.type === "show-more")).toBe(false);
-  });
-
-  it("keeps sticky indices aligned across multiple expanded groups", () => {
-    const layout = buildHomeListLayout({
-      groups: [makeGroup("alpha", 8), makeGroup("beta", 1)],
-      displayStates: displayStates({}),
-    });
-
-    // header + 6 threads + show-more = 8 items, so beta's header is index 8.
-    expect(layout.stickyHeaderIndices).toEqual([0, 8]);
-    expect(layout.items[8]).toMatchObject({ type: "header", isFirst: false });
-  });
-});
diff --git a/apps/mobile/src/features/home/homeListItems.ts b/apps/mobile/src/features/home/homeListItems.ts
deleted file mode 100644
index 910ddb5896b7..000000000000
--- a/apps/mobile/src/features/home/homeListItems.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
-
-import type { PendingNewTask } from "../../state/use-pending-new-tasks";
-import type { HomeThreadGroup } from "./homeThreadList";
-
-/** Threads shown per project before the "Show more" affordance appears. */
-export const HOME_INITIAL_VISIBLE_THREADS = 6;
-/** Additional threads revealed per "Show more" tap. */
-export const HOME_SHOW_MORE_STEP = 10;
-
-export interface HomeGroupDisplayState {
-  readonly collapsed: boolean;
-  /** How many threads are currently revealed (clamped to the group size). */
-  readonly visibleCount: number;
-}
-
-export const DEFAULT_GROUP_DISPLAY_STATE: HomeGroupDisplayState = {
-  collapsed: false,
-  visibleCount: HOME_INITIAL_VISIBLE_THREADS,
-};
-
-export interface HomeHeaderListItem {
-  readonly type: "header";
-  readonly key: string;
-  readonly group: HomeThreadGroup;
-  readonly collapsed: boolean;
-  readonly isFirst: boolean;
-}
-
-export interface HomeThreadListItem {
-  readonly type: "thread";
-  readonly key: string;
-  readonly thread: EnvironmentThreadShell;
-  readonly isLast: boolean;
-}
-
-export interface HomePendingTaskListItem {
-  readonly type: "pending-task";
-  readonly key: string;
-  readonly pendingTask: PendingNewTask;
-  readonly isLast: boolean;
-}
-
-export interface HomeShowMoreListItem {
-  readonly type: "show-more";
-  readonly key: string;
-  readonly groupKey: string;
-  /** Threads still hidden. 0 means the group is fully expanded. */
-  readonly hiddenCount: number;
-  /** Whether more than the initial count is revealed, so "Show less" applies. */
-  readonly canShowLess: boolean;
-}
-
-export type HomeListItem =
-  | HomeHeaderListItem
-  | HomePendingTaskListItem
-  | HomeThreadListItem
-  | HomeShowMoreListItem;
-
-export interface HomeListLayout {
-  readonly items: ReadonlyArray<HomeListItem>;
-  readonly stickyHeaderIndices: ReadonlyArray<number>;
-}
-
-export const EMPTY_HOME_LIST_LAYOUT: HomeListLayout = { items: [], stickyHeaderIndices: [] };
-
-export type HomeGroupDisplayAction = "toggle-collapsed" | "show-more" | "show-less";
-
-export function nextGroupDisplayState(
-  current: HomeGroupDisplayState,
-  action: HomeGroupDisplayAction,
-): HomeGroupDisplayState {
-  switch (action) {
-    case "toggle-collapsed":
-      return { ...current, collapsed: !current.collapsed };
-    case "show-more":
-      return { ...current, visibleCount: current.visibleCount + HOME_SHOW_MORE_STEP };
-    case "show-less":
-      return { ...current, visibleCount: HOME_INITIAL_VISIBLE_THREADS };
-  }
-}
-
-/**
- * Structural equality for list items. Item objects are rebuilt on every
- * collapse/show-more toggle; without this the lists would consider every
- * mounted row changed and re-render all of them (each carrying a swipeable +
- * a vcs-status subscription). Group/thread references are stable across
- * toggles.
- */
-export function homeListItemsAreEqual(previous: HomeListItem, item: HomeListItem): boolean {
-  switch (item.type) {
-    case "header":
-      return (
-        previous.type === "header" &&
-        previous.group === item.group &&
-        previous.collapsed === item.collapsed &&
-        previous.isFirst === item.isFirst
-      );
-    case "pending-task":
-      return (
-        previous.type === "pending-task" &&
-        previous.pendingTask === item.pendingTask &&
-        previous.isLast === item.isLast
-      );
-    case "thread":
-      return (
-        previous.type === "thread" &&
-        previous.thread === item.thread &&
-        previous.isLast === item.isLast
-      );
-    case "show-more":
-      return (
-        previous.type === "show-more" &&
-        previous.groupKey === item.groupKey &&
-        previous.hiddenCount === item.hiddenCount &&
-        previous.canShowLess === item.canShowLess
-      );
-  }
-}
-
-export function buildHomeListLayout(input: {
-  readonly groups: ReadonlyArray<HomeThreadGroup>;
-  readonly displayStates: ReadonlyMap<string, HomeGroupDisplayState>;
-  /**
-   * When searching, pagination is suspended so every match stays visible.
-   */
-  readonly showAllThreads?: boolean;
-}): HomeListLayout {
-  const items: HomeListItem[] = [];
-  const stickyHeaderIndices: number[] = [];
-
-  for (const [groupIndex, group] of input.groups.entries()) {
-    const display = input.displayStates.get(group.key) ?? DEFAULT_GROUP_DISPLAY_STATE;
-    const collapsed = display.collapsed && input.showAllThreads !== true;
-
-    stickyHeaderIndices.push(items.length);
-    items.push({
-      type: "header",
-      key: `header:${group.key}`,
-      group,
-      collapsed,
-      isFirst: groupIndex === 0,
-    });
-
-    if (collapsed) {
-      continue;
-    }
-
-    const totalCount = group.threads.length;
-    // Default to the group's recent-activity window (last few days, or a small
-    // fallback for stale projects), capped at the initial page size. Until the
-    // user taps "Show more", older threads stay hidden to save vertical space;
-    // "Show less" resets visibleCount to the initial constant, which lands back
-    // here at the recency baseline.
-    const baselineCount = Math.min(
-      group.recentThreads.length,
-      HOME_INITIAL_VISIBLE_THREADS,
-      totalCount,
-    );
-    const visibleCount = input.showAllThreads
-      ? totalCount
-      : Math.min(
-          display.visibleCount > HOME_INITIAL_VISIBLE_THREADS
-            ? display.visibleCount
-            : baselineCount,
-          totalCount,
-        );
-    const visibleThreads = group.threads.slice(0, visibleCount);
-    const hiddenCount = totalCount - visibleCount;
-    const hasShowMoreRow = !input.showAllThreads && totalCount > baselineCount;
-
-    // Pending (unsent) tasks lead the group and are never paginated away.
-    for (const [pendingIndex, pendingTask] of group.pendingTasks.entries()) {
-      items.push({
-        type: "pending-task",
-        key: pendingTask.key,
-        pendingTask,
-        isLast:
-          pendingIndex === group.pendingTasks.length - 1 &&
-          visibleThreads.length === 0 &&
-          !hasShowMoreRow,
-      });
-    }
-
-    for (const [threadIndex, thread] of visibleThreads.entries()) {
-      items.push({
-        type: "thread",
-        key: `thread:${thread.environmentId}:${thread.id}`,
-        thread,
-        isLast: threadIndex === visibleThreads.length - 1 && !hasShowMoreRow,
-      });
-    }
-
-    if (hasShowMoreRow) {
-      items.push({
-        type: "show-more",
-        key: `show-more:${group.key}`,
-        groupKey: group.key,
-        hiddenCount,
-        // Compare against the group's own baseline, not the global page size:
-        // stale projects start below HOME_INITIAL_VISIBLE_THREADS, and "Show
-        // less" must be offered as soon as anything beyond the baseline shows.
-        canShowLess: visibleCount > baselineCount,
-      });
-    }
-  }
-
-  return { items, stickyHeaderIndices };
-}
diff --git a/apps/mobile/src/features/home/homeThreadList.test.ts b/apps/mobile/src/features/home/homeThreadList.test.ts
index 0f7b14bf9365..98b32edfd748 100644
--- a/apps/mobile/src/features/home/homeThreadList.test.ts
+++ b/apps/mobile/src/features/home/homeThreadList.test.ts
@@ -2,15 +2,10 @@ import type {
   EnvironmentProject,
   EnvironmentThreadShell,
 } from "@t3tools/client-runtime/state/shell";
-import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
 import { EnvironmentId, ProjectId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
-import {
-  buildHomeProjectScopes,
-  buildHomeThreadGroups,
-  sortHomeProjectScopes,
-} from "./homeThreadList";
+import { buildHomeProjectScopes, sortHomeProjectScopes } from "./homeThreadList";
 
 function makeProject(
   input: Partial<EnvironmentProject> & Pick<EnvironmentProject, "environmentId" | "id" | "title">,
@@ -52,27 +47,7 @@ function makeThread(
   };
 }
 
-const NOW = Date.parse("2026-06-29T00:00:00.000Z");
-
-function buildGroups(
-  projects: ReadonlyArray<EnvironmentProject>,
-  threads: ReadonlyArray<EnvironmentThreadShell>,
-  overrides: Partial<Parameters<typeof buildHomeThreadGroups>[0]> = {},
-) {
-  return buildHomeThreadGroups({
-    projects,
-    threads,
-    environmentId: null,
-    searchQuery: "",
-    projectSortOrder: "updated_at",
-    threadSortOrder: "updated_at",
-    projectGroupingMode: "repository",
-    now: NOW,
-    ...overrides,
-  });
-}
-
-describe("buildHomeThreadGroups", () => {
+describe("home project scopes", () => {
   it("builds one v2 scope for the same repository across environments", () => {
     const localEnvironmentId = EnvironmentId.make("environment-local");
     const remoteEnvironmentId = EnvironmentId.make("environment-remote");
@@ -116,70 +91,6 @@ describe("buildHomeThreadGroups", () => {
     );
   });
 
-  it("routes stale duplicate project refs through the canonical repository group", () => {
-    const localEnvironmentId = EnvironmentId.make("environment-local");
-    const remoteEnvironmentId = EnvironmentId.make("environment-remote");
-    const repositoryIdentity = {
-      canonicalKey: "github.com/pingdotgg/t3code",
-      locator: {
-        source: "git-remote" as const,
-        remoteName: "origin",
-        remoteUrl: "git@github.com:pingdotgg/t3code.git",
-      },
-    };
-    const local = makeProject({
-      id: ProjectId.make("project-local"),
-      environmentId: localEnvironmentId,
-      title: "t3code",
-      workspaceRoot: "/workspaces/t3code",
-      repositoryIdentity,
-    });
-    const stale = makeProject({
-      environmentId: remoteEnvironmentId,
-      id: ProjectId.make("project-stale"),
-      title: "t3code",
-      workspaceRoot: "/remote/t3code",
-      updatedAt: "2026-06-01T00:00:00.000Z",
-    });
-    const canonicalRemote = makeProject({
-      environmentId: remoteEnvironmentId,
-      id: ProjectId.make("project-canonical-remote"),
-      title: "t3code",
-      workspaceRoot: "/remote/t3code/",
-      repositoryIdentity,
-      updatedAt: "2026-06-02T00:00:00.000Z",
-    });
-    const projects = [local, stale, canonicalRemote];
-    const staleThread = makeThread({
-      environmentId: remoteEnvironmentId,
-      id: ThreadId.make("thread-stale-project-ref"),
-      projectId: stale.id,
-      title: "Still visible",
-      updatedAt: "2026-06-03T00:00:00.000Z",
-    });
-
-    const scopes = buildHomeProjectScopes({
-      projects,
-      environmentId: null,
-      projectGroupingMode: "repository",
-    });
-    const groups = buildGroups(projects, [staleThread]);
-
-    expect(scopes).toHaveLength(1);
-    expect(scopes[0]?.projects.map((project) => project.id)).toEqual([
-      local.id,
-      canonicalRemote.id,
-    ]);
-    expect(scopes[0]?.projectRefs.map((projectRef) => projectRef.projectId)).toEqual([
-      local.id,
-      stale.id,
-      canonicalRemote.id,
-    ]);
-    expect(groups).toHaveLength(1);
-    expect(groups[0]?.threads.map((thread) => thread.id)).toEqual([staleThread.id]);
-    expect(groups[0]?.newThreadTarget?.id).toBe(canonicalRemote.id);
-  });
-
   it("keeps repository identity from an older duplicate when the freshness winner lacks it", () => {
     const localEnvironmentId = EnvironmentId.make("environment-local");
     const remoteEnvironmentId = EnvironmentId.make("environment-remote");
@@ -375,410 +286,4 @@ describe("buildHomeThreadGroups", () => {
       }),
     ).toHaveLength(2);
   });
-
-  it("uses the physical project title for a singleton scope", () => {
-    const project = makeProject({
-      environmentId: EnvironmentId.make("environment-1"),
-      id: ProjectId.make("project-1"),
-      title: "local-worktree-name",
-      repositoryIdentity: {
-        canonicalKey: "github.com/pingdotgg/t3code",
-        displayName: "codething-mvp",
-        locator: {
-          source: "git-remote" as const,
-          remoteName: "origin",
-          remoteUrl: "git@github.com:pingdotgg/t3code.git",
-        },
-      },
-    });
-
-    const scopes = buildHomeProjectScopes({
-      projects: [project],
-      environmentId: null,
-      projectGroupingMode: "repository",
-    });
-    const groups = buildGroups(
-      [project],
-      [
-        makeThread({
-          environmentId: project.environmentId,
-          id: ThreadId.make("thread-1"),
-          projectId: project.id,
-          title: "Thread",
-        }),
-      ],
-    );
-
-    expect(scopes[0]?.title).toBe("local-worktree-name");
-    expect(groups[0]?.title).toBe("local-worktree-name");
-  });
-
-  it("sorts the newest thread first regardless of snapshot order", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const project = makeProject({
-      environmentId,
-      id: ProjectId.make("project-1"),
-      title: "T3 Code",
-    });
-    const threads = [
-      makeThread({
-        environmentId,
-        id: ThreadId.make("thread-old"),
-        projectId: project.id,
-        title: "Older thread",
-        updatedAt: "2026-06-02T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId,
-        id: ThreadId.make("thread-new"),
-        projectId: project.id,
-        title: "Newer thread",
-        updatedAt: "2026-06-03T00:00:00.000Z",
-      }),
-    ];
-
-    expect(buildGroups([project], threads)[0]?.threads.map((thread) => thread.id)).toEqual([
-      "thread-new",
-      "thread-old",
-    ]);
-  });
-
-  it("supports independent project and thread creation-time sorting", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const olderProject = makeProject({
-      environmentId,
-      id: ProjectId.make("project-older"),
-      title: "Older project",
-    });
-    const newerProject = makeProject({
-      environmentId,
-      id: ProjectId.make("project-newer"),
-      title: "Newer project",
-    });
-    const threads = [
-      makeThread({
-        environmentId,
-        id: ThreadId.make("old-created"),
-        projectId: olderProject.id,
-        title: "Updated recently",
-        createdAt: "2026-06-01T00:00:00.000Z",
-        updatedAt: "2026-06-05T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId,
-        id: ThreadId.make("new-created"),
-        projectId: olderProject.id,
-        title: "Created recently",
-        createdAt: "2026-06-04T00:00:00.000Z",
-        updatedAt: "2026-06-04T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId,
-        id: ThreadId.make("newest-project-thread"),
-        projectId: newerProject.id,
-        title: "Newest project",
-        createdAt: "2026-06-06T00:00:00.000Z",
-      }),
-    ];
-
-    const groups = buildGroups([olderProject, newerProject], threads, {
-      projectSortOrder: "created_at",
-      threadSortOrder: "created_at",
-      projectGroupingMode: "separate",
-    });
-
-    expect(groups.map((group) => group.representative.id)).toEqual([
-      "project-newer",
-      "project-older",
-    ]);
-    expect(groups[1]?.threads.map((thread) => thread.id)).toEqual(["new-created", "old-created"]);
-  });
-
-  it("filters both projects and threads to one environment", () => {
-    const localEnvironmentId = EnvironmentId.make("environment-local");
-    const remoteEnvironmentId = EnvironmentId.make("environment-remote");
-    const projects = [
-      makeProject({
-        environmentId: localEnvironmentId,
-        id: ProjectId.make("project-local"),
-        title: "Local",
-      }),
-      makeProject({
-        environmentId: remoteEnvironmentId,
-        id: ProjectId.make("project-remote"),
-        title: "Remote",
-      }),
-    ];
-    const threads = projects.map((project) =>
-      makeThread({
-        environmentId: project.environmentId,
-        id: ThreadId.make(`thread-${project.id}`),
-        projectId: project.id,
-        title: project.title,
-      }),
-    );
-
-    const groups = buildGroups(projects, threads, { environmentId: remoteEnvironmentId });
-
-    expect(groups).toHaveLength(1);
-    expect(groups[0]?.representative.environmentId).toBe(remoteEnvironmentId);
-    expect(groups[0]?.threads.map((thread) => thread.environmentId)).toEqual([remoteEnvironmentId]);
-  });
-
-  it("matches web repository, repository-path, and separate grouping modes", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const repositoryIdentity = {
-      canonicalKey: "github.com/t3tools/t3code",
-      locator: {
-        source: "git-remote" as const,
-        remoteName: "origin",
-        remoteUrl: "git@github.com:t3tools/t3code.git",
-      },
-      provider: "github",
-      owner: "t3tools",
-      name: "t3code",
-      displayName: "T3 Code",
-      rootPath: "/workspaces/t3code",
-    };
-    const projects = [
-      makeProject({
-        environmentId,
-        id: ProjectId.make("project-web"),
-        title: "Web",
-        workspaceRoot: "/workspaces/t3code/apps/web",
-        repositoryIdentity,
-      }),
-      makeProject({
-        environmentId,
-        id: ProjectId.make("project-mobile"),
-        title: "Mobile",
-        workspaceRoot: "/workspaces/t3code/apps/mobile",
-        repositoryIdentity,
-      }),
-    ];
-    const threads = projects.map((project) =>
-      makeThread({
-        environmentId,
-        id: ThreadId.make(`thread-${project.id}`),
-        projectId: project.id,
-        title: project.title,
-      }),
-    );
-
-    expect(buildGroups(projects, threads, { projectGroupingMode: "repository" })).toHaveLength(1);
-    expect(
-      buildGroups(projects, threads, { projectGroupingMode: "repository_path" }).map(
-        (group) => group.title,
-      ),
-    ).toEqual(["Mobile", "Web"]);
-    expect(
-      buildGroups(projects, threads, { projectGroupingMode: "separate" }).map(
-        (group) => group.title,
-      ),
-    ).toEqual(["Mobile", "Web"]);
-  });
-
-  it("default view shows only threads from the last 5 days", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const project = makeProject({
-      environmentId,
-      id: ProjectId.make("project-1"),
-      title: "T3 Code",
-    });
-    const threads = [
-      makeThread({
-        environmentId,
-        id: ThreadId.make("recent-1"),
-        projectId: project.id,
-        title: "Today",
-        updatedAt: "2026-06-28T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId,
-        id: ThreadId.make("recent-2"),
-        projectId: project.id,
-        title: "Within window",
-        updatedAt: "2026-06-25T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId,
-        id: ThreadId.make("old"),
-        projectId: project.id,
-        title: "Two weeks ago",
-        updatedAt: "2026-06-14T00:00:00.000Z",
-      }),
-    ];
-
-    const group = buildGroups([project], threads)[0];
-    // Default view trims to recent threads...
-    expect(group?.recentThreads.map((thread) => thread.id)).toEqual(["recent-1", "recent-2"]);
-    // ...while full history stays available for the expanded view.
-    expect(group?.threads.map((thread) => thread.id)).toEqual(["recent-1", "recent-2", "old"]);
-  });
-
-  it("keeps an old thread in the default view while a message waits in its outbox", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const project = makeProject({
-      environmentId,
-      id: ProjectId.make("project-1"),
-      title: "T3 Code",
-    });
-    const threads = [
-      makeThread({
-        environmentId,
-        id: ThreadId.make("recent"),
-        projectId: project.id,
-        title: "Today",
-        updatedAt: "2026-06-28T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId,
-        id: ThreadId.make("old-queued"),
-        projectId: project.id,
-        title: "Two weeks ago, follow-up queued offline",
-        updatedAt: "2026-06-14T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId,
-        id: ThreadId.make("old"),
-        projectId: project.id,
-        title: "Two weeks ago",
-        updatedAt: "2026-06-13T00:00:00.000Z",
-      }),
-    ];
-
-    const group = buildGroups([project], threads, {
-      queuedThreadKeys: new Set([`${environmentId}:old-queued`]),
-    })[0];
-    expect(group?.recentThreads.map((thread) => thread.id)).toEqual(["recent", "old-queued"]);
-  });
-
-  it("falls back to the most recent 3 threads when none are within 5 days", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const project = makeProject({
-      environmentId,
-      id: ProjectId.make("project-1"),
-      title: "T3 Code",
-    });
-    const threads = ["2026-06-01", "2026-06-02", "2026-06-03", "2026-06-04", "2026-06-05"].map(
-      (day, index) =>
-        makeThread({
-          environmentId,
-          id: ThreadId.make(`thread-${index}`),
-          projectId: project.id,
-          title: `Thread ${index}`,
-          updatedAt: `${day}T00:00:00.000Z`,
-        }),
-    );
-
-    const group = buildGroups([project], threads)[0];
-    expect(group?.recentThreads.map((thread) => thread.id)).toEqual([
-      "thread-4",
-      "thread-3",
-      "thread-2",
-    ]);
-    expect(group?.threads).toHaveLength(5);
-  });
-
-  it("does not apply the recency window while searching", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const project = makeProject({
-      environmentId,
-      id: ProjectId.make("project-1"),
-      title: "T3 Code",
-    });
-    const threads = ["2026-06-01", "2026-06-02", "2026-06-03", "2026-06-04", "2026-06-05"].map(
-      (day, index) =>
-        makeThread({
-          environmentId,
-          id: ThreadId.make(`thread-${index}`),
-          projectId: project.id,
-          title: `Thread ${index}`,
-          updatedAt: `${day}T00:00:00.000Z`,
-        }),
-    );
-
-    const group = buildGroups([project], threads, { searchQuery: "T3 Code" })[0];
-    // Search reaches the full history rather than the 3-thread fallback.
-    expect(group?.recentThreads).toHaveLength(5);
-    expect(group?.recentThreads.map((thread) => thread.id)).toEqual(
-      group?.threads.map((thread) => thread.id),
-    );
-  });
-
-  it("includes a thread matched by message content", () => {
-    const environmentId = EnvironmentId.make("environment-1");
-    const project = makeProject({
-      environmentId,
-      id: ProjectId.make("project-1"),
-      title: "T3 Code",
-    });
-    const thread = makeThread({
-      environmentId,
-      id: ThreadId.make("thread-content"),
-      projectId: project.id,
-      title: "Unrelated title",
-    });
-
-    const groups = buildGroups([project], [thread], {
-      searchQuery: "relay reconnect",
-      matchedThreadKeys: new Set([
-        threadSearchMatchKey({
-          environmentId,
-          threadId: thread.id,
-        }),
-      ]),
-    });
-
-    expect(groups[0]?.threads.map((candidate) => candidate.id)).toEqual(["thread-content"]);
-  });
-
-  it("targets quick new threads at the group member with the newest thread", () => {
-    const laptopEnv = EnvironmentId.make("environment-laptop");
-    const desktopEnv = EnvironmentId.make("environment-desktop");
-    const repositoryIdentity = {
-      canonicalKey: "github.com/pingdotgg/t3code",
-      locator: {
-        source: "git-remote" as const,
-        remoteName: "origin",
-        remoteUrl: "git@github.com:pingdotgg/t3code.git",
-      },
-    };
-    const laptopProject = makeProject({
-      environmentId: laptopEnv,
-      id: ProjectId.make("project-laptop"),
-      title: "t3code",
-      repositoryIdentity,
-    });
-    const desktopProject = makeProject({
-      environmentId: desktopEnv,
-      id: ProjectId.make("project-desktop"),
-      title: "t3code",
-      repositoryIdentity,
-    });
-    const threads = [
-      makeThread({
-        environmentId: laptopEnv,
-        id: ThreadId.make("thread-laptop"),
-        projectId: laptopProject.id,
-        title: "Older laptop thread",
-        updatedAt: "2026-06-27T00:00:00.000Z",
-      }),
-      makeThread({
-        environmentId: desktopEnv,
-        id: ThreadId.make("thread-desktop"),
-        projectId: desktopProject.id,
-        title: "Newest desktop thread",
-        updatedAt: "2026-06-28T00:00:00.000Z",
-      }),
-    ];
-
-    // Aggregated into one group by repository; the quick new-thread target
-    // must follow the newest thread (desktop), not the arbitrary first member.
-    const groups = buildGroups([laptopProject, desktopProject], threads);
-    expect(groups).toHaveLength(1);
-    expect(groups[0]?.projects).toHaveLength(2);
-    expect(groups[0]?.newThreadTarget?.environmentId).toBe(desktopEnv);
-    expect(groups[0]?.newThreadTarget?.id).toBe(desktopProject.id);
-  });
 });
diff --git a/apps/mobile/src/features/home/homeThreadList.ts b/apps/mobile/src/features/home/homeThreadList.ts
index 895c73bbe266..0c85972e43e5 100644
--- a/apps/mobile/src/features/home/homeThreadList.ts
+++ b/apps/mobile/src/features/home/homeThreadList.ts
@@ -1,31 +1,22 @@
-import { threadPullRequestSearchTerms } from "@t3tools/shared/threadPullRequests";
-import {
-  buildProjectGroups,
-  derivePhysicalProjectKey,
-  deriveProjectGroupLabel,
-} from "@t3tools/client-runtime/state/project-grouping";
+import { buildProjectGroups } from "@t3tools/client-runtime/state/project-grouping";
 import type {
   EnvironmentProject,
   EnvironmentThreadShell,
 } from "@t3tools/client-runtime/state/shell";
 import {
   getThreadSortTimestamp,
-  sortThreads,
   toSortableTimestamp,
 } from "@t3tools/client-runtime/state/thread-sort";
-import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
 import type {
   EnvironmentId,
   ScopedProjectRef,
   SidebarProjectGroupingMode,
   SidebarProjectSortOrder,
-  SidebarThreadSortOrder,
 } from "@t3tools/contracts";
 import * as Arr from "effect/Array";
-import * as Option from "effect/Option";
 import * as Order from "effect/Order";
 
-import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
+import { scopedProjectKey } from "../../lib/scopedEntities";
 import type { PendingNewTask } from "../../state/use-pending-new-tasks";
 
 export type HomeProjectSortOrder = Exclude<SidebarProjectSortOrder, "manual">;
@@ -133,260 +124,3 @@ export function sortHomeProjectScopes(input: {
     ),
   );
 }
-
-/**
- * Default home view only surfaces threads active within this window, to keep the
- * screen compact while keeping recent work visible.
- */
-const RECENT_THREAD_WINDOW_MS = 5 * 24 * 60 * 60 * 1000;
-/** Fallback when a project has no threads inside the recency window. */
-const RECENT_THREAD_FALLBACK_COUNT = 3;
-
-export interface HomeThreadGroup {
-  readonly key: string;
-  readonly title: string;
-  readonly representative: EnvironmentProject;
-  readonly projects: ReadonlyArray<EnvironmentProject>;
-  readonly pendingTasks: ReadonlyArray<PendingNewTask>;
-  /** Full sorted thread history for the group (revealed when expanded / searching). */
-  readonly threads: ReadonlyArray<EnvironmentThreadShell>;
-  /** Subset shown by default: threads from the last few days, or the most recent few. */
-  readonly recentThreads: ReadonlyArray<EnvironmentThreadShell>;
-  /**
-   * Where a quick "new thread in this project" should land. For aggregated
-   * groups (same repo on several machines) this is the member that owns the
-   * group's most recent thread — the machine the user last worked on — rather
-   * than the arbitrary first member; the draft's computer picker covers
-   * switching from there. Null only for synthetic pending-project groups,
-   * whose single "project" is a placeholder built from queued-task metadata.
-   */
-  readonly newThreadTarget: EnvironmentProject | null;
-}
-
-interface MutableHomeThreadGroup {
-  readonly key: string;
-  readonly projects: EnvironmentProject[];
-  readonly pendingTasks: PendingNewTask[];
-  readonly threads: EnvironmentThreadShell[];
-}
-
-function groupSortTimestamp(group: HomeThreadGroup, sortOrder: HomeProjectSortOrder): number {
-  const latestThread = group.threads.reduce(
-    (latest, thread) => Math.max(latest, getThreadSortTimestamp(thread, sortOrder)),
-    Number.NEGATIVE_INFINITY,
-  );
-  return group.pendingTasks.reduce((latest, pendingTask) => {
-    const timestamp = Date.parse(pendingTask.createdAt);
-    return Number.isNaN(timestamp) ? latest : Math.max(latest, timestamp);
-  }, latestThread);
-}
-
-/**
- * Trims a group's threads to recent activity for the default home view.
- * `sortedThreads` must already be ordered newest-first for `threadSortOrder`.
- * Keeps threads within {@link RECENT_THREAD_WINDOW_MS}; when none qualify, keeps
- * the most recent {@link RECENT_THREAD_FALLBACK_COUNT} so a project never vanishes.
- */
-function selectRecentThreads(
-  sortedThreads: ReadonlyArray<EnvironmentThreadShell>,
-  threadSortOrder: SidebarThreadSortOrder,
-  now: number,
-  queuedThreadKeys: ReadonlySet<string> | undefined,
-): ReadonlyArray<EnvironmentThreadShell> {
-  const cutoff = now - RECENT_THREAD_WINDOW_MS;
-  // A thread with a message waiting in the outbox has work the user is
-  // waiting on, however old its last activity; it never trims away.
-  const recent = sortedThreads.filter(
-    (thread) =>
-      getThreadSortTimestamp(thread, threadSortOrder) >= cutoff ||
-      queuedThreadKeys?.has(scopedThreadKey(thread.environmentId, thread.id)) === true,
-  );
-  return recent.length > 0 ? recent : sortedThreads.slice(0, RECENT_THREAD_FALLBACK_COUNT);
-}
-
-export function buildHomeThreadGroups(input: {
-  readonly projects: ReadonlyArray<EnvironmentProject>;
-  readonly threads: ReadonlyArray<EnvironmentThreadShell>;
-  readonly pendingTasks?: ReadonlyArray<PendingNewTask>;
-  /** Thread keys with a message waiting in the outbox; kept in the default view. */
-  readonly queuedThreadKeys?: ReadonlySet<string>;
-  readonly environmentId: EnvironmentId | null;
-  readonly searchQuery: string;
-  readonly matchedThreadKeys?: ReadonlySet<string>;
-  readonly projectSortOrder: HomeProjectSortOrder;
-  readonly threadSortOrder: SidebarThreadSortOrder;
-  readonly projectGroupingMode: SidebarProjectGroupingMode;
-  /** Current time used for the recency window; defaults to now. Injectable for tests. */
-  readonly now?: number;
-}): ReadonlyArray<HomeThreadGroup> {
-  const now = input.now ?? Date.now();
-  const groups = new Map<string, MutableHomeThreadGroup>();
-  const groupTitleByKey = new Map<string, string>();
-  const groupKeyByProjectKey = new Map<string, string>();
-
-  for (const scope of buildHomeProjectScopes(input)) {
-    groupTitleByKey.set(scope.key, scope.title);
-    groups.set(scope.key, {
-      key: scope.key,
-      projects: [...scope.projects],
-      pendingTasks: [],
-      threads: [],
-    });
-    for (const projectRef of scope.projectRefs) {
-      groupKeyByProjectKey.set(
-        scopedProjectKey(projectRef.environmentId, projectRef.projectId),
-        scope.key,
-      );
-    }
-  }
-
-  for (const pendingTask of input.pendingTasks ?? []) {
-    if (input.environmentId !== null && pendingTask.environmentId !== input.environmentId) {
-      continue;
-    }
-
-    const physicalKey = scopedProjectKey(pendingTask.environmentId, pendingTask.projectId);
-    let groupKey = groupKeyByProjectKey.get(physicalKey);
-    if (!groupKey) {
-      // The project shell is not loaded (environment offline / project gone).
-      // A queued task must stay visible and deletable regardless, so build a
-      // standalone group from the metadata snapshotted at enqueue time.
-      groupKey = `pending-project:${physicalKey}`;
-      groupKeyByProjectKey.set(physicalKey, groupKey);
-      groups.set(groupKey, {
-        key: groupKey,
-        projects: [
-          {
-            environmentId: pendingTask.environmentId,
-            id: pendingTask.projectId,
-            title: pendingTask.projectTitle ?? "Unknown project",
-            workspaceRoot: pendingTask.projectCwd ?? String(pendingTask.projectId),
-            repositoryIdentity: null,
-            defaultModelSelection: null,
-            scripts: [],
-            createdAt: pendingTask.createdAt,
-            updatedAt: pendingTask.createdAt,
-          },
-        ],
-        pendingTasks: [],
-        threads: [],
-      });
-    }
-    groups.get(groupKey)?.pendingTasks.push(pendingTask);
-  }
-
-  for (const thread of input.threads) {
-    if (thread.archivedAt !== null) {
-      continue;
-    }
-    if (input.environmentId !== null && thread.environmentId !== input.environmentId) {
-      continue;
-    }
-
-    const physicalKey = scopedProjectKey(thread.environmentId, thread.projectId);
-    const groupKey = groupKeyByProjectKey.get(physicalKey);
-    if (!groupKey) {
-      continue;
-    }
-    groups.get(groupKey)?.threads.push(thread);
-  }
-
-  const query = input.searchQuery.trim().toLocaleLowerCase();
-  const result: HomeThreadGroup[] = [];
-
-  for (const group of groups.values()) {
-    const representative = group.projects[0];
-    if (!representative || (group.threads.length === 0 && group.pendingTasks.length === 0)) {
-      continue;
-    }
-
-    const title =
-      groupTitleByKey.get(group.key) ??
-      deriveProjectGroupLabel({ representative, members: group.projects });
-    const groupMatches =
-      query.length === 0 ||
-      title.toLocaleLowerCase().includes(query) ||
-      group.projects.some((project) => project.title.toLocaleLowerCase().includes(query));
-    const matchingThreads = groupMatches
-      ? group.threads
-      : group.threads.filter(
-          (thread) =>
-            thread.title.toLocaleLowerCase().includes(query) ||
-            threadPullRequestSearchTerms(thread).some((term) =>
-              term.toLocaleLowerCase().includes(query),
-            ) ||
-            input.matchedThreadKeys?.has(
-              threadSearchMatchKey({
-                environmentId: thread.environmentId,
-                threadId: thread.id,
-              }),
-            ) === true,
-        );
-    const matchingPendingTasks = groupMatches
-      ? group.pendingTasks
-      : group.pendingTasks.filter((pendingTask) =>
-          pendingTask.title.toLocaleLowerCase().includes(query),
-        );
-
-    if (matchingThreads.length === 0 && matchingPendingTasks.length === 0) {
-      continue;
-    }
-
-    const sortedThreads = sortThreads(matchingThreads, input.threadSortOrder);
-    // An active search should reach the full history, so the recency window
-    // only trims the default (no-query) view.
-    const recentThreads =
-      query.length === 0
-        ? selectRecentThreads(sortedThreads, input.threadSortOrder, now, input.queuedThreadKeys)
-        : sortedThreads;
-
-    // A stale project id still resolves to the canonical member with the same
-    // environment/path, so quick creation follows the machine with the newest activity.
-    const lastActiveProject = Arr.head(sortedThreads).pipe(
-      Option.flatMap((thread) =>
-        Arr.findFirst(
-          input.projects,
-          (project) =>
-            project.environmentId === thread.environmentId && project.id === thread.projectId,
-        ),
-      ),
-      Option.flatMap((threadProject) =>
-        Arr.findFirst(
-          group.projects,
-          (project) =>
-            derivePhysicalProjectKey(project) === derivePhysicalProjectKey(threadProject),
-        ),
-      ),
-      Option.getOrNull,
-    );
-
-    result.push({
-      key: group.key,
-      title,
-      representative,
-      projects: group.projects,
-      pendingTasks: matchingPendingTasks,
-      threads: sortedThreads,
-      recentThreads,
-      newThreadTarget: group.key.startsWith("pending-project:")
-        ? null
-        : (lastActiveProject ?? representative),
-    });
-  }
-
-  return Arr.sort(
-    result,
-    Order.mapInput(
-      Order.Struct({
-        timestamp: Order.flip(Order.Number),
-        title: Order.String,
-        key: Order.String,
-      }),
-      (group: HomeThreadGroup) => ({
-        timestamp: groupSortTimestamp(group, input.projectSortOrder),
-        title: group.title,
-        key: group.key,
-      }),
-    ),
-  );
-}
diff --git a/apps/mobile/src/features/home/swipe-row-activation.test.ts b/apps/mobile/src/features/home/swipe-row-activation.test.ts
new file mode 100644
index 000000000000..43f8dcf0ca7e
--- /dev/null
+++ b/apps/mobile/src/features/home/swipe-row-activation.test.ts
@@ -0,0 +1,68 @@
+import { describe, expect, it, vi } from "vite-plus/test";
+
+import { createSwipeRowActivation } from "./swipe-row-activation";
+
+describe("createSwipeRowActivation", () => {
+  it("activates exactly the requested rows and notifies only on change", () => {
+    const activation = createSwipeRowActivation();
+    const listener = vi.fn();
+    activation.subscribe(listener);
+
+    activation.activate(["a", "b"]);
+    activation.activate(["b", "a"]);
+
+    expect(activation.isActive("a")).toBe(true);
+    expect(activation.isActive("c")).toBe(false);
+    expect(listener).toHaveBeenCalledTimes(1);
+
+    activation.activate(["c"]);
+    expect(activation.isActive("a")).toBe(false);
+    expect(activation.isActive("c")).toBe(true);
+    expect(listener).toHaveBeenCalledTimes(2);
+  });
+
+  it("defers changes while a finger is on the list so a press is never remounted", () => {
+    const activation = createSwipeRowActivation();
+    activation.activate(["a"]);
+
+    activation.trackTouches(["1"], ["1"]);
+    activation.activate(["b"]);
+    activation.activate(["c"]);
+    expect(activation.isActive("a")).toBe(true);
+    expect(activation.isActive("c")).toBe(false);
+
+    activation.trackTouches([], []);
+    expect(activation.isActive("a")).toBe(false);
+    expect(activation.isActive("b")).toBe(false);
+    expect(activation.isActive("c")).toBe(true);
+  });
+
+  it("ignores fingers that did not start on the list", () => {
+    const activation = createSwipeRowActivation();
+    activation.trackTouches(["1"], ["1", "2"]);
+    activation.activate(["a"]);
+
+    // The list finger lifts while finger 2 stays on another control.
+    activation.trackTouches([], ["2"]);
+    expect(activation.isActive("a")).toBe(true);
+  });
+
+  it("drops a list finger whose end event never arrived", () => {
+    const activation = createSwipeRowActivation();
+    activation.trackTouches(["1"], ["1"]);
+    activation.activate(["a"]);
+
+    activation.trackTouches(["2"], ["2"]);
+    activation.trackTouches([], []);
+    expect(activation.isActive("a")).toBe(true);
+  });
+
+  it("stops notifying after unsubscribe", () => {
+    const activation = createSwipeRowActivation();
+    const listener = vi.fn();
+    const unsubscribe = activation.subscribe(listener);
+    unsubscribe();
+    activation.activate(["a"]);
+    expect(listener).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/mobile/src/features/home/swipe-row-activation.ts b/apps/mobile/src/features/home/swipe-row-activation.ts
new file mode 100644
index 000000000000..d56d12cba56f
--- /dev/null
+++ b/apps/mobile/src/features/home/swipe-row-activation.ts
@@ -0,0 +1,62 @@
+import { createContext, use, useSyncExternalStore } from "react";
+
+/**
+ * Full swipe rows (pan gesture, animated actions, hidden action buttons) only
+ * exist around the viewport. Every other Home row renders a dormant frame that
+ * paints the same content with a fraction of the native views, so a row the
+ * list rebuilds while scrolling is cheap. The scroll gate already disables
+ * swipes while the list moves, so rows are activated once it rests.
+ */
+export function createSwipeRowActivation() {
+  let activeKeys = new Set<string>();
+  // Swapping a row's frame remounts it, which would cancel a press or long
+  // press in progress, so changes wait until every finger that started on the
+  // list has lifted.
+  const listTouches = new Set<string>();
+  let pendingKeys: ReadonlyArray<string> | null = null;
+  const listeners = new Set<() => void>();
+  const apply = (keys: ReadonlyArray<string>) => {
+    if (keys.length === activeKeys.size && keys.every((key) => activeKeys.has(key))) return;
+    activeKeys = new Set(keys);
+    for (const listener of listeners) listener();
+  };
+  return {
+    subscribe(listener: () => void) {
+      listeners.add(listener);
+      return () => void listeners.delete(listener);
+    },
+    isActive: (key: string) => activeKeys.has(key),
+    activate(keys: ReadonlyArray<string>) {
+      if (listTouches.size > 0) pendingKeys = keys;
+      else apply(keys);
+    },
+    /**
+     * `started` are touches that just began on the list; `onScreen` is every
+     * finger still down anywhere. A finger on another control never holds
+     * changes, and one whose end event went missing is dropped here.
+     */
+    trackTouches(started: ReadonlyArray<string>, onScreen: ReadonlyArray<string>) {
+      for (const id of started) listTouches.add(id);
+      for (const id of listTouches) if (!onScreen.includes(id)) listTouches.delete(id);
+      if (listTouches.size > 0 || pendingKeys === null) return;
+      const keys = pendingKeys;
+      pendingKeys = null;
+      apply(keys);
+    },
+  };
+}
+
+export type SwipeRowActivation = ReturnType<typeof createSwipeRowActivation>;
+
+export const SwipeRowActivationContext = createContext<SwipeRowActivation | null>(null);
+
+const subscribeNever = () => () => {};
+
+/** Rows outside an activation provider (e.g. the iPad sidebar) stay live. */
+export function useSwipeRowDormant(key: string | undefined): boolean {
+  const activation = use(SwipeRowActivationContext);
+  return useSyncExternalStore(
+    activation?.subscribe ?? subscribeNever,
+    () => activation !== null && key !== undefined && !activation.isActive(key),
+  );
+}
diff --git a/apps/mobile/src/features/home/thread-swipe-actions.tsx b/apps/mobile/src/features/home/thread-swipe-actions.tsx
index 44f3c36e6655..e62935c28861 100644
--- a/apps/mobile/src/features/home/thread-swipe-actions.tsx
+++ b/apps/mobile/src/features/home/thread-swipe-actions.tsx
@@ -40,6 +40,7 @@ import Animated, {
 } from "react-native-reanimated";
 
 import { AppText as Text } from "../../components/AppText";
+import { SwipeRowActivationContext, type SwipeRowActivation } from "./swipe-row-activation";
 import { registerThreadDismissal } from "./thread-dismissal";
 
 // Wide enough for the longest action label ("Unarchive").
@@ -129,11 +130,14 @@ const SwipeableScrollGateContext = createContext(true);
 
 export function SwipeableScrollGateProvider(props: {
   readonly enabled: boolean;
+  readonly activation?: SwipeRowActivation;
   readonly children: ReactNode;
 }) {
   return (
     <SwipeableScrollGateContext.Provider value={props.enabled}>
-      {props.children}
+      <SwipeRowActivationContext value={props.activation ?? null}>
+        {props.children}
+      </SwipeRowActivationContext>
     </SwipeableScrollGateContext.Provider>
   );
 }
@@ -260,13 +264,32 @@ interface ThreadSwipeableProps {
    * open/mid-drag state can't leak onto another row.
    */
   readonly resetKey?: string;
+  /** Paints the row without swipe machinery; see swipe-row-activation. */
+  readonly dormant?: boolean;
   readonly simultaneousWithExternalGesture?: ComponentProps<
     typeof ReanimatedSwipeable
   >["simultaneousWithExternalGesture"];
   readonly threadTitle: string;
 }
 
+const closeDormant = () => {};
+
 export function ThreadSwipeable(props: ThreadSwipeableProps) {
+  if (props.dormant) {
+    // Mirrors ReanimatedSwipeable's container and children views.
+    return (
+      <View
+        style={[
+          { overflow: "hidden", backgroundColor: props.backgroundColor },
+          props.containerStyle,
+        ]}
+      >
+        <View style={{ backgroundColor: props.backgroundColor }}>
+          {props.children(closeDormant)}
+        </View>
+      </View>
+    );
+  }
   // Recycled content gets fresh native and animation state. Late callbacks
   // from the previous row retain its action, never the replacement's action.
   return <ThreadSwipeableRow key={props.resetKey} {...props} />;
diff --git a/apps/mobile/src/features/home/useThreadListActions.ts b/apps/mobile/src/features/home/useThreadListActions.ts
index 9b599110883c..4a43facc6172 100644
--- a/apps/mobile/src/features/home/useThreadListActions.ts
+++ b/apps/mobile/src/features/home/useThreadListActions.ts
@@ -59,6 +59,15 @@ function environmentSupportsPinReorder(environmentId: EnvironmentThreadShell["en
   );
 }
 
+function environmentSupportsAutoSettleOptOut(
+  environmentId: EnvironmentThreadShell["environmentId"],
+) {
+  return (
+    appAtomRegistry.get(environmentServerConfigsAtom).get(environmentId)?.environment.capabilities
+      .threadAutoSettleOptOut === true
+  );
+}
+
 function environmentSupportsTitleRegeneration(
   environmentId: EnvironmentThreadShell["environmentId"],
 ) {
@@ -237,6 +246,11 @@ export function useThreadListActions(): {
   readonly unsettleThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
   readonly pinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
   readonly unpinThread: (thread: EnvironmentThreadShell) => Promise<boolean>;
+  /** Sets per-thread automatic settlement on or off. */
+  readonly setThreadAutoSettle: (
+    thread: EnvironmentThreadShell,
+    enabled: boolean,
+  ) => Promise<boolean>;
   readonly moveThread: (
     thread: EnvironmentThreadShell,
     direction: ThreadMoveDestination,
@@ -249,6 +263,9 @@ export function useThreadListActions(): {
   const unsnoozeMutation = useAtomCommand(threadEnvironment.unsnooze, { reportFailure: false });
   const pinMutation = useAtomCommand(threadEnvironment.pin, { reportFailure: false });
   const unpinMutation = useAtomCommand(threadEnvironment.unpin, { reportFailure: false });
+  const setAutoSettleMutation = useAtomCommand(threadEnvironment.setAutoSettle, {
+    reportFailure: false,
+  });
   const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
     reportFailure: false,
   });
@@ -435,6 +452,34 @@ export function useThreadListActions(): {
     },
     [unpinMutation],
   );
+  const setThreadAutoSettle = useCallback(
+    async (thread: EnvironmentThreadShell, enabled: boolean) => {
+      if (!environmentSupportsAutoSettleOptOut(thread.environmentId)) {
+        Alert.alert(
+          "Could not update auto-settle",
+          "This environment's server does not support turning auto-settle off per thread yet. Update the server to use it.",
+        );
+        return false;
+      }
+      selectionHaptic();
+      const result = await setAutoSettleMutation({
+        environmentId: thread.environmentId,
+        input: { threadId: thread.id, enabled },
+      });
+      if (result._tag === "Failure") {
+        const error = Cause.squash(result.cause);
+        Alert.alert(
+          "Could not update auto-settle",
+          error instanceof Error && error.message.trim().length > 0
+            ? error.message
+            : "The auto-settle setting could not be changed.",
+        );
+        return false;
+      }
+      return true;
+    },
+    [setAutoSettleMutation],
+  );
   const regenerateThreadTitle = useCallback(
     async (thread: EnvironmentThreadShell) => {
       const key = scopedThreadKey(thread.environmentId, thread.id);
@@ -698,6 +743,7 @@ export function useThreadListActions(): {
     unsettleThread,
     pinThread,
     unpinThread,
+    setThreadAutoSettle,
     moveThread,
     renameThread,
     regenerateThreadTitle,
diff --git a/apps/mobile/src/features/keyboard/threadKeyboardShortcuts.ts b/apps/mobile/src/features/keyboard/threadKeyboardShortcuts.ts
index b76d2f8a90bf..45b6ccb13d17 100644
--- a/apps/mobile/src/features/keyboard/threadKeyboardShortcuts.ts
+++ b/apps/mobile/src/features/keyboard/threadKeyboardShortcuts.ts
@@ -2,23 +2,19 @@ import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell
 import { THREAD_JUMP_KEYBINDING_COMMANDS } from "@t3tools/contracts";
 import { useCallback } from "react";
 
-import type { HomeListItem } from "../home/homeListItems";
 import type { ThreadListV2ListItem } from "../threads/threadListV2";
 import {
   useHardwareKeyboardCommand,
   type HardwareKeyboardCommand,
 } from "./hardwareKeyboardCommands";
 
-type ThreadShortcutListItem =
-  | HomeListItem
-  | ThreadListV2ListItem
-  | { readonly type: "v2-show-more" };
+type ThreadShortcutListItem = ThreadListV2ListItem | { readonly type: "v2-show-more" };
 
 export function threadJumpIndex(command: HardwareKeyboardCommand) {
   return THREAD_JUMP_KEYBINDING_COMMANDS.findIndex((candidate) => candidate === command);
 }
 
-/** Uses the rendered list so filters, collapsed groups and shelves keep their order. */
+/** Uses the rendered list so filters and shelves keep their order. */
 export function threadJumpTarget(
   items: ReadonlyArray<ThreadShortcutListItem>,
   command: HardwareKeyboardCommand,
@@ -26,8 +22,7 @@ export function threadJumpTarget(
   let index = threadJumpIndex(command);
   if (index < 0) return null;
   for (const item of items) {
-    const thread =
-      item.type === "thread" ? item.thread : item.type === "v2-thread" ? item.item.thread : null;
+    const thread = item.type === "v2-thread" ? item.item.thread : null;
     if (thread !== null && index-- === 0) return thread;
   }
   return null;
diff --git a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
index 6c6133c7ef13..60df38b30357 100644
--- a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
+++ b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
@@ -57,6 +57,7 @@ import {
 import { AndroidHomeFabLayout } from "../home/AndroidHomeFab";
 import { HomeListOptionsProvider } from "../home/home-list-options";
 import { ThreadNavigationSidebar } from "../threads/ThreadNavigationSidebar";
+import { RenderErrorBoundary, RenderFailureView } from "../../components/RenderErrorBoundary";
 import { WORKSPACE_PANE_TIMING } from "./workspace-pane-animation";
 import { WorkspaceInspectorPane } from "./workspace-inspector-pane";
 import { WorkspaceContentWidthContext } from "./workspace-content-width";
@@ -580,21 +581,31 @@ function AdaptiveWorkspaceLayoutContent(
               style={sidebarAnimatedStyle}
             >
               <View className="flex-1" style={{ width: layout.listPaneWidth }}>
-                <AndroidHomeFabLayout sidebar onStartNewTask={handleStartNewTask}>
-                  <ThreadNavigationSidebar
-                    width={layout.listPaneWidth}
-                    visible={panes.primarySidebarVisible}
-                    onRequestVisibility={revealPrimarySidebar}
-                    selectedThreadKey={selectedThreadKey}
-                    onOpenSettings={handleOpenSettings}
-                    onOpenEnvironmentSettings={handleOpenEnvironmentSettings}
-                    onNewThreadInProject={handleNewThreadInProject}
-                    onNewThreadOnBranch={handleNewThreadOnBranch}
-                    onSelectThread={handleSelectThread}
-                    onSearchQueryChange={setPrimarySidebarSearchQuery}
-                    searchQuery={primarySidebarSearchQuery}
-                  />
-                </AndroidHomeFabLayout>
+                <RenderErrorBoundary
+                  renderFallback={(fallback) => (
+                    <RenderFailureView
+                      {...fallback}
+                      title="The sidebar couldn't be displayed"
+                      exit={{ label: "Open settings", onPress: handleOpenSettings }}
+                    />
+                  )}
+                >
+                  <AndroidHomeFabLayout sidebar onStartNewTask={handleStartNewTask}>
+                    <ThreadNavigationSidebar
+                      width={layout.listPaneWidth}
+                      visible={panes.primarySidebarVisible}
+                      onRequestVisibility={revealPrimarySidebar}
+                      selectedThreadKey={selectedThreadKey}
+                      onOpenSettings={handleOpenSettings}
+                      onOpenEnvironmentSettings={handleOpenEnvironmentSettings}
+                      onNewThreadInProject={handleNewThreadInProject}
+                      onNewThreadOnBranch={handleNewThreadOnBranch}
+                      onSelectThread={handleSelectThread}
+                      onSearchQueryChange={setPrimarySidebarSearchQuery}
+                      searchQuery={primarySidebarSearchQuery}
+                    />
+                  </AndroidHomeFabLayout>
+                </RenderErrorBoundary>
               </View>
             </Animated.View>
           ) : null}
@@ -625,6 +636,7 @@ function AdaptiveWorkspaceLayoutContent(
             </View>
           </View>
           <WorkspaceInspectorPane
+            pathname={props.pathname}
             renderedInspectorWidth={renderedInspectorWidth}
             active={workspaceInspector?.active ?? false}
             panes={panes}
diff --git a/apps/mobile/src/features/layout/workspace-inspector-pane.tsx b/apps/mobile/src/features/layout/workspace-inspector-pane.tsx
index 7c6574e22e6f..8f9da74f40ad 100644
--- a/apps/mobile/src/features/layout/workspace-inspector-pane.tsx
+++ b/apps/mobile/src/features/layout/workspace-inspector-pane.tsx
@@ -8,6 +8,7 @@ import Animated, {
 } from "react-native-reanimated";
 
 import { constrainAuxiliaryPaneWidth, type WorkspacePaneLayout } from "../../lib/layout";
+import { RenderErrorBoundary, RenderFailureView } from "../../components/RenderErrorBoundary";
 import { WORKSPACE_PANE_TIMING } from "./workspace-pane-animation";
 import { WorkspacePaneDivider } from "./workspace-pane-divider";
 
@@ -23,6 +24,7 @@ import { WorkspacePaneDivider } from "./workspace-pane-divider";
  * module stays import-cycle-free with AdaptiveWorkspaceLayout.
  */
 export function WorkspaceInspectorPane(props: {
+  readonly pathname: string;
   readonly renderedInspectorWidth: SharedValue<number>;
   /**
    * When false the pane animates closed but keeps its content mounted for the
@@ -139,10 +141,23 @@ export function WorkspaceInspectorPane(props: {
           style={inspectorStyle}
         >
           <Animated.View className="flex-1" style={inspectorContentStyle}>
-            {props.renderInspector?.()}
+            <RenderErrorBoundary
+              resetKeys={[props.pathname]}
+              renderFallback={(fallback) => (
+                <RenderFailureView {...fallback} title="The inspector couldn't be displayed" />
+              )}
+            >
+              <InspectorRenderer render={props.renderInspector} />
+            </RenderErrorBoundary>
           </Animated.View>
         </Animated.View>
       ) : null}
     </>
   );
 }
+
+// The render callback must run inside the boundary's child, not while its
+// parent constructs the boundary element.
+function InspectorRenderer(props: { readonly render?: () => ReactNode }) {
+  return <>{props.render?.()}</>;
+}
diff --git a/apps/mobile/src/features/observability/tracing.ts b/apps/mobile/src/features/observability/tracing.ts
index eb73abba292b..ae204413e777 100644
--- a/apps/mobile/src/features/observability/tracing.ts
+++ b/apps/mobile/src/features/observability/tracing.ts
@@ -25,7 +25,7 @@ export function resolveTracingConfig(): TracingConfig | null {
 
 export function makeTracingLayer(config: TracingConfig | null, resource: TracingResource) {
   return makeRelayClientTracingLayer(config, {
-    serviceName: "t3-mobile-relay-client",
+    serviceName: "t3code-mobile",
     serviceVersion: resource.serviceVersion,
     runtime: "react-native",
     client: `mobile-${resource.appVariant}`,
diff --git a/apps/mobile/src/features/review/ReviewSheet.tsx b/apps/mobile/src/features/review/ReviewSheet.tsx
index 2fac5376e5b1..08888dd469d2 100644
--- a/apps/mobile/src/features/review/ReviewSheet.tsx
+++ b/apps/mobile/src/features/review/ReviewSheet.tsx
@@ -735,7 +735,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
       />
 
       <MaterialScreenContent>
-        <View className={Platform.OS === "android" ? "flex-1 bg-sheet-solid" : "flex-1 bg-sheet"}>
+        <View className="flex-1 bg-sheet android:bg-sheet-solid">
           {showConnectionNotice ? (
             <View className="flex-1" style={{ paddingTop: topContentInset }}>
               <EnvironmentConnectionNotice
diff --git a/apps/mobile/src/features/review/reviewDiffRendering.tsx b/apps/mobile/src/features/review/reviewDiffRendering.tsx
index d00cf2be4daf..818f5ab8af47 100644
--- a/apps/mobile/src/features/review/reviewDiffRendering.tsx
+++ b/apps/mobile/src/features/review/reviewDiffRendering.tsx
@@ -4,7 +4,7 @@ import { cn } from "../../lib/cn";
 import { MOBILE_CODE_SURFACE } from "../../lib/typography";
 
 import type { ReviewRenderableLineRow } from "./reviewModel";
-import type { ReviewHighlightedToken } from "./shikiReviewHighlighter";
+import type { ReviewHighlightedToken } from "./reviewHighlightedToken.types";
 
 export const REVIEW_MONO_FONT_FAMILY = Platform.select({
   ios: "ui-monospace",
diff --git a/apps/mobile/src/features/review/reviewHighlightedToken.types.ts b/apps/mobile/src/features/review/reviewHighlightedToken.types.ts
new file mode 100644
index 000000000000..58418a32cc7c
--- /dev/null
+++ b/apps/mobile/src/features/review/reviewHighlightedToken.types.ts
@@ -0,0 +1,6 @@
+export interface ReviewHighlightedToken {
+  content: string;
+  readonly color: string | null;
+  readonly fontStyle: number | null;
+  readonly diffHighlight?: boolean;
+}
diff --git a/apps/mobile/src/features/review/reviewWordDiffs.ts b/apps/mobile/src/features/review/reviewWordDiffs.ts
index 34ac9bc7a746..8dd258a296cc 100644
--- a/apps/mobile/src/features/review/reviewWordDiffs.ts
+++ b/apps/mobile/src/features/review/reviewWordDiffs.ts
@@ -1,6 +1,6 @@
 import { diffWordsWithSpace } from "diff";
 
-import type { ReviewHighlightedToken } from "./shikiReviewHighlighter";
+import type { ReviewHighlightedToken } from "./reviewHighlightedToken.types";
 
 interface ReviewDiffOperation {
   readonly value: string;
diff --git a/apps/mobile/src/features/review/shikiReviewHighlighter.ts b/apps/mobile/src/features/review/shikiReviewHighlighter.ts
index 3050f1f67ee8..9b69c8d552ea 100644
--- a/apps/mobile/src/features/review/shikiReviewHighlighter.ts
+++ b/apps/mobile/src/features/review/shikiReviewHighlighter.ts
@@ -35,12 +35,9 @@ export class ReviewHighlighterEngineInitializationError extends Schema.TaggedErr
   }
 }
 
-export interface ReviewHighlightedToken {
-  content: string;
-  readonly color: string | null;
-  readonly fontStyle: number | null;
-  readonly diffHighlight?: boolean;
-}
+import type { ReviewHighlightedToken } from "./reviewHighlightedToken.types";
+
+export type { ReviewHighlightedToken } from "./reviewHighlightedToken.types";
 
 const SHIKI_THEME_NAME_BY_SCHEME = {
   light: "github-light-default",
diff --git a/apps/mobile/src/features/settings/SettingsEnvironmentDetailRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsEnvironmentDetailRouteScreen.tsx
new file mode 100644
index 000000000000..e8037e28ac69
--- /dev/null
+++ b/apps/mobile/src/features/settings/SettingsEnvironmentDetailRouteScreen.tsx
@@ -0,0 +1,342 @@
+import { useAtomValue } from "@effect/atom-react";
+import type { StaticScreenProps } from "@react-navigation/native";
+import type { EnvironmentId, ServerProvider } from "@t3tools/contracts";
+import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
+import { AsyncResult } from "effect/unstable/reactivity";
+import { useEffect, useRef, useState } from "react";
+import { Alert, View } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+import { AppText as Text } from "../../components/AppText";
+import { ProviderIcon } from "../../components/ProviderIcon";
+import { ScreenScrollView } from "../../components/ScreenScrollView";
+import { MOBILE_PRODUCT_NAME } from "../../lib/mobileBranding";
+import { serverEnvironment } from "../../state/server";
+import { environmentSession } from "../../state/session";
+import { useAtomCommand } from "../../state/use-atom-command";
+import { useRemoteConnections } from "../../state/use-remote-environment-registry";
+import { ConnectionEnvironmentRow } from "../connection/ConnectionEnvironmentRow";
+import { SettingsActionRow } from "./components/SettingsActionRow";
+import { SettingsScreen } from "./components/SettingsScreen";
+import { SettingsSection } from "./components/SettingsSection";
+import {
+  canMaintainEnvironment,
+  canUpdateEnvironmentProvider,
+  findEnvironmentUpdate,
+  supportsEnvironmentUpdate,
+} from "./environment-maintenance";
+
+export function SettingsEnvironmentDetailRouteScreen({
+  route,
+}: StaticScreenProps<{
+  readonly environmentId: EnvironmentId;
+}>) {
+  // Key local request state to the host even when navigation reuses this screen.
+  return (
+    <EnvironmentDetail
+      key={route.params.environmentId}
+      environmentId={route.params.environmentId}
+    />
+  );
+}
+
+function EnvironmentDetail({ environmentId }: { readonly environmentId: EnvironmentId }) {
+  const insets = useSafeAreaInsets();
+  const connections = useRemoteConnections();
+  const environment = connections.connectedEnvironments.find(
+    (entry) => entry.environmentId === environmentId,
+  );
+  const config = useAtomValue(serverEnvironment.configValueAtom(environmentId));
+  const session = useAtomValue(environmentSession.sessionStateValueAtom(environmentId));
+  const sessionResult = useAtomValue(environmentSession.sessionStateAtom(environmentId));
+  const updateState = useAtomValue(serverEnvironment.updateStateAtom(environmentId));
+  const updateServer = useAtomCommand(serverEnvironment.updateServer);
+  const updateProvider = useAtomCommand(serverEnvironment.updateProvider);
+  const refreshProviders = useAtomCommand(serverEnvironment.refreshProviders);
+  const [connectionExpanded, setConnectionExpanded] = useState(false);
+  const [pending, setPending] = useState<string | null>(null);
+  const pendingRef = useRef(false);
+  const [error, setError] = useState<string | null>(null);
+  const [notice, setNotice] = useState<string | null>(null);
+  const [release, setRelease] = useState<{
+    fromVersion: string;
+    targetVersion: string | null;
+  } | null>(null);
+  const checkController = useRef<AbortController | null>(null);
+  useEffect(() => () => checkController.current?.abort(), []);
+
+  const connected = environment?.isEnabled === true && environment.connectionState === "connected";
+  const allowed =
+    !AsyncResult.isFailure(sessionResult) && canMaintainEnvironment(session, connected);
+  const running = updateState.status === "running";
+  const providerBusy =
+    config?.providers.some(
+      (provider) =>
+        provider.updateState?.status === "running" || provider.updateState?.status === "queued",
+    ) ?? false;
+  const disabled = !allowed || pending !== null || running || providerBusy;
+  const version = config?.environment.serverVersion;
+  const checkedRelease = release?.fromVersion === version ? release : null;
+  const capabilities = config?.environment.capabilities;
+
+  async function run(label: string, action: () => Promise<void>) {
+    if (pendingRef.current) return;
+    pendingRef.current = true;
+    setPending(label);
+    setError(null);
+    setNotice(null);
+    try {
+      await action();
+    } catch (cause) {
+      setError(
+        cause instanceof Error ? cause.message : "The action could not be completed. Try again.",
+      );
+    } finally {
+      pendingRef.current = false;
+      setPending(null);
+    }
+  }
+
+  function requestServerUpdate() {
+    const targetVersion = checkedRelease?.targetVersion;
+    if (disabled || !targetVersion || !capabilities || !supportsEnvironmentUpdate(capabilities))
+      return;
+    Alert.alert(
+      `Update ${environment?.environmentLabel ?? "environment"}?`,
+      `Install ${MOBILE_PRODUCT_NAME} ${targetVersion}. ${capabilities.serverSelfUpdate === "desktop-managed" ? "The desktop app will close and relaunch." : "The server will restart and reconnect."} Running threads may be interrupted.`,
+      [
+        { text: "Cancel", style: "cancel" },
+        {
+          text: "Update",
+          onPress: () =>
+            void run("server", async () => {
+              const result = await updateServer({
+                environmentId,
+                input: {
+                  targetVersion,
+                  ...(capabilities.serverUpdateThreadContinuation &&
+                  config?.settings.continueThreadsAfterServerUpdate
+                    ? { continueRunningThreads: true }
+                    : {}),
+                },
+              });
+              if (AsyncResult.isFailure(result)) throw squashAtomCommandFailure(result);
+              setRelease(null);
+              setNotice(`Updated to ${result.value.targetVersion}.`);
+            }),
+        },
+      ],
+    );
+  }
+
+  function requestProviderUpdate(provider: ServerProvider) {
+    if (disabled || !canUpdateEnvironmentProvider(provider)) return;
+    void run(provider.instanceId, async () => {
+      const result = await updateProvider({
+        environmentId,
+        input: {
+          provider: provider.driver,
+          instanceId: provider.instanceId,
+        },
+      });
+      if (AsyncResult.isFailure(result)) throw squashAtomCommandFailure(result);
+    });
+  }
+
+  return (
+    <SettingsScreen title={environment?.environmentLabel ?? "Environment"}>
+      <ScreenScrollView
+        contentInsetAdjustmentBehavior="automatic"
+        className="flex-1"
+        contentContainerClassName="gap-6 px-5 pt-4"
+        contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
+      >
+        {!environment ? (
+          <Text className="text-base text-foreground-muted">
+            This environment is no longer saved on this device.
+          </Text>
+        ) : (
+          <>
+            <SettingsSection title="Connection">
+              <ConnectionEnvironmentRow
+                environment={environment}
+                expanded={connectionExpanded}
+                onToggle={() => setConnectionExpanded((value) => !value)}
+                onReconnect={connections.onReconnectEnvironment}
+                onRemove={connections.onRemoveEnvironmentPress}
+                onSetEnabled={connections.onSetEnvironmentEnabled}
+                onUpdate={connections.onUpdateEnvironment}
+              />
+            </SettingsSection>
+            {!connected ? (
+              <Text className="px-2 text-sm text-foreground-muted">
+                Connect this environment to manage it.
+              </Text>
+            ) : !allowed ? (
+              <Text className="px-2 text-sm text-foreground-muted">
+                {AsyncResult.isFailure(sessionResult)
+                  ? "Could not verify your permissions. Reconnect to try again."
+                  : session === null
+                    ? "Checking permissions…"
+                    : "This connection does not have permission to manage the environment."}
+              </Text>
+            ) : null}
+            {error ? (
+              <Text selectable className="px-2 text-sm text-danger-foreground">
+                {error}
+              </Text>
+            ) : null}
+            {notice ? <Text className="px-2 text-sm text-foreground-muted">{notice}</Text> : null}
+            {config ? (
+              <>
+                <SettingsSection title={MOBILE_PRODUCT_NAME}>
+                  <View className="gap-1 p-4">
+                    <Text className="text-base text-foreground">Version {version}</Text>
+                    {running ? (
+                      <Text className="text-sm text-foreground-muted">
+                        {updateState.stage === "resuming"
+                          ? "Restarting and reconnecting…"
+                          : "Downloading update…"}
+                      </Text>
+                    ) : updateState.status === "failed" ? (
+                      <Text selectable className="text-sm text-danger-foreground">
+                        {updateState.message}
+                      </Text>
+                    ) : null}
+                    {checkedRelease ? (
+                      <Text className="text-sm text-foreground-muted">
+                        {checkedRelease.targetVersion
+                          ? `Version ${checkedRelease.targetVersion} is available.`
+                          : "You are up to date."}
+                      </Text>
+                    ) : null}
+                    {!supportsEnvironmentUpdate(config.environment.capabilities) ? (
+                      <Text className="text-sm text-foreground-muted">
+                        {capabilities?.serverSelfUpdate === "desktop-managed"
+                          ? "Update the desktop app on this machine."
+                          : `Update and restart ${MOBILE_PRODUCT_NAME} on this machine.`}
+                      </Text>
+                    ) : null}
+                  </View>
+                  <SettingsActionRow
+                    icon="arrow.clockwise"
+                    label="Check for updates"
+                    disabled={disabled}
+                    loading={pending === "check"}
+                    onPress={() => {
+                      if (disabled) return;
+                      void run("check", async () => {
+                        const controller = new AbortController();
+                        checkController.current = controller;
+                        const timeout = setTimeout(() => controller.abort(), 20_000);
+                        try {
+                          const targetVersion = await findEnvironmentUpdate(
+                            config.environment.serverVersion,
+                            controller.signal,
+                          );
+                          setRelease({
+                            fromVersion: config.environment.serverVersion,
+                            targetVersion,
+                          });
+                        } finally {
+                          clearTimeout(timeout);
+                          checkController.current = null;
+                        }
+                      });
+                    }}
+                  />
+                  {checkedRelease?.targetVersion &&
+                  supportsEnvironmentUpdate(config.environment.capabilities) ? (
+                    <SettingsActionRow
+                      icon="arrow.up.circle"
+                      label={`Update to ${checkedRelease.targetVersion}`}
+                      disabled={disabled}
+                      loading={pending === "server" || running}
+                      onPress={requestServerUpdate}
+                    />
+                  ) : null}
+                </SettingsSection>
+                <SettingsSection title="Providers">
+                  <SettingsActionRow
+                    icon="arrow.clockwise"
+                    label="Refresh providers"
+                    disabled={disabled}
+                    loading={pending === "refresh"}
+                    onPress={() => {
+                      if (disabled) return;
+                      void run("refresh", async () => {
+                        const result = await refreshProviders({ environmentId, input: {} });
+                        if (AsyncResult.isFailure(result)) throw squashAtomCommandFailure(result);
+                        setNotice("Provider status refreshed.");
+                      });
+                    }}
+                  />
+                  {config.providers
+                    .filter((provider) => provider.enabled)
+                    .map((provider) => (
+                      <View key={provider.instanceId}>
+                        <View className="gap-1 p-4">
+                          <View className="flex-row items-center gap-2">
+                            <ProviderIcon provider={provider.driver} size={18} />
+                            <Text className="min-w-0 flex-1 text-base font-t3-medium text-foreground">
+                              {provider.displayName ?? provider.driver}
+                            </Text>
+                          </View>
+                          <Text className="text-sm text-foreground-muted">
+                            {provider.installed
+                              ? (provider.version ?? "Version unknown")
+                              : "Not installed"}
+                            {provider.versionAdvisory?.latestVersion
+                              ? ` · Latest ${provider.versionAdvisory.latestVersion}`
+                              : ""}
+                          </Text>
+                          {provider.updateState && provider.updateState.status !== "idle" ? (
+                            <Text
+                              selectable
+                              className={
+                                provider.updateState.status === "failed"
+                                  ? "text-sm text-danger-foreground"
+                                  : "text-sm text-foreground-muted"
+                              }
+                            >
+                              {provider.updateState.message ??
+                                `Update ${provider.updateState.status}`}
+                            </Text>
+                          ) : null}
+                          {provider.compatibilityAdvisory?.message ? (
+                            <Text selectable className="text-sm text-foreground-muted">
+                              {provider.compatibilityAdvisory.message}
+                            </Text>
+                          ) : null}
+                          {provider.unavailableReason || provider.message ? (
+                            <Text selectable className="text-sm text-foreground-muted">
+                              {provider.unavailableReason ?? provider.message}
+                            </Text>
+                          ) : null}
+                          {provider.versionAdvisory?.status === "behind_latest" &&
+                          !provider.versionAdvisory.canUpdate ? (
+                            <Text className="text-sm text-foreground-muted">
+                              Update this provider on the environment's machine.
+                            </Text>
+                          ) : null}
+                        </View>
+                        {canUpdateEnvironmentProvider(provider) ? (
+                          <SettingsActionRow
+                            icon="arrow.up.circle"
+                            label={`Update ${provider.displayName ?? provider.driver}`}
+                            disabled={disabled}
+                            loading={pending === provider.instanceId}
+                            onPress={() => requestProviderUpdate(provider)}
+                          />
+                        ) : null}
+                      </View>
+                    ))}
+                </SettingsSection>
+              </>
+            ) : null}
+          </>
+        )}
+      </ScreenScrollView>
+    </SettingsScreen>
+  );
+}
diff --git a/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
index 7ca791afec6d..003178a03aca 100644
--- a/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
@@ -47,7 +47,6 @@ export function SettingsEnvironmentsRouteScreen() {
   const connectedCloudEnvironments = SHOWCASE_ENABLED
     ? SHOWCASE_CONNECTED_CLOUD_ENVIRONMENTS
     : environmentSections.connectedCloudEnvironments;
-  const [expandedId, setExpandedId] = useState<EnvironmentId | null>(null);
   const headerIconColor = useUniwindTheme()["--color-icon"];
   const relaySession = useAtomValue(managedRelaySessionAtom);
   const refreshRelayEnvironments = useAtomCommand(
@@ -68,9 +67,15 @@ export function SettingsEnvironmentsRouteScreen() {
     }
   }
 
-  const handleToggle = useCallback((environmentId: EnvironmentId) => {
-    setExpandedId((prev) => (prev === environmentId ? null : environmentId));
-  }, []);
+  const openEnvironment = useCallback(
+    (environmentId: EnvironmentId) => {
+      navigation.navigate("SettingsSheet", {
+        screen: "SettingsContent",
+        params: { screen: "SettingsEnvironmentDetail", params: { environmentId } },
+      });
+    },
+    [navigation],
+  );
   const handleUpdateEnvironment = useCallback(
     (
       environmentId: EnvironmentId,
@@ -159,8 +164,9 @@ export function SettingsEnvironmentsRouteScreen() {
       >
         <LocalEnvironmentList
           environments={localEnvironments}
-          expandedId={expandedId}
-          onToggle={handleToggle}
+          expandedId={null}
+          onToggle={openEnvironment}
+          opensDetails
           onReconnect={onReconnectEnvironment}
           onRemove={onRemoveEnvironmentPress}
           onSetEnabled={onSetEnvironmentEnabled}
@@ -172,6 +178,7 @@ export function SettingsEnvironmentsRouteScreen() {
             user is signed out — the component gates discovery itself. */}
         <CloudEnvironmentRows
           connectedCloudEnvironments={connectedCloudEnvironments}
+          onOpenEnvironment={openEnvironment}
           onSetEnvironmentEnabled={onSetEnvironmentEnabled}
           onRemoveEnvironment={onRemoveEnvironmentPress}
           {...(SHOWCASE_ENABLED
diff --git a/apps/mobile/src/features/settings/SettingsProjectOverviewRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsProjectOverviewRouteScreen.tsx
index 8c260e871a0d..29377b42dd83 100644
--- a/apps/mobile/src/features/settings/SettingsProjectOverviewRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsProjectOverviewRouteScreen.tsx
@@ -96,9 +96,10 @@ function ProjectOverviewContent(props: {
       <View className="flex-row items-center gap-4 px-2">
         <ProjectFavicon
           environmentId={representative.environmentId}
-          projectTitle={displayName}
+          projectTitle={representative.title}
           workspaceRoot={representative.workspaceRoot}
           faviconPath={representative.faviconPath}
+          projectIcon={representative.projectIcon}
           size={48}
         />
         <View className="min-w-0 flex-1">
diff --git a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx
index 8aff022910d0..bc5315bec132 100644
--- a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx
@@ -1,3 +1,5 @@
+import { useNavigation } from "@react-navigation/native";
+import { SettingsRow } from "./components/SettingsRow";
 import { ScreenScrollView as ScrollView } from "../../components/ScreenScrollView";
 import { SymbolView } from "../../components/AppSymbol";
 import { AppText as Text } from "../../components/AppText";
@@ -133,6 +135,7 @@ export function SettingsEnvironmentMaintenanceRouteScreen() {
 
 function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
   const insets = useSafeAreaInsets();
+  const navigation = useNavigation();
   const { selectedTargets, projectGroups, selectedProjectKey } = useSettingsEnvironmentFilter();
   const selectedProject = projectGroups.find((group) => group.key === selectedProjectKey);
   const projectSelected = selectedProjectKey !== null;
@@ -397,36 +400,61 @@ function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
               ) : null}
 
               {props.page === "maintenance" ? (
-                <SettingsSection title="Updates">
-                  <FanoutSwitchRow
-                    icon="arrow.clockwise"
-                    label="Check provider updates"
-                    subtitle={
-                      projectSelected
-                        ? "Environment-wide setting. Select All projects to change it."
-                        : "Check installed provider CLIs for newer versions."
-                    }
-                    value={uniform("enableProviderUpdateChecks")}
-                    disabled={disabledFor("enableProviderUpdateChecks")}
-                    onValueChange={(value) => write({ enableProviderUpdateChecks: value })}
-                  />
-                  <View className="border-t border-border-subtle">
+                <>
+                  {!projectSelected ? (
+                    <SettingsSection title="Manage environments">
+                      {selectedTargets.map((target) => (
+                        <SettingsRow
+                          key={target.environmentId}
+                          icon="server.rack"
+                          label={target.label}
+                          value="Server and provider updates"
+                          onPress={() =>
+                            navigation.navigate("SettingsSheet", {
+                              screen: "SettingsContent",
+                              params: {
+                                screen: "SettingsEnvironmentDetail",
+                                params: { environmentId: target.environmentId },
+                              },
+                            })
+                          }
+                        />
+                      ))}
+                    </SettingsSection>
+                  ) : null}
+                  <SettingsSection title="Updates">
                     <FanoutSwitchRow
-                      icon="arrow.uturn.forward"
-                      label="Continue after restart"
+                      icon="arrow.clockwise"
+                      label="Check provider updates"
                       subtitle={
-                        supportsContinuation
-                          ? "Resume interrupted threads after an update or restart."
-                          : "Update older servers to control restart continuation."
-                      }
-                      value={uniform("continueThreadsAfterServerUpdate")}
-                      disabled={
-                        disabledFor("continueThreadsAfterServerUpdate") || !supportsContinuation
+                        projectSelected
+                          ? "Environment-wide setting. Select All projects to change it."
+                          : "Check installed provider CLIs for newer versions."
                       }
-                      onValueChange={(value) => write({ continueThreadsAfterServerUpdate: value })}
+                      value={uniform("enableProviderUpdateChecks")}
+                      disabled={disabledFor("enableProviderUpdateChecks")}
+                      onValueChange={(value) => write({ enableProviderUpdateChecks: value })}
                     />
-                  </View>
-                </SettingsSection>
+                    <View className="border-t border-border-subtle">
+                      <FanoutSwitchRow
+                        icon="arrow.uturn.forward"
+                        label="Continue after restart"
+                        subtitle={
+                          supportsContinuation
+                            ? "Resume interrupted threads after an update or restart."
+                            : "Update older servers to control restart continuation."
+                        }
+                        value={uniform("continueThreadsAfterServerUpdate")}
+                        disabled={
+                          disabledFor("continueThreadsAfterServerUpdate") || !supportsContinuation
+                        }
+                        onValueChange={(value) =>
+                          write({ continueThreadsAfterServerUpdate: value })
+                        }
+                      />
+                    </View>
+                  </SettingsSection>
+                </>
               ) : null}
             </>
           )}
diff --git a/apps/mobile/src/features/settings/SettingsThreadsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsThreadsRouteScreen.tsx
index bd8ec3252155..e209ab0b6ce5 100644
--- a/apps/mobile/src/features/settings/SettingsThreadsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsThreadsRouteScreen.tsx
@@ -3,17 +3,15 @@ import { ScreenScrollView as ScrollView } from "../../components/ScreenScrollVie
 import { useAtomSet, useAtomValue } from "@effect/atom-react";
 import { AsyncResult } from "effect/unstable/reactivity";
 import { useRef, useState } from "react";
-import { Platform, Pressable, View } from "react-native";
+import { Pressable, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { DEFAULT_SERVER_SETTINGS } from "@t3tools/contracts";
 import { supportsSharedSettingsSync } from "@t3tools/client-runtime/state/shared-settings";
 import { AppText as Text } from "../../components/AppText";
-import { cn } from "../../lib/cn";
 import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
 import { serverEnvironment } from "../../state/server";
 import { useAtomCommand } from "../../state/use-atom-command";
-import { useThreadListV2Enabled } from "../threads/use-thread-list-v2-enabled";
 import { SettingsSection } from "./components/SettingsSection";
 import { SettingsProjectOverridesSection } from "./components/SettingsProjectOverridesSection";
 import { SettingsSwitchRow } from "./components/SettingsSwitchRow";
@@ -182,21 +180,9 @@ function AutoSettleSettingsRows() {
           }
         />
         {afterDays !== null ? (
-          <View
-            className={cn(
-              "flex-row items-center gap-4 px-4",
-              Platform.OS === "android" ? "min-h-14 py-3" : "py-4",
-            )}
-          >
-            <View style={{ width: Platform.OS === "android" ? 24 : 22 }} />
-            <Text
-              className={cn(
-                "flex-1 text-foreground",
-                Platform.OS === "android" ? "text-base" : "text-lg",
-              )}
-            >
-              Inactive days
-            </Text>
+          <View className="flex-row items-center gap-4 px-4 py-4 android:min-h-14 android:py-3">
+            <View className="w-[22px] android:w-6" />
+            <Text className="flex-1 text-foreground text-lg android:text-base">Inactive days</Text>
             <AutoSettleDaysField
               value={afterDays}
               disabled={disabled}
@@ -237,19 +223,12 @@ function AutoSettleSettingsRows() {
 function LegacySettingsSection() {
   const savePreferences = useAtomSet(updateMobilePreferencesAtom);
   const preferences = useAtomValue(mobilePreferencesAtom);
-  const threadListV2Enabled = useThreadListV2Enabled();
   const planModeEnabled =
     AsyncResult.isSuccess(preferences) && preferences.value.planModeEnabled === true;
 
   return (
     <View className="gap-3">
       <SettingsSection title="Legacy">
-        <SettingsSwitchRow
-          icon="sidebar.left"
-          label="Legacy Thread List"
-          value={!threadListV2Enabled}
-          onValueChange={(value) => savePreferences({ legacyThreadListEnabled: value })}
-        />
         <SettingsSwitchRow
           icon="hammer"
           label="Plan Mode"
diff --git a/apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx b/apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx
index 55bd661a64ef..386ac3e2c39f 100644
--- a/apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx
+++ b/apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx
@@ -5,7 +5,6 @@ import {
   resolveMarkdownFontSizes,
   resolveMobileCodeSurface,
 } from "../../../../lib/appearancePreferences";
-import { useUniwindTheme } from "../../../../lib/useUniwindTheme";
 import { getMobileTerminalTheme } from "../../../terminal/terminalTheme";
 import { useAppearancePreferences } from "../AppearancePreferencesProvider";
 
@@ -138,16 +137,12 @@ export function CodeAppearancePreview(props: {
   readonly wordBreak: boolean;
 }) {
   const surface = resolveMobileCodeSurface(props.fontSize);
-  const theme = useUniwindTheme();
-  const lineNumberColor = theme["--color-icon-subtle"];
-  const keywordColor = theme["--color-md-link"];
 
   const lineNumber = (line: CodePreviewLine, index: number) => (
     <Text
-      className="text-right"
+      className="text-right text-icon-subtle"
       key={line.id}
       style={{
-        color: lineNumberColor,
         fontFamily: CODE_FONT_FAMILY,
         fontSize: surface.lineNumberFontSize,
         lineHeight: surface.rowHeight,
@@ -172,8 +167,8 @@ export function CodeAppearancePreview(props: {
       {line.tokens.map((token) => (
         <Text
           key={token.text}
+          className={token.keyword ? "text-md-link" : undefined}
           style={{
-            color: token.keyword ? keywordColor : undefined,
             fontFamily: CODE_FONT_FAMILY,
             fontSize: surface.fontSize,
             lineHeight: surface.rowHeight,
diff --git a/apps/mobile/src/features/settings/appearance/useScaledTextRole.ts b/apps/mobile/src/features/settings/appearance/useScaledTextRole.ts
index 62f918a0e6b0..561cc53e44a7 100644
--- a/apps/mobile/src/features/settings/appearance/useScaledTextRole.ts
+++ b/apps/mobile/src/features/settings/appearance/useScaledTextRole.ts
@@ -1,10 +1,6 @@
 import { useMemo } from "react";
 
-import {
-  DEFAULT_BASE_FONT_SIZE,
-  normalizeBaseFontSize,
-  scaledTypographyLineHeight,
-} from "../../../lib/appearancePreferences";
+import { resolveScaledTextRole } from "../../../lib/appearancePreferences";
 import { MOBILE_TYPOGRAPHY } from "../../../lib/typography";
 import { useAppearancePreferences } from "./AppearancePreferencesProvider";
 
@@ -20,15 +16,8 @@ export interface ScaledTextRole {
  */
 export function useScaledTextRole(role: keyof typeof MOBILE_TYPOGRAPHY): ScaledTextRole {
   const { appearance } = useAppearancePreferences();
-  return useMemo(() => {
-    const baseFontSize = normalizeBaseFontSize(appearance.baseFontSize);
-    const typography = MOBILE_TYPOGRAPHY[role];
-    return {
-      fontSize: Math.max(
-        8,
-        Math.round(typography.fontSize * (baseFontSize / DEFAULT_BASE_FONT_SIZE)),
-      ),
-      lineHeight: scaledTypographyLineHeight(typography, baseFontSize),
-    };
-  }, [appearance.baseFontSize, role]);
+  return useMemo(
+    () => resolveScaledTextRole(role, appearance.baseFontSize),
+    [appearance.baseFontSize, role],
+  );
 }
diff --git a/apps/mobile/src/features/settings/components/SettingsSwitchRow.tsx b/apps/mobile/src/features/settings/components/SettingsSwitchRow.tsx
index 49fb98e49976..85cb4764e25a 100644
--- a/apps/mobile/src/features/settings/components/SettingsSwitchRow.tsx
+++ b/apps/mobile/src/features/settings/components/SettingsSwitchRow.tsx
@@ -17,6 +17,7 @@ export function SettingsSwitchRow(
       subtitle={props.subtitle}
     >
       <ThemedSwitch
+        style={{ alignSelf: "center" }}
         accessibilityLabel={props.label}
         disabled={props.disabled}
         onValueChange={props.onValueChange}
diff --git a/apps/mobile/src/features/settings/environment-maintenance.test.ts b/apps/mobile/src/features/settings/environment-maintenance.test.ts
new file mode 100644
index 000000000000..878f71511890
--- /dev/null
+++ b/apps/mobile/src/features/settings/environment-maintenance.test.ts
@@ -0,0 +1,154 @@
+import { AuthOrchestrationOperateScope, ServerProvider } from "@t3tools/contracts";
+import * as Schema from "effect/Schema";
+import { afterEach, describe, expect, it, vi } from "vite-plus/test";
+
+import {
+  canMaintainEnvironment,
+  canUpdateEnvironmentProvider,
+  findEnvironmentUpdate,
+  supportsEnvironmentUpdate,
+} from "./environment-maintenance";
+
+const provider = Schema.decodeUnknownSync(ServerProvider)({
+  instanceId: "codex-personal",
+  driver: "codex",
+  enabled: true,
+  installed: true,
+  version: "1.0.0",
+  status: "ready",
+  auth: { status: "authenticated" },
+  checkedAt: "2026-09-23T00:00:00.000Z",
+  models: [],
+  versionAdvisory: {
+    status: "behind_latest",
+    currentVersion: "1.0.0",
+    latestVersion: "1.1.0",
+    canUpdate: true,
+    updateCommand: null,
+    checkedAt: null,
+    message: null,
+  },
+});
+
+afterEach(() => vi.unstubAllGlobals());
+
+describe("environment maintenance access", () => {
+  it("requires a connected authenticated session with operate permission", () => {
+    const session = {
+      authenticated: true,
+      auth: {
+        policy: "remote-reachable" as const,
+        bootstrapMethods: [],
+        sessionMethods: [],
+        sessionCookieName: "session",
+      },
+      scopes: [AuthOrchestrationOperateScope],
+    };
+    expect(canMaintainEnvironment(session, true)).toBe(true);
+    expect(canMaintainEnvironment(session, false)).toBe(false);
+    expect(canMaintainEnvironment({ ...session, authenticated: false }, true)).toBe(false);
+    expect(canMaintainEnvironment({ ...session, scopes: [] }, true)).toBe(false);
+    const { scopes: _, ...legacy } = session;
+    expect(canMaintainEnvironment(legacy, true)).toBe(false);
+    expect(canMaintainEnvironment(null, true)).toBe(false);
+  });
+
+  it("requires remote desktop update support for desktop hosts", () => {
+    expect(supportsEnvironmentUpdate({})).toBe(false);
+    expect(supportsEnvironmentUpdate({ serverSelfUpdate: "respawn" })).toBe(true);
+    expect(supportsEnvironmentUpdate({ serverSelfUpdate: "desktop-managed" })).toBe(false);
+    expect(
+      supportsEnvironmentUpdate({ serverSelfUpdate: "desktop-managed", desktopAppUpdate: true }),
+    ).toBe(true);
+  });
+
+  it("excludes unavailable, manual, busy, and incompatible provider updates", () => {
+    expect(canUpdateEnvironmentProvider(provider)).toBe(true);
+    expect(canUpdateEnvironmentProvider({ ...provider, installed: false })).toBe(false);
+    expect(canUpdateEnvironmentProvider({ ...provider, availability: "unavailable" })).toBe(false);
+    expect(canUpdateEnvironmentProvider({ ...provider, versionAdvisory: undefined })).toBe(false);
+    for (const latestVersionStatus of ["broken", "unsupported"] as const) {
+      expect(
+        canUpdateEnvironmentProvider({
+          ...provider,
+          compatibilityAdvisory: {
+            status: "supported",
+            latestVersionStatus,
+            message: null,
+            recommendedVersion: null,
+            recommendedRange: null,
+          },
+        }),
+      ).toBe(false);
+    }
+    for (const status of ["queued", "running"] as const) {
+      expect(
+        canUpdateEnvironmentProvider({
+          ...provider,
+          updateState: {
+            status,
+            startedAt: null,
+            finishedAt: null,
+            message: null,
+            output: null,
+          },
+        }),
+      ).toBe(false);
+    }
+    expect(
+      canUpdateEnvironmentProvider({
+        ...provider,
+        versionAdvisory: {
+          ...provider.versionAdvisory!,
+          canUpdate: false,
+        },
+      }),
+    ).toBe(false);
+  });
+});
+
+describe("environment release checks", () => {
+  const signal = new AbortController().signal;
+
+  it("keeps stable hosts on stable releases and ignores drafts", async () => {
+    vi.stubGlobal(
+      "fetch",
+      vi
+        .fn()
+        .mockImplementation(async () =>
+          Response.json([
+            { tag_name: "v2.0.0-nightly.20260923.1" },
+            { tag_name: "v1.2.0", draft: true },
+            { tag_name: "v1.1.0" },
+          ]),
+        ),
+    );
+    expect(await findEnvironmentUpdate("1.0.0", signal)).toBe("1.1.0");
+    expect(await findEnvironmentUpdate("1.1.0", signal)).toBeNull();
+    expect(await findEnvironmentUpdate("1.3.0", signal)).toBeNull();
+  });
+
+  it("walks release pages to find the host's channel", async () => {
+    const fetchMock = vi
+      .fn()
+      .mockResolvedValueOnce(
+        Response.json(Array.from({ length: 100 }, () => ({ tag_name: "v2.0.0" }))),
+      )
+      .mockResolvedValueOnce(Response.json([{ tag_name: "v1.0.0-preview.20260923.2" }]));
+    vi.stubGlobal("fetch", fetchMock);
+    expect(await findEnvironmentUpdate("1.0.0-preview.20260923.1", signal)).toBe(
+      "1.0.0-preview.20260923.2",
+    );
+    expect(fetchMock.mock.calls[1]?.[0]).toContain("page=2");
+    expect(fetchMock.mock.calls[1]?.[1]).toEqual({ signal });
+  });
+
+  it("reports failed checks instead of claiming the server is current", async () => {
+    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(new Response(null, { status: 403 })));
+    await expect(findEnvironmentUpdate("1.0.0", signal)).rejects.toThrow("403");
+    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(Response.json([])));
+    await expect(findEnvironmentUpdate("1.0.0", signal)).rejects.toThrow("No stable release");
+    vi.stubGlobal("fetch", vi.fn().mockResolvedValue(Response.json({ error: "invalid" })));
+    await expect(findEnvironmentUpdate("1.0.0", signal)).rejects.toThrow();
+  });
+});
diff --git a/apps/mobile/src/features/settings/environment-maintenance.ts b/apps/mobile/src/features/settings/environment-maintenance.ts
new file mode 100644
index 000000000000..f441066d7174
--- /dev/null
+++ b/apps/mobile/src/features/settings/environment-maintenance.ts
@@ -0,0 +1,68 @@
+import {
+  AuthOrchestrationOperateScope,
+  type AuthSessionState,
+  type ExecutionEnvironmentCapabilities,
+  type ServerProvider,
+} from "@t3tools/contracts";
+import {
+  cliReleaseChannelOf,
+  cliReleaseIndexPageUrl,
+  newestCliReleaseVersion,
+} from "@t3tools/shared/cliRelease";
+import { compareSemverVersions } from "@t3tools/shared/semver";
+import * as Schema from "effect/Schema";
+
+export function canMaintainEnvironment(session: AuthSessionState | null, connected: boolean) {
+  return (
+    connected &&
+    session?.authenticated === true &&
+    session.scopes?.includes(AuthOrchestrationOperateScope) === true
+  );
+}
+
+export function supportsEnvironmentUpdate(
+  capabilities: Pick<ExecutionEnvironmentCapabilities, "serverSelfUpdate" | "desktopAppUpdate">,
+) {
+  return (
+    capabilities.serverSelfUpdate !== undefined &&
+    (capabilities.serverSelfUpdate !== "desktop-managed" || capabilities.desktopAppUpdate === true)
+  );
+}
+
+export function canUpdateEnvironmentProvider(provider: ServerProvider) {
+  const compatibility = provider.compatibilityAdvisory?.latestVersionStatus;
+  return (
+    provider.installed &&
+    provider.availability !== "unavailable" &&
+    provider.versionAdvisory?.status === "behind_latest" &&
+    provider.versionAdvisory.canUpdate &&
+    provider.versionAdvisory.latestVersion !== null &&
+    compatibility !== "broken" &&
+    compatibility !== "unsupported" &&
+    provider.updateState?.status !== "running" &&
+    provider.updateState?.status !== "queued"
+  );
+}
+
+const Releases = Schema.Array(
+  Schema.Struct({
+    tag_name: Schema.String,
+    draft: Schema.optionalKey(Schema.Boolean),
+  }),
+);
+const decodeReleases = Schema.decodeUnknownSync(Releases);
+
+/** Preserve the host's release channel and never offer a downgrade. */
+export async function findEnvironmentUpdate(currentVersion: string, signal: AbortSignal) {
+  const channel = cliReleaseChannelOf(currentVersion);
+  for (let page = 1; ; page++) {
+    const response = await fetch(cliReleaseIndexPageUrl(page), { signal });
+    if (!response.ok) throw new Error(`Could not check releases (${response.status}). Try again.`);
+    const releases = decodeReleases(await response.json());
+    const version = newestCliReleaseVersion(releases, channel);
+    if (version !== undefined) {
+      return compareSemverVersions(version, currentVersion) > 0 ? version : null;
+    }
+    if (releases.length < 100) throw new Error(`No ${channel} release was found.`);
+  }
+}
diff --git a/apps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsx b/apps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsx
index 557c3b190359..716f4edd4166 100644
--- a/apps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsx
+++ b/apps/mobile/src/features/showcase/ShowcaseCaptureCoordinator.tsx
@@ -29,6 +29,7 @@ import {
   buildShowcasePendingTasks,
   SHOWCASE_PENDING_TASK_DEFINITIONS,
 } from "./showcasePendingTasks";
+import { buildShowcaseAgentActivity } from "./showcaseAgentActivity";
 import { retryShowcaseOperation } from "./showcaseRetry";
 import {
   clearShowcaseRenderSignal,
@@ -36,6 +37,7 @@ import {
   isShowcaseNativeContentReady,
   subscribeToShowcaseRenderSignal,
 } from "./showcaseRenderSignal";
+import { stageShowcaseAgentActivity } from "./stageShowcaseAgentActivity";
 
 const SHOWCASE_ENABLED = process.env.EXPO_PUBLIC_SHOWCASE === "1";
 const SHOWCASE_THREAD_ID = "remote-command-center";
@@ -75,7 +77,14 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
   const [themeRequestSettled, setThemeRequestSettled] = useState(false);
   const [readyScene, setReadyScene] = useState<ShowcaseScene | null>(null);
   const [orientationSettled, setOrientationSettled] = useState(false);
+  const [agentActivityStaged, setAgentActivityStaged] = useState(false);
   const requestedSceneRef = useRef<ShowcaseScene | null>(null);
+  // Staging reads the latest entities without restarting on every shell
+  // update, which would re-enter a permission prompt that is still open.
+  const entitiesRef = useRef({ threads, projects });
+  useEffect(() => {
+    entitiesRef.current = { threads, projects };
+  }, [projects, threads]);
   const renderSignal = useSyncExternalStore(
     subscribeToShowcaseRenderSignal,
     getShowcaseRenderSignal,
@@ -109,6 +118,7 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
     }
 
     let cancelled = false;
+    let lastOutcome: string | null = null;
     void retryShowcaseOperation(async () => applyNativeShowcaseOrientation(orientation), {
       isCancelled: () => cancelled,
     }).then((applied) => {
@@ -129,6 +139,7 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
       // A native draw belongs only to the scene request that produced it. In
       // particular, revisiting review must wait for its newly mounted surface.
       clearShowcaseRenderSignal();
+      setAgentActivityStaged(false);
       setRequestedScene(value);
     };
     readRequestedScene();
@@ -176,7 +187,11 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
     };
   }, [connectPairingUrl, pairingUrls]);
 
-  const scene = sceneFromPathname(props.pathname);
+  const routeScene = sceneFromPathname(props.pathname);
+  // Agent activity is captured over the thread list: the runner locks the
+  // simulator or opens the notification shade on top of it.
+  const scene =
+    requestedScene === "agent-activity" && routeScene === "threads" ? "agent-activity" : routeScene;
   const hasServerFixture =
     workspace.state.hasReadyEnvironment &&
     workspace.environments.length >= 3 &&
@@ -228,6 +243,11 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
       navigation.dispatch(StackActions.popToTop());
       return;
     }
+    // Follows the environments scene, whose settings sheet popToTop leaves open.
+    if (requestedScene === "agent-activity") {
+      navigation.dispatch(CommonActions.reset({ index: 0, routes: [{ name: "Home" }] }));
+      return;
+    }
     const routes: ShowcaseResetRoute[] = [{ name: "Home" }];
     if (requestedScene === "environments") {
       routes.push({
@@ -264,6 +284,39 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
     );
   }, [hasFixture, navigation, requestedScene, scene, showcaseThread]);
 
+  useEffect(() => {
+    if (!SHOWCASE_ENABLED || scene !== "agent-activity" || !hasFixture || agentActivityStaged) {
+      return;
+    }
+    let cancelled = false;
+    let lastOutcome: string | null = null;
+    void retryShowcaseOperation(
+      async () => {
+        const now = Date.now();
+        const { threads: latestThreads, projects: latestProjects } = entitiesRef.current;
+        const activity = buildShowcaseAgentActivity(latestThreads, latestProjects, now);
+        const outcome =
+          activity === null
+            ? "fixture threads not loaded"
+            : await stageShowcaseAgentActivity(activity, now);
+        if (outcome === true) return true;
+        // Surfaces in the runner's Metro output when the scene never turns ready.
+        if (outcome !== lastOutcome)
+          console.warn(`[showcase] agent activity not staged: ${outcome}`);
+        lastOutcome = outcome;
+        return false;
+      },
+      // The first attempt waits on the notification permission prompt until
+      // the runner answers it.
+      { isCancelled: () => cancelled, attemptTimeoutMs: 60_000 },
+    ).then((staged) => {
+      if (!cancelled && staged) setAgentActivityStaged(true);
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, [agentActivityStaged, hasFixture, scene]);
+
   useEffect(() => {
     if (
       !SHOWCASE_ENABLED ||
@@ -276,6 +329,7 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
       !orientationSettled ||
       // Likewise for the palette: an early screenshot shows the default theme.
       !themeApplied ||
+      (scene === "agent-activity" && !agentActivityStaged) ||
       !isShowcaseNativeContentReady({ scene, themeId, renderSignal })
     ) {
       setReadyScene(null);
@@ -298,7 +352,16 @@ export function ShowcaseCaptureCoordinator(props: { readonly pathname: string })
       if (renderFrame !== null) cancelAnimationFrame(renderFrame);
       if (readyFrame !== null) cancelAnimationFrame(readyFrame);
     };
-  }, [hasFixture, orientationSettled, renderSignal, requestedScene, scene, themeApplied, themeId]);
+  }, [
+    agentActivityStaged,
+    hasFixture,
+    orientationSettled,
+    renderSignal,
+    requestedScene,
+    scene,
+    themeApplied,
+    themeId,
+  ]);
 
   if (!SHOWCASE_ENABLED || readyScene === null) return null;
 
diff --git a/apps/mobile/src/features/showcase/nativeShowcaseScene.ts b/apps/mobile/src/features/showcase/nativeShowcaseScene.ts
index 11618291932d..33839b2fe473 100644
--- a/apps/mobile/src/features/showcase/nativeShowcaseScene.ts
+++ b/apps/mobile/src/features/showcase/nativeShowcaseScene.ts
@@ -2,7 +2,14 @@ import { requireOptionalNativeModule } from "expo";
 
 import { MOBILE_THEME_IDS, type MobileThemeId } from "../../lib/mobileTheme";
 
-export const SHOWCASE_SCENES = ["threads", "thread", "terminal", "review", "environments"] as const;
+export const SHOWCASE_SCENES = [
+  "threads",
+  "thread",
+  "terminal",
+  "review",
+  "environments",
+  "agent-activity",
+] as const;
 export type ShowcaseScene = (typeof SHOWCASE_SCENES)[number];
 
 export type ShowcaseOrientation = "portrait" | "landscape";
diff --git a/apps/mobile/src/features/showcase/showcaseAgentActivity.test.ts b/apps/mobile/src/features/showcase/showcaseAgentActivity.test.ts
new file mode 100644
index 000000000000..94aaa2fc5e9f
--- /dev/null
+++ b/apps/mobile/src/features/showcase/showcaseAgentActivity.test.ts
@@ -0,0 +1,93 @@
+import type {
+  EnvironmentProject,
+  EnvironmentThreadShell,
+} from "@t3tools/client-runtime/state/shell";
+import { EnvironmentId, ProjectId, ThreadId } from "@t3tools/contracts";
+import { assert, it } from "@effect/vitest";
+
+import {
+  buildShowcaseAgentActivity,
+  SHOWCASE_AGENT_ACTIVITY_ROWS,
+  showcaseAndroidActivityData,
+} from "./showcaseAgentActivity";
+
+const NOW = Date.parse("2026-07-16T09:00:00.000Z");
+
+const project = (environmentId: string, id: string, title: string) =>
+  ({
+    environmentId: EnvironmentId.make(environmentId),
+    id: ProjectId.make(id),
+    title,
+  }) as EnvironmentProject;
+
+const thread = (environmentId: string, id: string, projectId: string, title: string) =>
+  ({
+    environmentId: EnvironmentId.make(environmentId),
+    id: ThreadId.make(id),
+    projectId: ProjectId.make(projectId),
+    title,
+  }) as EnvironmentThreadShell;
+
+const projects = [
+  project("moonbase-terminal", "t3code", "T3 Code"),
+  project("suspense-station", "react", "React"),
+  project("kernel-cabin", "linux", "Linux"),
+];
+
+const threads = [
+  thread("moonbase-terminal", "remote-command-center", "t3code", "Make remote coding feel local"),
+  thread(
+    "moonbase-terminal",
+    "pocket-command-center",
+    "t3code",
+    "Put the command center in your pocket",
+  ),
+  thread("suspense-station", "buttery-suspense", "react", "Make Suspense transitions buttery"),
+  thread("kernel-cabin", "beautiful-boot", "linux", "Make boot logs oddly beautiful"),
+];
+
+it("waits until every staged thread and its project have loaded", () => {
+  assert.isNull(buildShowcaseAgentActivity(threads.slice(1), projects, NOW));
+  assert.isNull(buildShowcaseAgentActivity(threads, projects.slice(0, 2), NOW));
+});
+
+it("stages relay-shaped rows against the seeded threads", () => {
+  const activity = buildShowcaseAgentActivity(threads, projects, NOW);
+  assert.isNotNull(activity);
+  if (!activity) return;
+
+  assert.strictEqual(activity.activeCount, 3);
+  assert.deepStrictEqual(
+    activity.activities.map((row) => [row.threadId, row.status, row.projectTitle, row.updatedAt]),
+    [
+      ["pocket-command-center", "Approval", "T3 Code", "2026-07-16T08:59:00.000Z"],
+      ["beautiful-boot", "Input", "Linux", "2026-07-16T08:56:00.000Z"],
+      ["buttery-suspense", "Working", "React", "2026-07-16T08:58:00.000Z"],
+      ["remote-command-center", "Done", "T3 Code", "2026-07-16T08:57:00.000Z"],
+    ],
+  );
+  assert.strictEqual(
+    activity.activities[0]?.deepLink,
+    "/threads/moonbase-terminal/pocket-command-center",
+  );
+  assert.strictEqual(activity.activities.length, SHOWCASE_AGENT_ACTIVITY_ROWS.length);
+});
+
+it("encodes the Android Live Update and its alert like a relay push", () => {
+  const activity = buildShowcaseAgentActivity(threads, projects, NOW);
+  assert.isNotNull(activity);
+  if (!activity) return;
+  const data = showcaseAndroidActivityData(activity, NOW);
+
+  assert.strictEqual(data.active, "true");
+  assert.strictEqual(data.activity_chip, "Review");
+  assert.strictEqual(data.activity_title, "3 active agents · 2 need attention");
+  assert.strictEqual(
+    data.activity_line_0,
+    "Approval\tPut the command center in your pocket\tT3 Code",
+  );
+  assert.strictEqual(data.activity_line_3, "Done\tMake remote coding feel local\tT3 Code");
+  assert.strictEqual(data.alert_title, "Put the command center in your pocket");
+  assert.strictEqual(data.alert_body, "Approval: T3 Code");
+  assert.strictEqual(data.alert_path, "/threads/moonbase-terminal/pocket-command-center");
+});
diff --git a/apps/mobile/src/features/showcase/showcaseAgentActivity.ts b/apps/mobile/src/features/showcase/showcaseAgentActivity.ts
new file mode 100644
index 000000000000..17f25c0593bc
--- /dev/null
+++ b/apps/mobile/src/features/showcase/showcaseAgentActivity.ts
@@ -0,0 +1,139 @@
+import type {
+  EnvironmentProject,
+  EnvironmentThreadShell,
+} from "@t3tools/client-runtime/state/shell";
+
+import type {
+  AgentActivityPhase,
+  AgentActivityProps,
+  AgentActivityRowProps,
+} from "../../widgets/AgentActivity";
+import { MOBILE_PRODUCT_NAME } from "../../lib/mobileBranding";
+
+/**
+ * Agent work shown by the agent-activity scene. The rows point at
+ * seeded showcase threads so the copy matches the thread list, but the phases
+ * are staged: the relay that normally derives them is not part of the capture.
+ * Rows follow the relay's order: attention first, then running, then finished.
+ */
+export const SHOWCASE_AGENT_ACTIVITY_ROWS = [
+  { threadId: "pocket-command-center", phase: "waiting_for_approval", minutesAgo: 1 },
+  { threadId: "beautiful-boot", phase: "waiting_for_input", minutesAgo: 4 },
+  { threadId: "buttery-suspense", phase: "running", minutesAgo: 2 },
+  { threadId: "remote-command-center", phase: "completed", minutesAgo: 3 },
+] as const satisfies ReadonlyArray<{
+  readonly threadId: string;
+  readonly phase: AgentActivityPhase;
+  readonly minutesAgo: number;
+}>;
+
+// Matches the relay's row wording (AgentActivityPublisher.statusForPhase).
+const STATUS_BY_PHASE: Record<AgentActivityPhase, string> = {
+  starting: "Connecting",
+  running: "Working",
+  waiting_for_approval: "Approval",
+  waiting_for_input: "Input",
+  stale: "Waiting",
+  completed: "Done",
+  failed: "Failed",
+};
+
+const ACTIVE_PHASES: ReadonlySet<AgentActivityPhase> = new Set([
+  "starting",
+  "running",
+  "waiting_for_approval",
+  "waiting_for_input",
+]);
+
+/** Returns null until every staged thread and its project have loaded. */
+export function buildShowcaseAgentActivity(
+  threads: ReadonlyArray<EnvironmentThreadShell>,
+  projects: ReadonlyArray<EnvironmentProject>,
+  now: number,
+): AgentActivityProps | null {
+  const rows: AgentActivityRowProps[] = [];
+  for (const definition of SHOWCASE_AGENT_ACTIVITY_ROWS) {
+    const thread = threads.find((candidate) => String(candidate.id) === definition.threadId);
+    const project = thread
+      ? projects.find(
+          (candidate) =>
+            candidate.environmentId === thread.environmentId && candidate.id === thread.projectId,
+        )
+      : undefined;
+    if (!thread || !project) return null;
+    const environmentId = String(thread.environmentId);
+    rows.push({
+      environmentId,
+      threadId: definition.threadId,
+      projectTitle: project.title,
+      threadTitle: thread.title,
+      modelTitle: "",
+      phase: definition.phase,
+      status: STATUS_BY_PHASE[definition.phase],
+      updatedAt: new Date(now - definition.minutesAgo * 60_000).toISOString(),
+      deepLink: `/threads/${encodeURIComponent(environmentId)}/${encodeURIComponent(definition.threadId)}`,
+    });
+  }
+  return {
+    title: MOBILE_PRODUCT_NAME,
+    subtitle: "Agent work in progress",
+    activeCount: rows.filter((row) => ACTIVE_PHASES.has(row.phase)).length,
+    updatedAt: new Date(now).toISOString(),
+    activities: rows,
+  };
+}
+
+/** The alert the relay sends when the hero row starts waiting on the user. */
+export function showcaseAgentAlert(activity: AgentActivityProps) {
+  const row = activity.activities[0];
+  if (!row) return null;
+  return {
+    title: row.threadTitle,
+    body: `${row.status}: ${row.projectTitle}`,
+    path: row.deepLink,
+    environmentId: row.environmentId,
+    threadId: row.threadId,
+  };
+}
+
+/**
+ * The FCM data map Android's native receiver renders, mirroring the relay's
+ * androidActivityData so the shade shows exactly what a real push produces.
+ */
+export function showcaseAndroidActivityData(
+  activity: AgentActivityProps,
+  now: number,
+): Record<string, string> {
+  const attentionCount = activity.activities.filter(
+    (row) => row.phase === "waiting_for_approval" || row.phase === "waiting_for_input",
+  ).length;
+  const hero = activity.activities[0];
+  const alert = showcaseAgentAlert(activity);
+  return {
+    t3_kind: "agent_activity",
+    updated_at: String(now),
+    active: String(activity.activeCount > 0),
+    activity_chip: attentionCount > 0 ? "Review" : "Active",
+    activity_title: `${activity.activeCount} active agents · ${attentionCount} need attention`,
+    activity_phase: hero?.phase ?? "",
+    activity_active_count: String(activity.activeCount),
+    activity_attention_count: String(attentionCount),
+    activity_body: hero ? `${hero.status}: ${hero.threadTitle} · ${hero.projectTitle}` : "",
+    ...Object.fromEntries(
+      activity.activities.map((row, index) => [
+        `activity_line_${index}`,
+        [row.status, row.threadTitle, row.projectTitle].join("\t"),
+      ]),
+    ),
+    activity_path: hero?.deepLink ?? "/",
+    activity_expires_at: String(now + 2 * 60 * 60_000),
+    ...(alert
+      ? {
+          alert_id: "showcase-alert",
+          alert_title: alert.title,
+          alert_body: alert.body,
+          alert_path: alert.path,
+        }
+      : {}),
+  };
+}
diff --git a/apps/mobile/src/features/showcase/stageShowcaseAgentActivity.ts b/apps/mobile/src/features/showcase/stageShowcaseAgentActivity.ts
new file mode 100644
index 000000000000..c4b35525c782
--- /dev/null
+++ b/apps/mobile/src/features/showcase/stageShowcaseAgentActivity.ts
@@ -0,0 +1,45 @@
+import * as Notifications from "expo-notifications";
+import { Platform } from "react-native";
+
+import type { AgentActivityProps } from "../../widgets/AgentActivity";
+import {
+  getAgentLiveActivities,
+  startAgentLiveActivity,
+} from "../agent-awareness/agentLiveActivity";
+import { showAndroidShowcaseAgentActivity } from "../agent-awareness/androidNotifications";
+import { showcaseAndroidActivityData } from "./showcaseAgentActivity";
+
+/**
+ * Puts the staged agent activity on screen for the capture runner, which then
+ * locks the simulator (iOS) or opens the notification shade (Android).
+ * Resolves true once shown, otherwise the reason it could not be, so the
+ * caller can retry and report.
+ */
+export async function stageShowcaseAgentActivity(
+  activity: AgentActivityProps,
+  now: number,
+): Promise<true | string> {
+  // The runner answers the iOS prompt and pre-grants Android's, so this only
+  // settles the permission the runner's alert delivery depends on.
+  const permission = await Notifications.requestPermissionsAsync({
+    ios: { allowAlert: true, allowBadge: true, allowSound: true },
+  });
+  if (!permission.granted) return `notification permission ${permission.status}`;
+  // A previous appearance's pass left its alert delivered; it would stack
+  // under the new one.
+  await Notifications.dismissAllNotificationsAsync();
+
+  if (Platform.OS === "android") {
+    return (
+      showAndroidShowcaseAgentActivity(showcaseAndroidActivityData(activity, now)) ||
+      "native showShowcaseActivity missing"
+    );
+  }
+  if (Platform.OS !== "ios") return `unsupported platform ${Platform.OS}`;
+
+  // A retried or revisited scene must not stack a second card.
+  await Promise.all(getAgentLiveActivities().map((existing) => existing.end("immediate")));
+  // ActivityKit only starts activities while the app is foreground, which
+  // holds here: the runner locks the device after the scene reports ready.
+  return startAgentLiveActivity(activity) !== null || "Live Activity did not start";
+}
diff --git a/apps/mobile/src/features/terminal/terminalDebugLog.ts b/apps/mobile/src/features/terminal/terminalDebugLog.ts
index eb11419b330c..31c8497915c3 100644
--- a/apps/mobile/src/features/terminal/terminalDebugLog.ts
+++ b/apps/mobile/src/features/terminal/terminalDebugLog.ts
@@ -1,24 +1,21 @@
+import { createDebugLogger } from "../../lib/debugLog";
+
 /**
  * Debug logging for the mobile terminal pipeline. Prefix: `[t3-terminal]`.
  *
- * Enabled when `__DEV__` is true, or set `globalThis.__T3_TERMINAL_DEBUG__ = true` in a JS
- * debugger / Metro console to trace release/TestFlight builds.
+ * Enabled when `__DEV__` is true, or set `globalThis.__T3_TERMINAL_DEBUG__`
+ * (or the shared `globalThis.__T3_DEBUG__` filter) in a JS debugger / Metro
+ * console to trace release/TestFlight builds.
  */
+const logger = createDebugLogger("terminal", {
+  enabledInDev: true,
+  legacyGlobalFlag: "__T3_TERMINAL_DEBUG__",
+});
+
 export function isTerminalDebugEnabled(): boolean {
-  return (
-    (typeof __DEV__ !== "undefined" && __DEV__) ||
-    (typeof globalThis !== "undefined" &&
-      (globalThis as { __T3_TERMINAL_DEBUG__?: boolean }).__T3_TERMINAL_DEBUG__ === true)
-  );
+  return logger.isEnabled();
 }
 
 export function terminalDebugLog(message: string, data?: Record<string, unknown>): void {
-  if (!isTerminalDebugEnabled()) {
-    return;
-  }
-  if (data !== undefined) {
-    console.log(`[t3-terminal] ${message}`, data);
-  } else {
-    console.log(`[t3-terminal] ${message}`);
-  }
+  logger.log(message, data);
 }
diff --git a/apps/mobile/src/features/threads/ChatGptSharingStatus.tsx b/apps/mobile/src/features/threads/ChatGptSharingStatus.tsx
new file mode 100644
index 000000000000..86361fce4670
--- /dev/null
+++ b/apps/mobile/src/features/threads/ChatGptSharingStatus.tsx
@@ -0,0 +1,39 @@
+import type { ServerProvider } from "@t3tools/contracts";
+import { CHATGPT_USAGE_URL, usesChatGptSharing } from "@t3tools/shared/usageLimits";
+import { Alert, Linking, Pressable, View } from "react-native";
+import { AppText as Text } from "../../components/AppText";
+import { ProviderIcon } from "../../components/ProviderIcon";
+
+export function ChatGptSharingStatus({ provider }: { provider: ServerProvider | null }) {
+  if (!usesChatGptSharing(provider)) return null;
+  return (
+    <View className="flex-row items-center justify-between gap-3 px-3 py-1">
+      <Pressable
+        accessibilityRole="button"
+        accessibilityLabel="ChatGPT token sharing is active"
+        className="min-h-11 flex-row items-center gap-2"
+        onPress={() => {
+          Alert.alert(
+            "ChatGPT sharing is on",
+            [
+              provider?.auth.email,
+              "Eligible usage uses your ChatGPT plan. Credit settings and limits are managed in ChatGPT.",
+            ]
+              .filter(Boolean)
+              .join("\n\n"),
+          );
+        }}
+      >
+        <ProviderIcon provider="codex" size={14} />
+        <Text className="text-xs text-foreground-muted">Using ChatGPT plan</Text>
+      </Pressable>
+      <Pressable
+        accessibilityRole="link"
+        className="min-h-11 justify-center"
+        onPress={() => void Linking.openURL(CHATGPT_USAGE_URL).catch(() => undefined)}
+      >
+        <Text className="text-xs font-t3-medium text-primary">Manage usage</Text>
+      </Pressable>
+    </View>
+  );
+}
diff --git a/apps/mobile/src/features/threads/ChatGptUsageLimitNotice.tsx b/apps/mobile/src/features/threads/ChatGptUsageLimitNotice.tsx
new file mode 100644
index 000000000000..d668dc50eabf
--- /dev/null
+++ b/apps/mobile/src/features/threads/ChatGptUsageLimitNotice.tsx
@@ -0,0 +1,40 @@
+import type { EnvironmentId, OrchestrationThreadShell } from "@t3tools/contracts";
+import { CHATGPT_USAGE_URL, isChatGptUsageLimitError } from "@t3tools/shared/usageLimits";
+import * as Option from "effect/Option";
+import { Linking, Pressable, View } from "react-native";
+import { AppText as Text } from "../../components/AppText";
+import { ProviderIcon } from "../../components/ProviderIcon";
+import { useThreadDetail } from "../../state/use-thread-detail";
+
+export function ChatGptUsageLimitNotice({
+  environmentId,
+  thread,
+}: {
+  environmentId: EnvironmentId;
+  thread: OrchestrationThreadShell;
+}) {
+  const state = useThreadDetail({ environmentId, threadId: thread.id });
+  const detail = Option.getOrNull(state.data);
+  if (!isChatGptUsageLimitError(detail?.activities ?? [], thread.session?.lastError)) return null;
+  return (
+    <View
+      accessibilityRole="alert"
+      className="mx-3 mb-2 gap-2 rounded-xl border border-border-subtle bg-composer-panel p-3"
+    >
+      <View className="flex-row items-center gap-2">
+        <ProviderIcon provider="codex" size={16} />
+        <Text className="text-sm font-t3-medium text-foreground">ChatGPT usage limit reached</Text>
+      </View>
+      <Text className="text-xs text-foreground-muted">
+        Review your usage settings in ChatGPT to continue.
+      </Text>
+      <Pressable
+        accessibilityRole="link"
+        className="min-h-11 self-start justify-center rounded-lg bg-primary px-3"
+        onPress={() => void Linking.openURL(CHATGPT_USAGE_URL).catch(() => undefined)}
+      >
+        <Text className="text-sm font-t3-medium text-primary-foreground">Manage usage</Text>
+      </Pressable>
+    </View>
+  );
+}
diff --git a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
index 7edb07f4e3d8..b30175b5b0de 100644
--- a/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
+++ b/apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
@@ -402,7 +402,7 @@ export function NewTaskBranchPickerRouteScreen() {
   const branchContent =
     flow.filteredBranches.length === 0 ? (
       <ScrollView
-        className={Platform.OS === "android" ? "flex-1 bg-sheet-solid" : "flex-1 bg-sheet"}
+        className="flex-1 bg-sheet android:bg-sheet-solid"
         contentInsetAdjustmentBehavior="automatic"
         contentContainerStyle={{ flexGrow: 1, paddingHorizontal: 16, paddingTop: 16 }}
         scrollEnabled={false}
@@ -443,7 +443,7 @@ export function NewTaskBranchPickerRouteScreen() {
         alwaysBounceVertical={false}
         automaticallyAdjustsScrollIndicatorInsets
         automaticallyAdjustKeyboardInsets={Platform.OS === "ios"}
-        className={Platform.OS === "android" ? "flex-1 bg-sheet-solid" : "flex-1 bg-sheet"}
+        className="flex-1 bg-sheet android:bg-sheet-solid"
         contentInsetAdjustmentBehavior="automatic"
         contentContainerStyle={branchListContentStyle}
         data={flow.filteredBranches}
diff --git a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
index 681f6c5ee52d..7e90b0743374 100644
--- a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
+++ b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
@@ -132,30 +132,40 @@ import { fileRoutePathSegments } from "../files/filePath";
 function NewTaskWorkspaceIcon(props: {
   readonly workspaceMode: "local" | "worktree";
   readonly worktreePath: string | null;
+  readonly size: number;
 }) {
   if (props.workspaceMode === "local" && props.worktreePath === null) {
     return (
       <SymbolView
         name="folder"
-        size={16}
+        size={props.size}
         tintColorClassName="accent-icon-muted"
         type="monochrome"
       />
     );
   }
 
+  const boxSize = (14 * props.size) / 16;
   return (
-    <View className="size-4">
+    <View
+      className="size-4"
+      style={Platform.OS === "android" ? { width: boxSize, height: boxSize } : undefined}
+    >
       <SymbolView
         name="folder"
-        size={16}
+        size={props.size}
         tintColorClassName="accent-icon-muted"
         type="monochrome"
       />
-      <View className="absolute -right-1 -bottom-1">
+      <View
+        className="absolute -right-1 -bottom-1"
+        style={
+          Platform.OS === "android" ? { right: -boxSize / 4, bottom: -boxSize / 4 } : undefined
+        }
+      >
         <SymbolView
           name="arrow.triangle.branch"
-          size={9}
+          size={Math.round((9 * props.size) / 16)}
           tintColorClassName="accent-icon-muted"
           type="monochrome"
         />
@@ -1476,13 +1486,13 @@ export function NewTaskDraftScreen(props: {
         accessibilityLabel={`Environment: ${selectedEnvironmentLabel}`}
         chevronDirection="right"
         disabled={isComposerInteractionLocked || voiceInput.isBusy}
-        iconNode={
+        renderIcon={(size) => (
           <EnvironmentMachineSymbol
             kind={resolveEnvironmentMachineKind(selectedEnvironmentServerConfig)}
-            size={16}
+            size={size}
             tintColorClassName="accent-icon-muted"
           />
-        }
+        )}
         label={`on ${selectedEnvironmentLabel}`}
         maxWidth={260}
         onPress={
@@ -1517,12 +1527,13 @@ export function NewTaskDraftScreen(props: {
         accessibilityHint={`Switches to ${flow.workspaceMode === "local" ? "a new worktree" : "the current checkout"}`}
         accessibilityLabel={workspaceLabel}
         disabled={isComposerInteractionLocked || voiceInput.isBusy}
-        iconNode={
+        renderIcon={(size) => (
           <NewTaskWorkspaceIcon
             workspaceMode={flow.workspaceMode}
             worktreePath={flow.selectedWorktreePath}
+            size={size}
           />
-        }
+        )}
         label={workspaceLabel}
         maxWidth={flow.workspaceMode === "local" ? 220 : 148}
         onPress={() => flow.setWorkspaceMode(flow.workspaceMode === "local" ? "worktree" : "local")}
@@ -1681,12 +1692,12 @@ export function NewTaskDraftScreen(props: {
                         accessibilityLabel="Model and reasoning settings"
                         disabled={isComposerInteractionLocked}
                         emphasized
-                        iconNode={
+                        renderIcon={(size) => (
                           <ProviderIcon
                             provider={flow.selectedModelOption?.providerDriver}
-                            size={16}
+                            size={size}
                           />
-                        }
+                        )}
                         label={flow.selectedModelOption?.label ?? "Choose model"}
                         maxWidth="100%"
                         onPress={settingsSheetPresentation.open}
diff --git a/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx b/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
index f74542076be2..27a9b3217c7e 100644
--- a/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
+++ b/apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
@@ -333,6 +333,7 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
                         <ProjectFavicon
                           environmentId={scope.representative.environmentId}
                           faviconPath={scope.representative.faviconPath}
+                          projectIcon={scope.representative.projectIcon}
                           size={24}
                           projectTitle={scope.title}
                           workspaceRoot={scope.representative.workspaceRoot}
@@ -357,6 +358,7 @@ export function NewTaskRouteScreen({ route }: StaticScreenProps<NewTaskRoutePara
                         <ProjectFavicon
                           environmentId={scope.representative.environmentId}
                           faviconPath={scope.representative.faviconPath}
+                          projectIcon={scope.representative.projectIcon}
                           size={20}
                           projectTitle={scope.title}
                           workspaceRoot={scope.representative.workspaceRoot}
diff --git a/apps/mobile/src/features/threads/ThreadComposer.tsx b/apps/mobile/src/features/threads/ThreadComposer.tsx
index 721732b37417..d4aad05c2b4c 100644
--- a/apps/mobile/src/features/threads/ThreadComposer.tsx
+++ b/apps/mobile/src/features/threads/ThreadComposer.tsx
@@ -1,3 +1,4 @@
+import { ChatGptUsageLimitNotice } from "./ChatGptUsageLimitNotice";
 import type { ComposerTextPaste } from "../../native/T3ComposerEditor.types";
 import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
 import { useAtomValue } from "@effect/atom-react";
@@ -638,6 +639,10 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
         className="relative w-full self-center"
         style={{ maxWidth: props.contentMaxWidth }}
       >
+        <ChatGptUsageLimitNotice
+          environmentId={props.environmentId}
+          thread={props.selectedThread}
+        />
         {!voiceInput.isBusy &&
         composerMenu.trigger &&
         (composerMenu.items.length > 0 || composerMenu.trigger.kind === "pull-request") ? (
@@ -652,6 +657,27 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
           </View>
         ) : null}
 
+        {selectedProviderStatus?.compatibilityAdvisory?.message &&
+        (selectedProviderStatus.compatibilityAdvisory.status === "unsupported" ||
+          selectedProviderStatus.compatibilityAdvisory.status === "broken") ? (
+          <Text
+            accessibilityRole={
+              selectedProviderStatus.compatibilityAdvisory.status === "broken" ? "alert" : undefined
+            }
+            accessibilityLiveRegion={
+              selectedProviderStatus.compatibilityAdvisory.status === "broken"
+                ? "assertive"
+                : "polite"
+            }
+            className={
+              selectedProviderStatus.compatibilityAdvisory.status === "broken"
+                ? "bg-danger px-3 py-2 text-xs text-danger-foreground"
+                : "px-3 py-2 text-xs text-foreground"
+            }
+          >
+            {selectedProviderStatus.compatibilityAdvisory.message}
+          </Text>
+        ) : null}
         {modelUnavailable ? (
           <Pressable accessibilityRole="button" className="px-3 py-2" onPress={openSettings}>
             <Text className="text-xs text-foreground">Model unavailable. Open model settings.</Text>
@@ -945,9 +971,9 @@ export const ThreadComposer = memo(function ThreadComposer(props: ThreadComposer
                       <ComposerInlineControl
                         accessibilityLabel="Model and reasoning settings"
                         emphasized
-                        iconNode={
-                          <ProviderIcon provider={currentModelOption?.providerDriver} size={16} />
-                        }
+                        renderIcon={(size) => (
+                          <ProviderIcon provider={currentModelOption?.providerDriver} size={size} />
+                        )}
                         label={currentModelOption?.label ?? currentModelSelection.model}
                         maxWidth="100%"
                         onPress={openSettings}
diff --git a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
index ad0872ea9116..14beefd6d178 100644
--- a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
@@ -70,6 +70,7 @@ import { collectProviderUsageLimits } from "@t3tools/shared/usageLimits";
 import type { ComposerEditorHandle } from "../../components/ComposerEditor";
 import type { StatusTone } from "../../components/StatusPill";
 import type { DraftComposerAttachment } from "../../lib/composerImages";
+import { RenderErrorBoundary, RenderFailureView } from "../../components/RenderErrorBoundary";
 import { CHAT_CONTENT_MAX_WIDTH, type LayoutVariant } from "../../lib/layout";
 import { IOS_NAV_BAR_HEIGHT } from "../../lib/layoutMetrics";
 import { editPendingThreadMessage } from "../../state/edit-pending-thread-message";
@@ -78,6 +79,7 @@ import { useEnvironmentQuery } from "../../state/query";
 import { threadDevicePreviews } from "../devices/threadDevicePreviews";
 import type { QueuedThreadMessage } from "../../state/thread-outbox-model";
 import { scopedThreadKey } from "../../lib/scopedEntities";
+import { useDelayedStatus } from "../../lib/useDelayedStatus";
 import type {
   PendingApproval,
   PendingUserInput,
@@ -353,7 +355,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
   // The raw sync status enters "synchronizing" on every full fetch, cached or
   // not. Whether messages are already on screen decides the pill label: no
   // data yet → "Loading messages", cached data reconciling → "Syncing".
-  const threadSyncLabel = (() => {
+  const realThreadSyncLabel = (() => {
     switch (props.threadSyncStatus) {
       case "empty":
       case "cached":
@@ -366,6 +368,9 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
         return null;
     }
   })();
+  // Opening a running thread resyncs for a few frames. The pill shows the
+  // sync label only when the sync lasts, so it does not flash before the timer.
+  const threadSyncLabel = useDelayedStatus(selectedThreadKey, realThreadSyncLabel);
   // One floating pill above the composer: it reads the connection phase while
   // disconnected, the sync state while messages load, then the working timer
   // once the feed is settled.
@@ -674,10 +679,12 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
   const isSplitLayout = layoutVariant === "split";
   const contentMaxWidth = isSplitLayout ? CHAT_CONTENT_MAX_WIDTH : undefined;
   const workspaceContentWidth = useWorkspaceContentWidth();
+  // Clearing animated width can retain the unfolded width after Android resumes folded.
+  // Assign both layouts explicitly so the dock always follows its current parent.
   const composerWidthStyle = useAnimatedStyle(() =>
     isSplitLayout && workspaceContentWidth !== null
-      ? { width: workspaceContentWidth.value, right: undefined }
-      : { width: undefined, right: 0 },
+      ? { width: workspaceContentWidth.value }
+      : { width: "100%" },
   );
   const selectedInstanceId = props.selectedThread.modelSelection.instanceId;
   useStreamingHaptics(props.selectedThread.id, props.selectedThreadFeed);
@@ -892,39 +899,51 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
                 : "absolute inset-0 bg-screen"
             }
           />
-          <ThreadFeed
+          <RenderErrorBoundary
             key={selectedThreadKey}
-            environmentId={props.environmentId}
-            threadId={props.selectedThread.id}
-            workspaceRoot={props.threadCwd}
-            feed={props.selectedThreadFeed}
-            worktreeSetup={props.worktreeSetup}
-            setupWorkingStartedAt={props.setupWorkingStartedAt}
-            queuedMessages={props.queuedMessages}
-            dispatchingMessageId={props.dispatchingMessageId}
-            onEditPendingMessage={handleEditPendingMessage}
-            contentPresentation={props.contentPresentation}
-            agentLabel={agentLabel}
-            latestTurn={props.selectedThread.latestTurn}
-            activeWorkStartedAt={props.activeWorkStartedAt}
-            listRef={listRef}
-            freeze={freeze}
-            anchorMessageId={anchorMessageId}
-            submittedMessageId={submittedMessageId}
-            contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
-            contentTopInset={0}
-            contentBottomInset={
-              estimatedOverlayHeight + (showFloatingStatus ? FLOATING_WORKING_CONTROL_COVERAGE : 0)
-            }
-            contentMaxWidth={contentMaxWidth}
-            layoutVariant={layoutVariant}
-            usesAutomaticContentInsets={props.usesAutomaticContentInsets}
-            onHeaderMaterialVisibilityChange={props.onHeaderMaterialVisibilityChange}
-            onEndFollowEnabledChange={setEndFollowEnabled}
-            skills={selectedProviderSkills}
-            onUseArtifactTemplate={handleUseArtifactTemplate}
-            loadEarlier={props.loadEarlier ?? null}
-          />
+            resetKeys={[props.threadCwd]}
+            renderFallback={(fallback) => (
+              <RenderFailureView
+                {...fallback}
+                title="The conversation couldn't be displayed"
+                bottomInset={estimatedOverlayHeight}
+              />
+            )}
+          >
+            <ThreadFeed
+              environmentId={props.environmentId}
+              threadId={props.selectedThread.id}
+              workspaceRoot={props.threadCwd}
+              feed={props.selectedThreadFeed}
+              worktreeSetup={props.worktreeSetup}
+              setupWorkingStartedAt={props.setupWorkingStartedAt}
+              queuedMessages={props.queuedMessages}
+              dispatchingMessageId={props.dispatchingMessageId}
+              onEditPendingMessage={handleEditPendingMessage}
+              contentPresentation={props.contentPresentation}
+              agentLabel={agentLabel}
+              latestTurn={props.selectedThread.latestTurn}
+              activeWorkStartedAt={props.activeWorkStartedAt}
+              listRef={listRef}
+              freeze={freeze}
+              anchorMessageId={anchorMessageId}
+              submittedMessageId={submittedMessageId}
+              contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
+              contentTopInset={0}
+              contentBottomInset={
+                estimatedOverlayHeight +
+                (showFloatingStatus ? FLOATING_WORKING_CONTROL_COVERAGE : 0)
+              }
+              contentMaxWidth={contentMaxWidth}
+              layoutVariant={layoutVariant}
+              usesAutomaticContentInsets={props.usesAutomaticContentInsets}
+              onHeaderMaterialVisibilityChange={props.onHeaderMaterialVisibilityChange}
+              onEndFollowEnabledChange={setEndFollowEnabled}
+              skills={selectedProviderSkills}
+              onUseArtifactTemplate={handleUseArtifactTemplate}
+              loadEarlier={props.loadEarlier ?? null}
+            />
+          </RenderErrorBoundary>
         </View>
       ) : (
         <View className="flex-1" />
@@ -947,7 +966,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
           <Animated.View
             layout={COMPOSER_LAYOUT_TRANSITION}
             pointerEvents="box-none"
-            style={[{ position: "absolute", bottom: 0, left: 0, right: 0 }, composerWidthStyle]}
+            style={[{ position: "absolute", bottom: 0, left: 0 }, composerWidthStyle]}
           >
             {/* No paddingTop here: the overlay's measured height becomes the
                 list's bottom inset, so any padding above the pill/composer
diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index 20848cd2ad10..83b0bef9c022 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -2477,7 +2477,10 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
   // content-inset override. Seed the fresh instance synchronously with the
   // current overlay height before the scroll integration's next reaction;
   // on Android the declarative contentInset floor covers this same window.
-  const listMountKey = `${feedThreadKey}:${presentedFeed.length === 0 ? "empty" : "filled"}`;
+  // The thinking row a running thread shows while its messages load is not
+  // content: the list must still remount, and so open at the end, when they
+  // arrive.
+  const listMountKey = `${feedThreadKey}:${presentedFeed.some((entry) => entry.type !== "thinking") ? "filled" : "empty"}`;
   useLayoutEffect(() => {
     const bottom = props.contentInsetEndAdjustment.value;
     if (bottom > 0) {
diff --git a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
index bf957ad54195..d9e165bd0107 100644
--- a/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
+++ b/apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx
@@ -1,5 +1,6 @@
+import { useAndroidControlSizing } from "../../components/useAndroidControlSizing";
 import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
-import { createThreadMovePlanner } from "./threadOrder";
+import { computeThreadMoveAvailability } from "./threadOrder";
 import type {
   EnvironmentProject,
   EnvironmentThreadShell,
@@ -29,7 +30,6 @@ import { NativeStackScreenOptions } from "../../native/StackHeader";
 import { scopedProjectKey, scopedThreadKey } from "../../lib/scopedEntities";
 import { useProjects, useThreadShells } from "../../state/entities";
 import { useThreadSearch } from "../../state/queries";
-import { useThreadListV2Enabled } from "./use-thread-list-v2-enabled";
 import { useThreadListV2ShelfPreferences } from "./use-thread-list-v2-shelf-preferences";
 import { usePendingThreadOrder } from "../../state/thread-order";
 import { environmentServerConfigsAtom } from "../../state/server";
@@ -39,24 +39,9 @@ import { useWorkspaceState } from "../../state/workspace";
 import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
 import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
 import { useThreadJumpShortcuts } from "../keyboard/threadKeyboardShortcuts";
-import {
-  hasCustomHomeListOptions,
-  PROJECT_SORT_OPTIONS,
-  THREAD_SORT_OPTIONS,
-  useHomeListOptions,
-} from "../home/home-list-options";
+import { useHomeListOptions } from "../home/home-list-options";
 import { buildHomeListFilterMenu } from "../home/home-list-filter-menu";
-import {
-  buildHomeListLayout,
-  DEFAULT_GROUP_DISPLAY_STATE,
-  EMPTY_HOME_LIST_LAYOUT,
-  homeListItemsAreEqual,
-  nextGroupDisplayState,
-  type HomeGroupDisplayAction,
-  type HomeGroupDisplayState,
-  type HomeListItem,
-} from "../home/homeListItems";
-import { buildHomeProjectScopes, buildHomeThreadGroups } from "../home/homeThreadList";
+import { buildHomeProjectScopes } from "../home/homeThreadList";
 import { SwipeableScrollGateProvider, useSwipeableScrollGate } from "../home/thread-swipe-actions";
 import { usePendingTaskListActions } from "../home/usePendingTaskListActions";
 import { useThreadListActions } from "../home/useThreadListActions";
@@ -66,17 +51,11 @@ import {
 } from "../home/WorkspaceConnectionTitle";
 import { SidebarHeaderActions } from "./sidebar-header-actions";
 import { MaterialThreadListToolbar } from "../home/MaterialThreadListToolbar";
-import { useMaterialToolbarHeight } from "../../components/useMaterialToolbarHeight";
+import { useMaterialToolbarLayout } from "../../components/useMaterialToolbarLayout";
 import { useMaterialFabScroll } from "../home/MaterialFabScrollContext";
 import { SidebarFilterButton } from "./sidebar-filter-button";
 import { createSidebarHeaderItems } from "./sidebar-native-header-items";
 import { SidebarNavigationShell } from "./sidebar-navigation-shell";
-import {
-  PendingTaskListRow,
-  ThreadListGroupHeader,
-  ThreadListRow,
-  ThreadListShowMoreRow,
-} from "./thread-list-items";
 import {
   ThreadListV2PendingRow,
   ThreadListV2Row,
@@ -84,21 +63,21 @@ import {
   ThreadListV2ShowMoreRow,
   ThreadListV2SnoozedShelfHeader,
 } from "./thread-list-v2-items";
-import { resolveThreadProviderInstance } from "./thread-provider-instance";
+import { useThreadRowProviderInstanceResolver } from "./thread-provider-instance";
 import {
   buildThreadListV2Items,
   getThreadListV2OrderedSection,
   buildThreadListV2ListItems,
+  isThreadListV2ListItem,
+  threadListV2ListItemsAreEqual,
   THREAD_LIST_V2_SETTLED_INITIAL_COUNT,
   THREAD_LIST_V2_SETTLED_PAGE_COUNT,
   type ThreadListV2ListItem,
 } from "./threadListV2";
 
-/** The sidebar list serves both lists: v1 grouped items or, when the Thread
-    List v2 beta is on, flat v2 rows with queued tasks spliced in, and a settled
-    "Show more" pager. */
+/** The sidebar list: flat v2 rows with queued tasks spliced in, plus a
+    settled "Show more" pager row. */
 type SidebarListItem =
-  | HomeListItem
   | ThreadListV2ListItem
   | { readonly type: "v2-show-more"; readonly key: string; readonly hiddenCount: number };
 
@@ -155,6 +134,7 @@ function ThreadNavigationSidebarPane(
   const drawerColor = materialTheme["--color-drawer"];
 
   const insets = useSafeAreaInsets();
+  const { fabClearance } = useAndroidControlSizing();
   const projects = useProjects();
   const threads = useThreadShells();
   const { environments: workspaceEnvironments, state: catalogState } = useWorkspaceState();
@@ -172,11 +152,11 @@ function ThreadNavigationSidebarPane(
     unsettleThread,
     pinThread,
     unpinThread,
+    setThreadAutoSettle,
     moveThread,
     renameThread,
     regenerateThreadTitle,
   } = useThreadListActions();
-  const threadListV2Enabled = useThreadListV2Enabled();
   const pendingTasks = usePendingNewTasks();
   const queuedThreadKeys = useQueuedThreadKeys();
   const { openPendingTask, confirmDeletePendingTask } = usePendingTaskListActions();
@@ -194,8 +174,7 @@ function ThreadNavigationSidebarPane(
     () => new Set(environments.map((environment) => environment.environmentId)),
     [environments],
   );
-  const { options, setSelectedEnvironmentId, setProjectSortOrder, setThreadSortOrder } =
-    useHomeListOptions(availableEnvironmentIds);
+  const { options, setSelectedEnvironmentId } = useHomeListOptions(availableEnvironmentIds);
   const searchEnvironmentIds = useMemo(
     () =>
       options.selectedEnvironmentId === null
@@ -284,93 +263,6 @@ function ThreadNavigationSidebarPane(
           ),
     [selectedProjectScope],
   );
-  const scopedProjects = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : selectedProjectRefs === null
-          ? projects
-          : projects.filter((project) =>
-              selectedProjectRefs.has(scopedProjectKey(project.environmentId, project.id)),
-            ),
-    [threadListV2Enabled, projects, selectedProjectRefs],
-  );
-  const scopedThreads = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : selectedProjectRefs === null
-          ? threads
-          : threads.filter((thread) =>
-              selectedProjectRefs.has(scopedProjectKey(thread.environmentId, thread.projectId)),
-            ),
-    [threadListV2Enabled, selectedProjectRefs, threads],
-  );
-  const scopedPendingTasks = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : selectedProjectRefs === null
-          ? pendingTasks
-          : pendingTasks.filter((pendingTask) =>
-              selectedProjectRefs.has(
-                scopedProjectKey(pendingTask.environmentId, pendingTask.projectId),
-              ),
-            ),
-    [threadListV2Enabled, pendingTasks, selectedProjectRefs],
-  );
-  const groups = useMemo(
-    () =>
-      threadListV2Enabled
-        ? []
-        : buildHomeThreadGroups({
-            projects: scopedProjects,
-            threads: scopedThreads,
-            pendingTasks: scopedPendingTasks,
-            queuedThreadKeys,
-            environmentId: options.selectedEnvironmentId,
-            searchQuery: props.searchQuery,
-            matchedThreadKeys,
-            projectSortOrder: options.projectSortOrder,
-            threadSortOrder: options.threadSortOrder,
-            projectGroupingMode: options.projectGroupingMode,
-          }),
-    [
-      threadListV2Enabled,
-      queuedThreadKeys,
-      matchedThreadKeys,
-      options,
-      props.searchQuery,
-      scopedPendingTasks,
-      scopedProjects,
-      scopedThreads,
-    ],
-  );
-  const [groupDisplayStates, setGroupDisplayStates] = useState<
-    ReadonlyMap<string, HomeGroupDisplayState>
-  >(() => new Map());
-  const updateGroupDisplay = useCallback((key: string, action: HomeGroupDisplayAction) => {
-    setGroupDisplayStates((previous) => {
-      const next = new Map(previous);
-      next.set(
-        key,
-        nextGroupDisplayState(previous.get(key) ?? DEFAULT_GROUP_DISPLAY_STATE, action),
-      );
-      return next;
-    });
-  }, []);
-  const hasSearchQuery = props.searchQuery.trim().length > 0;
-  const listLayout = useMemo(
-    () =>
-      threadListV2Enabled
-        ? EMPTY_HOME_LIST_LAYOUT
-        : buildHomeListLayout({
-            groups,
-            displayStates: groupDisplayStates,
-            showAllThreads: hasSearchQuery,
-          }),
-    [threadListV2Enabled, groups, groupDisplayStates, hasSearchQuery],
-  );
   const projectByKey = useMemo(() => {
     const map = new Map<string, EnvironmentProject>();
     for (const project of projects) {
@@ -410,12 +302,11 @@ function ThreadNavigationSidebarPane(
   // thread reappears immediately instead of on the next minute tick.
   const [snoozeWakeTick, bumpSnoozeWakeTick] = useState(0);
   useEffect(() => {
-    if (!threadListV2Enabled) return;
     // Refresh immediately because the mount-time value can be hours old.
     setNowMinute(new Date().toISOString().slice(0, 16));
     const id = setInterval(() => setNowMinute(new Date().toISOString().slice(0, 16)), 60_000);
     return () => clearInterval(id);
-  }, [threadListV2Enabled]);
+  }, []);
   // Threads on servers without the settlement capability never classify as
   // settled (the user could neither un-settle nor pin them).
   const serverConfigs = useAtomValue(environmentServerConfigsAtom);
@@ -446,6 +337,15 @@ function ThreadNavigationSidebarPane(
     }
     return supported;
   }, [serverConfigs]);
+  const autoSettleOptOutEnvironmentIds = useMemo(() => {
+    const supported = new Set<EnvironmentId>();
+    for (const [environmentId, config] of serverConfigs) {
+      if (config.environment.capabilities.threadAutoSettleOptOut === true) {
+        supported.add(environmentId);
+      }
+    }
+    return supported;
+  }, [serverConfigs]);
   const pinReorderEnvironmentIds = useMemo(() => {
     const supported = new Set<EnvironmentId>();
     for (const [environmentId, config] of serverConfigs) {
@@ -483,12 +383,19 @@ function ThreadNavigationSidebarPane(
       ),
     [serverConfigs],
   );
+  // Reference-stable provider glyphs: a fresh object per render would break
+  // the memoized rows' props comparison on every parent render.
+  const resolveProviderInstance = useThreadRowProviderInstanceResolver(serverConfigs);
   const pendingOrder = usePendingThreadOrder(nowMinute, snoozeWakeTick);
-  const threadMovePlanners = useMemo(() => {
-    const sectionPlanner = (section: "pinned" | "active") =>
-      createThreadMovePlanner({
+  // Up/down menu availability for every card, computed once per section per
+  // rebuild (see computeThreadMoveAvailability): per-thread planner calls made
+  // list construction quadratic, and this list rebuilds on every minute tick.
+  const threadMoveAvailability = useMemo(() => {
+    const sectionAvailability = (section: "pinned" | "active") =>
+      computeThreadMoveAvailability({
         allThreads: threads,
         section,
+        pendingOrder,
         reorderableEnvironmentIds: new Set(
           [...serverConfigs].flatMap(([id, config]) =>
             (section === "pinned"
@@ -508,7 +415,7 @@ function ThreadNavigationSidebarPane(
           queuedThreadKeys,
         }),
       });
-    return { pinned: sectionPlanner("pinned"), active: sectionPlanner("active") };
+    return new Map([...sectionAvailability("pinned"), ...sectionAvailability("active")]);
   }, [
     serverConfigs,
     threads,
@@ -520,16 +427,6 @@ function ThreadNavigationSidebarPane(
     snoozeWakeTick,
   ]);
   const threadListV2Layout = useMemo(() => {
-    if (!threadListV2Enabled)
-      return {
-        items: [],
-        hiddenSettledCount: 0,
-        snoozedCount: 0,
-        snoozedShelfHeaderIndex: null,
-        settledCount: 0,
-        settledShelfHeaderIndex: null,
-        nextSnoozeWakeAt: null,
-      };
     return buildThreadListV2Items({
       pendingOrder,
       threads: threads.filter((thread) => thread.archivedAt === null),
@@ -560,7 +457,6 @@ function ThreadNavigationSidebarPane(
     settledVisibleCount,
     settlementEnvironmentIds,
     snoozeEnvironmentIds,
-    threadListV2Enabled,
     threads,
     selectedProjectScope,
   ]);
@@ -579,7 +475,6 @@ function ThreadNavigationSidebarPane(
     // range) the boundary string is identical and the chain would die.
   }, [nextSnoozeWakeAt, snoozeWakeTick]);
   const listItems = useMemo<readonly SidebarListItem[]>(() => {
-    if (!threadListV2Enabled) return listLayout.items;
     // Queued offline tasks are not thread shells, so the v2 item builder
     // never sees them; the shared splice puts them below the active block
     // (mirrors the compact Home v2 list) where they stay visible and
@@ -607,6 +502,10 @@ function ThreadNavigationSidebarPane(
       settledShelfExpanded,
       settledShelfHeaderIndex: threadListV2Layout.settledShelfHeaderIndex,
       snoozeLabelNow: `${nowMinute}:00.000Z`,
+      snoozeEnvironmentIds,
+      queuedThreadKeys,
+      moveAvailability: threadMoveAvailability,
+      shelfPreferencesLoading: !shelfPreferencesLoaded,
     });
     if (settledShelfExpanded && threadListV2Layout.hiddenSettledCount > 0) {
       items.push({
@@ -617,15 +516,17 @@ function ThreadNavigationSidebarPane(
     }
     return items;
   }, [
-    listLayout.items,
     nowMinute,
     options.selectedEnvironmentId,
     pendingTasks,
     props.searchQuery,
+    queuedThreadKeys,
+    threadMoveAvailability,
     selectedProjectRefs,
     settledShelfExpanded,
+    shelfPreferencesLoaded,
     snoozedShelfExpanded,
-    threadListV2Enabled,
+    snoozeEnvironmentIds,
     threadListV2Layout,
   ]);
   const listMenuActions = useMemo<MenuAction[]>(
@@ -671,33 +572,8 @@ function ThreadNavigationSidebarPane(
               ],
             },
           ] satisfies MenuAction[])),
-      // v2 lays the list out in fixed creation order — offering sort/group
-      // controls it silently ignores would be a lie. Environment still
-      // scopes the v2 partition, so it stays.
-      ...(threadListV2Enabled
-        ? []
-        : ([
-            {
-              id: "project-sort",
-              title: "Sort projects",
-              subactions: PROJECT_SORT_OPTIONS.map((option) => ({
-                id: `project-sort:${option.value}`,
-                title: option.label,
-                state: options.projectSortOrder === option.value ? "on" : "off",
-              })),
-            },
-            {
-              id: "thread-sort",
-              title: "Sort threads",
-              subactions: THREAD_SORT_OPTIONS.map((option) => ({
-                id: `thread-sort:${option.value}`,
-                title: option.label,
-                state: options.threadSortOrder === option.value ? "on" : "off",
-              })),
-            },
-          ] satisfies MenuAction[])),
     ],
-    [environments, options, projectFilterOptions, selectedProjectKey, threadListV2Enabled],
+    [environments, options, projectFilterOptions, selectedProjectKey],
   );
   const handleListMenuAction = useCallback(
     ({ nativeEvent }: { readonly nativeEvent: { readonly event: string } }) => {
@@ -724,39 +600,19 @@ function ThreadNavigationSidebarPane(
         }
         return;
       }
-      const projectSort = PROJECT_SORT_OPTIONS.find(
-        (option) => `project-sort:${option.value}` === event,
-      );
-      if (projectSort) {
-        setProjectSortOrder(projectSort.value);
-        return;
-      }
-      const threadSort = THREAD_SORT_OPTIONS.find(
-        (option) => `thread-sort:${option.value}` === event,
-      );
-      if (threadSort) {
-        setThreadSortOrder(threadSort.value);
-        return;
-      }
     },
-    [
-      environments,
-      projectFilterOptions,
-      setProjectSortOrder,
-      setSelectedEnvironmentId,
-      setThreadSortOrder,
-    ],
+    [environments, projectFilterOptions, setSelectedEnvironmentId],
   );
 
   const [measuredHeaderHeight, setMeasuredHeaderHeight] = useState<number | null>(null);
-  const materialToolbarHeight = useMaterialToolbarHeight();
+  const { height, paddingTop, paddingBottom } = useMaterialToolbarLayout();
   // The sticky header (title row, search field, optional connection status)
   // is measured so the list inset always matches its real height — no
   // hardcoded per-variant constants.
   const stickyHeaderHeight =
     measuredHeaderHeight ??
     (Platform.OS === "android"
-      ? Math.max(insets.top, 12) + materialToolbarHeight + 8
+      ? paddingTop + height + paddingBottom
       : insets.top + SIDEBAR_STICKY_HEADER_HEIGHT);
   const topListInset = stickyHeaderHeight + 6;
   const handleStickyHeaderLayout = useCallback((event: LayoutChangeEvent) => {
@@ -789,9 +645,11 @@ function ThreadNavigationSidebarPane(
     onScroll: onMaterialFabScroll,
     onScrollBeginDrag: handleScrollBeginDrag,
   });
-  // Project shells load after the first rows draw, so the maps they feed have
-  // to bust the recycler's memoization — otherwise a row keeps the blank
-  // favicon and fallback title it was first rendered with.
+  // The sticky header's project shells and search maps feed row props, so
+  // they have to bust the recycler's memoization — otherwise a row keeps the
+  // blank favicon and fallback title it was first rendered with. The minute
+  // clock deliberately stays out: its per-row text lives on the items, so a
+  // tick only re-renders rows whose displayed text actually moved.
   const listExtraData = useMemo(
     () => ({
       selectedThreadKey: props.selectedThreadKey ?? "",
@@ -799,7 +657,6 @@ function ThreadNavigationSidebarPane(
       projectTitleByProjectKey,
       savedConnectionsById,
       serverConfigs,
-      snoozePresetMinute: nowMinute,
       threadSearchMatchByKey,
     }),
     [
@@ -808,53 +665,19 @@ function ThreadNavigationSidebarPane(
       projectTitleByProjectKey,
       savedConnectionsById,
       serverConfigs,
-      nowMinute,
       threadSearchMatchByKey,
     ],
   );
   useThreadJumpShortcuts(listItems, handleSelectThread);
   const sidebarItemsAreEqual = useCallback(
     (previous: SidebarListItem, item: SidebarListItem): boolean => {
-      if (previous.type === "v2-thread" && item.type === "v2-thread") {
-        return (
-          previous.key === item.key &&
-          previous.item.thread === item.item.thread &&
-          previous.item.variant === item.item.variant &&
-          previous.item.snoozed === item.item.snoozed &&
-          previous.item.pinned === item.item.pinned &&
-          previous.snoozeWakeLabelText === item.snoozeWakeLabelText
-        );
+      if (isThreadListV2ListItem(previous) && isThreadListV2ListItem(item)) {
+        return threadListV2ListItemsAreEqual(previous, item);
       }
       if (previous.type === "v2-show-more" && item.type === "v2-show-more") {
         return previous.hiddenCount === item.hiddenCount;
       }
-      if (previous.type === "v2-pending" && item.type === "v2-pending") {
-        return (
-          previous.pendingTask === item.pendingTask &&
-          previous.showPendingDivider === item.showPendingDivider
-        );
-      }
-      if (previous.type === "v2-snoozed-shelf" && item.type === "v2-snoozed-shelf") {
-        return previous.count === item.count && previous.expanded === item.expanded;
-      }
-      if (previous.type === "v2-settled-shelf" && item.type === "v2-settled-shelf") {
-        return previous.count === item.count && previous.expanded === item.expanded;
-      }
-      if (
-        previous.type === "v2-thread" ||
-        previous.type === "v2-show-more" ||
-        previous.type === "v2-pending" ||
-        previous.type === "v2-snoozed-shelf" ||
-        previous.type === "v2-settled-shelf" ||
-        item.type === "v2-thread" ||
-        item.type === "v2-show-more" ||
-        item.type === "v2-pending" ||
-        item.type === "v2-snoozed-shelf" ||
-        item.type === "v2-settled-shelf"
-      ) {
-        return false;
-      }
-      return homeListItemsAreEqual(previous, item);
+      return false;
     },
     [],
   );
@@ -904,24 +727,29 @@ function ThreadNavigationSidebarPane(
         }
         case "v2-thread": {
           const thread = item.item.thread;
-          const movePlanner = item.item.pinned
-            ? threadMovePlanners.pinned
-            : threadMovePlanners.active;
-          const movedId = `${thread.environmentId}:${thread.id}`;
           const scopeKey = scopedProjectKey(thread.environmentId, thread.projectId);
+          // Intentional difference from Home: the sidebar never passes
+          // `showTrailingDivider` because its rows render no Home-style row
+          // hairline at all — card rows carry tonal containers in this pane
+          // (the hairline branch is !sidebarPane-only) and slim rows have no
+          // hairline branch. The stamp still rides the shared list items
+          // because Home's boundary suppression consumes it; the sidebar's
+          // only cost is the occasional divider-only equality invalidation,
+          // which re-renders identically.
           return (
             <ThreadListV2Row
               onNewThreadOnBranch={props.onNewThreadOnBranch}
               thread={thread}
               variant={item.item.variant}
-              hasQueuedMessages={queuedThreadKeys.has(`${thread.environmentId}:${thread.id}`)}
+              hasQueuedMessages={item.hasQueuedMessages}
               snoozed={item.item.snoozed}
               pinned={item.item.pinned}
-              snoozePresetMinute={nowMinute}
+              snoozePresetMinute={item.snoozePresetMinute ?? ""}
               snoozeWakeLabelText={item.snoozeWakeLabelText}
+              timeLabel={item.timeLabel}
               project={projectByKey.get(scopeKey) ?? null}
               projectTitle={projectTitleByProjectKey.get(scopeKey)}
-              providerInstance={resolveThreadProviderInstance(serverConfigs, thread)}
+              providerInstance={resolveProviderInstance(thread)}
               environmentLabel={
                 Object.keys(savedConnectionsById).length > 1
                   ? (savedConnectionsById[thread.environmentId]?.environmentLabel ?? null)
@@ -950,18 +778,20 @@ function ThreadNavigationSidebarPane(
               onSettleThread={settleThread}
               snoozeSupported={snoozeEnvironmentIds.has(thread.environmentId)}
               pinningSupported={pinningEnvironmentIds.has(thread.environmentId)}
+              autoSettleOptOutSupported={autoSettleOptOutEnvironmentIds.has(thread.environmentId)}
               reorderSupported={
                 item.item.pinned
                   ? pinReorderEnvironmentIds.has(thread.environmentId)
                   : activeReorderEnvironmentIds.has(thread.environmentId)
               }
-              canMoveUp={pendingOrder === null && movePlanner(movedId, "up") !== null}
-              canMoveDown={pendingOrder === null && movePlanner(movedId, "down") !== null}
+              canMoveUp={item.canMoveUp}
+              canMoveDown={item.canMoveDown}
               onSnoozeThread={snoozeThread}
               onUnsnoozeThread={unsnoozeThread}
               onUnsettleThread={unsettleThread}
               onPinThread={pinThread}
               onUnpinThread={unpinThread}
+              onSetThreadAutoSettle={setThreadAutoSettle}
               onMoveThread={moveThread}
               onSwipeableClose={handleSwipeableClose}
               onSwipeableWillOpen={handleSwipeableWillOpen}
@@ -973,7 +803,7 @@ function ThreadNavigationSidebarPane(
           return (
             <ThreadListV2SnoozedShelfHeader
               count={item.count}
-              disabled={!shelfPreferencesLoaded}
+              disabled={item.disabled}
               expanded={item.expanded}
               onToggle={toggleSnoozedShelf}
               pane="sidebar"
@@ -983,7 +813,7 @@ function ThreadNavigationSidebarPane(
           return (
             <ThreadListV2SettledShelfHeader
               count={item.count}
-              disabled={!shelfPreferencesLoaded}
+              disabled={item.disabled}
               expanded={item.expanded}
               onToggle={toggleSettledShelf}
               pane="sidebar"
@@ -997,92 +827,11 @@ function ThreadNavigationSidebarPane(
               onPress={showMoreSettled}
             />
           );
-        case "header":
-          return (
-            <ThreadListGroupHeader
-              variant="sidebar"
-              collapsed={item.collapsed}
-              isFirst={item.isFirst}
-              groupKey={item.group.key}
-              onGroupAction={updateGroupDisplay}
-              // Same gating as the compact Home list: aggregated groups have no
-              // single target project, and pending-project groups hold a
-              // placeholder shell rather than a real project.
-              newThreadTarget={item.group.newThreadTarget}
-              onNewThread={props.onNewThreadInProject}
-              project={item.group.representative}
-              threadCount={item.group.threads.length + item.group.pendingTasks.length}
-              title={item.group.title}
-            />
-          );
-        case "pending-task":
-          return (
-            <PendingTaskListRow
-              variant="sidebar"
-              pendingTask={item.pendingTask}
-              environmentLabel={
-                savedConnectionsById[item.pendingTask.environmentId]?.environmentLabel ?? null
-              }
-              environmentMachine={machineByEnvironmentId.get(item.pendingTask.environmentId)}
-              isLast={item.isLast}
-              onSelectPendingTask={openPendingTask}
-              onDeletePendingTask={confirmDeletePendingTask}
-            />
-          );
-        case "thread": {
-          const thread = item.thread;
-          return (
-            <ThreadListRow
-              onNewThreadOnBranch={props.onNewThreadOnBranch}
-              variant="sidebar"
-              thread={thread}
-              hasQueuedMessages={queuedThreadKeys.has(`${thread.environmentId}:${thread.id}`)}
-              environmentLabel={
-                savedConnectionsById[thread.environmentId]?.environmentLabel ?? null
-              }
-              environmentMachine={machineByEnvironmentId.get(thread.environmentId)}
-              isLast={item.isLast}
-              searchMatch={threadSearchMatchByKey.get(
-                threadSearchMatchKey({
-                  environmentId: thread.environmentId,
-                  threadId: thread.id,
-                }),
-              )}
-              searchQuery={props.searchQuery}
-              selected={
-                scopedThreadKey(thread.environmentId, thread.id) === props.selectedThreadKey
-              }
-              fullSwipeWidth={props.width - 20}
-              onArchiveThread={archiveThread}
-              onDeleteThread={confirmDeleteThread}
-              onRenameThread={renameThread}
-              onRegenerateThreadTitle={regenerateThreadTitle}
-              titleRegenerationSupported={titleRegenerationEnvironmentIds.has(thread.environmentId)}
-              onSelectThread={handleSelectThread}
-              onSwipeableClose={handleSwipeableClose}
-              onSwipeableWillOpen={handleSwipeableWillOpen}
-              simultaneousSwipeGesture={sidebarScrollGesture}
-            />
-          );
-        }
-        case "show-more":
-          return (
-            <ThreadListShowMoreRow
-              variant="sidebar"
-              hiddenCount={item.hiddenCount}
-              canShowLess={item.canShowLess}
-              groupKey={item.groupKey}
-              onGroupAction={updateGroupDisplay}
-            />
-          );
       }
     },
     [
       archiveThread,
       activeReorderEnvironmentIds,
-      threadMovePlanners,
-      pendingOrder,
-      queuedThreadKeys,
       confirmDeletePendingTask,
       confirmDeleteThread,
       handleSelectThread,
@@ -1094,19 +843,19 @@ function ThreadNavigationSidebarPane(
       pinReorderEnvironmentIds,
       pinThread,
       pinningEnvironmentIds,
+      autoSettleOptOutEnvironmentIds,
+      setThreadAutoSettle,
       projectByKey,
       projectTitleByProjectKey,
       regenerateThreadTitle,
       renameThread,
+      threadSearchMatchByKey,
       props.onNewThreadInProject,
       props.onNewThreadOnBranch,
       props.searchQuery,
       props.selectedThreadKey,
       props.width,
       savedConnectionsById,
-      serverConfigs,
-      shelfPreferencesLoaded,
-      threadSearchMatchByKey,
       titleRegenerationEnvironmentIds,
       settleThread,
       settlementEnvironmentIds,
@@ -1114,20 +863,17 @@ function ThreadNavigationSidebarPane(
       sidebarScrollGesture,
       snoozeEnvironmentIds,
       snoozeThread,
-      nowMinute,
+      resolveProviderInstance,
       toggleSettledShelf,
       toggleSnoozedShelf,
       unpinThread,
       unsettleThread,
       unsnoozeThread,
-      updateGroupDisplay,
     ],
   );
-  // v2 ignores the sort/group options, so only the environment filter can
-  // light the "customized" state while the beta is on.
-  const filterCustomized = threadListV2Enabled
-    ? options.selectedEnvironmentId !== null || selectedProjectKey !== null
-    : hasCustomHomeListOptions({ ...options, selectedProjectKey });
+  // The list ignores sort/group options, so only the environment and project
+  // filters can light the "customized" state.
+  const filterCustomized = options.selectedEnvironmentId !== null || selectedProjectKey !== null;
   const filterIcon = filterCustomized
     ? "line.3.horizontal.decrease.circle.fill"
     : "line.3.horizontal.decrease.circle";
@@ -1138,24 +884,10 @@ function ThreadNavigationSidebarPane(
         projects: projectFilterOptions,
         selectedEnvironmentId: options.selectedEnvironmentId,
         selectedProjectKey,
-        projectSortOrder: options.projectSortOrder,
-        threadSortOrder: options.threadSortOrder,
         onEnvironmentChange: setSelectedEnvironmentId,
         onProjectChange: setSelectedProjectKey,
-        onProjectSortOrderChange: setProjectSortOrder,
-        onThreadSortOrderChange: setThreadSortOrder,
-        listOrganization: !threadListV2Enabled,
       }),
-    [
-      environments,
-      options,
-      projectFilterOptions,
-      selectedProjectKey,
-      setProjectSortOrder,
-      setSelectedEnvironmentId,
-      setThreadSortOrder,
-      threadListV2Enabled,
-    ],
+    [environments, options, projectFilterOptions, selectedProjectKey, setSelectedEnvironmentId],
   );
   const nativeHeaderItems = useMemo(
     () =>
@@ -1309,7 +1041,7 @@ function ThreadNavigationSidebarPane(
                   {
                     paddingBottom:
                       Platform.OS === "android"
-                        ? Math.max(insets.bottom, 16) + 148 - insets.bottom
+                        ? Math.max(insets.bottom, 16) + fabClearance - insets.bottom
                         : 16 + insets.bottom,
                     paddingTop: Platform.OS === "android" ? 6 : topListInset,
                   },
@@ -1365,10 +1097,7 @@ function ThreadNavigationSidebarPane(
             />
             <View className="flex-row items-center gap-2.5">
               <ControlPillMenu actions={listMenuActions} onPressAction={handleListMenuAction}>
-                <SidebarFilterButton
-                  accessibilityLabel="Filter and sort threads"
-                  icon={filterIcon}
-                />
+                <SidebarFilterButton accessibilityLabel="Filter threads" icon={filterIcon} />
               </ControlPillMenu>
               <SidebarHeaderActions onOpenSettings={props.onOpenSettings} />
             </View>
diff --git a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx b/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
index e5bfc1590cf0..4fb22d152496 100644
--- a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
@@ -606,10 +606,19 @@ function ThreadRouteContent(
           Files={FilesInspector}
           Git={GitInspector}
           mode={inspectorMode}
+          resetKeys={[routeThreadIdentity, selectedThreadCwd]}
           Route={props.renderInspector ? RouteInspector : undefined}
         />
       ),
-    [FilesInspector, GitInspector, RouteInspector, inspectorMode, props.renderInspector],
+    [
+      FilesInspector,
+      GitInspector,
+      RouteInspector,
+      inspectorMode,
+      props.renderInspector,
+      routeThreadIdentity,
+      selectedThreadCwd,
+    ],
   );
   const activeInspectorRenderer = inspectorMode === null ? undefined : renderInspectorStack;
   // Hand the inspector to the workspace so it renders beside the navigator,
@@ -947,18 +956,7 @@ function ThreadRouteContent(
     <>
       <GitActionProgressOverlay progress={gitActionProgress} onDismiss={dismissGitActionResult} />
 
-      <View
-        className={Platform.OS === "android" ? "flex-1 bg-thread-canvas" : "flex-1 bg-screen"}
-        style={
-          Platform.OS === "android"
-            ? {
-                borderTopLeftRadius: 28,
-                borderTopRightRadius: 28,
-                overflow: "hidden",
-              }
-            : undefined
-        }
-      >
+      <View className="flex-1 bg-screen android:overflow-hidden android:rounded-t-[28px] android:bg-thread-canvas">
         <ThreadDetailScreen
           selectedThread={selectedThreadWithDraftSettings ?? selectedThread}
           contentPresentation={contentPresentation}
diff --git a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
index dc989a4de2d9..aedf415d02de 100644
--- a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
+++ b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
@@ -61,7 +61,8 @@ import {
   nativeHeaderScrollEdgeEffects,
 } from "../../native/StackHeader";
 import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
-import { serverEnvironment } from "../../state/server";
+import { ChatGptSharingStatus } from "./ChatGptSharingStatus";
+import { environmentServerConfigsAtom, serverEnvironment } from "../../state/server";
 import { mobilePreferencesAtom, updateMobilePreferencesAtom } from "../../state/preferences";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { useNewTaskFlow } from "./new-task-flow-provider";
@@ -158,9 +159,8 @@ function ProviderHeader(props: {
         accessibilityLabel={`${props.label}, ${props.modelCount} models`}
         accessibilityRole="button"
         accessibilityState={{ expanded: !props.collapsed }}
-        className="mx-4 mt-1 min-h-11 flex-row items-center gap-2 rounded-xl px-1 pt-2 active:opacity-60"
+        className="mx-4 mt-1 min-h-11 flex-row items-center gap-2 rounded-xl px-1 pt-2 active:opacity-60 android:min-h-12"
         onPress={props.onToggle}
-        style={Platform.OS === "android" ? { minHeight: 48 } : undefined}
       >
         {content}
       </Pressable>
@@ -185,9 +185,8 @@ function DisclosureRow(props: {
     <Pressable
       accessibilityRole="button"
       onPress={props.onPress}
-      style={Platform.OS === "android" ? { minHeight: 56 } : undefined}
       className={cn(
-        "min-h-11 flex-row items-center gap-2 bg-card px-4 py-2 active:bg-subtle",
+        "min-h-11 flex-row items-center gap-2 bg-card px-4 py-2 active:bg-subtle android:min-h-14",
         !props.isLast && "border-b border-border-subtle",
       )}
     >
@@ -685,6 +684,12 @@ function ThreadSettingsOptionsItem(props: {
 }) {
   const insets = useSafeAreaInsets();
   const session = useThreadSettingsSession();
+  const configs = useAtomValue(environmentServerConfigsAtom);
+  const selectedProvider = session.environmentId
+    ? (configs
+        .get(session.environmentId)
+        ?.providers.find((provider) => provider.instanceId === session.providerInstanceId) ?? null)
+    : null;
   const bottomToolbarInset =
     Platform.OS === "ios" && NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED
       ? NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET
@@ -692,6 +697,7 @@ function ThreadSettingsOptionsItem(props: {
 
   return (
     <View style={{ paddingBottom: insets.bottom + bottomToolbarInset + 12 }}>
+      <ChatGptSharingStatus provider={selectedProvider} />
       <Text className="px-5 pb-2 pt-2 text-sm font-t3-medium text-foreground-muted">Options</Text>
       <Animated.View
         className="mx-4 overflow-hidden rounded-2xl bg-card"
@@ -1373,6 +1379,7 @@ export function NewTaskThreadSettingsRouteScreen() {
   return (
     <ThreadSettingsSessionProvider
       environmentId={flow.selectedEnvironmentId}
+      {...(flow.selectedModel ? { providerInstanceId: flow.selectedModel.instanceId } : {})}
       providerGroups={flow.providerGroups}
       selectedModel={flow.selectedModel}
       onSelectModel={(option) => flow.setSelectedModelKey(option.key, option.selection.options)}
diff --git a/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx b/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
index 7ca5085965f5..d16b72d13d81 100644
--- a/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
@@ -63,7 +63,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
   return (
     <View
       collapsable={false}
-      className={Platform.OS === "android" ? "bg-sheet" : "flex-1 bg-sheet"}
+      className="bg-sheet ios:flex-1"
       style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
     >
       {Platform.OS === "android" ? (
@@ -83,31 +83,19 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
       ) : null}
       <MaterialScreenContent fitToContents>
         <ScrollView
-          className={Platform.OS === "android" ? "shrink grow-0" : "flex-1"}
+          className="android:shrink android:grow-0 ios:flex-1"
           keyboardShouldPersistTaps="handled"
           showsVerticalScrollIndicator={false}
           contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
-          contentContainerClassName={Platform.OS === "android" ? "gap-2 p-2" : "gap-4 px-5 pt-2"}
+          contentContainerClassName="android:gap-2 android:p-2 ios:gap-4 ios:px-5 ios:pt-2"
           contentContainerStyle={
             Platform.OS === "android"
               ? { paddingBottom: Math.max(insets.bottom, 18) + 18 }
               : undefined
           }
         >
-          <View
-            className={
-              Platform.OS === "android"
-                ? "gap-3 rounded-[20px] bg-card p-4"
-                : "gap-2 rounded-[18px] border border-border bg-card px-4 py-4"
-            }
-          >
-            <Text
-              className={
-                Platform.OS === "android"
-                  ? "text-foreground text-base font-t3-medium"
-                  : "text-foreground-secondary text-2xs font-t3-bold tracking-[1px] uppercase"
-              }
-            >
+          <View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
+            <Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
               New branch
             </Text>
             <TextInput
@@ -115,7 +103,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
               onChangeText={setNewBranchName}
               placeholder="feature/mobile-polish"
               accessibilityLabel="New branch name"
-              className={Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[18px]"}
+              className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
             />
             <SheetActionButton
               icon="plus"
@@ -133,20 +121,8 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
             />
           </View>
 
-          <View
-            className={
-              Platform.OS === "android"
-                ? "gap-3 rounded-[20px] bg-card p-4"
-                : "gap-2 rounded-[18px] border border-border bg-card px-4 py-4"
-            }
-          >
-            <Text
-              className={
-                Platform.OS === "android"
-                  ? "text-foreground text-base font-t3-medium"
-                  : "text-foreground-secondary text-2xs font-t3-bold tracking-[1px] uppercase"
-              }
-            >
+          <View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
+            <Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
               New worktree
             </Text>
             {Platform.OS === "android" ? (
@@ -157,7 +133,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
               onChangeText={setWorktreeBaseBranch}
               placeholder="main"
               accessibilityLabel="Worktree base branch"
-              className={Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[18px]"}
+              className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
             />
             {Platform.OS === "android" ? (
               <Text className="text-foreground-secondary text-sm">New branch</Text>
@@ -167,7 +143,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
               onChangeText={setWorktreeBranchName}
               placeholder="feature/mobile-thread"
               accessibilityLabel="Worktree branch name"
-              className={Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[18px]"}
+              className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
             />
             <SheetActionButton
               icon="square.split.2x1"
@@ -193,32 +169,16 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
           </View>
 
           <View className="gap-2">
-            <Text
-              className={
-                Platform.OS === "android"
-                  ? "px-4 pb-1 pt-3 text-foreground-secondary text-sm font-t3-medium"
-                  : "text-foreground-secondary text-2xs font-t3-bold tracking-[1px] uppercase"
-              }
-            >
+            <Text className="text-foreground-secondary android:px-4 android:pb-1 android:pt-3 android:text-sm android:font-t3-medium ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
               Existing branches
             </Text>
             {branchesLoading ? (
-              <Text
-                className={cn(
-                  "text-foreground-secondary text-sm font-medium",
-                  Platform.OS === "android" && "px-4",
-                )}
-              >
+              <Text className="text-foreground-secondary text-sm font-medium android:px-4">
                 Loading branches...
               </Text>
             ) : null}
             {!branchesLoading && availableBranches.length === 0 ? (
-              <Text
-                className={cn(
-                  "text-foreground-secondary text-sm font-medium",
-                  Platform.OS === "android" && "px-4",
-                )}
-              >
+              <Text className="text-foreground-secondary text-sm font-medium android:px-4">
                 No local branches found.
               </Text>
             ) : null}
@@ -236,16 +196,10 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
                 <Pressable
                   key={branch.name}
                   className={cn(
-                    "gap-1 px-4 py-3 disabled:opacity-[0.45]",
-                    Platform.OS === "android"
-                      ? cn(
-                          "rounded-[20px] active:bg-subtle",
-                          branch.current ? "bg-secondary" : "bg-card",
-                        )
-                      : cn(
-                          "rounded-[18px] border",
-                          branch.current ? "border-subtle-strong" : "border-border",
-                        ),
+                    "gap-1 px-4 py-3 disabled:opacity-[0.45] android:rounded-[20px] android:active:bg-subtle ios:rounded-[18px] ios:border",
+                    branch.current
+                      ? "android:bg-secondary ios:border-subtle-strong"
+                      : "android:bg-card ios:border-border",
                   )}
                   accessibilityRole="button"
                   accessibilityState={{ selected: branch.current, disabled: busy || disabled }}
@@ -259,12 +213,7 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
                   {Platform.OS !== "android" ? (
                     <View className="absolute inset-0 rounded-[18px] bg-card" />
                   ) : null}
-                  <Text
-                    className={cn(
-                      "text-foreground text-base",
-                      Platform.OS === "android" ? "font-t3-medium" : "font-t3-bold",
-                    )}
-                  >
+                  <Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
                     {branch.name}
                   </Text>
                   <Text className="text-foreground-secondary text-xs font-medium">{subtitle}</Text>
diff --git a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
index 7f70a39d9372..19d77a327def 100644
--- a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
@@ -72,7 +72,7 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
   return (
     <View
       collapsable={false}
-      className={Platform.OS === "android" ? "bg-sheet" : "flex-1 bg-sheet"}
+      className="bg-sheet ios:flex-1"
       style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
     >
       {Platform.OS === "android" ? (
@@ -92,35 +92,21 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
       ) : null}
       <MaterialScreenContent fitToContents>
         <ScrollView
-          className={Platform.OS === "android" ? "shrink grow-0" : "flex-1"}
+          className="android:shrink android:grow-0 ios:flex-1"
           keyboardShouldPersistTaps="handled"
           showsVerticalScrollIndicator={false}
           contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
-          contentContainerClassName={Platform.OS === "android" ? "gap-2 p-2" : "gap-4 px-5 pt-2"}
+          contentContainerClassName="android:gap-2 android:p-2 ios:gap-4 ios:px-5 ios:pt-2"
           contentContainerStyle={
             Platform.OS === "android"
               ? { paddingBottom: Math.max(insets.bottom, 18) + 18 }
               : undefined
           }
         >
-          <View
-            className={cn(
-              "gap-3 bg-card p-4",
-              Platform.OS === "android" ? "rounded-[20px]" : "rounded-[22px] border border-border",
-            )}
-          >
-            <View
-              className={
-                Platform.OS === "android" ? "gap-1" : "flex-row items-center justify-between gap-3"
-              }
-            >
+          <View className="gap-3 bg-card p-4 android:rounded-[20px] ios:rounded-[22px] ios:border ios:border-border">
+            <View className="android:gap-1 ios:flex-row ios:items-center ios:justify-between ios:gap-3">
               <Text className="text-foreground-muted text-sm font-medium">Branch</Text>
-              <Text
-                className={cn(
-                  "text-foreground text-base",
-                  Platform.OS === "android" ? "font-t3-medium" : "font-t3-bold",
-                )}
-              >
+              <Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
                 {gitStatus.data?.refName ?? "(detached HEAD)"}
               </Text>
             </View>
@@ -131,20 +117,10 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
             ) : null}
           </View>
 
-          <View
-            className={cn(
-              "gap-3 bg-card p-4",
-              Platform.OS === "android" ? "rounded-[20px]" : "rounded-[22px] border border-border",
-            )}
-          >
+          <View className="gap-3 bg-card p-4 android:rounded-[20px] ios:rounded-[22px] ios:border ios:border-border">
             <View className="flex-row items-center justify-between gap-3">
               <View className="gap-1">
-                <Text
-                  className={cn(
-                    "text-foreground text-base",
-                    Platform.OS === "android" ? "font-t3-medium" : "font-t3-bold",
-                  )}
-                >
+                <Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
                   Files
                 </Text>
                 <Text className="text-foreground-muted text-xs leading-normal">
@@ -154,39 +130,19 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
               <View className="flex-row items-center gap-2">
                 {!allSelected && isEditingFiles ? (
                   <Pressable
-                    className={
-                      Platform.OS === "android"
-                        ? "min-h-12 justify-center rounded-full px-3 active:bg-subtle"
-                        : "bg-subtle rounded-full px-3 py-2"
-                    }
+                    className="rounded-full px-3 android:min-h-12 android:justify-center android:active:bg-subtle ios:bg-subtle ios:py-2"
                     onPress={() => setExcludedFiles(new Set())}
                   >
-                    <Text
-                      className={
-                        Platform.OS === "android"
-                          ? "text-primary-text text-sm font-t3-medium"
-                          : "text-foreground text-2xs font-t3-bold uppercase"
-                      }
-                    >
+                    <Text className="android:text-primary-text android:text-sm android:font-t3-medium ios:text-foreground ios:text-2xs ios:font-t3-bold ios:uppercase">
                       Reset
                     </Text>
                   </Pressable>
                 ) : null}
                 <Pressable
-                  className={
-                    Platform.OS === "android"
-                      ? "min-h-12 justify-center rounded-full px-3 active:bg-subtle"
-                      : "bg-subtle rounded-full px-3 py-2"
-                  }
+                  className="rounded-full px-3 android:min-h-12 android:justify-center android:active:bg-subtle ios:bg-subtle ios:py-2"
                   onPress={() => setIsEditingFiles((current) => !current)}
                 >
-                  <Text
-                    className={
-                      Platform.OS === "android"
-                        ? "text-primary-text text-sm font-t3-medium"
-                        : "text-foreground text-2xs font-t3-bold uppercase"
-                    }
-                  >
+                  <Text className="android:text-primary-text android:text-sm android:font-t3-medium ios:text-foreground ios:text-2xs ios:font-t3-bold ios:uppercase">
                     {isEditingFiles ? "Done" : "Edit"}
                   </Text>
                 </Pressable>
@@ -226,15 +182,10 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
                     <Pressable
                       key={file.path}
                       className={cn(
-                        "px-4 py-3",
-                        Platform.OS === "android"
-                          ? included
-                            ? "rounded-xl bg-subtle"
-                            : "rounded-xl"
-                          : cn(
-                              "rounded-[18px] border",
-                              included ? "border-border" : "border-border-subtle",
-                            ),
+                        "px-4 py-3 android:rounded-xl ios:rounded-[18px] ios:border",
+                        included
+                          ? "android:bg-subtle ios:border-border"
+                          : "ios:border-border-subtle",
                       )}
                       accessibilityRole="checkbox"
                       accessibilityLabel={file.path}
@@ -303,16 +254,8 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
             )}
           </View>
 
-          <View
-            className={Platform.OS === "android" ? "gap-3 rounded-[20px] bg-card p-4" : "gap-2"}
-          >
-            <Text
-              className={
-                Platform.OS === "android"
-                  ? "text-foreground text-base font-t3-medium"
-                  : "text-foreground text-sm font-t3-bold"
-              }
-            >
+          <View className="android:gap-3 android:rounded-[20px] android:bg-card android:p-4 ios:gap-2">
+            <Text className="text-foreground android:text-base android:font-t3-medium ios:text-sm ios:font-t3-bold">
               Commit message
             </Text>
             <TextInput
@@ -322,15 +265,12 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
               onChangeText={setDialogCommitMessage}
               placeholder="Leave empty to auto-generate"
               textAlignVertical="top"
-              className={cn(
-                "min-h-[128px] px-4 py-3.5",
-                Platform.OS === "android" ? "rounded-xl bg-sheet-solid" : "rounded-[20px]",
-              )}
+              className="min-h-[128px] px-4 py-3.5 android:rounded-xl android:bg-sheet-solid ios:rounded-[20px]"
             />
           </View>
 
-          <View className={Platform.OS === "android" ? "gap-2" : "flex-row gap-3"}>
-            <View className={Platform.OS === "android" ? undefined : "flex-1"}>
+          <View className="android:gap-2 ios:flex-row ios:gap-3">
+            <View className="ios:flex-1">
               <SheetActionButton
                 icon="arrow.branch"
                 label="Commit on new branch"
@@ -338,7 +278,7 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
                 onPress={() => void runCommitAction(true)}
               />
             </View>
-            <View className={Platform.OS === "android" ? undefined : "flex-1"}>
+            <View className="ios:flex-1">
               <SheetActionButton
                 icon="checkmark.circle"
                 label="Commit"
diff --git a/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx b/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
index bc5e88f3fd68..06cce85791f6 100644
--- a/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
@@ -107,7 +107,7 @@ export function GitConfirmSheet(props: GitConfirmSheetProps) {
   return (
     <View
       collapsable={false}
-      className={Platform.OS === "android" ? "bg-sheet" : "flex-1 bg-sheet"}
+      className="bg-sheet ios:flex-1"
       style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
     >
       {Platform.OS === "android" ? (
@@ -130,49 +130,31 @@ export function GitConfirmSheet(props: GitConfirmSheetProps) {
 
       <MaterialScreenContent fitToContents>
         <ScrollView
-          className={Platform.OS === "android" ? "shrink grow-0" : "flex-1"}
+          className="android:shrink android:grow-0 ios:flex-1"
           showsVerticalScrollIndicator={false}
-          contentContainerClassName={Platform.OS === "android" ? "gap-2 p-2" : undefined}
+          contentContainerClassName="android:gap-2 android:p-2"
           contentContainerStyle={
             Platform.OS === "android"
               ? { paddingBottom: Math.max(insets.bottom, 18) + 8 }
               : undefined
           }
         >
-          <View
-            className={
-              Platform.OS === "android"
-                ? "gap-2 rounded-[20px] bg-card p-3"
-                : "items-center gap-1 px-5 pb-3 pt-4"
-            }
-          >
+          <View className="android:gap-2 android:rounded-[20px] android:bg-card android:p-3 ios:items-center ios:gap-1 ios:px-5 ios:pb-3 ios:pt-4">
             {Platform.OS !== "android" ? (
               <Text className="text-xs font-t3-bold tracking-[1px] uppercase text-foreground-muted">
                 Confirm
               </Text>
             ) : null}
-            <Text
-              className={
-                Platform.OS === "android"
-                  ? "text-xl font-t3-medium"
-                  : "text-center text-3xl font-t3-bold"
-              }
-            >
+            <Text className="android:text-xl android:font-t3-medium ios:text-center ios:text-3xl ios:font-t3-bold">
               {copy?.title ?? "Run action on default branch?"}
             </Text>
-            <Text
-              className={
-                Platform.OS === "android"
-                  ? "text-foreground-secondary text-base leading-normal"
-                  : "text-center text-foreground-secondary text-sm font-medium leading-normal"
-              }
-            >
+            <Text className="text-foreground-secondary leading-normal android:text-base ios:text-center ios:text-sm ios:font-medium">
               {copy?.description ?? "Choose how to continue."}
             </Text>
           </View>
 
           <View
-            className={Platform.OS === "android" ? "gap-2" : "gap-3 px-5 pt-2"}
+            className="android:gap-2 ios:gap-3 ios:px-5 ios:pt-2"
             style={
               Platform.OS === "android"
                 ? undefined
diff --git a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
index 7293173ecee7..831ef1145cec 100644
--- a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
@@ -234,7 +234,7 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
   const content = (
     <ScrollView
       alwaysBounceVertical
-      className={Platform.OS === "android" ? "flex-1 bg-sheet-solid" : "flex-1 bg-screen"}
+      className="flex-1 android:bg-sheet-solid ios:bg-screen"
       contentInsetAdjustmentBehavior={Platform.OS === "ios" ? "automatic" : "never"}
       showsVerticalScrollIndicator={false}
       contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
@@ -248,13 +248,9 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
       }
     >
       <View
-        className={
-          Platform.OS === "android"
-            ? "overflow-hidden rounded-[20px] bg-card"
-            : isInspector
-              ? "overflow-hidden rounded-2xl border border-border bg-card px-3 py-1"
-              : "overflow-hidden rounded-[22px] border border-border bg-card px-4 py-1"
-        }
+        className={`overflow-hidden bg-card android:rounded-[20px] ios:border ios:border-border ${
+          isInspector ? "ios:rounded-2xl ios:px-3 ios:py-1" : "ios:rounded-[22px] ios:px-4 ios:py-1"
+        }`}
       >
         {sheetMenuItems.map(({ item, disabledReason }, index) => (
           <View key={`${item.id}-${item.label}`}>
@@ -320,11 +316,7 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
           {linkedPrChains.map((chain) => (
             <View
               key={threadPullRequestKeyOf(chain.layers[0]!)}
-              className={
-                Platform.OS === "android"
-                  ? "overflow-hidden rounded-[20px] bg-card"
-                  : "overflow-hidden rounded-2xl border border-border bg-card px-3 py-1"
-              }
+              className="overflow-hidden bg-card android:rounded-[20px] ios:rounded-2xl ios:border ios:border-border ios:px-3 ios:py-1"
             >
               {chain.layers.length > 1 ? (
                 <View className="flex-row items-center gap-2 px-1 pt-2 pb-1">
@@ -483,13 +475,7 @@ export function GitOverviewSheet(props: GitOverviewSheetProps) {
       ) : null}
 
       {isInspector ? (
-        <View
-          className={
-            Platform.OS === "android"
-              ? "gap-1 bg-header px-4 pb-4 pt-3"
-              : "gap-1 border-b border-border px-4 pb-4 pt-3"
-          }
-        >
+        <View className="gap-1 px-4 pb-4 pt-3 android:bg-header ios:border-b ios:border-border">
           {Platform.OS === "android" ? (
             <View className="absolute right-3 top-4 z-[1]">{refreshMenu}</View>
           ) : (
diff --git a/apps/mobile/src/features/threads/git/gitSheetComponents.tsx b/apps/mobile/src/features/threads/git/gitSheetComponents.tsx
index daf494cb79cc..c358466e22d2 100644
--- a/apps/mobile/src/features/threads/git/gitSheetComponents.tsx
+++ b/apps/mobile/src/features/threads/git/gitSheetComponents.tsx
@@ -71,13 +71,7 @@ export function SheetActionButton(props: {
 
 export function MetaCard(props: { readonly label: string; readonly value: string }) {
   return (
-    <View
-      className={
-        Platform.OS === "android"
-          ? "rounded-[20px] bg-card px-4 py-3"
-          : "rounded-[18px] border border-border bg-card px-4 py-3"
-      }
-    >
+    <View className="bg-card px-4 py-3 android:rounded-[20px] ios:rounded-[18px] ios:border ios:border-border">
       <Text className="text-foreground-muted text-2xs font-t3-bold tracking-[0.9px] uppercase">
         {props.label}
       </Text>
@@ -97,21 +91,11 @@ export function SheetListRow(props: {
 }) {
   return (
     <Pressable
-      className={
-        Platform.OS === "android"
-          ? "min-h-16 flex-row items-center gap-4 px-4 py-3 active:bg-subtle disabled:opacity-[0.45]"
-          : "flex-row items-center gap-3 px-1 py-3 disabled:opacity-[0.45]"
-      }
+      className="flex-row items-center py-3 disabled:opacity-[0.45] android:min-h-16 android:gap-4 android:px-4 android:active:bg-subtle ios:gap-3 ios:px-1"
       disabled={props.disabled}
       onPress={props.onPress}
     >
-      <View
-        className={
-          Platform.OS === "android"
-            ? "size-6 items-center justify-center"
-            : "bg-subtle h-9 w-9 items-center justify-center rounded-full"
-        }
-      >
+      <View className="items-center justify-center android:size-6 ios:bg-subtle ios:h-9 ios:w-9 ios:rounded-full">
         <SymbolView
           name={props.icon}
           size={Platform.OS === "android" ? 24 : 16}
@@ -120,13 +104,7 @@ export function SheetListRow(props: {
         />
       </View>
       <View className="flex-1 gap-0.5">
-        <Text
-          className={
-            Platform.OS === "android"
-              ? "text-foreground text-base font-t3-medium"
-              : "text-foreground text-base font-t3-bold"
-          }
-        >
+        <Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
           {props.title}
         </Text>
         {props.subtitle ? (
diff --git a/apps/mobile/src/features/threads/new-task-context-presentation.test.ts b/apps/mobile/src/features/threads/new-task-context-presentation.test.ts
index 3c81d8231216..f48ba92396e9 100644
--- a/apps/mobile/src/features/threads/new-task-context-presentation.test.ts
+++ b/apps/mobile/src/features/threads/new-task-context-presentation.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from "vite-plus/test";
 
 import {
+  filterNewTaskBranches,
   resolveNewTaskBranchWorktreePath,
   resolveNewTaskBranchLabel,
   resolveNewTaskLocalWorkspaceSelection,
@@ -126,3 +127,26 @@ describe("resolveNewTaskBranchLabel", () => {
     ).toBe("Choose branch");
   });
 });
+
+describe("filterNewTaskBranches", () => {
+  const branches = [
+    { name: "main", isRemote: false },
+    { name: "Feature/Login-Page", isRemote: false },
+    { name: "origin/fix/remote-only", isRemote: true },
+  ];
+  const search = (query: string) =>
+    filterNewTaskBranches(branches, query).map((branch) => branch.name);
+
+  it("ignores case in both the query and the branch name", () => {
+    expect(search("feature/login")).toEqual(["Feature/Login-Page"]);
+    expect(search("MAIN")).toEqual(["main"]);
+  });
+
+  it("keeps remote-only branches searchable", () => {
+    expect(search("remote-only")).toEqual(["origin/fix/remote-only"]);
+  });
+
+  it("matches a typed space against the dash a branch name uses", () => {
+    expect(search("  login page ")).toEqual(["Feature/Login-Page"]);
+  });
+});
diff --git a/apps/mobile/src/features/threads/new-task-context-presentation.ts b/apps/mobile/src/features/threads/new-task-context-presentation.ts
index 99eee3ea48ae..87c9b2595f4f 100644
--- a/apps/mobile/src/features/threads/new-task-context-presentation.ts
+++ b/apps/mobile/src/features/threads/new-task-context-presentation.ts
@@ -1,3 +1,5 @@
+import { sanitizeNewRefName } from "@t3tools/shared/git";
+
 type WorkspaceMode = "local" | "worktree";
 
 export function resolveNewTaskWorkspaceLabel(input: {
@@ -81,3 +83,13 @@ export function shouldCheckoutNewTaskBranch(input: {
 }): boolean {
   return input.workspaceMode === "local" && !input.branchIsCurrent && !input.branchWorktreePath;
 }
+
+export function filterNewTaskBranches<T extends { readonly name: string }>(
+  branches: ReadonlyArray<T>,
+  rawQuery: string,
+): ReadonlyArray<T> {
+  const query = sanitizeNewRefName(rawQuery).toLowerCase();
+  return query.length === 0
+    ? branches
+    : branches.filter((branch) => branch.name.toLowerCase().includes(query));
+}
diff --git a/apps/mobile/src/features/threads/new-task-flow-provider.tsx b/apps/mobile/src/features/threads/new-task-flow-provider.tsx
index f2801255b3bc..61b77afffba1 100644
--- a/apps/mobile/src/features/threads/new-task-flow-provider.tsx
+++ b/apps/mobile/src/features/threads/new-task-flow-provider.tsx
@@ -18,6 +18,7 @@ import {
   T3_PROJECT_FILE_NAME,
   ThreadId,
 } from "@t3tools/contracts";
+import { sanitizeNewRefName } from "@t3tools/shared/git";
 import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
 import { parseT3ProjectFile } from "@t3tools/shared/t3ProjectFile";
 import * as Arr from "effect/Array";
@@ -89,9 +90,10 @@ import { useMobileProjectGroupingSettings } from "../../state/project-grouping";
 import {
   resolvePendingTaskInteractionMode,
   resolveProviderInteractionMode,
-} from "./legacy-plan-mode";
+} from "../../state/legacy-plan-mode";
 import { useLegacyPlanModeState } from "./use-legacy-plan-mode-enabled";
 import {
+  filterNewTaskBranches,
   resolveNewTaskBranchWorktreePath,
   resolveNewTaskLocalWorkspaceSelection,
 } from "./new-task-context-presentation";
@@ -129,6 +131,9 @@ export function branchBadgeLabel(input: {
   if (input.branch.worktreePath && input.branch.worktreePath !== input.project?.workspaceRoot) {
     return "worktree";
   }
+  if (input.branch.isRemote) {
+    return "remote";
+  }
   if (input.branch.isDefault) {
     return "default";
   }
@@ -626,7 +631,8 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
     }
     replaceComposerDraftAttachments(selectedProjectDraftKey, []);
   }, [selectedProjectDraftKey]);
-  const debouncedBranchQuery = useDebouncedValue(branchQuery, BRANCH_SEARCH_DEBOUNCE_MS);
+  const branchSearchQuery = sanitizeNewRefName(branchQuery);
+  const debouncedBranchQuery = useDebouncedValue(branchSearchQuery, BRANCH_SEARCH_DEBOUNCE_MS);
   const branchTarget = useMemo(
     () => ({
       environmentId: selectedProject?.environmentId ?? null,
@@ -637,7 +643,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
     [debouncedBranchQuery, selectedProject?.environmentId, selectedProject?.workspaceRoot],
   );
   const branchState = usePaginatedBranches(branchTarget);
-  const branchSearchIsDebouncing = branchQuery.trim() !== debouncedBranchQuery.trim();
+  const branchSearchIsDebouncing = branchSearchQuery !== debouncedBranchQuery;
   const branchesLoading =
     branchSearchIsDebouncing || (branchState.isPending && branchState.data === null);
   const branchesFetchingNextPage = branchState.isFetchingNextPage;
@@ -669,17 +675,10 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
   );
   const currentCheckoutBranchName = projectGitStatus.data?.refName ?? null;
 
-  const filteredBranches = useMemo(() => {
-    const query = branchQuery.trim().toLowerCase();
-    if (query.length === 0) {
-      return availableBranches;
-    }
-
-    return pipe(
-      availableBranches,
-      Arr.filter((branch) => branch.name.toLowerCase().includes(query)),
-    );
-  }, [availableBranches, branchQuery]);
+  const filteredBranches = useMemo(
+    () => filterNewTaskBranches(allBranchRefs, branchQuery),
+    [allBranchRefs, branchQuery],
+  );
 
   // The composer's draft follows the project it will be sent to: switching
   // mid-compose keeps the same draft and moves it, so typed text follows the
diff --git a/apps/mobile/src/features/threads/sidebar-native-header-items.ts b/apps/mobile/src/features/threads/sidebar-native-header-items.ts
index b80fffda057d..1f9297f47258 100644
--- a/apps/mobile/src/features/threads/sidebar-native-header-items.ts
+++ b/apps/mobile/src/features/threads/sidebar-native-header-items.ts
@@ -45,7 +45,7 @@ export function createSidebarHeaderItems(input: {
     withNativeGlassHeaderItem({
       type: "menu",
       label: "",
-      accessibilityLabel: "Filter and sort threads",
+      accessibilityLabel: "Filter threads",
       icon: sfSymbolIcon(input.filterIcon),
       menu: {
         title: input.filterMenu.title,
diff --git a/apps/mobile/src/features/threads/thread-inspector-content-stack.tsx b/apps/mobile/src/features/threads/thread-inspector-content-stack.tsx
index 9b41ed4e362a..5a1601b0e5ae 100644
--- a/apps/mobile/src/features/threads/thread-inspector-content-stack.tsx
+++ b/apps/mobile/src/features/threads/thread-inspector-content-stack.tsx
@@ -1,6 +1,8 @@
 import { useEffect, useState, type ComponentType, type ReactNode } from "react";
 import { View } from "react-native";
 
+import { RenderErrorBoundary, RenderFailureView } from "../../components/RenderErrorBoundary";
+
 export type ThreadInspectorMode = "route" | "git" | "files";
 
 const INSPECTOR_PREWARM_DELAY_MS = 350;
@@ -8,6 +10,7 @@ const INSPECTOR_PREWARM_DELAY_MS = 350;
 function InspectorContentPane(props: {
   readonly children: ReactNode;
   readonly mounted: boolean;
+  readonly resetKeys: readonly [string | null, string | null];
   readonly visible: boolean;
 }) {
   if (!props.mounted) {
@@ -27,7 +30,14 @@ function InspectorContentPane(props: {
         zIndex: props.visible ? 1 : 0,
       }}
     >
-      {props.children}
+      <RenderErrorBoundary
+        resetKeys={props.resetKeys}
+        renderFallback={(fallback) => (
+          <RenderFailureView {...fallback} title="The inspector couldn't be displayed" />
+        )}
+      >
+        {props.children}
+      </RenderErrorBoundary>
     </View>
   );
 }
@@ -36,6 +46,7 @@ export function ThreadInspectorContentStack(props: {
   readonly Files: ComponentType;
   readonly Git: ComponentType;
   readonly mode: ThreadInspectorMode;
+  readonly resetKeys: readonly [string | null, string | null];
   readonly Route?: ComponentType;
 }) {
   const [mountedModes, setMountedModes] = useState<ReadonlySet<ThreadInspectorMode>>(
@@ -78,12 +89,14 @@ export function ThreadInspectorContentStack(props: {
     <View className="flex-1">
       <InspectorContentPane
         mounted={mountedModes.has("files") || props.mode === "files"}
+        resetKeys={props.resetKeys}
         visible={props.mode === "files"}
       >
         <Files />
       </InspectorContentPane>
       <InspectorContentPane
         mounted={mountedModes.has("git") || props.mode === "git"}
+        resetKeys={props.resetKeys}
         visible={props.mode === "git"}
       >
         <Git />
@@ -91,6 +104,7 @@ export function ThreadInspectorContentStack(props: {
       {Route ? (
         <InspectorContentPane
           mounted={mountedModes.has("route") || props.mode === "route"}
+          resetKeys={props.resetKeys}
           visible={props.mode === "route"}
         >
           <Route />
diff --git a/apps/mobile/src/features/threads/thread-list-items.tsx b/apps/mobile/src/features/threads/thread-list-items.tsx
deleted file mode 100644
index 04d30a26a901..000000000000
--- a/apps/mobile/src/features/threads/thread-list-items.tsx
+++ /dev/null
@@ -1,849 +0,0 @@
-import type {
-  EnvironmentProject,
-  EnvironmentThreadShell,
-} from "@t3tools/client-runtime/state/shell";
-import type { EnvironmentThreadSearchMatch } from "@t3tools/client-runtime/state/thread-search";
-import type { EnvironmentMachineKind } from "@t3tools/contracts";
-import type { MenuAction } from "@react-native-menu/menu";
-import { SymbolView } from "../../components/AppSymbol";
-import { memo, useCallback, useMemo, type ComponentProps } from "react";
-import { Platform, Pressable, useWindowDimensions, View } from "react-native";
-import type { SwipeableMethods } from "react-native-gesture-handler/ReanimatedSwipeable";
-import { useAppearancePreferences } from "../settings/appearance/AppearancePreferencesProvider";
-import Svg, { Circle, Path } from "react-native-svg";
-
-import { RowPressable } from "../../components/RowPressable";
-import { AppText as Text } from "../../components/AppText";
-import { ControlPillMenu } from "../../components/ControlPill";
-import { EnvironmentMachineSymbol } from "../../components/EnvironmentMachineSymbol";
-import { ProjectFavicon } from "../../components/ProjectFavicon";
-import { cn } from "../../lib/cn";
-import { copyTextWithHaptic } from "../../lib/copyTextWithHaptic";
-import { HOME_HORIZONTAL_INSET } from "../../lib/layoutMetrics";
-import { relativeTime } from "../../lib/time";
-import { useUniwindTheme } from "../../lib/useUniwindTheme";
-import type { PendingNewTask } from "../../state/use-pending-new-tasks";
-import { useThreadPr, type ThreadPrPresentation } from "../../state/use-thread-pr";
-import type { HomeGroupDisplayAction } from "../home/homeListItems";
-import { ThreadSwipeable } from "../home/thread-swipe-actions";
-import { buildThreadTitleRegenerationMenuItems } from "./thread-title-regeneration-menu";
-import { QueuedMessageIcon } from "./queued-message-icon";
-import { resolveThreadStatus } from "./threadPresentation";
-import { ThreadSearchMatchExcerpt } from "./thread-search-match";
-
-/**
- * Shared presentation for the thread lists: the compact (phone) Home list and
- * the iPad sidebar render the SAME items — group headers with collapse,
- * thread rows with status/PR/subtitle, and show-more rows — differing only in
- * metrics and chrome via `variant`.
- */
-export type ThreadListVariant = "compact" | "sidebar";
-
-/** Left inset that aligns compact secondary rows with the title column. */
-export const THREAD_LIST_COMPACT_INSET = HOME_HORIZONTAL_INSET;
-const SIDEBAR_ROW_RADIUS = 12;
-
-function pullRequestTintColor(
-  pr: Pick<ThreadPrPresentation, "state" | "isDraft" | "others" | "kind">,
-  colorScheme: "light" | "dark",
-) {
-  const dark = colorScheme === "dark";
-  if (pr.state === "open" && pr.isDraft === true) {
-    return dark ? "#a1a1aa" : "#71717a";
-  }
-  switch (pr.state) {
-    case "open":
-      return dark ? "#34d399" : "#059669";
-    case "merged":
-      return dark ? "#a78bfa" : "#7c3aed";
-    case "closed":
-      if (pr.kind === "stack" || pr.others > 0) {
-        return dark ? "#fb7185" : "#e11d48";
-      }
-      return dark ? "#a1a1aa" : "#71717a";
-    case null:
-      return dark ? "#a1a1aa" : "#71717a";
-  }
-}
-
-function PullRequestIcon(props: { readonly size: number; readonly color: string }) {
-  return (
-    <Svg
-      width={props.size}
-      height={props.size}
-      viewBox="0 0 24 24"
-      fill="none"
-      stroke={props.color}
-      strokeWidth={2}
-      strokeLinecap="round"
-      strokeLinejoin="round"
-    >
-      <Circle cx={18} cy={18} r={3} />
-      <Circle cx={6} cy={6} r={3} />
-      <Path d="M13 6h3a2 2 0 0 1 2 2v7" />
-      <Path d="M6 9v12" />
-    </Svg>
-  );
-}
-
-/* ─── Project group header ───────────────────────────────────────────── */
-
-export const ThreadListGroupHeader = memo(function ThreadListGroupHeader(props: {
-  readonly variant: ThreadListVariant;
-  readonly project: EnvironmentProject;
-  readonly title: string;
-  readonly threadCount: number;
-  readonly collapsed: boolean;
-  readonly isFirst: boolean;
-  readonly groupKey: string;
-  readonly onGroupAction: (key: string, action: HomeGroupDisplayAction) => void;
-  /** Project a quick new thread should target; null hides the button. */
-  readonly newThreadTarget?: EnvironmentProject | null;
-  readonly onNewThread?: (project: EnvironmentProject) => void;
-}) {
-  const { groupKey, onGroupAction, onNewThread } = props;
-  const newThreadTarget = props.newThreadTarget ?? null;
-  const compact = props.variant === "compact";
-  const handleToggle = useCallback(
-    () => onGroupAction(groupKey, "toggle-collapsed"),
-    [groupKey, onGroupAction],
-  );
-  const handleNewThread = useCallback(() => {
-    if (newThreadTarget) {
-      onNewThread?.(newThreadTarget);
-    }
-  }, [newThreadTarget, onNewThread]);
-  const showNewThreadButton = onNewThread !== undefined && newThreadTarget !== null;
-
-  // The new-thread button is a SIBLING of the collapse toggle, not a child:
-  // nested touchables are unreachable to VoiceOver/TalkBack (the parent
-  // swallows focus). Row padding lives on the container (explicit styles —
-  // dynamic padding classes on Pressable did not apply reliably) so both
-  // children share one centerline; hitSlop restores the padded tap area.
-  const verticalHitSlop = { top: props.isFirst ? 8 : 24, bottom: 12 };
-  return (
-    <View
-      className={compact ? "flex-row items-center bg-screen" : "flex-row items-center"}
-      style={{
-        minHeight: compact ? 44 : 36,
-        paddingLeft: compact ? 20 : 12,
-        // Compact right padding centers the 20pt plus glyph on the thread
-        // rows' trailing chevron column (18 + 13/2 ≈ 24.5 from the edge).
-        paddingRight: compact ? 14 : 12,
-        paddingBottom: compact ? 12 : 8,
-        paddingTop: props.isFirst ? (compact ? 8 : 4) : compact ? 24 : 20,
-      }}
-    >
-      <Pressable
-        accessibilityRole="button"
-        accessibilityState={{ expanded: !props.collapsed }}
-        accessibilityLabel={`${props.title}, ${props.threadCount} threads`}
-        accessibilityHint={props.collapsed ? "Expands the project" : "Collapses the project"}
-        className={
-          compact ? "flex-1 flex-row items-center gap-2.5" : "flex-1 flex-row items-center gap-2"
-        }
-        hitSlop={{ ...verticalHitSlop, left: compact ? 20 : 12 }}
-        onPress={handleToggle}
-      >
-        <ProjectFavicon
-          environmentId={props.project.environmentId}
-          faviconPath={props.project.faviconPath}
-          open={!props.collapsed}
-          size={compact ? 22 : 18}
-          projectTitle={props.project.title}
-          workspaceRoot={props.project.workspaceRoot}
-        />
-        <Text
-          className={
-            compact
-              ? "flex-shrink text-base font-t3-bold tracking-[0.2px] text-foreground-muted"
-              : "flex-shrink text-sm font-t3-bold tracking-[0.2px] text-drawer-foreground-muted"
-          }
-          numberOfLines={1}
-        >
-          {props.title}
-        </Text>
-        <Text
-          className={
-            compact
-              ? "flex-1 text-sm font-t3-medium text-foreground-tertiary"
-              : "flex-1 text-xs font-t3-medium text-drawer-foreground-muted"
-          }
-        >
-          {props.threadCount}
-        </Text>
-      </Pressable>
-      {showNewThreadButton ? (
-        <Pressable
-          accessibilityLabel={`Create new thread in ${props.title}`}
-          accessibilityRole="button"
-          hitSlop={{ ...verticalHitSlop, left: 10, right: 14 }}
-          onPress={handleNewThread}
-          style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1, paddingLeft: 12 })}
-        >
-          <SymbolView
-            name="plus"
-            size={compact ? 20 : 16}
-            tintColorClassName="accent-icon-muted"
-            type="monochrome"
-            weight="medium"
-          />
-        </Pressable>
-      ) : null}
-    </View>
-  );
-});
-
-/* ─── Show more / show less row ──────────────────────────────────────── */
-
-export const ThreadListShowMoreRow = memo(function ThreadListShowMoreRow(props: {
-  readonly variant: ThreadListVariant;
-  readonly hiddenCount: number;
-  readonly canShowLess: boolean;
-  readonly groupKey: string;
-  readonly onGroupAction: (key: string, action: HomeGroupDisplayAction) => void;
-}) {
-  const showsMore = props.hiddenCount > 0;
-  const compact = props.variant === "compact";
-  const { groupKey, onGroupAction } = props;
-  const handleShowMore = useCallback(
-    () => onGroupAction(groupKey, "show-more"),
-    [groupKey, onGroupAction],
-  );
-  const handleShowLess = useCallback(
-    () => onGroupAction(groupKey, "show-less"),
-    [groupKey, onGroupAction],
-  );
-
-  const button = (label: string, icon: "chevron.down" | "chevron.up", onPress: () => void) => (
-    <Pressable
-      accessibilityRole="button"
-      accessibilityLabel={label === "Show more" ? "Show more threads" : "Show fewer threads"}
-      className="rounded-full bg-subtle"
-      hitSlop={6}
-      onPress={onPress}
-      style={({ pressed }) => ({
-        opacity: pressed ? 0.6 : 1,
-        paddingHorizontal: compact ? 14 : 12,
-        paddingVertical: compact ? 7 : 6,
-        borderCurve: "continuous",
-      })}
-    >
-      <View className="flex-row items-center gap-1.5">
-        <SymbolView
-          name={icon}
-          size={10}
-          tintColorClassName="accent-icon-subtle"
-          type="monochrome"
-          weight="semibold"
-        />
-        <Text
-          className={
-            compact
-              ? "text-sm font-t3-medium text-foreground-muted"
-              : "text-xs font-t3-medium text-drawer-foreground-muted"
-          }
-        >
-          {label}
-        </Text>
-      </View>
-    </Pressable>
-  );
-
-  return (
-    <View
-      className={
-        compact ? "flex-row items-center gap-2.5 bg-screen" : "flex-row items-center gap-2"
-      }
-      style={{
-        paddingLeft: compact ? THREAD_LIST_COMPACT_INSET : 12,
-        paddingRight: compact ? 18 : 12,
-        paddingVertical: compact ? 12 : 8,
-      }}
-    >
-      {showsMore ? button("Show more", "chevron.down", handleShowMore) : null}
-      {props.canShowLess ? button("Show less", "chevron.up", handleShowLess) : null}
-    </View>
-  );
-});
-
-/* ─── Pending task row ───────────────────────────────────────────────── */
-
-const PENDING_TASK_MENU_ACTIONS: MenuAction[] = [
-  { id: "delete", title: "Delete", image: "trash", attributes: { destructive: true } },
-];
-
-const DRAFT_TASK_MENU_ACTIONS: MenuAction[] = [
-  { id: "delete", title: "Discard", image: "trash", attributes: { destructive: true } },
-];
-
-/**
- * Unsent work: a task queued in the outbox for its environment to reconnect,
- * or a draft still sitting in the project's new-task composer. Tapping
- * reopens the composer with everything prefilled; the row disappears once
- * the work is sent and the real thread arrives. The two kinds differ in what
- * happens next, so the pill and icon say which one this is: a queued task
- * sends itself, a draft waits for the user.
- */
-export const PendingTaskListRow = memo(function PendingTaskListRow(props: {
-  readonly variant: ThreadListVariant;
-  readonly pendingTask: PendingNewTask;
-  readonly environmentLabel: string | null;
-  readonly environmentMachine?: EnvironmentMachineKind;
-  readonly isLast: boolean;
-  readonly onSelectPendingTask: (pendingTask: PendingNewTask) => void;
-  readonly onDeletePendingTask: (pendingTask: PendingNewTask) => void;
-}) {
-  const compact = props.variant === "compact";
-
-  const { pendingTask, onSelectPendingTask, onDeletePendingTask } = props;
-  const isDraft = pendingTask.kind === "draft";
-  const timestamp = isDraft ? null : relativeTime(pendingTask.createdAt);
-  // The pill only has room for one word, so what happens next goes in the
-  // subtitle: a queued task sends itself, a draft waits for the user.
-  const subtitleParts = [
-    isDraft ? null : "Sends on reconnect",
-    props.environmentLabel,
-    pendingTask.branch,
-  ].filter((part): part is string => Boolean(part));
-
-  const handleMenuAction = useCallback(
-    ({ nativeEvent }: { readonly nativeEvent: { readonly event: string } }) => {
-      if (nativeEvent.event === "delete") onDeletePendingTask(pendingTask);
-    },
-    [onDeletePendingTask, pendingTask],
-  );
-
-  const statusPill = isDraft ? (
-    <View className="rounded-full bg-adaptive-amber-500-a12-a16 px-1.5 py-0.5">
-      <Text className="text-3xs font-t3-bold text-adaptive-amber-700-300">Draft</Text>
-    </View>
-  ) : (
-    <View className="rounded-full bg-subtle px-1.5 py-0.5">
-      <Text
-        className={cn(
-          "text-3xs font-t3-bold text-foreground-muted",
-          !compact && "text-drawer-foreground-muted",
-        )}
-      >
-        Pending
-      </Text>
-    </View>
-  );
-
-  const subtitleRow =
-    subtitleParts.length > 0 ? (
-      <View className="mt-px flex-row items-center gap-1.5">
-        <SymbolView
-          name={isDraft ? "square.and.pencil" : "tray.and.arrow.up"}
-          size={10}
-          tintColorClassName={compact ? "accent-icon-subtle" : "accent-drawer-foreground-muted"}
-          type="monochrome"
-        />
-        {props.environmentLabel && props.environmentMachine ? (
-          <EnvironmentMachineSymbol
-            kind={props.environmentMachine}
-            size={compact ? 12 : 10}
-            tintColorClassName={compact ? "accent-icon-subtle" : "accent-drawer-foreground-muted"}
-          />
-        ) : null}
-        <Text
-          className={
-            compact
-              ? "shrink text-sm text-foreground-muted"
-              : "shrink text-xs text-drawer-foreground-muted"
-          }
-          numberOfLines={1}
-        >
-          {subtitleParts.join(" · ")}
-        </Text>
-      </View>
-    ) : null;
-
-  const accessibilityHint = isDraft
-    ? "Opens the draft in the new task composer"
-    : "Sends when the environment reconnects. Opens the task for editing";
-
-  const rowContent = compact ? (
-    <RowPressable
-      key={pendingTask.key}
-      accessibilityHint={accessibilityHint}
-      accessibilityLabel={pendingTask.title}
-      accessibilityRole="button"
-      className="bg-screen"
-      onPress={() => onSelectPendingTask(pendingTask)}
-    >
-      <View className="pr-[18px] pt-[10px]" style={{ paddingLeft: THREAD_LIST_COMPACT_INSET }}>
-        <View className={cn("gap-[3px] pb-[10px]", !props.isLast && "border-b border-separator")}>
-          <View className="flex-row items-center justify-between gap-2">
-            <Text
-              className={cn(
-                "flex-1 text-lg font-t3-bold text-foreground",
-                !compact && "text-drawer-foreground",
-              )}
-              numberOfLines={1}
-            >
-              {pendingTask.title}
-            </Text>
-            <View className="flex-row items-center gap-2">
-              {statusPill}
-              {timestamp !== null ? (
-                <Text
-                  className={cn(
-                    "text-base tabular-nums text-foreground-tertiary",
-                    !compact && "text-drawer-foreground-muted",
-                  )}
-                >
-                  {timestamp}
-                </Text>
-              ) : null}
-              <SymbolView
-                name="chevron.right"
-                size={13}
-                tintColorClassName="accent-icon-subtle"
-                type="monochrome"
-              />
-            </View>
-          </View>
-          {subtitleRow}
-        </View>
-      </View>
-    </RowPressable>
-  ) : (
-    <RowPressable
-      key={pendingTask.key}
-      accessibilityHint={accessibilityHint}
-      accessibilityLabel={pendingTask.title}
-      accessibilityRole="button"
-      interactionClassName="bg-thread-hover"
-      onPress={() => onSelectPendingTask(pendingTask)}
-      style={{
-        borderRadius: SIDEBAR_ROW_RADIUS,
-        minHeight: 64,
-        justifyContent: "center",
-        paddingHorizontal: 12,
-        paddingVertical: 10,
-      }}
-    >
-      <View className="gap-[3px]">
-        <View className="flex-row items-center justify-between gap-2">
-          <Text
-            className="flex-1 text-base font-t3-medium text-drawer-foreground"
-            numberOfLines={1}
-          >
-            {pendingTask.title}
-          </Text>
-          <View className="flex-row items-center gap-2">
-            {statusPill}
-            {timestamp !== null ? (
-              <Text
-                className={cn(
-                  "text-xs tabular-nums text-foreground-muted",
-                  !compact && "text-drawer-foreground-muted",
-                )}
-                numberOfLines={1}
-              >
-                {timestamp}
-              </Text>
-            ) : null}
-          </View>
-        </View>
-        {subtitleRow}
-      </View>
-    </RowPressable>
-  );
-
-  return (
-    <ControlPillMenu
-      actions={isDraft ? DRAFT_TASK_MENU_ACTIONS : PENDING_TASK_MENU_ACTIONS}
-      onPressAction={handleMenuAction}
-      shouldOpenOnLongPress
-    >
-      {rowContent}
-    </ControlPillMenu>
-  );
-});
-
-/* ─── Thread row ─────────────────────────────────────────────────────── */
-
-const THREAD_ROW_MENU_ACTIONS: MenuAction[] = [
-  { id: "archive", title: "Archive", image: "archivebox" },
-  { id: "rename", title: "Rename", image: "square.and.pencil" },
-  { id: "delete", title: "Delete", image: "trash", attributes: { destructive: true } },
-];
-
-export const ThreadListRow = memo(function ThreadListRow(props: {
-  readonly variant: ThreadListVariant;
-  readonly thread: EnvironmentThreadShell;
-  readonly environmentLabel: string | null;
-  readonly environmentMachine?: EnvironmentMachineKind;
-  /** A message for this thread is waiting in the outbox. */
-  readonly hasQueuedMessages?: boolean;
-  readonly searchMatch?: EnvironmentThreadSearchMatch;
-  readonly searchQuery?: string;
-  readonly isLast: boolean;
-  /** Sidebar only: the thread currently open in the detail pane. */
-  readonly selected?: boolean;
-  /** Defaults to window width minus compact margins. */
-  readonly fullSwipeWidth?: number;
-  readonly onSelectThread: (thread: EnvironmentThreadShell) => void;
-  readonly onArchiveThread: (thread: EnvironmentThreadShell) => void;
-  readonly onDeleteThread: (thread: EnvironmentThreadShell) => void;
-  readonly onNewThreadOnBranch: (thread: EnvironmentThreadShell) => void;
-  readonly onRenameThread: (thread: EnvironmentThreadShell) => void;
-  readonly onRegenerateThreadTitle: (thread: EnvironmentThreadShell) => void;
-  readonly titleRegenerationSupported: boolean;
-  readonly onSwipeableWillOpen: (methods: SwipeableMethods) => void;
-  readonly onSwipeableClose: (methods: SwipeableMethods) => void;
-  readonly simultaneousSwipeGesture?: ComponentProps<
-    typeof ThreadSwipeable
-  >["simultaneousWithExternalGesture"];
-}) {
-  const { width: windowWidth } = useWindowDimensions();
-  const { themeAppearance: colorScheme } = useAppearancePreferences();
-  const compact = props.variant === "compact";
-  const selected = props.selected === true;
-  const visuallySelected = selected && (!compact || Platform.OS === "android");
-  const theme = useUniwindTheme();
-  const screenColor = theme["--color-screen"];
-  const drawerColor = theme["--color-drawer"];
-  const selectedBackgroundColor = theme["--color-thread-selected"];
-
-  const {
-    thread,
-    onSelectThread,
-    onArchiveThread,
-    onDeleteThread,
-    onRenameThread,
-    onRegenerateThreadTitle,
-    onNewThreadOnBranch,
-  } = props;
-  const status = resolveThreadStatus(thread);
-  const pr = useThreadPr(thread);
-  const timestamp = relativeTime(
-    thread.latestUserMessageAt ?? thread.updatedAt ?? thread.createdAt,
-  );
-  const threadAccessibilityLabel = [
-    thread.title,
-    pr?.accessibilityLabel,
-    props.hasQueuedMessages ? "messages queued to send" : null,
-  ]
-    .filter(Boolean)
-    .join(", ");
-  const subtitleParts = [props.environmentLabel, thread.branch].filter((part): part is string =>
-    Boolean(part),
-  );
-
-  const backgroundColor = compact ? screenColor : drawerColor;
-
-  const handleDelete = useCallback(() => onDeleteThread(thread), [onDeleteThread, thread]);
-  const handleArchive = useCallback(() => onArchiveThread(thread), [onArchiveThread, thread]);
-  const handleRename = useCallback(() => onRenameThread(thread), [onRenameThread, thread]);
-  const handleRegenerateTitle = useCallback(
-    () => onRegenerateThreadTitle(thread),
-    [onRegenerateThreadTitle, thread],
-  );
-  const menuActions = useMemo<MenuAction[]>(
-    () => [
-      ...(thread.branch
-        ? [
-            {
-              id: "new-thread-on-branch",
-              title:
-                Platform.OS === "ios" ? "New thread on branch" : `New thread on ${thread.branch}`,
-              image: "square.and.pencil",
-            },
-          ]
-        : []),
-      THREAD_ROW_MENU_ACTIONS[0]!,
-      THREAD_ROW_MENU_ACTIONS[1]!,
-      { id: "copy-thread-id", title: "Copy thread ID", image: "doc.on.doc" },
-      ...buildThreadTitleRegenerationMenuItems({
-        supported: props.titleRegenerationSupported,
-        isRegenerating: thread.titleRegeneration != null,
-      }),
-      THREAD_ROW_MENU_ACTIONS[2]!,
-    ],
-    [props.titleRegenerationSupported, thread.branch, thread.titleRegeneration],
-  );
-  const primaryAction = useMemo(
-    () => ({
-      accessibilityLabel: `Archive ${thread.title}`,
-      icon: "archivebox" as const,
-      label: "Archive",
-      onPress: handleArchive,
-    }),
-    [handleArchive, thread.title],
-  );
-  const handleMenuAction = useCallback(
-    ({ nativeEvent }: { readonly nativeEvent: { readonly event: string } }) => {
-      if (nativeEvent.event === "new-thread-on-branch") onNewThreadOnBranch(thread);
-      if (nativeEvent.event === "archive") handleArchive();
-      if (nativeEvent.event === "rename") handleRename();
-      if (nativeEvent.event === "copy-thread-id") {
-        copyTextWithHaptic(thread.id, { target: "thread-id" });
-      }
-      if (nativeEvent.event === "regenerate-title") handleRegenerateTitle();
-      if (nativeEvent.event === "delete") handleDelete();
-    },
-    [handleArchive, handleDelete, handleRegenerateTitle, handleRename, onNewThreadOnBranch, thread],
-  );
-
-  const statusPill = status ? (
-    <View className={`${status.pillClassName} rounded-full px-1.5 py-0.5`}>
-      <Text className={`text-3xs font-t3-bold ${status.textClassName}`}>{status.label}</Text>
-    </View>
-  ) : null;
-
-  const subtitleRow =
-    subtitleParts.length > 0 || pr !== null ? (
-      <View className="mt-px flex-row items-center gap-1.5">
-        {subtitleParts.length > 0 ? (
-          <>
-            {props.environmentLabel && props.environmentMachine ? (
-              <EnvironmentMachineSymbol
-                kind={props.environmentMachine}
-                size={compact ? 12 : 10}
-                tintColorClassName={
-                  compact
-                    ? "accent-icon-subtle"
-                    : selected
-                      ? "accent-thread-selected-foreground-muted"
-                      : "accent-drawer-foreground-muted"
-                }
-              />
-            ) : null}
-            <Text
-              className={cn(
-                "shrink",
-                compact ? "text-sm" : "text-xs",
-                visuallySelected
-                  ? "text-thread-selected-foreground-muted"
-                  : compact
-                    ? "text-foreground-muted"
-                    : "text-drawer-foreground-muted",
-              )}
-              numberOfLines={1}
-            >
-              {subtitleParts.join(" · ")}
-            </Text>
-          </>
-        ) : null}
-        {pr !== null ? (
-          <View
-            className="flex-row items-center gap-0.5"
-            accessibilityLabel={pr.accessibilityLabel}
-          >
-            {pr.kind === "stack" ? (
-              <SymbolView
-                name="square.3.layers.3d"
-                size={compact ? 13 : 11}
-                tintColor={pullRequestTintColor(pr, colorScheme)}
-              />
-            ) : (
-              <PullRequestIcon
-                size={compact ? 13 : 11}
-                color={pullRequestTintColor(pr, colorScheme)}
-              />
-            )}
-            <Text
-              className={`${compact ? "text-sm" : "text-xs"} font-t3-medium ${pr.textClassName}`}
-            >
-              {pr.label}
-            </Text>
-          </View>
-        ) : null}
-      </View>
-    ) : null;
-
-  const rowContent = (close: () => void) =>
-    compact ? (
-      <RowPressable
-        key={`${thread.environmentId}:${thread.id}`}
-        interactionClassName="bg-row-hover"
-        interactionOpacity={visuallySelected ? 0 : 1}
-        accessibilityHint="Swipe left for archive and delete actions"
-        accessibilityLabel={threadAccessibilityLabel}
-        accessibilityRole="button"
-        className="bg-screen"
-        style={
-          Platform.OS === "android"
-            ? {
-                backgroundColor: visuallySelected ? selectedBackgroundColor : backgroundColor,
-                borderRadius: 20,
-              }
-            : undefined
-        }
-        onPress={() => {
-          close();
-          onSelectThread(thread);
-        }}
-      >
-        <View className="pr-[18px] pt-[10px]" style={{ paddingLeft: THREAD_LIST_COMPACT_INSET }}>
-          <View
-            className={cn(
-              "gap-[3px] pb-[10px]",
-              Platform.OS !== "android" && !props.isLast && "border-b border-separator",
-            )}
-          >
-            <View className="flex-row items-center justify-between gap-2">
-              <Text
-                className={cn(
-                  "flex-1 text-lg font-t3-bold",
-                  visuallySelected
-                    ? "text-thread-selected-foreground"
-                    : compact
-                      ? "text-foreground"
-                      : "text-drawer-foreground",
-                )}
-                numberOfLines={1}
-              >
-                {thread.title}
-              </Text>
-              <View className="flex-row items-center gap-2">
-                {props.hasQueuedMessages ? (
-                  <QueuedMessageIcon selected={visuallySelected && Platform.OS !== "android"} />
-                ) : null}
-                {statusPill}
-                <Text
-                  className={cn(
-                    "text-base tabular-nums",
-                    visuallySelected
-                      ? "text-thread-selected-foreground-muted"
-                      : "text-drawer-foreground-muted",
-                  )}
-                >
-                  {timestamp}
-                </Text>
-                <SymbolView
-                  name="chevron.right"
-                  size={13}
-                  tintColorClassName="accent-icon-subtle"
-                  type="monochrome"
-                />
-              </View>
-            </View>
-            {props.searchMatch ? (
-              <ThreadSearchMatchExcerpt
-                compact
-                sidebar={!compact}
-                match={props.searchMatch}
-                query={props.searchQuery ?? ""}
-                selected={visuallySelected}
-              />
-            ) : null}
-            {subtitleRow}
-          </View>
-        </View>
-      </RowPressable>
-    ) : (
-      <RowPressable
-        key={`${thread.environmentId}:${thread.id}`}
-        interactionClassName="bg-thread-hover"
-        interactionOpacity={visuallySelected ? 0 : 1}
-        accessibilityHint="Opens the thread"
-        accessibilityLabel={threadAccessibilityLabel}
-        accessibilityRole="button"
-        accessibilityState={{ selected }}
-        onPress={() => {
-          close();
-          onSelectThread(thread);
-        }}
-        style={{
-          backgroundColor: visuallySelected ? selectedBackgroundColor : backgroundColor,
-          borderRadius: Platform.OS === "android" ? 20 : SIDEBAR_ROW_RADIUS,
-          minHeight: 64,
-          justifyContent: "center",
-          paddingHorizontal: 12,
-          paddingVertical: 10,
-        }}
-      >
-        <View className="gap-[3px]">
-          <View className="flex-row items-center justify-between gap-2">
-            <Text
-              className={cn(
-                "flex-1 text-base font-t3-medium",
-                visuallySelected
-                  ? "text-thread-selected-foreground"
-                  : compact
-                    ? "text-foreground"
-                    : "text-drawer-foreground",
-              )}
-              numberOfLines={1}
-            >
-              {thread.title}
-            </Text>
-            <View className="flex-row items-center gap-2">
-              {props.hasQueuedMessages ? (
-                <QueuedMessageIcon selected={visuallySelected && Platform.OS !== "android"} />
-              ) : null}
-              {statusPill}
-              <Text
-                className={cn(
-                  "text-xs tabular-nums",
-                  visuallySelected
-                    ? "text-thread-selected-foreground-muted"
-                    : compact
-                      ? "text-foreground-muted"
-                      : "text-drawer-foreground-muted",
-                )}
-                numberOfLines={1}
-              >
-                {timestamp}
-              </Text>
-            </View>
-          </View>
-          {props.searchMatch ? (
-            <ThreadSearchMatchExcerpt
-              sidebar={!compact}
-              match={props.searchMatch}
-              query={props.searchQuery ?? ""}
-              selected={visuallySelected}
-            />
-          ) : null}
-          {subtitleRow}
-        </View>
-      </RowPressable>
-    );
-
-  return (
-    <ThreadSwipeable
-      threadKey={`${thread.environmentId}:${thread.id}`}
-      backgroundColor={backgroundColor}
-      containerStyle={
-        Platform.OS === "android"
-          ? { borderRadius: 20, overflow: "hidden", marginHorizontal: 8, marginVertical: 2 }
-          : compact
-            ? undefined
-            : { borderRadius: SIDEBAR_ROW_RADIUS, overflow: "hidden" }
-      }
-      enableTrackpadSwipe
-      fullSwipeWidth={props.fullSwipeWidth ?? windowWidth - 32}
-      onDelete={handleDelete}
-      onSwipeableClose={props.onSwipeableClose}
-      onSwipeableWillOpen={props.onSwipeableWillOpen}
-      primaryAction={primaryAction}
-      resetKey={`${thread.environmentId}:${thread.id}`}
-      simultaneousWithExternalGesture={props.simultaneousSwipeGesture}
-      threadTitle={thread.title}
-    >
-      {(close) => (
-        // Messages-style row actions on long-press. iOS: a real
-        // UIContextMenuInteraction with the row as the zoom preview (needs the
-        // patched @react-native-menu, see
-        // patches/@react-native-menu__menu@2.0.0.patch — in long-press mode the
-        // interaction is hosted by the component view and the underlying
-        // UIButton passes touches through, so row taps keep working). Android:
-        // ControlPillMenu injects onLongPress into the row and anchors the
-        // token-styled dropdown to it; taps and swipes are untouched.
-        <ControlPillMenu
-          actions={menuActions}
-          onPressAction={handleMenuAction}
-          shouldOpenOnLongPress
-        >
-          {rowContent(close)}
-        </ControlPillMenu>
-      )}
-    </ThreadSwipeable>
-  );
-});
diff --git a/apps/mobile/src/features/threads/thread-list-v2-items.tsx b/apps/mobile/src/features/threads/thread-list-v2-items.tsx
index 797781d16a4c..09ffe404ee79 100644
--- a/apps/mobile/src/features/threads/thread-list-v2-items.tsx
+++ b/apps/mobile/src/features/threads/thread-list-v2-items.tsx
@@ -18,7 +18,6 @@ import type {
 import type { EnvironmentThreadSearchMatch } from "@t3tools/client-runtime/state/thread-search";
 import type { EnvironmentMachineKind } from "@t3tools/contracts";
 import { canSnooze, resolveSnoozePresets } from "@t3tools/client-runtime/state/thread-settled";
-import { resolveSettledThreadTimestamp } from "@t3tools/client-runtime/state/thread-sort";
 import type { MenuAction } from "@react-native-menu/menu";
 import { memo, useCallback, useEffect, useMemo, useState, type ComponentProps } from "react";
 import { Alert, Pressable, useWindowDimensions, View } from "react-native";
@@ -33,10 +32,10 @@ import { ProviderInstanceIcon } from "../../components/ProviderIcon";
 import type { ThreadRowProviderInstance } from "./thread-provider-instance";
 import { cn } from "../../lib/cn";
 import { copyTextWithHaptic } from "../../lib/copyTextWithHaptic";
-import { relativeTime } from "../../lib/time";
 import { useUniwindTheme } from "../../lib/useUniwindTheme";
 import type { PendingNewTask } from "../../state/use-pending-new-tasks";
 import { useThreadPr } from "../../state/use-thread-pr";
+import { useSwipeRowDormant } from "../home/swipe-row-activation";
 import { ThreadSwipeable } from "../home/thread-swipe-actions";
 import { buildThreadTitleRegenerationMenuItems } from "./thread-title-regeneration-menu";
 import {
@@ -69,10 +68,6 @@ const STATUS_LABEL_BY_STATUS: Partial<
   failed: { label: "Failed", className: "text-danger-foreground" },
 };
 
-function threadTimeLabel(thread: EnvironmentThreadShell): string {
-  return relativeTime(thread.latestUserMessageAt ?? thread.updatedAt ?? thread.createdAt);
-}
-
 // Menus keep lifecycle and title regeneration together. Archive keeps its
 // own surface (thread screen / settings) rather than crowding v2 rows.
 const CARD_MENU_ACTIONS: MenuAction[] = [
@@ -300,8 +295,9 @@ export const ThreadListV2PendingRow = memo(function ThreadListV2PendingRow(props
           <ProjectFavicon
             environmentId={pendingTask.environmentId}
             faviconPath={props.project.faviconPath}
+            projectIcon={props.project.projectIcon}
             size={15}
-            projectTitle={projectTitle}
+            projectTitle={props.project.title}
             workspaceRoot={props.project.workspaceRoot}
           />
         ) : null}
@@ -453,8 +449,15 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
   /** Preformatted against the parent minute tick so this memoized row's
       countdown keeps moving. */
   readonly snoozeWakeLabelText?: string;
-  /** Parent minute tick passed as a prop so this memoized row refreshes its
-      native snooze menu while mounted. */
+  /** Preformatted against the parent clock (row order timestamp: settle stamp
+      on settled rows, latest activity otherwise). Blank while a status label
+      or the wake countdown owns that slot. Precomputed per row — not via the
+      list's extraData — so the minute tick re-renders only rows whose
+      displayed text moved. */
+  readonly timeLabel: string;
+  /** Parent minute tick carried on the row's list item, present only when the
+      row's menu offers snooze presets, so those menus refresh while mounted
+      without invalidating every other row. */
   readonly snoozePresetMinute: string;
   readonly project: EnvironmentProject | null;
   readonly projectTitle?: string;
@@ -492,6 +495,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
   readonly onArchiveThread: (thread: EnvironmentThreadShell) => void;
   readonly onPinThread: (thread: EnvironmentThreadShell) => void;
   readonly onUnpinThread: (thread: EnvironmentThreadShell) => void;
+  readonly onSetThreadAutoSettle: (thread: EnvironmentThreadShell, enabled: boolean) => void;
   /** False on environments whose server predates thread.settle/unsettle:
       swipe + menu fall back to Archive instead of failing on use. */
   readonly settlementSupported: boolean;
@@ -499,6 +503,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
   readonly snoozeSupported: boolean;
   /** False on servers that predate thread.pin/unpin. */
   readonly pinningSupported: boolean;
+  /** False on servers that predate thread.auto-settle.set. */
+  readonly autoSettleOptOutSupported: boolean;
   /** False on servers that predate thread title regeneration. */
   readonly titleRegenerationSupported: boolean;
   /** Server supports reordering this card's section. */
@@ -513,6 +519,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
   readonly canMoveDown?: boolean;
   readonly onSwipeableWillOpen: (methods: SwipeableMethods) => void;
   readonly onSwipeableClose: (methods: SwipeableMethods) => void;
+  /** List key checked against the Home swipe row activation. */
+  readonly activationKey?: string;
   readonly searchMatch?: EnvironmentThreadSearchMatch;
   readonly searchQuery?: string;
   readonly simultaneousSwipeGesture?: ComponentProps<
@@ -535,10 +543,12 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
     onArchiveThread,
     onPinThread,
     onUnpinThread,
+    onSetThreadAutoSettle,
     onMoveThread,
   } = props;
   const snoozedRow = props.snoozed === true;
   const pinnedRow = props.pinned === true;
+  const dormant = useSwipeRowDormant(props.activationKey);
 
   const pr = useThreadPr(thread);
 
@@ -549,13 +559,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
 
   const status = resolveThreadListV2Status(thread);
   const statusLabel = STATUS_LABEL_BY_STATUS[status];
-  // Settled rows label by the same stamp they sort by, so order and label
-  // can't disagree. updatedAt is always present, so the resolver never
-  // returns null here.
-  const settledTimestamp =
-    variant === "slim" && !snoozedRow ? resolveSettledThreadTimestamp(thread) : null;
-  const timeLabel =
-    settledTimestamp !== null ? relativeTime(settledTimestamp) : threadTimeLabel(thread);
+  // The timestamp is precomputed on the list item (same stamps the settled
+  // tail sorts by) so a minute tick only re-renders rows that draw it.
+  const timeLabel = props.timeLabel;
 
   const handleDelete = useCallback(() => onDeleteThread(thread), [onDeleteThread, thread]);
   const handleRename = useCallback(() => onRenameThread(thread), [onRenameThread, thread]);
@@ -565,6 +571,19 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
   );
   const handleSettle = useCallback(() => onSettleThread(thread), [onSettleThread, thread]);
   const [customSnoozeOpen, setCustomSnoozeOpen] = useState(false);
+  // A recycled cell reassigns this mounted row to a different thread without
+  // remounting it, and the render closure stops running while list equality
+  // says the item is unchanged — so any row-local UI state must be dismissed
+  // when the identity under it changes. Without this, a custom snooze sheet
+  // opened for one thread survives the thread's removal/reorder and its
+  // submit snoozes whichever thread the cell was reassigned to. (ThreadSwipeable
+  // enforces the same contract on the swipe layer with its resetKey.)
+  const rowIdentity = `${thread.environmentId}:${thread.id}`;
+  const [boundIdentity, setBoundIdentity] = useState(rowIdentity);
+  if (boundIdentity !== rowIdentity) {
+    setBoundIdentity(rowIdentity);
+    setCustomSnoozeOpen(false);
+  }
   const handleSnooze = useCallback(
     (snoozedUntil: string) => onSnoozeThread(thread, snoozedUntil),
     [onSnoozeThread, thread],
@@ -573,6 +592,10 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
   const handleUnsettle = useCallback(() => onUnsettleThread(thread), [onUnsettleThread, thread]);
   const handlePin = useCallback(() => onPinThread(thread), [onPinThread, thread]);
   const handleUnpin = useCallback(() => onUnpinThread(thread), [onUnpinThread, thread]);
+  const handleSetAutoSettle = useCallback(
+    (enabled: boolean) => onSetThreadAutoSettle(thread, enabled),
+    [onSetThreadAutoSettle, thread],
+  );
   const handleMoveUp = useCallback(() => onMoveThread?.(thread, "up"), [onMoveThread, thread]);
   const handleMoveDown = useCallback(() => onMoveThread?.(thread, "down"), [onMoveThread, thread]);
   const handleArchive = useCallback(() => onArchiveThread(thread), [onArchiveThread, thread]);
@@ -651,6 +674,33 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       variant,
     ],
   );
+  // A submenu with the current option checked, matching web. This is a
+  // per-thread setting, not a lifecycle verb.
+  const autoSettleMenuItems = useMemo<MenuAction[]>(
+    () =>
+      props.autoSettleOptOutSupported
+        ? [
+            {
+              id: "auto-settle",
+              title: "Auto-settle behavior",
+              image: "timer",
+              subactions: [
+                {
+                  id: "auto-settle:enabled",
+                  title: "Enabled",
+                  state: thread.autoSettleDisabledAt == null ? "on" : "off",
+                },
+                {
+                  id: "auto-settle:disabled",
+                  title: "Disabled",
+                  state: thread.autoSettleDisabledAt == null ? "off" : "on",
+                },
+              ],
+            } satisfies MenuAction,
+          ]
+        : [],
+    [props.autoSettleOptOutSupported, thread.autoSettleDisabledAt],
+  );
   const titleMenuItems = useMemo<MenuAction[]>(
     () => [
       { id: "rename", title: "Rename", image: "square.and.pencil" },
@@ -672,19 +722,23 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       },
       ...arrangementMenuItems,
       ...titleMenuItems,
+      ...autoSettleMenuItems,
       { id: "delete", title: "Delete", image: "trash", attributes: { destructive: true } },
     ],
-    [arrangementMenuItems, snoozePresetActions, titleMenuItems],
+    [arrangementMenuItems, autoSettleMenuItems, snoozePresetActions, titleMenuItems],
   );
   const cardMenuActions = useMemo<MenuAction[]>(
     () => [
       CARD_MENU_ACTIONS[0]!,
       ...arrangementMenuItems,
       ...titleMenuItems,
+      ...autoSettleMenuItems,
       ...CARD_MENU_ACTIONS.slice(1),
     ],
-    [arrangementMenuItems, titleMenuItems],
+    [arrangementMenuItems, autoSettleMenuItems, titleMenuItems],
   );
+  // Settled and snoozed rows keep the setting too, matching web where every
+  // row shares one menu builder.
   const slimMenuActions = useMemo<MenuAction[]>(
     () => [
       SLIM_MENU_ACTIONS[0]!,
@@ -692,13 +746,19 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         (action) => action.id !== "move-up" && action.id !== "move-down",
       ),
       ...titleMenuItems,
+      ...autoSettleMenuItems,
       SLIM_MENU_ACTIONS[1]!,
     ],
-    [arrangementMenuItems, titleMenuItems],
+    [arrangementMenuItems, autoSettleMenuItems, titleMenuItems],
   );
   const snoozedMenuActions = useMemo<MenuAction[]>(
-    () => [SNOOZED_MENU_ACTIONS[0]!, ...titleMenuItems, SNOOZED_MENU_ACTIONS[1]!],
-    [titleMenuItems],
+    () => [
+      SNOOZED_MENU_ACTIONS[0]!,
+      ...titleMenuItems,
+      ...autoSettleMenuItems,
+      SNOOZED_MENU_ACTIONS[1]!,
+    ],
+    [autoSettleMenuItems, titleMenuItems],
   );
   const legacyMenuActions = useMemo<MenuAction[]>(
     () => [
@@ -717,6 +777,8 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       if (nativeEvent.event === "unsnooze") handleUnsnooze();
       if (nativeEvent.event === "pin") handlePin();
       if (nativeEvent.event === "unpin") handleUnpin();
+      if (nativeEvent.event === "auto-settle:enabled") handleSetAutoSettle(true);
+      if (nativeEvent.event === "auto-settle:disabled") handleSetAutoSettle(false);
       if (nativeEvent.event === "arrange") appAtomRegistry.set(threadArrangementOpenAtom, true);
       if (nativeEvent.event === "move-up") handleMoveUp();
       if (nativeEvent.event === "move-down") handleMoveDown();
@@ -754,10 +816,12 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
       handlePin,
       handleSettle,
       handleSnooze,
+      handleSetAutoSettle,
       handleUnpin,
       handleUnsettle,
       handleUnsnooze,
       snoozePresets,
+      setCustomSnoozeOpen,
     ],
   );
   const primaryAction = useMemo(() => {
@@ -831,8 +895,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
           <ProjectFavicon
             environmentId={thread.environmentId}
             faviconPath={props.project.faviconPath}
+            projectIcon={props.project.projectIcon}
             size={15}
-            projectTitle={props.projectTitle ?? props.project.title}
+            projectTitle={props.project.title}
             workspaceRoot={props.project.workspaceRoot}
           />
         ) : null}
@@ -963,27 +1028,25 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         )}
         {pr ? (
           <View className="flex-row items-center gap-1" accessibilityLabel={pr.accessibilityLabel}>
-            {pr.kind === "stack" || pr.others > 0 ? (
-              <SymbolView
-                name={pr.kind === "stack" ? "square.3.layers.3d" : "arrow.triangle.pull"}
-                size={12}
-                tintColorClassName={
-                  pr.state === null || pr.isDraft
-                    ? rowAppearance.mutedIconTintClassName
-                    : pr.state === "open"
-                      ? "accent-adaptive-emerald-600-400"
-                      : pr.state === "closed"
-                        ? "accent-adaptive-rose-600-400"
-                        : "accent-adaptive-violet-600-400"
-                }
-              />
-            ) : null}
+            <SymbolView
+              name={pr.kind === "stack" ? "square.3.layers.3d" : "arrow.triangle.pull"}
+              size={12}
+              tintColorClassName={
+                pr.state === null || pr.isDraft
+                  ? rowAppearance.mutedIconTintClassName
+                  : pr.state === "open"
+                    ? "accent-adaptive-emerald-600-400"
+                    : pr.state === "closed"
+                      ? "accent-adaptive-rose-600-400"
+                      : "accent-adaptive-violet-600-400"
+              }
+            />
             <Text
               accessibilityLabel={pr.accessibilityLabel}
               className={cn("text-xs", pr.textClassName)}
               style={{ fontFamily: MONO_FONT }}
             >
-              {pr.kind === "stack" || pr.others > 0 ? pr.label : `#${pr.label}`}
+              {pr.label}
             </Text>
           </View>
         ) : null}
@@ -1065,8 +1128,9 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
               <ProjectFavicon
                 environmentId={thread.environmentId}
                 faviconPath={props.project.faviconPath}
+                projectIcon={props.project.projectIcon}
                 size={15}
-                projectTitle={props.projectTitle ?? props.project.title}
+                projectTitle={props.project.title}
                 workspaceRoot={props.project.workspaceRoot}
               />
             </View>
@@ -1118,6 +1182,7 @@ export const ThreadListV2Row = memo(function ThreadListV2Row(props: {
         <CustomSnoozeSheet onClose={() => setCustomSnoozeOpen(false)} onSnooze={handleSnooze} />
       )}
       <ThreadSwipeable
+        dormant={dormant}
         threadKey={`${thread.environmentId}:${thread.id}`}
         backgroundColor={rowAppearance.swipeBackgroundColor}
         compactActions={variant === "slim"}
diff --git a/apps/mobile/src/features/threads/thread-provider-instance.test.ts b/apps/mobile/src/features/threads/thread-provider-instance.test.ts
index 2afef9759070..4912bf2b61ba 100644
--- a/apps/mobile/src/features/threads/thread-provider-instance.test.ts
+++ b/apps/mobile/src/features/threads/thread-provider-instance.test.ts
@@ -8,7 +8,10 @@ import {
 } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
-import { resolveThreadProviderInstance } from "./thread-provider-instance";
+import {
+  createThreadRowProviderInstanceResolver,
+  resolveThreadProviderInstance,
+} from "./thread-provider-instance";
 
 function makeConfig(
   providers: ReadonlyArray<{
@@ -96,3 +99,53 @@ describe("resolveThreadProviderInstance", () => {
     expect(resolveThreadProviderInstance(serverConfigs, thread)?.showBadge).toBe(false);
   });
 });
+
+describe("createThreadRowProviderInstanceResolver", () => {
+  const environmentId = EnvironmentId.make("environment-a");
+  const serverConfigs = new Map<EnvironmentId, ServerConfig>([
+    [
+      environmentId,
+      makeConfig([
+        { instanceId: "codex", driver: "codex", displayName: "Codex" },
+        { instanceId: "codex_work", driver: "codex", displayName: "Codex" },
+      ]),
+    ],
+  ]);
+
+  it("hands out the same reference for repeated lookups of one instance", () => {
+    const resolve = createThreadRowProviderInstanceResolver(serverConfigs);
+    const first = resolve(makeThread(environmentId, "codex"));
+    const second = resolve(makeThread(environmentId, "codex"));
+    // Memoized rows compare props by reference: a fresh object per call would
+    // re-render every row on every parent render (minute tick included).
+    expect(first).not.toBeNull();
+    expect(second).toBe(first);
+  });
+
+  it("distinguishes instances of the same driver", () => {
+    const resolve = createThreadRowProviderInstanceResolver(serverConfigs);
+    const personal = resolve(makeThread(environmentId, "codex"));
+    const work = resolve(makeThread(environmentId, "codex_work"));
+    expect(personal).not.toBeNull();
+    expect(work).not.toBeNull();
+    expect(work).not.toBe(personal);
+    expect(work?.displayName).toBe("Codex Work");
+  });
+
+  it("hands out a new identity when the server-config generation changes", () => {
+    const before = createThreadRowProviderInstanceResolver(serverConfigs);
+    const nextConfigs = new Map<EnvironmentId, ServerConfig>([
+      [environmentId, makeConfig([{ instanceId: "codex", driver: "codex" }])],
+    ]);
+    const after = createThreadRowProviderInstanceResolver(nextConfigs);
+    expect(after(makeThread(environmentId, "codex"))).not.toBe(
+      before(makeThread(environmentId, "codex")),
+    );
+  });
+
+  it("resolves unknown instances to null without throwing", () => {
+    const resolve = createThreadRowProviderInstanceResolver(serverConfigs);
+    expect(resolve(makeThread(environmentId, "ghost"))).toBeNull();
+    expect(resolve(makeThread(environmentId, "ghost"))).toBeNull();
+  });
+});
diff --git a/apps/mobile/src/features/threads/thread-provider-instance.ts b/apps/mobile/src/features/threads/thread-provider-instance.ts
index 29dbe8828b66..cd07f636820c 100644
--- a/apps/mobile/src/features/threads/thread-provider-instance.ts
+++ b/apps/mobile/src/features/threads/thread-provider-instance.ts
@@ -1,3 +1,5 @@
+import { useMemo } from "react";
+
 import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
 import {
   normalizeProviderAccentColor,
@@ -40,3 +42,33 @@ export function resolveThreadProviderInstance(
     ),
   };
 }
+
+/**
+ * Builds a resolver handing out reference-stable `ThreadRowProviderInstance`
+ * objects. `resolveThreadProviderInstance` builds a fresh object per call,
+ * which breaks the memoized row's props comparison on every parent render —
+ * the result only depends on (environment, instance id), so one cache per
+ * server-config generation keeps each row's `providerInstance` prop stable
+ * until the instance behind the row actually changes.
+ */
+export function createThreadRowProviderInstanceResolver(
+  serverConfigs: ReadonlyMap<EnvironmentId, ServerConfig>,
+): (thread: EnvironmentThreadShell) => ThreadRowProviderInstance | null {
+  const cache = new Map<string, ThreadRowProviderInstance | null>();
+  return (thread) => {
+    const instanceId = thread.session?.providerInstanceId ?? thread.modelSelection.instanceId;
+    const cacheKey = `${thread.environmentId}|${instanceId ?? ""}`;
+    const cached = cache.get(cacheKey);
+    if (cached !== undefined) return cached;
+    const resolved = resolveThreadProviderInstance(serverConfigs, thread);
+    cache.set(cacheKey, resolved);
+    return resolved;
+  };
+}
+
+/** List-scoped wrapper: one cache per server-config generation. */
+export function useThreadRowProviderInstanceResolver(
+  serverConfigs: ReadonlyMap<EnvironmentId, ServerConfig>,
+): (thread: EnvironmentThreadShell) => ThreadRowProviderInstance | null {
+  return useMemo(() => createThreadRowProviderInstanceResolver(serverConfigs), [serverConfigs]);
+}
diff --git a/apps/mobile/src/features/threads/threadListV2.test.ts b/apps/mobile/src/features/threads/threadListV2.test.ts
index afc00ef9ab40..4bbcf2233a42 100644
--- a/apps/mobile/src/features/threads/threadListV2.test.ts
+++ b/apps/mobile/src/features/threads/threadListV2.test.ts
@@ -6,6 +6,7 @@ import {
   threadDropLifecycle,
   reconcilePendingThreadOrder,
   type PendingThreadOrder,
+  type ThreadMoveAvailability,
 } from "./threadOrder";
 import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
 import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
@@ -19,7 +20,7 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
-import { describe, expect, it } from "vite-plus/test";
+import { describe, expect, it, vi } from "vite-plus/test";
 
 import type { PendingNewTask } from "../../state/use-pending-new-tasks";
 import { threadJumpTarget } from "../keyboard/threadKeyboardShortcuts";
@@ -27,12 +28,14 @@ import {
   buildThreadListV2Items,
   buildThreadListV2ListItems,
   getThreadListV2OrderedSection,
-  resolveThreadListV2Enabled,
+  isThreadListV2ListItem,
   resolveThreadListV2SnoozeMenuSelection,
   resolveThreadListV2SnoozeGateExpiryMs,
   resolveThreadListV2Status,
   resolveThreadListV2SwipeActions,
   sortThreadsForListV2,
+  threadListV2ListItemsAreEqual,
+  type ThreadListV2ListItem,
 } from "./threadListV2";
 
 const environmentId = EnvironmentId.make("environment-1");
@@ -120,29 +123,6 @@ describe("resolveThreadListV2SnoozeMenuSelection", () => {
   });
 });
 
-describe("resolveThreadListV2Enabled", () => {
-  it("defaults on when the device has never chosen", () => {
-    expect(
-      resolveThreadListV2Enabled({ legacyPreference: undefined, preferencesLoaded: true }),
-    ).toBe(true);
-  });
-
-  it("honors an explicit legacy opt-in", () => {
-    expect(resolveThreadListV2Enabled({ legacyPreference: true, preferencesLoaded: true })).toBe(
-      false,
-    );
-    expect(resolveThreadListV2Enabled({ legacyPreference: false, preferencesLoaded: true })).toBe(
-      true,
-    );
-  });
-
-  it("holds the default while preferences are still loading so the list does not remount", () => {
-    expect(
-      resolveThreadListV2Enabled({ legacyPreference: undefined, preferencesLoaded: false }),
-    ).toBe(true);
-  });
-});
-
 describe("resolveThreadListV2Status", () => {
   it("prioritizes approval over a running session", () => {
     const thread = makeThread({
@@ -1482,3 +1462,551 @@ describe("cross-section thread drops", () => {
     ).toEqual({ pin: false, unpin: false, unsettle: false, unsnooze: false });
   });
 });
+
+/* ─── Recycled-list equality + per-row clock scoping ─────────────────── */
+
+const BASE_MS = Date.parse(NOW);
+const isoAt = (ms: number) => new Date(ms).toISOString();
+const MINUTE_MS = 60_000;
+
+function runningSession(threadId: string) {
+  return {
+    threadId: ThreadId.make(threadId),
+    status: "running" as const,
+    providerName: "Codex",
+    providerInstanceId: ProviderInstanceId.make("codex"),
+    runtimeMode: "full-access" as const,
+    activeTurnId: null,
+    lastError: null,
+    updatedAt: NOW,
+  };
+}
+
+function buildTickThreads() {
+  return {
+    ready: makeThread({
+      id: ThreadId.make("tick-ready"),
+      title: "tick ready",
+      latestUserMessageAt: isoAt(BASE_MS - 5 * MINUTE_MS),
+    }),
+    approval: makeThread({
+      id: ThreadId.make("tick-approval"),
+      title: "tick approval",
+      hasPendingApprovals: true,
+      latestUserMessageAt: isoAt(BASE_MS - 5 * MINUTE_MS),
+    }),
+    settled: makeThread({
+      id: ThreadId.make("tick-settled"),
+      title: "tick settled",
+      settledOverride: "settled",
+      settledAt: isoAt(BASE_MS - 3 * 24 * 60 * MINUTE_MS),
+    }),
+    snoozed: makeThread({
+      id: ThreadId.make("tick-snoozed"),
+      title: "tick snoozed",
+      snoozedAt: isoAt(BASE_MS - MINUTE_MS),
+      snoozedUntil: isoAt(BASE_MS + 2 * 60 * MINUTE_MS),
+    }),
+  };
+}
+
+function buildTickList(
+  threads: ReadonlyArray<EnvironmentThreadShell>,
+  clockMs: number,
+  pendingTasks: ReadonlyArray<PendingNewTask>,
+  options?: {
+    readonly snoozeEnvironmentIds?: ReadonlySet<EnvironmentId>;
+    readonly queuedThreadKeys?: ReadonlySet<string>;
+    readonly moveAvailability?: ReadonlyMap<string, ThreadMoveAvailability>;
+    readonly shelfPreferencesLoading?: boolean;
+  },
+): ThreadListV2ListItem[] {
+  const now = isoAt(clockMs);
+  const layout = buildThreadListV2Items({
+    threads,
+    environmentId: null,
+    searchQuery: "",
+    now,
+    snoozedShelfExpanded: true,
+  });
+  return buildThreadListV2ListItems({
+    items: layout.items,
+    pendingTasks,
+    snoozedCount: layout.snoozedCount,
+    snoozedShelfExpanded: true,
+    snoozedShelfHeaderIndex: layout.snoozedShelfHeaderIndex,
+    settledCount: layout.settledCount,
+    settledShelfHeaderIndex: layout.settledShelfHeaderIndex,
+    snoozeLabelNow: now,
+    ...(options?.snoozeEnvironmentIds
+      ? { snoozeEnvironmentIds: options.snoozeEnvironmentIds }
+      : {}),
+    ...(options?.queuedThreadKeys ? { queuedThreadKeys: options.queuedThreadKeys } : {}),
+    ...(options?.moveAvailability ? { moveAvailability: options.moveAvailability } : {}),
+    ...(options?.shelfPreferencesLoading !== undefined
+      ? { shelfPreferencesLoading: options.shelfPreferencesLoading }
+      : {}),
+  });
+}
+
+function itemsByThreadKey(items: ReadonlyArray<ThreadListV2ListItem>) {
+  const byKey = new Map<string, ThreadListV2ListItem>();
+  for (const item of items) byKey.set(item.key, item);
+  return byKey;
+}
+
+describe("threadListV2ListItemsAreEqual", () => {
+  const thread = makeThread({
+    id: ThreadId.make("eq"),
+    title: "eq",
+    latestUserMessageAt: isoAt(BASE_MS - 5 * MINUTE_MS),
+  });
+  const layout = buildThreadListV2Items({
+    threads: [thread],
+    environmentId: null,
+    searchQuery: "",
+    now: NOW,
+  });
+  // One queued task object shared across builds: identity, not content, is
+  // what the row equality compares (mirrors the store's stable references).
+  const queued = makePendingTask("eq-queued");
+  const build = () =>
+    buildThreadListV2ListItems({
+      items: layout.items,
+      pendingTasks: [queued],
+      snoozeLabelNow: NOW,
+    });
+
+  it("treats rebuilt wrappers over identical rows as equal", () => {
+    const first = build();
+    const second = build();
+    expect(first.length).toBe(second.length);
+    for (let index = 0; index < first.length; index += 1) {
+      expect(first[index]).not.toBe(second[index]);
+      expect(threadListV2ListItemsAreEqual(first[index]!, second[index]!)).toBe(true);
+    }
+  });
+
+  it("notices a replaced thread shell", () => {
+    const replacement = makeThread({ id: ThreadId.make("eq"), title: "renamed" });
+    const rebuilt = buildThreadListV2Items({
+      threads: [replacement],
+      environmentId: null,
+      searchQuery: "",
+      now: NOW,
+    });
+    const next = buildThreadListV2ListItems({
+      items: rebuilt.items,
+      pendingTasks: [],
+      snoozeLabelNow: NOW,
+    });
+    const previousThread = build().find((item) => item.type === "v2-thread")!;
+    const nextThread = next.find((item) => item.type === "v2-thread")!;
+    expect(threadListV2ListItemsAreEqual(previousThread, nextThread)).toBe(false);
+  });
+
+  it("notices a changed wake countdown label", () => {
+    const snoozedLayout = buildThreadListV2Items({
+      threads: [
+        makeThread({
+          id: ThreadId.make("wake"),
+          title: "wake",
+          snoozedAt: NOW,
+          snoozedUntil: isoAt(BASE_MS + 61 * MINUTE_MS),
+        }),
+      ],
+      environmentId: null,
+      searchQuery: "",
+      now: NOW,
+      snoozedShelfExpanded: true,
+    });
+    const earlier = buildThreadListV2ListItems({
+      items: snoozedLayout.items,
+      pendingTasks: [],
+      snoozedShelfExpanded: true,
+      snoozeLabelNow: NOW,
+    });
+    const later = buildThreadListV2ListItems({
+      items: snoozedLayout.items,
+      pendingTasks: [],
+      snoozedShelfExpanded: true,
+      snoozeLabelNow: isoAt(BASE_MS + MINUTE_MS),
+    });
+    const rows = (items: ThreadListV2ListItem[]) => {
+      const row = items.find((item) => item.key === `v2-thread:${environmentId}:wake`);
+      expect(row?.type).toBe("v2-thread");
+      if (row?.type !== "v2-thread") throw new Error("missing snoozed row");
+      return row;
+    };
+    expect(rows(earlier).snoozeWakeLabelText).toBe("2h");
+    expect(rows(later).snoozeWakeLabelText).toBe("1h");
+    expect(threadListV2ListItemsAreEqual(rows(earlier), rows(later))).toBe(false);
+  });
+
+  it("notices shelf count, expansion, and loading-disabled changes", () => {
+    const shelf = {
+      type: "v2-settled-shelf",
+      key: "v2-settled-shelf",
+      count: 2,
+      expanded: true,
+      disabled: false,
+    } as const;
+    expect(threadListV2ListItemsAreEqual(shelf, { ...shelf })).toBe(true);
+    expect(threadListV2ListItemsAreEqual(shelf, { ...shelf, count: 3 })).toBe(false);
+    expect(threadListV2ListItemsAreEqual(shelf, { ...shelf, expanded: false })).toBe(false);
+    // A recycled cell ignores the render closure, so the shelf header's
+    // preference-loading disabled state has to ride on the item too.
+    expect(threadListV2ListItemsAreEqual(shelf, { ...shelf, disabled: true })).toBe(false);
+  });
+
+  it("treats different item kinds as unequal", () => {
+    const built = build();
+    const threadItem = built.find((item) => item.type === "v2-thread")!;
+    const pendingItem = built.find((item) => item.type === "v2-pending")!;
+    expect(threadListV2ListItemsAreEqual(threadItem, pendingItem)).toBe(false);
+  });
+
+  it("notices a trailing-divider flip caused by a neighbour change", () => {
+    const threadA = makeThread({ id: ThreadId.make("flip-a"), title: "flip a" });
+    const threadB = makeThread({ id: ThreadId.make("flip-b"), title: "flip b" });
+    const bare = buildThreadListV2ListItems({
+      items: buildThreadListV2Items({
+        threads: [threadA, threadB],
+        environmentId: null,
+        searchQuery: "",
+        now: NOW,
+      }).items,
+      pendingTasks: [],
+      snoozeLabelNow: NOW,
+    });
+    // The same shells with B settled: A now sits above the Settled section
+    // rule instead of another row, so A's hairline must flip through the
+    // recycled equality — its own shell reference never changed.
+    const settledB = makeThread({
+      id: ThreadId.make("flip-b"),
+      title: "flip b",
+      settledOverride: "settled",
+      settledAt: NOW,
+    });
+    const withSettled = buildThreadListV2ListItems({
+      items: buildThreadListV2Items({
+        threads: [threadA, settledB],
+        environmentId: null,
+        searchQuery: "",
+        now: NOW,
+      }).items,
+      pendingTasks: [],
+      settledCount: 1,
+      settledShelfHeaderIndex: 1,
+      snoozeLabelNow: NOW,
+    });
+    const firstA = bare[0]!;
+    const secondA = withSettled[0]!;
+    expect(firstA.type === "v2-thread" && firstA.showTrailingDivider).toBe(true);
+    expect(secondA.type === "v2-thread" && secondA.showTrailingDivider).toBe(false);
+    expect(threadListV2ListItemsAreEqual(firstA, secondA)).toBe(false);
+  });
+});
+
+describe("isThreadListV2ListItem", () => {
+  it("narrows the v2 kinds and rejects the legacy discriminators", () => {
+    expect(isThreadListV2ListItem({ type: "v2-thread" })).toBe(true);
+    expect(isThreadListV2ListItem({ type: "v2-pending" })).toBe(true);
+    expect(isThreadListV2ListItem({ type: "v2-snoozed-shelf" })).toBe(true);
+    expect(isThreadListV2ListItem({ type: "v2-settled-shelf" })).toBe(true);
+    expect(isThreadListV2ListItem({ type: "thread" })).toBe(false);
+    expect(isThreadListV2ListItem({ type: "v2-show-more" })).toBe(false);
+  });
+});
+
+describe("buildThreadListV2ListItems clock scoping", () => {
+  const allEnvironments = new Set<EnvironmentId>([environmentId]);
+  const tickQueued = () => [makePendingTask("tick-queued")];
+
+  it("carries the snooze menu clock on every row whose swipe menu offers presets", () => {
+    const threads = buildTickThreads();
+    const items = buildTickList(Object.values(threads), BASE_MS, tickQueued(), {
+      snoozeEnvironmentIds: allEnvironments,
+    });
+    const byKey = itemsByThreadKey(items);
+    const ready = byKey.get(`v2-thread:${environmentId}:tick-ready`)!;
+    const approval = byKey.get(`v2-thread:${environmentId}:tick-approval`)!;
+    const settled = byKey.get(`v2-thread:${environmentId}:tick-settled`)!;
+    const snoozed = byKey.get(`v2-thread:${environmentId}:tick-snoozed`)!;
+    expect(ready.type === "v2-thread" && ready.snoozePresetMinute).toBe(NOW);
+    // The swipe-revealed snooze action exists on slim rows too (the variant
+    // only swaps the primary action), so settled rows need the fresh clock.
+    expect(settled.type === "v2-thread" && settled.snoozePresetMinute).toBe(NOW);
+    // Approval rows are never snoozable; snoozed rows only offer Wake.
+    expect(approval.type === "v2-thread" && approval.snoozePresetMinute).toBeUndefined();
+    expect(snoozed.type === "v2-thread" && snoozed.snoozePresetMinute).toBeUndefined();
+  });
+
+  it("keeps the snooze menu clock off rows on servers without the capability", () => {
+    const threads = buildTickThreads();
+    const items = buildTickList([threads.ready], BASE_MS, [], {
+      snoozeEnvironmentIds: new Set<EnvironmentId>(),
+    });
+    const ready = items.find((item) => item.type === "v2-thread")!;
+    expect(ready.type === "v2-thread" && ready.snoozePresetMinute).toBeUndefined();
+  });
+
+  it("blanks the precomputed time for rows that render a label instead", () => {
+    vi.useFakeTimers();
+    try {
+      vi.setSystemTime(BASE_MS);
+      const working = makeThread({
+        id: ThreadId.make("tick-working"),
+        title: "tick working",
+        latestUserMessageAt: isoAt(BASE_MS - 5 * MINUTE_MS),
+        session: runningSession("tick-working"),
+      });
+      const threads = buildTickThreads();
+      const items = buildTickList(
+        [threads.ready, working, threads.settled, threads.snoozed],
+        BASE_MS,
+        tickQueued(),
+      );
+      const byKey = itemsByThreadKey(items);
+      const label = (key: string) => {
+        const item = byKey.get(key)!;
+        return item.type === "v2-thread" ? item.timeLabel : "<shelf>";
+      };
+      // Ready cards and settled/snoozed slim rows draw a time; the wake
+      // countdown outranks the time on snoozed rows; cards with a status
+      // label never draw one.
+      expect(label(`v2-thread:${environmentId}:tick-ready`)).toBe("5m");
+      expect(label(`v2-thread:${environmentId}:tick-working`)).toBe("");
+      expect(label(`v2-thread:${environmentId}:tick-settled`)).toBe("3d");
+      expect(label(`v2-thread:${environmentId}:tick-snoozed`)).toBe("");
+      const snoozed = byKey.get(`v2-thread:${environmentId}:tick-snoozed`)!;
+      expect(snoozed.type === "v2-thread" && snoozed.snoozeWakeLabelText).toBe("2h");
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+});
+
+describe("thread list v2 minute tick invalidation", () => {
+  it("only invalidates rows whose clock-driven content moved", () => {
+    vi.useFakeTimers();
+    try {
+      vi.setSystemTime(BASE_MS);
+      const threads = buildTickThreads();
+      const shellOrder = [threads.ready, threads.approval, threads.settled, threads.snoozed];
+      // One queued-task reference shared by both builds: the store hands the
+      // list the same pending-task objects between rebuilds.
+      const pendingTasks = [makePendingTask("tick-queued")];
+      const atStart = buildTickList(shellOrder, BASE_MS, pendingTasks);
+      vi.setSystemTime(BASE_MS + MINUTE_MS);
+      const atNextMinute = buildTickList(shellOrder, BASE_MS + MINUTE_MS, pendingTasks);
+
+      expect(atStart.length).toBe(atNextMinute.length);
+      const invalidated: string[] = [];
+      for (let index = 0; index < atStart.length; index += 1) {
+        if (!threadListV2ListItemsAreEqual(atStart[index]!, atNextMinute[index]!)) {
+          invalidated.push(atStart[index]!.key);
+        }
+      }
+      // The ready row draws a minute-granular time and carries the snooze
+      // menu, and the settled slim row's swipe-revealed snooze menu shows
+      // preset times too, so both rows' menu content moved. Every other row
+      // — the approval card (status label, never snoozable), the snoozed
+      // shelf row ("2h" unchanged, Wake only), the shelf headers, and the
+      // queued row — survives the tick untouched.
+      expect(invalidated).toEqual([
+        `v2-thread:${environmentId}:tick-ready`,
+        `v2-thread:${environmentId}:tick-settled`,
+      ]);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("keeps hour-granularity rows stable across a minute tick when they carry no snooze menu", () => {
+    vi.useFakeTimers();
+    try {
+      vi.setSystemTime(BASE_MS);
+      const staleReady = makeThread({
+        id: ThreadId.make("tick-stale"),
+        title: "tick stale",
+        latestUserMessageAt: isoAt(BASE_MS - 3 * 60 * MINUTE_MS),
+      });
+      const atStart = buildTickList([staleReady], BASE_MS, [], {
+        snoozeEnvironmentIds: new Set<EnvironmentId>(),
+      });
+      vi.setSystemTime(BASE_MS + MINUTE_MS);
+      const atNextMinute = buildTickList([staleReady], BASE_MS + MINUTE_MS, [], {
+        snoozeEnvironmentIds: new Set<EnvironmentId>(),
+      });
+      expect(threadListV2ListItemsAreEqual(atStart[0]!, atNextMinute[0]!)).toBe(true);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("re-renders the snoozed countdown row when the wake label advances", () => {
+    vi.useFakeTimers();
+    try {
+      const wakeAt = BASE_MS + 120 * MINUTE_MS;
+      const snoozed = makeThread({
+        id: ThreadId.make("tick-wake"),
+        title: "tick wake",
+        snoozedAt: isoAt(BASE_MS - MINUTE_MS),
+        snoozedUntil: isoAt(wakeAt),
+      });
+      const wakeKey = `v2-thread:${environmentId}:tick-wake`;
+      const wakeRow = (items: ThreadListV2ListItem[]) => itemsByThreadKey(items).get(wakeKey)!;
+      vi.setSystemTime(BASE_MS);
+      const atStart = buildTickList([snoozed], BASE_MS, []);
+      vi.setSystemTime(BASE_MS + MINUTE_MS);
+      const stillTwoHours = buildTickList([snoozed], BASE_MS + MINUTE_MS, []);
+      expect(threadListV2ListItemsAreEqual(wakeRow(atStart), wakeRow(stillTwoHours))).toBe(true);
+      // Minutes round up, so the countdown holds "2h" until the remaining
+      // time drops to the hour boundary — and only that row flips when it
+      // finally moves to minute granularity.
+      vi.setSystemTime(BASE_MS + 61 * MINUTE_MS);
+      const oneHour = buildTickList([snoozed], BASE_MS + 61 * MINUTE_MS, []);
+      const oneHourRow = wakeRow(oneHour);
+      expect(oneHourRow.type).toBe("v2-thread");
+      expect(oneHourRow.type === "v2-thread" && oneHourRow.snoozeWakeLabelText).toBe("59m");
+      expect(threadListV2ListItemsAreEqual(wakeRow(stillTwoHours), wakeRow(oneHour))).toBe(false);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+});
+
+describe("buildThreadListV2ListItems trailing dividers", () => {
+  it("follows the final neighbour order, not the pre-splice blocks", () => {
+    const activeA = makeThread({ id: ThreadId.make("div-a"), title: "a" });
+    const activeB = makeThread({ id: ThreadId.make("div-b"), title: "b" });
+    const layout = buildThreadListV2Items({
+      threads: [activeA, activeB],
+      environmentId: null,
+      searchQuery: "",
+      now: NOW,
+    });
+    const items = buildThreadListV2ListItems({
+      items: layout.items,
+      pendingTasks: [makePendingTask("div-q1"), makePendingTask("div-q2")],
+      snoozeLabelNow: NOW,
+    });
+    const dividers = items.map((item) =>
+      item.type === "v2-thread" || item.type === "v2-pending" ? item.showTrailingDivider : "n/a",
+    );
+    // thread A | thread B | queued 1 | queued 2: consecutive threads keep
+    // their hairlines, the row before the Unsent section rule loses its own,
+    // queued rows divide each other, and the last row has nothing under it.
+    expect(dividers).toEqual([true, false, true, false]);
+  });
+});
+
+describe("buildThreadListV2ListItems row-state stamps", () => {
+  const readyThread = makeThread({
+    id: ThreadId.make("stamp-ready"),
+    title: "stamp ready",
+    latestUserMessageAt: isoAt(BASE_MS - 5 * MINUTE_MS),
+  });
+  const settledThread = makeThread({
+    id: ThreadId.make("stamp-settled"),
+    title: "stamp settled",
+    settledOverride: "settled",
+    settledAt: isoAt(BASE_MS - 3 * 24 * 60 * MINUTE_MS),
+  });
+  const allEnvironments = new Set<EnvironmentId>([environmentId]);
+
+  it("stamps queued outbox messages onto the matching row and notices removal", () => {
+    // An outbox write never touches the thread shell, so the queued icon has
+    // to ride on the item for the recycled cell to ever update it.
+    const queued = buildTickList([readyThread, settledThread], BASE_MS, [], {
+      queuedThreadKeys: new Set([`${environmentId}:stamp-ready`]),
+      snoozeEnvironmentIds: allEnvironments,
+    });
+    const plain = buildTickList([readyThread, settledThread], BASE_MS, [], {
+      queuedThreadKeys: new Set<string>(),
+      snoozeEnvironmentIds: allEnvironments,
+    });
+    const byKey = (items: ThreadListV2ListItem[]) => itemsByThreadKey(items);
+    const readyQueued = byKey(queued).get(`v2-thread:${environmentId}:stamp-ready`)!;
+    const readyPlain = byKey(plain).get(`v2-thread:${environmentId}:stamp-ready`)!;
+    const settledQueued = byKey(queued).get(`v2-thread:${environmentId}:stamp-settled`)!;
+    const settledPlain = byKey(plain).get(`v2-thread:${environmentId}:stamp-settled`)!;
+    expect(readyQueued.type === "v2-thread" && readyQueued.hasQueuedMessages).toBe(true);
+    expect(readyPlain.type === "v2-thread" && readyPlain.hasQueuedMessages).toBe(false);
+    expect(threadListV2ListItemsAreEqual(readyQueued, readyPlain)).toBe(false);
+    // The neighbour row is untouched by the outbox change.
+    expect(threadListV2ListItemsAreEqual(settledQueued, settledPlain)).toBe(true);
+  });
+
+  it("notices move-availability changes on card rows without a shell update", () => {
+    const permissive = new Map([
+      [`${environmentId}:stamp-ready`, { canMoveUp: true, canMoveDown: true }],
+      [`${environmentId}:stamp-settled`, { canMoveUp: true, canMoveDown: true }],
+    ]);
+    const blocked = new Map([
+      [`${environmentId}:stamp-settled`, { canMoveUp: true, canMoveDown: true }],
+    ]);
+    const open = buildTickList([readyThread, settledThread], BASE_MS, [], {
+      moveAvailability: permissive,
+      snoozeEnvironmentIds: allEnvironments,
+    });
+    const closed = buildTickList([readyThread, settledThread], BASE_MS, [], {
+      moveAvailability: blocked,
+      snoozeEnvironmentIds: allEnvironments,
+    });
+    const readyOpen = itemsByThreadKey(open).get(`v2-thread:${environmentId}:stamp-ready`)!;
+    const readyClosed = itemsByThreadKey(closed).get(`v2-thread:${environmentId}:stamp-ready`)!;
+    expect(readyOpen.type === "v2-thread" && readyOpen.canMoveUp).toBe(true);
+    expect(readyClosed.type === "v2-thread" && readyClosed.canMoveUp).toBe(false);
+    expect(threadListV2ListItemsAreEqual(readyOpen, readyClosed)).toBe(false);
+    // Slim rows never carry the move actions, so availability is inert there.
+    const settledOpen = itemsByThreadKey(open).get(`v2-thread:${environmentId}:stamp-settled`)!;
+    const settledClosed = itemsByThreadKey(closed).get(`v2-thread:${environmentId}:stamp-settled`)!;
+    expect(settledOpen.type === "v2-thread" && settledOpen.canMoveUp).toBe(false);
+    expect(threadListV2ListItemsAreEqual(settledOpen, settledClosed)).toBe(true);
+  });
+
+  it("keeps the settled slim row's swipe snooze menu fresh across a tick", () => {
+    vi.useFakeTimers();
+    try {
+      vi.setSystemTime(BASE_MS);
+      const atStart = buildTickList([settledThread], BASE_MS, [], {
+        snoozeEnvironmentIds: allEnvironments,
+      });
+      vi.setSystemTime(BASE_MS + MINUTE_MS);
+      const atNextMinute = buildTickList([settledThread], BASE_MS + MINUTE_MS, [], {
+        snoozeEnvironmentIds: allEnvironments,
+      });
+      const rowAtStart = atStart.find((item) => item.type === "v2-thread")!;
+      const rowAtNext = atNextMinute.find((item) => item.type === "v2-thread")!;
+      // The swipe-revealed secondary action carries the snooze preset menu on
+      // slim rows; its minute clock must move, or the displayed wake times
+      // drift while the row is recycled-stable.
+      expect(rowAtStart.type === "v2-thread" && rowAtStart.item.variant).toBe("slim");
+      expect(rowAtStart.type === "v2-thread" && rowAtStart.snoozePresetMinute).toBe(isoAt(BASE_MS));
+      expect(rowAtNext.type === "v2-thread" && rowAtNext.snoozePresetMinute).toBe(
+        isoAt(BASE_MS + MINUTE_MS),
+      );
+      expect(threadListV2ListItemsAreEqual(rowAtStart, rowAtNext)).toBe(false);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+
+  it("stamps the shelf loading-disabled state so recycled headers refresh", () => {
+    const loading = buildTickList([settledThread], BASE_MS, [], {
+      shelfPreferencesLoading: true,
+      snoozeEnvironmentIds: allEnvironments,
+    });
+    const loaded = buildTickList([settledThread], BASE_MS, [], {
+      shelfPreferencesLoading: false,
+      snoozeEnvironmentIds: allEnvironments,
+    });
+    const shelfLoading = loading.find((item) => item.type === "v2-settled-shelf")!;
+    const shelfLoaded = loaded.find((item) => item.type === "v2-settled-shelf")!;
+    expect(shelfLoading.type === "v2-settled-shelf" && shelfLoading.disabled).toBe(true);
+    expect(shelfLoaded.type === "v2-settled-shelf" && shelfLoaded.disabled).toBe(false);
+    expect(threadListV2ListItemsAreEqual(shelfLoading, shelfLoaded)).toBe(false);
+  });
+});
diff --git a/apps/mobile/src/features/threads/threadListV2.ts b/apps/mobile/src/features/threads/threadListV2.ts
index e1cb8e9ece7f..8c4dd0b0f097 100644
--- a/apps/mobile/src/features/threads/threadListV2.ts
+++ b/apps/mobile/src/features/threads/threadListV2.ts
@@ -1,5 +1,6 @@
 import { threadPullRequestSearchTerms } from "@t3tools/shared/threadPullRequests";
 import {
+  canSnooze,
   effectiveSnoozed,
   hasQueuedTurnStart,
   QUEUED_TURN_START_GRACE_MS,
@@ -13,9 +14,13 @@ import {
   sortActiveThreadsByOrderKey,
   resolveSettledThreadTimestamp,
   sortPinnedThreadsByOrderKey,
+  sortSettledThreads,
 } from "@t3tools/client-runtime/state/thread-sort";
 import type { EnvironmentId, ProjectId } from "@t3tools/contracts";
 
+import type { ThreadMoveAvailability } from "./threadOrder";
+
+import { relativeTime } from "../../lib/time";
 import type { PendingNewTask } from "../../state/use-pending-new-tasks";
 
 import {
@@ -112,26 +117,6 @@ export function resolveThreadListV2SnoozeGateExpiryMs(
 export const THREAD_LIST_V2_SETTLED_INITIAL_COUNT = 10;
 export const THREAD_LIST_V2_SETTLED_PAGE_COUNT = 25;
 
-/**
- * The flat Thread List v2 is the default on every app variant; the Settings →
- * Legacy toggle opts a device back into the grouped legacy list. Preferences
- * persist as sparse patches, so `undefined` genuinely means "never chosen".
- *
- * `preferencesLoaded` guards the startup window: preferences load
- * asynchronously, and rendering one list before the stored choice arrives would
- * remount the whole thing a tick later. While loading, hold the default — that
- * is where every device without an explicit legacy opt-in lands anyway.
- */
-export function resolveThreadListV2Enabled(input: {
-  readonly legacyPreference: boolean | undefined;
-  readonly preferencesLoaded: boolean;
-}): boolean {
-  if (!input.preferencesLoaded) {
-    return true;
-  }
-  return input.legacyPreference !== true;
-}
-
 export function resolveThreadListV2Status(
   thread: Pick<EnvironmentThreadShell, "hasPendingApprovals" | "hasPendingUserInput" | "session">,
 ): ThreadListV2Status {
@@ -244,6 +229,28 @@ export interface ThreadListV2ThreadListItem {
   readonly item: ThreadListV2Item;
   /** Precomputed so recycled-list equality can see a minute-tick change. */
   readonly snoozeWakeLabelText: string | undefined;
+  /** Row timestamp precomputed against the parent clock so the recycler's
+      equality only sees a change on rows that actually draw a time. Blank
+      while the row renders a status label or the wake countdown instead. */
+  readonly timeLabel: string;
+  /** Minute clock feeding the row's native snooze menu, carried only on rows
+      whose menu holds snooze presets (capability-gated cards the user may
+      snooze). Keeping it out of the list's `extraData` means the minute tick
+      re-renders just these rows instead of every visible one. */
+  readonly snoozePresetMinute: string | undefined;
+  /** Inset hairline drawn under the row. Precomputed from the final order so
+      a neighbour change (e.g. the queued block appearing) updates the row
+      through recycled-list equality instead of leaving a stale divider. */
+  readonly showTrailingDivider: boolean;
+  /** A message for this thread is waiting in the outbox. Carried on the item
+      so an outbox write (which never touches the thread shell) reaches the
+      row through recycled-list equality instead of leaving a stale icon. */
+  readonly hasQueuedMessages: boolean;
+  /** Move up/down availability in the row's card section. Carried on the item
+      for the same reason: a reorder in flight (or its commit) changes menu
+      availability without changing any shell. */
+  readonly canMoveUp: boolean;
+  readonly canMoveDown: boolean;
 }
 
 export interface ThreadListV2PendingListItem {
@@ -252,6 +259,9 @@ export interface ThreadListV2PendingListItem {
   readonly pendingTask: PendingNewTask;
   /** First queued row after the active block draws the PENDING divider. */
   readonly showPendingDivider: boolean;
+  /** Same rule as the thread rows: a hairline unless the next row carries its
+      own section rule or none follows. */
+  readonly showTrailingDivider: boolean;
 }
 
 export interface ThreadListV2SnoozedShelfListItem {
@@ -259,6 +269,11 @@ export interface ThreadListV2SnoozedShelfListItem {
   readonly key: "v2-snoozed-shelf";
   readonly count: number;
   readonly expanded: boolean;
+  /** Shelf preferences still loading: the toggle is disabled until they
+      arrive. Carried on the item because a recycled cell ignores the render
+      closure — without it the header would stay visibly disabled (or enabled
+      too early) after the preference load lands. */
+  readonly disabled: boolean;
 }
 
 export interface ThreadListV2SettledShelfListItem {
@@ -266,6 +281,8 @@ export interface ThreadListV2SettledShelfListItem {
   readonly key: "v2-settled-shelf";
   readonly count: number;
   readonly expanded: boolean;
+  /** See the snoozed shelf header's field. */
+  readonly disabled: boolean;
 }
 
 export type ThreadListV2ListItem =
@@ -274,6 +291,90 @@ export type ThreadListV2ListItem =
   | ThreadListV2SnoozedShelfListItem
   | ThreadListV2SettledShelfListItem;
 
+/** Narrows a wider list-item union (e.g. the sidebar's legacy + v2 mix) to
+    the v2 item kinds the shared equality understands. */
+export function isThreadListV2ListItem(value: {
+  readonly type: string;
+}): value is ThreadListV2ListItem {
+  return (
+    value.type === "v2-thread" ||
+    value.type === "v2-pending" ||
+    value.type === "v2-snoozed-shelf" ||
+    value.type === "v2-settled-shelf"
+  );
+}
+
+/** Recycled-list equality for the flat v2 list (Home + iPad sidebar).
+    Item objects are rebuilt on every minute tick and every partition run;
+    without this the lists would consider every mounted row changed and
+    re-render all of them (each carrying a swipeable + a PR subscription).
+    The clock-derived fields are per-row precomputed text, so a minute tick
+    only flips equality on rows whose visible text (or snooze menu) actually
+    moved. Thread references are stable across rebuilds. */
+export function threadListV2ListItemsAreEqual(
+  previous: ThreadListV2ListItem,
+  item: ThreadListV2ListItem,
+): boolean {
+  switch (item.type) {
+    case "v2-thread":
+      return (
+        previous.type === "v2-thread" &&
+        previous.key === item.key &&
+        previous.item.thread === item.item.thread &&
+        previous.item.variant === item.item.variant &&
+        previous.item.snoozed === item.item.snoozed &&
+        previous.item.pinned === item.item.pinned &&
+        previous.snoozeWakeLabelText === item.snoozeWakeLabelText &&
+        previous.timeLabel === item.timeLabel &&
+        previous.snoozePresetMinute === item.snoozePresetMinute &&
+        previous.showTrailingDivider === item.showTrailingDivider &&
+        previous.hasQueuedMessages === item.hasQueuedMessages &&
+        previous.canMoveUp === item.canMoveUp &&
+        previous.canMoveDown === item.canMoveDown
+      );
+    case "v2-pending":
+      return (
+        previous.type === "v2-pending" &&
+        previous.key === item.key &&
+        previous.pendingTask === item.pendingTask &&
+        previous.showPendingDivider === item.showPendingDivider &&
+        previous.showTrailingDivider === item.showTrailingDivider
+      );
+    case "v2-snoozed-shelf":
+      return (
+        previous.type === "v2-snoozed-shelf" &&
+        previous.count === item.count &&
+        previous.expanded === item.expanded &&
+        previous.disabled === item.disabled
+      );
+    case "v2-settled-shelf":
+      return (
+        previous.type === "v2-settled-shelf" &&
+        previous.count === item.count &&
+        previous.expanded === item.expanded &&
+        previous.disabled === item.disabled
+      );
+  }
+}
+
+/** The timestamp a row renders when it shows no status label: the settle
+    stamp on settled slim rows, otherwise the latest activity. Blank for
+    status-labelled cards and snoozed rows with a wake countdown — those
+    never draw a time, so their minute tick must not invalidate the cell. */
+function resolveThreadListV2ItemTimeLabel(
+  item: ThreadListV2Item,
+  showSnoozeWakeLabel: boolean,
+): string {
+  const { thread, variant, snoozed } = item;
+  if (showSnoozeWakeLabel) return "";
+  if (variant === "card" && resolveThreadListV2Status(thread) !== "ready") return "";
+  const settledTimestamp =
+    variant === "slim" && !snoozed ? resolveSettledThreadTimestamp(thread) : null;
+  return relativeTime(
+    settledTimestamp ?? thread.latestUserMessageAt ?? thread.updatedAt ?? thread.createdAt,
+  );
+}
+
 /**
  * Builds the shared mobile order: active → pending → snoozed shelf → settled.
  * Pending tasks are waiting rather than asking, and parked work remains
@@ -289,21 +390,64 @@ export function buildThreadListV2ListItems(input: {
   readonly settledShelfExpanded?: boolean;
   readonly settledShelfHeaderIndex?: number | null;
   readonly snoozeLabelNow?: string;
+  /** Environments whose server supports thread.snooze. Rows on other
+      environments never carry the minute clock that feeds the snooze menu.
+      Absent = no gating (tests). */
+  readonly snoozeEnvironmentIds?: ReadonlySet<EnvironmentId>;
+  /** Thread keys (`environmentId:threadId`) with a message waiting in the
+      outbox; stamped onto the matching rows as `hasQueuedMessages`. */
+  readonly queuedThreadKeys?: ReadonlySet<string>;
+  /** Menu availability for Move up/down, keyed by `environmentId:threadId`
+      (only consulted for card rows — slim menus omit the moves). Produced by
+      `computeThreadMoveAvailability` in one pass per section; a recycled cell
+      ignores the render closure, so the stamps ride on the item. Absent =
+      never available (tests). */
+  readonly moveAvailability?: ReadonlyMap<string, ThreadMoveAvailability>;
+  /** True while the shelf expansion preferences are still loading; stamped
+      onto both shelf headers so the disabled state reaches recycled cells. */
+  readonly shelfPreferencesLoading?: boolean;
 }): ThreadListV2ListItem[] {
-  const threadItems = input.items.map((item): ThreadListV2ListItem => ({
-    type: "v2-thread",
-    key: `v2-thread:${item.thread.environmentId}:${item.thread.id}`,
-    item,
-    snoozeWakeLabelText:
+  const threadItems = input.items.map((item): ThreadListV2ListItem => {
+    const snoozeWakeLabelText =
       item.snoozed && item.thread.snoozedUntil != null && input.snoozeLabelNow !== undefined
         ? snoozeWakeLabel(item.thread.snoozedUntil, { now: input.snoozeLabelNow })
-        : undefined,
-  }));
+        : undefined;
+    // The minute clock belongs on the item, not the list's extraData, so the
+    // recycler's equality can confine the per-minute re-render to rows whose
+    // snooze menu actually shows preset times. The swipe-revealed snooze menu
+    // exists on slim rows too (the variant only swaps the primary action),
+    // so the gate follows actual snooze availability, not the variant.
+    const snoozePresetMinute =
+      !item.snoozed &&
+      input.snoozeLabelNow !== undefined &&
+      (input.snoozeEnvironmentIds?.has(item.thread.environmentId) ?? true) &&
+      canSnooze(item.thread, { now: input.snoozeLabelNow })
+        ? input.snoozeLabelNow
+        : undefined;
+    const move =
+      item.variant === "card"
+        ? input.moveAvailability?.get(`${item.thread.environmentId}:${item.thread.id}`)
+        : undefined;
+    return {
+      type: "v2-thread",
+      key: `v2-thread:${item.thread.environmentId}:${item.thread.id}`,
+      item,
+      snoozeWakeLabelText,
+      timeLabel: resolveThreadListV2ItemTimeLabel(item, snoozeWakeLabelText !== undefined),
+      snoozePresetMinute,
+      showTrailingDivider: false,
+      hasQueuedMessages:
+        input.queuedThreadKeys?.has(`${item.thread.environmentId}:${item.thread.id}`) === true,
+      canMoveUp: move?.canMoveUp === true,
+      canMoveDown: move?.canMoveDown === true,
+    };
+  });
   const pendingItems = input.pendingTasks.map((pendingTask, index): ThreadListV2ListItem => ({
     type: "v2-pending",
     key: `v2-${pendingTask.key}`,
     pendingTask,
     showPendingDivider: index === 0,
+    showTrailingDivider: false,
   }));
   const snoozedCount = input.snoozedCount ?? 0;
   const snoozedShelfHeaderIndex = input.snoozedShelfHeaderIndex ?? null;
@@ -312,12 +456,14 @@ export function buildThreadListV2ListItems(input: {
   const activeEnd = snoozedShelfHeaderIndex ?? settledShelfHeaderIndex ?? threadItems.length;
   const snoozedEnd = settledShelfHeaderIndex ?? threadItems.length;
   const result: ThreadListV2ListItem[] = [...threadItems.slice(0, activeEnd), ...pendingItems];
+  const shelfDisabled = input.shelfPreferencesLoading === true;
   if (snoozedShelfHeaderIndex !== null && snoozedCount > 0) {
     result.push({
       type: "v2-snoozed-shelf",
       key: "v2-snoozed-shelf",
       count: snoozedCount,
       expanded: input.snoozedShelfExpanded === true,
+      disabled: shelfDisabled,
     });
     result.push(...threadItems.slice(snoozedShelfHeaderIndex, snoozedEnd));
   }
@@ -327,10 +473,21 @@ export function buildThreadListV2ListItems(input: {
       key: "v2-settled-shelf",
       count: settledCount,
       expanded: input.settledShelfExpanded !== false,
+      disabled: shelfDisabled,
     });
     result.push(...threadItems.slice(settledShelfHeaderIndex));
   }
-  return result;
+  // Hairlines depend on the final neighbour, so they are stamped after the
+  // splice: a recycled cell only re-renders when its divider actually flips.
+  return result.map((entry, index) => {
+    if (entry.type !== "v2-thread" && entry.type !== "v2-pending") return entry;
+    const next = result[index + 1];
+    const showTrailingDivider =
+      next?.type === "v2-thread" || (next?.type === "v2-pending" && !next.showPendingDivider);
+    return showTrailingDivider === entry.showTrailingDivider
+      ? entry
+      : { ...entry, showTrailingDivider };
+  });
 }
 
 /**
@@ -450,11 +607,7 @@ export function buildThreadListV2Items(input: {
       : orderedSnoozed.filter(
           (thread) => `${thread.environmentId}:${thread.id}` === selectedThreadKey,
         );
-  const orderedSettled = [...settled].sort(
-    (left, right) =>
-      parseTimestampMs(resolveSettledThreadTimestamp(right) ?? "") -
-      parseTimestampMs(resolveSettledThreadTimestamp(left) ?? ""),
-  );
+  const orderedSettled = sortSettledThreads(settled);
   const settledLimit = input.settledLimit ?? Number.POSITIVE_INFINITY;
   const pagedSettled =
     orderedSettled.length > settledLimit ? orderedSettled.slice(0, settledLimit) : orderedSettled;
diff --git a/apps/mobile/src/features/threads/threadOrder.ts b/apps/mobile/src/features/threads/threadOrder.ts
index c71c1040bf40..570251f4a985 100644
--- a/apps/mobile/src/features/threads/threadOrder.ts
+++ b/apps/mobile/src/features/threads/threadOrder.ts
@@ -1,5 +1,9 @@
 import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
-import { planPinnedReorder } from "@t3tools/client-runtime/state/thread-sort";
+import {
+  generateSpreadPinOrderKeys,
+  pinOrderKeyBetween,
+  planPinnedReorder,
+} from "@t3tools/client-runtime/state/thread-sort";
 import { effectiveSnoozed } from "@t3tools/client-runtime/state/thread-settled";
 import type { EnvironmentId } from "@t3tools/contracts";
 
@@ -42,7 +46,7 @@ export function threadOrderAfterMove(
   return result;
 }
 
-type OrderRow = Pick<
+export type OrderRow = Pick<
   EnvironmentThreadShell,
   | "id"
   | "environmentId"
@@ -106,6 +110,143 @@ export function createThreadMovePlanner(input: {
   };
 }
 
+export interface ThreadMoveAvailability {
+  readonly canMoveUp: boolean;
+  readonly canMoveDown: boolean;
+}
+
+/**
+ * Batch form of "call `createThreadMovePlanner` once per card": one pass over
+ * the section answers up/down availability for every ordered row, so list
+ * construction stays linear instead of one full planner probe (array copies,
+ * hidden-key rescans) per row on the minute-tick rebuild path. The mirror of
+ * the planner's plan rules lives in the body below; the reference-parity test
+ * pins them row-by-row, including adversarial keys and hidden reservations.
+ */
+export function computeThreadMoveAvailability(input: {
+  readonly ordered: readonly OrderRow[];
+  readonly allThreads?: readonly OrderRow[];
+  readonly section: PendingThreadOrder["section"];
+  readonly reorderableEnvironmentIds: ReadonlySet<EnvironmentId>;
+  readonly pendingOrder?: PendingThreadOrder | null;
+}): Map<string, ThreadMoveAvailability> {
+  const result = new Map<string, ThreadMoveAvailability>();
+  // A reorder in flight locks the whole list until its receipt lands.
+  if (input.pendingOrder != null) return result;
+  const rows = input.ordered;
+  const orderedIds = rows.map(rowId);
+  const indexById = new Map(orderedIds.map((id, index) => [id, index] as const));
+  const keysById = new Map(
+    (input.allThreads ?? input.ordered).map(
+      (row) => [rowId(row), rowOrder(row, input.section).key] as const,
+    ),
+  );
+  const writableIds = new Set(
+    (input.allThreads ?? input.ordered)
+      .filter((row) => input.reorderableEnvironmentIds.has(row.environmentId))
+      .map(rowId),
+  );
+  const visibleIds = new Set(orderedIds);
+  const reservedKeys = new Set(
+    [...keysById].flatMap(([id, key]) => (!visibleIds.has(id) && key != null ? [key] : [])),
+  );
+  // Mirror of `planPinnedReorder` for adjacent swaps, hoisted so every row is
+  // answered in O(1) amortized instead of one planner probe per row:
+  //
+  // Fast path (both neighbors keyed): the fresh key between the landing
+  // neighbors, walking forward while hidden reserved keys block it. The walk
+  // depends only on the neighbor key pair - each adjacency is probed by at
+  // most two rows (down of the left member, up of the right member) - so the
+  // memo keeps even a fully adversarial reserved-key layout linear per build.
+  //
+  // Rewrite path (keyless/unusable neighbor, or key space exhausted): fresh
+  // spread keys for every row; only positions whose current key differs get
+  // written. A swap permutes two rows without changing the multiset, so the
+  // assignment set differs from the unswapped baseline at at most those two
+  // positions, and mismatch/writability tallies computed once per section
+  // answer each row with a constant-size delta.
+  const midpoints = new Map<string, string | null>();
+  const fastPathKey = (beforeKey: string | null, afterKey: string | null): string | null => {
+    const memoKey = `${beforeKey ?? ""}\u0000${afterKey ?? ""}`;
+    const cached = midpoints.get(memoKey);
+    if (cached !== undefined) return cached;
+    let key = pinOrderKeyBetween(beforeKey, afterKey);
+    while (key !== null && reservedKeys.has(key)) key = pinOrderKeyBetween(key, afterKey);
+    midpoints.set(memoKey, key);
+    return key;
+  };
+  const spreadKeys = generateSpreadPinOrderKeys(orderedIds.length + reservedKeys.size)
+    .filter((key) => !reservedKeys.has(key))
+    .slice(0, orderedIds.length);
+  const currentKeys = orderedIds.map((id) => keysById.get(id) ?? null);
+  const writableRow = orderedIds.map((id) => writableIds.has(id));
+  let baselineWrites = 0;
+  let baselineUnwritableWrites = 0;
+  for (let position = 0; position < orderedIds.length; position += 1) {
+    if (currentKeys[position] === spreadKeys[position]) continue;
+    baselineWrites += 1;
+    if (!writableRow[position]) baselineUnwritableWrites += 1;
+  }
+  // `movedId` swaps with its neighbor; ids at the two swapped positions change,
+  // so only their tally contributions are recomputed.
+  const rewriteViable = (index: number): boolean => {
+    let writes = baselineWrites;
+    let unwritableWrites = baselineUnwritableWrites;
+    for (const position of [index, index + 1]) {
+      const other = position === index ? index + 1 : index;
+      if (currentKeys[position] !== spreadKeys[position]) {
+        writes -= 1;
+        if (!writableRow[position]) unwritableWrites -= 1;
+      }
+      // After the swap this position holds the row that was at `other`.
+      if (currentKeys[other] !== spreadKeys[position]) {
+        writes += 1;
+        if (!writableRow[other]) unwritableWrites += 1;
+      }
+    }
+    return writes > 0 && unwritableWrites === 0;
+  };
+  for (const row of rows) {
+    const movedId = rowId(row);
+    const denied = { canMoveUp: false, canMoveDown: false };
+    if (!writableIds.has(movedId)) {
+      result.set(movedId, denied);
+      continue;
+    }
+    const index = indexById.get(movedId);
+    if (index === undefined) {
+      result.set(movedId, denied);
+      continue;
+    }
+    const adjacentAvailable = (towardUp: boolean): boolean => {
+      const shifted = index + (towardUp ? -1 : 1);
+      if (shifted < 0 || shifted >= orderedIds.length) return false;
+      // The swap exchanges the row with its neighbor; afterwards the moved row
+      // sits at `shifted` between `beforeIndex` and `afterIndex` of the OLD
+      // order: moving up it lands between old(index-2) and old(index-1),
+      // moving down between old(index+1) and old(index+2).
+      const beforeIndex = towardUp ? index - 2 : index + 1;
+      const afterIndex = towardUp ? index - 1 : index + 2;
+      const beforeId = beforeIndex < 0 ? null : (orderedIds[beforeIndex] ?? null);
+      const afterId = afterIndex >= orderedIds.length ? null : (orderedIds[afterIndex] ?? null);
+      const beforeKey = beforeId === null ? null : (keysById.get(beforeId) ?? null);
+      const afterKey = afterId === null ? null : (keysById.get(afterId) ?? null);
+      if ((beforeId === null || beforeKey != null) && (afterId === null || afterKey != null)) {
+        const key = fastPathKey(beforeKey, afterKey);
+        // A fresh key is a single-write plan for the (writable) moved row.
+        if (key !== null) return true;
+      }
+      // Keyless neighbor or exhausted key space: the section rewrite runs.
+      return rewriteViable(Math.min(index, shifted));
+    };
+    result.set(movedId, {
+      canMoveUp: adjacentAvailable(true),
+      canMoveDown: adjacentAvailable(false),
+    });
+  }
+  return result;
+}
+
 export function createPendingThreadOrder(input: {
   readonly section: PendingThreadOrder["section"];
   readonly ordered: readonly OrderRow[];
diff --git a/apps/mobile/src/features/threads/threadOrderAvailability.test.ts b/apps/mobile/src/features/threads/threadOrderAvailability.test.ts
new file mode 100644
index 000000000000..765eff4cf61e
--- /dev/null
+++ b/apps/mobile/src/features/threads/threadOrderAvailability.test.ts
@@ -0,0 +1,265 @@
+import { describe, expect, it } from "vite-plus/test";
+import {
+  generateSpreadPinOrderKeys,
+  pinOrderKeyBetween,
+} from "@t3tools/client-runtime/state/thread-sort";
+import type { EnvironmentId } from "@t3tools/contracts";
+
+import {
+  computeThreadMoveAvailability,
+  createThreadMovePlanner,
+  type OrderRow,
+} from "./threadOrder";
+
+// The batch availability computation must answer exactly what the reference
+// per-move planner answers; these tests randomize sections that stress every
+// branch (keyless rows, hidden keys, non-writable rows, adversarial keys).
+
+function makeRow(id: string, environmentId: string, key: string | null, pinned: boolean): OrderRow {
+  return {
+    id: id as OrderRow["id"],
+    environmentId: environmentId as OrderRow["environmentId"],
+    pinOrderKey: pinned ? key : null,
+    activeOrderKey: pinned ? null : key,
+    createdAt: "2026-01-01T00:00:00.000Z",
+    unsettledAt: "2026-01-01T00:00:00.000Z",
+    pinnedAt: pinned ? "2026-01-01T00:00:00.000Z" : null,
+  };
+}
+
+function makeRng(seed: number) {
+  let state = seed >>> 0;
+  return () => {
+    state = (state * 1_664_525 + 1_013_904_223) >>> 0;
+    return state / 0x1_0000_0000;
+  };
+}
+
+const KEY_POOL = [
+  "a",
+  "b",
+  "ba",
+  "bb",
+  "c",
+  "d",
+  "ca",
+  "cb",
+  "da",
+  "db",
+  "e",
+  "f",
+  "g",
+  "h",
+  "i",
+  "j",
+  "k",
+  "l",
+  "m",
+  "n",
+  "o",
+  "p",
+  "q",
+  "r",
+  "s",
+  "t",
+  "u",
+  "v",
+  "w",
+  "x",
+  "y",
+  "z",
+  null,
+];
+
+function referenceAvailability(
+  ordered: readonly OrderRow[],
+  allThreads: readonly OrderRow[],
+  writable: ReadonlySet<EnvironmentId>,
+) {
+  const planner = createThreadMovePlanner({
+    ordered,
+    allThreads,
+    section: "pinned",
+    reorderableEnvironmentIds: writable,
+  });
+  const answers = new Map<string, { canMoveUp: boolean; canMoveDown: boolean }>();
+  for (const row of ordered) {
+    const movedId = `${row.environmentId}:${row.id}`;
+    answers.set(movedId, {
+      canMoveUp: planner(movedId, "up") !== null,
+      canMoveDown: planner(movedId, "down") !== null,
+    });
+  }
+  return answers;
+}
+
+function randomCase(rng: () => number) {
+  const rowCount = 1 + Math.floor(rng() * 9);
+  // Two environments; "writable" env vs. one lacking the reorder capability.
+  const rows: OrderRow[] = [];
+  for (let index = 0; index < rowCount; index += 1) {
+    const environment = rng() < 0.75 ? "env-w" : "env-x";
+    const key = KEY_POOL[Math.floor(rng() * KEY_POOL.length)] ?? null;
+    // Ids with colons: a `${environmentId}:${id}` string is not splittable
+    // back into its parts, so batch and planner must agree even here.
+    const id = rng() < 0.4 ? `t:${index}` : `t${index}`;
+    rows.push(makeRow(id, environment, key, true));
+  }
+  // Hidden rows (in allThreads, not in the visible ordered section) may hold
+  // keys that collide with fast-path midpoints.
+  const hidden: OrderRow[] = [];
+  const hiddenCount = Math.floor(rng() * 4);
+  for (let index = 0; index < hiddenCount; index += 1) {
+    const key = KEY_POOL[Math.floor(rng() * KEY_POOL.length)] ?? null;
+    const id = rng() < 0.4 ? `h:${index}` : `h${index}`;
+    hidden.push(makeRow(id, rng() < 0.75 ? "env-w" : "env-x", key, true));
+  }
+  return { ordered: rows, allThreads: [...rows, ...hidden] };
+}
+
+const WRITABLE = new Set<EnvironmentId>(["env-w" as EnvironmentId]);
+
+describe("computeThreadMoveAvailability matches the reference planner", () => {
+  it("agrees across randomized sections (keys, holes, non-writable rows, hidden keys)", () => {
+    for (let seed = 1; seed <= 4_000; seed += 1) {
+      const rng = makeRng(seed);
+      const { ordered, allThreads } = randomCase(rng);
+      const batch = computeThreadMoveAvailability({
+        ordered,
+        allThreads,
+        section: "pinned",
+        reorderableEnvironmentIds: WRITABLE,
+      });
+      const reference = referenceAvailability(ordered, allThreads, WRITABLE);
+      for (const [id, answer] of reference) {
+        expect(
+          batch.get(id) ?? { canMoveUp: false, canMoveDown: false },
+          `seed ${seed} row ${id} ordered=${ordered
+            .map((row) => `${row.id}:${row.pinOrderKey ?? "-"}:${row.environmentId}`)
+            .join(",")}`,
+        ).toEqual(answer);
+      }
+    }
+  });
+
+  it("locks every row while a pending reorder is in flight", () => {
+    const rows = [makeRow("t0", "env-w", "a", true), makeRow("t1", "env-w", "c", true)];
+    const pending = {
+      section: "pinned" as const,
+      orderedIds: ["env-w:t1", "env-w:t0"],
+      before: new Map(),
+      assignments: new Map(),
+      confirmed: new Set<string>(),
+      commandsComplete: false,
+    };
+    const batch = computeThreadMoveAvailability({
+      ordered: rows,
+      section: "pinned",
+      reorderableEnvironmentIds: WRITABLE,
+      pendingOrder: pending,
+    });
+    expect(batch.size).toBe(0);
+  });
+
+  it("allows the fast-path walk past reserved keys and rewrites that skip matching keys (auditor cases)", () => {
+    // Reported parity case: keys ["f","gn",null], middle row NOT writable.
+    // The rewrite assigns the middle row the key it already holds, so the
+    // diff never writes it and the first row's down-move stays available.
+    const rows = [makeRow("t0", "env-w", "f", true), makeRow("t1", "env-x", "gn", true)];
+    const withThird = [...rows, makeRow("t2", "env-w", null, true)];
+    const batch = computeThreadMoveAvailability({
+      ordered: withThird,
+      allThreads: withThird,
+      section: "pinned",
+      reorderableEnvironmentIds: WRITABLE,
+    });
+    const reference = referenceAvailability(withThird, withThird, WRITABLE);
+    expect(Object.fromEntries(batch)).toEqual(Object.fromEntries(reference));
+    expect(batch.get("env-w:t0")).toEqual({ canMoveUp: false, canMoveDown: true });
+  });
+
+  it("keeps moves available for ids containing colons (composite-id parsing)", () => {
+    // The reported case: environment `env`, ids `thread:1`/`thread:2`. Splitting
+    // the composite id at the last colon yields `env:thread` and falsely locks
+    // both rows; writability must come from the row's own environmentId.
+    const rows = [makeRow("thread:1", "env", "a", true), makeRow("thread:2", "env", "c", true)];
+    const batch = computeThreadMoveAvailability({
+      ordered: rows,
+      section: "pinned",
+      reorderableEnvironmentIds: new Set<EnvironmentId>(["env" as EnvironmentId]),
+    });
+    const reference = referenceAvailability(
+      rows,
+      rows,
+      new Set<EnvironmentId>(["env" as EnvironmentId]),
+    );
+    expect(Object.fromEntries(batch)).toEqual(Object.fromEntries(reference));
+    expect(batch.get("env:thread:1")).toEqual({ canMoveUp: false, canMoveDown: true });
+    expect(batch.get("env:thread:2")).toEqual({ canMoveUp: true, canMoveDown: false });
+  });
+
+  it("denies single-row sections on both directions", () => {
+    const rows = [makeRow("t0", "env-w", "a", true)];
+    const batch = computeThreadMoveAvailability({
+      ordered: rows,
+      section: "pinned",
+      reorderableEnvironmentIds: WRITABLE,
+    });
+    expect(batch.get("env-w:t0")).toEqual({ canMoveUp: false, canMoveDown: false });
+  });
+
+  it("denies rows whose section has non-writable neighbours when the fast path fails", () => {
+    // Keyless neighbors force the section-rewrite fallback; a non-writable
+    // neighbor makes the rewrite illegal for every row in the section.
+    const rows = [
+      makeRow("t0", "env-w", null, true),
+      makeRow("t1", "env-x", "c", true),
+      makeRow("t2", "env-w", "d", true),
+    ];
+    const batch = computeThreadMoveAvailability({
+      ordered: rows,
+      allThreads: rows,
+      section: "pinned",
+      reorderableEnvironmentIds: WRITABLE,
+    });
+    const reference = referenceAvailability(rows, rows, WRITABLE);
+    expect(Object.fromEntries(batch)).toEqual(Object.fromEntries(reference));
+    // Sanity: the middle (non-writable) row is denied on both sides.
+    expect(batch.get("env-x:t1")).toEqual({ canMoveUp: false, canMoveDown: false });
+  });
+
+  it("agrees on a section where every adjacency midpoint is a hidden reserved key", () => {
+    // The worst case for reserved-key collisions: one hidden row holds the
+    // exact midpoint key of every adjacent visible pair, so every probe walks.
+    const visibleKeys = generateSpreadPinOrderKeys(24);
+    const hiddenKeys = visibleKeys
+      .slice(0, -1)
+      .map((key, index) => pinOrderKeyBetween(key, visibleKeys[index + 1]!))
+      .filter((key): key is string => key != null);
+    const ordered = visibleKeys.map((key, index) => makeRow(`v${index}`, "env-w", key, true));
+    const hidden = hiddenKeys.map((key, index) => makeRow(`h${index}`, "env-w", key, true));
+    const allThreads = [...ordered, ...hidden];
+    const batch = computeThreadMoveAvailability({
+      ordered,
+      allThreads,
+      section: "pinned",
+      reorderableEnvironmentIds: WRITABLE,
+    });
+    const reference = referenceAvailability(ordered, allThreads, WRITABLE);
+    expect(Object.fromEntries(batch)).toEqual(Object.fromEntries(reference));
+  });
+
+  it("agrees on an adversarial section of consecutive single-char keys", () => {
+    // Every midpoint between consecutive one-char keys is unrepresentable, so
+    // no row may claim a fast-path plan.
+    const rows = ["a", "b", "c", "d"].map((key, index) => makeRow(`t${index}`, "env-w", key, true));
+    const batch = computeThreadMoveAvailability({
+      ordered: rows,
+      allThreads: rows,
+      section: "pinned",
+      reorderableEnvironmentIds: WRITABLE,
+    });
+    const reference = referenceAvailability(rows, rows, WRITABLE);
+    expect(Object.fromEntries(batch)).toEqual(Object.fromEntries(reference));
+  });
+});
diff --git a/apps/mobile/src/features/threads/threadPresentation.ts b/apps/mobile/src/features/threads/threadPresentation.ts
deleted file mode 100644
index b5f286937e0c..000000000000
--- a/apps/mobile/src/features/threads/threadPresentation.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import type { StatusTone } from "../../components/StatusPill";
-import type { OrchestrationLatestTurn, OrchestrationSession } from "@t3tools/contracts";
-import { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
-
-export type ThreadStatusKind =
-  | "pending-approval"
-  | "awaiting-input"
-  | "working"
-  | "connecting"
-  | "error"
-  | "plan-ready";
-
-export interface ThreadStatusPresentation extends StatusTone {
-  readonly kind: ThreadStatusKind;
-  /** Whether the indicator represents in-flight activity. */
-  readonly pulse: boolean;
-}
-
-function isLatestTurnSettled(
-  latestTurn: OrchestrationLatestTurn | null,
-  session: OrchestrationSession | null,
-): boolean {
-  if (!latestTurn?.startedAt) return false;
-  if (!latestTurn.completedAt) return false;
-  if (!session) return true;
-  return session.status !== "running";
-}
-
-/**
- * Resolves the user-facing status of a thread, in priority order. Returns
- * `null` for quiescent threads so rows stay free of "Idle"-style noise.
- * Mirrors `resolveThreadStatusPill` in apps/web/src/components/Sidebar.logic.ts.
- */
-export function resolveThreadStatus(
-  thread: EnvironmentThreadShell,
-): ThreadStatusPresentation | null {
-  if (thread.hasPendingApprovals) {
-    return {
-      kind: "pending-approval",
-      label: "Needs Approval",
-      pillClassName: "bg-warning",
-      textClassName: "text-warning-foreground",
-      pulse: false,
-    };
-  }
-
-  if (thread.hasPendingUserInput) {
-    return {
-      kind: "awaiting-input",
-      label: "Awaiting Input",
-      pillClassName: "bg-adaptive-indigo-500-a12-a16",
-      textClassName: "text-adaptive-indigo-600-300",
-      pulse: false,
-    };
-  }
-
-  if (thread.session?.status === "running") {
-    return {
-      kind: "working",
-      label: "Working",
-      pillClassName: "bg-adaptive-sky-500-a12-a16",
-      textClassName: "text-adaptive-sky-600-400",
-      pulse: true,
-    };
-  }
-
-  if (thread.session?.status === "starting") {
-    return {
-      kind: "connecting",
-      label: "Connecting",
-      pillClassName: "bg-adaptive-sky-500-a12-a16",
-      textClassName: "text-adaptive-sky-600-400",
-      pulse: true,
-    };
-  }
-
-  if (thread.session?.status === "error" || thread.latestTurn?.state === "error") {
-    return {
-      kind: "error",
-      label: "Error",
-      pillClassName: "bg-danger",
-      textClassName: "text-danger-foreground",
-      pulse: false,
-    };
-  }
-
-  const hasPlanReadyPrompt =
-    thread.interactionMode === "plan" &&
-    isLatestTurnSettled(thread.latestTurn, thread.session) &&
-    thread.hasActionableProposedPlan;
-  if (hasPlanReadyPrompt) {
-    return {
-      kind: "plan-ready",
-      label: "Plan Ready",
-      pillClassName: "bg-adaptive-violet-500-a12-a16",
-      textClassName: "text-adaptive-violet-600-400",
-      pulse: false,
-    };
-  }
-
-  return null;
-}
diff --git a/apps/mobile/src/features/threads/use-legacy-plan-mode-enabled.ts b/apps/mobile/src/features/threads/use-legacy-plan-mode-enabled.ts
index 61c4fb65cdc9..684049155a9e 100644
--- a/apps/mobile/src/features/threads/use-legacy-plan-mode-enabled.ts
+++ b/apps/mobile/src/features/threads/use-legacy-plan-mode-enabled.ts
@@ -2,7 +2,7 @@ import { useAtomValue } from "@effect/atom-react";
 import { AsyncResult } from "effect/unstable/reactivity";
 
 import { mobilePreferencesAtom } from "../../state/preferences";
-import { resolveLegacyPlanModeEnabled } from "./legacy-plan-mode";
+import { resolveLegacyPlanModeEnabled } from "../../state/legacy-plan-mode";
 
 /**
  * Mobile preferences are device-local, matching the desktop client setting.
diff --git a/apps/mobile/src/features/threads/use-thread-list-v2-enabled.ts b/apps/mobile/src/features/threads/use-thread-list-v2-enabled.ts
deleted file mode 100644
index 2672942c2d36..000000000000
--- a/apps/mobile/src/features/threads/use-thread-list-v2-enabled.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useAtomValue } from "@effect/atom-react";
-import { AsyncResult } from "effect/unstable/reactivity";
-
-import { mobilePreferencesAtom } from "../../state/preferences";
-import { resolveThreadListV2Enabled } from "./threadListV2";
-
-/**
- * Resolved Thread List v2 state: on unless the device opted into the legacy
- * grouped list (Settings → Legacy). Every consumer must read through this
- * rather than the raw preference, which is undefined until explicitly chosen.
- */
-export function useThreadListV2Enabled(): boolean {
-  const preferencesResult = useAtomValue(mobilePreferencesAtom);
-  const loaded = AsyncResult.isSuccess(preferencesResult);
-  return resolveThreadListV2Enabled({
-    legacyPreference: loaded ? preferencesResult.value.legacyThreadListEnabled : undefined,
-    preferencesLoaded: loaded,
-  });
-}
diff --git a/apps/mobile/src/features/usage/ChatGptUsageSummary.tsx b/apps/mobile/src/features/usage/ChatGptUsageSummary.tsx
new file mode 100644
index 000000000000..10f18a51acd1
--- /dev/null
+++ b/apps/mobile/src/features/usage/ChatGptUsageSummary.tsx
@@ -0,0 +1,41 @@
+import { useAtomValue } from "@effect/atom-react";
+import type { EnvironmentId } from "@t3tools/contracts";
+import { CHATGPT_USAGE_URL, collectExternalUsageLinks } from "@t3tools/shared/usageLimits";
+import { Linking, Pressable, View } from "react-native";
+import { AppText as Text } from "../../components/AppText";
+import { ProviderIcon } from "../../components/ProviderIcon";
+import { environmentPresentations } from "../../state/presentation";
+
+export function ChatGptUsageSummary({
+  selectedEnvironmentIds,
+}: {
+  selectedEnvironmentIds: ReadonlySet<EnvironmentId> | null;
+}) {
+  const presentations = useAtomValue(environmentPresentations.presentationsAtom);
+  const selected =
+    selectedEnvironmentIds === null
+      ? presentations
+      : new Map([...presentations].filter(([id]) => selectedEnvironmentIds.has(id)));
+  const usage = collectExternalUsageLinks(selected).find((link) => link.url === CHATGPT_USAGE_URL);
+  if (!usage) return null;
+  return (
+    <View className="gap-1">
+      <View className="flex-row items-center justify-between gap-3">
+        <View className="flex-row items-center gap-2">
+          <ProviderIcon provider="codex" size={16} />
+          <Text className="text-sm text-foreground">ChatGPT shared usage</Text>
+        </View>
+        <Pressable
+          accessibilityRole="link"
+          className="min-h-11 justify-center"
+          onPress={() => void Linking.openURL(usage.url).catch(() => undefined)}
+        >
+          <Text className="text-sm font-t3-medium text-primary">Manage usage</Text>
+        </Pressable>
+      </View>
+      <Text className="text-xs text-foreground-muted">
+        {usage.accounts.join(", ")}. Open ChatGPT with the account you connected.
+      </Text>
+    </View>
+  );
+}
diff --git a/apps/mobile/src/features/usage/UsageLimitsPooled.tsx b/apps/mobile/src/features/usage/UsageLimitsPooled.tsx
index 4e3e7339765c..36d01838b0e0 100644
--- a/apps/mobile/src/features/usage/UsageLimitsPooled.tsx
+++ b/apps/mobile/src/features/usage/UsageLimitsPooled.tsx
@@ -3,16 +3,19 @@ import { useNavigation, type StaticScreenProps } from "@react-navigation/native"
 import { EnvironmentId } from "@t3tools/contracts";
 import {
   collectLimitAccounts,
+  collectExternalUsageLinks,
   collectLimitNotices,
   collectLimitPools,
+  cursorUsageWindowDetails,
+  displayLimitWindows,
   formatDuration,
   formatResetsIn,
   remainingPercent,
   type LimitAccount,
   type LimitPoolWindow,
 } from "@t3tools/shared/usageLimits";
-import { useId, useState } from "react";
-import { Pressable, ScrollView, View } from "react-native";
+import { Fragment, type ReactNode, useId, useState } from "react";
+import { Linking, Pressable, ScrollView, View } from "react-native";
 import { Defs, Path, Pattern, Rect, Svg } from "react-native-svg";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
@@ -70,11 +73,15 @@ function PoolWindowCard({
   color,
   now,
   environmentIds,
+  label,
+  description,
 }: {
   readonly pool: LimitPoolWindow;
   readonly color: string;
   readonly now: number;
   readonly environmentIds: readonly string[] | null;
+  readonly label?: string;
+  readonly description?: string;
 }) {
   const navigation = useNavigation();
   const nextRefill = pool.resets.find((reset) => reset.restoresPercent > 0);
@@ -96,7 +103,7 @@ function PoolWindowCard({
     <View className="gap-3 rounded-[24px] border-continuous bg-card p-4">
       <View className="flex-row items-start justify-between gap-3">
         <View className="gap-1">
-          <Text className="text-sm font-t3-medium text-foreground">{pool.label}</Text>
+          <Text className="text-sm font-t3-medium text-foreground">{label ?? pool.label}</Text>
           <View className="flex-row items-baseline gap-1.5">
             <Text className="text-3xl font-t3-bold tabular-nums text-foreground">
               {pool.remainingPercent}%
@@ -108,6 +115,7 @@ function PoolWindowCard({
           <Text className="text-xs text-foreground-tertiary">{PACE_LABEL[pool.pace]}</Text>
         ) : null}
       </View>
+      {description ? <Text className="text-xs text-foreground-muted">{description}</Text> : null}
       {nextRefill ? (
         <Text className="text-xs tabular-nums text-foreground-muted">
           ↻ +{nextRefill.restoresPercent}%{" "}
@@ -196,10 +204,12 @@ export function UsageLimitsSection({
   now,
   failedLabels,
   selectedEnvironmentIds,
+  cursorPrompt,
 }: {
   readonly now: number;
   readonly failedLabels: readonly string[];
   readonly selectedEnvironmentIds: ReadonlySet<EnvironmentId> | null;
+  readonly cursorPrompt?: ReactNode;
 }) {
   const presentations = useAtomValue(environmentPresentations.presentationsAtom);
   const selected =
@@ -208,33 +218,74 @@ export function UsageLimitsSection({
       : new Map([...presentations].filter(([id]) => selectedEnvironmentIds.has(id)));
   const pools = collectLimitPools(collectLimitAccounts(selected), now);
   const notices = collectLimitNotices(selected);
+  const externalLinks = collectExternalUsageLinks(selected);
   const colors = useProviderColors();
+  const cursorPromptAt =
+    Math.max(
+      pools.findIndex((pool) => pool.driver === "codex"),
+      pools.findIndex((pool) => pool.driver === "claudeAgent"),
+    ) + 1;
   return (
     <View className="gap-6">
-      {pools.length === 0 && notices.length === 0 && failedLabels.length === 0 ? (
+      {pools.length === 0 &&
+      notices.length === 0 &&
+      failedLabels.length === 0 &&
+      !cursorPrompt &&
+      externalLinks.length === 0 ? (
         <Text className="py-12 text-center text-base text-foreground-muted">
           {selected.size === 0
             ? "Select an environment to see limits."
             : "No provider on the selected environments reports subscription limits."}
         </Text>
       ) : null}
-      {pools.map((pool) => (
-        <View key={pool.driver} className="gap-3">
-          <View className="flex-row items-center gap-2 px-1">
-            <ProviderIcon provider={pool.driver} size={18} />
-            <Text className="text-base font-t3-medium text-foreground">
-              {DRIVER_LABEL[pool.driver] ?? pool.driver}
-            </Text>
-          </View>
-          {pool.windows.map((window) => (
-            <PoolWindowCard
-              key={`${window.kind}:${window.id}`}
-              pool={window}
-              color={pool.driver === "claudeAgent" ? colors.claude : colors.codex}
-              now={now}
-              environmentIds={selectedEnvironmentIds === null ? null : [...selectedEnvironmentIds]}
-            />
-          ))}
+      {pools.map((pool, index) => {
+        const windows = displayLimitWindows(pool);
+        return (
+          <Fragment key={pool.driver}>
+            {index === cursorPromptAt ? cursorPrompt : null}
+            <View className="gap-3">
+              <View className="flex-row items-center gap-2 px-1">
+                <ProviderIcon provider={pool.driver} size={18} />
+                <Text className="text-base font-t3-medium text-foreground">
+                  {DRIVER_LABEL[pool.driver] ?? pool.driver}
+                </Text>
+              </View>
+              {windows.map((window) => {
+                const details =
+                  pool.driver === "cursor" ? cursorUsageWindowDetails(window.id) : undefined;
+                return (
+                  <PoolWindowCard
+                    key={`${window.kind}:${window.id}`}
+                    pool={window}
+                    color={pool.driver === "claudeAgent" ? colors.claude : colors.codex}
+                    now={now}
+                    environmentIds={
+                      selectedEnvironmentIds === null ? null : [...selectedEnvironmentIds]
+                    }
+                    label={details?.label}
+                    description={details?.description}
+                  />
+                );
+              })}
+            </View>
+          </Fragment>
+        );
+      })}
+      {cursorPromptAt === pools.length ? cursorPrompt : null}
+      {externalLinks.map((link) => (
+        <View key={link.url} className="gap-3 rounded-xl border border-border-subtle p-4">
+          <Text className="text-base font-t3-medium text-foreground">{link.label}</Text>
+          <Text className="text-xs text-foreground-muted">{link.accounts.join(", ")}</Text>
+          {link.message ? (
+            <Text className="text-sm text-foreground-muted">{link.message}</Text>
+          ) : null}
+          <Pressable
+            accessibilityRole="link"
+            className="min-h-11 justify-center"
+            onPress={() => void Linking.openURL(link.url).catch(() => undefined)}
+          >
+            <Text className="text-sm font-t3-medium text-primary">Manage usage</Text>
+          </Pressable>
         </View>
       ))}
       {notices.length > 0 || failedLabels.length > 0 ? (
diff --git a/apps/mobile/src/features/usage/UsageLimitsSection.tsx b/apps/mobile/src/features/usage/UsageLimitsSection.tsx
index 5383602869bb..144c9d18e8e4 100644
--- a/apps/mobile/src/features/usage/UsageLimitsSection.tsx
+++ b/apps/mobile/src/features/usage/UsageLimitsSection.tsx
@@ -18,7 +18,7 @@ import {
 } from "@t3tools/shared/usageLimits";
 import { type ReactNode, useEffect, useEffectEvent, useRef, useState } from "react";
 import { refreshUsageLimits } from "@t3tools/client-runtime/state/usage";
-import { Alert, Pressable, View } from "react-native";
+import { Alert, Linking, Pressable, View } from "react-native";
 
 import { AppText as Text } from "../../components/AppText";
 import { ProviderIcon } from "../../components/ProviderIcon";
@@ -140,6 +140,7 @@ export function AccountLimits(props: {
   const color = useBarColor(props.driver);
   if (!limits) return null;
   const notice = limitsNotice(limits);
+  const externalUsage = limits.externalUsage;
   const padding = dense ? "px-4 py-3" : "p-4";
   return (
     <View
@@ -171,6 +172,15 @@ export function AccountLimits(props: {
           ))}
         </View>
       )}
+      {externalUsage ? (
+        <Pressable
+          accessibilityRole="link"
+          className="min-h-11 justify-center"
+          onPress={() => void Linking.openURL(externalUsage.url).catch(() => undefined)}
+        >
+          <Text className="text-sm font-t3-medium text-primary">Manage usage</Text>
+        </Pressable>
+      ) : null}
       {props.footer}
     </View>
   );
@@ -294,7 +304,7 @@ export function useRefreshLimits(
   const [failedEnvironments, setFailedEnvironments] = useState<
     readonly { environmentId: EnvironmentId; label: string }[]
   >([]);
-  const refresh = async (automatic = false) => {
+  const refresh = async (automatic = false, afterPending = false) => {
     const connected = [...presentations].filter(
       ([environmentId, presentation]) =>
         presentation.connection.phase === "connected" &&
@@ -307,6 +317,7 @@ export function useRefreshLimits(
             environmentId,
             () => refreshProviders({ environmentId, input: {} }),
             automatic,
+            afterPending,
           );
           if (result === undefined) return;
           setFailedEnvironments((previous) => [
@@ -354,5 +365,11 @@ export function useRefreshLimits(
         selectedEnvironmentIds === null || selectedEnvironmentIds.has(environmentId),
     )
     .map(({ label }) => label);
-  return { now, refreshing, failedLabels, refresh: refreshManually };
+  return {
+    now,
+    refreshing,
+    failedLabels,
+    refresh: refreshManually,
+    refreshAfterEnable: () => refresh(false, true),
+  };
 }
diff --git a/apps/mobile/src/features/usage/UsageRouteScreen.tsx b/apps/mobile/src/features/usage/UsageRouteScreen.tsx
index d1bec8cbc140..e846425af6f6 100644
--- a/apps/mobile/src/features/usage/UsageRouteScreen.tsx
+++ b/apps/mobile/src/features/usage/UsageRouteScreen.tsx
@@ -1,6 +1,8 @@
+import { ChatGptUsageSummary } from "./ChatGptUsageSummary";
 import { ScreenScrollView as ScrollView } from "../../components/ScreenScrollView";
 import { EnvironmentId, USAGE_CONTRACT_VERSION } from "@t3tools/contracts";
 import { type RouteProp, useIsFocused, useNavigation, useRoute } from "@react-navigation/native";
+import { cursorKeychainAccessEnvironments } from "@t3tools/client-runtime/state/usage";
 import {
   isCompatibleUsageContractVersion,
   isModelCostUnknown,
@@ -15,6 +17,7 @@ import {
   formatHourShort,
   formatPercent,
   formatTokens,
+  formatUsageContractMismatch,
   formatUsd,
   makeWindow,
 } from "@t3tools/shared/usageFormat";
@@ -25,9 +28,12 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { SegmentedControl } from "../../components/SegmentedControl";
 import { AppText as Text } from "../../components/AppText";
+import { ProviderIcon } from "../../components/ProviderIcon";
 import { cn } from "../../lib/cn";
 import { SettingsScreen } from "../settings/components/SettingsScreen";
 import { useUsage, type EnvironmentUsageStatus } from "../../state/usage";
+import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
 import { SettingsSection } from "../settings/components/SettingsSection";
 import { UsageDailyChart } from "./UsageDailyChart";
 import { toggleUsageEnvironment } from "./usageEnvironmentSelection";
@@ -59,6 +65,7 @@ const METRIC_OPTIONS = [
 ] as const satisfies readonly { value: UsageChartMetric; label: string }[];
 
 const CHART_HEIGHT = 180;
+const CURSOR_KEYCHAIN_COPY = "Requires access to your Cursor login in macOS Keychain.";
 
 /**
  * Two tabs over one screen. Usage is the transcript-derived spend for a
@@ -97,6 +104,27 @@ export function UsageRouteScreen() {
   );
   const isFocused = useIsFocused();
   const limits = useRefreshLimits(selectedEnvironmentIds, isFocused && tab === "limits");
+  const cursorAccessEnvironments = cursorKeychainAccessEnvironments(selectedEnvironments);
+  const refreshAfterCursorEnable = () => {
+    void refresh();
+    void limits.refreshAfterEnable();
+  };
+  const sourceMessages = [
+    ...new Set(
+      selectedEnvironments.flatMap(
+        (environment) =>
+          environment.summary?.sources.flatMap((source) =>
+            source.message &&
+            !source.action &&
+            (source.status === "partial" ||
+              source.status === "failed" ||
+              source.fingerprint.provider === "cursor")
+              ? [source.message]
+              : [],
+          ) ?? [],
+      ),
+    ),
+  ];
 
   const days = useMemo(
     () => enumerateDays(window.sinceDay, window.untilDay),
@@ -251,7 +279,6 @@ export function UsageRouteScreen() {
         }
       >
         <SegmentedControl options={TAB_OPTIONS} selected={tab} onSelect={setTab} role="tab" />
-
         <Animated.View
           key={tab}
           entering={FadeIn.duration(160).reduceMotion(ReduceMotion.System)}
@@ -262,27 +289,36 @@ export function UsageRouteScreen() {
               now={limits.now}
               failedLabels={limits.failedLabels}
               selectedEnvironmentIds={selectedEnvironmentIds}
+              cursorPrompt={
+                cursorAccessEnvironments.length > 0 ? (
+                  <CursorEnableLimits
+                    environments={cursorAccessEnvironments}
+                    onEnabled={refreshAfterCursorEnable}
+                  />
+                ) : null
+              }
             />
           ) : (
             <>
               {/* Period and metric together: neither applies to Limits, and
                 both change every number below, so they share one bar. */}
-              <View className={cn("gap-3", Platform.OS !== "android" && "flex-row items-center")}>
+              <View className="gap-3 ios:flex-row ios:items-center">
                 <SegmentedControl
                   options={WINDOW_OPTIONS}
                   selected={windowDays}
                   onSelect={selectWindow}
                   size="compact"
-                  className={Platform.OS === "android" ? "w-full" : "flex-1"}
+                  className="w-full ios:flex-1"
                 />
                 <SegmentedControl
                   options={METRIC_OPTIONS}
                   selected={metric}
                   onSelect={setMetric}
                   size="compact"
-                  className={Platform.OS === "android" ? "w-full" : "w-36"}
+                  className="w-full ios:w-36"
                 />
               </View>
+              <ChatGptUsageSummary selectedEnvironmentIds={selectedEnvironmentIds} />
               {merged.duplicateSources.length > 0 ? (
                 <Text className="text-sm text-foreground-muted">
                   Counted once across environments sharing a transcript directory:{" "}
@@ -301,6 +337,11 @@ export function UsageRouteScreen() {
                 </Text>
               ) : (
                 <>
+                  {sourceMessages.map((message) => (
+                    <Text key={message} className="text-sm text-foreground-muted">
+                      {message}
+                    </Text>
+                  ))}
                   <ChartCard
                     merged={merged}
                     days={chartDays}
@@ -311,7 +352,13 @@ export function UsageRouteScreen() {
                     isPast24Hours={isPast24Hours}
                     timeZone={window.timeZone}
                   />
-                  <ProviderSection merged={merged} metric={metric} />
+                  <ProviderSection
+                    merged={merged}
+                    metric={metric}
+                    cursorAccessEnvironments={cursorAccessEnvironments}
+                    showCursorEnvironment={selectedEnvironments.length > 1}
+                    onCursorEnabled={refreshAfterCursorEnable}
+                  />
                   <TotalsSection merged={merged} isPast24Hours={isPast24Hours} />
                   <ModelsSection merged={merged} />
                 </>
@@ -324,6 +371,110 @@ export function UsageRouteScreen() {
   );
 }
 
+function CursorEnableAction({
+  environmentId,
+  label,
+  onEnabled,
+  buttonText = "Enable",
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly label: string;
+  readonly onEnabled: () => void;
+  readonly buttonText?: string;
+}) {
+  const updateSettings = useAtomCommand(serverEnvironment.updateSettings, {
+    label: "enable Cursor account usage",
+  });
+  const [pending, setPending] = useState(false);
+  const enable = async () => {
+    setPending(true);
+    try {
+      const result = await updateSettings({
+        environmentId,
+        input: { patch: { cursorKeychainUsageEnabled: true } },
+      });
+      if (result._tag === "Success") onEnabled();
+    } finally {
+      setPending(false);
+    }
+  };
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityLabel={`Enable Cursor usage from ${label}`}
+      accessibilityHint={CURSOR_KEYCHAIN_COPY}
+      disabled={pending}
+      onPress={() => void enable()}
+      className="rounded-full bg-primary px-4 py-2"
+    >
+      <Text className="text-sm font-medium text-primary-foreground">{buttonText}</Text>
+    </Pressable>
+  );
+}
+
+function CursorEnableRow({
+  environmentId,
+  label,
+  showEnvironment,
+  bordered,
+  onEnabled,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly label: string;
+  readonly showEnvironment: boolean;
+  readonly bordered: boolean;
+  readonly onEnabled: () => void;
+}) {
+  const colors = useProviderColors();
+  return (
+    <View
+      className={cn(
+        "flex-row items-center justify-between gap-3 p-4",
+        bordered && "border-t border-border-subtle",
+      )}
+    >
+      <View className="min-w-0 flex-1 flex-row items-center gap-2">
+        <View className="size-2.5 rounded-full" style={{ backgroundColor: colors.cursor }} />
+        <Text className="shrink text-lg text-foreground">
+          Cursor{showEnvironment ? ` · ${label}` : ""}
+        </Text>
+      </View>
+      <CursorEnableAction environmentId={environmentId} label={label} onEnabled={onEnabled} />
+    </View>
+  );
+}
+
+function CursorEnableLimits({
+  environments,
+  onEnabled,
+}: {
+  readonly environments: readonly EnvironmentUsageStatus[];
+  readonly onEnabled: () => void;
+}) {
+  return (
+    <View className="gap-3">
+      <View className="flex-row items-center gap-2 px-1">
+        <ProviderIcon provider="cursor" size={18} />
+        <Text className="text-base font-t3-medium text-foreground">Cursor</Text>
+      </View>
+      <View className="items-start gap-3 rounded-[24px] border-continuous bg-card p-4">
+        <Text className="text-xs text-foreground-muted">{CURSOR_KEYCHAIN_COPY}</Text>
+        <View className="flex-row flex-wrap gap-2">
+          {environments.map((environment) => (
+            <CursorEnableAction
+              key={environment.environmentId}
+              environmentId={environment.environmentId}
+              label={environment.label}
+              buttonText={environments.length > 1 ? `Enable on ${environment.label}` : "Enable"}
+              onEnabled={onEnabled}
+            />
+          ))}
+        </View>
+      </View>
+    </View>
+  );
+}
+
 /** Headline figure, the animated daily chart, and its legend, in one card. */
 function ChartCard(props: {
   readonly merged: MergedUsage;
@@ -400,20 +551,53 @@ function ChartCard(props: {
 function ProviderSection(props: {
   readonly merged: MergedUsage;
   readonly metric: UsageChartMetric;
+  readonly cursorAccessEnvironments: readonly EnvironmentUsageStatus[];
+  readonly showCursorEnvironment: boolean;
+  readonly onCursorEnabled: () => void;
 }) {
   const { merged, metric } = props;
   const colors = useProviderColors();
-  if (merged.providers.length === 0) return null;
+  if (merged.providers.length === 0 && props.cursorAccessEnvironments.length === 0) return null;
 
   // Ranked by whatever the toggle is showing, so the rows always descend.
   // .sort() on a copy, not .toSorted(): Hermes doesn't ship the ES2023 method.
   const ordered = [...merged.providers].sort((a, b) =>
     metric === "cost" ? b.costUsd - a.costUsd : b.totalTokens - a.totalTokens,
   );
+  const rows: Array<
+    | { readonly kind: "usage"; readonly provider: (typeof ordered)[number] }
+    | { readonly kind: "enable"; readonly environment: EnvironmentUsageStatus }
+  > = ordered.map((provider) => ({ kind: "usage", provider }));
+  const cursorInsertAt =
+    Math.max(
+      ordered.findIndex((provider) => provider.provider === "codex"),
+      ordered.findIndex((provider) => provider.provider === "claude"),
+    ) + 1;
+  rows.splice(
+    cursorInsertAt,
+    0,
+    ...props.cursorAccessEnvironments.map((environment) => ({
+      kind: "enable" as const,
+      environment,
+    })),
+  );
 
   return (
     <SettingsSection title="Providers">
-      {ordered.map((provider, index) => {
+      {rows.map((row, index) => {
+        if (row.kind === "enable") {
+          return (
+            <CursorEnableRow
+              key={`enable:${row.environment.environmentId}`}
+              environmentId={row.environment.environmentId}
+              label={row.environment.label}
+              showEnvironment={props.showCursorEnvironment}
+              bordered={index > 0}
+              onEnabled={props.onCursorEnabled}
+            />
+          );
+        }
+        const provider = row.provider;
         const share = metric === "cost" ? provider.costShare : provider.tokenShare;
         return (
           <View
@@ -571,7 +755,12 @@ function usageEnvironmentStatus(environment: EnvironmentUsageStatus): string {
     environment.summary &&
     !isCompatibleUsageContractVersion(environment.summary.contractVersion, USAGE_CONTRACT_VERSION)
   ) {
-    return "Older server · excluded from usage totals";
+    return formatUsageContractMismatch(environment.label, {
+      direction:
+        environment.summary.contractVersion < USAGE_CONTRACT_VERSION
+          ? "serverBehind"
+          : "clientBehind",
+    });
   }
   if (!environment.isConnected)
     return environment.summary ? "Disconnected · showing saved usage" : "Waiting for connection…";
diff --git a/apps/mobile/src/features/usage/usageProviders.ts b/apps/mobile/src/features/usage/usageProviders.ts
index 2576ac21fb07..45a94ddae1f7 100644
--- a/apps/mobile/src/features/usage/usageProviders.ts
+++ b/apps/mobile/src/features/usage/usageProviders.ts
@@ -5,12 +5,22 @@ import { useAppearancePreferences } from "../settings/appearance/AppearancePrefe
  * Series and table order. The chart stacks providers from the bottom in this
  * order, so it also fixes which band sits on top of the bars.
  */
-export const PROVIDER_ORDER: readonly UsageProviderKind[] = ["codex", "claude", "grok"];
+export const PROVIDER_ORDER: readonly UsageProviderKind[] = [
+  "codex",
+  "claude",
+  "grok",
+  "cursor",
+  "opencode",
+  "antigravity",
+];
 
 export const PROVIDER_LABEL: Record<UsageProviderKind, string> = {
   claude: "Claude Code",
   codex: "Codex",
   grok: "Grok Build",
+  cursor: "Cursor",
+  opencode: "OpenCode",
+  antigravity: "Antigravity",
 };
 
 /**
@@ -23,5 +33,8 @@ export function useProviderColors(): Record<UsageProviderKind, string> {
     claude: "#d97757",
     codex: scheme === "dark" ? "#e6e6e6" : "#3c3c43",
     grok: scheme === "dark" ? "#a1a1aa" : "#52525b",
+    cursor: "#8b8b8b",
+    opencode: "#5b9bbd",
+    antigravity: "#8c7bd1",
   };
 }
diff --git a/apps/mobile/src/lib/androidControlSizing.test.ts b/apps/mobile/src/lib/androidControlSizing.test.ts
new file mode 100644
index 000000000000..8b9fd9751cbb
--- /dev/null
+++ b/apps/mobile/src/lib/androidControlSizing.test.ts
@@ -0,0 +1,22 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import { resolveAndroidControlSizing } from "./androidControlSizing";
+
+describe("Android control sizing", () => {
+  it.each([
+    [11, 17, 48, 48, 172, 48],
+    [16, 24, 48, 56, 250, 48],
+    [22, 33, 66, 77, 344, 66],
+  ])(
+    "scales controls at %ipt",
+    (fontSize, iconSize, buttonSize, fabSize, menuWidth, menuItemHeight) => {
+      expect(resolveAndroidControlSizing(fontSize)).toMatchObject({
+        iconSize,
+        buttonSize,
+        fabSize,
+        menuWidth,
+        menuItemHeight,
+      });
+    },
+  );
+});
diff --git a/apps/mobile/src/lib/androidControlSizing.ts b/apps/mobile/src/lib/androidControlSizing.ts
new file mode 100644
index 000000000000..f6868ad07bdd
--- /dev/null
+++ b/apps/mobile/src/lib/androidControlSizing.ts
@@ -0,0 +1,23 @@
+import { DEFAULT_BASE_FONT_SIZE, normalizeBaseFontSize } from "./appearancePreferences";
+
+/** Android controls follow the app's text size; buttons and menu rows retain a 48dp touch target. */
+export function resolveAndroidControlSizing(baseFontSize: number) {
+  const scale = normalizeBaseFontSize(baseFontSize) / DEFAULT_BASE_FONT_SIZE;
+  const iconSize = Math.round(24 * scale);
+  const buttonSize = Math.max(48, Math.round(48 * scale));
+  const fabSize = Math.max(48, Math.round(56 * scale));
+
+  return {
+    scale,
+    iconSize,
+    smallIconSize: Math.round(16 * scale),
+    mediumIconSize: Math.round(18 * scale),
+    buttonSize,
+    fabSize,
+    largeFabSize: Math.round(96 * scale),
+    menuWidth: Math.round(250 * scale),
+    menuItemHeight: Math.max(48, Math.round(48 * scale)),
+    // Two floating actions, their gap, and the space below the lower action.
+    fabClearance: fabSize * 2 + 36,
+  };
+}
diff --git a/apps/mobile/src/lib/appearancePreferences.ts b/apps/mobile/src/lib/appearancePreferences.ts
index 2ce6a8b5a367..981b35808a54 100644
--- a/apps/mobile/src/lib/appearancePreferences.ts
+++ b/apps/mobile/src/lib/appearancePreferences.ts
@@ -219,6 +219,16 @@ export function scaledTypographyLineHeight(
   return Math.max(10, Math.round(role.lineHeight * scale));
 }
 
+/** Text dimensions shared by React Native and Compose consumers of an appearance role. */
+export function resolveScaledTextRole(role: keyof typeof MOBILE_TYPOGRAPHY, baseFontSize: number) {
+  const typography = MOBILE_TYPOGRAPHY[role];
+  const scale = normalizeBaseFontSize(baseFontSize) / DEFAULT_BASE_FONT_SIZE;
+  return {
+    fontSize: Math.max(8, Math.round(typography.fontSize * scale)),
+    lineHeight: scaledTypographyLineHeight(typography, baseFontSize),
+  };
+}
+
 export function resolveNativeMarkdownTypography(baseFontSize: number): NativeMarkdownTypography {
   const fontSizes = resolveMarkdownFontSizes(baseFontSize);
   return {
diff --git a/apps/mobile/src/lib/attachmentUpload.test.ts b/apps/mobile/src/lib/attachmentUpload.test.ts
index 2c6b27864432..df68a2de3019 100644
--- a/apps/mobile/src/lib/attachmentUpload.test.ts
+++ b/apps/mobile/src/lib/attachmentUpload.test.ts
@@ -32,7 +32,7 @@ vi.mock("../state/atom-registry", () => ({
 }));
 
 // The real read lease and cleanup are covered by the composer ownership suite.
-vi.mock("../state/use-composer-drafts", () => ({
+vi.mock("./composerAttachmentPreviewRetention", () => ({
   retainComposerAttachmentFileForPreview: () => () => {},
 }));
 
diff --git a/apps/mobile/src/lib/attachmentUpload.ts b/apps/mobile/src/lib/attachmentUpload.ts
index 10f4fdb7c6c7..1bce3e26774f 100644
--- a/apps/mobile/src/lib/attachmentUpload.ts
+++ b/apps/mobile/src/lib/attachmentUpload.ts
@@ -20,8 +20,8 @@ import { appAtomRegistry } from "../state/atom-registry";
 import { assetEnvironment } from "../state/assets";
 import { attachmentEnvironment } from "../state/attachments";
 import { environmentSession } from "../state/session";
-import { retainComposerAttachmentFileForPreview } from "../state/use-composer-drafts";
 import { resolveOwnedComposerAttachmentFileUri } from "./composerAttachmentFiles";
+import { retainComposerAttachmentFileForPreview } from "./composerAttachmentPreviewRetention";
 import {
   isComposerImageAttachment,
   isFileBackedComposerAttachment,
diff --git a/apps/mobile/src/lib/composerAttachmentPreviewRetention.ts b/apps/mobile/src/lib/composerAttachmentPreviewRetention.ts
new file mode 100644
index 000000000000..ca9044f32dc6
--- /dev/null
+++ b/apps/mobile/src/lib/composerAttachmentPreviewRetention.ts
@@ -0,0 +1,28 @@
+import type { FileBackedComposerAttachment } from "./composerImages";
+import { retainComposerAttachmentFile } from "./composerAttachmentFiles";
+
+/**
+ * Preview retention for saved composer attachment copies.
+ *
+ * The durable owners of an attachment file (composer drafts, queued outbox
+ * messages) live in state, so this module cannot reach the ownership-cleanup
+ * sweep directly. Composer draft state registers the owner-side cleanup hook
+ * at module load; until then a release has nothing to retry, because no draft
+ * store has loaded yet and there is nothing to clean.
+ */
+type UnusedAttachmentHandler = (attachment: FileBackedComposerAttachment) => void;
+
+let onAttachmentUnused: UnusedAttachmentHandler | null = null;
+
+export function registerComposerAttachmentUnusedHandler(handler: UnusedAttachmentHandler): void {
+  onAttachmentUnused = handler;
+}
+
+/** Keeps a native preview or upload readable until it finishes, then retries ownership cleanup. */
+export function retainComposerAttachmentFileForPreview(
+  attachment: FileBackedComposerAttachment,
+): () => void {
+  return retainComposerAttachmentFile(attachment.fileUri, () => {
+    onAttachmentUnused?.(attachment);
+  });
+}
diff --git a/apps/mobile/src/lib/debugLog.ts b/apps/mobile/src/lib/debugLog.ts
new file mode 100644
index 000000000000..447973503333
--- /dev/null
+++ b/apps/mobile/src/lib/debugLog.ts
@@ -0,0 +1,64 @@
+/**
+ * Namespaced, filterable debug logging shared by mobile subsystems.
+ *
+ * Ordinary, expected conditions — a queued send failing while the device is
+ * offline, for example — go through a debug logger instead of `console.warn`
+ * so warning output stays reserved for failures someone can act on. Output
+ * uses `console.log` with a `[t3-<namespace>]` prefix, matching the existing
+ * cloud and terminal debug logs. (client-runtime cannot host this: its
+ * tooling bans `console.*` in favor of Effect logging.)
+ *
+ * A logger is silent in every build, including development, unless enabled.
+ * Toggle it from a JS debugger or the Metro console, including on release/TestFlight builds:
+ * - `globalThis.__T3_DEBUG__ = true` enables every namespace;
+ * - `globalThis.__T3_DEBUG__ = ["thread-outbox"]` enables only listed ones.
+ *
+ * Subsystems whose traces are useful by default in development (`__DEV__`)
+ * opt in with `enabledInDev`; `legacyGlobalFlag` keeps an older
+ * subsystem-specific global (e.g. `__T3_CLOUD_DEBUG__`) working.
+ */
+
+export interface DebugLogger {
+  readonly isEnabled: () => boolean;
+  readonly log: (event: string, data?: Record<string, unknown>) => void;
+}
+
+export interface DebugLoggerOptions {
+  /** Log whenever `__DEV__` is true, without the global filter. Defaults to false. */
+  readonly enabledInDev?: boolean;
+  /** Name of a legacy subsystem-specific global boolean, e.g. `"__T3_CLOUD_DEBUG__"`. */
+  readonly legacyGlobalFlag?: string;
+}
+
+function globalValue(name: string): unknown {
+  return typeof globalThis === "undefined"
+    ? undefined
+    : (globalThis as Record<string, unknown>)[name];
+}
+
+export function createDebugLogger(
+  namespace: string,
+  options: DebugLoggerOptions = {},
+): DebugLogger {
+  const isEnabled = () => {
+    if (options.enabledInDev === true && typeof __DEV__ !== "undefined" && __DEV__) {
+      return true;
+    }
+    if (options.legacyGlobalFlag !== undefined && globalValue(options.legacyGlobalFlag) === true) {
+      return true;
+    }
+    const filter = globalValue("__T3_DEBUG__");
+    return filter === true || (Array.isArray(filter) && filter.includes(namespace));
+  };
+  const log = (event: string, data?: Record<string, unknown>) => {
+    if (!isEnabled()) {
+      return;
+    }
+    if (data === undefined) {
+      console.log(`[t3-${namespace}] ${event}`);
+    } else {
+      console.log(`[t3-${namespace}] ${event}`, data);
+    }
+  };
+  return { isEnabled, log };
+}
diff --git a/apps/mobile/src/lib/localAttachmentPreview.test.ts b/apps/mobile/src/lib/localAttachmentPreview.test.ts
index 3693caa41185..602d5aada56b 100644
--- a/apps/mobile/src/lib/localAttachmentPreview.test.ts
+++ b/apps/mobile/src/lib/localAttachmentPreview.test.ts
@@ -6,7 +6,7 @@ const mocks = vi.hoisted(() => ({
   exists: vi.fn(),
 }));
 
-vi.mock("../state/use-composer-drafts", () => ({
+vi.mock("./composerAttachmentPreviewRetention", () => ({
   retainComposerAttachmentFileForPreview: mocks.retain,
 }));
 vi.mock("./attachmentDownload", () => ({ shareLocalAttachment: mocks.share }));
diff --git a/apps/mobile/src/lib/localAttachmentPreview.ts b/apps/mobile/src/lib/localAttachmentPreview.ts
index 0d90f7210bab..171fc26c0566 100644
--- a/apps/mobile/src/lib/localAttachmentPreview.ts
+++ b/apps/mobile/src/lib/localAttachmentPreview.ts
@@ -3,7 +3,7 @@ import { videoMimeType } from "@t3tools/shared/video";
 import type { FileBackedComposerAttachment } from "./composerImages";
 import { resolveOwnedComposerAttachmentFileUri } from "./composerAttachmentFiles";
 import { shareLocalAttachment, type AttachmentPreviewFile } from "./attachmentDownload";
-import { retainComposerAttachmentFileForPreview } from "../state/use-composer-drafts";
+import { retainComposerAttachmentFileForPreview } from "./composerAttachmentPreviewRetention";
 
 /** Retains the draft original for preview and gives each outgoing share its own lease. */
 export async function loadLocalAttachmentPreview(
diff --git a/apps/mobile/src/lib/projectFaviconCache.test.ts b/apps/mobile/src/lib/projectFaviconDatabaseCache.test.ts
similarity index 97%
rename from apps/mobile/src/lib/projectFaviconCache.test.ts
rename to apps/mobile/src/lib/projectFaviconDatabaseCache.test.ts
index adde56fbf0b1..1e7344a684c3 100644
--- a/apps/mobile/src/lib/projectFaviconCache.test.ts
+++ b/apps/mobile/src/lib/projectFaviconDatabaseCache.test.ts
@@ -27,7 +27,7 @@ vi.mock("expo-file-system", () => ({
   },
 }));
 
-import { downscaleProjectFavicon } from "./projectFaviconCache";
+import { downscaleProjectFavicon } from "./projectFaviconDatabaseCache";
 
 const png = "iVBORw0KGgoAAAAA";
 const image = { url: "https://remote/icon.png" };
diff --git a/apps/mobile/src/lib/projectFaviconCache.ts b/apps/mobile/src/lib/projectFaviconDatabaseCache.ts
similarity index 90%
rename from apps/mobile/src/lib/projectFaviconCache.ts
rename to apps/mobile/src/lib/projectFaviconDatabaseCache.ts
index 26a6d848d11d..f24cb2b394f7 100644
--- a/apps/mobile/src/lib/projectFaviconCache.ts
+++ b/apps/mobile/src/lib/projectFaviconDatabaseCache.ts
@@ -1,5 +1,5 @@
 import {
-  createProjectFaviconCache,
+  createProjectFaviconCache as createSharedProjectFaviconCache,
   createProjectFaviconImageLoader,
   PROJECT_FAVICON_MAX_DATA_URL_LENGTH,
   PROJECT_FAVICON_THUMBNAIL_SIZE,
@@ -78,8 +78,13 @@ export async function downscaleProjectFavicon(
   throw new Error("Project icon thumbnail exceeds the cache limit.");
 }
 
-/** Rows live in `client_cache` so Settings → Client storage counts and clears them. */
-export const projectFaviconCache = createProjectFaviconCache({
+/**
+ * The database-backed project favicon cache. Named apart from the shared
+ * `createProjectFaviconCache` factory it calls and from the in-flight request
+ * registry in `projectFaviconRequests`. Rows live in `client_cache` so
+ * Settings → Client storage counts and clears them.
+ */
+export const projectFaviconDatabaseCache = createSharedProjectFaviconCache({
   storage: {
     list: () =>
       runDatabase((database) =>
diff --git a/apps/mobile/src/components/projectFaviconCache.test.ts b/apps/mobile/src/lib/projectFaviconRequests.test.ts
similarity index 98%
rename from apps/mobile/src/components/projectFaviconCache.test.ts
rename to apps/mobile/src/lib/projectFaviconRequests.test.ts
index d0582a8b5f5b..540a45473926 100644
--- a/apps/mobile/src/components/projectFaviconCache.test.ts
+++ b/apps/mobile/src/lib/projectFaviconRequests.test.ts
@@ -6,9 +6,9 @@ import {
   hasLoadedProjectFavicon,
   markProjectFaviconFailed,
   markProjectFaviconLoaded,
-} from "./projectFaviconCache";
+} from "./projectFaviconRequests";
 
-describe("project favicon cache", () => {
+describe("project favicon requests", () => {
   it("ignores callbacks from a superseded URL", () => {
     const cacheKey = "environment-1:/workspace:v1-favicon.svg";
     const expiredUrl = "https://environment.example/api/assets/expired/v1-favicon.svg";
diff --git a/apps/mobile/src/components/projectFaviconCache.ts b/apps/mobile/src/lib/projectFaviconRequests.ts
similarity index 87%
rename from apps/mobile/src/components/projectFaviconCache.ts
rename to apps/mobile/src/lib/projectFaviconRequests.ts
index da77d7613f2d..202142d175e1 100644
--- a/apps/mobile/src/components/projectFaviconCache.ts
+++ b/apps/mobile/src/lib/projectFaviconRequests.ts
@@ -1,3 +1,11 @@
+/**
+ * Request bookkeeping behind `ProjectFavicon`: tracks the favicon URLs with
+ * mounted views per cache key, keeps one of them current, and remembers which
+ * keys have already loaded so superseded or already-shown loads settle without
+ * churn. This is not request coalescing — each mount still issues its own
+ * load — and it is not the cache; persistence lives in
+ * `projectFaviconDatabaseCache`.
+ */
 export interface ProjectFaviconRequest {
   readonly cacheKey: string;
   readonly faviconUrl: string;
diff --git a/apps/mobile/src/lib/projectIcon.ts b/apps/mobile/src/lib/projectIcon.ts
new file mode 100644
index 000000000000..885c583aa543
--- /dev/null
+++ b/apps/mobile/src/lib/projectIcon.ts
@@ -0,0 +1,81 @@
+import type { ProjectIconColor, ProjectIconOverride } from "@t3tools/contracts";
+
+export type ProjectIconGlyph =
+  | { readonly kind: "emoji"; readonly emoji: string }
+  | { readonly kind: "monogram"; readonly text: string; readonly color: ProjectIconColor };
+
+/**
+ * Visible glyph count for sizing monogram text. Hermes has no Intl.Segmenter, so combining
+ * marks are folded into their base character instead of full grapheme segmentation.
+ */
+export function countGlyphs(text: string): number {
+  return Array.from(text.replace(/\p{M}/gu, "")).length;
+}
+
+/** Mirrors the automatic monogram web derives from a project name when it has no favicon. */
+export function projectMonogram(projectName: string): string {
+  const words =
+    projectName
+      .normalize("NFKC")
+      .trim()
+      .match(/[\p{L}\p{N}]+/gu) ?? [];
+  const firstWord = words[0];
+  if (!firstWord) return "PR";
+
+  const glyphs = Array.from(firstWord);
+  const first = glyphs[0] ?? "P";
+  const second =
+    glyphs.slice(1).find((glyph) => /\p{N}/u.test(glyph)) ??
+    (words.length > 1 ? Array.from(words.at(-1) ?? "")[0] : glyphs.at(-1)) ??
+    first;
+  return Array.from(`${first}${second}`.toUpperCase()).slice(0, 2).join("");
+}
+
+/**
+ * Picks what mobile draws for an assigned project icon. Mobile does not bundle
+ * the Lucide set, so a Lucide override keeps its color and falls back to the
+ * project's monogram instead of the folder glyph.
+ */
+export function resolveProjectIconGlyph(
+  projectIcon: ProjectIconOverride | null | undefined,
+  projectTitle: string,
+): ProjectIconGlyph | null {
+  switch (projectIcon?.kind) {
+    case "emoji":
+      return { kind: "emoji", emoji: projectIcon.emoji };
+    case "monogram":
+      return { kind: "monogram", text: projectIcon.text, color: projectIcon.color };
+    case "lucide":
+      return { kind: "monogram", text: projectMonogram(projectTitle), color: projectIcon.color };
+    case undefined:
+      return null;
+  }
+}
+
+const PROJECT_ICON_COLOR_CLASSES: Record<
+  ProjectIconColor,
+  { readonly text: string; readonly background: string }
+> = {
+  gray: { text: "text-gray-500", background: "bg-gray-500/15" },
+  red: { text: "text-red-500", background: "bg-red-500/15" },
+  orange: { text: "text-orange-500", background: "bg-orange-500/15" },
+  amber: { text: "text-amber-500", background: "bg-amber-500/15" },
+  yellow: { text: "text-yellow-500", background: "bg-yellow-500/15" },
+  lime: { text: "text-lime-500", background: "bg-lime-500/15" },
+  green: { text: "text-green-500", background: "bg-green-500/15" },
+  emerald: { text: "text-emerald-500", background: "bg-emerald-500/15" },
+  teal: { text: "text-teal-500", background: "bg-teal-500/15" },
+  cyan: { text: "text-cyan-500", background: "bg-cyan-500/15" },
+  sky: { text: "text-sky-500", background: "bg-sky-500/15" },
+  blue: { text: "text-blue-500", background: "bg-blue-500/15" },
+  indigo: { text: "text-indigo-500", background: "bg-indigo-500/15" },
+  violet: { text: "text-violet-500", background: "bg-violet-500/15" },
+  purple: { text: "text-purple-500", background: "bg-purple-500/15" },
+  fuchsia: { text: "text-fuchsia-500", background: "bg-fuchsia-500/15" },
+  pink: { text: "text-pink-500", background: "bg-pink-500/15" },
+  rose: { text: "text-rose-500", background: "bg-rose-500/15" },
+};
+
+export function projectIconColorClassNames(color: ProjectIconColor) {
+  return PROJECT_ICON_COLOR_CLASSES[color];
+}
diff --git a/apps/mobile/src/lib/uniwind-platform-variants.fixture.cjs b/apps/mobile/src/lib/uniwind-platform-variants.fixture.cjs
new file mode 100644
index 000000000000..8d8017f28f83
--- /dev/null
+++ b/apps/mobile/src/lib/uniwind-platform-variants.fixture.cjs
@@ -0,0 +1,183 @@
+"use strict";
+
+// Fixture for uniwind-platform-variants.test.ts. Run as a plain Node process
+// (`node uniwind-platform-variants.fixture.cjs <fixtureDir>`) so it executes the
+// real compiler with no test-runner transforms in the way. Prints one JSON
+// object to stdout describing what each platform bundle compiled.
+//
+// It reproduces what the Metro transformer does for `global.css`: compile the
+// Tailwind entry, then run uniwind's CSS processor and stylesheet serializer
+// once per platform. Loading `dist/common` needs a small custom loader because
+// uniwind declares `"type": "module"` over that CommonJS output and its
+// internal `@/...` import alias only exists at uniwind's own build time; the
+// loader hands unmodified file bytes to V8 and resolves those aliases the same
+// way, so this runs the exact compiled code the Metro transformer bundles.
+const fs = require("node:fs");
+const path = require("node:path");
+const { createRequire } = require("node:module");
+
+function createUniwindCompilerLoader(uniwindPackageJson) {
+  const uniwindRoot = path.dirname(fs.realpathSync(uniwindPackageJson));
+  const uniwindRequire = createRequire(path.join(uniwindRoot, "package.json"));
+  const cache = new Map();
+
+  const load = (absoluteFileWithoutExtension) => {
+    const resolved = [
+      absoluteFileWithoutExtension,
+      `${absoluteFileWithoutExtension}.js`,
+      path.join(absoluteFileWithoutExtension, "index.js"),
+    ].find((candidate) => {
+      try {
+        return fs.statSync(candidate).isFile();
+      } catch {
+        return false;
+      }
+    });
+    if (resolved === undefined) {
+      throw new Error(`Cannot resolve uniwind module ${absoluteFileWithoutExtension}`);
+    }
+    const cached = cache.get(resolved);
+    if (cached !== undefined) return cached;
+
+    const cjsModule = { exports: {} };
+
+    const localRequire = (request) => {
+      if (request.startsWith("@/")) {
+        return load(path.join(uniwindRoot, "dist/common", request.slice(2)));
+      }
+      if (request.startsWith(".")) {
+        return load(path.resolve(path.dirname(resolved), request));
+      }
+      // uniwind's own dependencies (lightningcss, culori, ...) resolve through
+      // the package's dependency tree, like they do inside the Metro bundle.
+      return uniwindRequire(request);
+    };
+
+    const code = fs.readFileSync(resolved, "utf8");
+    new Function("require", "module", "exports", code)(localRequire, cjsModule, cjsModule.exports);
+    cache.set(resolved, cjsModule.exports);
+    return cjsModule.exports;
+  };
+
+  const loadBundler = (request) => load(path.join(uniwindRoot, "dist/common", request));
+  return { loadBundler, uniwindRequire, uniwindRoot };
+}
+
+async function main() {
+  const fixtureDir = fs.realpathSync(path.resolve(process.argv[2]));
+  const uniwindPackageJson = require.resolve("uniwind/package.json", {
+    paths: [fixtureDir],
+  });
+  const { loadBundler, uniwindRequire, uniwindRoot } =
+    createUniwindCompilerLoader(uniwindPackageJson);
+  const { ProcessorBuilder } = loadBundler("bundler/css-processor/processor.js");
+  const { addMetaToStylesTemplate } = loadBundler(
+    "bundler/css-processor/addMetaToStylesTemplate.js",
+  );
+  const { compileNativeCSS } = loadBundler("bundler/css-compiler/compileNativeCSS.js");
+
+  const { compile } = uniwindRequire("@tailwindcss/node");
+  const { Scanner } = uniwindRequire("@tailwindcss/oxide");
+  const compiler = await compile(fs.readFileSync(path.join(fixtureDir, "global.css"), "utf8"), {
+    base: fixtureDir,
+    onDependency: () => {},
+  });
+  const scanner = new Scanner({
+    sources: [...compiler.sources, { negated: false, pattern: "**/*.tsx", base: fixtureDir }],
+  });
+  const tailwindCSS = await compiler.build(scanner.scan());
+
+  const platforms = {};
+  // Every ios:/android: utility class Tailwind generated for the fixture.
+  const compiledGuardedClasses = {};
+  for (const match of tailwindCSS.matchAll(/\.(ios|android)\\:([^{ ,]+) \{/g)) {
+    compiledGuardedClasses[`${match[1]}:${match[2]}`.replace(/\\(.)/g, "$1")] = true;
+  }
+  const platformBlock = (name) =>
+    new RegExp(`@media ${name} \\{([\\s\\S]*?)\\n  \\}`).exec(tailwindCSS)?.[1] ?? "";
+  const utilityCountIn = (block) => (block.match(/^\s+\.[^ ]+ \{/gm) ?? []).length;
+  const tailwindChecks = {
+    iosBlocks: (tailwindCSS.match(/@media ios \{/g) ?? []).length,
+    androidBlocks: (tailwindCSS.match(/@media android \{/g) ?? []).length,
+    iosUtilities: utilityCountIn(platformBlock("ios")),
+    androidUtilities: utilityCountIn(platformBlock("android")),
+  };
+  for (const platform of ["ios", "android"]) {
+    // Same config the app's withUniwindConfig produces (polyfills.rem: 14).
+    const bundlerConfig = { platform, themes: ["light", "dark"], polyfills: { rem: 14 } };
+    const processor = new ProcessorBuilder(bundlerConfig);
+    processor.transform(tailwindCSS);
+    const compiled = addMetaToStylesTemplate(processor, platform);
+    const payload = compileNativeCSS(bundlerConfig, tailwindCSS);
+    const styles = {};
+    for (const [className, entries] of Object.entries(compiled)) {
+      styles[className] = entries.map(
+        ({ native, minWidth, maxWidth, active, focus, disabled, dataAttributes }) => ({
+          native,
+          minWidth,
+          maxWidth,
+          active: active ?? null,
+          focus: focus ?? null,
+          disabled: disabled ?? null,
+          dataAttributes: dataAttributes ?? null,
+        }),
+      );
+    }
+    platforms[platform] = {
+      styles,
+      payloadIncludesAllCompiled: Object.keys(compiled).every((className) =>
+        payload.includes(`"${className}"`),
+      ),
+      // A utility dropped from this platform's stylesheet must not appear
+      // anywhere in the payload the bundle embeds for this platform.
+      payloadLeaks: Object.keys(compiledGuardedClasses)
+        .filter((className) => compiled[className] === undefined)
+        .filter((className) => payload.includes(`"${className}"`)),
+    };
+  }
+
+  // Exercise the real Metro transformer entry point (the shipped
+  // `dist/metro/transformer.cjs`, not a copy) with a stubbed downstream worker,
+  // to check what the global.css virtual module actually becomes — including
+  // the native styles fingerprint that lets dev reloads skip reinitializing.
+  const transformerPath = path.join(uniwindRoot, "dist/metro/transformer.cjs");
+  let reinitCode = "";
+  const Module = require("node:module");
+  const origLoad = Module._load;
+  Module._load = function (request, ...rest) {
+    if (request === "metro-transform-worker") {
+      return {
+        transform: async (_config, _root, _file, data) => {
+          reinitCode = data.toString();
+          return { output: [{ data: {} }] };
+        },
+      };
+    }
+    return origLoad.call(this, request, ...rest);
+  };
+  process.chdir(fixtureDir);
+  try {
+    const { transform } = require(transformerPath);
+    await transform(
+      { uniwind: { cssEntryFile: "./global.css", isExpoProject: false } },
+      fixtureDir,
+      "global.css",
+      Buffer.from(""),
+      { platform: "ios", type: "module" },
+    );
+  } finally {
+    Module._load = origLoad;
+  }
+  const transformerCheck = {
+    reinitPayload: reinitCode.includes("Uniwind.__reinit(rt =>"),
+    fingerprintArg: /, '[0-9a-f]{64}'\);\s*$/.test(reinitCode),
+    themesArg: reinitCode.includes("['light', 'dark']"),
+  };
+
+  process.stdout.write(JSON.stringify({ tailwindChecks, transformerCheck, platforms }));
+}
+
+main().catch((error) => {
+  console.error(error);
+  process.exit(1);
+});
diff --git a/apps/mobile/src/lib/uniwind-platform-variants.test.ts b/apps/mobile/src/lib/uniwind-platform-variants.test.ts
new file mode 100644
index 000000000000..12fa86b33c08
--- /dev/null
+++ b/apps/mobile/src/lib/uniwind-platform-variants.test.ts
@@ -0,0 +1,253 @@
+import * as NodeChildProcess from "node:child_process";
+import * as NodeFS from "node:fs";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+import * as NodeURL from "node:url";
+import { beforeAll, describe, expect, it } from "vite-plus/test";
+
+// Regression guard for the uniwind platform-variant leak (audit #15 / #13161):
+// Tailwind groups every `ios:` (or `android:`) utility into one shared
+// `@media ios { ... }` block, and uniwind's CSS processor used to drop the
+// block's media queries after its first nested rule. Everything past the first
+// utility compiled unguarded and shipped to both platforms. These tests run
+// the installed (patched) uniwind compiler over real Tailwind output, per
+// platform, and assert what each bundle receives. The compiler itself runs in
+// a plain Node child process (uniwind-platform-variants.fixture.cjs) so no
+// test-runner module transforms sit between the test and the shipped code.
+
+interface CompiledStyle {
+  native: boolean;
+  minWidth: number;
+  maxWidth: number;
+  active: boolean | null;
+  focus: boolean | null;
+  disabled: boolean | null;
+  dataAttributes: Record<string, string> | null;
+}
+
+interface FixtureOutput {
+  tailwindChecks: {
+    iosBlocks: number;
+    androidBlocks: number;
+    iosUtilities: number;
+    androidUtilities: number;
+  };
+  transformerCheck: {
+    reinitPayload: boolean;
+    fingerprintArg: boolean;
+    themesArg: boolean;
+  };
+  platforms: Record<
+    string,
+    {
+      styles: Record<string, CompiledStyle[] | undefined>;
+      payloadIncludesAllCompiled: boolean;
+      payloadLeaks: string[];
+    }
+  >;
+}
+
+// Mirrors the classNames the audits flagged: multiple platform utilities per
+// block (only the first one used to keep its guard), a base utility overridden
+// by an `ios:` variant (NewTaskDraftScreen), and opposing `ios:`/`android:`
+// font families (worktree-setup-card).
+const FIXTURE_SOURCE = `export const Probe = () => (
+  <div className="android:shrink android:grow-0 ios:flex-1 pt-12 ios:pt-[72px] ios:font-[family-name:Menlo] android:font-mono flex-1 sm:p-6 sm:text-lg" />
+);
+`;
+
+const IOS_CLASSES = ["ios:flex-1", "ios:pt-[72px]", "ios:font-[family-name:Menlo]"];
+const ANDROID_CLASSES = ["android:shrink", "android:grow-0", "android:font-mono"];
+const SHARED_CLASSES = ["flex-1", "pt-12"];
+const RESPONSIVE_CLASSES = ["sm:p-6", "sm:text-lg"];
+
+const runFixture = (globalCss: string, probeSource: string): FixtureOutput => {
+  const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "uniwind-platform-"));
+  try {
+    // So `@import "tailwindcss"` and `@import "uniwind"` resolve like in the app.
+    NodeFS.symlinkSync(
+      NodeFS.realpathSync(new URL("../../node_modules", import.meta.url)),
+      NodePath.join(tempDir, "node_modules"),
+      "dir",
+    );
+    NodeFS.writeFileSync(NodePath.join(tempDir, "global.css"), globalCss);
+    NodeFS.writeFileSync(NodePath.join(tempDir, "Probe.tsx"), probeSource);
+
+    const fixture = NodeURL.fileURLToPath(
+      new URL("./uniwind-platform-variants.fixture.cjs", import.meta.url),
+    );
+    const stdout = NodeChildProcess.execFileSync(process.execPath, [fixture, tempDir], {
+      encoding: "utf8",
+      maxBuffer: 32 * 1024 * 1024,
+      timeout: 60_000,
+    });
+    // The fixture's compiler may log warnings to stdout before the JSON payload.
+    const start = stdout.indexOf('{"tailwindChecks"');
+    if (start === -1) {
+      throw new Error(`Fixture produced no JSON:\n${stdout}`);
+    }
+    return JSON.parse(stdout.slice(start)) as FixtureOutput;
+  } finally {
+    NodeFS.rmSync(tempDir, { recursive: true, force: true });
+  }
+};
+
+describe("uniwind platform variants compile per platform", () => {
+  let output: FixtureOutput;
+
+  beforeAll(() => {
+    output = runFixture('@import "tailwindcss";\n@import "uniwind";\n', FIXTURE_SOURCE);
+  }, 60_000);
+
+  it("compiles the fixture utilities into shared platform blocks", () => {
+    // Without this grouping the leak could not happen and the assertions below
+    // would prove nothing.
+    expect(output.tailwindChecks).toEqual({
+      iosBlocks: 1,
+      androidBlocks: 1,
+      iosUtilities: 3,
+      androidUtilities: 3,
+    });
+  });
+
+  it("keeps ios: utilities out of the android bundle and guards them on ios", () => {
+    for (const className of IOS_CLASSES) {
+      expect(
+        output.platforms.android?.styles[className],
+        `android has ${className}`,
+      ).toBeUndefined();
+      expect(output.platforms.ios?.styles[className], `ios lacks ${className}`).toBeDefined();
+      expect(output.platforms.ios?.styles[className]?.every((style) => style.native)).toBe(true);
+    }
+  });
+
+  it("keeps android: utilities out of the ios bundle and guards them on android", () => {
+    for (const className of ANDROID_CLASSES) {
+      expect(output.platforms.ios?.styles[className], `ios has ${className}`).toBeUndefined();
+      expect(
+        output.platforms.android?.styles[className],
+        `android lacks ${className}`,
+      ).toBeDefined();
+      expect(output.platforms.android?.styles[className]?.every((style) => style.native)).toBe(
+        true,
+      );
+    }
+  });
+
+  it("keeps shared and responsive utilities usable on both platforms", () => {
+    for (const className of [...SHARED_CLASSES, ...RESPONSIVE_CLASSES]) {
+      for (const platform of ["ios", "android"]) {
+        const styles = output.platforms[platform]?.styles[className];
+        expect(styles, `${platform} lacks ${className}`).toBeDefined();
+        expect(styles?.every((style) => !style.native)).toBe(true);
+      }
+    }
+    // The leak hid a second regression: only the first utility of a width
+    // block kept its breakpoint, so the second applied at every screen size.
+    for (const platform of ["ios", "android"]) {
+      for (const className of RESPONSIVE_CLASSES) {
+        const style = output.platforms[platform]?.styles[className]?.at(-1);
+        expect(style?.minWidth, `${className} lost its breakpoint`).toBeGreaterThan(0);
+      }
+    }
+  });
+
+  it("serializes every compiled style into the platform payload and leaks nothing", () => {
+    for (const platform of ["ios", "android"]) {
+      expect(output.platforms[platform]?.payloadIncludesAllCompiled).toBe(true);
+      // A platform utility dropped from this platform's stylesheet must not
+      // survive anywhere in the payload this platform bundles.
+      expect(output.platforms[platform]?.payloadLeaks, `${platform} payload leaks`).toEqual([]);
+    }
+  });
+});
+
+// The media-query fix must not lose the surrounding rule context: Tailwind
+// also emits media rules *nested inside a class rule* (`@utility` bodies with
+// `@variant`, nested breakpoints), and those declarations belong to the
+// enclosing class. These expectations match the pre-fix compiler output for
+// the same inputs, captured against the unpatched package.
+describe("uniwind keeps media rules nested inside class rules attached to the class", () => {
+  let nested: FixtureOutput;
+
+  beforeAll(() => {
+    nested = runFixture(
+      [
+        '@import "tailwindcss";',
+        '@import "uniwind";',
+        "",
+        ".container-x {",
+        "  width: 100%;",
+        "  @media (width >= 40rem) {",
+        "    max-width: 40rem;",
+        "  }",
+        "}",
+        "",
+        "@utility foo-x {",
+        "  padding: 2px;",
+        "  @variant ios {",
+        "    padding: 3px;",
+        "  }",
+        "}",
+        "",
+      ].join("\n"),
+      'export const Probe = () => <div className="container-x foo-x" />;\n',
+    );
+  }, 60_000);
+
+  it("keeps the nested breakpoint entry of a nested media rule", () => {
+    for (const platform of ["ios", "android"]) {
+      const entries = nested.platforms[platform]?.styles["container-x"];
+      expect(entries, `${platform} lacks container-x`).toBeDefined();
+      expect(entries?.some((style) => !style.native && style.minWidth === 0)).toBe(true);
+      expect(entries?.some((style) => !style.native && style.minWidth > 0)).toBe(true);
+    }
+  });
+
+  it("keeps @variant declarations inside @utility on their platform", () => {
+    const iosEntries = nested.platforms.ios?.styles["foo-x"];
+    expect(iosEntries?.some((style) => !style.native)).toBe(true);
+    expect(iosEntries?.some((style) => style.native)).toBe(true);
+
+    const androidEntries = nested.platforms.android?.styles["foo-x"];
+    expect(androidEntries?.some((style) => !style.native)).toBe(true);
+    expect(androidEntries?.some((style) => style.native)).toBe(false);
+  });
+});
+
+// The patch file carries three independent uniwind fixes (state/data selector
+// variants, the Metro native-styles fingerprint, and this media-query scoping
+// fix). Regenerating it for one fix must not silently drop the others — this
+// suite exercises the shipped transformer and compiler for the other two.
+describe("uniwind patch keeps pre-existing selector and transformer behavior", () => {
+  let output: FixtureOutput;
+
+  beforeAll(() => {
+    output = runFixture(
+      '@import "tailwindcss";\n@import "uniwind";\n',
+      'export const Probe = () => <div className="active:opacity-50 disabled:opacity-50 data-x:underline aria-disabled:text-red-500" />;\n',
+    );
+  }, 60_000);
+
+  it("keeps state and data variants conditioned, and rejects unsupported compounds", () => {
+    for (const platform of ["ios", "android"]) {
+      const styles = output.platforms[platform]?.styles;
+      expect(styles?.["active:opacity-50"]?.every((style) => style.active === true)).toBe(true);
+      expect(styles?.["disabled:opacity-50"]?.every((style) => style.disabled === true)).toBe(true);
+      expect(styles?.["data-x:underline"]?.every((style) => style.dataAttributes?.["data-x"])).toBe(
+        true,
+      );
+      // `[aria-disabled="true"]` is not expressible at runtime; emitting it
+      // unconditionally (the pre-#9355 behavior) styles the element always.
+      expect(styles).not.toHaveProperty("aria-disabled:text-red-500");
+    }
+  });
+
+  it("emits the global.css virtual module with a native styles fingerprint", () => {
+    expect(output.transformerCheck).toEqual({
+      reinitPayload: true,
+      fingerprintArg: true,
+      themesArg: true,
+    });
+  });
+});
diff --git a/apps/mobile/src/lib/useDelayedStatus.ts b/apps/mobile/src/lib/useDelayedStatus.ts
new file mode 100644
index 000000000000..a96edfdf23df
--- /dev/null
+++ b/apps/mobile/src/lib/useDelayedStatus.ts
@@ -0,0 +1,18 @@
+import { createDelayedStatus, type ShownStatus } from "@t3tools/client-runtime/delayed-status";
+import { useEffect, useState } from "react";
+
+/**
+ * Returns `value` only once it has lasted past the show delay, then holds it
+ * for a minimum time, so a short status never flashes. `key` is what the
+ * status belongs to (for example a thread). A new key drops it at once.
+ * Web has the same hook.
+ */
+export function useDelayedStatus<A>(key: string, value: A | null): A | null {
+  const [shown, setShown] = useState<ShownStatus<A> | null>(null);
+  const [status] = useState(() => createDelayedStatus<A>(setShown));
+  useEffect(() => () => status.dispose(), [status]);
+  useEffect(() => {
+    status.update(key, value);
+  }, [status, key, value]);
+  return shown?.key === key ? shown.value : null;
+}
diff --git a/apps/mobile/src/persistence/mobile-preferences.ts b/apps/mobile/src/persistence/mobile-preferences.ts
index 508630b1e581..9514efdff424 100644
--- a/apps/mobile/src/persistence/mobile-preferences.ts
+++ b/apps/mobile/src/persistence/mobile-preferences.ts
@@ -33,14 +33,6 @@ export interface Preferences {
   /** @deprecated Kept temporarily so older OTA bundles retain the selected mode. */
   readonly projectGroupingEnabled?: boolean;
   readonly projectGroupingMode?: SidebarProjectGroupingMode;
-  /**
-   * Device-local mirror of the web `legacySidebarEnabled` setting. Mobile has
-   * no client-settings sync, so the legacy grouped thread list is opted into
-   * per device. Deliberately a fresh key (was `threadListV2Enabled`, an
-   * opt-out): sanitizing drops the old key, so every device resets to the
-   * default flat list — see `resolveThreadListV2Enabled`.
-   */
-  readonly legacyThreadListEnabled?: boolean;
   /** Device-local counterpart of desktop's `planModeEnabled` legacy flag. */
   readonly planModeEnabled?: boolean;
   /** Model favorites belong to this device, like the web client setting. */
@@ -107,7 +99,6 @@ function sanitizePreferences(parsed: Preferences): Preferences {
     composerEnterBehavior?: ComposerEnterBehavior;
     projectGroupingEnabled?: boolean;
     projectGroupingMode?: SidebarProjectGroupingMode;
-    legacyThreadListEnabled?: boolean;
     planModeEnabled?: boolean;
     modelFavorites?: Preferences["modelFavorites"];
     threadListSettledShelfExpanded?: boolean;
@@ -176,9 +167,6 @@ function sanitizePreferences(parsed: Preferences): Preferences {
   ) {
     preferences.projectGroupingMode = parsed.projectGroupingMode;
   }
-  if (typeof parsed.legacyThreadListEnabled === "boolean") {
-    preferences.legacyThreadListEnabled = parsed.legacyThreadListEnabled;
-  }
   if (typeof parsed.planModeEnabled === "boolean") {
     preferences.planModeEnabled = parsed.planModeEnabled;
   }
diff --git a/apps/mobile/src/state/assets.ts b/apps/mobile/src/state/assets.ts
index 15cbd1d9a89f..b2fb759c5680 100644
--- a/apps/mobile/src/state/assets.ts
+++ b/apps/mobile/src/state/assets.ts
@@ -16,7 +16,7 @@ import { useCallback } from "react";
 
 import { environmentCatalog } from "../connection/catalog";
 import { connectionAtomRuntime } from "../connection/runtime";
-import { projectFaviconCache } from "../lib/projectFaviconCache";
+import { projectFaviconDatabaseCache } from "../lib/projectFaviconDatabaseCache";
 import { type AssetUrlState, deriveAssetUrlState } from "./asset-url-state";
 import { environmentSession, usePreparedConnection } from "./session";
 import { useAtomQueryRunner } from "./use-atom-query-runner";
@@ -26,7 +26,7 @@ export type { AssetUrlFailureReason, AssetUrlState } from "./asset-url-state";
 export const assetEnvironment = createAssetEnvironmentAtoms(connectionAtomRuntime);
 
 export const projectFaviconUrlAtom = createProjectFaviconUrlAtomFamily({
-  imageCache: projectFaviconCache,
+  imageCache: projectFaviconDatabaseCache,
   createUrl: assetEnvironment.createUrl,
   preparedConnection: environmentSession.preparedConnectionValueAtom,
 });
diff --git a/apps/mobile/src/state/client-cache-state.ts b/apps/mobile/src/state/client-cache-state.ts
index c210c54f2fdd..0060e6ab0789 100644
--- a/apps/mobile/src/state/client-cache-state.ts
+++ b/apps/mobile/src/state/client-cache-state.ts
@@ -3,7 +3,7 @@ import * as Effect from "effect/Effect";
 import { Atom } from "effect/unstable/reactivity";
 
 import { type ClientCacheKind, MobileDatabase } from "../persistence/mobile-database";
-import { projectFaviconCache } from "../lib/projectFaviconCache";
+import { projectFaviconDatabaseCache } from "../lib/projectFaviconDatabaseCache";
 import * as Runtime from "../lib/runtime";
 
 export interface EnvironmentClientCacheSummary {
@@ -74,8 +74,8 @@ export const clearClientCacheAtom = clientCacheRuntime
   .fn((scope: ClientCacheClearScope, get) =>
     Effect.promise(() =>
       scope.type === "all"
-        ? projectFaviconCache.clearAll()
-        : projectFaviconCache.clearEnvironment(scope.environmentId),
+        ? projectFaviconDatabaseCache.clearAll()
+        : projectFaviconDatabaseCache.clearEnvironment(scope.environmentId),
     ).pipe(
       Effect.andThen(MobileDatabase),
       Effect.flatMap((database) =>
diff --git a/apps/mobile/src/state/composer-attachment-uploads.ts b/apps/mobile/src/state/composer-attachment-uploads.ts
index 352367c09a15..dec31f9ce039 100644
--- a/apps/mobile/src/state/composer-attachment-uploads.ts
+++ b/apps/mobile/src/state/composer-attachment-uploads.ts
@@ -4,6 +4,7 @@ import { Atom } from "effect/unstable/reactivity";
 import { useEffect, useRef } from "react";
 
 import { prepareTurnAttachments } from "../lib/attachmentUpload";
+import { retainComposerAttachmentFileForPreview } from "../lib/composerAttachmentPreviewRetention";
 import { isFileBackedComposerAttachment } from "../lib/composerImages";
 import {
   composerAttachmentUploadKey,
@@ -20,7 +21,6 @@ import {
   composerDraftsAtom,
   ensureComposerDraftsLoaded,
   flushComposerDrafts,
-  retainComposerAttachmentFileForPreview,
   setComposerDraftAttachmentUpload,
 } from "./use-composer-drafts";
 import { useRemoteConnectionStatus } from "./use-remote-environment-registry";
diff --git a/apps/mobile/src/features/threads/legacy-plan-mode.test.ts b/apps/mobile/src/state/legacy-plan-mode.test.ts
similarity index 100%
rename from apps/mobile/src/features/threads/legacy-plan-mode.test.ts
rename to apps/mobile/src/state/legacy-plan-mode.test.ts
diff --git a/apps/mobile/src/features/threads/legacy-plan-mode.ts b/apps/mobile/src/state/legacy-plan-mode.ts
similarity index 100%
rename from apps/mobile/src/features/threads/legacy-plan-mode.ts
rename to apps/mobile/src/state/legacy-plan-mode.ts
diff --git a/apps/mobile/src/state/thread-outbox-model.ts b/apps/mobile/src/state/thread-outbox-model.ts
index 3d2231fb3ac3..c53dc34e7df4 100644
--- a/apps/mobile/src/state/thread-outbox-model.ts
+++ b/apps/mobile/src/state/thread-outbox-model.ts
@@ -26,7 +26,7 @@ import * as Schema from "effect/Schema";
 import { DraftComposerAttachmentSchema } from "../lib/composer-image-schema";
 import type { DraftComposerAttachment } from "../lib/composerImages";
 import { scopedThreadKey } from "../lib/scopedEntities";
-import { resolveProviderInteractionMode } from "../features/threads/legacy-plan-mode";
+import { resolveProviderInteractionMode } from "./legacy-plan-mode";
 
 // Keep current writes until a compatible native baseline includes the v4 reader.
 const THREAD_OUTBOX_SCHEMA_VERSION = 3;
diff --git a/apps/mobile/src/state/usage.ts b/apps/mobile/src/state/usage.ts
index d49c26a40a44..c5895d353fef 100644
--- a/apps/mobile/src/state/usage.ts
+++ b/apps/mobile/src/state/usage.ts
@@ -16,7 +16,7 @@ import {
   type UsageSummary,
   type UsageSummaryInput,
 } from "@t3tools/contracts";
-import { refreshUsage } from "@t3tools/client-runtime/state/usage";
+import { needsCursorKeychainAccess, refreshUsage } from "@t3tools/client-runtime/state/usage";
 import { mergeUsage, type EnvironmentUsage, type MergedUsage } from "@t3tools/shared/usageMerge";
 import * as Option from "effect/Option";
 import { AsyncResult, Atom } from "effect/unstable/reactivity";
@@ -33,6 +33,7 @@ export interface EnvironmentUsageStatus {
   readonly isConnected: boolean;
   readonly error: string | null;
   readonly summary: UsageSummary | null;
+  readonly needsCursorKeychainAccess: boolean;
 }
 
 /**
@@ -50,13 +51,18 @@ const usageByWindowAtom = Atom.family((windowKey: string) =>
     const statuses: EnvironmentUsageStatus[] = [];
     for (const [environmentId, presentation] of presentations) {
       const result = get(serverEnvironment.usageSummary({ environmentId, input }));
+      const summary = Option.getOrNull(AsyncResult.value(result));
       statuses.push({
         environmentId,
         label: presentation.entry.target.label,
         isPending: result.waiting,
         isConnected: presentation.connection.phase === "connected",
         error: result._tag === "Failure" ? "This environment could not report usage." : null,
-        summary: Option.getOrNull(AsyncResult.value(result)),
+        summary,
+        needsCursorKeychainAccess: needsCursorKeychainAccess(
+          summary,
+          get(serverEnvironment.providersValueAtom(environmentId)),
+        ),
       });
     }
     return statuses;
diff --git a/apps/mobile/src/state/use-composer-drafts.test.ts b/apps/mobile/src/state/use-composer-drafts.test.ts
index 9f5dad4d5600..fa6b2f303f70 100644
--- a/apps/mobile/src/state/use-composer-drafts.test.ts
+++ b/apps/mobile/src/state/use-composer-drafts.test.ts
@@ -179,7 +179,6 @@ import {
   removeComposerDraftsForEnvironment,
   replaceComposerDraftAttachments,
   resetComposerDraftsLoadState,
-  retainComposerAttachmentFileForPreview,
   restoreComposerDraftSnapshotState,
   restoreCloudComposerDrafts,
   retargetNewTaskDraft,
@@ -194,6 +193,7 @@ import {
   undoComposerDraftMerge,
   undoComposerDraftMergeState,
 } from "./use-composer-drafts";
+import { retainComposerAttachmentFileForPreview } from "../lib/composerAttachmentPreviewRetention";
 
 const DRAFT: ComposerDraft = {
   text: "hello",
diff --git a/apps/mobile/src/state/use-composer-drafts.ts b/apps/mobile/src/state/use-composer-drafts.ts
index 734199dcef5e..de886d54fe91 100644
--- a/apps/mobile/src/state/use-composer-drafts.ts
+++ b/apps/mobile/src/state/use-composer-drafts.ts
@@ -35,8 +35,11 @@ import { DraftComposerAttachmentSchema } from "../lib/composer-image-schema";
 import {
   composerAttachmentFileReferenceKey,
   isComposerAttachmentFileRetained,
-  retainComposerAttachmentFile,
 } from "../lib/composerAttachmentFiles";
+import {
+  registerComposerAttachmentUnusedHandler,
+  retainComposerAttachmentFileForPreview,
+} from "../lib/composerAttachmentPreviewRetention";
 import type { DraftComposerAttachment, FileBackedComposerAttachment } from "../lib/composerImages";
 import { SerializedAsyncQueue } from "../lib/serialized-async-queue";
 import { appAtomRegistry } from "./atom-registry";
@@ -957,14 +960,14 @@ export function scheduleUnusedComposerAttachmentCleanup(
   });
 }
 
-/** Keeps a native preview or upload readable until it finishes, then retries ownership cleanup. */
-export function retainComposerAttachmentFileForPreview(
-  attachment: FileBackedComposerAttachment,
-): () => void {
-  return retainComposerAttachmentFile(attachment.fileUri, () => {
-    scheduleUnusedComposerAttachmentCleanup([attachment]);
-  });
-}
+/**
+ * Owner-side cleanup hook for the shared preview-retention helper: releasing
+ * the last preview/upload lease retries the unused-file sweep. Registered here
+ * because this module owns the draft and outbox references the sweep reads.
+ */
+registerComposerAttachmentUnusedHandler((attachment) => {
+  scheduleUnusedComposerAttachmentCleanup([attachment]);
+});
 
 function schedulePersistComposerState(): void {
   if (persistTimer !== null) {
diff --git a/apps/mobile/src/state/use-remote-environment-registry.ts b/apps/mobile/src/state/use-remote-environment-registry.ts
index 1664dc7461aa..ce309f5b06fd 100644
--- a/apps/mobile/src/state/use-remote-environment-registry.ts
+++ b/apps/mobile/src/state/use-remote-environment-registry.ts
@@ -1,4 +1,5 @@
 import { useAtomValue } from "@effect/atom-react";
+import { useNavigation } from "@react-navigation/native";
 import type { EnvironmentId } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
 import { AsyncResult, Atom } from "effect/unstable/reactivity";
@@ -111,6 +112,7 @@ export function useRemoteConnectionStatus() {
 
 export function useRemoteConnections() {
   const controller = useConnectionController();
+  const navigation = useNavigation();
   const connectionPairingUrl = useAtomValue(connectionPairingUrlAtom);
   const pendingConnectionError = useAtomValue(pendingConnectionErrorAtom);
   const { connectedEnvironments, connectionError, connectionState } = useRemoteConnectionStatus();
@@ -171,22 +173,37 @@ export function useRemoteConnections() {
       if (!environment) {
         return;
       }
+      const remove = {
+        text: "Remove",
+        style: "destructive",
+        onPress: () => {
+          void controller.removeEnvironment(environmentId);
+        },
+      } as const;
+      // Removing a T3 Connect environment here leaves its account registration
+      // and host space, so point to where it can be deregistered.
+      if (environment.isRelayManaged) {
+        Alert.alert(
+          "Remove from this device?",
+          `Forget ${environment.environmentLabel} and its cached threads on this device.\n\nIt stays on your T3 Connect account and keeps its host space. Deregister it under T3 Account → T3 Connect to free it.`,
+          [
+            { text: "Cancel", style: "cancel" },
+            {
+              text: "Open T3 Account",
+              onPress: () => navigation.navigate("SettingsSheet", { screen: "SettingsAuth" }),
+            },
+            remove,
+          ],
+        );
+        return;
+      }
       Alert.alert(
         "Remove from this device?",
         `Forget ${environment.environmentLabel} and its cached threads on this device. Switch it off instead to keep it saved.`,
-        [
-          { text: "Cancel", style: "cancel" },
-          {
-            text: "Remove",
-            style: "destructive",
-            onPress: () => {
-              void controller.removeEnvironment(environmentId);
-            },
-          },
-        ],
+        [{ text: "Cancel", style: "cancel" }, remove],
       );
     },
-    [connectedEnvironments, controller],
+    [connectedEnvironments, controller, navigation],
   );
 
   return {
diff --git a/apps/mobile/src/state/use-thread-composer-state.ts b/apps/mobile/src/state/use-thread-composer-state.ts
index d21af7d79cc3..051fe543ea2b 100644
--- a/apps/mobile/src/state/use-thread-composer-state.ts
+++ b/apps/mobile/src/state/use-thread-composer-state.ts
@@ -30,7 +30,7 @@ import { uuidv4 } from "../lib/uuid";
 
 import { makeQueuedMessageMetadata } from "../lib/commandMetadata";
 import { isModelSelectionUnavailable } from "../lib/modelOptions";
-import { resolveProviderInteractionMode } from "../features/threads/legacy-plan-mode";
+import { resolveProviderInteractionMode } from "./legacy-plan-mode";
 import {
   convertPastedImagesToAttachments,
   createPastedTextComposerAttachment,
diff --git a/apps/mobile/src/state/use-thread-outbox-drain.ts b/apps/mobile/src/state/use-thread-outbox-drain.ts
index 1147e9fd47af..022c0ad6addb 100644
--- a/apps/mobile/src/state/use-thread-outbox-drain.ts
+++ b/apps/mobile/src/state/use-thread-outbox-drain.ts
@@ -17,6 +17,7 @@ import { AsyncResult } from "effect/unstable/reactivity";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Alert } from "react-native";
 
+import { createDebugLogger } from "../lib/debugLog";
 import { scopedThreadKey } from "../lib/scopedEntities";
 import { buildProjectThreadStartTurnInput } from "../lib/projectThreadStartTurn";
 import { serializeComposerMessageForServer, uploadedComposerContext } from "../lib/composerContext";
@@ -55,6 +56,7 @@ import {
   type QueuedThreadCreation,
   type QueuedThreadMessage,
   type ThreadOutboxCommandStage,
+  type ThreadOutboxFailureAction,
 } from "./thread-outbox-model";
 import { environmentThreadShells, threadEnvironment } from "./threads";
 import {
@@ -82,6 +84,92 @@ import {
   useRemoteConnectionStatus,
 } from "./use-remote-environment-registry";
 
+// Ordinary offline behavior (a socket dropping mid-request, a retryable
+// attachment upload failure) must not spam `console.warn` on every backoff
+// retry; it goes to the filterable `[t3-thread-outbox]` debug log instead.
+// Failures the server decided stay on `console.warn`.
+const threadOutboxDebug = createDebugLogger("thread-outbox");
+
+/**
+ * On the queued-request path (settings sync, startTurn) the RPC client
+ * reports ordinary transport drops as the raw socket/worker reason tags, and
+ * reserves `RpcClientDefect` for client-side protocol violations and decoding
+ * failures — unlike the shared config-subscription stream, which
+ * deliberately re-wraps transport causes under that tag. Defects still retry,
+ * but they are not ordinary offline behavior and must not hide behind the
+ * offline debug log.
+ */
+function isRpcClientDecodeDefect(error: unknown): boolean {
+  if (
+    typeof error !== "object" ||
+    error === null ||
+    !("_tag" in error) ||
+    error._tag !== "RpcClientError"
+  ) {
+    return false;
+  }
+  const reason: unknown = (error as { readonly reason?: unknown }).reason;
+  return (
+    typeof reason === "object" &&
+    reason !== null &&
+    "_tag" in reason &&
+    reason._tag === "RpcClientDefect"
+  );
+}
+
+function isOrdinaryThreadOutboxTransportFailure(error: unknown): boolean {
+  return shouldRetryThreadOutboxDelivery(error) && !isRpcClientDecodeDefect(error);
+}
+
+/**
+ * Logs one queued-message delivery failure and returns the retry-or-restore
+ * decision for the caller. Ordinary transport retries — what an offline
+ * device or a flapping socket produces on every backoff attempt — go to the
+ * debug log. Server-decided failures warn. Settings-sync failures always
+ * resolve to a retry even when the server rejected the command, so the
+ * error, not the resolved action, must decide the log level there; routing
+ * every retry to debug could hide a permanently rejected update forever.
+ */
+function logThreadOutboxDeliveryFailure(input: {
+  readonly stage: ThreadOutboxCommandStage;
+  readonly error: unknown;
+  readonly interrupted: boolean;
+  readonly context: Record<string, unknown>;
+}): ThreadOutboxFailureAction {
+  const action = resolveThreadOutboxFailureAction({
+    stage: input.stage,
+    error: input.error,
+    interrupted: input.interrupted,
+  });
+  const details = { ...input.context, stage: input.stage, action };
+  const ordinaryTransportRetry =
+    action === "retry" &&
+    !isRpcClientDecodeDefect(input.error) &&
+    (input.interrupted ||
+      input.stage !== "settings-sync" ||
+      shouldRetryThreadOutboxDelivery(input.error));
+  if (ordinaryTransportRetry) {
+    threadOutboxDebug.log("queued message delivery failed", details);
+  } else {
+    console.warn("[thread-outbox] queued message delivery failed", details);
+  }
+  return action;
+}
+
+/** Attachment uploads retry like delivery: transport failures are ordinary offline noise. */
+function logThreadOutboxUploadFailure(queuedMessage: QueuedThreadMessage, error: unknown): void {
+  const context = {
+    environmentId: queuedMessage.environmentId,
+    threadId: queuedMessage.threadId,
+    messageId: queuedMessage.messageId,
+  };
+  if (isOrdinaryThreadOutboxTransportFailure(error)) {
+    threadOutboxDebug.log("attachment upload failed; retrying", { ...context, error });
+  } else {
+    console.warn("[thread-outbox] failed to upload attachments", { ...context, error });
+  }
+}
+
 function beginDispatchingQueuedMessage(queuedMessageId: MessageId): void {
   appAtomRegistry.set(dispatchingQueuedMessageIdAtom, queuedMessageId);
 }
@@ -215,14 +303,13 @@ export async function completeQueuedMessageDelivery(
     );
     if (!removed) {
       forgetAcknowledgedThreadMessage(queuedMessage);
-      console.warn(
-        "[thread-outbox] delivered message was edited before cleanup; keeping the newer message",
-        {
-          environmentId: queuedMessage.environmentId,
-          threadId: queuedMessage.threadId,
-          messageId: queuedMessage.messageId,
-        },
-      );
+      // Losing the cleanup race to a user edit is an expected outcome the
+      // caller handles by keeping the newer message; it is not a warning.
+      threadOutboxDebug.log("delivered message was edited before cleanup", {
+        environmentId: queuedMessage.environmentId,
+        threadId: queuedMessage.threadId,
+        messageId: queuedMessage.messageId,
+      });
       return "edited";
     }
     return "removed";
@@ -667,18 +754,16 @@ export function useThreadOutboxDrain(): void {
         return null;
       }
       const error = Cause.squash(commandResult.cause);
-      const action = resolveThreadOutboxFailureAction({
+      const action = logThreadOutboxDeliveryFailure({
         stage,
         error,
         interrupted: Cause.hasInterruptsOnly(commandResult.cause),
-      });
-      console.warn("[thread-outbox] queued message delivery failed", {
-        environmentId: queuedMessage.environmentId,
-        threadId: queuedMessage.threadId,
-        messageId: queuedMessage.messageId,
-        stage,
-        cause: commandResult.cause,
-        action,
+        context: {
+          environmentId: queuedMessage.environmentId,
+          threadId: queuedMessage.threadId,
+          messageId: queuedMessage.messageId,
+          cause: commandResult.cause,
+        },
       });
       return {
         action,
@@ -772,7 +857,7 @@ export function useThreadOutboxDrain(): void {
           return true;
         }
       } catch (error) {
-        console.warn("[thread-outbox] failed to upload attachments", error);
+        logThreadOutboxUploadFailure(queuedMessage, error);
         if (!shouldRetryThreadOutboxDelivery(error)) {
           return restoreQueuedMessage(
             queuedMessage,
@@ -900,7 +985,7 @@ export function useThreadOutboxDrain(): void {
           return true;
         }
       } catch (error) {
-        console.warn("[thread-outbox] failed to upload attachments", error);
+        logThreadOutboxUploadFailure(queuedMessage, error);
         if (!shouldRetryThreadOutboxDelivery(error)) {
           return restoreQueuedMessage(
             queuedMessage,
diff --git a/apps/mobile/src/state/use-thread-selection.ts b/apps/mobile/src/state/use-thread-selection.ts
index d922eb7f6d5c..108afbbc9416 100644
--- a/apps/mobile/src/state/use-thread-selection.ts
+++ b/apps/mobile/src/state/use-thread-selection.ts
@@ -74,6 +74,7 @@ function threadDetailToShell(
     settledAt: thread.settledAt,
     unsettledAt: thread.unsettledAt,
     activeOrderKey: thread.activeOrderKey,
+    autoSettleDisabledAt: thread.autoSettleDisabledAt,
     pinnedAt: thread.pinnedAt,
     pinOrderKey: thread.pinOrderKey,
     snoozedUntil: thread.snoozedUntil ?? null,
diff --git a/apps/mobile/src/widgets/SubscriptionUsage.tsx b/apps/mobile/src/widgets/SubscriptionUsage.tsx
index c8cde5d444fe..a32454e5ff83 100644
--- a/apps/mobile/src/widgets/SubscriptionUsage.tsx
+++ b/apps/mobile/src/widgets/SubscriptionUsage.tsx
@@ -235,7 +235,11 @@ function SubscriptionUsage(
       spacing={accessory || dense ? 2 : 6}
       modifiers={props.url ? [widgetURL(props.url)] : []}
     >
-      {compact ? (
+      {providers.length === 0 ? (
+        <Text modifiers={[font({ textStyle: "caption" }), foregroundStyle("secondary")]}>
+          No subscription limits available.
+        </Text>
+      ) : compact ? (
         <VStack alignment="leading" spacing={accessory || dense ? 4 : 8}>
           {columns}
         </VStack>
diff --git a/apps/mobile/src/widgets/SubscriptionUsageCoordinator.tsx b/apps/mobile/src/widgets/SubscriptionUsageCoordinator.tsx
index 84dce5d515ec..4a805b48ce22 100644
--- a/apps/mobile/src/widgets/SubscriptionUsageCoordinator.tsx
+++ b/apps/mobile/src/widgets/SubscriptionUsageCoordinator.tsx
@@ -2,6 +2,7 @@ import { useAtomValue } from "@effect/atom-react";
 import { Atom } from "effect/unstable/reactivity";
 import * as Linking from "expo-linking";
 import { useEffect } from "react";
+import { Platform } from "react-native";
 import { environmentCatalog } from "../connection/catalog";
 import { environmentPresentations } from "../state/presentation";
 import { publishSubscriptionUsage } from "./publishSubscriptionUsage";
@@ -13,6 +14,8 @@ const snapshotAtom = Atom.make((get) =>
   buildSubscriptionUsageSnapshot(
     get(environmentPresentations.presentationsAtom),
     Linking.createURL("settings/usage", { queryParams: { tab: "limits" } }),
+    // Android scrolls the full list; iOS stores a bounded widget timeline.
+    Platform.OS === "android" ? Infinity : 6,
   ),
 ).pipe(Atom.withEquality((a, b) => JSON.stringify(a) === JSON.stringify(b)));
 
diff --git a/apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts b/apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts
index 65d4c9924f66..8ab3d6191ef5 100644
--- a/apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts
+++ b/apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts
@@ -65,18 +65,63 @@ describe("subscription widget snapshots", () => {
     expect(snapshot.url).toBe(deepLink);
     expect(JSON.stringify(snapshot)).not.toContain("private@example.com");
   });
-  it("clears data after removing environments and hides disabled providers", () => {
-    expect(
-      buildSubscriptionUsageSnapshot(new Map(), deepLink).providers.every(
-        (p) => p.windows.length === 0,
-      ),
-    ).toBe(true);
+  it("clears data after removing environments", () => {
+    expect(buildSubscriptionUsageSnapshot(new Map(), deepLink).providers).toEqual([]);
+  });
+  it.each<{ name: string; overrides: Partial<ServerProvider> }>([
+    { name: "disabled", overrides: { enabled: false } },
+    {
+      name: "missing",
+      overrides: { installed: false, status: "error", usageLimits: undefined },
+    },
+    {
+      name: "API-key",
+      overrides: {
+        usageLimits: { checkedAt, windows: [], unavailable: { reason: "unsupported" } },
+      },
+    },
+  ])("hides $name providers", ({ overrides }) => {
     expect(
-      buildSubscriptionUsageSnapshot(
-        presentations([provider({ enabled: false })]),
-        deepLink,
-      ).providers.every((p) => p.windows.length === 0),
-    ).toBe(true);
+      buildSubscriptionUsageSnapshot(presentations([provider(overrides)]), deepLink).providers,
+    ).toEqual([]);
+  });
+  it.each([
+    { name: "Codex", driver: "codex" },
+    { name: "Claude", driver: "claudeAgent" },
+  ])("only shows $name when $name and OpenCode are configured", ({ name, driver }) => {
+    const snapshot = buildSubscriptionUsageSnapshot(
+      presentations([
+        provider({
+          instanceId: ProviderInstanceId.make(driver),
+          driver: ProviderDriverKind.make(driver),
+        }),
+        provider({
+          instanceId: ProviderInstanceId.make("opencode"),
+          driver: ProviderDriverKind.make("opencode"),
+          usageLimits: undefined,
+        }),
+      ]),
+      deepLink,
+    );
+    expect(snapshot.providers).toHaveLength(1);
+    expect(snapshot.providers[0]).toMatchObject({
+      name,
+      totalWindows: 1,
+      windows: [{ remaining: 60 }],
+    });
+    expect(subscriptionUsageTimeline(snapshot, now + 15 * 60_000)[0]?.props.providers).toEqual([
+      expect.objectContaining({ name, totalWindows: 0, windows: [] }),
+    ]);
+  });
+  it("keeps an enabled provider visible before its first usage read", () => {
+    const snapshot = buildSubscriptionUsageSnapshot(
+      presentations([provider({ usageLimits: undefined })]),
+      deepLink,
+    );
+    expect(snapshot.checkedAt).toBe(0);
+    expect(snapshot.providers).toEqual([
+      { name: "Codex", detail: "No limits available", windows: [], expiresAt: 0, totalWindows: 0 },
+    ]);
   });
   it("uses upstream deduplication for a native account also present in a proxy hub", () => {
     const input = new Map([
@@ -151,6 +196,21 @@ describe("subscription widget snapshots", () => {
     expect(snapshot.providers[0]?.totalWindows).toBe(20);
     expect(snapshot.providers[0]?.windows[0]?.remaining).toBe(5);
   });
+  it("includes every limit for the scrollable Android widget", () => {
+    const windows = Array.from({ length: 20 }, (_, index) => ({
+      ...window,
+      id: `${index}`,
+      usedPercent: index * 5,
+    }));
+    const snapshot = buildSubscriptionUsageSnapshot(
+      presentations([provider({ usageLimits: { checkedAt, windows } })]),
+      deepLink,
+      Infinity,
+    );
+    expect(snapshot.providers[0]?.windows.map((window) => window.remaining)).toEqual(
+      Array.from({ length: 20 }, (_, index) => 5 + index * 5),
+    );
+  });
   it("marks unknown or distant reset times stale after fifteen minutes", () => {
     const snapshot = buildSubscriptionUsageSnapshot(
       presentations([
diff --git a/apps/mobile/src/widgets/subscriptionUsageSnapshot.ts b/apps/mobile/src/widgets/subscriptionUsageSnapshot.ts
index 826124e1053f..44f2c6ef4bed 100644
--- a/apps/mobile/src/widgets/subscriptionUsageSnapshot.ts
+++ b/apps/mobile/src/widgets/subscriptionUsageSnapshot.ts
@@ -46,6 +46,8 @@ export function createWidgetRefresher<Id>(refresh: (id: Id) => Promise<unknown>)
 function subscriptionUsageProps(
   accounts: readonly LimitAccount[],
   now: number,
+  configuredDrivers: ReadonlySet<string>,
+  maxWindowsPerProvider: number,
 ): SubscriptionUsageSnapshot {
   const pools = collectLimitPools(accounts, now);
   const checked = accounts
@@ -53,57 +55,68 @@ function subscriptionUsageProps(
     .map((account) => Date.parse(account.limits.checkedAt));
   return {
     checkedAt: checked.length > 0 && checked.every(Number.isFinite) ? Math.min(...checked) : 0,
-    providers: (["codex", "claudeAgent"] as const).map((driver) => {
-      const pool = pools.find((candidate) => candidate.driver === driver);
-      const name = driver === "codex" ? "Codex" : "Claude";
-      if (!pool)
-        return { name, detail: "No limits available", windows: [], expiresAt: 0, totalWindows: 0 };
-      const checkedAt = Math.min(...pool.accounts.map((a) => Date.parse(a.limits.checkedAt)));
-      const expiresAt = Math.min(
-        checkedAt + SNAPSHOT_MAX_AGE,
-        ...pool.windows.flatMap((window) => window.resets.map((reset) => reset.at)),
-      );
-      const fresh = Number.isFinite(expiresAt) && expiresAt > now;
-      const sortedWindows = [...pool.windows].sort(
-        (a, b) => a.remainingPercent - b.remainingPercent,
-      );
-      // Keep a session and weekly limit when scoped limits fill the storage budget.
-      const selectedWindows = [
-        ...new Set([
-          sortedWindows.find((window) => window.kind === "session"),
-          sortedWindows.find((window) => window.kind === "weekly"),
-          ...sortedWindows,
-        ]),
-      ]
-        .filter((window) => window !== undefined)
-        .slice(0, 6)
-        .sort((a, b) => a.remainingPercent - b.remainingPercent);
-      return {
-        name,
-        detail: !fresh
-          ? "Open T3 to refresh"
-          : pool.accounts.length > 1
-            ? `${pool.accounts.length} accounts · pooled`
-            : "Subscription remaining",
-        expiresAt: fresh ? expiresAt : 0,
-        totalWindows: fresh ? pool.windows.length : 0,
-        windows: fresh
-          ? selectedWindows.map((window) => ({
-              kind: window.kind,
-              label: window.label,
-              remaining: Math.round(window.remainingPercent),
-              reset: window.resets[0]
-                ? `Next reset ${new Date(window.resets[0].at).toLocaleString(undefined, {
-                    month: "short",
-                    day: "numeric",
-                    hour: "numeric",
-                    minute: "2-digit",
-                  })}`
-                : "Reset time unavailable",
-            }))
-          : [],
-      };
-    }),
+    providers: (["codex", "claudeAgent"] as const)
+      .filter(
+        (driver) =>
+          configuredDrivers.has(driver) || accounts.some((account) => account.driver === driver),
+      )
+      .map((driver) => {
+        const pool = pools.find((candidate) => candidate.driver === driver);
+        const name = driver === "codex" ? "Codex" : "Claude";
+        if (!pool)
+          return {
+            name,
+            detail: "No limits available",
+            windows: [],
+            expiresAt: 0,
+            totalWindows: 0,
+          };
+        const checkedAt = Math.min(...pool.accounts.map((a) => Date.parse(a.limits.checkedAt)));
+        const expiresAt = Math.min(
+          checkedAt + SNAPSHOT_MAX_AGE,
+          ...pool.windows.flatMap((window) => window.resets.map((reset) => reset.at)),
+        );
+        const fresh = Number.isFinite(expiresAt) && expiresAt > now;
+        const sortedWindows = [...pool.windows].sort(
+          (a, b) => a.remainingPercent - b.remainingPercent,
+        );
+        // Keep a session and weekly limit when scoped limits fill the storage budget.
+        const selectedWindows = [
+          ...new Set([
+            sortedWindows.find((window) => window.kind === "session"),
+            sortedWindows.find((window) => window.kind === "weekly"),
+            ...sortedWindows,
+          ]),
+        ]
+          .filter((window) => window !== undefined)
+          .slice(0, maxWindowsPerProvider)
+          .sort((a, b) => a.remainingPercent - b.remainingPercent);
+        return {
+          name,
+          detail: !fresh
+            ? "Open T3 to refresh"
+            : pool.accounts.length > 1
+              ? `${pool.accounts.length} accounts · pooled`
+              : "Subscription remaining",
+          expiresAt: fresh ? expiresAt : 0,
+          totalWindows: fresh ? pool.windows.length : 0,
+          windows: fresh
+            ? selectedWindows.map((window) => ({
+                kind: window.kind,
+                label: window.label,
+                remaining: Math.round(window.remainingPercent),
+                reset: window.resets[0]
+                  ? `Next reset ${new Date(window.resets[0].at).toLocaleString(undefined, {
+                      month: "short",
+                      day: "numeric",
+                      hour: "numeric",
+                      minute: "2-digit",
+                    })}`
+                  : "Reset time unavailable",
+              }))
+            : [],
+        };
+      }),
   };
 }
 
@@ -111,9 +124,31 @@ function subscriptionUsageProps(
 export function buildSubscriptionUsageSnapshot(
   presentations: LimitPresentations,
   url: string,
+  maxWindowsPerProvider = 6,
 ): SubscriptionUsageSnapshot {
   // Freshness is evaluated at publication/render time, not on unrelated config emissions.
-  return { ...subscriptionUsageProps(collectLimitAccounts(presentations), 0), url };
+  const configuredDrivers = new Set(
+    [...presentations.values()].flatMap((presentation) =>
+      (presentation.serverConfig?.providers ?? [])
+        // Servers report default-enabled drivers even when their CLI is missing.
+        .filter(
+          (provider) =>
+            provider.enabled &&
+            provider.installed &&
+            provider.usageLimits?.unavailable?.reason !== "unsupported",
+        )
+        .map((provider) => provider.driver),
+    ),
+  );
+  return {
+    ...subscriptionUsageProps(
+      collectLimitAccounts(presentations),
+      0,
+      configuredDrivers,
+      maxWindowsPerProvider,
+    ),
+    url,
+  };
 }
 
 export function subscriptionUsageTimeline(snapshot: SubscriptionUsageSnapshot, now: number) {
diff --git a/apps/server/integration/OrchestrationEngineHarness.integration.ts b/apps/server/integration/OrchestrationEngineHarness.integration.ts
index 0df54be2f701..5e3b4c6e4afe 100644
--- a/apps/server/integration/OrchestrationEngineHarness.integration.ts
+++ b/apps/server/integration/OrchestrationEngineHarness.integration.ts
@@ -26,6 +26,7 @@ import * as Tracer from "effect/Tracer";
 
 import * as CheckpointStore from "../src/checkpointing/CheckpointStore.ts";
 import { TextGeneration } from "../src/textGeneration/TextGeneration.ts";
+import * as TerminalManager from "../src/terminal/Manager.ts";
 import { OrchestrationCommandReceiptRepositoryLive } from "../src/persistence/Layers/OrchestrationCommandReceipts.ts";
 import { OrchestrationEventStoreLive } from "../src/persistence/Layers/OrchestrationEventStore.ts";
 import { ProjectionPendingApprovalRepositoryLive } from "../src/persistence/Layers/ProjectionPendingApprovals.ts";
@@ -340,6 +341,7 @@ export const makeOrchestrationIntegrationHarness = (
           tryHandlePromptCommand: () => Effect.succeed(false),
         }),
       ),
+      Layer.provide(Layer.mock(TerminalManager.TerminalManager)({ closeIdle: () => Effect.void })),
       Layer.provideMerge(runtimeServicesLayer),
       Layer.provideMerge(gitWorkflowLayer),
       Layer.provideMerge(textGenerationLayer),
@@ -418,6 +420,7 @@ export const makeOrchestrationIntegrationHarness = (
       Layer.provideMerge(
         Layer.succeed(AgentAwarenessRelay.AgentAwarenessRelay, {
           publishThread: () => Effect.void,
+          requestCatchUp: () => Effect.void,
           start: () => Effect.void,
         }),
       ),
diff --git a/apps/server/integration/orphanedProviderSessionStartup.integration.test.ts b/apps/server/integration/orphanedProviderSessionStartup.integration.test.ts
index 77173af1b377..b483a3f99f8e 100644
--- a/apps/server/integration/orphanedProviderSessionStartup.integration.test.ts
+++ b/apps/server/integration/orphanedProviderSessionStartup.integration.test.ts
@@ -100,7 +100,7 @@ const startupDependencies = Layer.mergeAll(
   Layer.succeed(ServiceLauncherClient.ServiceLauncherClient, {
     managed: false,
     requestUpdate: () => Effect.die("unused"),
-    prepareTrial: Effect.sync(() => undefined),
+    prepareTrial: Effect.undefined,
   }),
   Layer.succeed(
     HttpServer.HttpServer,
diff --git a/apps/server/package.json b/apps/server/package.json
index 82df7c8930bf..a4f13ac07769 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "t3",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -27,10 +27,13 @@
     "@effect/platform-node": "catalog:",
     "@effect/platform-node-shared": "catalog:",
     "@ff-labs/fff-node": "0.9.4",
+    "@napi-rs/keyring": "^1.3.0",
     "@opencode-ai/sdk": "^1.3.15",
     "diff": "8.0.3",
     "effect": "catalog:",
-    "node-pty": "^1.1.0",
+    "jose": "catalog:",
+    "node-pty": "^1.2.0-beta.15",
+    "proper-lockfile": "4.1.2",
     "stream-chain": "^4.2.5",
     "stream-json": "3.6.0",
     "yaml": "catalog:",
@@ -44,6 +47,7 @@
     "@t3tools/tailscale": "workspace:*",
     "@t3tools/web": "workspace:*",
     "@types/node": "catalog:",
+    "@types/proper-lockfile": "^4.1.4",
     "@types/yauzl": "^3.4.0",
     "effect-acp": "workspace:*",
     "effect-codex-app-server": "workspace:*",
diff --git a/apps/server/scripts/acp-mock-agent.ts b/apps/server/scripts/acp-mock-agent.ts
index 9fbdeee03c86..4865354e41f5 100644
--- a/apps/server/scripts/acp-mock-agent.ts
+++ b/apps/server/scripts/acp-mock-agent.ts
@@ -19,6 +19,8 @@ const emitToolCalls = process.env.T3_ACP_EMIT_TOOL_CALLS === "1";
 const emitInterleavedAssistantToolCalls =
   process.env.T3_ACP_EMIT_INTERLEAVED_ASSISTANT_TOOL_CALLS === "1";
 const emitGenericToolPlaceholders = process.env.T3_ACP_EMIT_GENERIC_TOOL_PLACEHOLDERS === "1";
+const emitBackgroundToolDuringAnswer =
+  process.env.T3_ACP_EMIT_BACKGROUND_TOOL_DURING_ANSWER === "1";
 const emitAskQuestion = process.env.T3_ACP_EMIT_ASK_QUESTION === "1";
 const emitXAiAskUserQuestion = process.env.T3_ACP_EMIT_XAI_ASK_USER_QUESTION === "1";
 const emitXAiExitPlanMode = process.env.T3_ACP_EMIT_XAI_EXIT_PLAN_MODE === "1";
@@ -619,6 +621,12 @@ const program = Effect.gen(function* () {
     Effect.gen(function* () {
       const requestedSessionId = String(request.sessionId ?? sessionId);
       promptCount += 1;
+      if (
+        process.env.T3_ACP_CRASH_PROMPT === "1" &&
+        request.prompt.some((part) => part.type === "text" && part.text === "crash now")
+      ) {
+        return yield* Effect.sync(() => process.exit(23));
+      }
 
       if (completeFirstPromptOnCancel && promptCount === 1) {
         yield* agent.client.sessionUpdate({
@@ -941,6 +949,47 @@ const program = Effect.gen(function* () {
         return yield* Effect.never;
       }
 
+      if (emitBackgroundToolDuringAnswer) {
+        // A command backgrounded earlier reports progress and then finishes
+        // while the next answer is still streaming.
+        const toolCallId = "background-1";
+        const say = (text: string) =>
+          agent.client.sessionUpdate({
+            sessionId: requestedSessionId,
+            update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text } },
+          });
+        const progress = (status: "in_progress" | "completed", stdout: string) =>
+          agent.client.sessionUpdate({
+            sessionId: requestedSessionId,
+            update: {
+              sessionUpdate: "tool_call_update",
+              toolCallId,
+              status,
+              rawOutput: { stdout },
+            },
+          });
+        yield* agent.client.sessionUpdate({
+          sessionId: requestedSessionId,
+          update: {
+            sessionUpdate: "tool_call",
+            toolCallId,
+            title: "Terminal",
+            kind: "execute",
+            status: "in_progress",
+            rawInput: { command: "sleep 3 && echo done" },
+          },
+        });
+        yield* say("| a | b |\n|---|---|\n| 1 ");
+        yield* progress("in_progress", ".");
+        yield* say("| x |\n");
+        yield* progress("completed", "done");
+        yield* say("| 2 | y |\n");
+        // Agents can repeat a terminal update after the call finished.
+        yield* progress("completed", "done");
+        yield* say("| 3 | z |");
+        return { stopReason: "end_turn" };
+      }
+
       if (emitInterleavedAssistantToolCalls) {
         const toolCallId = "tool-call-1";
 
diff --git a/apps/server/scripts/evaluate-thread-titles.ts b/apps/server/scripts/evaluate-thread-titles.ts
index 78273a9ef790..4c6e04bb510e 100644
--- a/apps/server/scripts/evaluate-thread-titles.ts
+++ b/apps/server/scripts/evaluate-thread-titles.ts
@@ -28,6 +28,7 @@ import * as GitLabCli from "../src/sourceControl/GitLabCli.ts";
 import * as ForgejoCli from "../src/sourceControl/ForgejoCli.ts";
 import * as AzureDevOpsCli from "../src/sourceControl/AzureDevOpsCli.ts";
 import * as BitbucketApi from "../src/sourceControl/BitbucketApi.ts";
+import * as ServerSettings from "../src/serverSettings.ts";
 import * as VcsProcess from "../src/vcs/VcsProcess.ts";
 import * as VcsDriverRegistry from "../src/vcs/VcsDriverRegistry.ts";
 import * as VcsProjectConfig from "../src/vcs/VcsProjectConfig.ts";
@@ -155,7 +156,8 @@ await Effect.runPromise(
               GitLabCli.layer,
               ForgejoCli.layer,
               AzureDevOpsCli.layer,
-              BitbucketApi.layer,
+              // No saved credentials here; Bitbucket falls back to T3CODE_BITBUCKET_* variables.
+              BitbucketApi.layer.pipe(Layer.provide(ServerSettings.layerTest())),
             ),
           ),
           Layer.provide(VcsDriverRegistry.layer.pipe(Layer.provide(VcsProjectConfig.layer))),
diff --git a/apps/server/src/assets/AssetAccess.ts b/apps/server/src/assets/AssetAccess.ts
index e1f6633fbeca..8dbd1c755966 100644
--- a/apps/server/src/assets/AssetAccess.ts
+++ b/apps/server/src/assets/AssetAccess.ts
@@ -190,7 +190,7 @@ const optionOnNotFound = <A, R>(
   effect: Effect.Effect<A, PlatformError.PlatformError, R>,
 ): Effect.Effect<Option.Option<A>, PlatformError.PlatformError, R> =>
   effect.pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catchTags({
       PlatformError: (error) =>
         error.reason._tag === "NotFound" ? Effect.succeed(Option.none<A>()) : Effect.fail(error),
@@ -213,9 +213,9 @@ const resolveCanonicalWorkspaceFile = Effect.fn("AssetAccess.resolveCanonicalWor
     const fileSystem = yield* FileSystem.FileSystem;
     const workspacePaths = yield* WorkspacePaths.WorkspacePaths;
     const resolved = yield* workspacePaths.resolveRelativePathWithinRoot(input).pipe(
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.catchTags({
-        WorkspacePathOutsideRootError: () => Effect.succeed(Option.none()),
+        WorkspacePathOutsideRootError: () => Effect.succeedNone,
       }),
     );
     if (Option.isNone(resolved)) return null;
diff --git a/apps/server/src/assets/NativeAppIconResolver.ts b/apps/server/src/assets/NativeAppIconResolver.ts
index 89a6d0636012..34299f95142f 100644
--- a/apps/server/src/assets/NativeAppIconResolver.ts
+++ b/apps/server/src/assets/NativeAppIconResolver.ts
@@ -43,10 +43,10 @@ function appFromCacheKey(key: string): ToolActivityNativeAppReference {
 const existingFile = Effect.fn("NativeAppIconResolver.existingFile")(function* (filePath: string) {
   const fileSystem = yield* FileSystem.FileSystem;
   const info = yield* fileSystem.stat(filePath).pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catchTags({
       PlatformError: (error) =>
-        error.reason._tag === "NotFound" ? Effect.succeed(Option.none()) : Effect.fail(error),
+        error.reason._tag === "NotFound" ? Effect.succeedNone : Effect.fail(error),
     }),
   );
   return Option.isSome(info) && info.value.type === "File" ? filePath : null;
diff --git a/apps/server/src/auth/PairingGrantStore.test.ts b/apps/server/src/auth/PairingGrantStore.test.ts
index 9a093be41ca4..beb07627c66a 100644
--- a/apps/server/src/auth/PairingGrantStore.test.ts
+++ b/apps/server/src/auth/PairingGrantStore.test.ts
@@ -3,7 +3,6 @@ import { expect, it } from "@effect/vitest";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as Stream from "effect/Stream";
 import * as Queue from "effect/Queue";
 import * as TestClock from "effect/testing/TestClock";
@@ -47,10 +46,10 @@ const makePairingGrantStoreTestLayer = (
         AuthPairingLinks.AuthPairingLinkRepository,
         AuthPairingLinks.AuthPairingLinkRepository.of({
           create: () => Effect.void,
-          consumeAvailable: () => Effect.succeed(Option.none()),
+          consumeAvailable: () => Effect.succeedNone,
           listActive: () => Effect.succeed([]),
           revoke: () => Effect.succeed(false),
-          getByCredential: () => Effect.succeed(Option.none()),
+          getByCredential: () => Effect.succeedNone,
           ...overrides,
         }),
       ),
diff --git a/apps/server/src/auth/RpcAuthorization.ts b/apps/server/src/auth/RpcAuthorization.ts
index 90dc5c0fffd1..9d6ff75f3bb9 100644
--- a/apps/server/src/auth/RpcAuthorization.ts
+++ b/apps/server/src/auth/RpcAuthorization.ts
@@ -37,6 +37,11 @@ export const RPC_REQUIRED_SCOPES = {
   [WS_METHODS.providerAuthStart]: AuthOrchestrationOperateScope,
   [WS_METHODS.providerConsumeResetCredit]: AuthOrchestrationOperateScope,
   [WS_METHODS.providerAuthComplete]: AuthOrchestrationOperateScope,
+  [WS_METHODS.chatGptReconnectProfile]: AuthOrchestrationOperateScope,
+  [WS_METHODS.chatGptImportProfile]: AuthOrchestrationOperateScope,
+  [WS_METHODS.chatGptHandoffSubscribe]: AuthOrchestrationOperateScope,
+  [WS_METHODS.codexAuthCallbackSubscribe]: AuthOrchestrationOperateScope,
+  [WS_METHODS.providerAuthRespond]: AuthOrchestrationOperateScope,
   [WS_METHODS.providerAuthCancel]: AuthOrchestrationOperateScope,
   [WS_METHODS.providerAuthLogout]: AuthOrchestrationOperateScope,
   [WS_METHODS.providerAuthSubscribe]: AuthOrchestrationOperateScope,
diff --git a/apps/server/src/auth/ServerSecretStore.ts b/apps/server/src/auth/ServerSecretStore.ts
index e936a1f85c99..1ee11d3e198e 100644
--- a/apps/server/src/auth/ServerSecretStore.ts
+++ b/apps/server/src/auth/ServerSecretStore.ts
@@ -138,6 +138,8 @@ export const isSecretAlreadyExistsError = (error: SecretStoreError): boolean =>
 export class ServerSecretStore extends Context.Service<
   ServerSecretStore,
   {
+    /** File-backed stores expose their directory for cross-process credential leases. */
+    readonly directory?: string;
     readonly get: (name: string) => Effect.Effect<Option.Option<Uint8Array>, SecretStoreError>;
     readonly set: (name: string, value: Uint8Array) => Effect.Effect<void, SecretStoreError>;
     readonly create: (name: string, value: Uint8Array) => Effect.Effect<void, SecretStoreError>;
@@ -174,7 +176,7 @@ export const make = Effect.gen(function* () {
       Effect.map((bytes) => Option.some(Uint8Array.from(bytes))),
       Effect.catch((cause) =>
         cause.reason._tag === "NotFound"
-          ? Effect.succeed(Option.none())
+          ? Effect.succeedNone
           : Effect.fail(
               new SecretStoreReadError({
                 resource: `secret ${name}`,
@@ -303,6 +305,7 @@ export const make = Effect.gen(function* () {
     );
 
   return ServerSecretStore.of({
+    directory: serverConfig.secretsDir,
     get,
     set,
     create,
diff --git a/apps/server/src/auth/dpop.ts b/apps/server/src/auth/dpop.ts
index 43f90e440915..5e026f584273 100644
--- a/apps/server/src/auth/dpop.ts
+++ b/apps/server/src/auth/dpop.ts
@@ -18,6 +18,9 @@ import {
 } from "./EnvironmentAuth.ts";
 import * as ServerSecretStore from "./ServerSecretStore.ts";
 
+/** Secret store name prefix of DPoP replay markers. The server prunes expired ones. */
+export const DPOP_REPLAY_MARKER_PREFIX = "dpop-proof-";
+
 export const mapDpopFailureReason = (code: DpopVerificationFailureCodeType): DpopFailureReason => {
   switch (code) {
     case "time_window":
@@ -96,7 +99,7 @@ export const verifyRequestDpopProof = (input: {
     );
     yield* secretStore
       .create(
-        `dpop-proof-${replayKey}`,
+        `${DPOP_REPLAY_MARKER_PREFIX}${replayKey}`,
         new TextEncoder().encode(
           [
             `thumbprint=${result.thumbprint}`,
@@ -115,7 +118,7 @@ export const verifyRequestDpopProof = (input: {
                 "environment.dpop.failure_code": mapped.dpopFailureReason,
               });
             }
-            return yield* Effect.fail(mapped);
+            return yield* mapped;
           }),
         ),
       );
diff --git a/apps/server/src/auth/http.test.ts b/apps/server/src/auth/http.test.ts
index 3d53ee088376..793f86349650 100644
--- a/apps/server/src/auth/http.test.ts
+++ b/apps/server/src/auth/http.test.ts
@@ -5,7 +5,6 @@ import * as Context from "effect/Context";
 import * as Crypto from "effect/Crypto";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
 import * as Schema from "effect/Schema";
 import * as Etag from "effect/unstable/http/Etag";
@@ -69,7 +68,7 @@ it.effect("sets the selected browser session cookies through the HTTP route", ()
   Effect.gen(function* () {
     const crypto = yield* Crypto.Crypto;
     const unusedSecretStore = ServerSecretStore.ServerSecretStore.of({
-      get: () => Effect.succeed(Option.none()),
+      get: () => Effect.succeedNone,
       set: () => Effect.void,
       create: () => Effect.void,
       getOrCreateRandom: () => Effect.die("Not used by these routes."),
diff --git a/apps/server/src/auth/replayMarkers.test.ts b/apps/server/src/auth/replayMarkers.test.ts
new file mode 100644
index 000000000000..76c31b0162bd
--- /dev/null
+++ b/apps/server/src/auth/replayMarkers.test.ts
@@ -0,0 +1,92 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { assert, it } from "@effect/vitest";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
+import * as TestClock from "effect/testing/TestClock";
+
+import * as ServerConfig from "../config.ts";
+import { pruneExpiredReplayMarkers, REPLAY_MARKER_MAX_AGE } from "./replayMarkers.ts";
+import * as ServerSecretStore from "./ServerSecretStore.ts";
+
+// Every secret name the server stores today. The last three stand for names
+// built from an id at runtime.
+const REAL_SECRET_NAMES = [
+  "server-signing-key",
+  "asset-access-signing-key",
+  "cloud-cli-oauth-token",
+  "cloud-cli-desired-link",
+  "cloud-link-ed25519-key-pair",
+  "cloud-link-ed25519-private-key",
+  "cloud-link-ed25519-public-key",
+  "cloud-mint-ed25519-public-key",
+  "cloud-endpoint-runtime-config",
+  "cloud-endpoint-confirmed-origin",
+  "cloud-linked-user-id",
+  "cloud-relay-url",
+  "cloud-relay-issuer",
+  "cloud-relay-environment-credential",
+  "cloud-publish-agent-activity",
+  "provider-env-Y29kZXg-T1BFTkFJX0FQSV9LRVk",
+  "provider-auth-0f1e2d3c4b5a69788796a5b4c3d2e1f00f1e2d3c4b5a69788796a5b4c3d2e1f0",
+  "usage-limit-source-aHVi",
+];
+
+it.layer(NodeServices.layer)("replayMarkers", (it) => {
+  it.effect("prunes only replay markers older than the max age", () =>
+    Effect.gen(function* () {
+      const secretStore = yield* ServerSecretStore.ServerSecretStore;
+      const { secretsDir } = yield* ServerConfig.ServerConfig;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const now = DateTime.makeUnsafe("2026-01-01T00:00:00Z");
+      const setAge = (fileName: string, age: Duration.Duration) => {
+        const mtime = DateTime.toDateUtc(DateTime.subtractDuration(now, age));
+        return fileSystem.utimes(path.join(secretsDir, fileName), mtime, mtime);
+      };
+      const writeAged = (name: string, age: Duration.Duration) =>
+        secretStore
+          .create(name, Uint8Array.from([1]))
+          .pipe(Effect.andThen(setAge(`${name}.bin`, age)));
+
+      const justExpired = Duration.sum(REPLAY_MARKER_MAX_AGE, Duration.seconds(1));
+      const expiredMarkers = [
+        "dpop-proof-old",
+        "cloud-mint-jti-old",
+        "cloud-mint-nonce-old",
+        "cloud-health-jti-old",
+        "cloud-health-nonce-old",
+      ];
+      for (const name of expiredMarkers) yield* writeAged(name, justExpired);
+      yield* writeAged("dpop-proof-at-max-age", REPLAY_MARKER_MAX_AGE);
+      for (const name of REAL_SECRET_NAMES) yield* writeAged(name, Duration.days(30));
+      const pendingSetFile = "dpop-proof-pending.bin.0000.tmp";
+      yield* fileSystem.writeFile(path.join(secretsDir, pendingSetFile), Uint8Array.from([1]));
+      yield* setAge(pendingSetFile, Duration.days(30));
+      yield* TestClock.setTime(DateTime.toEpochMillis(now));
+
+      yield* pruneExpiredReplayMarkers();
+
+      const remaining = yield* fileSystem.readDirectory(secretsDir);
+      assert.deepStrictEqual(
+        remaining.toSorted(),
+        [
+          ...REAL_SECRET_NAMES.map((name) => `${name}.bin`),
+          "dpop-proof-at-max-age.bin",
+          pendingSetFile,
+        ].toSorted(),
+      );
+    }).pipe(
+      Effect.provide(
+        ServerSecretStore.layer.pipe(
+          Layer.provideMerge(
+            ServerConfig.layerTest(process.cwd(), { prefix: "t3-replay-markers-test-" }),
+          ),
+        ),
+      ),
+    ),
+  );
+});
diff --git a/apps/server/src/auth/replayMarkers.ts b/apps/server/src/auth/replayMarkers.ts
new file mode 100644
index 000000000000..67b56b722334
--- /dev/null
+++ b/apps/server/src/auth/replayMarkers.ts
@@ -0,0 +1,77 @@
+import * as Clock from "effect/Clock";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schedule from "effect/Schedule";
+
+import { CLOUD_REPLAY_MARKER_PREFIXES } from "../cloud/http.ts";
+import * as ServerConfig from "../config.ts";
+import { forkParked } from "../serverActivation.ts";
+import { DPOP_REPLAY_MARKER_PREFIX } from "./dpop.ts";
+
+const REPLAY_MARKER_PREFIXES = [DPOP_REPLAY_MARKER_PREFIX, ...CLOUD_REPLAY_MARKER_PREFIXES];
+
+/**
+ * How long a replay marker stays on disk. A marker only matters while its proof
+ * can pass the time check (about 5 minutes for DPoP, 7 for cloud proofs). After
+ * that, the time check rejects a replay by itself. The sweep and the time check
+ * both use the wall clock, so a pruned marker can let a replay through only if
+ * the clock moves back by almost a day, or if the filesystem stamps mtimes almost
+ * a day behind. Markers are files, so a restart does not reset them.
+ */
+export const REPLAY_MARKER_MAX_AGE = Duration.days(1);
+
+/**
+ * Deletes replay markers whose mtime is older than `REPLAY_MARKER_MAX_AGE`.
+ * `ServerSecretStore` saves each secret as `<name>.bin`, so only
+ * `<marker prefix>*.bin` names match. Other secrets and the `*.bin.<uuid>.tmp`
+ * files that `set` writes are never touched.
+ */
+export const pruneExpiredReplayMarkers = Effect.fn("replayMarkers.pruneExpired")(function* () {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const { secretsDir } = yield* ServerConfig.ServerConfig;
+  const cutoff = (yield* Clock.currentTimeMillis) - Duration.toMillis(REPLAY_MARKER_MAX_AGE);
+  const markers = (yield* fileSystem.readDirectory(secretsDir)).filter(
+    (name) =>
+      name.endsWith(".bin") && REPLAY_MARKER_PREFIXES.some((prefix) => name.startsWith(prefix)),
+  );
+  // `partition` visits every marker, so one locked file does not stop the sweep.
+  const [failures, removed] = yield* Effect.partition(markers, (name) => {
+    const markerPath = path.join(secretsDir, name);
+    return fileSystem.stat(markerPath).pipe(
+      Effect.flatMap((info) =>
+        Option.exists(info.mtime, (mtime) => mtime.getTime() < cutoff)
+          ? fileSystem.remove(markerPath).pipe(Effect.as(true))
+          : Effect.succeed(false),
+      ),
+      Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(false)),
+    );
+  });
+  yield* Effect.annotateCurrentSpan({
+    "replay_markers.matched": markers.length,
+    "replay_markers.removed": removed.filter(Boolean).length,
+    "replay_markers.failed": failures.length,
+  });
+  if (failures.length > 0) {
+    yield* Effect.logWarning("Failed to prune some replay markers", {
+      failed: failures.length,
+      cause: failures[0],
+    });
+  }
+});
+
+/** Prunes expired replay markers after server activation, then every hour. */
+export const layer = Layer.effectDiscard(
+  forkParked(
+    pruneExpiredReplayMarkers().pipe(
+      Effect.catch((cause) =>
+        Effect.logWarning("Failed to prune expired replay markers", { cause }),
+      ),
+      Effect.repeat(Schedule.spaced(Duration.hours(1))),
+    ),
+  ),
+);
diff --git a/apps/server/src/bin.test.ts b/apps/server/src/bin.test.ts
index e009cf572f30..d87d8cbbb437 100644
--- a/apps/server/src/bin.test.ts
+++ b/apps/server/src/bin.test.ts
@@ -16,6 +16,7 @@ import {
 import * as NetService from "@t3tools/shared/Net";
 import { HostProcessEnvironment } from "@t3tools/shared/hostProcess";
 import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 import { assert, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as DateTime from "effect/DateTime";
@@ -105,7 +106,7 @@ const makeCliTestServerConfig = (baseDir: string) =>
       otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
       otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
       otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-      otlpServiceName: "t3-server",
+      otelEnvironment: OtelEnvironment.none,
       mode: "web",
       port: 0,
       host: "127.0.0.1",
diff --git a/apps/server/src/bin.ts b/apps/server/src/bin.ts
index 117c010f09fc..7877704daa33 100644
--- a/apps/server/src/bin.ts
+++ b/apps/server/src/bin.ts
@@ -25,6 +25,7 @@ import { serviceLauncherCommand } from "./cli/serviceLauncher.ts";
 import { servicePreflightCommand } from "./cli/servicePreflight.ts";
 import { sshHelperCommand } from "./cli/sshHelper.ts";
 import { themeCommand } from "./cli/theme.ts";
+import { traceCommand } from "./cli/trace.ts";
 import { triageCommand } from "./cli/triage.ts";
 
 const CliRuntimeLayer = Layer.mergeAll(NodeServices.layer, NetService.layer);
@@ -73,6 +74,7 @@ export const makeCli = ({ cloudEnabled = hasCloudPublicConfig } = {}) =>
       officialImportCommand,
       sshHelperCommand,
       themeCommand,
+      traceCommand,
       triageCommand,
       cloudEnabled ? connectCommand : connectUnavailableCommand,
     ]),
diff --git a/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts b/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
index 7bfd313a2103..6df7d7534130 100644
--- a/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
+++ b/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
@@ -84,15 +84,16 @@ describe("CheckpointDiffQuery.layer", () => {
             getShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
             getDeletedWorktreeThreads: () => Effect.die("unused"),
+            listThreadsWithPullRequests: () => Effect.die("unused"),
             getArchivedShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
             getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
             getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
             getEventReplayStats: () => Effect.die("unused"),
-            getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+            getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
             getProjectShells: () => Effect.die("unused"),
-            getProjectShellById: () => Effect.succeed(Option.none()),
-            getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+            getProjectShellById: () => Effect.succeedNone,
+            getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
             getImportedAgentSessionSources: () => Effect.die("unused"),
             getThreadCheckpointContext: () =>
               Effect.sync(() => {
@@ -113,9 +114,9 @@ describe("CheckpointDiffQuery.layer", () => {
               }),
             getThreadRuntimeContext: () => Effect.die("unused"),
             getTurnStartMessage: () => Effect.die("unused"),
-            getThreadShellById: () => Effect.succeed(Option.none()),
-            getThreadDetailById: () => Effect.succeed(Option.none()),
-            getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+            getThreadShellById: () => Effect.succeedNone,
+            getThreadDetailById: () => Effect.succeedNone,
+            getThreadDetailSnapshot: () => Effect.succeedNone,
             searchThreads: () => Effect.succeed({ matches: [] }),
           }),
         ),
@@ -201,23 +202,24 @@ describe("CheckpointDiffQuery.layer", () => {
             getShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
             getDeletedWorktreeThreads: () => Effect.die("unused"),
+            listThreadsWithPullRequests: () => Effect.die("unused"),
             getArchivedShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
             getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
             getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
             getEventReplayStats: () => Effect.die("unused"),
-            getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+            getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
             getProjectShells: () => Effect.die("unused"),
-            getProjectShellById: () => Effect.succeed(Option.none()),
-            getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+            getProjectShellById: () => Effect.succeedNone,
+            getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
             getImportedAgentSessionSources: () => Effect.die("unused"),
-            getThreadCheckpointContext: () => Effect.succeed(Option.some(threadCheckpointContext)),
+            getThreadCheckpointContext: () => Effect.succeedSome(threadCheckpointContext),
             getFullThreadDiffContext: () => Effect.die("unused"),
             getThreadRuntimeContext: () => Effect.die("unused"),
             getTurnStartMessage: () => Effect.die("unused"),
-            getThreadShellById: () => Effect.succeed(Option.none()),
-            getThreadDetailById: () => Effect.succeed(Option.none()),
-            getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+            getThreadShellById: () => Effect.succeedNone,
+            getThreadDetailById: () => Effect.succeedNone,
+            getThreadDetailSnapshot: () => Effect.succeedNone,
             searchThreads: () => Effect.succeed({ matches: [] }),
           }),
         ),
@@ -293,23 +295,24 @@ describe("CheckpointDiffQuery.layer", () => {
             getShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
             getDeletedWorktreeThreads: () => Effect.die("unused"),
+            listThreadsWithPullRequests: () => Effect.die("unused"),
             getArchivedShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
             getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
             getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
             getEventReplayStats: () => Effect.die("unused"),
-            getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+            getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
             getProjectShells: () => Effect.die("unused"),
-            getProjectShellById: () => Effect.succeed(Option.none()),
-            getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+            getProjectShellById: () => Effect.succeedNone,
+            getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
             getImportedAgentSessionSources: () => Effect.die("unused"),
-            getThreadCheckpointContext: () => Effect.succeed(Option.some(threadCheckpointContext)),
+            getThreadCheckpointContext: () => Effect.succeedSome(threadCheckpointContext),
             getFullThreadDiffContext: () => Effect.die("unused"),
             getThreadRuntimeContext: () => Effect.die("unused"),
             getTurnStartMessage: () => Effect.die("unused"),
-            getThreadShellById: () => Effect.succeed(Option.none()),
-            getThreadDetailById: () => Effect.succeed(Option.none()),
-            getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+            getThreadShellById: () => Effect.succeedNone,
+            getThreadDetailById: () => Effect.succeedNone,
+            getThreadDetailSnapshot: () => Effect.succeedNone,
             searchThreads: () => Effect.succeed({ matches: [] }),
           }),
         ),
@@ -370,23 +373,24 @@ describe("CheckpointDiffQuery.layer", () => {
             getShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
             getDeletedWorktreeThreads: () => Effect.die("unused"),
+            listThreadsWithPullRequests: () => Effect.die("unused"),
             getArchivedShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
             getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
             getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
             getEventReplayStats: () => Effect.die("unused"),
-            getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+            getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
             getProjectShells: () => Effect.die("unused"),
-            getProjectShellById: () => Effect.succeed(Option.none()),
-            getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+            getProjectShellById: () => Effect.succeedNone,
+            getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
             getImportedAgentSessionSources: () => Effect.die("unused"),
-            getThreadCheckpointContext: () => Effect.succeed(Option.some(threadCheckpointContext)),
+            getThreadCheckpointContext: () => Effect.succeedSome(threadCheckpointContext),
             getFullThreadDiffContext: () => Effect.die("unused"),
             getThreadRuntimeContext: () => Effect.die("unused"),
             getTurnStartMessage: () => Effect.die("unused"),
-            getThreadShellById: () => Effect.succeed(Option.none()),
-            getThreadDetailById: () => Effect.succeed(Option.none()),
-            getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+            getThreadShellById: () => Effect.succeedNone,
+            getThreadDetailById: () => Effect.succeedNone,
+            getThreadDetailSnapshot: () => Effect.succeedNone,
             searchThreads: () => Effect.succeed({ matches: [] }),
           }),
         ),
@@ -432,23 +436,24 @@ describe("CheckpointDiffQuery.layer", () => {
             getShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request the orchestration shell snapshot"),
             getDeletedWorktreeThreads: () => Effect.die("unused"),
+            listThreadsWithPullRequests: () => Effect.die("unused"),
             getArchivedShellSnapshot: () =>
               Effect.die("CheckpointDiffQuery should not request archived shell snapshots"),
             getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
             getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
             getEventReplayStats: () => Effect.die("unused"),
-            getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+            getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
             getProjectShells: () => Effect.die("unused"),
-            getProjectShellById: () => Effect.succeed(Option.none()),
-            getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+            getProjectShellById: () => Effect.succeedNone,
+            getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
             getImportedAgentSessionSources: () => Effect.die("unused"),
-            getThreadCheckpointContext: () => Effect.succeed(Option.none()),
-            getFullThreadDiffContext: () => Effect.succeed(Option.none()),
+            getThreadCheckpointContext: () => Effect.succeedNone,
+            getFullThreadDiffContext: () => Effect.succeedNone,
             getThreadRuntimeContext: () => Effect.die("unused"),
             getTurnStartMessage: () => Effect.die("unused"),
-            getThreadShellById: () => Effect.succeed(Option.none()),
-            getThreadDetailById: () => Effect.succeed(Option.none()),
-            getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+            getThreadShellById: () => Effect.succeedNone,
+            getThreadDetailById: () => Effect.succeedNone,
+            getThreadDetailSnapshot: () => Effect.succeedNone,
             searchThreads: () => Effect.succeed({ matches: [] }),
           }),
         ),
diff --git a/apps/server/src/cli/config.test.ts b/apps/server/src/cli/config.test.ts
index 34ea7f685364..42932b927008 100644
--- a/apps/server/src/cli/config.test.ts
+++ b/apps/server/src/cli/config.test.ts
@@ -18,6 +18,7 @@ import {
 } from "@t3tools/contracts";
 import * as NetService from "@t3tools/shared/Net";
 import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { deriveServerPaths } from "../config.ts";
 import { resolveServerConfig } from "./config.ts";
@@ -55,7 +56,7 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
     otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
     otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
     otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-    otlpServiceName: "t3-server",
+    otelEnvironment: OtelEnvironment.none,
     devAllowedOrigins: [],
   } as const;
 
@@ -507,7 +508,6 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
         resolved.terminalLogsDir,
         resolved.attachmentsDir,
         resolved.worktreesDir,
-        path.dirname(resolved.serverLogPath),
         path.dirname(resolved.serverTracePath),
       ]) {
         expect(yield* fs.exists(directory)).toBe(true);
@@ -666,6 +666,109 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
     }),
   );
 
+  it.effect("zeroes an endpoint stored in Settings when the SDK is disabled", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-cli-config-otel-off-" });
+      const derivedPaths = yield* deriveExplicitServerPaths(baseDir, undefined);
+      yield* fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true });
+      yield* fs.writeFileString(
+        derivedPaths.settingsPath,
+        // @effect-diagnostics-next-line preferSchemaOverJson:off
+        `${JSON.stringify({
+          observability: {
+            otlpTracesUrl: "http://localhost:4318/v1/traces",
+            otlpMetricsUrl: "http://localhost:4318/v1/metrics",
+            otlpLogsUrl: "http://localhost:4318/v1/logs",
+          },
+        })}\n`,
+      );
+
+      const resolved = yield* resolveServerConfig(
+        {
+          mode: Option.some("desktop"),
+          port: Option.some(4888),
+          host: Option.none(),
+          baseDir: Option.some(baseDir),
+          cwd: Option.none(),
+          devUrl: Option.none(),
+          noBrowser: Option.none(),
+          bootstrapFd: Option.none(),
+          autoBootstrapProjectFromCwd: Option.none(),
+          logWebSocketEvents: Option.none(),
+          tailscaleServeEnabled: Option.none(),
+          tailscaleServePort: Option.none(),
+        },
+        Option.none(),
+      ).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            ConfigProvider.layer(ConfigProvider.fromEnv({ env: { OTEL_SDK_DISABLED: "true" } })),
+            NetService.layer,
+          ),
+        ),
+      );
+
+      // The switch beats every source, including an endpoint stored in Settings.
+      expect(resolved.otlpTracesUrl).toBeUndefined();
+      expect(resolved.otlpMetricsUrl).toBeUndefined();
+      expect(resolved.otlpLogsUrl).toBeUndefined();
+      expect(resolved.otelEnvironment.disabled).toBe(true);
+    }),
+  );
+
+  it.effect("lets T3CODE_OTEL_SDK_DISABLED=false override an ambient OTEL_SDK_DISABLED=true", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-cli-config-otel-on-" });
+      const derivedPaths = yield* deriveExplicitServerPaths(baseDir, undefined);
+      yield* fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true });
+      yield* fs.writeFileString(
+        derivedPaths.settingsPath,
+        // @effect-diagnostics-next-line preferSchemaOverJson:off
+        `${JSON.stringify({
+          observability: {
+            otlpTracesUrl: "http://localhost:4318/v1/traces",
+          },
+        })}\n`,
+      );
+
+      const resolved = yield* resolveServerConfig(
+        {
+          mode: Option.some("desktop"),
+          port: Option.some(4888),
+          host: Option.none(),
+          baseDir: Option.some(baseDir),
+          cwd: Option.none(),
+          devUrl: Option.none(),
+          noBrowser: Option.none(),
+          bootstrapFd: Option.none(),
+          autoBootstrapProjectFromCwd: Option.none(),
+          logWebSocketEvents: Option.none(),
+          tailscaleServeEnabled: Option.none(),
+          tailscaleServePort: Option.none(),
+        },
+        Option.none(),
+      ).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            ConfigProvider.layer(
+              ConfigProvider.fromEnv({
+                env: { T3CODE_OTEL_SDK_DISABLED: "false", OTEL_SDK_DISABLED: "true" },
+              }),
+            ),
+            NetService.layer,
+          ),
+        ),
+      );
+
+      expect(resolved.otelEnvironment.disabled).toBe(false);
+      expect(resolved.otlpTracesUrl).toBe("http://localhost:4318/v1/traces");
+    }),
+  );
+
   it.effect("forces noBrowser and disables auto-bootstrap for headless startup presentation", () =>
     Effect.gen(function* () {
       const { join } = yield* Path.Path;
@@ -894,4 +997,146 @@ it.layer(NodeServices.layer)("cli config resolution", (it) => {
       expect(resolved.otlpLogsUrl).toBe("http://collector.internal:4318/v1/logs");
     }),
   );
+
+  const minimalWebFlags = (baseDir: string) => ({
+    mode: Option.some("web" as const),
+    port: Option.some(3773),
+    host: Option.none<string>(),
+    baseDir: Option.some(baseDir),
+    cwd: Option.none<string>(),
+    devUrl: Option.none<URL>(),
+    noBrowser: Option.none<boolean>(),
+    bootstrapFd: Option.none<number>(),
+    autoBootstrapProjectFromCwd: Option.none<boolean>(),
+    logWebSocketEvents: Option.none<boolean>(),
+    tailscaleServeEnabled: Option.none<boolean>(),
+    tailscaleServePort: Option.none<number>(),
+  });
+
+  it.effect(
+    "resolves each signal's endpoint through T3CODE_OTLP_*_URL, an OTEL endpoint, the bootstrap envelope, and persisted Settings, in that order",
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const baseDir = yield* fs.makeTempDirectoryScoped({
+          prefix: "t3-cli-config-otel-precedence-",
+        });
+        const derivedPaths = yield* deriveExplicitServerPaths(baseDir, undefined);
+        yield* fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true });
+        yield* fs.writeFileString(
+          derivedPaths.settingsPath,
+          // @effect-diagnostics-next-line preferSchemaOverJson:off
+          `${JSON.stringify({ observability: { otlpLogsUrl: "http://settings:4318/v1/logs" } })}\n`,
+        );
+
+        const fd = yield* openBootstrapFd(
+          makeDesktopBootstrap({
+            otlpMetricsUrl: "http://bootstrap:4318/v1/metrics",
+            // Blank, not an endpoint: it must not stand in front of Settings.
+            otlpLogsUrl: "",
+          }),
+        );
+
+        const resolved = yield* resolveServerConfig(
+          {
+            ...minimalWebFlags(baseDir),
+            mode: Option.some("desktop"),
+            port: Option.some(4888),
+            bootstrapFd: Option.some(fd),
+          },
+          Option.none(),
+        ).pipe(
+          Effect.provide(
+            Layer.mergeAll(
+              ConfigProvider.layer(
+                ConfigProvider.fromEnv({
+                  env: {
+                    T3CODE_OTLP_TRACES_URL: "http://t3:4318/v1/traces",
+                    T3CODE_OTLP_HEADERS: "x-key=secret",
+                    OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "http://otel-traces:4318/custom",
+                    OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: "http://otel-metrics:4318/custom",
+                    OTEL_EXPORTER_OTLP_HEADERS: "x-key=otel",
+                  },
+                }),
+              ),
+              NetService.layer,
+            ),
+          ),
+        );
+
+        // T3CODE_OTLP_TRACES_URL wins over the OTEL variable for the same
+        // signal, and keeps T3 Code's own headers since T3 Code still owns it.
+        expect(resolved.otlpTracesUrl).toBe("http://t3:4318/v1/traces");
+        expect(resolved.otlpTracesExport.headers).toEqual({ "x-key": "secret" });
+        // Metrics named no T3CODE_OTLP_METRICS_URL, so the OTEL endpoint wins
+        // over the bootstrap envelope and brings the OTEL headers and protocol.
+        expect(resolved.otlpMetricsUrl).toBe("http://otel-metrics:4318/custom");
+        expect(resolved.otlpMetricsExport).toEqual({
+          ...DEFAULT_SIGNAL_EXPORT,
+          protocol: "http/protobuf",
+          headers: { "x-key": "otel" },
+        });
+        // Logs named no T3 or OTEL endpoint and a blank bootstrap value, so
+        // Settings answers, and logs keep the shared headers since no OTEL
+        // endpoint claimed them.
+        expect(resolved.otlpLogsUrl).toBe("http://settings:4318/v1/logs");
+        expect(resolved.otlpLogsExport.headers).toEqual({ "x-key": "secret" });
+      }),
+  );
+
+  it.effect(
+    "exports nothing for a signal an OTEL endpoint claimed with a protocol or headers that do not read",
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const baseDir = yield* fs.makeTempDirectoryScoped({
+          prefix: "t3-cli-config-otel-off-",
+        });
+        const derivedPaths = yield* deriveExplicitServerPaths(baseDir, undefined);
+        yield* fs.makeDirectory(path.dirname(derivedPaths.settingsPath), { recursive: true });
+        yield* fs.writeFileString(
+          derivedPaths.settingsPath,
+          // @effect-diagnostics-next-line preferSchemaOverJson:off
+          `${JSON.stringify({ observability: { otlpLogsUrl: "http://settings:4318/v1/logs" } })}\n`,
+        );
+
+        const fd = yield* openBootstrapFd(
+          makeDesktopBootstrap({ otlpMetricsUrl: "http://bootstrap:4318/v1/metrics" }),
+        );
+
+        const resolved = yield* resolveServerConfig(
+          {
+            ...minimalWebFlags(baseDir),
+            mode: Option.some("desktop"),
+            port: Option.some(4888),
+            bootstrapFd: Option.some(fd),
+          },
+          Option.none(),
+        ).pipe(
+          Effect.provide(
+            Layer.mergeAll(
+              ConfigProvider.layer(
+                ConfigProvider.fromEnv({
+                  env: {
+                    T3CODE_OTLP_TRACES_URL: "http://t3:4318/v1/traces",
+                    OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel:4318",
+                    OTEL_EXPORTER_OTLP_HEADERS: "x-key=%zz",
+                  },
+                }),
+              ),
+              NetService.layer,
+            ),
+          ),
+        );
+
+        // T3CODE_OTLP_TRACES_URL still wins outright.
+        expect(resolved.otlpTracesUrl).toBe("http://t3:4318/v1/traces");
+        // The OTEL endpoint claimed metrics and logs, so neither the bootstrap
+        // envelope nor Settings receives them with T3 Code's headers.
+        expect(resolved.otlpMetricsUrl).toBeUndefined();
+        expect(resolved.otlpLogsUrl).toBeUndefined();
+      }),
+  );
 });
diff --git a/apps/server/src/cli/config.ts b/apps/server/src/cli/config.ts
index 42cc883bc891..58bd8dce22f4 100644
--- a/apps/server/src/cli/config.ts
+++ b/apps/server/src/cli/config.ts
@@ -4,6 +4,7 @@ import {
   OtlpProtocol,
   type SignalExport,
 } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 import { parsePersistedServerObservabilitySettings } from "@t3tools/shared/serverSettings";
 import { DesktopBackendBootstrap, PortSchema } from "@t3tools/contracts";
 import * as Config from "effect/Config";
@@ -81,16 +82,22 @@ const tailscaleServePortFlag = Flag.Int("tailscale-serve-port").pipe(
   Flag.optional,
 );
 
+// Trace file location, shared by the server and `t3 trace summary`.
+export const traceFileConfig = Config.String("T3CODE_TRACE_FILE").pipe(
+  Config.option,
+  Config.map(Option.getOrUndefined),
+);
+export const traceMaxFilesConfig = Config.Int("T3CODE_TRACE_MAX_FILES").pipe(
+  Config.withDefault(10),
+);
+
 const EnvServerConfig = Config.all({
   logLevel: Config.LogLevel("T3CODE_LOG_LEVEL").pipe(Config.withDefault("Info")),
   traceMinLevel: Config.LogLevel("T3CODE_TRACE_MIN_LEVEL").pipe(Config.withDefault("Info")),
   traceTimingEnabled: Config.Boolean("T3CODE_TRACE_TIMING_ENABLED").pipe(Config.withDefault(true)),
-  traceFile: Config.String("T3CODE_TRACE_FILE").pipe(
-    Config.option,
-    Config.map(Option.getOrUndefined),
-  ),
+  traceFile: traceFileConfig,
   traceMaxBytes: Config.Int("T3CODE_TRACE_MAX_BYTES").pipe(Config.withDefault(10 * 1024 * 1024)),
-  traceMaxFiles: Config.Int("T3CODE_TRACE_MAX_FILES").pipe(Config.withDefault(10)),
+  traceMaxFiles: traceMaxFilesConfig,
   traceBatchWindowMs: Config.Int("T3CODE_TRACE_BATCH_WINDOW_MS").pipe(Config.withDefault(1_000)),
   otlpTracesUrl: Config.String("T3CODE_OTLP_TRACES_URL").pipe(
     Config.option,
@@ -107,7 +114,6 @@ const EnvServerConfig = Config.all({
   otlpExportIntervalMs: Config.Int("T3CODE_OTLP_EXPORT_INTERVAL_MS").pipe(
     Config.withDefault(10_000),
   ),
-  otlpServiceName: Config.String("T3CODE_OTLP_SERVICE_NAME").pipe(Config.withDefault("t3-server")),
   otlpHeaders: Config.schema(OtlpHeadersFromString, "T3CODE_OTLP_HEADERS").pipe(
     Config.option,
     Config.map(Option.getOrUndefined),
@@ -386,6 +392,8 @@ export const resolveServerConfig = (
     );
     const logLevel = Option.getOrElse(cliLogLevel, () => env.logLevel);
 
+    const otel = yield* OtelEnvironment.load;
+
     // T3 Code's own OTLP variables name no signal, so the one answer they give
     // is the answer for all three.
     const signalExport: SignalExport = {
@@ -393,6 +401,27 @@ export const resolveServerConfig = (
       headers: env.otlpHeaders,
       exportIntervalMs: env.otlpExportIntervalMs,
     };
+    const traces = OtelEnvironment.resolveSignalEndpoint(
+      otel,
+      "traces",
+      { url: env.otlpTracesUrl, export: signalExport },
+      bootstrap?.otlpTracesUrl,
+      persistedObservabilitySettings.otlpTracesUrl,
+    );
+    const metrics = OtelEnvironment.resolveSignalEndpoint(
+      otel,
+      "metrics",
+      { url: env.otlpMetricsUrl, export: signalExport },
+      bootstrap?.otlpMetricsUrl,
+      persistedObservabilitySettings.otlpMetricsUrl,
+    );
+    const logs = OtelEnvironment.resolveSignalEndpoint(
+      otel,
+      "logs",
+      { url: env.otlpLogsUrl, export: signalExport },
+      bootstrap?.otlpLogsUrl,
+      persistedObservabilitySettings.otlpLogsUrl,
+    );
 
     const config: ServerConfig.ServerConfig["Service"] = {
       logLevel,
@@ -401,20 +430,13 @@ export const resolveServerConfig = (
       traceBatchWindowMs: env.traceBatchWindowMs,
       traceMaxBytes: env.traceMaxBytes,
       traceMaxFiles: env.traceMaxFiles,
-      otlpTracesUrl:
-        env.otlpTracesUrl ??
-        bootstrap?.otlpTracesUrl ??
-        persistedObservabilitySettings.otlpTracesUrl,
-      otlpMetricsUrl:
-        env.otlpMetricsUrl ??
-        bootstrap?.otlpMetricsUrl ??
-        persistedObservabilitySettings.otlpMetricsUrl,
-      otlpLogsUrl:
-        env.otlpLogsUrl ?? bootstrap?.otlpLogsUrl ?? persistedObservabilitySettings.otlpLogsUrl,
-      otlpTracesExport: signalExport,
-      otlpMetricsExport: signalExport,
-      otlpLogsExport: signalExport,
-      otlpServiceName: env.otlpServiceName,
+      otlpTracesUrl: traces?.url,
+      otlpMetricsUrl: metrics?.url,
+      otlpLogsUrl: logs?.url,
+      otlpTracesExport: traces?.export ?? signalExport,
+      otlpMetricsExport: metrics?.export ?? signalExport,
+      otlpLogsExport: logs?.export ?? signalExport,
+      otelEnvironment: otel,
       mode,
       port,
       cwd,
diff --git a/apps/server/src/cli/pair.ts b/apps/server/src/cli/pair.ts
index 5a66b6557db5..14a6ed640570 100644
--- a/apps/server/src/cli/pair.ts
+++ b/apps/server/src/cli/pair.ts
@@ -16,6 +16,7 @@ import {
 } from "@t3tools/contracts";
 import { resolveWorktreeT3Home } from "@t3tools/shared/devHome";
 import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 import {
   buildTailscaleHttpsBaseUrl,
   DEFAULT_TAILSCALE_SERVE_PORT,
@@ -325,7 +326,7 @@ const makePairServerConfig = Effect.fn(function* (input: {
     otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
     otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
     otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-    otlpServiceName: "t3-server",
+    otelEnvironment: OtelEnvironment.none,
     mode: "web",
     port: state.port,
     host: state.host,
diff --git a/apps/server/src/cli/theme.ts b/apps/server/src/cli/theme.ts
index 26a0c337fb27..ab662596267a 100644
--- a/apps/server/src/cli/theme.ts
+++ b/apps/server/src/cli/theme.ts
@@ -260,12 +260,10 @@ const writeDefaultTheme = Effect.fn(function* (input: {
       // Falling through here would overwrite whatever landed in between, which
       // is exactly the loss this loop exists to prevent.
       if (attempt >= CONCURRENT_WRITE_ATTEMPTS) {
-        return yield* Effect.fail(
-          new ThemeSettingsBusyError({
-            settingsPath: input.settingsPath,
-            attempts: CONCURRENT_WRITE_ATTEMPTS,
-          }),
-        );
+        return yield* new ThemeSettingsBusyError({
+          settingsPath: input.settingsPath,
+          attempts: CONCURRENT_WRITE_ATTEMPTS,
+        });
       }
       continue;
     }
@@ -299,12 +297,13 @@ const publishThemeFile = Effect.fn(function* (input: {
       Effect.mapError((cause) => new ThemeFileUnreadableError({ filePath: input.filePath, cause })),
     );
   if (info.type !== "File") {
-    return yield* Effect.fail(new ThemeFileUnreadableError({ filePath: input.filePath }));
+    return yield* new ThemeFileUnreadableError({ filePath: input.filePath });
   }
   if (Number(info.size) > MAX_THEME_FILE_BYTES) {
-    return yield* Effect.fail(
-      new ThemeFileTooLargeError({ filePath: input.filePath, limit: MAX_THEME_FILE_BYTES }),
-    );
+    return yield* new ThemeFileTooLargeError({
+      filePath: input.filePath,
+      limit: MAX_THEME_FILE_BYTES,
+    });
   }
 
   // An explicit source path is the user's own input, and a symlink there is a
@@ -320,17 +319,15 @@ const publishThemeFile = Effect.fn(function* (input: {
     );
   const raw = readThemeFileGuarded(resolvedSource, MAX_THEME_FILE_BYTES);
   if (raw === null) {
-    return yield* Effect.fail(new ThemeFileUnreadableError({ filePath: input.filePath }));
+    return yield* new ThemeFileUnreadableError({ filePath: input.filePath });
   }
 
   const decoded = decodeThemeFileJsonExit(raw);
   if (decoded._tag === "Failure") {
-    return yield* Effect.fail(
-      new ThemeFileInvalidError({ filePath: input.filePath, cause: decoded.cause }),
-    );
+    return yield* new ThemeFileInvalidError({ filePath: input.filePath, cause: decoded.cause });
   }
   if (!environmentThemeFileHasColors(decoded.value)) {
-    return yield* Effect.fail(new ThemeFileColorlessError({ filePath: input.filePath }));
+    return yield* new ThemeFileColorlessError({ filePath: input.filePath });
   }
 
   const fileBasename = path.basename(input.filePath, ".json");
@@ -338,7 +335,7 @@ const publishThemeFile = Effect.fn(function* (input: {
   // The same rules the watcher applies when it reads the directory back, so a
   // publish cannot report success for a file that will then be skipped.
   if (!isEnvironmentThemeId(themeId) || UNPUBLISHABLE_THEME_IDS.has(themeId)) {
-    return yield* Effect.fail(new ThemeFileIdInvalidError({ themeId, filePath: input.filePath }));
+    return yield* new ThemeFileIdInvalidError({ themeId, filePath: input.filePath });
   }
 
   const destinationPath = path.join(input.themesDir, `${themeId}.json`);
@@ -479,7 +476,7 @@ const themeSetCommand = Command.make("set", {
       const fs = yield* FileSystem.FileSystem;
       const target = yield* expandHomePath(flags.theme.trim());
       if (target.length === 0) {
-        return yield* Effect.fail(new ThemeTargetMissingError());
+        return yield* new ThemeTargetMissingError();
       }
       const paths = yield* resolveThemePaths(flags.baseDir);
 
@@ -514,15 +511,15 @@ const themeSetCommand = Command.make("set", {
         revertPublish = published.revert;
         cleanupPublish = published.cleanup;
       } else if (looksLikePath) {
-        return yield* Effect.fail(new ThemeFileUnreadableError({ filePath: target }));
+        return yield* new ThemeFileUnreadableError({ filePath: target });
       } else if (isEnvironmentThemeId(target)) {
         const known = yield* resolvableThemeIds(paths.themesDir);
         if (!known.includes(target)) {
-          return yield* Effect.fail(new ThemeIdUnknownError({ themeId: target, known }));
+          return yield* new ThemeIdUnknownError({ themeId: target, known });
         }
         themeId = target;
       } else {
-        return yield* Effect.fail(new ThemeIdInvalidError({ themeId: target }));
+        return yield* new ThemeIdInvalidError({ themeId: target });
       }
 
       // set means set: if the default cannot be written, the publish that
diff --git a/apps/server/src/cli/trace.test.ts b/apps/server/src/cli/trace.test.ts
new file mode 100644
index 000000000000..b81a3ed53f25
--- /dev/null
+++ b/apps/server/src/cli/trace.test.ts
@@ -0,0 +1,100 @@
+import { assert, it } from "@effect/vitest";
+
+import { makeTraceSpanSummary } from "./trace.ts";
+
+const MINUTE_MS = 60_000;
+
+function span(name: string, durationMs: number, endMs: number, exitTag = "Success") {
+  return JSON.stringify({
+    type: "effect-span",
+    name,
+    traceId: "trace",
+    spanId: "span",
+    durationMs,
+    endTimeUnixNano: String(BigInt(endMs) * 1_000_000n),
+    exit: { _tag: exitTag, cause: "cause" },
+  });
+}
+
+function browserSpan(name: string, status: { code: string; message?: string }) {
+  return JSON.stringify({
+    type: "otlp-span",
+    name,
+    durationMs: 1,
+    endTimeUnixNano: "1000000",
+    status,
+  });
+}
+
+it("reports count, rate, percentiles, and exits per span name", () => {
+  // Ten `refresh` spans of 1..10 ms end over minutes 0..9, and one `probe`
+  // span ends at minute 10, so the recorded window is 10 minutes.
+  const refreshes = Array.from({ length: 10 }, (_, index) =>
+    span(
+      "refresh",
+      index + 1,
+      index * MINUTE_MS,
+      index === 0 ? "Interrupted" : index === 1 ? "Failure" : "Success",
+    ),
+  );
+  const summarizer = makeTraceSpanSummary();
+  [...refreshes, span("probe", 2_500, 10 * MINUTE_MS)].forEach(summarizer.addLine);
+  const summary = summarizer.finish();
+
+  assert.strictEqual(summary.spanCount, 11);
+  assert.strictEqual(summary.minutes, 10);
+  assert.deepStrictEqual(summary.spans, [
+    {
+      name: "refresh",
+      count: 10,
+      perMinute: 1,
+      p50Ms: 5,
+      p90Ms: 9,
+      maxMs: 10,
+      interrupted: 1,
+      failures: 1,
+    },
+    {
+      name: "probe",
+      count: 1,
+      perMinute: 0.1,
+      p50Ms: 2_500,
+      p90Ms: 2_500,
+      maxMs: 2_500,
+      interrupted: 0,
+      failures: 0,
+    },
+  ]);
+});
+
+it("drops spans that ended before the window and counts unreadable lines", () => {
+  const summarizer = makeTraceSpanSummary(MINUTE_MS);
+  [
+    span("old", 1, 0),
+    "",
+    "{not json",
+    JSON.stringify({ name: "no-duration" }),
+    // Ends past the largest Date, so the report could not print it.
+    JSON.stringify({ name: "far-future", durationMs: 1, endTimeUnixNano: "9".repeat(22) }),
+    span("recent", 4, 5 * MINUTE_MS),
+  ].forEach(summarizer.addLine);
+  const summary = summarizer.finish();
+
+  assert.strictEqual(summary.skippedLineCount, 3);
+  assert.deepStrictEqual(
+    summary.spans.map((entry) => [entry.name, entry.count, entry.perMinute]),
+    [["recent", 1, undefined]],
+  );
+});
+
+it("reads failures and interrupts of browser spans from their OTLP status", () => {
+  const summarizer = makeTraceSpanSummary();
+  [
+    browserSpan("render", { code: "2", message: "boom" }),
+    browserSpan("render", { code: "1", message: "Interrupted" }),
+    browserSpan("render", { code: "1" }),
+  ].forEach(summarizer.addLine);
+
+  const [render] = summarizer.finish().spans;
+  assert.deepStrictEqual([render?.count, render?.interrupted, render?.failures], [3, 1, 1]);
+});
diff --git a/apps/server/src/cli/trace.ts b/apps/server/src/cli/trace.ts
new file mode 100644
index 000000000000..61a209471d6e
--- /dev/null
+++ b/apps/server/src/cli/trace.ts
@@ -0,0 +1,208 @@
+/**
+ * `t3 trace summary` - per-span counts, rates, and latency percentiles from
+ * the local server trace file and its rotated backups. It reads the files
+ * directly, so it works while the server is stalled or stopped.
+ */
+import { PositiveInt } from "@t3tools/contracts";
+import * as Clock from "effect/Clock";
+import * as Config from "effect/Config";
+import * as Console from "effect/Console";
+import * as DateTime from "effect/DateTime";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import { Command, Flag } from "effect/unstable/cli";
+
+import * as ServerConfig from "../config.ts";
+import { streamTraceFileLines, toRotatedTracePaths } from "../diagnostics/TraceDiagnostics.ts";
+import { resolveBaseDir } from "../os-jank.ts";
+import { baseDirFlag, DurationFromString, traceFileConfig, traceMaxFilesConfig } from "./config.ts";
+
+// Only the fields the summary needs. Other record fields are ignored.
+const decodeTraceSpanLine = Schema.decodeUnknownOption(
+  Schema.fromJsonString(
+    Schema.Struct({
+      name: Schema.String,
+      durationMs: Schema.Finite,
+      endTimeUnixNano: Schema.FiniteFromString,
+      // Server (`effect-span`) records.
+      exit: Schema.optional(Schema.Struct({ _tag: Schema.String })),
+      // Browser (`otlp-span`) records. Effect's OTLP tracer writes code "2" for
+      // errors and code "1" with message "Interrupted" for interrupts.
+      status: Schema.optional(
+        Schema.Struct({
+          code: Schema.optional(Schema.String),
+          message: Schema.optional(Schema.String),
+        }),
+      ),
+    }),
+  ),
+);
+
+/**
+ * Groups trace NDJSON by span name. Call `addLine` once per line as the files
+ * stream in, then `finish` for the summary. Spans that ended before `sinceMs`
+ * are left out. Rates are per minute between the first and last span end,
+ * since spans are written when they end.
+ */
+export function makeTraceSpanSummary(sinceMs = -Infinity) {
+  // Keep each span's duration (8 bytes, a few MB for the default 110 MB of
+  // rotated traces) for exact percentiles. A bounded sketch would save little
+  // and make p50 and p90 approximate.
+  const byName = new Map<string, { durations: number[]; interrupted: number; failures: number }>();
+  let spanCount = 0;
+  let skippedLineCount = 0;
+  let firstEndMs = Infinity;
+  let lastEndMs = -Infinity;
+
+  const addLine = (line: string) => {
+    if (line.trim().length === 0) return;
+    const span = Option.getOrUndefined(decodeTraceSpanLine(line));
+    if (span === undefined) {
+      skippedLineCount += 1;
+      return;
+    }
+    const endMs = span.endTimeUnixNano / 1_000_000;
+    // The report prints end times as dates, so skip ones outside the Date range.
+    if (Option.isNone(DateTime.make(endMs))) {
+      skippedLineCount += 1;
+      return;
+    }
+    if (endMs < sinceMs) return;
+
+    spanCount += 1;
+    firstEndMs = Math.min(firstEndMs, endMs);
+    lastEndMs = Math.max(lastEndMs, endMs);
+    const stats = byName.get(span.name) ?? { durations: [], interrupted: 0, failures: 0 };
+    stats.durations.push(span.durationMs);
+    if (span.exit?._tag === "Interrupted" || span.status?.message === "Interrupted") {
+      stats.interrupted += 1;
+    }
+    if (span.exit?._tag === "Failure" || span.status?.code === "2") stats.failures += 1;
+    byName.set(span.name, stats);
+  };
+
+  const finish = () => {
+    const minutes = (lastEndMs - firstEndMs) / 60_000;
+    const spans = [...byName]
+      .map(([name, { durations, interrupted, failures }]) => {
+        const sorted = durations.toSorted((left, right) => left - right);
+        // Nearest-rank percentile.
+        const percentile = (p: number) => sorted[Math.ceil(p * sorted.length) - 1]!;
+        return {
+          name,
+          count: sorted.length,
+          perMinute: minutes > 0 ? sorted.length / minutes : undefined,
+          p50Ms: percentile(0.5),
+          p90Ms: percentile(0.9),
+          maxMs: sorted[sorted.length - 1]!,
+          interrupted,
+          failures,
+        };
+      })
+      .toSorted((left, right) => right.count - left.count || left.name.localeCompare(right.name));
+
+    return { spanCount, skippedLineCount, firstEndMs, lastEndMs, minutes, spans };
+  };
+
+  return { addLine, finish };
+}
+
+const formatMs = (ms: number) =>
+  ms < 1_000 ? `${Math.round(ms)}ms` : `${(ms / 1_000).toFixed(1)}s`;
+
+function formatTraceSummary(
+  summary: ReturnType<ReturnType<typeof makeTraceSpanSummary>["finish"]>,
+  limit: number,
+) {
+  const header = ["span", "count", "/min", "p50", "p90", "max", "interrupted", "failed"];
+  const rows = summary.spans
+    .slice(0, limit)
+    .map((span) => [
+      span.name,
+      String(span.count),
+      span.perMinute === undefined
+        ? "-"
+        : span.perMinute < 0.1
+          ? "<0.1"
+          : span.perMinute.toFixed(1),
+      formatMs(span.p50Ms),
+      formatMs(span.p90Ms),
+      formatMs(span.maxMs),
+      String(span.interrupted),
+      String(span.failures),
+    ]);
+  const table = [header, ...rows];
+  const widths = header.map((_, column) => Math.max(...table.map((row) => row[column]!.length)));
+  const formatIso = (ms: number) => DateTime.formatIso(DateTime.makeUnsafe(ms));
+  return [
+    `${summary.spanCount} spans ended from ${formatIso(summary.firstEndMs)} to ${formatIso(summary.lastEndMs)} (${summary.minutes.toFixed(1)} min).`,
+    ...(summary.skippedLineCount > 0
+      ? [`Skipped ${summary.skippedLineCount} lines that are not spans.`]
+      : []),
+    "",
+    ...table.map((row) =>
+      row
+        .map((cell, column) =>
+          column === 0 ? cell.padEnd(widths[column]!) : cell.padStart(widths[column]!),
+        )
+        .join("  "),
+    ),
+    ...(summary.spans.length > limit
+      ? ["", `${summary.spans.length - limit} more span names. Use --limit to show more.`]
+      : []),
+  ].join("\n");
+}
+
+const traceSummaryCommand = Command.make("summary", {
+  baseDir: baseDirFlag,
+  since: Flag.String("since").pipe(
+    Flag.withSchema(DurationFromString),
+    Flag.withDescription("Only count spans that ended in this window, for example 30m or 2h."),
+    Flag.optional,
+  ),
+  limit: Flag.Int("limit").pipe(
+    Flag.withSchema(PositiveInt),
+    Flag.withDescription("Number of span names to show, busiest first."),
+    Flag.withDefault(25),
+  ),
+}).pipe(
+  Command.withDescription("Summarize the local server trace file: counts, rates, and latency."),
+  Command.withHandler(
+    Effect.fn("cli.trace.summary")(function* (flags) {
+      const fs = yield* FileSystem.FileSystem;
+      // T3CODE_TRACE_FILE, else the userdata trace file for --base-dir or
+      // T3CODE_HOME. Implicit dev runs write elsewhere; set T3CODE_TRACE_FILE.
+      const envHome = yield* Config.String("T3CODE_HOME").pipe(Config.option);
+      const baseDir = yield* resolveBaseDir(
+        Option.getOrUndefined(Option.orElse(flags.baseDir, () => envHome)),
+      );
+      const traceFilePath =
+        (yield* traceFileConfig) ??
+        (yield* ServerConfig.deriveServerPaths(baseDir, undefined)).serverTracePath;
+      const sinceMs = Option.isSome(flags.since)
+        ? (yield* Clock.currentTimeMillis) - Duration.toMillis(flags.since.value)
+        : undefined;
+      const summarizer = makeTraceSpanSummary(sinceMs);
+      yield* Effect.forEach(
+        toRotatedTracePaths(traceFilePath, yield* traceMaxFilesConfig),
+        (path) => streamTraceFileLines(fs, path, summarizer.addLine),
+        { discard: true },
+      );
+      const summary = summarizer.finish();
+
+      yield* Console.log(
+        summary.spanCount === 0
+          ? `No spans found in ${traceFilePath} or its rotated files${sinceMs === undefined ? "" : " in that window"}.${summary.skippedLineCount > 0 ? ` Skipped ${summary.skippedLineCount} lines that are not spans.` : ""}`
+          : formatTraceSummary(summary, flags.limit),
+      );
+    }),
+  ),
+);
+
+export const traceCommand = Command.make("trace").pipe(
+  Command.withDescription("Inspect the local server trace file."),
+  Command.withSubcommands([traceSummaryCommand]),
+);
diff --git a/apps/server/src/cli/triage.ts b/apps/server/src/cli/triage.ts
index c621d331c404..b408e3550112 100644
--- a/apps/server/src/cli/triage.ts
+++ b/apps/server/src/cli/triage.ts
@@ -27,6 +27,7 @@ import * as Schema from "effect/Schema";
 import { Command, Flag } from "effect/unstable/cli";
 
 import packageJson from "../../package.json" with { type: "json" };
+import * as BootService from "../cloud/bootService.ts";
 import * as ServerConfig from "../config.ts";
 import { resolveBaseDir } from "../os-jank.ts";
 import { isProcessAlive, readPersistedServerRuntimeState } from "../serverRuntimeState.ts";
@@ -201,7 +202,11 @@ export const triageCommand = Command.make("triage", {
             dbPath: paths.dbPath,
             settingsPath: paths.settingsPath,
             logsDir: paths.logsDir,
-            serverLogPath: paths.serverLogPath,
+            // The server writes no log file of its own. Service installs and the
+            // desktop app capture its output. The glob covers every desktop backend
+            // (such as WSL) and rotated copies; names come from DesktopObservability.ts.
+            serviceLogPath: path.join(paths.logsDir, BootService.BOOT_SERVICE_LOG_FILE),
+            desktopBackendLogGlob: path.join(paths.logsDir, "server-child*.log*"),
             serverTracePath: paths.serverTracePath,
             providerEventLogPath: paths.providerEventLogPath,
             terminalLogsDir: paths.terminalLogsDir,
diff --git a/apps/server/src/cli/triagePrompt.test.ts b/apps/server/src/cli/triagePrompt.test.ts
index bf1ac5dbbe5e..fe65bf0dc444 100644
--- a/apps/server/src/cli/triagePrompt.test.ts
+++ b/apps/server/src/cli/triagePrompt.test.ts
@@ -52,7 +52,8 @@ it("context file carries every path the playbook depends on", () => {
       dbPath: "/home/u/.t3/userdata/state.sqlite",
       settingsPath: "/home/u/.t3/userdata/settings.json",
       logsDir: "/home/u/.t3/userdata/logs",
-      serverLogPath: "/home/u/.t3/userdata/logs/server.log",
+      serviceLogPath: "/home/u/.t3/userdata/logs/boot-service.log",
+      desktopBackendLogGlob: "/home/u/.t3/userdata/logs/server-child*.log*",
       serverTracePath: "/home/u/.t3/userdata/logs/server.trace.ndjson",
       providerEventLogPath: "/home/u/.t3/userdata/logs/provider/events.log",
       terminalLogsDir: "/home/u/.t3/userdata/logs/terminals",
@@ -63,6 +64,8 @@ it("context file carries every path the playbook depends on", () => {
   });
   assert.include(context, "/home/u/.t3/userdata/state.sqlite");
   assert.include(context, "/home/u/.t3/userdata/logs/server.trace.ndjson");
+  assert.include(context, "/home/u/.t3/userdata/logs/boot-service.log");
+  assert.include(context, "/home/u/.t3/userdata/logs/server-child*.log*");
   assert.include(context, "/home/u/.t3/userdata/logs/provider/events.log");
   assert.include(context, "/home/u/.t3/userdata/secrets");
   assert.include(context, "/home/u/.t3/source");
diff --git a/apps/server/src/cli/triagePrompt.ts b/apps/server/src/cli/triagePrompt.ts
index c2b93a1840a1..1df712854263 100644
--- a/apps/server/src/cli/triagePrompt.ts
+++ b/apps/server/src/cli/triagePrompt.ts
@@ -71,8 +71,9 @@ different code depending on it:
 
 Then work from evidence, not assumption. In rough order of value:
 
-- The server log and the trace file (\`server.trace.ndjson\`) around the time of the
-  problem. Recent failures usually leave a trail here.
+- The trace file (\`server.trace.ndjson\`) around the time of the problem, plus the
+  service log or desktop backend logs from the context file if they exist. Recent
+  failures usually leave a trail here.
 - The provider event log, for problems with claude/codex/cursor sessions.
 - The SQLite database. Read it freely, but only write when a write is necessary
   to fix the problem the user described, and get their explicit permission
@@ -176,7 +177,8 @@ export interface TriageContextInput {
     readonly dbPath: string;
     readonly settingsPath: string;
     readonly logsDir: string;
-    readonly serverLogPath: string;
+    readonly serviceLogPath: string;
+    readonly desktopBackendLogGlob: string;
     readonly serverTracePath: string;
     readonly providerEventLogPath: string;
     readonly terminalLogsDir: string;
@@ -205,7 +207,8 @@ Generated by \`t3 triage\` at ${input.generatedAt}.
 - Database (SQLite; write only with the user's explicit permission): ${input.paths.dbPath}
 - Settings: ${input.paths.settingsPath}
 - Logs dir: ${input.paths.logsDir}
-- Server log: ${input.paths.serverLogPath}
+- Service log (systemd/launchd service installs only): ${input.paths.serviceLogPath}
+- Desktop backend logs (glob; one file per backend plus rotated copies; written only when a backend crashes or fails to start): ${input.paths.desktopBackendLogGlob}
 - Server trace (ndjson): ${input.paths.serverTracePath}
 - Provider event log: ${input.paths.providerEventLogPath}
 - Terminal logs: ${input.paths.terminalLogsDir}
diff --git a/apps/server/src/cloud/CliState.test.ts b/apps/server/src/cloud/CliState.test.ts
index 39f904b47b89..d59b89875e79 100644
--- a/apps/server/src/cloud/CliState.test.ts
+++ b/apps/server/src/cloud/CliState.test.ts
@@ -8,6 +8,7 @@ import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
 import { ServerConfig } from "../config.ts";
 import * as CliState from "./CliState.ts";
 import {
+  CLOUD_ENDPOINT_CONFIRMED_ORIGIN,
   CLOUD_ENDPOINT_RUNTIME_CONFIG,
   CLOUD_LINKED_USER_ID,
   CLOUD_MINT_PUBLIC_KEY,
@@ -24,6 +25,7 @@ const persistedCloudLinkSecrets = [
   RELAY_ENVIRONMENT_CREDENTIAL_SECRET,
   CLOUD_MINT_PUBLIC_KEY,
   CLOUD_ENDPOINT_RUNTIME_CONFIG,
+  CLOUD_ENDPOINT_CONFIRMED_ORIGIN,
   PUBLISH_AGENT_ACTIVITY_SECRET,
 ] as const;
 
diff --git a/apps/server/src/cloud/CliState.ts b/apps/server/src/cloud/CliState.ts
index 9af9a032f856..dc77609ccc92 100644
--- a/apps/server/src/cloud/CliState.ts
+++ b/apps/server/src/cloud/CliState.ts
@@ -3,6 +3,7 @@ import * as Option from "effect/Option";
 
 import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
 import {
+  CLOUD_ENDPOINT_CONFIRMED_ORIGIN,
   CLOUD_ENDPOINT_RUNTIME_CONFIG,
   CLOUD_LINKED_USER_ID,
   CLOUD_MINT_PUBLIC_KEY,
@@ -67,6 +68,7 @@ export const clearPersistedCloudLink = Effect.gen(function* () {
       secrets.remove(RELAY_ENVIRONMENT_CREDENTIAL_SECRET),
       secrets.remove(CLOUD_MINT_PUBLIC_KEY),
       secrets.remove(CLOUD_ENDPOINT_RUNTIME_CONFIG),
+      secrets.remove(CLOUD_ENDPOINT_CONFIRMED_ORIGIN),
       secrets.remove(PUBLISH_AGENT_ACTIVITY_SECRET),
     ],
     { concurrency: "unbounded" },
diff --git a/apps/server/src/cloud/CliTokenManager.ts b/apps/server/src/cloud/CliTokenManager.ts
index 4172578d45f3..2a666651a9a5 100644
--- a/apps/server/src/cloud/CliTokenManager.ts
+++ b/apps/server/src/cloud/CliTokenManager.ts
@@ -341,7 +341,7 @@ const pollDeviceToken = Effect.fn("cloud.cli_token.poll_device_token")(function*
     const response = yield* HttpClientRequest.post(metadata.tokenEndpoint).pipe(
       HttpClientRequest.bodyUrlParams(params),
       httpClient.execute,
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.catchIf(isTransportError, () => Effect.succeedNone),
     );
     // Transport failures and upstream 5xx are transient while the device code
diff --git a/apps/server/src/cloud/ManagedEndpointRuntime.test.ts b/apps/server/src/cloud/ManagedEndpointRuntime.test.ts
index ba2cf5c5ac05..71677a43d6b8 100644
--- a/apps/server/src/cloud/ManagedEndpointRuntime.test.ts
+++ b/apps/server/src/cloud/ManagedEndpointRuntime.test.ts
@@ -7,10 +7,12 @@ import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as PlatformError from "effect/PlatformError";
+import * as Queue from "effect/Queue";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import type { RelayManagedEndpointRuntimeConfig } from "@t3tools/contracts/relay";
 import * as RelayClient from "@t3tools/shared/relayClient";
 
 import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
@@ -38,7 +40,7 @@ const runtimeDependencies = (
     Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
     relayClientLayer,
     Layer.mock(ServerSecretStore.ServerSecretStore)({
-      get: () => Effect.succeed(Option.none()),
+      get: () => Effect.succeedNone,
     }),
   );
 
@@ -62,6 +64,7 @@ function makeHandle(input: {
   readonly onKill: () => void;
   readonly isRunning?: () => boolean;
   readonly exitCode?: Effect.Effect<ChildProcessSpawner.ExitCode>;
+  readonly output?: Stream.Stream<Uint8Array>;
 }) {
   return ChildProcessSpawner.makeHandle({
     pid: ChildProcessSpawner.ProcessId(input.pid),
@@ -75,13 +78,70 @@ function makeHandle(input: {
     stdin: Sink.drain,
     stdout: Stream.empty,
     stderr: Stream.empty,
-    all: Stream.empty,
+    all: input.output ?? Stream.empty,
     getInputFd: () => Sink.drain,
     getOutputFd: () => Stream.empty,
   });
 }
 
 describe("CloudManagedEndpointRuntime", () => {
+  it("retries connector startup failures but stops for unsupported runtimes", () => {
+    expect(
+      ManagedEndpointRuntime.isRetryableManagedEndpointRuntimeStatus({
+        status: "failed",
+        failure: "not-installed",
+        reason: "The relay client is not installed.",
+      }),
+    ).toBe(true);
+    expect(
+      ManagedEndpointRuntime.isRetryableManagedEndpointRuntimeStatus({
+        status: "failed",
+        failure: "spawn-failed",
+        reason: "spawn failed",
+      }),
+    ).toBe(true);
+    expect(
+      ManagedEndpointRuntime.isRetryableManagedEndpointRuntimeStatus({
+        status: "failed",
+        failure: "unsupported-platform",
+        reason: "Relay client is unsupported on linux-arm.",
+      }),
+    ).toBe(false);
+    expect(
+      ManagedEndpointRuntime.isRetryableManagedEndpointRuntimeStatus({ status: "unsupported" }),
+    ).toBe(false);
+  });
+
+  it.effect("serializes updates to persisted cloud link state", () =>
+    Effect.gen(function* () {
+      const firstEntered = yield* Deferred.make<void>();
+      const releaseFirst = yield* Deferred.make<void>();
+      const secondEntered = yield* Deferred.make<void>();
+      const runtime = yield* buildCloudManagedEndpointRuntime(
+        ChildProcessSpawner.make(() => Effect.die("unused")),
+      );
+
+      const first = yield* runtime
+        .withLinkStateLock(
+          Deferred.succeed(firstEntered, undefined).pipe(
+            Effect.andThen(Deferred.await(releaseFirst)),
+          ),
+        )
+        .pipe(Effect.forkChild);
+      yield* Deferred.await(firstEntered);
+
+      const second = yield* runtime
+        .withLinkStateLock(Deferred.succeed(secondEntered, undefined))
+        .pipe(Effect.forkChild);
+      expect(yield* Deferred.isDone(secondEntered)).toBe(false);
+
+      yield* Deferred.succeed(releaseFirst, undefined);
+      yield* Fiber.join(first);
+      yield* Fiber.join(second);
+      expect(yield* Deferred.isDone(secondEntered)).toBe(true);
+    }),
+  );
+
   it("classifies Cloudflare connection and warning output", () => {
     expect(
       ManagedEndpointRuntime.classifyRelayClientOutput(
@@ -109,6 +169,125 @@ describe("CloudManagedEndpointRuntime", () => {
     ).toBe("warning");
   });
 
+  it("recognizes tunnel authorization failures without matching ordinary transport errors", () => {
+    expect(
+      ManagedEndpointRuntime.isRejectedRelayClientTunnelOutput(
+        '2026-09-15T06:30:43Z ERR Register tunnel error from server side error="Failed to get tunnel" connIndex=0 event=0 ip=198.41.200.23',
+      ),
+    ).toBe(true);
+    expect(
+      ManagedEndpointRuntime.isRejectedRelayClientTunnelOutput(
+        '2026-06-17T02:00:00Z ERR Register tunnel error from server side error="Unauthorized: Record for tunnel not found" connIndex=0',
+      ),
+    ).toBe(true);
+    expect(
+      ManagedEndpointRuntime.isRejectedRelayClientTunnelOutput(
+        '2026-06-17T02:00:00Z ERR Register tunnel error from server side error="Unauthorized: Invalid tunnel secret" connIndex=0',
+      ),
+    ).toBe(true);
+    expect(
+      ManagedEndpointRuntime.isRejectedRelayClientTunnelOutput(
+        '2026-06-17T02:00:00Z ERR Register tunnel error from server side error="connection timed out" connIndex=0',
+      ),
+    ).toBe(false);
+  });
+
+  it.effect("keeps recovery requests sent before the server starts consuming them", () =>
+    Effect.gen(function* () {
+      const runtime = yield* buildCloudManagedEndpointRuntime(
+        ChildProcessSpawner.make(() => Effect.die("unused")),
+      );
+      const config = {
+        providerKind: "cloudflare_tunnel" as const,
+        connectorToken: "token",
+        tunnelId: "tunnel-1",
+      };
+
+      yield* runtime.requestRecovery(config);
+
+      expect(Option.getOrNull(yield* Stream.runHead(runtime.recoveryRequests))).toEqual(config);
+    }),
+  );
+
+  it.effect("recovers a rejected tunnel without waiting for the connector to exit", () =>
+    Effect.gen(function* () {
+      const output = yield* Queue.unbounded<Uint8Array>();
+      const firstBatchObserved = yield* Deferred.make<void>();
+      const secondBatchObserved = yield* Deferred.make<void>();
+      const recoveryRequested = yield* Deferred.make<RelayManagedEndpointRuntimeConfig>();
+      const recoveryRetried = yield* Deferred.make<RelayManagedEndpointRuntimeConfig>();
+      let recoveryRequestCount = 0;
+      const spawned: Array<number> = [];
+      const encoder = new TextEncoder();
+      const connectorOutput = Stream.fromQueue(output).pipe(
+        Stream.tap((chunk) => {
+          const line = new TextDecoder().decode(chunk);
+          if (line === "first checkpoint\n") {
+            return Deferred.succeed(firstBatchObserved, undefined).pipe(Effect.asVoid);
+          }
+          if (line === "second checkpoint\n") {
+            return Deferred.succeed(secondBatchObserved, undefined).pipe(Effect.asVoid);
+          }
+          return Effect.void;
+        }),
+      );
+      const spawner = ChildProcessSpawner.make(() =>
+        Effect.gen(function* () {
+          const pid = 600;
+          spawned.push(pid);
+          const handle = makeHandle({ pid, onKill: () => {}, output: connectorOutput });
+          yield* Effect.addFinalizer(() => handle.kill().pipe(Effect.ignore));
+          return handle;
+        }),
+      );
+      const runtime = yield* buildCloudManagedEndpointRuntime(spawner);
+      const config = {
+        providerKind: "cloudflare_tunnel" as const,
+        connectorToken: "token",
+        tunnelId: "deleted-tunnel",
+      };
+      const rejectedLine =
+        '2026-09-15T06:30:43Z ERR Register tunnel error from server side error="Failed to get tunnel" connIndex=0 event=0 ip=198.41.200.23\n';
+
+      yield* runtime.recoveryRequests.pipe(
+        Stream.runForEach((requested) => {
+          recoveryRequestCount += 1;
+          return Deferred.succeed(
+            recoveryRequestCount === 1 ? recoveryRequested : recoveryRetried,
+            requested,
+          ).pipe(Effect.asVoid);
+        }),
+        Effect.forkChild,
+      );
+      yield* runtime.applyConfig(config);
+
+      yield* Queue.offer(output, encoder.encode(rejectedLine.repeat(3)));
+      yield* Queue.offer(output, encoder.encode("first checkpoint\n"));
+      yield* Deferred.await(firstBatchObserved);
+      expect(yield* Deferred.isDone(recoveryRequested)).toBe(false);
+
+      yield* Queue.offer(
+        output,
+        encoder.encode(
+          "2026-06-17T02:00:00Z INF Registered tunnel connection connIndex=0\n" +
+            rejectedLine.repeat(3),
+        ),
+      );
+      yield* Queue.offer(output, encoder.encode("second checkpoint\n"));
+      yield* Deferred.await(secondBatchObserved);
+      expect(yield* Deferred.isDone(recoveryRequested)).toBe(false);
+
+      yield* Queue.offer(output, encoder.encode(rejectedLine));
+
+      expect(yield* Deferred.await(recoveryRequested)).toEqual(config);
+
+      yield* Queue.offer(output, encoder.encode(rejectedLine.repeat(4)));
+
+      expect(yield* Deferred.await(recoveryRetried)).toEqual(config);
+      expect(spawned).toEqual([600]);
+    }),
+  );
+
   it.effect("starts, deduplicates, rotates, and stops the Cloudflare connector", () =>
     Effect.gen(function* () {
       const spawned: Array<ChildProcess.StandardCommand> = [];
@@ -156,8 +335,8 @@ describe("CloudManagedEndpointRuntime", () => {
 
       expect(spawned.map((command) => command.command)).toEqual(["cloudflared", "cloudflared"]);
       expect(spawned.map((command) => command.args)).toEqual([
-        ["tunnel", "run"],
-        ["tunnel", "run"],
+        ["tunnel", "--no-autoupdate", "--loglevel", "info", "--output", "default", "run"],
+        ["tunnel", "--no-autoupdate", "--loglevel", "info", "--output", "default", "run"],
       ]);
       expect(spawned.map((command) => command.options.env?.TUNNEL_TOKEN)).toEqual([
         "token-1",
@@ -378,6 +557,37 @@ describe("CloudManagedEndpointRuntime", () => {
     }).pipe(Effect.provide(TestClock.layer())),
   );
 
+  it.effect("a recovery that returns the same config keeps the crash backoff", () =>
+    Effect.gen(function* () {
+      const { spawner, spawned, exits, spawnSignals } = yield* makeCrashLoopSpawner(900, 4);
+      const runtime = yield* buildCloudManagedEndpointRuntime(spawner);
+      const config = {
+        providerKind: "cloudflare_tunnel" as const,
+        connectorToken: "same-token",
+        tunnelId: "same-tunnel",
+      };
+      // The startup consumer re-applies whatever the relay hands back. When the
+      // relay confirms the current tunnel, that must not look like a config change.
+      yield* runtime.recoveryRequests.pipe(
+        Stream.runForEach((requested) => runtime.applyConfig(requested).pipe(Effect.asVoid)),
+        Effect.forkChild,
+      );
+
+      yield* runtime.applyConfig(config);
+      yield* Deferred.succeed(exits[0]!, ChildProcessSpawner.ExitCode(1));
+      yield* Deferred.await(spawnSignals[1]!);
+      expect(spawned).toEqual([900, 901]);
+
+      // Second rapid crash still waits out the base delay.
+      yield* Deferred.succeed(exits[1]!, ChildProcessSpawner.ExitCode(1));
+      yield* TestClock.adjust(Duration.millis(999));
+      expect(spawned).toEqual([900, 901]);
+      yield* TestClock.adjust(Duration.millis(1));
+      yield* Deferred.await(spawnSignals[2]!);
+      expect(spawned).toEqual([900, 901, 902]);
+    }).pipe(Effect.provide(TestClock.layer())),
+  );
+
   it.effect("an explicit config change clears the backoff and preempts a delayed restart", () =>
     Effect.gen(function* () {
       const { spawner, spawned, exits, spawnSignals } = yield* makeCrashLoopSpawner(800, 3);
@@ -510,6 +720,7 @@ describe("CloudManagedEndpointRuntime", () => {
       expect(status).toEqual({
         status: "failed",
         providerKind: "cloudflare_tunnel",
+        failure: "not-installed",
         reason: "The relay client is not installed.",
       });
       expect(spawn).not.toHaveBeenCalled();
diff --git a/apps/server/src/cloud/ManagedEndpointRuntime.ts b/apps/server/src/cloud/ManagedEndpointRuntime.ts
index cc657bdebf1b..21091c5c446e 100644
--- a/apps/server/src/cloud/ManagedEndpointRuntime.ts
+++ b/apps/server/src/cloud/ManagedEndpointRuntime.ts
@@ -6,7 +6,7 @@ import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
+import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import * as Result from "effect/Result";
 import * as Semaphore from "effect/Semaphore";
@@ -15,22 +15,6 @@ import * as Stream from "effect/Stream";
 import * as ChildProcess from "effect/unstable/process/ChildProcess";
 import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 
-import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
-import { CLOUD_ENDPOINT_RUNTIME_CONFIG, decodeRuntimeConfig } from "./config.ts";
-
-function bytesToString(bytes: Uint8Array): string {
-  return new TextDecoder().decode(bytes);
-}
-
-const readRuntimeConfig = Effect.gen(function* () {
-  const secrets = yield* ServerSecretStore.ServerSecretStore;
-  const bytes = yield* secrets.get(CLOUD_ENDPOINT_RUNTIME_CONFIG);
-  if (Option.isNone(bytes)) {
-    return null;
-  }
-  return Option.getOrNull(decodeRuntimeConfig(bytesToString(bytes.value)));
-});
-
 export type CloudManagedEndpointRuntimeStatus =
   | {
       readonly status: "disabled";
@@ -38,6 +22,7 @@ export type CloudManagedEndpointRuntimeStatus =
   | {
       readonly status: "failed";
       readonly providerKind: RelayManagedEndpointRuntimeConfig["providerKind"];
+      readonly failure: "unsupported-platform" | "not-installed" | "spawn-failed";
       readonly reason: string;
       readonly tunnelId?: string;
       readonly tunnelName?: string;
@@ -60,6 +45,9 @@ export class CloudManagedEndpointRuntime extends Context.Service<
     readonly applyConfig: (
       config: RelayManagedEndpointRuntimeConfig | null,
     ) => Effect.Effect<CloudManagedEndpointRuntimeStatus>;
+    readonly recoveryRequests: Stream.Stream<RelayManagedEndpointRuntimeConfig>;
+    readonly requestRecovery: (config: RelayManagedEndpointRuntimeConfig) => Effect.Effect<void>;
+    readonly withLinkStateLock: <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
   }
 >()("t3/cloud/ManagedEndpointRuntime/CloudManagedEndpointRuntime") {}
 
@@ -79,6 +67,8 @@ interface ActiveConnector {
 const RELAY_RESTART_STABLE_UPTIME_MS = 30_000;
 const RELAY_RESTART_BACKOFF_BASE_MS = 1_000;
 const RELAY_RESTART_BACKOFF_MAX_MS = 60_000;
+// Newly created tunnels can fail authorization briefly while Cloudflare propagates their token.
+const TUNNEL_AUTHORIZATION_FAILURES_BEFORE_RECOVERY = 4;
 
 export function classifyRelayClientOutput(line: string): "connected" | "warning" | "debug" {
   if (/\bRegistered tunnel connection\b/iu.test(line)) {
@@ -90,6 +80,32 @@ export function classifyRelayClientOutput(line: string): "connected" | "warning"
   return /\b(?:ERR|WRN|FTL|PNC)\b/u.test(line) ? "warning" : "debug";
 }
 
+/**
+ * Cloudflare's edge rejects a connector whose tunnel was deleted or whose
+ * token no longer matches. Current edge output is
+ * `error="Failed to get tunnel"` with no prefix; older edges prefixed the
+ * same messages with `Unauthorized:`. Match both so recovery fires on either.
+ */
+export function isRejectedRelayClientTunnelOutput(line: string): boolean {
+  return (
+    /\bRegister tunnel error from server side\b/iu.test(line) &&
+    /error="(?:Unauthorized:\s*)?(?:Failed to get tunnel|Record for tunnel not found|Invalid tunnel secret)"/iu.test(
+      line,
+    )
+  );
+}
+
+/** Connector startup failures can clear after installation or a later spawn attempt. */
+export function isRetryableManagedEndpointRuntimeStatus(status: unknown): boolean {
+  if (typeof status !== "object" || status === null || !("status" in status)) {
+    return false;
+  }
+  if (status.status !== "failed" || !("failure" in status)) {
+    return false;
+  }
+  return status.failure === "not-installed" || status.failure === "spawn-failed";
+}
+
 function runtimeConfigKey(config: RelayManagedEndpointRuntimeConfig): string {
   return JSON.stringify({
     providerKind: config.providerKind,
@@ -117,8 +133,10 @@ export const make = Effect.gen(function* () {
   const relayClient = yield* RelayClient.RelayClient;
   const activeRef = yield* Ref.make<ActiveConnector | null>(null);
   const desiredConfigRef = yield* Ref.make<RelayManagedEndpointRuntimeConfig | null>(null);
+  const recoveryRequests = yield* Queue.sliding<RelayManagedEndpointRuntimeConfig>(1);
   const reconcileSemaphore = yield* Semaphore.make(1);
   const restartDelayRef = yield* Ref.make(0);
+  const linkStateSemaphore = yield* Semaphore.make(1);
   let reconcileConfig: CloudManagedEndpointRuntime["Service"]["applyConfig"];
 
   const stopActive = Effect.gen(function* () {
@@ -191,6 +209,7 @@ export const make = Effect.gen(function* () {
             tunnelId: connector.config.tunnelId,
             tunnelName: connector.config.tunnelName,
           });
+          yield* Queue.offer(recoveryRequests, connector.config);
           yield* reconcileConfig(desiredConfig);
         }),
       );
@@ -198,8 +217,10 @@ export const make = Effect.gen(function* () {
       Effect.catchCause((cause) => Effect.logWarning("Relay client supervisor failed", { cause })),
     );
 
-  const observeConnectorOutput = (connector: ActiveConnector) =>
-    connector.child.all.pipe(
+  const observeConnectorOutput = (connector: ActiveConnector) => {
+    let rejectedRegistrations = 0;
+
+    return connector.child.all.pipe(
       Stream.decodeText(),
       Stream.splitLines,
       Stream.map((line) => line.trim()),
@@ -214,8 +235,22 @@ export const make = Effect.gen(function* () {
         };
         switch (classifyRelayClientOutput(line)) {
           case "connected":
+            rejectedRegistrations = 0;
             return Effect.logInfo("Relay client tunnel connection registered", attributes);
           case "warning":
+            if (isRejectedRelayClientTunnelOutput(line)) {
+              rejectedRegistrations += 1;
+              if (rejectedRegistrations >= TUNNEL_AUTHORIZATION_FAILURES_BEFORE_RECOVERY) {
+                rejectedRegistrations = 0;
+                return Effect.logWarning(
+                  "Relay client tunnel was rejected; requesting recovery",
+                  attributes,
+                ).pipe(
+                  Effect.andThen(Queue.offer(recoveryRequests, connector.config)),
+                  Effect.asVoid,
+                );
+              }
+            }
             return Effect.logWarning("Relay client reported a transport warning", attributes);
           case "debug":
             return Effect.logDebug("Relay client output", attributes);
@@ -230,6 +265,7 @@ export const make = Effect.gen(function* () {
         }),
       ),
     );
+  };
 
   reconcileConfig = Effect.fn("CloudManagedEndpointRuntime.reconcileConfig")(function* (config) {
     if (!config || config.providerKind !== "cloudflare_tunnel") {
@@ -261,6 +297,7 @@ export const make = Effect.gen(function* () {
       return {
         status: "failed",
         providerKind: "cloudflare_tunnel",
+        failure: executable.status === "unsupported" ? "unsupported-platform" : "not-installed",
         reason:
           executable.status === "unsupported"
             ? `Relay client is unsupported on ${executable.platform}-${executable.arch}.`
@@ -273,16 +310,20 @@ export const make = Effect.gen(function* () {
     const connectorScope = yield* Scope.make("sequential");
     const child = yield* spawner
       .spawn(
-        ChildProcess.make(executable.executablePath, ["tunnel", "run"], {
-          detached: false,
-          env: {
-            ...process.env,
-            TUNNEL_TOKEN: config.connectorToken,
+        ChildProcess.make(
+          executable.executablePath,
+          ["tunnel", "--no-autoupdate", "--loglevel", "info", "--output", "default", "run"],
+          {
+            detached: false,
+            env: {
+              ...process.env,
+              TUNNEL_TOKEN: config.connectorToken,
+            },
+            shell: false,
+            stderr: "pipe",
+            stdout: "pipe",
           },
-          shell: false,
-          stderr: "pipe",
-          stdout: "pipe",
-        }),
+        ),
       )
       .pipe(
         Effect.provideService(Scope.Scope, connectorScope),
@@ -303,6 +344,7 @@ export const make = Effect.gen(function* () {
             Effect.as({
               status: "failed",
               providerKind: "cloudflare_tunnel",
+              failure: "spawn-failed",
               reason: String(cause),
               ...(config.tunnelId ? { tunnelId: config.tunnelId } : {}),
               ...(config.tunnelName ? { tunnelName: config.tunnelName } : {}),
@@ -338,6 +380,7 @@ export const make = Effect.gen(function* () {
     return {
       status: "failed",
       providerKind: "cloudflare_tunnel",
+      failure: "spawn-failed",
       reason: "Relay client did not start.",
       ...(config.tunnelId ? { tunnelId: config.tunnelId } : {}),
       ...(config.tunnelName ? { tunnelName: config.tunnelName } : {}),
@@ -347,26 +390,31 @@ export const make = Effect.gen(function* () {
   const applyConfig = Effect.fn("CloudManagedEndpointRuntime.applyConfig")(
     (config: RelayManagedEndpointRuntimeConfig | null) =>
       reconcileSemaphore.withPermits(1)(
-        // An explicit config change starts over with a fresh backoff.
-        Ref.set(restartDelayRef, 0).pipe(
-          Effect.andThen(Ref.set(desiredConfigRef, config)),
-          Effect.andThen(reconcileConfig(config)),
-        ),
+        Effect.gen(function* () {
+          // A real config change starts over with a fresh backoff. Recovery
+          // that hands back the same tunnel and token must keep the delay, or
+          // a crash-looping connector respawns on every recovery round trip.
+          const desired = yield* Ref.get(desiredConfigRef);
+          const unchanged =
+            desired !== null &&
+            config !== null &&
+            runtimeConfigKey(desired) === runtimeConfigKey(config);
+          if (!unchanged) {
+            yield* Ref.set(restartDelayRef, 0);
+          }
+          yield* Ref.set(desiredConfigRef, config);
+          return yield* reconcileConfig(config);
+        }),
       ),
   );
 
   const runtime = CloudManagedEndpointRuntime.of({
     applyConfig,
+    recoveryRequests: Stream.fromQueue(recoveryRequests),
+    requestRecovery: (config) => Queue.offer(recoveryRequests, config).pipe(Effect.asVoid),
+    withLinkStateLock: linkStateSemaphore.withPermits(1),
   });
 
-  const initialConfig = yield* readRuntimeConfig.pipe(
-    Effect.catch((cause) =>
-      Effect.logWarning("Failed to read managed endpoint runtime config", { cause }).pipe(
-        Effect.as(null),
-      ),
-    ),
-  );
-  yield* runtime.applyConfig(initialConfig);
   yield* Effect.addFinalizer(() => runtime.applyConfig(null));
   return runtime;
 });
diff --git a/apps/server/src/cloud/bootService.ts b/apps/server/src/cloud/bootService.ts
index 633778641371..4db311c646b1 100644
--- a/apps/server/src/cloud/bootService.ts
+++ b/apps/server/src/cloud/bootService.ts
@@ -43,6 +43,8 @@ const BOOT_SERVICE_UNIT_FILE = `${BOOT_SERVICE_NAME}.service`;
 const BOOT_SERVICE_LAUNCHD_LABEL = "com.t3tools.t3code.service";
 const BOOT_SERVICE_PLIST_FILE = `${BOOT_SERVICE_LAUNCHD_LABEL}.plist`;
 const BOOT_SERVICE_UNIT_ENV = "T3_BOOT_SERVICE_UNIT";
+/** File in the logs dir that receives the service's stdout and stderr. `t3 triage` points agents at it. */
+export const BOOT_SERVICE_LOG_FILE = "boot-service.log";
 
 /** systemd expands `%` specifiers, including in unquoted append-log paths. */
 function escapeSystemdSpecifiers(value: string): string {
@@ -599,7 +601,7 @@ export const make = Effect.fn("cloud.boot_service.make")(function* (input: {
     environmentPath,
   });
   const unitPath = detectedManager?.unitPath ?? "";
-  const logPath = path.join(input.logsDir, "boot-service.log");
+  const logPath = path.join(input.logsDir, BOOT_SERVICE_LOG_FILE);
   const statePath = path.join(input.baseDir, "runtime", SERVICE_STATE_FILE);
   const restartPendingPath = path.join(input.baseDir, "runtime", SERVICE_RESTART_PENDING_FILE);
   const runtimePaths = pinnedRuntimePaths(path, input.baseDir, input.cliVersion, platform);
diff --git a/apps/server/src/cloud/config.ts b/apps/server/src/cloud/config.ts
index 2eff693f61e6..9b1b281ba2da 100644
--- a/apps/server/src/cloud/config.ts
+++ b/apps/server/src/cloud/config.ts
@@ -1,4 +1,7 @@
-import { RelayManagedEndpointRuntimeConfig } from "@t3tools/contracts/relay";
+import {
+  RelayManagedEndpointOrigin,
+  RelayManagedEndpointRuntimeConfig,
+} from "@t3tools/contracts/relay";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
@@ -7,6 +10,7 @@ import type * as ServerSecretStore from "../auth/ServerSecretStore.ts";
 
 export const CLOUD_MINT_PUBLIC_KEY = "cloud-mint-ed25519-public-key";
 export const CLOUD_ENDPOINT_RUNTIME_CONFIG = "cloud-endpoint-runtime-config";
+export const CLOUD_ENDPOINT_CONFIRMED_ORIGIN = "cloud-endpoint-confirmed-origin";
 export const CLOUD_LINKED_USER_ID = "cloud-linked-user-id";
 export const RELAY_URL_SECRET = "cloud-relay-url";
 export const RELAY_ISSUER_SECRET = "cloud-relay-issuer";
@@ -21,6 +25,19 @@ export const decodeRuntimeConfig = Schema.decodeUnknownOption(
   Schema.fromJsonString(RelayManagedEndpointRuntimeConfig),
 );
 
+export const ManagedEndpointConfirmedOrigin = Schema.Struct({
+  config: RelayManagedEndpointRuntimeConfig,
+  origin: RelayManagedEndpointOrigin,
+});
+
+export const encodeConfirmedOriginJson = Schema.encodeEffect(
+  Schema.fromJsonString(ManagedEndpointConfirmedOrigin),
+);
+
+export const decodeConfirmedOrigin = Schema.decodeUnknownOption(
+  Schema.fromJsonString(ManagedEndpointConfirmedOrigin),
+);
+
 export function isAgentActivityPublishingEnabledValue(value: string | null): boolean {
   return value === "true";
 }
diff --git a/apps/server/src/cloud/http.test.ts b/apps/server/src/cloud/http.test.ts
index 0f24e6f34176..1d6b78e56cef 100644
--- a/apps/server/src/cloud/http.test.ts
+++ b/apps/server/src/cloud/http.test.ts
@@ -1,12 +1,18 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, expect, it } from "@effect/vitest";
+import * as Deferred from "effect/Deferred";
+import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as PlatformError from "effect/PlatformError";
+import * as Schema from "effect/Schema";
+import * as TestClock from "effect/testing/TestClock";
 import * as Tracer from "effect/Tracer";
+import * as Stream from "effect/Stream";
 import {
   HttpClient,
   HttpClientResponse,
@@ -14,7 +20,7 @@ import {
   type HttpClientRequest,
 } from "effect/unstable/http";
 
-import { EnvironmentId } from "@t3tools/contracts";
+import { DESKTOP_UPDATE_RESTART_MARKER_FILE, EnvironmentId } from "@t3tools/contracts";
 import { RelayClientTracer } from "@t3tools/shared/relayTracing";
 import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
 import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
@@ -27,18 +33,40 @@ import {
   type ServiceUpdateRecord,
 } from "./serviceProtocol.ts";
 import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
+import * as AgentAwarenessRelay from "../relay/AgentAwarenessRelay.ts";
 import { CLOUD_CLI_DESIRED_LINK_SECRET } from "./CliState.ts";
 import * as CliTokenManager from "./CliTokenManager.ts";
-import type { RelayLinkProofRequest } from "@t3tools/contracts/relay";
-import { CLOUD_ENDPOINT_RUNTIME_CONFIG, RELAY_URL_SECRET } from "./config.ts";
+import {
+  RelayManagedEndpointRecoveryRegistrationRequest,
+  type RelayLinkProofRequest,
+} from "@t3tools/contracts/relay";
+import {
+  CLOUD_ENDPOINT_CONFIRMED_ORIGIN,
+  CLOUD_ENDPOINT_RUNTIME_CONFIG,
+  CLOUD_LINKED_USER_ID,
+  decodeConfirmedOrigin,
+  decodeRuntimeConfig,
+  RELAY_ENVIRONMENT_CREDENTIAL_SECRET,
+  RELAY_URL_SECRET,
+} from "./config.ts";
 import {
   consumeCloudReplayGuards,
   isSupportedLinkProviderKind,
   linkProofScopes,
   pendingServiceUpdateExists,
+  parseManagedEndpointLocalOrigin,
   reconcileDesiredCloudLink,
+  reconcileDesiredCloudLinkIfStillDesired,
+  recoverManagedCloudTunnel,
+  registerManagedCloudTunnelRecovery,
   releaseManagedTunnelOnShutdown,
+  startManagedCloudTunnelIfOriginConfirmed,
 } from "./http.ts";
+import {
+  managedTunnelStartupAction,
+  retryManagedTunnelRegistration,
+} from "./managedTunnelStartup.ts";
+import { shouldRetryCloudLink } from "./relayResponse.ts";
 import * as ManagedEndpointRuntime from "./ManagedEndpointRuntime.ts";
 import { traceAuthenticatedRelayRequest, traceRelayRequest } from "./traceRelayRequest.ts";
 
@@ -54,6 +82,15 @@ const storeFailure = (tag: "AlreadyExists" | "PermissionDenied") =>
   });
 
 const unusedSecretStoreOperation = () => Effect.die("unused secret-store operation");
+// Linking wakes the awareness relay; these tests do not run it.
+const idleAwarenessRelay = AgentAwarenessRelay.AgentAwarenessRelay.of({
+  publishThread: () => Effect.void,
+  requestCatchUp: () => Effect.void,
+  start: () => Effect.void,
+});
+const decodeManagedTunnelRecoveryRegistration = Schema.decodeUnknownEffect(
+  Schema.fromJsonString(RelayManagedEndpointRecoveryRegistrationRequest),
+);
 
 function makeSecretStore(
   create: ServerSecretStore.ServerSecretStore["Service"]["create"],
@@ -209,6 +246,9 @@ describe("reconcileDesiredCloudLink", () => {
         ManagedEndpointRuntime.CloudManagedEndpointRuntime,
         ManagedEndpointRuntime.CloudManagedEndpointRuntime.of({
           applyConfig: unusedSecretStoreOperation,
+          recoveryRequests: Stream.empty,
+          requestRecovery: () => Effect.void,
+          withLinkStateLock: (effect) => effect,
         } satisfies ManagedEndpointRuntime.CloudManagedEndpointRuntime["Service"]),
       ),
       Effect.provideService(
@@ -219,7 +259,7 @@ describe("reconcileDesiredCloudLink", () => {
         CliTokenManager.CloudCliTokenManager,
         CliTokenManager.CloudCliTokenManager.of({
           get: unusedSecretStoreOperation(),
-          getExisting: Effect.succeed(Option.none()),
+          getExisting: Effect.succeedNone,
           hasCredential: unusedSecretStoreOperation(),
           store: () => unusedSecretStoreOperation(),
           clear: unusedSecretStoreOperation(),
@@ -229,11 +269,45 @@ describe("reconcileDesiredCloudLink", () => {
         HttpClient.HttpClient,
         HttpClient.make(() => unusedSecretStoreOperation()),
       ),
+      Effect.provideService(AgentAwarenessRelay.AgentAwarenessRelay, idleAwarenessRelay),
       Effect.provide(NodeServices.layer),
     ),
   );
 });
 
+describe("parseManagedEndpointLocalOrigin", () => {
+  it.each([
+    {
+      input: "http://127.0.0.1:80",
+      httpBaseUrl: "http://127.0.0.1",
+      wsBaseUrl: "ws://127.0.0.1",
+      port: 80,
+    },
+    {
+      input: "https://127.0.0.1:443",
+      httpBaseUrl: "https://127.0.0.1",
+      wsBaseUrl: "wss://127.0.0.1",
+      port: 443,
+    },
+  ])("accepts an explicit default port in $input", ({ input, httpBaseUrl, wsBaseUrl, port }) => {
+    expect(parseManagedEndpointLocalOrigin(input)).toEqual({
+      httpBaseUrl,
+      wsBaseUrl,
+      origin: { localHttpHost: "127.0.0.1", localHttpPort: port },
+    });
+  });
+
+  it.each([
+    "ftp://127.0.0.1:3773",
+    "http://user:password@127.0.0.1:3773",
+    "http://127.0.0.1:3773/api",
+    "http://127.0.0.1:3773?mode=test",
+    "http://127.0.0.1:3773#fragment",
+  ])("rejects non-origin URL %s", (input) => {
+    expect(() => parseManagedEndpointLocalOrigin(input)).toThrow("Invalid local origin");
+  });
+});
+
 describe("releaseManagedTunnelOnShutdown", () => {
   const cliToken: CliTokenManager.PersistedToken = {
     accessToken: "cli-access-token",
@@ -251,7 +325,10 @@ describe("releaseManagedTunnelOnShutdown", () => {
         Effect.sync(() => {
           values.set(name, value);
         }),
-      create: unusedSecretStoreOperation,
+      create: (name, value) =>
+        Effect.sync(() => {
+          values.set(name, value);
+        }),
       getOrCreateRandom: unusedSecretStoreOperation,
       remove: (name) =>
         Effect.sync(() => {
@@ -265,7 +342,9 @@ describe("releaseManagedTunnelOnShutdown", () => {
     readonly store: ServerSecretStore.ServerSecretStore["Service"];
     readonly applyConfigCalls: Array<unknown>;
     readonly requests: Array<HttpClientRequest.HttpClientRequest>;
+    readonly onRequest?: (request: HttpClientRequest.HttpClientRequest) => Effect.Effect<void>;
     readonly respond?: () => Response;
+    readonly respondEffect?: Effect.Effect<Response>;
   }
 
   // Writes the launcher's durable state file into this test's baseDir with
@@ -285,11 +364,26 @@ describe("releaseManagedTunnelOnShutdown", () => {
       );
     });
 
+  // Writes the marker the desktop app leaves just before it stops its backend
+  // to install an update, and returns when it was written.
+  const writeDesktopUpdateRestartMarker = Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const config = yield* ServerConfigModule.ServerConfig;
+    const runtimeDir = path.join(config.baseDir, "runtime");
+    const markerPath = path.join(runtimeDir, DESKTOP_UPDATE_RESTART_MARKER_FILE);
+    yield* fs.makeDirectory(runtimeDir, { recursive: true });
+    yield* fs.writeFileString(markerPath, "");
+    const { mtime } = yield* fs.stat(markerPath);
+    return Option.getOrThrow(mtime).getTime();
+  });
+
   const provideReleaseHarness =
     (harness: ReleaseHarness) =>
     <A, E, R>(effect: Effect.Effect<A, E, R>) =>
       effect.pipe(
         Effect.provideService(ServerSecretStore.ServerSecretStore, harness.store),
+        Effect.provideService(AgentAwarenessRelay.AgentAwarenessRelay, idleAwarenessRelay),
         Effect.provideService(
           ServerEnvironment.ServerEnvironment,
           ServerEnvironment.ServerEnvironment.of({
@@ -303,10 +397,19 @@ describe("releaseManagedTunnelOnShutdown", () => {
             applyConfig: (config) =>
               Effect.sync(() => {
                 harness.applyConfigCalls.push(config);
-                return {
-                  status: "disabled",
-                } satisfies ManagedEndpointRuntime.CloudManagedEndpointRuntimeStatus;
+                return config === null
+                  ? ({
+                      status: "disabled",
+                    } satisfies ManagedEndpointRuntime.CloudManagedEndpointRuntimeStatus)
+                  : ({
+                      status: "running",
+                      providerKind: "cloudflare_tunnel",
+                      pid: 123,
+                    } satisfies ManagedEndpointRuntime.CloudManagedEndpointRuntimeStatus);
               }),
+            recoveryRequests: Stream.empty,
+            requestRecovery: () => Effect.void,
+            withLinkStateLock: (effect) => effect,
           }),
         ),
         Effect.provideService(
@@ -317,7 +420,7 @@ describe("releaseManagedTunnelOnShutdown", () => {
           CliTokenManager.CloudCliTokenManager,
           CliTokenManager.CloudCliTokenManager.of({
             get: unusedSecretStoreOperation(),
-            getExisting: Effect.succeed(Option.some(cliToken)),
+            getExisting: Effect.succeedSome(cliToken),
             hasCredential: unusedSecretStoreOperation(),
             store: () => unusedSecretStoreOperation(),
             clear: unusedSecretStoreOperation(),
@@ -328,11 +431,14 @@ describe("releaseManagedTunnelOnShutdown", () => {
           HttpClient.make((request) =>
             Effect.sync(() => {
               harness.requests.push(request);
-              return HttpClientResponse.fromWeb(
-                request,
-                (harness.respond ?? (() => Response.json({ ok: true })))(),
-              );
-            }),
+            }).pipe(
+              Effect.andThen(harness.onRequest?.(request) ?? Effect.void),
+              Effect.andThen(
+                harness.respondEffect ??
+                  Effect.sync(() => (harness.respond ?? (() => Response.json({ ok: true })))()),
+              ),
+              Effect.map((response) => HttpClientResponse.fromWeb(request, response)),
+            ),
           ),
         ),
         // The release consults the launcher state file under the configured
@@ -348,10 +454,27 @@ describe("releaseManagedTunnelOnShutdown", () => {
   // The persisted state of a CLI-managed link whose tunnel is releasable.
   const managedLinkSecrets = [
     [CLOUD_ENDPOINT_RUNTIME_CONFIG, "runtime-config"],
+    [CLOUD_ENDPOINT_CONFIRMED_ORIGIN, "confirmed-origin"],
     [RELAY_URL_SECRET, "https://relay.example.test"],
     [CLOUD_CLI_DESIRED_LINK_SECRET, "managed"],
   ] as const;
 
+  it.effect("does not recreate a link that was unlinked while startup registration retried", () => {
+    const { store, values } = makeMemorySecretStore(managedLinkSecrets);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      // Registration started while this marker existed. Unlink removes it
+      // before startup receives the relay's final not_linked response.
+      values.delete(CLOUD_CLI_DESIRED_LINK_SECRET);
+
+      expect(yield* reconcileDesiredCloudLinkIfStillDesired("http://127.0.0.1:3773")).toBeNull();
+      expect(requests).toEqual([]);
+      expect(applyConfigCalls).toEqual([]);
+    }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+  });
+
   it.effect("stops the connector, releases the relay tunnel, and drops the dead token", () => {
     const { store, values } = makeMemorySecretStore(managedLinkSecrets);
     const applyConfigCalls: Array<unknown> = [];
@@ -370,6 +493,7 @@ describe("releaseManagedTunnelOnShutdown", () => {
       );
       expect(request.headers.authorization).toBe("Bearer cli-access-token");
       expect(values.has(CLOUD_ENDPOINT_RUNTIME_CONFIG)).toBe(false);
+      expect(values.has(CLOUD_ENDPOINT_CONFIRMED_ORIGIN)).toBe(false);
     }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
   });
 
@@ -454,6 +578,38 @@ describe("releaseManagedTunnelOnShutdown", () => {
     }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
   });
 
+  it.effect("keeps the tunnel once when the desktop app restarts it for an update", () => {
+    const { store, values } = makeMemorySecretStore(managedLinkSecrets);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(yield* writeDesktopUpdateRestartMarker);
+
+      expect(yield* releaseManagedTunnelOnShutdown()).toBe(false);
+      expect(requests).toEqual([]);
+      expect(values.has(CLOUD_ENDPOINT_RUNTIME_CONFIG)).toBe(true);
+
+      // The shutdown consumed the marker, so a later quit releases the tunnel.
+      expect(yield* releaseManagedTunnelOnShutdown()).toBe(true);
+      expect(requests).toHaveLength(1);
+    }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+  });
+
+  it.effect("releases the tunnel when the desktop update marker is stale", () => {
+    const { store } = makeMemorySecretStore(managedLinkSecrets);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      const writtenAt = yield* writeDesktopUpdateRestartMarker;
+      yield* TestClock.setTime(writtenAt + Duration.toMillis(Duration.minutes(2)));
+
+      expect(yield* releaseManagedTunnelOnShutdown()).toBe(true);
+      expect(requests).toHaveLength(1);
+    }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+  });
+
   it.effect("still releases a pending update when the launcher is stopping", () => {
     // `t3 service uninstall` or `systemctl stop` during the pending window:
     // the launcher writes its stop marker before signalling the child, so no
@@ -579,6 +735,501 @@ describe("releaseManagedTunnelOnShutdown", () => {
       }),
     );
   });
+
+  it.effect("registers an existing tunnel and starts the confirmed connector", () => {
+    const { store } = makeMemorySecretStore([
+      [
+        CLOUD_ENDPOINT_RUNTIME_CONFIG,
+        '{"providerKind":"cloudflare_tunnel","connectorToken":"existing-token","tunnelId":"existing-tunnel"}',
+      ],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+      [CLOUD_LINKED_USER_ID, "user-123"],
+      [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      expect(yield* registerManagedCloudTunnelRecovery("http://127.0.0.1:3773")).toMatchObject({
+        status: "ready",
+      });
+      expect(requests).toHaveLength(1);
+      expect(requests[0]?.method).toBe("POST");
+      expect(requests[0]?.url).toBe(
+        "https://relay.example.test/v1/environments/env_123/tunnel/recovery",
+      );
+      expect(requests[0]?.headers.authorization).toBe("Bearer environment-credential");
+      const body = requests[0]?.body;
+      expect(body?._tag).toBe("Uint8Array");
+      if (body?._tag === "Uint8Array") {
+        expect(
+          yield* decodeManagedTunnelRecoveryRegistration(new TextDecoder().decode(body.body)),
+        ).toMatchObject({
+          cloudUserId: "user-123",
+          tunnelId: "existing-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        });
+      }
+      expect(applyConfigCalls).toHaveLength(1);
+    }).pipe(
+      provideReleaseHarness({
+        store,
+        applyConfigCalls,
+        requests,
+        respond: () => Response.json({ status: "ready" }),
+      }),
+    );
+  });
+
+  it.effect("reconciles a changed port after a relay outage outlasts the startup fallback", () => {
+    const config = {
+      providerKind: "cloudflare_tunnel" as const,
+      connectorToken: "existing-token",
+      tunnelId: "existing-tunnel",
+    };
+    const { store } = makeMemorySecretStore([
+      [CLOUD_ENDPOINT_RUNTIME_CONFIG, JSON.stringify(config)],
+      [
+        CLOUD_ENDPOINT_CONFIRMED_ORIGIN,
+        JSON.stringify({
+          config,
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      ],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+      [CLOUD_LINKED_USER_ID, "user-123"],
+      [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+    let relayAvailable = false;
+    const localOrigin = "http://127.0.0.1:4884";
+
+    return Effect.gen(function* () {
+      const fallbackStarted = yield* Deferred.make<void>();
+      const firstFailure = yield* Deferred.make<void>();
+      expect(yield* startManagedCloudTunnelIfOriginConfirmed(localOrigin)).toBe(false);
+      const registration = yield* Effect.forkChild(
+        retryManagedTunnelRegistration(
+          registerManagedCloudTunnelRecovery(localOrigin).pipe(
+            Effect.tapError(() => Deferred.succeed(firstFailure, undefined)),
+          ),
+          shouldRetryCloudLink,
+          startManagedCloudTunnelIfOriginConfirmed(localOrigin, {
+            requireConfirmedOrigin: false,
+          }).pipe(
+            Effect.orDie,
+            Effect.tap((started) => {
+              expect(started).toBe(true);
+              return Deferred.succeed(fallbackStarted, undefined);
+            }),
+            Effect.asVoid,
+          ),
+        ),
+        { startImmediately: true },
+      );
+      yield* Deferred.await(firstFailure);
+      yield* TestClock.adjust("15 minutes");
+      yield* Effect.raceFirst(
+        Deferred.await(fallbackStarted),
+        Fiber.join(registration).pipe(
+          Effect.andThen(Effect.die("Registration ended before starting the fallback")),
+        ),
+      );
+      expect(applyConfigCalls).toEqual([config]);
+      const attemptsBeforeRecovery = requests.length;
+
+      relayAvailable = true;
+      yield* TestClock.adjust("1 minute");
+      expect(yield* Fiber.join(registration)).toMatchObject({ status: "ready" });
+      expect(requests.length).toBeGreaterThan(attemptsBeforeRecovery);
+      const marker = yield* store.get(CLOUD_ENDPOINT_CONFIRMED_ORIGIN);
+      expect(Option.isSome(marker)).toBe(true);
+      if (Option.isSome(marker)) {
+        expect(
+          Option.getOrThrow(decodeConfirmedOrigin(new TextDecoder().decode(marker.value))),
+        ).toEqual({
+          config,
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 4884 },
+        });
+      }
+    }).pipe(
+      provideReleaseHarness({
+        store,
+        applyConfigCalls,
+        requests,
+        respond: () =>
+          relayAvailable
+            ? Response.json({ status: "ready" })
+            : Response.json({ message: "relay unavailable" }, { status: 503 }),
+      }),
+    );
+  });
+
+  it.effect(
+    "starts a connector with a marker for the current origin without contacting relay",
+    () => {
+      const configJson =
+        '{"providerKind":"cloudflare_tunnel","connectorToken":"existing-token","tunnelId":"existing-tunnel"}';
+      const config = {
+        providerKind: "cloudflare_tunnel" as const,
+        connectorToken: "existing-token",
+        tunnelId: "existing-tunnel",
+      };
+      const { store } = makeMemorySecretStore([
+        [CLOUD_ENDPOINT_RUNTIME_CONFIG, configJson],
+        [
+          CLOUD_ENDPOINT_CONFIRMED_ORIGIN,
+          `{"config":${configJson},"origin":{"localHttpHost":"127.0.0.1","localHttpPort":3773}}`,
+        ],
+      ]);
+      const applyConfigCalls: Array<unknown> = [];
+      const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+      return Effect.gen(function* () {
+        expect(yield* startManagedCloudTunnelIfOriginConfirmed("http://127.0.0.1:3773")).toBe(true);
+        expect(applyConfigCalls).toEqual([config]);
+        expect(requests).toEqual([]);
+      }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+    },
+  );
+
+  it.effect.each([
+    { name: "missing", marker: undefined, origin: "http://127.0.0.1:3773" },
+    {
+      name: "stale",
+      marker:
+        '{"config":{"providerKind":"cloudflare_tunnel","connectorToken":"existing-token","tunnelId":"existing-tunnel"},"origin":{"localHttpHost":"127.0.0.1","localHttpPort":3773}}',
+      origin: "http://127.0.0.1:4884",
+    },
+  ])("does not start a connector with a $name origin marker", ({ marker, origin }) => {
+    const entries: Array<readonly [string, string]> = [
+      [
+        CLOUD_ENDPOINT_RUNTIME_CONFIG,
+        '{"providerKind":"cloudflare_tunnel","connectorToken":"existing-token","tunnelId":"existing-tunnel"}',
+      ],
+    ];
+    if (marker !== undefined) entries.push([CLOUD_ENDPOINT_CONFIRMED_ORIGIN, marker]);
+    const { store } = makeMemorySecretStore(entries);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      expect(yield* startManagedCloudTunnelIfOriginConfirmed(origin)).toBe(false);
+      expect(applyConfigCalls).toEqual([]);
+      expect(requests).toEqual([]);
+    }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+  });
+
+  it.effect(
+    "starts the stored connector without a marker when confirmation is not required",
+    () => {
+      const config = {
+        providerKind: "cloudflare_tunnel" as const,
+        connectorToken: "existing-token",
+        tunnelId: "existing-tunnel",
+      };
+      const { store } = makeMemorySecretStore([
+        [CLOUD_ENDPOINT_RUNTIME_CONFIG, JSON.stringify(config)],
+      ]);
+      const applyConfigCalls: Array<unknown> = [];
+      const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+      return Effect.gen(function* () {
+        expect(
+          yield* startManagedCloudTunnelIfOriginConfirmed("http://127.0.0.1:3773", {
+            requireConfirmedOrigin: false,
+          }),
+        ).toBe(true);
+        expect(applyConfigCalls).toEqual([config]);
+        expect(requests).toEqual([]);
+      }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+    },
+  );
+
+  it.effect.each(["replaced", "removed"] as const)(
+    "does not activate a tunnel when its runtime config is %s during registration",
+    (mutation) => {
+      const originalConfig =
+        '{"providerKind":"cloudflare_tunnel","connectorToken":"existing-token","tunnelId":"existing-tunnel"}';
+      const { store, values } = makeMemorySecretStore([
+        [CLOUD_ENDPOINT_RUNTIME_CONFIG, originalConfig],
+        [RELAY_URL_SECRET, "https://relay.example.test"],
+        [CLOUD_LINKED_USER_ID, "user-123"],
+        [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+      ]);
+      const applyConfigCalls: Array<unknown> = [];
+      const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+      return Effect.gen(function* () {
+        expect(yield* registerManagedCloudTunnelRecovery("http://127.0.0.1:3773")).toEqual({
+          status: "superseded",
+        });
+        expect(applyConfigCalls).toEqual([]);
+        expect(values.has(CLOUD_ENDPOINT_CONFIRMED_ORIGIN)).toBe(false);
+      }).pipe(
+        provideReleaseHarness({
+          store,
+          applyConfigCalls,
+          requests,
+          respond: () => {
+            if (mutation === "replaced") {
+              values.set(
+                CLOUD_ENDPOINT_RUNTIME_CONFIG,
+                new TextEncoder().encode(
+                  '{"providerKind":"cloudflare_tunnel","connectorToken":"fresh-token","tunnelId":"fresh-tunnel"}',
+                ),
+              );
+            } else {
+              values.delete(CLOUD_ENDPOINT_RUNTIME_CONFIG);
+            }
+            return Response.json({ status: "ready" });
+          },
+        }),
+      );
+    },
+  );
+
+  it.effect("requests startup recovery for a legacy config without a recorded tunnel ID", () => {
+    const { store } = makeMemorySecretStore([
+      [
+        CLOUD_ENDPOINT_RUNTIME_CONFIG,
+        '{"providerKind":"cloudflare_tunnel","connectorToken":"token"}',
+      ],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+      [CLOUD_LINKED_USER_ID, "user-123"],
+      [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      const registration = yield* registerManagedCloudTunnelRecovery("http://127.0.0.1:3773");
+      expect(registration).toEqual({
+        status: "recovery_required",
+        config: { providerKind: "cloudflare_tunnel", connectorToken: "token" },
+      });
+      expect(
+        managedTunnelStartupAction({
+          wantsCliLink: false,
+          registration,
+        }),
+      ).toEqual({
+        action: "request_recovery",
+        config: { providerKind: "cloudflare_tunnel", connectorToken: "token" },
+      });
+      expect(requests).toEqual([]);
+      expect(applyConfigCalls).toEqual([]);
+    }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+  });
+
+  it.effect("recovers a web-linked tunnel with its environment credential", () => {
+    const oldConfig =
+      '{"providerKind":"cloudflare_tunnel","connectorToken":"old-token","tunnelId":"old-tunnel"}';
+    const nextConfig = {
+      providerKind: "cloudflare_tunnel",
+      connectorToken: "new-token",
+      tunnelId: "new-tunnel",
+    } as const;
+    const { store, values } = makeMemorySecretStore([
+      [CLOUD_ENDPOINT_RUNTIME_CONFIG, oldConfig],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+      [CLOUD_LINKED_USER_ID, "user-123"],
+      [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      expect(yield* recoverManagedCloudTunnel("http://127.0.0.1:3773")).toBe(true);
+      expect(requests).toHaveLength(1);
+      expect(requests[0]?.method).toBe("POST");
+      expect(requests[0]?.url).toBe("https://relay.example.test/v1/environments/env_123/tunnel");
+      expect(requests[0]?.headers.authorization).toBe("Bearer environment-credential");
+      expect(applyConfigCalls).toEqual([nextConfig]);
+      expect(
+        Option.getOrNull(
+          decodeRuntimeConfig(new TextDecoder().decode(values.get(CLOUD_ENDPOINT_RUNTIME_CONFIG))),
+        ),
+      ).toEqual(nextConfig);
+    }).pipe(
+      provideReleaseHarness({
+        store,
+        applyConfigCalls,
+        requests,
+        respond: () =>
+          Response.json({
+            endpoint: {
+              httpBaseUrl: "https://environment.example.test/",
+              wsBaseUrl: "wss://environment.example.test/ws",
+              providerKind: "cloudflare_tunnel",
+            },
+            endpointRuntime: nextConfig,
+          }),
+      }),
+    );
+  });
+
+  it.effect("allows managed tunnel provisioning to take longer than ten seconds", () =>
+    Effect.gen(function* () {
+      const oldConfig =
+        '{"providerKind":"cloudflare_tunnel","connectorToken":"old-token","tunnelId":"old-tunnel"}';
+      const nextConfig = {
+        providerKind: "cloudflare_tunnel" as const,
+        connectorToken: "new-token",
+        tunnelId: "new-tunnel",
+      };
+      const { store } = makeMemorySecretStore([
+        [CLOUD_ENDPOINT_RUNTIME_CONFIG, oldConfig],
+        [RELAY_URL_SECRET, "https://relay.example.test"],
+        [CLOUD_LINKED_USER_ID, "user-123"],
+        [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+      ]);
+      const applyConfigCalls: Array<unknown> = [];
+      const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+      const requestStarted = yield* Deferred.make<void>();
+      const response = yield* Deferred.make<Response>();
+      const recovery = yield* recoverManagedCloudTunnel("http://127.0.0.1:3773").pipe(
+        provideReleaseHarness({
+          store,
+          applyConfigCalls,
+          requests,
+          onRequest: () => Deferred.succeed(requestStarted, undefined),
+          respondEffect: Deferred.await(response),
+        }),
+        Effect.forkChild({ startImmediately: true }),
+      );
+
+      yield* Deferred.await(requestStarted);
+      expect(requests).toHaveLength(1);
+      yield* TestClock.adjust("11 seconds");
+      yield* Effect.yieldNow;
+      yield* Deferred.succeed(
+        response,
+        Response.json({
+          endpoint: {
+            httpBaseUrl: "https://environment.example.test/",
+            wsBaseUrl: "wss://environment.example.test/ws",
+            providerKind: "cloudflare_tunnel",
+          },
+          endpointRuntime: nextConfig,
+        }),
+      );
+
+      expect(yield* Fiber.join(recovery)).toBe(true);
+      expect(requests).toHaveLength(1);
+      expect(applyConfigCalls).toEqual([nextConfig]);
+    }),
+  );
+
+  it.effect("does not recover an environment without a managed tunnel credential", () => {
+    const { store } = makeMemorySecretStore([
+      [CLOUD_ENDPOINT_RUNTIME_CONFIG, "old-config"],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      expect(yield* recoverManagedCloudTunnel("http://127.0.0.1:3773")).toBe(false);
+      expect(applyConfigCalls).toEqual([]);
+      expect(requests).toEqual([]);
+    }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+  });
+
+  it.effect("ignores recovery requests for a tunnel that has already been replaced", () => {
+    const { store } = makeMemorySecretStore([
+      [
+        CLOUD_ENDPOINT_RUNTIME_CONFIG,
+        '{"providerKind":"cloudflare_tunnel","connectorToken":"current-token","tunnelId":"current-tunnel"}',
+      ],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+      [CLOUD_LINKED_USER_ID, "user-123"],
+      [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      expect(
+        yield* recoverManagedCloudTunnel("http://127.0.0.1:3773", {
+          providerKind: "cloudflare_tunnel",
+          connectorToken: "old-token",
+          tunnelId: "old-tunnel",
+        }),
+      ).toBe(false);
+      expect(requests).toEqual([]);
+      expect(applyConfigCalls).toEqual([]);
+    }).pipe(provideReleaseHarness({ store, applyConfigCalls, requests }));
+  });
+
+  it.effect.each([
+    { status: 401, errorTag: "EnvironmentHttpUnauthorizedError" },
+    { status: 403, errorTag: "EnvironmentHttpForbiddenError" },
+    { status: 409, errorTag: "EnvironmentHttpBadRequestError" },
+  ])("preserves a permanent $status relay recovery failure", ({ status, errorTag }) => {
+    const { store } = makeMemorySecretStore([
+      [CLOUD_ENDPOINT_RUNTIME_CONFIG, "old-config"],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+      [CLOUD_LINKED_USER_ID, "user-123"],
+      [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+
+    return Effect.gen(function* () {
+      const error = yield* Effect.flip(recoverManagedCloudTunnel("http://127.0.0.1:3773"));
+
+      expect(error._tag).toBe(errorTag);
+      expect(requests).toHaveLength(1);
+      expect(applyConfigCalls).toEqual([]);
+    }).pipe(
+      provideReleaseHarness({
+        store,
+        applyConfigCalls,
+        requests,
+        respond: () => Response.json({}, { status }),
+      }),
+    );
+  });
+
+  it.effect("keeps a tunnel configuration replaced during recovery", () => {
+    const { store, values } = makeMemorySecretStore([
+      [CLOUD_ENDPOINT_RUNTIME_CONFIG, "old-config"],
+      [RELAY_URL_SECRET, "https://relay.example.test"],
+      [CLOUD_LINKED_USER_ID, "user-123"],
+      [RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "environment-credential"],
+    ]);
+    const applyConfigCalls: Array<unknown> = [];
+    const requests: Array<HttpClientRequest.HttpClientRequest> = [];
+    const freshConfig = new TextEncoder().encode("fresh-config");
+
+    return Effect.gen(function* () {
+      expect(yield* recoverManagedCloudTunnel("http://127.0.0.1:3773")).toBe(false);
+      expect(values.get(CLOUD_ENDPOINT_RUNTIME_CONFIG)).toBe(freshConfig);
+      expect(applyConfigCalls).toEqual([]);
+    }).pipe(
+      provideReleaseHarness({
+        store,
+        applyConfigCalls,
+        requests,
+        respond: () => {
+          values.set(CLOUD_ENDPOINT_RUNTIME_CONFIG, freshConfig);
+          return Response.json({
+            endpoint: {
+              httpBaseUrl: "https://environment.example.test/",
+              wsBaseUrl: "wss://environment.example.test/ws",
+              providerKind: "cloudflare_tunnel",
+            },
+            endpointRuntime: {
+              providerKind: "cloudflare_tunnel",
+              connectorToken: "replacement-token",
+            },
+          });
+        },
+      }),
+    );
+  });
 });
 
 describe("link proof provider kinds", () => {
diff --git a/apps/server/src/cloud/http.ts b/apps/server/src/cloud/http.ts
index e0d458b4b97c..a7e3de8c7283 100644
--- a/apps/server/src/cloud/http.ts
+++ b/apps/server/src/cloud/http.ts
@@ -11,6 +11,7 @@ import {
   EnvironmentHttpConflictError,
   EnvironmentHttpInternalServerError,
   EnvironmentHttpUnauthorizedError,
+  DESKTOP_UPDATE_RESTART_MARKER_FILE,
 } from "@t3tools/contracts";
 import {
   RelayCloudEnvironmentHealthProofPayload,
@@ -28,6 +29,10 @@ import {
   RelayEnvironmentLinkProofPayload,
   RelayLinkProofRequest,
   RelayManagedEndpointOrigin,
+  RelayManagedEndpointRecoveryProofPayload,
+  RelayManagedEndpointRecoveryRegistrationResponse,
+  RelayManagedEndpointRecoveryResponse,
+  type RelayManagedEndpointRuntimeConfig,
   RelayOkResponse,
 } from "@t3tools/contracts/relay";
 import { withRelayClientTracing } from "@t3tools/shared/relayTracing";
@@ -36,12 +41,14 @@ import {
   RELAY_HEALTH_REQUEST_TYP,
   RELAY_HEALTH_RESPONSE_TYP,
   RELAY_LINK_PROOF_TYP,
+  RELAY_MANAGED_TUNNEL_RECOVERY_TYP,
   RELAY_MINT_REQUEST_TYP,
   RELAY_MINT_RESPONSE_TYP,
   signRelayJwt,
   verifyRelayJwt,
 } from "@t3tools/shared/relayJwt";
 import { isSecureRelayUrl } from "@t3tools/shared/relayUrl";
+import * as Clock from "effect/Clock";
 import * as DateTime from "effect/DateTime";
 import * as Crypto from "effect/Crypto";
 import * as Duration from "effect/Duration";
@@ -50,16 +57,19 @@ import * as FileSystem from "effect/FileSystem";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
+import * as Schedule from "effect/Schedule";
 import * as HttpEffect from "effect/unstable/http/HttpEffect";
 import { HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
 import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
 import * as HttpApiBuilder from "effect/unstable/httpapi/HttpApiBuilder";
+import * as HttpServer from "effect/unstable/http/HttpServer";
 
 import * as EnvironmentAuth from "../auth/EnvironmentAuth.ts";
 import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
 import { requireEnvironmentScope } from "../auth/http.ts";
 import * as ServerConfig from "../config.ts";
 import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
+import * as AgentAwarenessRelay from "../relay/AgentAwarenessRelay.ts";
 import * as ManagedEndpointRuntime from "./ManagedEndpointRuntime.ts";
 import {
   SERVICE_STATE_FILE,
@@ -68,9 +78,13 @@ import {
 } from "./serviceProtocol.ts";
 import {
   CLOUD_ENDPOINT_RUNTIME_CONFIG,
+  CLOUD_ENDPOINT_CONFIRMED_ORIGIN,
+  decodeConfirmedOrigin,
   CLOUD_LINKED_USER_ID,
   CLOUD_MINT_PUBLIC_KEY,
+  decodeRuntimeConfig,
   encodeEndpointRuntimeConfigJson,
+  encodeConfirmedOriginJson,
   PUBLISH_AGENT_ACTIVITY_SECRET,
   RELAY_ENVIRONMENT_CREDENTIAL_SECRET,
   RELAY_ISSUER_SECRET,
@@ -85,14 +99,24 @@ import {
 import * as CliTokenManager from "./CliTokenManager.ts";
 import { getOrCreateEnvironmentKeyPairFromSecretStore } from "./environmentKeys.ts";
 import { traceRelayRequest } from "./traceRelayRequest.ts";
-import { filterRelayResponse, relayRequestError } from "./relayResponse.ts";
+import { filterRelayResponse, relayRequestError, shouldRetryCloudLink } from "./relayResponse.ts";
 
 const CLOUD_MINT_NONCE_PREFIX = "cloud-mint-nonce-";
 const CLOUD_MINT_JTI_PREFIX = "cloud-mint-jti-";
 const CLOUD_HEALTH_NONCE_PREFIX = "cloud-health-nonce-";
 const CLOUD_HEALTH_JTI_PREFIX = "cloud-health-jti-";
+/** Secret store name prefixes of cloud replay markers. The server prunes expired ones. */
+export const CLOUD_REPLAY_MARKER_PREFIXES = [
+  CLOUD_MINT_NONCE_PREFIX,
+  CLOUD_MINT_JTI_PREFIX,
+  CLOUD_HEALTH_NONCE_PREFIX,
+  CLOUD_HEALTH_JTI_PREFIX,
+] as const;
 const CLOUD_PROOF_MAX_LIFETIME_SECONDS = 5 * 60;
 const CLOUD_PROOF_CLOCK_SKEW_SECONDS = 60;
+// The desktop app stops its backends within seconds of writing the marker.
+const DESKTOP_UPDATE_RESTART_MARKER_TTL = Duration.minutes(1);
+const MANAGED_ENDPOINT_PROVISION_REQUEST_TIMEOUT = Duration.minutes(2);
 const LOOPBACK_HOSTNAMES = new Set(["127.0.0.1", "::1", "localhost"]);
 const CLOUD_CREDENTIAL_RESPONSE_HEADERS = {
   "cache-control": "no-store",
@@ -136,8 +160,9 @@ export function consumeCloudReplayGuards(input: {
   readonly names: ReadonlyArray<string>;
   readonly value: Uint8Array;
 }) {
-  return Effect.all(
-    input.names.map((name) =>
+  return Effect.forEach(
+    input.names,
+    (name) =>
       input.secrets.create(name, input.value).pipe(
         Effect.as(true),
         Effect.catchIf(ServerSecretStore.isSecretStoreError, (error) =>
@@ -146,7 +171,6 @@ export function consumeCloudReplayGuards(input: {
             : Effect.fail(error),
         ),
       ),
-    ),
     { concurrency: input.names.length },
   ).pipe(Effect.map((created) => created.every(Boolean)));
 }
@@ -297,6 +321,33 @@ function endpointRequestPort(url: URL): number {
   return Number(url.port || (url.protocol === "https:" ? 443 : 80));
 }
 
+export function parseManagedEndpointLocalOrigin(localOrigin: string) {
+  const url = new URL(localOrigin);
+  if (
+    localOrigin !== localOrigin.trim() ||
+    (url.protocol !== "http:" && url.protocol !== "https:") ||
+    url.username !== "" ||
+    url.password !== "" ||
+    url.pathname !== "/" ||
+    url.search !== "" ||
+    url.hash !== "" ||
+    localOrigin.includes("?") ||
+    localOrigin.includes("#")
+  ) {
+    throw new Error("Invalid local origin");
+  }
+  const wsUrl = new URL(url.origin);
+  wsUrl.protocol = url.protocol === "https:" ? "wss:" : "ws:";
+  return {
+    httpBaseUrl: url.origin,
+    wsBaseUrl: wsUrl.origin,
+    origin: {
+      localHttpHost: url.hostname,
+      localHttpPort: endpointRequestPort(url),
+    } satisfies RelayManagedEndpointOrigin,
+  };
+}
+
 function isAllowedEndpointOrigin(input: {
   readonly origin: RelayManagedEndpointOrigin;
   readonly requestUrl: string;
@@ -361,6 +412,7 @@ interface CloudHttpDependencies {
   readonly environmentAuth: EnvironmentAuth.EnvironmentAuth["Service"];
   readonly cliTokenManager: CliTokenManager.CloudCliTokenManager["Service"];
   readonly httpClient: HttpClient.HttpClient;
+  readonly awarenessRelay: AgentAwarenessRelay.AgentAwarenessRelay["Service"];
 }
 
 const cloudHttpDependencies = Effect.gen(function* () {
@@ -371,6 +423,7 @@ const cloudHttpDependencies = Effect.gen(function* () {
     environmentAuth: yield* EnvironmentAuth.EnvironmentAuth,
     cliTokenManager: yield* CliTokenManager.CloudCliTokenManager,
     httpClient: yield* HttpClient.HttpClient,
+    awarenessRelay: yield* AgentAwarenessRelay.AgentAwarenessRelay,
   } satisfies CloudHttpDependencies;
 });
 
@@ -451,55 +504,250 @@ const cloudLinkProofHandler = Effect.fn("environment.cloud.linkProof")(
   ),
 );
 
-const applyCloudRelayConfig = Effect.fn("environment.cloud.applyRelayConfig")(function* (
+function managedEndpointRuntimeConfigsMatch(
+  left: RelayManagedEndpointRuntimeConfig,
+  right: RelayManagedEndpointRuntimeConfig,
+): boolean {
+  return (
+    left.providerKind === right.providerKind &&
+    left.connectorToken === right.connectorToken &&
+    left.tunnelId === right.tunnelId &&
+    left.tunnelName === right.tunnelName
+  );
+}
+
+const activateManagedTunnel = Effect.fn("environment.cloud.activateManagedTunnel")(function* (
   dependencies: CloudHttpDependencies,
-  payload: RelayEnvironmentConfigRequest,
+  input: {
+    readonly config: RelayManagedEndpointRuntimeConfig;
+    readonly configJson: string;
+    readonly origin: RelayManagedEndpointOrigin;
+  },
 ) {
-  yield* validateRelayConfigPayload(payload);
-  yield* validateLinkedCloudUser({
-    secrets: dependencies.secrets,
-    cloudUserId: payload.cloudUserId,
+  return yield* dependencies.endpointRuntime.withLinkStateLock(
+    Effect.gen(function* () {
+      const currentConfig = yield* dependencies.secrets.get(CLOUD_ENDPOINT_RUNTIME_CONFIG);
+      if (Option.isNone(currentConfig) || bytesToString(currentConfig.value) !== input.configJson) {
+        return null;
+      }
+      const status = yield* dependencies.endpointRuntime.applyConfig(input.config);
+      if (status.status !== "running") {
+        return yield* new EnvironmentCloudEndpointUnavailableError({
+          message: "Managed endpoint runtime could not be started.",
+          endpointRuntimeStatus: status,
+        });
+      }
+      const marker = yield* encodeConfirmedOriginJson({
+        config: input.config,
+        origin: input.origin,
+      });
+      yield* dependencies.secrets.set(CLOUD_ENDPOINT_CONFIRMED_ORIGIN, stringToBytes(marker));
+      return status;
+    }),
+  );
+});
+
+const activateManagedTunnelWithRetry = (
+  dependencies: CloudHttpDependencies,
+  input: {
+    readonly config: RelayManagedEndpointRuntimeConfig;
+    readonly configJson: string;
+    readonly origin: RelayManagedEndpointOrigin;
+  },
+  retryRuntimeFailures: boolean,
+) => {
+  const activate = activateManagedTunnel(dependencies, input);
+  return retryRuntimeFailures
+    ? activate.pipe(
+        Effect.retry({
+          while: (error) =>
+            error._tag === "EnvironmentCloudEndpointUnavailableError" &&
+            ManagedEndpointRuntime.isRetryableManagedEndpointRuntimeStatus(
+              error.endpointRuntimeStatus,
+            ),
+          schedule: Schedule.exponential("1 second").pipe(
+            Schedule.modifyDelay(({ duration }) =>
+              Effect.succeed(Duration.min(duration, Duration.seconds(30))),
+            ),
+            Schedule.jittered,
+          ),
+        }),
+      )
+    : activate;
+};
+
+export const startManagedCloudTunnelIfOriginConfirmed = Effect.fn(
+  "environment.cloud.startManagedCloudTunnelIfOriginConfirmed",
+)(function* (localOrigin: string, options?: { readonly requireConfirmedOrigin?: boolean }) {
+  const dependencies = yield* cloudHttpDependencies;
+  const requireConfirmedOrigin = options?.requireConfirmedOrigin ?? true;
+  const parsedOrigin = yield* Effect.try({
+    try: () => parseManagedEndpointLocalOrigin(localOrigin),
+    catch: () =>
+      new EnvironmentHttpBadRequestError({
+        message: "Could not resolve local environment origin.",
+      }),
   });
-  yield* validateCloudMintPublicKey(payload.cloudMintPublicKey);
-  const endpointRuntimeStatus = yield* dependencies.endpointRuntime.applyConfig(
-    payload.endpointRuntime,
+  return yield* dependencies.endpointRuntime.withLinkStateLock(
+    Effect.gen(function* () {
+      const [runtimeBytes, markerBytes] = yield* Effect.all([
+        dependencies.secrets.get(CLOUD_ENDPOINT_RUNTIME_CONFIG),
+        dependencies.secrets.get(CLOUD_ENDPOINT_CONFIRMED_ORIGIN),
+      ]);
+      if (Option.isNone(runtimeBytes)) return false;
+      const config = Option.getOrNull(decodeRuntimeConfig(bytesToString(runtimeBytes.value)));
+      if (config === null || config.providerKind !== "cloudflare_tunnel") return false;
+      // With the marker required, only a config the relay already confirmed on
+      // this port may start. Without it, startup is falling back after the
+      // relay stayed unreachable: an unconfirmed origin may send traffic to a
+      // stale port, but that beats no remote access at all.
+      if (requireConfirmedOrigin) {
+        if (Option.isNone(markerBytes)) return false;
+        const marker = Option.getOrNull(decodeConfirmedOrigin(bytesToString(markerBytes.value)));
+        if (
+          marker === null ||
+          !managedEndpointRuntimeConfigsMatch(marker.config, config) ||
+          marker.origin.localHttpHost !== parsedOrigin.origin.localHttpHost ||
+          marker.origin.localHttpPort !== parsedOrigin.origin.localHttpPort
+        ) {
+          return false;
+        }
+      }
+      const status = yield* dependencies.endpointRuntime.applyConfig(config);
+      if (status.status !== "running") {
+        return yield* new EnvironmentCloudEndpointUnavailableError({
+          message: "Managed endpoint runtime could not be started.",
+          endpointRuntimeStatus: status,
+        });
+      }
+      return true;
+    }),
   );
-  const ok =
-    endpointRuntimeStatus.status === "disabled" || endpointRuntimeStatus.status === "running";
-  if (!ok) {
-    return yield* new EnvironmentCloudEndpointUnavailableError({
-      message: "Managed endpoint runtime could not be started.",
-      endpointRuntimeStatus,
+});
+
+const applyCloudRelayConfig = Effect.fn("environment.cloud.applyRelayConfig")(function* (
+  dependencies: CloudHttpDependencies,
+  payload: RelayEnvironmentConfigRequest,
+  options?: {
+    readonly lockHeld?: boolean;
+    readonly confirmedOrigin?: RelayManagedEndpointOrigin;
+  },
+) {
+  const apply = Effect.gen(function* () {
+    yield* validateRelayConfigPayload(payload);
+    yield* validateLinkedCloudUser({
+      secrets: dependencies.secrets,
+      cloudUserId: payload.cloudUserId,
     });
-  }
+    yield* validateCloudMintPublicKey(payload.cloudMintPublicKey);
+    // Reject unsupported runtimes before touching the connector so a bad
+    // payload cannot stop a healthy tunnel on its way to a 503.
+    if (
+      payload.endpointRuntime !== null &&
+      payload.endpointRuntime.providerKind !== "cloudflare_tunnel"
+    ) {
+      return yield* new EnvironmentCloudEndpointUnavailableError({
+        message: "Managed endpoint runtime could not be started.",
+        endpointRuntimeStatus: {
+          status: "unsupported",
+          providerKind: payload.endpointRuntime.providerKind,
+        },
+      });
+    }
+    yield* dependencies.endpointRuntime.applyConfig(null);
+    yield* dependencies.secrets.remove(CLOUD_ENDPOINT_CONFIRMED_ORIGIN);
 
-  yield* dependencies.secrets.set(RELAY_URL_SECRET, stringToBytes(payload.relayUrl));
-  yield* dependencies.secrets.set(
-    RELAY_ISSUER_SECRET,
-    stringToBytes(payload.relayIssuer ?? payload.relayUrl),
-  );
-  yield* dependencies.secrets.set(CLOUD_LINKED_USER_ID, stringToBytes(payload.cloudUserId));
-  yield* dependencies.secrets.set(
-    RELAY_ENVIRONMENT_CREDENTIAL_SECRET,
-    stringToBytes(payload.environmentCredential),
-  );
-  yield* dependencies.secrets.set(CLOUD_MINT_PUBLIC_KEY, stringToBytes(payload.cloudMintPublicKey));
-  if (payload.endpointRuntime) {
-    const endpointRuntimeJson = yield* encodeEndpointRuntimeConfigJson(payload.endpointRuntime);
+    yield* dependencies.secrets.set(RELAY_URL_SECRET, stringToBytes(payload.relayUrl));
     yield* dependencies.secrets.set(
-      CLOUD_ENDPOINT_RUNTIME_CONFIG,
-      stringToBytes(endpointRuntimeJson),
+      RELAY_ISSUER_SECRET,
+      stringToBytes(payload.relayIssuer ?? payload.relayUrl),
     );
-  } else {
-    yield* dependencies.secrets.remove(CLOUD_ENDPOINT_RUNTIME_CONFIG);
-  }
-  return { ok, endpointRuntimeStatus } satisfies EnvironmentCloudRelayConfigResult;
+    yield* dependencies.secrets.set(CLOUD_LINKED_USER_ID, stringToBytes(payload.cloudUserId));
+    yield* dependencies.secrets.set(
+      RELAY_ENVIRONMENT_CREDENTIAL_SECRET,
+      stringToBytes(payload.environmentCredential),
+    );
+    yield* dependencies.secrets.set(
+      CLOUD_MINT_PUBLIC_KEY,
+      stringToBytes(payload.cloudMintPublicKey),
+    );
+    yield* dependencies.awarenessRelay.requestCatchUp();
+    if (payload.endpointRuntime) {
+      const endpointRuntimeJson = yield* encodeEndpointRuntimeConfigJson(payload.endpointRuntime);
+      yield* dependencies.secrets.set(
+        CLOUD_ENDPOINT_RUNTIME_CONFIG,
+        stringToBytes(endpointRuntimeJson),
+      );
+    } else {
+      yield* dependencies.secrets.remove(CLOUD_ENDPOINT_RUNTIME_CONFIG);
+    }
+    if (payload.endpointRuntime === null || options?.confirmedOrigin === undefined) {
+      return {
+        ok: true,
+        endpointRuntimeStatus: { status: "disabled" },
+      } satisfies EnvironmentCloudRelayConfigResult;
+    }
+    const endpointRuntimeStatus = yield* dependencies.endpointRuntime.applyConfig(
+      payload.endpointRuntime,
+    );
+    if (endpointRuntimeStatus.status !== "running") {
+      return yield* new EnvironmentCloudEndpointUnavailableError({
+        message: "Managed endpoint runtime could not be started.",
+        endpointRuntimeStatus,
+      });
+    }
+    const marker = yield* encodeConfirmedOriginJson({
+      config: payload.endpointRuntime,
+      origin: options.confirmedOrigin,
+    });
+    yield* dependencies.secrets.set(CLOUD_ENDPOINT_CONFIRMED_ORIGIN, stringToBytes(marker));
+    return { ok: true, endpointRuntimeStatus } satisfies EnvironmentCloudRelayConfigResult;
+  });
+  return yield* options?.lockHeld ? apply : dependencies.endpointRuntime.withLinkStateLock(apply);
 });
 
 const cloudRelayConfigHandler = Effect.fn("environment.cloud.relayConfig")(
   function* (dependencies: CloudHttpDependencies, payload: RelayEnvironmentConfigRequest) {
     yield* requireEnvironmentScope(AuthRelayWriteScope);
-    return yield* applyCloudRelayConfig(dependencies, payload);
+    const result = yield* applyCloudRelayConfig(dependencies, payload);
+    if (payload.endpointRuntime?.providerKind === "cloudflare_tunnel") {
+      const server = yield* HttpServer.HttpServer;
+      const address = server.address;
+      if (typeof address === "string" || !("port" in address)) {
+        return yield* new EnvironmentHttpInternalServerError({
+          message: "Could not resolve the local server origin.",
+        });
+      }
+      const registration = yield* registerManagedCloudTunnelRecovery(
+        `http://127.0.0.1:${address.port}`,
+      ).pipe(
+        Effect.retry({
+          times: 2,
+          while: (error) =>
+            shouldRetryCloudLink(error) &&
+            error._tag !== "EnvironmentCloudEndpointUnavailableError",
+        }),
+      );
+      if (registration.status === "superseded") {
+        return yield* new EnvironmentHttpConflictError({
+          message: "The managed tunnel configuration changed during registration.",
+        });
+      }
+      if (registration.status === "recovery_required") {
+        yield* dependencies.endpointRuntime.requestRecovery(registration.config);
+      }
+      if (registration.status !== "ready") {
+        return yield* new EnvironmentCloudEndpointUnavailableError({
+          message: "Managed endpoint origin could not be confirmed.",
+          endpointRuntimeStatus: { status: "disabled" },
+        });
+      }
+      return {
+        ok: true,
+        endpointRuntimeStatus: registration.endpointRuntimeStatus,
+      } satisfies EnvironmentCloudRelayConfigResult;
+    }
+    return result;
   },
   Effect.catchIf(EnvironmentAuth.isServerAuthInternalError, (error) =>
     failEnvironmentCloudInternalError(error.message)(error),
@@ -508,10 +756,14 @@ const cloudRelayConfigHandler = Effect.fn("environment.cloud.relayConfig")(
     ServerSecretStore.isSecretStoreError,
     failEnvironmentCloudInternalError("Could not persist environment relay configuration."),
   ),
-  Effect.catchTag(
-    "SchemaError",
-    failEnvironmentCloudInternalError("Could not persist environment relay configuration."),
-  ),
+  Effect.catchTags({
+    SchemaError: failEnvironmentCloudInternalError(
+      "Could not persist environment relay configuration.",
+    ),
+    PlatformError: failEnvironmentCloudInternalError(
+      "Could not register the managed endpoint origin.",
+    ),
+  }),
 );
 
 const relayClientRequest = <A>(
@@ -521,6 +773,7 @@ const relayClientRequest = <A>(
     readonly token: string;
     readonly payload: unknown;
     readonly schema: Schema.Decoder<A>;
+    readonly timeout?: Duration.Input;
   },
 ) =>
   HttpClientRequest.post(input.url).pipe(
@@ -529,25 +782,20 @@ const relayClientRequest = <A>(
     Effect.flatMap(dependencies.httpClient.execute),
     Effect.flatMap(filterRelayResponse),
     Effect.flatMap(HttpClientResponse.schemaBodyJson(input.schema)),
+    Effect.timeout(input.timeout ?? "10 seconds"),
     Effect.mapError(relayRequestError),
     withRelayClientTracing,
   );
 
 const reconcileDesiredCloudLinkWith = Effect.fn("environment.cloud.reconcileDesiredLinkWith")(
   function* (dependencies: CloudHttpDependencies, localOrigin: string) {
-    const localUrl = yield* Effect.try({
-      try: () => new URL(localOrigin),
+    const parsedOrigin = yield* Effect.try({
+      try: () => parseManagedEndpointLocalOrigin(localOrigin),
       catch: () =>
         new EnvironmentHttpBadRequestError({
           message: "Could not resolve local environment origin.",
         }),
     });
-    if (localUrl.origin !== localOrigin) {
-      return yield* new EnvironmentHttpBadRequestError({
-        message: "Could not resolve local environment origin.",
-      });
-    }
-    const localWsOrigin = localOrigin.replace(/^http/u, "ws");
     const token = yield* dependencies.cliTokenManager.getExisting.pipe(
       Effect.flatMap(
         Option.match({
@@ -580,16 +828,13 @@ const reconcileDesiredCloudLinkWith = Effect.fn("environment.cloud.reconcileDesi
         challenge: challenge.challenge,
         relayIssuer: relayUrl,
         endpoint: {
-          httpBaseUrl: localOrigin,
-          wsBaseUrl: localWsOrigin,
+          httpBaseUrl: parsedOrigin.httpBaseUrl,
+          wsBaseUrl: parsedOrigin.wsBaseUrl,
           providerKind: managedTunnelsEnabled ? "cloudflare_tunnel" : "manual",
         },
-        origin: {
-          localHttpHost: localUrl.hostname,
-          localHttpPort: endpointRequestPort(localUrl),
-        },
+        origin: parsedOrigin.origin,
       },
-      localOrigin,
+      parsedOrigin.httpBaseUrl,
     );
     const link = yield* relayClientRequest(dependencies, {
       url: `${relayUrl}/v1/client/environment-links`,
@@ -601,16 +846,27 @@ const reconcileDesiredCloudLinkWith = Effect.fn("environment.cloud.reconcileDesi
         managedTunnelsEnabled,
       },
       schema: RelayEnvironmentLinkResponse,
+      timeout: MANAGED_ENDPOINT_PROVISION_REQUEST_TIMEOUT,
     });
     yield* setCliDesiredCloudLink(true, mode);
-    return yield* applyCloudRelayConfig(dependencies, {
-      relayUrl,
-      relayIssuer: link.relayIssuer,
-      cloudUserId: link.cloudUserId,
-      environmentCredential: link.environmentCredential,
-      cloudMintPublicKey: link.cloudMintPublicKey,
-      endpointRuntime: link.endpointRuntime,
-    });
+    yield* applyCloudRelayConfig(
+      dependencies,
+      {
+        relayUrl,
+        relayIssuer: link.relayIssuer,
+        cloudUserId: link.cloudUserId,
+        environmentCredential: link.environmentCredential,
+        cloudMintPublicKey: link.cloudMintPublicKey,
+        endpointRuntime: link.endpointRuntime,
+      },
+      {
+        lockHeld: true,
+        confirmedOrigin: parsedOrigin.origin,
+      },
+    );
+    // Callers decide on managed tunnel recovery from the mode this link
+    // actually used, not from a value read before the relay round trip.
+    return mode;
   },
   Effect.catchIf(
     ServerSecretStore.isSecretStoreError,
@@ -627,7 +883,260 @@ const reconcileDesiredCloudLinkWith = Effect.fn("environment.cloud.reconcileDesi
 
 export const reconcileDesiredCloudLink = Effect.fn("environment.cloud.reconcileDesiredLink")(
   function* (localOrigin: string) {
-    return yield* reconcileDesiredCloudLinkWith(yield* cloudHttpDependencies, localOrigin);
+    const dependencies = yield* cloudHttpDependencies;
+    return yield* dependencies.endpointRuntime.withLinkStateLock(
+      reconcileDesiredCloudLinkWith(dependencies, localOrigin),
+    );
+  },
+);
+
+export const reconcileDesiredCloudLinkIfStillDesired = Effect.fn(
+  "environment.cloud.reconcileDesiredLinkIfStillDesired",
+)(function* (localOrigin: string) {
+  const dependencies = yield* cloudHttpDependencies;
+  return yield* dependencies.endpointRuntime.withLinkStateLock(
+    Effect.gen(function* () {
+      if (!(yield* readCliDesiredCloudLink)) {
+        return null;
+      }
+      return yield* reconcileDesiredCloudLinkWith(dependencies, localOrigin);
+    }),
+  );
+});
+
+type ManagedTunnelRecoveryProofInput = {
+  readonly environmentId: RelayManagedEndpointRecoveryProofPayload["environmentId"];
+  readonly cloudUserId: string;
+  readonly relayUrl: string;
+} & (
+  | {
+      readonly action: "register";
+      readonly tunnelId: string;
+      readonly origin: RelayManagedEndpointOrigin;
+    }
+  | { readonly action: "recover"; readonly origin: RelayManagedEndpointOrigin }
+);
+
+const makeManagedTunnelRecoveryProof = Effect.fn(
+  "environment.cloud.makeManagedTunnelRecoveryProof",
+)(function* (dependencies: CloudHttpDependencies, input: ManagedTunnelRecoveryProofInput) {
+  const keyPair = yield* getOrCreateEnvironmentKeyPairFromSecretStore(dependencies.secrets);
+  const configuredIssuer = yield* dependencies.secrets.get(RELAY_ISSUER_SECRET);
+  const now = yield* DateTime.now;
+  const issuedAt = Math.floor(now.epochMilliseconds / 1_000);
+  const claims = {
+    iss: `t3-env:${input.environmentId}`,
+    aud: normalizeRelayIssuer(
+      Option.isSome(configuredIssuer) ? bytesToString(configuredIssuer.value) : input.relayUrl,
+    ),
+    sub: input.environmentId,
+    jti: yield* Crypto.Crypto.pipe(Effect.flatMap((crypto) => crypto.randomUUIDv4)),
+    iat: issuedAt,
+    exp: issuedAt + 60,
+    environmentId: input.environmentId,
+    cloudUserId: input.cloudUserId,
+  };
+  const payload =
+    input.action === "register"
+      ? {
+          ...claims,
+          action: "register" as const,
+          tunnelId: input.tunnelId,
+          origin: input.origin,
+        }
+      : { ...claims, action: "recover" as const, origin: input.origin };
+
+  return yield* signRelayJwt({
+    privateKey: keyPair.privateKey,
+    typ: RELAY_MANAGED_TUNNEL_RECOVERY_TYP,
+    payload,
+  }).pipe(
+    Effect.mapError(
+      () =>
+        new EnvironmentHttpInternalServerError({
+          message: "Could not sign the managed tunnel recovery request.",
+        }),
+    ),
+  );
+});
+
+export const registerManagedCloudTunnelRecovery = Effect.fn(
+  "environment.cloud.registerManagedCloudTunnelRecovery",
+)(function* (localOrigin: string, options?: { readonly retryRuntimeFailures?: boolean }) {
+  const dependencies = yield* cloudHttpDependencies;
+  const [runtimeConfig, relayUrl, cloudUserId, environmentCredential] = yield* Effect.all([
+    dependencies.secrets.get(CLOUD_ENDPOINT_RUNTIME_CONFIG),
+    dependencies.secrets.get(RELAY_URL_SECRET),
+    dependencies.secrets.get(CLOUD_LINKED_USER_ID),
+    dependencies.secrets.get(RELAY_ENVIRONMENT_CREDENTIAL_SECRET),
+  ]);
+  if (
+    Option.isNone(runtimeConfig) ||
+    Option.isNone(relayUrl) ||
+    Option.isNone(cloudUserId) ||
+    Option.isNone(environmentCredential)
+  ) {
+    return { status: "not_linked" as const };
+  }
+
+  const config = Option.getOrNull(decodeRuntimeConfig(bytesToString(runtimeConfig.value)));
+  if (config?.providerKind !== "cloudflare_tunnel") {
+    return { status: "not_linked" as const };
+  }
+
+  const parsedOrigin = yield* Effect.try({
+    try: () => parseManagedEndpointLocalOrigin(localOrigin),
+    catch: () =>
+      new EnvironmentHttpBadRequestError({
+        message: "Could not resolve local environment origin.",
+      }),
+  });
+  if (config.tunnelId === undefined) {
+    return { status: "recovery_required" as const, config };
+  }
+  const origin = parsedOrigin.origin;
+  const environmentId = yield* dependencies.environment.getEnvironmentId;
+  const relayUrlValue = bytesToString(relayUrl.value);
+  const cloudUserIdValue = bytesToString(cloudUserId.value);
+  const proof = yield* makeManagedTunnelRecoveryProof(dependencies, {
+    action: "register",
+    environmentId,
+    cloudUserId: cloudUserIdValue,
+    relayUrl: relayUrlValue,
+    tunnelId: config.tunnelId,
+    origin,
+  });
+  const registered = yield* relayClientRequest(dependencies, {
+    url: `${relayUrlValue}/v1/environments/${encodeURIComponent(environmentId)}/tunnel/recovery`,
+    token: bytesToString(environmentCredential.value),
+    payload: {
+      cloudUserId: cloudUserIdValue,
+      tunnelId: config.tunnelId,
+      origin,
+      proof,
+    },
+    schema: RelayManagedEndpointRecoveryRegistrationResponse,
+  });
+  if (registered.status === "recovery_required") {
+    return { status: registered.status, config };
+  }
+  const endpointRuntimeStatus = yield* activateManagedTunnelWithRetry(
+    dependencies,
+    {
+      config,
+      configJson: bytesToString(runtimeConfig.value),
+      origin,
+    },
+    options?.retryRuntimeFailures === true,
+  );
+  return endpointRuntimeStatus === null
+    ? { status: "superseded" as const }
+    : { status: "ready" as const, endpointRuntimeStatus };
+});
+
+export const recoverManagedCloudTunnel = Effect.fn("environment.cloud.recoverManagedCloudTunnel")(
+  function* (
+    localOrigin: string,
+    expectedConfig?: RelayManagedEndpointRuntimeConfig,
+    options?: { readonly retryRuntimeFailures?: boolean },
+  ) {
+    const dependencies = yield* cloudHttpDependencies;
+    const [runtimeConfig, relayUrl, cloudUserId, environmentCredential] = yield* Effect.all([
+      dependencies.secrets.get(CLOUD_ENDPOINT_RUNTIME_CONFIG),
+      dependencies.secrets.get(RELAY_URL_SECRET),
+      dependencies.secrets.get(CLOUD_LINKED_USER_ID),
+      dependencies.secrets.get(RELAY_ENVIRONMENT_CREDENTIAL_SECRET),
+    ]);
+    if (
+      Option.isNone(runtimeConfig) ||
+      Option.isNone(relayUrl) ||
+      Option.isNone(cloudUserId) ||
+      Option.isNone(environmentCredential)
+    ) {
+      return false;
+    }
+    if (expectedConfig !== undefined) {
+      const current = Option.getOrNull(decodeRuntimeConfig(bytesToString(runtimeConfig.value)));
+      if (
+        current === null ||
+        current.providerKind !== expectedConfig.providerKind ||
+        current.connectorToken !== expectedConfig.connectorToken ||
+        current.tunnelId !== expectedConfig.tunnelId ||
+        current.tunnelName !== expectedConfig.tunnelName
+      ) {
+        return false;
+      }
+    }
+
+    const parsedOrigin = yield* Effect.try({
+      try: () => parseManagedEndpointLocalOrigin(localOrigin),
+      catch: () =>
+        new EnvironmentHttpBadRequestError({
+          message: "Could not resolve local environment origin.",
+        }),
+    });
+
+    const environmentId = yield* dependencies.environment.getEnvironmentId;
+    const relayUrlValue = bytesToString(relayUrl.value);
+    const cloudUserIdValue = bytesToString(cloudUserId.value);
+    const origin = parsedOrigin.origin;
+    const proof = yield* makeManagedTunnelRecoveryProof(dependencies, {
+      action: "recover",
+      environmentId,
+      cloudUserId: cloudUserIdValue,
+      relayUrl: relayUrlValue,
+      origin,
+    });
+    const recovered = yield* relayClientRequest(dependencies, {
+      url: `${relayUrlValue}/v1/environments/${encodeURIComponent(environmentId)}/tunnel`,
+      token: bytesToString(environmentCredential.value),
+      payload: {
+        cloudUserId: cloudUserIdValue,
+        origin,
+        proof,
+      },
+      schema: RelayManagedEndpointRecoveryResponse,
+      timeout: MANAGED_ENDPOINT_PROVISION_REQUEST_TIMEOUT,
+    });
+    if (recovered.endpointRuntime.providerKind !== "cloudflare_tunnel") {
+      return yield* new EnvironmentHttpInternalServerError({
+        message: "T3 Connect returned an unsupported managed tunnel configuration.",
+      });
+    }
+
+    const encoded = yield* encodeEndpointRuntimeConfigJson(recovered.endpointRuntime).pipe(
+      Effect.mapError(
+        () =>
+          new EnvironmentHttpInternalServerError({
+            message: "Could not persist the recovered managed tunnel configuration.",
+          }),
+      ),
+    );
+    const stored = yield* dependencies.endpointRuntime.withLinkStateLock(
+      Effect.gen(function* () {
+        const currentConfig = yield* dependencies.secrets.get(CLOUD_ENDPOINT_RUNTIME_CONFIG);
+        if (
+          Option.isNone(currentConfig) ||
+          bytesToString(currentConfig.value) !== bytesToString(runtimeConfig.value)
+        ) {
+          return false;
+        }
+        yield* dependencies.secrets.set(CLOUD_ENDPOINT_RUNTIME_CONFIG, stringToBytes(encoded));
+        yield* dependencies.secrets.remove(CLOUD_ENDPOINT_CONFIRMED_ORIGIN);
+        return true;
+      }),
+    );
+    if (!stored) return false;
+    const status = yield* activateManagedTunnelWithRetry(
+      dependencies,
+      {
+        config: recovered.endpointRuntime,
+        configJson: encoded,
+        origin,
+      },
+      options?.retryRuntimeFailures === true,
+    );
+    return status !== null;
   },
 );
 
@@ -663,6 +1172,29 @@ const pendingUpdateHandoffExists = Effect.gen(function* () {
   return !stopping;
 });
 
+// The desktop app writes its marker right before it stops this server to
+// install an update, whether a remote client or the local app started it.
+// Reading consumes it, so shutdown checks it first. Only a fresh marker counts,
+// so a marker the server never read (a hard kill) cannot keep the tunnel on a
+// later quit.
+const desktopUpdateRestartPending = Effect.gen(function* () {
+  const config = yield* ServerConfig.ServerConfig;
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const markerPath = path.join(config.baseDir, "runtime", DESKTOP_UPDATE_RESTART_MARKER_FILE);
+  const marker = yield* fs.stat(markerPath).pipe(Effect.option);
+  if (Option.isNone(marker)) {
+    return false;
+  }
+  yield* fs.remove(markerPath).pipe(Effect.ignore);
+  const now = yield* Clock.currentTimeMillis;
+  return Option.match(marker.value.mtime, {
+    onNone: () => false,
+    onSome: (writtenAt) =>
+      now - writtenAt.getTime() < Duration.toMillis(DESKTOP_UPDATE_RESTART_MARKER_TTL),
+  });
+});
+
 // Cloudflare bills per provisioned tunnel, so an environment that goes offline
 // must not leave its tunnel behind. Releasing deletes only the tunnel — the
 // relay keeps the link and its hostname reservation, and the next startup's
@@ -677,24 +1209,23 @@ export const releaseManagedTunnelOnShutdown = Effect.fn(
   if (Option.isNone(runtimeConfig)) {
     return false;
   }
-  // Only CLI-desired managed links release on shutdown, because the startup
-  // reconcile that provisions the replacement tunnel only runs for them. A
-  // link installed by a web/mobile client comes back after a restart by
-  // reapplying the stored connector token — it has no boot-time re-provision
-  // path — so its tunnel must survive the restart. (Unlink still deletes it.)
+  // Only CLI-desired managed links release eagerly because this request uses
+  // CLI authorization. Web/mobile links register startup recovery with their
+  // environment credential, and the relay reaper removes them after they are
+  // down for the configured grace period. Unlink still deletes either kind.
   if (!(yield* readCliDesiredCloudLink) || (yield* readCliDesiredLinkMode) !== "managed") {
     return false;
   }
-  // A shutdown that hands off to a pending remote update is not the
-  // environment going offline: the launcher immediately brings a server back
-  // (the new version, or the old one after a rollback). Deleting the tunnel
-  // here forces that server to provision a replacement UUID, and the public
-  // hostname's route to the new tunnel takes 1-2 minutes to propagate — the
-  // dominant cost of an update restart. Keep the tunnel instead: the next
+  // A shutdown that hands off to a pending update is not the environment
+  // going offline: the service launcher or the desktop app immediately brings
+  // a server back (the new version, or the old one after a rollback). Deleting
+  // the tunnel here forces that server to provision a replacement UUID, and the
+  // public hostname's route to the new tunnel takes 1-2 minutes to propagate —
+  // the dominant cost of an update restart. Keep the tunnel instead: the next
   // boot respawns the connector from the stored config and is reachable as
   // soon as it connects, and the reconcile confirms the still-live tunnel
   // without replacing it.
-  if (yield* pendingUpdateHandoffExists) {
+  if ((yield* desktopUpdateRestartPending) || (yield* pendingUpdateHandoffExists)) {
     yield* Effect.logInfo("Keeping the managed tunnel across the update restart");
     return false;
   }
@@ -738,6 +1269,7 @@ export const releaseManagedTunnelOnShutdown = Effect.fn(
     bytesToString(storedConfig.value) === bytesToString(runtimeConfig.value)
   ) {
     yield* dependencies.secrets.remove(CLOUD_ENDPOINT_RUNTIME_CONFIG);
+    yield* dependencies.secrets.remove(CLOUD_ENDPOINT_CONFIRMED_ORIGIN);
   }
   return true;
 });
@@ -784,21 +1316,26 @@ const cloudLinkStateHandler = Effect.fn("environment.cloud.linkState")(
 const cloudUnlinkHandler = Effect.fn("environment.cloud.unlink")(
   function* (dependencies: CloudHttpDependencies) {
     yield* requireEnvironmentScope(AuthRelayWriteScope);
-    const endpointRuntimeStatus = yield* dependencies.endpointRuntime.applyConfig(null);
-    yield* Effect.all(
-      [
-        dependencies.secrets.remove(CLOUD_LINKED_USER_ID),
-        dependencies.secrets.remove(RELAY_URL_SECRET),
-        dependencies.secrets.remove(RELAY_ISSUER_SECRET),
-        dependencies.secrets.remove(RELAY_ENVIRONMENT_CREDENTIAL_SECRET),
-        dependencies.secrets.remove(CLOUD_MINT_PUBLIC_KEY),
-        dependencies.secrets.remove(CLOUD_ENDPOINT_RUNTIME_CONFIG),
-        dependencies.secrets.remove(PUBLISH_AGENT_ACTIVITY_SECRET),
-      ],
-      { concurrency: 7 },
+    return yield* dependencies.endpointRuntime.withLinkStateLock(
+      Effect.gen(function* () {
+        const endpointRuntimeStatus = yield* dependencies.endpointRuntime.applyConfig(null);
+        yield* Effect.all(
+          [
+            dependencies.secrets.remove(CLOUD_LINKED_USER_ID),
+            dependencies.secrets.remove(RELAY_URL_SECRET),
+            dependencies.secrets.remove(RELAY_ISSUER_SECRET),
+            dependencies.secrets.remove(RELAY_ENVIRONMENT_CREDENTIAL_SECRET),
+            dependencies.secrets.remove(CLOUD_MINT_PUBLIC_KEY),
+            dependencies.secrets.remove(CLOUD_ENDPOINT_RUNTIME_CONFIG),
+            dependencies.secrets.remove(CLOUD_ENDPOINT_CONFIRMED_ORIGIN),
+            dependencies.secrets.remove(PUBLISH_AGENT_ACTIVITY_SECRET),
+          ],
+          { concurrency: 8 },
+        );
+        yield* setCliDesiredCloudLink(false);
+        return { ok: true, endpointRuntimeStatus } satisfies EnvironmentCloudRelayConfigResult;
+      }),
     );
-    yield* setCliDesiredCloudLink(false);
-    return { ok: true, endpointRuntimeStatus } satisfies EnvironmentCloudRelayConfigResult;
   },
   Effect.catchIf(
     ServerSecretStore.isSecretStoreError,
@@ -816,6 +1353,7 @@ const cloudPreferencesHandler = Effect.fn("environment.cloud.preferences")(
       PUBLISH_AGENT_ACTIVITY_SECRET,
       stringToBytes(String(payload.publishAgentActivity)),
     );
+    yield* dependencies.awarenessRelay.requestCatchUp();
     return yield* readCloudLinkState(dependencies);
   },
   Effect.catchIf(
diff --git a/apps/server/src/cloud/managedTunnelStartup.test.ts b/apps/server/src/cloud/managedTunnelStartup.test.ts
new file mode 100644
index 000000000000..1d75f606cd2f
--- /dev/null
+++ b/apps/server/src/cloud/managedTunnelStartup.test.ts
@@ -0,0 +1,132 @@
+import { describe, expect, it } from "@effect/vitest";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as TestClock from "effect/testing/TestClock";
+
+import {
+  managedTunnelStartupAction,
+  retryManagedTunnelRegistration,
+} from "./managedTunnelStartup.ts";
+
+describe("managedTunnelStartupAction", () => {
+  const config = {
+    providerKind: "cloudflare_tunnel" as const,
+    connectorToken: "connector-token",
+    tunnelId: "tunnel-1",
+  };
+
+  it("requests tunnel recovery only when the relay proves it is needed", () => {
+    expect(
+      managedTunnelStartupAction({
+        wantsCliLink: true,
+        registration: { status: "recovery_required", config },
+      }),
+    ).toEqual({ action: "request_recovery", config });
+  });
+
+  it("creates a desired CLI link only when no local managed link exists", () => {
+    expect(
+      managedTunnelStartupAction({
+        wantsCliLink: true,
+        registration: { status: "not_linked" },
+      }),
+    ).toEqual({ action: "reconcile_link" });
+  });
+
+  it.each(["ready", "unavailable"] as const)(
+    "does not provision after a %s registration result",
+    (status) => {
+      expect(
+        managedTunnelStartupAction({
+          wantsCliLink: true,
+          registration: { status },
+        }),
+      ).toEqual({ action: "none" });
+    },
+  );
+});
+
+describe("retryManagedTunnelRegistration", () => {
+  it.effect("does not fall back or retry when registration is permanently rejected", () =>
+    Effect.gen(function* () {
+      let attempts = 0;
+      let fallbacks = 0;
+      const error = yield* Effect.flip(
+        retryManagedTunnelRegistration(
+          Effect.suspend(() => {
+            attempts += 1;
+            return Effect.fail("not authorized");
+          }),
+          () => false,
+          Effect.sync(() => {
+            fallbacks += 1;
+          }),
+        ),
+      );
+      expect(error).toBe("not authorized");
+      expect(attempts).toBe(1);
+      expect(fallbacks).toBe(0);
+    }),
+  );
+
+  it.effect("stops retrying after the retry window so startup can fall back", () =>
+    Effect.gen(function* () {
+      let attempts = 0;
+      const registration = Effect.suspend(() => {
+        attempts += 1;
+        return Effect.fail("relay unavailable" as const);
+      });
+      const fiber = yield* Effect.forkChild(
+        Effect.flip(retryManagedTunnelRegistration(registration, () => true)),
+        { startImmediately: true },
+      );
+      yield* TestClock.adjust("15 minutes");
+      expect(yield* Fiber.join(fiber)).toBe("relay unavailable");
+      // Capped at 30 seconds between attempts, ten minutes allows a bounded run.
+      expect(attempts).toBeGreaterThan(5);
+      expect(attempts).toBeLessThan(60);
+    }),
+  );
+
+  it.effect("waits for successful registration before it activates the connector", () =>
+    Effect.gen(function* () {
+      const firstAttempt = yield* Deferred.make<void>();
+      let attempts = 0;
+      let activations = 0;
+      let reconciliations = 0;
+      const registration = Effect.suspend(() => {
+        attempts += 1;
+        if (attempts === 1) {
+          return Deferred.succeed(firstAttempt, undefined).pipe(
+            Effect.andThen(Effect.fail("relay unavailable" as const)),
+          );
+        }
+        return Effect.succeed({ status: "ready" as const });
+      });
+      const startup = retryManagedTunnelRegistration(registration, () => true).pipe(
+        Effect.tap((result) =>
+          Effect.sync(() => {
+            const action = managedTunnelStartupAction({ wantsCliLink: true, registration: result });
+            if (action.action === "reconcile_link") {
+              reconciliations += 1;
+            }
+            activations += 1;
+          }),
+        ),
+      );
+
+      const fiber = yield* Effect.forkChild(startup, { startImmediately: true });
+      yield* Deferred.await(firstAttempt);
+      expect(attempts).toBe(1);
+      expect(activations).toBe(0);
+
+      yield* TestClock.adjust("2 seconds");
+      yield* Fiber.join(fiber);
+
+      expect(attempts).toBe(2);
+      expect(activations).toBe(1);
+      expect(reconciliations).toBe(0);
+    }),
+  );
+});
diff --git a/apps/server/src/cloud/managedTunnelStartup.ts b/apps/server/src/cloud/managedTunnelStartup.ts
new file mode 100644
index 000000000000..511d5545a0ac
--- /dev/null
+++ b/apps/server/src/cloud/managedTunnelStartup.ts
@@ -0,0 +1,78 @@
+import type { RelayManagedEndpointRuntimeConfig } from "@t3tools/contracts/relay";
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Schedule from "effect/Schedule";
+
+export type ManagedTunnelRegistrationResult =
+  | { readonly status: "not_linked" | "ready" | "unavailable" | "superseded" }
+  | {
+      readonly status: "recovery_required";
+      readonly config: RelayManagedEndpointRuntimeConfig;
+    };
+
+export type ManagedTunnelStartupAction =
+  | { readonly action: "none" }
+  | { readonly action: "reconcile_link" }
+  | {
+      readonly action: "request_recovery";
+      readonly config: RelayManagedEndpointRuntimeConfig;
+    };
+
+export function managedTunnelStartupAction(input: {
+  readonly wantsCliLink: boolean;
+  readonly registration: ManagedTunnelRegistrationResult;
+}): ManagedTunnelStartupAction {
+  if (input.registration.status === "recovery_required") {
+    return {
+      action: "request_recovery",
+      config: input.registration.config,
+    };
+  }
+  if (input.wantsCliLink && input.registration.status === "not_linked") {
+    return { action: "reconcile_link" };
+  }
+  return { action: "none" };
+}
+
+// After this window the host can start its stored connector config while
+// registration keeps retrying to reconcile the origin when the relay returns.
+const MANAGED_TUNNEL_REGISTRATION_RETRY_WINDOW = Duration.minutes(10);
+
+export const retryManagedTunnelRegistration = <A, E, R>(
+  registration: Effect.Effect<A, E, R>,
+  isRetryable: (error: E) => boolean,
+  onRetryWindowExhausted?: Effect.Effect<void, never, R>,
+) => {
+  const schedule = Schedule.exponential("1 second").pipe(
+    Schedule.modifyDelay(({ duration }) =>
+      Effect.succeed(Duration.min(duration, Duration.seconds(30))),
+    ),
+    Schedule.jittered,
+  );
+  const withinWindow = registration.pipe(
+    Effect.retry({
+      while: isRetryable,
+      schedule: schedule.pipe(
+        Schedule.upTo({ duration: MANAGED_TUNNEL_REGISTRATION_RETRY_WINDOW }),
+      ),
+    }),
+  );
+  if (onRetryWindowExhausted === undefined) return withinWindow;
+  return withinWindow.pipe(
+    Effect.catchIf(isRetryable, () =>
+      onRetryWindowExhausted.pipe(
+        Effect.andThen(registration.pipe(Effect.retry({ while: isRetryable, schedule }))),
+      ),
+    ),
+  );
+};
+
+// A host asks the relay for a replacement tunnel at most this often. Every
+// managed host shares one relay, so a host stuck in a bad loop must not turn
+// into a fleet-wide request storm.
+export const MANAGED_TUNNEL_RECOVERY_COOLDOWN = Duration.minutes(2);
+
+// Existing hosts register on their first boot after an upgrade, and desktop
+// auto-update delivers that boot to many hosts at once. Spread the first
+// registration so the relay and Cloudflare see a ramp instead of a spike.
+export const MANAGED_TUNNEL_FIRST_REGISTRATION_JITTER = Duration.seconds(30);
diff --git a/apps/server/src/cloud/relayTracing.ts b/apps/server/src/cloud/relayTracing.ts
index e35c94545a5e..eeea28a2b68f 100644
--- a/apps/server/src/cloud/relayTracing.ts
+++ b/apps/server/src/cloud/relayTracing.ts
@@ -7,14 +7,14 @@ const relayClientTracingConfig = resolveRelayClientTracingConfig();
 export const headlessRelayClientTracingLayer = makeRelayClientTracingLayer(
   relayClientTracingConfig,
   {
-    serviceName: "t3-headless-relay-client",
+    serviceName: "t3code-server",
     runtime: "node",
     client: "headless-cli",
   },
 );
 
 export const serverRelayBrokerTracingLayer = makeRelayClientTracingLayer(relayClientTracingConfig, {
-  serviceName: "t3-server",
+  serviceName: "t3code-server",
   runtime: "node",
   client: "environment-server",
   component: "relay-broker",
diff --git a/apps/server/src/cloud/selfUpdate.test.ts b/apps/server/src/cloud/selfUpdate.test.ts
index 8ca0baa64a32..05c96c95c2df 100644
--- a/apps/server/src/cloud/selfUpdate.test.ts
+++ b/apps/server/src/cloud/selfUpdate.test.ts
@@ -105,7 +105,7 @@ const makeHarness = Effect.fn("test.make_self_update_harness")(function* (
           order.push("accept");
           return "launcher-id";
         })),
-    prepareTrial: Effect.sync((): undefined => undefined),
+    prepareTrial: Effect.undefined,
   });
   const config = yield* ServerConfig.ServerConfig.pipe(
     Effect.provide(ServerConfig.layerTest(process.cwd(), baseDir)),
diff --git a/apps/server/src/compileCache.test.ts b/apps/server/src/compileCache.test.ts
new file mode 100644
index 000000000000..17827bb38ba9
--- /dev/null
+++ b/apps/server/src/compileCache.test.ts
@@ -0,0 +1,53 @@
+// @effect-diagnostics nodeBuiltinImport:off - the test kills a real Node process to prove the cache is on disk.
+import * as NodeChildProcess from "node:child_process";
+import * as NodeFSP from "node:fs/promises";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+import { assert, it } from "@effect/vitest";
+
+it.each([false, true])(
+  "persists an enabled cache before forced exit (disabled: %s)",
+  async (disabled) => {
+    const directory = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-compile-cache-"));
+    try {
+      const cacheDirectory = NodePath.join(directory, "cache");
+      const child = NodeChildProcess.spawnSync(
+        process.execPath,
+        [
+          "--input-type=module",
+          "--eval",
+          `import * as Effect from ${JSON.stringify(import.meta.resolve("effect/Effect"))};
+const { flushCompileCache } = await import(${JSON.stringify(new URL("./compileCache.ts", import.meta.url).href)});
+await Effect.runPromise(flushCompileCache);
+process.kill(process.pid, "SIGKILL");`,
+        ],
+        {
+          encoding: "utf8",
+          env: {
+            ...process.env,
+            NODE_COMPILE_CACHE: cacheDirectory,
+            NODE_DISABLE_COMPILE_CACHE: disabled ? "1" : undefined,
+          },
+        },
+      );
+      assert.equal(child.error, undefined);
+      assert.equal(child.stderr, "");
+      assert.notEqual(child.status, 0);
+      const entries = await NodeFSP.readdir(cacheDirectory, { recursive: true }).catch(
+        (error: NodeJS.ErrnoException) => {
+          if (error.code === "ENOENT") return [];
+          throw error;
+        },
+      );
+      const files = await Promise.all(
+        entries.map((entry) => NodeFSP.stat(NodePath.join(cacheDirectory, entry))),
+      );
+      assert.equal(
+        files.some((entry) => entry.isFile()),
+        !disabled,
+      );
+    } finally {
+      await NodeFSP.rm(directory, { recursive: true, force: true });
+    }
+  },
+);
diff --git a/apps/server/src/compileCache.ts b/apps/server/src/compileCache.ts
new file mode 100644
index 000000000000..d31e4305774c
--- /dev/null
+++ b/apps/server/src/compileCache.ts
@@ -0,0 +1,9 @@
+import * as NodeModule from "node:module";
+import * as Effect from "effect/Effect";
+
+// Desktop enables this cache before loading the backend. Windows force-kills
+// the backend on quit, so persist it after startup instead of waiting for exit.
+// This is a no-op when caching is disabled, including normal dev launches.
+export const flushCompileCache = Effect.try(() => NodeModule.flushCompileCache()).pipe(
+  Effect.ignore,
+);
diff --git a/apps/server/src/config.ts b/apps/server/src/config.ts
index 5762ccdb6ff3..d8dad5ae4d24 100644
--- a/apps/server/src/config.ts
+++ b/apps/server/src/config.ts
@@ -18,6 +18,7 @@ import * as Schema from "effect/Schema";
 
 import { sweepStalePendingAttachments } from "./attachmentStore.ts";
 import { DEFAULT_SIGNAL_EXPORT, type SignalExport } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 
 export const DEFAULT_PORT = 3773;
 
@@ -43,7 +44,6 @@ export interface ServerDerivedPaths {
   /** Screenshots the agent asks the collaborative browser to keep for the user. */
   readonly browserArtifactsDir: string;
   readonly logsDir: string;
-  readonly serverLogPath: string;
   readonly serverTracePath: string;
   readonly providerLogsDir: string;
   readonly providerEventLogPath: string;
@@ -81,7 +81,7 @@ export class ServerConfig extends Context.Service<
     readonly otlpTracesExport: SignalExport;
     readonly otlpMetricsExport: SignalExport;
     readonly otlpLogsExport: SignalExport;
-    readonly otlpServiceName: string;
+    readonly otelEnvironment: OtelEnvironment.OtelEnvironment;
     readonly mode: RuntimeMode;
     readonly port: number;
     readonly host: string | undefined;
@@ -117,8 +117,9 @@ export const make = (config: ServerConfig["Service"]) => ServerConfig.of(config)
  * logs report the same service identity to the collector.
  */
 export const otlpResource = (config: ServerConfig["Service"]) => ({
-  serviceName: config.otlpServiceName,
+  serviceName: "t3code-server",
   attributes: {
+    "service.namespace": "t3code",
     "service.runtime": "t3-server",
     "service.mode": config.mode,
   },
@@ -152,7 +153,6 @@ export const deriveServerPaths = Effect.fn(function* (
     attachmentsDir,
     browserArtifactsDir: join(stateDir, "browser-artifacts"),
     logsDir,
-    serverLogPath: join(logsDir, "server.log"),
     serverTracePath: join(logsDir, "server.trace.ndjson"),
     providerLogsDir,
     providerEventLogPath: join(providerLogsDir, "events.log"),
@@ -220,7 +220,7 @@ const makeTest = Effect.fn("ServerConfig.makeTest")(function* (
     otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
     otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
     otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-    otlpServiceName: "t3-server",
+    otelEnvironment: OtelEnvironment.none,
     cwd,
     baseDir,
     ...derivedPaths,
diff --git a/apps/server/src/desktopUpdate/DesktopAppUpdate.ts b/apps/server/src/desktopUpdate/DesktopAppUpdate.ts
index 9c5d88bd7910..dc29375f0a47 100644
--- a/apps/server/src/desktopUpdate/DesktopAppUpdate.ts
+++ b/apps/server/src/desktopUpdate/DesktopAppUpdate.ts
@@ -106,7 +106,7 @@ export const make = Effect.fn("desktopUpdate.desktopAppUpdate.make")(function* (
               ? emitStage(desktopUpdateProgressStage(report.state)).pipe(
                   Effect.as(Option.none<DesktopUpdateStatusReport>()),
                 )
-              : Effect.succeed(Option.some(report)),
+              : Effect.succeedSome(report),
         ),
         Stream.filterMap(
           Option.match({
diff --git a/apps/server/src/device/DeviceHubProxy.test.ts b/apps/server/src/device/DeviceHubProxy.test.ts
index 0f039274e207..d80b0e714645 100644
--- a/apps/server/src/device/DeviceHubProxy.test.ts
+++ b/apps/server/src/device/DeviceHubProxy.test.ts
@@ -111,6 +111,32 @@ describe("device hub proxy", () => {
     await response.text();
   });
 
+  it("reads Android fold state but requires operate scope to change it", async () => {
+    const path = "http://t3.test/api/device-hub/vendor/serve-emu/api/fold?device=emulator-5554";
+    const reader = fixture([AuthOrchestrationReadScope]);
+    const read = await reader.handler(new Request(path));
+    expect(read.status).toBe(200);
+    await read.text();
+    expect(reader.requests).toEqual([
+      "http://hub.test/vendor/serve-emu/api/fold?device=emulator-5554",
+    ]);
+    const denied = await reader.handler(
+      new Request(path, { method: "POST", body: '{"posture":"closed"}' }),
+    );
+    expect(denied.status).toBe(403);
+    expect(reader.requests).toHaveLength(1);
+
+    const operator = fixture([AuthOrchestrationOperateScope]);
+    const changed = await operator.handler(
+      new Request(path, { method: "POST", body: '{"posture":"closed"}' }),
+    );
+    expect(changed.status).toBe(200);
+    await changed.text();
+    expect(operator.requests).toEqual([
+      "http://hub.test/vendor/serve-emu/api/fold?device=emulator-5554",
+    ]);
+  });
+
   it("never forwards the vendor shell endpoint", async () => {
     const { handler, requests } = fixture([AuthOrchestrationOperateScope]);
     expect(
@@ -139,3 +165,29 @@ it.each([
   expect(await response.text()).not.toContain("private credential diagnostic");
   expect(requests).toEqual([]);
 });
+
+it.each([1, 3])(
+  "forwards fixed Duo display %s through the authenticated read proxy",
+  async (panel) => {
+    const { handler, requests } = fixture([AuthOrchestrationReadScope]);
+    const route = `/vendor/serve-sim/helper/duo/panel/${panel}/stream.avcc`;
+    const response = await handler(
+      new Request(`http://t3.test/api/device-hub${route}?wsTicket=secret`),
+    );
+    expect(response.status).toBe(200);
+    await response.text();
+    expect(requests).toEqual([`http://hub.test${route}`]);
+  },
+);
+
+it.each(["/panel/2/stream.avcc", "/panel/1/webrtc/offer", "/panel/3/exec"])(
+  "rejects unsupported Duo route %s",
+  async (route) => {
+    const { handler, requests } = fixture([AuthOrchestrationReadScope]);
+    const response = await handler(
+      new Request(`http://t3.test/api/device-hub/vendor/serve-sim/helper/duo${route}`),
+    );
+    expect(response.status).toBe(404);
+    expect(requests).toEqual([]);
+  },
+);
diff --git a/apps/server/src/device/DeviceHubProxy.ts b/apps/server/src/device/DeviceHubProxy.ts
index dd048480b3dd..706137796654 100644
--- a/apps/server/src/device/DeviceHubProxy.ts
+++ b/apps/server/src/device/DeviceHubProxy.ts
@@ -42,8 +42,9 @@ const ALLOWED_PATHS: ReadonlyArray<RegExp> = [
   /^\/vendor\/serve-sim\/api\/screenshot$/,
   /^\/vendor\/serve-sim\/api\/event-log(\/events)?$/,
   /^\/vendor\/serve-sim\/helper\/[^/]+\/(stream\.mjpeg|stream\.avcc|config|health|ax|foreground)$/,
+  /^\/vendor\/serve-sim\/helper\/[^/]+\/panel\/(1|3)\/stream\.avcc$/,
   /^\/vendor\/serve-sim\/appstate$/,
-  /^\/vendor\/serve-emu\/api\/(devices|screenshot|stream-mode|stream-settings|accessibility)$/,
+  /^\/vendor\/serve-emu\/api\/(devices|screenshot|stream-mode|stream-settings|accessibility|fold)$/,
   /^\/vendor\/serve-emu\/health$/,
 ];
 
@@ -51,6 +52,7 @@ const ALLOWED_PATHS: ReadonlyArray<RegExp> = [
 const MUTABLE_PATHS: ReadonlyArray<RegExp> = [
   /^\/vendor\/serve-sim\/api\/screenshot$/,
   /^\/vendor\/serve-emu\/api\/(screenshot|stream-mode|stream-settings)$/,
+  /^\/vendor\/serve-emu\/api\/fold$/,
 ];
 
 const ALLOWED_WS_PATHS: ReadonlyArray<RegExp> = [
@@ -141,7 +143,7 @@ const proxyWebSocket = Effect.fn("DeviceHubProxy.proxyWebSocket")(function* (
         pumpFrames(client, writeToUpstream),
       );
     }),
-  ).pipe(Effect.catchCause(() => Effect.void));
+  ).pipe(Effect.ignoreCause);
   return HttpServerResponse.empty();
 });
 
@@ -203,7 +205,7 @@ const handler = Effect.gen(function* () {
   }
   const controlsDevice =
     (upgrade && hubPath !== "/api/devices/ws") ||
-    (!readOnly && /\/api\/stream-(mode|settings)$/.test(hubPath));
+    (!readOnly && /\/api\/(stream-(mode|settings)|fold)$/.test(hubPath));
   yield* authenticate(controlsDevice ? AuthOrchestrationOperateScope : AuthOrchestrationReadScope);
   const devices = yield* DeviceService.DeviceService;
   const ready = yield* devices.currentReadiness(url.value.searchParams.get("hostId") ?? undefined);
diff --git a/apps/server/src/device/DeviceService.ts b/apps/server/src/device/DeviceService.ts
index 2435fbca34ab..dcb81d95eb99 100644
--- a/apps/server/src/device/DeviceService.ts
+++ b/apps/server/src/device/DeviceService.ts
@@ -906,13 +906,11 @@ export const makeWithHosts = Effect.fn("DeviceService.makeWithHosts")(function*
         lifecycleLock.withPermit(
           Effect.gen(function* () {
             if (!installTool)
-              return yield* Effect.fail(
-                new DeviceOperationError({
-                  operation: "update device tool",
-                  reason: "request_failed",
-                  cause: new Error("Tool installation is unavailable in this device service."),
-                }),
-              );
+              return yield* new DeviceOperationError({
+                operation: "update device tool",
+                reason: "request_failed",
+                cause: new Error("Tool installation is unavailable in this device service."),
+              });
             yield* installTool(tool);
             return yield* inspect;
           }),
diff --git a/apps/server/src/device/DeviceToolchain.ts b/apps/server/src/device/DeviceToolchain.ts
index 81cdb79217fe..f30960ed2212 100644
--- a/apps/server/src/device/DeviceToolchain.ts
+++ b/apps/server/src/device/DeviceToolchain.ts
@@ -26,9 +26,9 @@ import * as Semaphore from "effect/Semaphore";
 import * as ProcessRunner from "../processRunner.ts";
 
 const DEVICE_HUB_PACKAGE = "expo-device-hub";
-export const DEVICE_HUB_VERSION = "0.10.1";
+export const DEVICE_HUB_VERSION = "0.12.0";
 const AGENT_DEVICE_PACKAGE = "agent-device";
-export const AGENT_DEVICE_VERSION = "0.21.7";
+export const AGENT_DEVICE_VERSION = "0.21.12";
 
 const INSTALL_TIMEOUT = Duration.minutes(10);
 const installLock = Semaphore.makeUnsafe(1);
diff --git a/apps/server/src/device/LocalDeviceHost.ts b/apps/server/src/device/LocalDeviceHost.ts
index e704d28bbc34..5d0ba5176a1e 100644
--- a/apps/server/src/device/LocalDeviceHost.ts
+++ b/apps/server/src/device/LocalDeviceHost.ts
@@ -326,7 +326,7 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
       }
     }
     yield* fs.remove(hubStatePath(), { force: true }).pipe(Effect.ignore);
-  }).pipe(Effect.catchCause(() => Effect.void));
+  }).pipe(Effect.ignoreCause);
 
   const recordHub = (hub: HubProcess, hubTool: DeviceToolPaths) =>
     encodeHubStateFile({
@@ -422,7 +422,7 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
       Stream.runForEach((line) =>
         Effect.logDebug("Device hub output", { pid: Number(hub.child.pid), output: line }),
       ),
-      Effect.catchCause(() => Effect.void),
+      Effect.ignoreCause,
     );
 
   /**
diff --git a/apps/server/src/device/deviceToolMaintenance.ts b/apps/server/src/device/deviceToolMaintenance.ts
index 43cc64e8faca..0d7d61a18d59 100644
--- a/apps/server/src/device/deviceToolMaintenance.ts
+++ b/apps/server/src/device/deviceToolMaintenance.ts
@@ -128,9 +128,12 @@ const runMaintenance = Effect.fn("DeviceToolchain.maintenance")(function* (
     ],
   });
   if (result.code !== 0)
-    return yield* Effect.fail(
-      new DeviceToolMaintenanceError({ operation, tool, exitCode: result.code, cause: result }),
-    );
+    return yield* new DeviceToolMaintenanceError({
+      operation,
+      tool,
+      exitCode: result.code,
+      cause: result,
+    });
 });
 
 export const pruneLocalDeviceTools = Effect.fn("DeviceToolchain.prune")(function* (
diff --git a/apps/server/src/diagnostics/TraceDiagnostics.test.ts b/apps/server/src/diagnostics/TraceDiagnostics.test.ts
index 70bb4dc815c3..3b86841b99ba 100644
--- a/apps/server/src/diagnostics/TraceDiagnostics.test.ts
+++ b/apps/server/src/diagnostics/TraceDiagnostics.test.ts
@@ -7,6 +7,7 @@ import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import * as PlatformError from "effect/PlatformError";
 import * as References from "effect/References";
+import * as Stream from "effect/Stream";
 
 import * as TraceDiagnostics from "./TraceDiagnostics.ts";
 
@@ -40,72 +41,78 @@ function record(input: {
   });
 }
 
+const traceFilePath = "/tmp/server.trace.ndjson";
+const readAt = DateTime.makeUnsafe("2026-05-05T10:00:00.000Z");
+
+/** Aggregates whole lines in memory, the way diagnostics read traces before streaming. */
+function aggregateLines(lines: ReadonlyArray<string>) {
+  const aggregator = TraceDiagnostics.makeTraceDiagnosticsAggregator();
+  lines.forEach(aggregator.addLine);
+  return aggregator.finish({
+    traceFilePath,
+    scannedFilePaths: TraceDiagnostics.toRotatedTracePaths(traceFilePath, 1),
+    readAt,
+  });
+}
+
+/** Reads the trace file and one rotated backup through a fake file system. */
+function readTraces(fileSystem: Partial<FileSystem.FileSystem>) {
+  return TraceDiagnostics.readTraceDiagnostics({ traceFilePath, maxFiles: 1, readAt }).pipe(
+    Effect.provide(TraceDiagnostics.layer.pipe(Layer.provide(FileSystem.layerNoop(fileSystem)))),
+  );
+}
+
 describe("TraceDiagnostics", () => {
   it.effect("aggregates failures, slow spans, log levels, and parse errors", () =>
     Effect.sync(() => {
-      const diagnostics = TraceDiagnostics.aggregateTraceDiagnostics({
-        traceFilePath: "/tmp/server.trace.ndjson",
-        readAt: DateTime.makeUnsafe("2026-05-05T10:00:00.000Z"),
-        slowSpanThresholdMs: 1_000,
-        files: [
-          {
-            path: "/tmp/server.trace.ndjson.1",
-            text: [
-              record({
-                name: "server.getConfig",
-                traceId: "trace-a",
-                spanId: "span-a",
-                startMs: 1_000,
-                durationMs: 50,
-              }),
-              "not-json",
-            ].join("\n"),
-          },
-          {
-            path: "/tmp/server.trace.ndjson",
-            text: [
-              record({
-                name: "orchestration.dispatch",
-                traceId: "trace-b",
-                spanId: "span-b",
-                startMs: 2_000,
-                durationMs: 1_500,
-                exit: { _tag: "Failure", cause: "Provider crashed" },
-                events: [
-                  {
-                    name: "provider failed",
-                    timeUnixNano: ns(3_400),
-                    attributes: { "effect.logLevel": "Error" },
-                  },
-                ],
-              }),
-              record({
-                name: "orchestration.dispatch",
-                traceId: "trace-c",
-                spanId: "span-c",
-                startMs: 4_000,
-                durationMs: 250,
-                exit: { _tag: "Failure", cause: "Provider crashed" },
-              }),
-              record({
-                name: "git.status",
-                traceId: "trace-d",
-                spanId: "span-d",
-                startMs: 5_000,
-                durationMs: 25,
-                exit: { _tag: "Interrupted", cause: "Interrupted" },
-                events: [
-                  {
-                    name: "status delayed",
-                    timeUnixNano: ns(5_010),
-                    attributes: { "effect.logLevel": "Warning" },
-                  },
-                ],
-              }),
-            ].join("\n"),
-          },
-        ],
-      });
+      const diagnostics = aggregateLines([
+        record({
+          name: "server.getConfig",
+          traceId: "trace-a",
+          spanId: "span-a",
+          startMs: 1_000,
+          durationMs: 50,
+        }),
+        "not-json",
+        record({
+          name: "orchestration.dispatch",
+          traceId: "trace-b",
+          spanId: "span-b",
+          startMs: 2_000,
+          durationMs: 1_500,
+          exit: { _tag: "Failure", cause: "Provider crashed" },
+          events: [
+            {
+              name: "provider failed",
+              timeUnixNano: ns(3_400),
+              attributes: { "effect.logLevel": "Error" },
+            },
+          ],
+        }),
+        record({
+          name: "orchestration.dispatch",
+          traceId: "trace-c",
+          spanId: "span-c",
+          startMs: 4_000,
+          durationMs: 250,
+          exit: { _tag: "Failure", cause: "Provider crashed" },
+        }),
+        record({
+          name: "git.status",
+          traceId: "trace-d",
+          spanId: "span-d",
+          startMs: 5_000,
+          durationMs: 25,
+          exit: { _tag: "Interrupted", cause: "Interrupted" },
+          events: [
+            {
+              name: "status delayed",
+              timeUnixNano: ns(5_010),
+              attributes: { "effect.logLevel": "Warning" },
+            },
+          ],
+        }),
+      ]);
 
       assert.equal(diagnostics.recordCount, 4);
       assert.equal(DateTime.formatIso(diagnostics.readAt), "2026-05-05T10:00:00.000Z");
@@ -139,47 +146,110 @@ describe("TraceDiagnostics", () => {
   );
 
   it.effect("returns a not-found diagnostic when no files are available", () =>
-    Effect.sync(() => {
-      const diagnostics = TraceDiagnostics.aggregateTraceDiagnostics({
-        traceFilePath: "/tmp/missing.trace.ndjson",
-        readAt: DateTime.makeUnsafe("2026-05-05T10:00:00.000Z"),
-        files: [],
-      });
+    Effect.gen(function* () {
+      const diagnostics = yield* readTraces({});
 
       assert.equal(diagnostics.recordCount, 0);
       assert.equal(Option.getOrUndefined(diagnostics.error)?.kind, "trace-file-not-found");
     }),
   );
 
-  it.effect("preserves full failure causes and log messages", () =>
-    Effect.sync(() => {
-      const longCause = `VcsProcessSpawnError: ${"missing executable ".repeat(80)}`.trim();
-      const longMessage = `provider warning: ${"retrying command ".repeat(80)}`.trim();
-      const diagnostics = TraceDiagnostics.aggregateTraceDiagnostics({
-        traceFilePath: "/tmp/server.trace.ndjson",
-        readAt: DateTime.makeUnsafe("2026-05-05T10:00:00.000Z"),
-        files: [
-          {
-            path: "/tmp/server.trace.ndjson",
-            text: record({
-              name: "VcsProcess.run",
-              traceId: "trace-long",
-              spanId: "span-long",
+  it.effect("streams rotated files into the same result as reading them whole", () =>
+    Effect.gen(function* () {
+      // CRLF and LF endings plus multi-byte text, served one byte per chunk so
+      // chunks split lines, line endings, and characters.
+      const files = new Map([
+        [
+          `${traceFilePath}.1`,
+          [
+            record({
+              name: "server.getConfig",
+              traceId: "trace-a",
+              spanId: "span-a",
               startMs: 1_000,
+              durationMs: 50,
+            }),
+            "not-json",
+            record({
+              name: "orchestration.dispatch",
+              traceId: "trace-b",
+              spanId: "span-b",
+              startMs: 2_000,
+              durationMs: 1_500,
+              exit: { _tag: "Failure", cause: "Provider crashed: café 🔥" },
+            }),
+            "",
+          ].join("\r\n"),
+        ],
+        [
+          traceFilePath,
+          [
+            record({
+              name: "git.status",
+              traceId: "trace-c",
+              spanId: "span-c",
+              startMs: 3_000,
               durationMs: 25,
-              exit: { _tag: "Failure", cause: longCause },
+              exit: { _tag: "Interrupted", cause: "Interrupted" },
               events: [
                 {
-                  name: longMessage,
-                  timeUnixNano: ns(1_010),
+                  name: "status delayed ⏳",
+                  timeUnixNano: ns(3_010),
                   attributes: { "effect.logLevel": "Warning" },
                 },
               ],
             }),
-          },
+            "",
+            record({
+              name: "orchestration.dispatch",
+              traceId: "trace-d",
+              spanId: "span-d",
+              startMs: 4_000,
+              durationMs: 250,
+              exit: { _tag: "Failure", cause: "Provider crashed: café 🔥" },
+            }),
+          ].join("\n"),
         ],
+      ]);
+      const encoder = new TextEncoder();
+
+      const diagnostics = yield* readTraces({
+        stream: (path) =>
+          Stream.fromIterable(
+            Array.from(encoder.encode(files.get(path)), (byte) => Uint8Array.of(byte)),
+          ),
       });
 
+      assert.equal(diagnostics.recordCount, 4);
+      assert.deepStrictEqual(
+        diagnostics,
+        aggregateLines([...files.values()].flatMap((text) => text.split(/\r?\n/))),
+      );
+    }),
+  );
+
+  it.effect("preserves full failure causes and log messages", () =>
+    Effect.sync(() => {
+      const longCause = `VcsProcessSpawnError: ${"missing executable ".repeat(80)}`.trim();
+      const longMessage = `provider warning: ${"retrying command ".repeat(80)}`.trim();
+      const diagnostics = aggregateLines([
+        record({
+          name: "VcsProcess.run",
+          traceId: "trace-long",
+          spanId: "span-long",
+          startMs: 1_000,
+          durationMs: 25,
+          exit: { _tag: "Failure", cause: longCause },
+          events: [
+            {
+              name: longMessage,
+              timeUnixNano: ns(1_010),
+              attributes: { "effect.logLevel": "Warning" },
+            },
+          ],
+        }),
+      ]);
+
       assert.equal(diagnostics.latestFailures[0]?.cause, longCause);
       assert.equal(diagnostics.commonFailures[0]?.cause, longCause);
       assert.equal(diagnostics.latestWarningAndErrorLogs[0]?.message, longMessage);
@@ -188,45 +258,34 @@ describe("TraceDiagnostics", () => {
 
   it.effect("keeps loaded trace data when one rotated trace file fails to read", () =>
     Effect.gen(function* () {
-      const traceFilePath = "/tmp/server.trace.ndjson";
       const readFailure = PlatformError.systemError({
         _tag: "PermissionDenied",
         module: "FileSystem",
-        method: "readFileString",
+        method: "open",
         description: "permission denied",
         pathOrDescriptor: `${traceFilePath}.1`,
       });
-      const fileSystemLayer = FileSystem.layerNoop({
-        readFileString: (path) =>
-          path === `${traceFilePath}.1`
-            ? Effect.fail(readFailure)
-            : Effect.succeed(
-                record({
-                  name: "server.getConfig",
-                  traceId: "trace-a",
-                  spanId: "span-a",
-                  startMs: 1_000,
-                  durationMs: 50,
-                }),
-              ),
-      });
       const logAnnotations: Array<Record<string, unknown>> = [];
       const logger = Logger.make<unknown, void>((options) => {
         logAnnotations.push({ ...options.fiber.getRef(References.CurrentLogAnnotations) });
       });
 
-      const diagnostics = yield* TraceDiagnostics.readTraceDiagnostics({
-        traceFilePath,
-        maxFiles: 1,
-        readAt: DateTime.makeUnsafe("2026-05-05T10:00:00.000Z"),
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            TraceDiagnostics.layer.pipe(Layer.provide(fileSystemLayer)),
-            Logger.layer([logger], { mergeWithExisting: false }),
-          ),
-        ),
-      );
+      const diagnostics = yield* readTraces({
+        stream: (path) =>
+          path === `${traceFilePath}.1`
+            ? Stream.fail(readFailure)
+            : Stream.make(
+                new TextEncoder().encode(
+                  record({
+                    name: "server.getConfig",
+                    traceId: "trace-a",
+                    spanId: "span-a",
+                    startMs: 1_000,
+                    durationMs: 50,
+                  }),
+                ),
+              ),
+      }).pipe(Effect.provide(Logger.layer([logger], { mergeWithExisting: false })));
 
       assert.equal(diagnostics.recordCount, 1);
       assert.equal(
@@ -251,32 +310,43 @@ describe("TraceDiagnostics", () => {
     }),
   );
 
-  it.effect("keeps only the slowest span occurrences while aggregating large inputs", () =>
+  it.effect("keeps only the top spans, failures, and warning logs from large inputs", () =>
     Effect.sync(() => {
-      const diagnostics = TraceDiagnostics.aggregateTraceDiagnostics({
-        traceFilePath: "/tmp/server.trace.ndjson",
-        readAt: DateTime.makeUnsafe("2026-05-05T10:00:00.000Z"),
-        files: [
-          {
-            path: "/tmp/server.trace.ndjson",
-            text: Array.from({ length: 25 }, (_, index) =>
-              record({
-                name: `span-${index}`,
-                traceId: `trace-${index}`,
-                spanId: `span-${index}`,
-                startMs: index * 1_000,
-                durationMs: index,
-              }),
-            ).join("\n"),
-          },
-        ],
-      });
+      // Shuffled, so some older records arrive after the lists are full.
+      const indexes = Array.from({ length: 30 }, (_, step) => (step * 7) % 30);
+      const diagnostics = aggregateLines(
+        indexes.map((index) =>
+          record({
+            name: `span-${index}`,
+            traceId: `trace-${index}`,
+            spanId: `span-${index}`,
+            startMs: index * 1_000,
+            durationMs: index,
+            exit: { _tag: "Failure", cause: "Provider crashed" },
+            events: [
+              {
+                name: `warning ${index}`,
+                timeUnixNano: ns(index * 1_000),
+                attributes: { "effect.logLevel": "Warning" },
+              },
+            ],
+          }),
+        ),
+      );
+      const newestTwenty = Array.from({ length: 20 }, (_, rank) => `trace-${29 - rank}`);
 
-      assert.equal(diagnostics.recordCount, 25);
-      assert.equal(diagnostics.slowestSpans.length, 10);
+      assert.equal(diagnostics.recordCount, 30);
       assert.deepStrictEqual(
         diagnostics.slowestSpans.map((span) => span.durationMs),
-        [24, 23, 22, 21, 20, 19, 18, 17, 16, 15],
+        [29, 28, 27, 26, 25, 24, 23, 22, 21, 20],
+      );
+      assert.deepStrictEqual(
+        diagnostics.latestFailures.map((failure) => failure.traceId),
+        newestTwenty,
+      );
+      assert.deepStrictEqual(
+        diagnostics.latestWarningAndErrorLogs.map((log) => log.traceId),
+        newestTwenty,
       );
     }),
   );
diff --git a/apps/server/src/diagnostics/TraceDiagnostics.ts b/apps/server/src/diagnostics/TraceDiagnostics.ts
index 58b08ea8b572..6dbc4afdec93 100644
--- a/apps/server/src/diagnostics/TraceDiagnostics.ts
+++ b/apps/server/src/diagnostics/TraceDiagnostics.ts
@@ -16,6 +16,7 @@ import * as Option from "effect/Option";
 import * as PlatformError from "effect/PlatformError";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 
 interface TraceRecordLike {
   readonly name?: unknown;
@@ -63,16 +64,6 @@ export class TraceDiagnostics extends Context.Service<
   }
 >()("t3/diagnostics/TraceDiagnostics") {}
 
-interface TraceDiagnosticsInput {
-  readonly traceFilePath: string;
-  readonly files: ReadonlyArray<{ readonly path: string; readonly text: string }>;
-  readonly scannedFilePaths?: ReadonlyArray<string>;
-  readonly slowSpanThresholdMs?: number;
-  readonly readAt: DateTime.Utc;
-  readonly error?: TraceDiagnosticsErrorSummary;
-  readonly partialFailure?: boolean;
-}
-
 interface TraceDiagnosticsErrorSummary {
   readonly kind: ServerTraceDiagnosticsErrorKind;
   readonly message: string;
@@ -81,7 +72,12 @@ interface TraceDiagnosticsErrorSummary {
 const DEFAULT_SLOW_SPAN_THRESHOLD_MS = 1_000;
 const TOP_LIMIT = 10;
 const RECENT_LIMIT = 20;
-function toRotatedTracePaths(traceFilePath: string, maxFiles: number): ReadonlyArray<string> {
+
+/** The trace file and its rotated backups, oldest first. */
+export function toRotatedTracePaths(
+  traceFilePath: string,
+  maxFiles: number,
+): ReadonlyArray<string> {
   const backupCount = Math.max(0, Math.floor(maxFiles));
   const backups = Array.from(
     { length: backupCount },
@@ -168,44 +164,50 @@ function isNotFoundError(error: PlatformError.PlatformError): boolean {
   return error.reason._tag === "NotFound";
 }
 
-function insertBoundedSlowestSpan(
-  slowestSpans: ServerTraceDiagnosticsSpanOccurrence[],
-  span: ServerTraceDiagnosticsSpanOccurrence,
+/**
+ * Adds `item` to `items`, which stays sorted by `order` and holds at most
+ * `limit` entries. Same result as a stable sort and slice over every item, but
+ * memory stays bounded however many items stream in.
+ */
+function insertBounded<A>(
+  items: A[],
+  item: A,
+  limit: number,
+  order: (left: A, right: A) => number,
 ): void {
-  if (
-    slowestSpans.length >= TOP_LIMIT &&
-    span.durationMs <= slowestSpans[slowestSpans.length - 1]!.durationMs
-  ) {
+  if (items.length >= limit && order(item, items[items.length - 1]!) >= 0) {
     return;
   }
 
-  slowestSpans.push(span);
-  slowestSpans.sort((left, right) => right.durationMs - left.durationMs);
-  if (slowestSpans.length > TOP_LIMIT) {
-    slowestSpans.length = TOP_LIMIT;
+  items.push(item);
+  items.sort(order);
+  if (items.length > limit) {
+    items.length = limit;
   }
 }
 
-export function aggregateTraceDiagnostics(
-  input: TraceDiagnosticsInput,
-): ServerTraceDiagnosticsResult {
-  const readAt = input.readAt;
-  const slowSpanThresholdMs = input.slowSpanThresholdMs ?? DEFAULT_SLOW_SPAN_THRESHOLD_MS;
-  const scannedFilePaths = input.scannedFilePaths ?? input.files.map((file) => file.path);
-  if (input.files.length === 0) {
-    return makeEmptyDiagnostics({
-      traceFilePath: input.traceFilePath,
-      scannedFilePaths,
-      readAt,
-      slowSpanThresholdMs,
-      error: input.error ?? {
-        kind: "trace-file-not-found",
-        message: "No local trace files were found.",
-      },
-      ...(input.partialFailure ? { partialFailure: true } : {}),
-    });
-  }
-
+const slowestFirst = (
+  left: ServerTraceDiagnosticsSpanOccurrence,
+  right: ServerTraceDiagnosticsSpanOccurrence,
+) => right.durationMs - left.durationMs;
+
+const latestEndedFirst = (
+  left: ServerTraceDiagnosticsRecentFailure,
+  right: ServerTraceDiagnosticsRecentFailure,
+) => DateTime.toEpochMillis(right.endedAt) - DateTime.toEpochMillis(left.endedAt);
+
+const latestSeenFirst = (
+  left: ServerTraceDiagnosticsLogEvent,
+  right: ServerTraceDiagnosticsLogEvent,
+) => DateTime.toEpochMillis(right.seenAt) - DateTime.toEpochMillis(left.seenAt);
+
+/**
+ * Folds trace NDJSON into diagnostics. Call `addLine` once per line as the
+ * rotated files stream in, then `finish` for the result.
+ */
+export function makeTraceDiagnosticsAggregator(
+  slowSpanThresholdMs = DEFAULT_SLOW_SPAN_THRESHOLD_MS,
+) {
   let parseErrorCount = 0;
   let recordCount = 0;
   let failureCount = 0;
@@ -224,182 +226,184 @@ export function aggregateTraceDiagnostics(
   const latestWarningAndErrorLogs: ServerTraceDiagnosticsLogEvent[] = [];
   const logLevelCounts: Record<string, number> = {};
 
-  for (const file of input.files) {
-    const lines = file.text.split(/\r?\n/);
-    for (const line of lines) {
-      if (line.trim().length === 0) continue;
-
-      let parsed: unknown;
-      try {
-        parsed = JSON.parse(line);
-      } catch {
-        parseErrorCount += 1;
-        continue;
-      }
+  const addLine = (line: string) => {
+    if (line.trim().length === 0) return;
 
-      if (!isRecordObject(parsed)) {
-        parseErrorCount += 1;
-        continue;
-      }
+    let parsed: unknown;
+    try {
+      parsed = JSON.parse(line);
+    } catch {
+      parseErrorCount += 1;
+      return;
+    }
 
-      const name = toStringValue(parsed.name);
-      const traceId = toStringValue(parsed.traceId);
-      const spanId = toStringValue(parsed.spanId);
-      const durationMs = toNumberValue(parsed.durationMs);
-      const endedAt = unixNanoToDateTime(parsed.endTimeUnixNano);
-      const startedAt = unixNanoToDateTime(parsed.startTimeUnixNano);
+    if (!isRecordObject(parsed)) {
+      parseErrorCount += 1;
+      return;
+    }
 
-      if (!name || !traceId || !spanId || durationMs === null || !endedAt) {
-        parseErrorCount += 1;
-        continue;
-      }
+    const name = toStringValue(parsed.name);
+    const traceId = toStringValue(parsed.traceId);
+    const spanId = toStringValue(parsed.spanId);
+    const durationMs = toNumberValue(parsed.durationMs);
+    const endedAt = unixNanoToDateTime(parsed.endTimeUnixNano);
+    const startedAt = unixNanoToDateTime(parsed.startTimeUnixNano);
 
-      recordCount += 1;
-      firstSpanAt =
-        startedAt && (firstSpanAt === null || DateTime.isLessThan(startedAt, firstSpanAt))
-          ? startedAt
-          : firstSpanAt;
-      lastSpanAt =
-        lastSpanAt === null || DateTime.isGreaterThan(endedAt, lastSpanAt) ? endedAt : lastSpanAt;
-
-      const exitTag = readExitTag(parsed.exit);
-      const isFailure = exitTag === "Failure";
-      const isInterrupted = exitTag === "Interrupted";
-      if (isFailure) failureCount += 1;
-      if (isInterrupted) interruptionCount += 1;
-
-      const spanSummary = spansByName.get(name) ?? {
-        count: 0,
-        failureCount: 0,
-        totalDurationMs: 0,
-        maxDurationMs: 0,
-      };
-      spanSummary.count += 1;
-      spanSummary.totalDurationMs += durationMs;
-      spanSummary.maxDurationMs = Math.max(spanSummary.maxDurationMs, durationMs);
-      if (isFailure) spanSummary.failureCount += 1;
-      spansByName.set(name, spanSummary);
-
-      const spanItem = { name, durationMs, endedAt, traceId, spanId };
-      if (durationMs >= slowSpanThresholdMs) {
-        slowSpanCount += 1;
-      }
-      insertBoundedSlowestSpan(slowestSpans, spanItem);
-
-      if (isFailure) {
-        const cause = readExitCause(parsed.exit);
-        latestFailures.push({ ...spanItem, cause });
-
-        const failureKey = `${name}\0${cause}`;
-        const existing = failuresByKey.get(failureKey);
-        const isLatestFailure = !existing || DateTime.isGreaterThan(endedAt, existing.lastSeenAt);
-        failuresByKey.set(failureKey, {
-          name,
-          cause,
-          count: (existing?.count ?? 0) + 1,
-          lastSeenAt: isLatestFailure ? endedAt : existing!.lastSeenAt,
-          traceId: isLatestFailure ? traceId : existing!.traceId,
-          spanId: isLatestFailure ? spanId : existing!.spanId,
-        });
-      }
+    if (!name || !traceId || !spanId || durationMs === null || !endedAt) {
+      parseErrorCount += 1;
+      return;
+    }
 
-      if (Array.isArray(parsed.events)) {
-        for (const rawEvent of parsed.events) {
-          if (!isTraceEvent(rawEvent)) continue;
-          const attributes = readEventAttributes(rawEvent);
-          const level = toStringValue(attributes["effect.logLevel"]);
-          if (!level) continue;
-
-          logLevelCounts[level] = (logLevelCounts[level] ?? 0) + 1;
-          const normalizedLevel = level.toLowerCase();
-          if (
-            normalizedLevel !== "warning" &&
-            normalizedLevel !== "warn" &&
-            normalizedLevel !== "error" &&
-            normalizedLevel !== "fatal"
-          ) {
-            continue;
-          }
-
-          const seenAt = unixNanoToDateTime(rawEvent.timeUnixNano) ?? endedAt;
-          const message = toStringValue(rawEvent.name)?.trim() ?? "Log event";
-          latestWarningAndErrorLogs.push({
-            spanName: name,
-            level,
-            message,
-            seenAt,
-            traceId,
-            spanId,
-          });
+    recordCount += 1;
+    firstSpanAt =
+      startedAt && (firstSpanAt === null || DateTime.isLessThan(startedAt, firstSpanAt))
+        ? startedAt
+        : firstSpanAt;
+    lastSpanAt =
+      lastSpanAt === null || DateTime.isGreaterThan(endedAt, lastSpanAt) ? endedAt : lastSpanAt;
+
+    const exitTag = readExitTag(parsed.exit);
+    const isFailure = exitTag === "Failure";
+    const isInterrupted = exitTag === "Interrupted";
+    if (isFailure) failureCount += 1;
+    if (isInterrupted) interruptionCount += 1;
+
+    const spanSummary = spansByName.get(name) ?? {
+      count: 0,
+      failureCount: 0,
+      totalDurationMs: 0,
+      maxDurationMs: 0,
+    };
+    spanSummary.count += 1;
+    spanSummary.totalDurationMs += durationMs;
+    spanSummary.maxDurationMs = Math.max(spanSummary.maxDurationMs, durationMs);
+    if (isFailure) spanSummary.failureCount += 1;
+    spansByName.set(name, spanSummary);
+
+    const spanItem = { name, durationMs, endedAt, traceId, spanId };
+    if (durationMs >= slowSpanThresholdMs) {
+      slowSpanCount += 1;
+    }
+    insertBounded(slowestSpans, spanItem, TOP_LIMIT, slowestFirst);
+
+    if (isFailure) {
+      const cause = readExitCause(parsed.exit);
+      insertBounded(latestFailures, { ...spanItem, cause }, RECENT_LIMIT, latestEndedFirst);
+
+      const failureKey = `${name}\0${cause}`;
+      const existing = failuresByKey.get(failureKey);
+      const isLatestFailure = !existing || DateTime.isGreaterThan(endedAt, existing.lastSeenAt);
+      failuresByKey.set(failureKey, {
+        name,
+        cause,
+        count: (existing?.count ?? 0) + 1,
+        lastSeenAt: isLatestFailure ? endedAt : existing!.lastSeenAt,
+        traceId: isLatestFailure ? traceId : existing!.traceId,
+        spanId: isLatestFailure ? spanId : existing!.spanId,
+      });
+    }
+
+    if (Array.isArray(parsed.events)) {
+      for (const rawEvent of parsed.events) {
+        if (!isTraceEvent(rawEvent)) continue;
+        const attributes = readEventAttributes(rawEvent);
+        const level = toStringValue(attributes["effect.logLevel"]);
+        if (!level) continue;
+
+        logLevelCounts[level] = (logLevelCounts[level] ?? 0) + 1;
+        const normalizedLevel = level.toLowerCase();
+        if (
+          normalizedLevel !== "warning" &&
+          normalizedLevel !== "warn" &&
+          normalizedLevel !== "error" &&
+          normalizedLevel !== "fatal"
+        ) {
+          continue;
         }
+
+        const seenAt = unixNanoToDateTime(rawEvent.timeUnixNano) ?? endedAt;
+        const message = toStringValue(rawEvent.name)?.trim() ?? "Log event";
+        insertBounded(
+          latestWarningAndErrorLogs,
+          { spanName: name, level, message, seenAt, traceId, spanId },
+          RECENT_LIMIT,
+          latestSeenFirst,
+        );
       }
     }
-  }
-
-  const topSpansByCount: ServerTraceDiagnosticsSpanSummary[] = [...spansByName.entries()]
-    .map(([name, span]) => ({
-      name,
-      count: span.count,
-      failureCount: span.failureCount,
-      totalDurationMs: span.totalDurationMs,
-      averageDurationMs: span.count > 0 ? span.totalDurationMs / span.count : 0,
-      maxDurationMs: span.maxDurationMs,
-    }))
-    .toSorted((left, right) => right.count - left.count || right.maxDurationMs - left.maxDurationMs)
-    .slice(0, TOP_LIMIT);
+  };
 
-  return {
-    traceFilePath: input.traceFilePath,
-    scannedFilePaths,
-    readAt,
-    recordCount,
-    parseErrorCount,
-    firstSpanAt: Option.fromNullishOr(firstSpanAt),
-    lastSpanAt: Option.fromNullishOr(lastSpanAt),
-    failureCount,
-    interruptionCount,
-    slowSpanThresholdMs,
-    slowSpanCount,
-    logLevelCounts,
-    topSpansByCount,
-    slowestSpans,
-    commonFailures: [...failuresByKey.values()]
-      .toSorted(
-        (left, right) =>
-          right.count - left.count ||
-          DateTime.toEpochMillis(right.lastSeenAt) - DateTime.toEpochMillis(left.lastSeenAt),
-      )
-      .slice(0, TOP_LIMIT),
-    latestFailures: latestFailures
-      .toSorted(
-        (left, right) =>
-          DateTime.toEpochMillis(right.endedAt) - DateTime.toEpochMillis(left.endedAt),
-      )
-      .slice(0, RECENT_LIMIT),
-    latestWarningAndErrorLogs: latestWarningAndErrorLogs
+  const finish = (input: {
+    readonly traceFilePath: string;
+    readonly scannedFilePaths: ReadonlyArray<string>;
+    readonly readAt: DateTime.Utc;
+    readonly error?: TraceDiagnosticsErrorSummary;
+    readonly partialFailure?: boolean;
+  }): ServerTraceDiagnosticsResult => {
+    const topSpansByCount: ServerTraceDiagnosticsSpanSummary[] = [...spansByName.entries()]
+      .map(([name, span]) => ({
+        name,
+        count: span.count,
+        failureCount: span.failureCount,
+        totalDurationMs: span.totalDurationMs,
+        averageDurationMs: span.count > 0 ? span.totalDurationMs / span.count : 0,
+        maxDurationMs: span.maxDurationMs,
+      }))
       .toSorted(
-        (left, right) => DateTime.toEpochMillis(right.seenAt) - DateTime.toEpochMillis(left.seenAt),
+        (left, right) => right.count - left.count || right.maxDurationMs - left.maxDurationMs,
       )
-      .slice(0, RECENT_LIMIT),
-    partialFailure: input.partialFailure ? Option.some(true) : Option.none(),
-    error: Option.fromNullishOr(input.error),
+      .slice(0, TOP_LIMIT);
+
+    return {
+      traceFilePath: input.traceFilePath,
+      scannedFilePaths: input.scannedFilePaths,
+      readAt: input.readAt,
+      recordCount,
+      parseErrorCount,
+      firstSpanAt: Option.fromNullishOr(firstSpanAt),
+      lastSpanAt: Option.fromNullishOr(lastSpanAt),
+      failureCount,
+      interruptionCount,
+      slowSpanThresholdMs,
+      slowSpanCount,
+      logLevelCounts,
+      topSpansByCount,
+      slowestSpans,
+      commonFailures: [...failuresByKey.values()]
+        .toSorted(
+          (left, right) =>
+            right.count - left.count ||
+            DateTime.toEpochMillis(right.lastSeenAt) - DateTime.toEpochMillis(left.lastSeenAt),
+        )
+        .slice(0, TOP_LIMIT),
+      latestFailures,
+      latestWarningAndErrorLogs,
+      partialFailure: input.partialFailure ? Option.some(true) : Option.none(),
+      error: Option.fromNullishOr(input.error),
+    };
   };
-}
 
-type TraceFileReadResult =
-  | { readonly _tag: "Loaded"; readonly path: string; readonly text: string }
-  | { readonly _tag: "Missing"; readonly path: string };
+  return { addLine, finish };
+}
 
-function readTraceFile(
+/**
+ * Feeds each line of one trace file to `onLine`, streaming so only one chunk of
+ * text is in memory at a time. Succeeds with false when the file does not exist.
+ */
+export function streamTraceFileLines(
   fileSystem: FileSystem.FileSystem,
   path: string,
-): Effect.Effect<TraceFileReadResult, TraceFileReadError> {
-  return fileSystem.readFileString(path).pipe(
-    Effect.map((text): TraceFileReadResult => ({ _tag: "Loaded", path, text })),
+  onLine: (line: string) => void,
+): Effect.Effect<boolean, TraceFileReadError> {
+  return fileSystem.stream(path).pipe(
+    Stream.decodeText,
+    Stream.splitLines,
+    Stream.runForEachArray((lines) => Effect.sync(() => lines.forEach(onLine))),
+    Effect.as(true),
     Effect.catchTags({
       PlatformError: (cause) =>
         isNotFoundError(cause)
-          ? Effect.succeed<TraceFileReadResult>({ _tag: "Missing", path })
+          ? Effect.succeed(false)
           : Effect.fail(
               new TraceFileReadError({
                 traceFilePath: path,
@@ -420,9 +424,11 @@ export const make = Effect.gen(function* () {
       const readAt = options.readAt ?? (yield* DateTime.now);
       const slowSpanThresholdMs = options.slowSpanThresholdMs ?? DEFAULT_SLOW_SPAN_THRESHOLD_MS;
       const paths = toRotatedTracePaths(options.traceFilePath, options.maxFiles);
-      const results = yield* Effect.all(
-        paths.map((path) =>
-          readTraceFile(fileSystem, path).pipe(
+      const aggregator = makeTraceDiagnosticsAggregator(slowSpanThresholdMs);
+      const results = yield* Effect.forEach(
+        paths,
+        (path) =>
+          streamTraceFileLines(fileSystem, path, aggregator.addLine).pipe(
             Effect.tapError((cause) =>
               Effect.logWarning("Failed to read local trace file.").pipe(
                 Effect.annotateLogs({
@@ -434,16 +440,10 @@ export const make = Effect.gen(function* () {
             ),
             Effect.result,
           ),
-        ),
-        {
-          concurrency: 1,
-        },
-      );
-      const files = results.flatMap((result) =>
-        Result.isSuccess(result) && result.success._tag === "Loaded"
-          ? [{ path: result.success.path, text: result.success.text }]
-          : [],
+        // Every file feeds one aggregator, so read them one at a time, oldest first.
+        { concurrency: 1 },
       );
+      const foundFile = results.some((result) => Result.isSuccess(result) && result.success);
       const readFailure = results.find(Result.isFailure);
       const readFailureError = readFailure
         ? ({
@@ -452,7 +452,7 @@ export const make = Effect.gen(function* () {
           } satisfies TraceDiagnosticsErrorSummary)
         : undefined;
 
-      if (files.length === 0) {
+      if (!foundFile) {
         return makeEmptyDiagnostics({
           traceFilePath: options.traceFilePath,
           scannedFilePaths: paths,
@@ -467,12 +467,10 @@ export const make = Effect.gen(function* () {
         });
       }
 
-      return aggregateTraceDiagnostics({
+      return aggregator.finish({
         traceFilePath: options.traceFilePath,
-        files,
         scannedFilePaths: paths,
         readAt,
-        slowSpanThresholdMs,
         ...(readFailureError ? { partialFailure: true, error: readFailureError } : {}),
       });
     },
diff --git a/apps/server/src/environment/ServerEnvironment.test.ts b/apps/server/src/environment/ServerEnvironment.test.ts
index b4758e980065..6eb95c84b477 100644
--- a/apps/server/src/environment/ServerEnvironment.test.ts
+++ b/apps/server/src/environment/ServerEnvironment.test.ts
@@ -6,11 +6,11 @@ import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as PlatformError from "effect/PlatformError";
 import * as Schema from "effect/Schema";
 
 import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 
 import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
 import {
@@ -34,7 +34,7 @@ const makeServerEnvironmentLayer = (baseDir: string) =>
 const emptySecretStoreLayer = Layer.succeed(
   ServerSecretStore.ServerSecretStore,
   ServerSecretStore.ServerSecretStore.of({
-    get: () => Effect.succeed(Option.none()),
+    get: () => Effect.succeedNone,
     set: () => Effect.void,
     create: () => Effect.void,
     getOrCreateRandom: () => Effect.succeed(new Uint8Array()),
@@ -59,7 +59,7 @@ const makeServerConfig = Effect.fn(function* (baseDir: string) {
     otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
     otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
     otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-    otlpServiceName: "t3-server",
+    otelEnvironment: OtelEnvironment.none,
     cwd: process.cwd(),
     baseDir,
     mode: "web",
diff --git a/apps/server/src/environment/ServerEnvironment.ts b/apps/server/src/environment/ServerEnvironment.ts
index a36c0a03b6f2..d58c014d86e8 100644
--- a/apps/server/src/environment/ServerEnvironment.ts
+++ b/apps/server/src/environment/ServerEnvironment.ts
@@ -127,13 +127,12 @@ const makeIdentity = Effect.gen(function* () {
       });
       yield* fileSystem.writeFileString(tempPath, `${value}\n`);
       // Publish the completed file without replacing an ID created by another process.
-      yield* fileSystem
-        .link(tempPath, destinationPath)
-        .pipe(
-          Effect.catch((cause) =>
-            cause.reason._tag === "AlreadyExists" ? Effect.void : Effect.fail(cause),
-          ),
-        );
+      yield* fileSystem.link(tempPath, destinationPath).pipe(
+        Effect.catchIf(
+          (cause) => cause.reason._tag === "AlreadyExists",
+          () => Effect.void,
+        ),
+      );
       if (mode === "recover") {
         // Keep the recovery ID so delayed initializers also publish the same winner.
         yield* fileSystem.remove(tempPath);
@@ -236,6 +235,7 @@ export const make = Effect.gen(function* () {
       threadPinning: true,
       threadPinReorder: true,
       threadActiveReorder: true,
+      threadAutoSettleOptOut: true,
       threadTitleRegeneration: true,
       threadPullRequests: true,
       pullRequestStackActions: true,
diff --git a/apps/server/src/environment/ServerEnvironmentLabel.ts b/apps/server/src/environment/ServerEnvironmentLabel.ts
index 1d944492331a..4a5d0a009b9a 100644
--- a/apps/server/src/environment/ServerEnvironmentLabel.ts
+++ b/apps/server/src/environment/ServerEnvironmentLabel.ts
@@ -128,7 +128,7 @@ const runFriendlyLabelCommand = Effect.fn("runFriendlyLabelCommand")(function* (
             cause,
           }),
       ),
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.catchTags({
         ServerEnvironmentLabelCommandError: (error) =>
           Effect.logDebug(error.message).pipe(
diff --git a/apps/server/src/environment/ServerEnvironmentMachine.ts b/apps/server/src/environment/ServerEnvironmentMachine.ts
index 9d11a1ef59fd..e9f5e51af600 100644
--- a/apps/server/src/environment/ServerEnvironmentMachine.ts
+++ b/apps/server/src/environment/ServerEnvironmentMachine.ts
@@ -107,7 +107,7 @@ const readOptionalFile = Effect.fn("readOptionalFile")(function* (path: string)
   const fileSystem = yield* FileSystem.FileSystem;
   return yield* fileSystem.readFileString(path).pipe(
     Effect.map(normalize),
-    Effect.catch(() => Effect.succeed(null)),
+    Effect.orElseSucceed(() => null),
   );
 });
 
@@ -125,7 +125,7 @@ const runProbe = Effect.fn("runMachineProbe")(function* (input: {
     })
     .pipe(
       Effect.map((result) => (result.code === 0 ? normalize(result.stdout) : null)),
-      Effect.catch(() => Effect.succeed(null)),
+      Effect.orElseSucceed(() => null),
     );
 });
 
diff --git a/apps/server/src/git/GitManager.test.ts b/apps/server/src/git/GitManager.test.ts
index e7aeab087728..115455b3bf56 100644
--- a/apps/server/src/git/GitManager.test.ts
+++ b/apps/server/src/git/GitManager.test.ts
@@ -15,6 +15,7 @@ import * as PlatformError from "effect/PlatformError";
 import * as References from "effect/References";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
+import { TestClock } from "effect/testing";
 import { ChildProcessSpawner } from "effect/unstable/process";
 import { expect } from "vite-plus/test";
 import type {
@@ -1346,7 +1347,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
           prListByHeadSelector: {
             // Fake gh returns raw JSON stdout, matching the CLI boundary under test.
             // @effect-diagnostics-next-line preferSchemaOverJson:off
-            "contributor:feature/deleted-fork-branch": JSON.stringify([
+            "feature/deleted-fork-branch": JSON.stringify([
               {
                 number: 218,
                 title: "Deleted fork branch PR",
@@ -1376,8 +1377,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         updatedAt: "2026-04-05T15:00:00.000Z",
       });
       expect(
-        ghCalls.some((call) => call.includes("--head contributor:feature/deleted-fork-branch")),
+        ghCalls.some((call) => call.includes("--head feature/deleted-fork-branch --state all")),
       ).toBe(true);
+      expect(ghCalls.some((call) => call.includes("--head contributor:"))).toBe(false);
     }),
   );
 
@@ -1528,6 +1530,61 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
     }),
   );
 
+  it.effect("branch PR lookup rechecks open PRs every minute and settled answers less often", () =>
+    Effect.gen(function* () {
+      const repoDir = yield* makeTempDir("t3code-git-manager-");
+      yield* initRepo(repoDir);
+      const remoteDir = yield* createBareRemote();
+      yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
+      for (const branch of ["feature/open-pr", "feature/merged-pr", "feature/no-pr"]) {
+        yield* runGit(repoDir, ["checkout", "-b", branch, "main"]);
+        yield* runGit(repoDir, ["push", "-u", "origin", branch]);
+      }
+      const pullRequest = (number: number, headRefName: string, state: string) => ({
+        number,
+        title: headRefName,
+        url: `https://github.com/pingdotgg/codething-mvp/pull/${number}`,
+        baseRefName: "main",
+        headRefName,
+        state,
+        updatedAt: "2026-04-07T15:00:00Z",
+      });
+      const { manager, ghCalls } = yield* makeManager({
+        ghScenario: {
+          prListByHeadSelector: {
+            "feature/open-pr": encodeCliJson([pullRequest(301, "feature/open-pr", "OPEN")]),
+            "feature/merged-pr": encodeCliJson([pullRequest(302, "feature/merged-pr", "MERGED")]),
+          },
+        },
+      });
+      const lookupAll = Effect.forEach(
+        ["feature/open-pr", "feature/merged-pr", "feature/no-pr"],
+        (branch) => manager.branchPullRequest({ cwd: repoDir, branch }),
+      );
+      const prListCalls = () => ghCalls.filter((call) => call.startsWith("pr list "));
+
+      yield* lookupAll;
+      expect(prListCalls()).toHaveLength(3);
+
+      yield* TestClock.adjust("61 seconds");
+      yield* lookupAll;
+      expect(prListCalls()).toHaveLength(4);
+      expect(prListCalls().at(-1)).toContain("--head feature/open-pr");
+
+      // Just inside the 5-minute window only the open PR is asked again.
+      yield* TestClock.adjust("238 seconds");
+      yield* lookupAll;
+      expect(prListCalls()).toHaveLength(5);
+      expect(prListCalls().at(-1)).toContain("--head feature/open-pr");
+
+      // Just past it the settled answers expire too.
+      yield* TestClock.adjust("2 seconds");
+      yield* lookupAll;
+      expect(prListCalls()).toHaveLength(7);
+      expect(prListCalls().slice(-2).join("\n")).not.toContain("--head feature/open-pr");
+    }),
+  );
+
   it.effect("branch PR lookup propagates provider failures", () =>
     Effect.gen(function* () {
       const repoDir = yield* makeTempDir("t3code-git-manager-");
@@ -1758,8 +1815,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
       const { manager } = yield* makeManager({
         ghScenario: {
           prListByHeadSelector: {
-            "alice:feature": output,
-            "fork:feature": output,
             feature: output,
           },
         },
@@ -1926,10 +1981,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         const { manager, ghCalls } = yield* makeManager({
           ghScenario: {
             prListSequence: [
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              JSON.stringify([]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              JSON.stringify([]),
               // @effect-diagnostics-next-line preferSchemaOverJson:off
               JSON.stringify([
                 {
@@ -1965,7 +2016,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
           updatedAt: "2026-03-10T07:00:00.000Z",
         });
         expect(ghCalls).toContain(
-          "pr list --head jasonLaster:statemachine --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
+          "pr list --head statemachine --state all --limit 100 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
         );
       }),
     20_000,
@@ -1997,7 +2048,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
           ghScenario: {
             prListByHeadSelector: {
               // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "contributor:main": JSON.stringify([
+              main: JSON.stringify([
                 {
                   number: 777,
                   title: "Fork PR from main",
@@ -2031,7 +2082,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
           updatedAt: "2026-03-10T07:00:00.000Z",
         });
         expect(ghCalls).toContain(
-          "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
+          "pr list --head main --state all --limit 100 --json number,title,url,baseRefName,headRefName,state,isDraft,mergedAt,closedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner",
         );
       }),
     20_000,
@@ -2096,34 +2147,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
                   updatedAt: "2026-04-01T10:00:00Z",
                 },
               ]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "pingdotgg:effect-atom": JSON.stringify([]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "my-org/upstream:effect-atom": JSON.stringify([]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "pingdotgg:upstream/effect-atom": JSON.stringify([
-                {
-                  number: 1518,
-                  title: "Wrong PR",
-                  url: "https://github.com/pingdotgg/t3code/pull/1518",
-                  baseRefName: "main",
-                  headRefName: "upstream/effect-atom",
-                  state: "OPEN",
-                  updatedAt: "2026-04-01T10:00:00Z",
-                },
-              ]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "my-org/upstream:upstream/effect-atom": JSON.stringify([
-                {
-                  number: 1518,
-                  title: "Wrong PR",
-                  url: "https://github.com/pingdotgg/t3code/pull/1518",
-                  baseRefName: "main",
-                  headRefName: "upstream/effect-atom",
-                  state: "OPEN",
-                  updatedAt: "2026-04-01T10:00:00Z",
-                },
-              ]),
             },
           },
         });
@@ -2334,7 +2357,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
             prListByHeadSelector: {
               // Fake gh returns raw JSON stdout, matching the CLI boundary under test.
               // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "contributor:feature/fork-plain": JSON.stringify([
+              "feature/fork-plain": JSON.stringify([
                 {
                   number: 89,
                   title: "Fork PR pushed without -u",
@@ -2354,9 +2377,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 
         const status = yield* manager.status({ cwd: repoDir });
         expect(status.pr?.number).toBe(89);
-        expect(ghCalls.some((call) => call.includes("--head contributor:feature/fork-plain"))).toBe(
-          true,
-        );
+        expect(ghCalls.some((call) => call.includes("--head feature/fork-plain"))).toBe(true);
+        expect(ghCalls.some((call) => call.includes("--head contributor:"))).toBe(false);
         expect(ghCalls.some((call) => call.includes("--head main"))).toBe(false);
       }),
   );
@@ -2391,7 +2413,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
           prListByHeadSelector: {
             // Fake gh returns raw JSON stdout, matching the CLI boundary under test.
             // @effect-diagnostics-next-line preferSchemaOverJson:off
-            "contributor:feature/fork-settle": JSON.stringify([
+            "feature/fork-settle": JSON.stringify([
               {
                 number: 91,
                 title: "Fork PR to settle",
@@ -3552,7 +3574,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
   );
 
   it.effect(
-    "returns existing cross-repo PR metadata using the fork owner selector",
+    "returns existing cross-repo PR metadata found under the bare branch name",
     () =>
       Effect.gen(function* () {
         const repoDir = yield* makeTempDir("t3code-git-manager-");
@@ -3571,8 +3593,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         const { manager, ghCalls } = yield* makeManager({
           ghScenario: {
             prListSequence: [
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              JSON.stringify([]),
               // @effect-diagnostics-next-line preferSchemaOverJson:off
               JSON.stringify([
                 {
@@ -3604,7 +3624,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         expect(result.pr.number).toBe(142);
         expect(
           ghCalls.some((call) =>
-            call.includes("pr list --head octocat:statemachine --state open --limit 1"),
+            call.includes("pr list --head statemachine --state open --limit 100"),
           ),
         ).toBe(true);
         expect(ghCalls.some((call) => call.startsWith("pr create "))).toBe(false);
@@ -3670,30 +3690,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
                   headRefName: "upstream/effect-atom",
                 },
               ]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "pingdotgg:effect-atom": JSON.stringify([]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "my-org/upstream:effect-atom": JSON.stringify([]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "pingdotgg:upstream/effect-atom": JSON.stringify([
-                {
-                  number: 1518,
-                  title: "Wrong PR",
-                  url: "https://github.com/pingdotgg/t3code/pull/1518",
-                  baseRefName: "main",
-                  headRefName: "upstream/effect-atom",
-                },
-              ]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "my-org/upstream:upstream/effect-atom": JSON.stringify([
-                {
-                  number: 1518,
-                  title: "Wrong PR",
-                  url: "https://github.com/pingdotgg/t3code/pull/1518",
-                  baseRefName: "main",
-                  headRefName: "upstream/effect-atom",
-                },
-              ]),
             },
           },
         });
@@ -3713,7 +3709,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
   );
 
   it.effect(
-    "prefers owner-qualified selectors before bare branch names for cross-repo PRs",
+    "picks the fork PR among same-named branches from other repositories",
     () =>
       Effect.gen(function* () {
         const repoDir = yield* makeTempDir("t3code-git-manager-");
@@ -3745,9 +3741,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
                   baseRefName: "main",
                   headRefName: "statemachine",
                 },
-              ]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "octocat:statemachine": JSON.stringify([
                 {
                   number: 142,
                   title: "Existing fork PR",
@@ -3764,8 +3757,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
                   },
                 },
               ]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "fork-seed:statemachine": JSON.stringify([]),
             },
           },
         });
@@ -3777,11 +3768,9 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
 
         expect(result.pr.status).toBe("opened_existing");
         expect(result.pr.number).toBe(142);
-
-        const ownerSelectorCallIndex = ghCalls.findIndex((call) =>
-          call.includes("pr list --head octocat:statemachine --state open --limit 1"),
-        );
-        expect(ownerSelectorCallIndex).toBeGreaterThanOrEqual(0);
+        expect(
+          ghCalls.some((call) => /--head [^ ]*:/u.test(call) && call.startsWith("pr list")),
+        ).toBe(false);
         expect(ghCalls.some((call) => call.startsWith("pr create "))).toBe(false);
       }),
     12_000,
@@ -3810,7 +3799,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
           ghScenario: {
             prListByHeadSelector: {
               // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "octocat:statemachine": JSON.stringify([
+              statemachine: JSON.stringify([
                 {
                   number: 142,
                   title: "Existing fork PR",
@@ -3828,11 +3817,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
                 },
               ]),
               // @effect-diagnostics-next-line preferSchemaOverJson:off
-              "fork-seed:statemachine": JSON.stringify([]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
               "t3code/pr-142/statemachine": JSON.stringify([]),
-              // @effect-diagnostics-next-line preferSchemaOverJson:off
-              statemachine: JSON.stringify([]),
             },
           },
         });
@@ -3845,10 +3830,10 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         expect(result.pr.status).toBe("opened_existing");
         expect(result.pr.number).toBe(142);
 
-        const openLookupCalls = ghCalls.filter((call) => call.includes("--state open --limit 1"));
+        const openLookupCalls = ghCalls.filter((call) => call.includes("--state open --limit 100"));
         expect(openLookupCalls).toHaveLength(1);
         expect(openLookupCalls[0]).toContain(
-          "pr list --head octocat:statemachine --state open --limit 1",
+          "pr list --head statemachine --state open --limit 100",
         );
       }),
     12_000,
@@ -3873,12 +3858,10 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         const { manager, ghCalls } = yield* makeManager({
           ghScenario: {
             prListSequenceByHeadSelector: {
-              "octocat:statemachine": [
+              statemachine: [
                 `[{"number":41,"title":"Ambiguous fork PR","url":"https://github.com/pingdotgg/codething-mvp/pull/41","baseRefName":"main","headRefName":"statemachine","state":"OPEN"}]`,
                 `[{"number":142,"title":"Add stacked git actions","url":"https://github.com/pingdotgg/codething-mvp/pull/142","baseRefName":"main","headRefName":"statemachine","state":"OPEN","isCrossRepository":true,"headRepository":{"nameWithOwner":"octocat/codething-mvp"},"headRepositoryOwner":{"login":"octocat"}}]`,
               ],
-              "fork-seed:statemachine": ["[]"],
-              statemachine: ["[]"],
             },
           },
         });
@@ -4109,7 +4092,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
     }),
   );
 
-  it.effect("generates PR content against the remote base when the local base is stale", () =>
+  it.effect("generates PR content from branch changes when the remote base advances", () =>
     Effect.gen(function* () {
       const repoDir = yield* makeTempDir("t3code-git-manager-");
       yield* initRepo(repoDir);
@@ -4141,7 +4124,15 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
       yield* runGit(repoDir, ["push", "-u", "origin", "feature/remote-base"]);
       yield* runGit(repoDir, ["config", "branch.feature/remote-base.gh-merge-base", "main"]);
 
+      NodeFS.writeFileSync(NodePath.join(peerDir, "later-main.txt"), "unrelated\n");
+      yield* runGit(peerDir, ["add", "later-main.txt"]);
+      yield* runGit(peerDir, ["commit", "-m", "Later main commit"]);
+      yield* runGit(peerDir, ["push", "origin", "main"]);
+      yield* runGit(repoDir, ["fetch", "origin"]);
+
       let generatedCommitSummary = "";
+      let generatedDiffSummary = "";
+      let generatedDiffPatch = "";
       const { manager } = yield* makeManager({
         ghScenario: {
           prListSequence: ["[]", "[]"],
@@ -4149,6 +4140,8 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
         textGeneration: {
           generatePrContent: (input) => {
             generatedCommitSummary = input.commitSummary;
+            generatedDiffSummary = input.diffSummary;
+            generatedDiffPatch = input.diffPatch;
             return Effect.succeed({ title: "Feature PR", body: "Feature body" });
           },
         },
@@ -4162,6 +4155,11 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
       expect(result.pr.status).toBe("created");
       expect(generatedCommitSummary).toContain("Feature commit");
       expect(generatedCommitSummary).not.toContain("Remote base commit");
+      expect(generatedCommitSummary).not.toContain("Later main commit");
+      expect(generatedDiffSummary).toContain("feature.txt");
+      expect(generatedDiffSummary).not.toContain("later-main.txt");
+      expect(generatedDiffPatch).toContain("feature.txt");
+      expect(generatedDiffPatch).not.toContain("later-main.txt");
     }),
   );
 
@@ -4262,7 +4260,7 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
       const { manager, ghCalls } = yield* makeManager({
         ghScenario: {
           prListSequenceByHeadSelector: {
-            "octocat:statemachine": [
+            statemachine: [
               // @effect-diagnostics-next-line preferSchemaOverJson:off
               JSON.stringify([]),
               // @effect-diagnostics-next-line preferSchemaOverJson:off
@@ -4284,10 +4282,6 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
                 },
               ]),
             ],
-            // @effect-diagnostics-next-line preferSchemaOverJson:off
-            "fork-seed:statemachine": [JSON.stringify([])],
-            // @effect-diagnostics-next-line preferSchemaOverJson:off
-            statemachine: [JSON.stringify([])],
           },
         },
       });
diff --git a/apps/server/src/git/GitManager.ts b/apps/server/src/git/GitManager.ts
index f09ddb59e679..4ebfce0feb21 100644
--- a/apps/server/src/git/GitManager.ts
+++ b/apps/server/src/git/GitManager.ts
@@ -32,6 +32,7 @@ import {
   ModelSelection,
   type ProjectId,
   SourceControlProviderError,
+  type SourceControlProviderKind,
   type SourceControlWritingStyleSettings,
   type ThreadId,
 } from "@t3tools/contracts";
@@ -144,6 +145,12 @@ const STATUS_RESULT_CACHE_CAPACITY = 2_048;
 // exponentially via prLookupFailureTtl, so throttling pressure still drops
 // under 429s instead of amplifying it.
 const PR_LOOKUP_CACHE_TTL = Duration.seconds(60);
+// Answers without an open PR ("no PR yet", merged, closed) only change when
+// someone opens a PR, and the paths that do that in-app (turn end, push,
+// create PR, user refresh) bypass this cache. Re-asking every minute for each
+// idle branch was the bulk of background GitHub quota use, so these wait out
+// a longer TTL and a PR opened outside the app shows up within minutes.
+const PR_LOOKUP_NO_OPEN_PR_CACHE_TTL = Duration.minutes(5);
 const PR_LOOKUP_FAILURE_BASE_TTL = Duration.seconds(20);
 const PR_LOOKUP_FAILURE_MAX_TTL = Duration.minutes(15);
 const PR_LOOKUP_CACHE_CAPACITY = 2_048;
@@ -588,6 +595,26 @@ function parseCustomCommitMessage(raw: string): { subject: string; body: string
   };
 }
 
+// Without the owner selector, a bare branch name also lists same-named
+// branches on other forks (`main`, `patch-1`), so GitHub probes ask for a full
+// page and let matchesBranchHeadContext pick the right head. gh fetches up to
+// 100 in one request, and GitHub prices a first:100 connection like first:1.
+const GITHUB_HEAD_BRANCH_PROBE_LIMIT = 100;
+
+// `gh pr list --head` filters on the head ref name alone and accepts anything, so an
+// `owner:branch` or `remote:branch` selector silently lists zero pull requests
+// while spending a GraphQL call. Git branch names cannot contain ":", and the
+// bare head branch is always among the selectors, so GitHub probes skip them and
+// leave the owner check to matchesBranchHeadContext.
+function probeableHeadSelectors(
+  providerKind: SourceControlProviderKind,
+  headSelectors: ReadonlyArray<string>,
+): ReadonlyArray<string> {
+  return providerKind === "github"
+    ? headSelectors.filter((selector) => !selector.includes(":"))
+    : headSelectors;
+}
+
 function appendUnique(values: string[], next: string | null | undefined): void {
   const trimmed = next?.trim() ?? "";
   if (trimmed.length === 0 || values.includes(trimmed)) {
@@ -1106,7 +1133,9 @@ export const make = Effect.gen(function* () {
       timeToLive: (exit, key) => {
         if (Exit.isSuccess(exit)) {
           prLookupFailureStreakByKey.delete(key);
-          return PR_LOOKUP_CACHE_TTL;
+          return exit.value.latest?.state === "open"
+            ? PR_LOOKUP_CACHE_TTL
+            : PR_LOOKUP_NO_OPEN_PR_CACHE_TTL;
         }
         return nextPrLookupFailureTtl(key);
       },
@@ -1597,12 +1626,14 @@ export const make = Effect.gen(function* () {
       | "isCrossRepository"
     >,
   ) {
-    for (const headSelector of headContext.headSelectors) {
-      const pullRequests = yield* (yield* sourceControlProvider(cwd)).listChangeRequests({
+    const provider = yield* sourceControlProvider(cwd);
+    const headSelectors = probeableHeadSelectors(provider.kind, headContext.headSelectors);
+    for (const headSelector of headSelectors) {
+      const pullRequests = yield* provider.listChangeRequests({
         cwd,
         headSelector,
         state: "open",
-        limit: 1,
+        limit: provider.kind === "github" ? GITHUB_HEAD_BRANCH_PROBE_LIMIT : 1,
       });
       const normalizedPullRequests = pullRequests.map(toPullRequestInfo);
 
@@ -1627,12 +1658,13 @@ export const make = Effect.gen(function* () {
   ) {
     const parsedByNumber = new Map<number, PullRequestInfo>();
 
-    for (const headSelector of headContext.headSelectors) {
-      const pullRequests = yield* (yield* sourceControlProvider(cwd)).listChangeRequests({
+    const provider = yield* sourceControlProvider(cwd);
+    for (const headSelector of probeableHeadSelectors(provider.kind, headContext.headSelectors)) {
+      const pullRequests = yield* provider.listChangeRequests({
         cwd,
         headSelector,
         state: "all",
-        limit: 20,
+        limit: provider.kind === "github" ? GITHUB_HEAD_BRANCH_PROBE_LIMIT : 20,
       });
 
       for (const pr of pullRequests.map(toPullRequestInfo)) {
@@ -2066,7 +2098,7 @@ export const make = Effect.gen(function* () {
         title: generated.title,
         bodyFile,
       })
-      .pipe(Effect.ensuring(fileSystem.remove(bodyFile).pipe(Effect.catch(() => Effect.void))));
+      .pipe(Effect.ensuring(fileSystem.remove(bodyFile).pipe(Effect.ignore)));
 
     const created = yield* findOpenPr(cwd, headContext);
     if (!created) {
diff --git a/apps/server/src/git/linkCreatedPullRequest.test.ts b/apps/server/src/git/linkCreatedPullRequest.test.ts
index 2c33d82792bd..2e8be05febe7 100644
--- a/apps/server/src/git/linkCreatedPullRequest.test.ts
+++ b/apps/server/src/git/linkCreatedPullRequest.test.ts
@@ -83,7 +83,7 @@ const makeDependencies = (
   Layer.mergeAll(
     Layer.mock(ProjectionSnapshotQuery)({
       getThreadShellById: () => Effect.succeed(Option.fromNullishOr(threadShell)),
-      getProjectShellById: () => Effect.succeed(Option.some(project)),
+      getProjectShellById: () => Effect.succeedSome(project),
     }),
     Layer.mock(OrchestrationEngineService)({
       readEvents: () => Stream.empty,
diff --git a/apps/server/src/http.ts b/apps/server/src/http.ts
index 7533b8c1db19..30b368e62167 100644
--- a/apps/server/src/http.ts
+++ b/apps/server/src/http.ts
@@ -311,9 +311,12 @@ export const serverEnvironmentHttpApiLayer = HttpApiBuilder.group(
 
 class DecodeOtlpTraceRecordsError extends Data.TaggedError("DecodeOtlpTraceRecordsError")<{
   readonly cause: unknown;
-  readonly bodyJson: OtlpTracer.TraceData;
 }> {}
 
+// Renderers export up to once a second while they have spans buffered, so
+// tracing this proxy would add more server spans than it forwards.
+// withTracerEnabled(false) drops the handler's spans, including the forward.
+// untracedRequestsLayer drops the HTTP server span.
 export const otlpTracesProxyRouteLayer = HttpRouter.add(
   "POST",
   OTLP_TRACES_PROXY_PATH,
@@ -330,15 +333,10 @@ export const otlpTracesProxyRouteLayer = HttpRouter.add(
 
     yield* Effect.try({
       try: () => decodeOtlpTraceRecords(bodyJson),
-      catch: (cause) => new DecodeOtlpTraceRecordsError({ cause, bodyJson }),
+      catch: (cause) => new DecodeOtlpTraceRecordsError({ cause }),
     }).pipe(
       Effect.flatMap((records) => browserTraceCollector.record(records)),
-      Effect.catch((cause) =>
-        Effect.logWarning("Failed to decode browser OTLP traces", {
-          cause,
-          bodyJson,
-        }),
-      ),
+      Effect.catch((cause) => Effect.logWarning("Failed to decode browser OTLP traces", { cause })),
     );
 
     if (otlpTracesUrl === undefined) {
@@ -369,9 +367,25 @@ export const otlpTracesProxyRouteLayer = HttpRouter.add(
       EnvironmentInternalError: HttpServerRespondable.toResponse,
       EnvironmentScopeRequiredError: HttpServerRespondable.toResponse,
     }),
+    Effect.withTracerEnabled(false),
   ),
 );
 
+const UNTRACED_REQUEST_PATHS: ReadonlySet<string> = new Set([OTLP_TRACES_PROXY_PATH]);
+
+// Skips the HTTP server span for UNTRACED_REQUEST_PATHS. That span starts
+// before routing, so a route handler cannot skip it. TracerDisabledWhen is one
+// predicate for the whole server and the last layer to provide it wins, so
+// makeRoutesLayer provides this one last. Add paths here instead of providing
+// TracerDisabledWhen again; server.test.ts fails if a later layer replaces it.
+// The query string is ignored, as in routing.
+export const untracedRequestsLayer = Layer.succeed(HttpMiddleware.TracerDisabledWhen)((request) => {
+  const queryIndex = request.url.indexOf("?");
+  return UNTRACED_REQUEST_PATHS.has(
+    queryIndex === -1 ? request.url : request.url.slice(0, queryIndex),
+  );
+});
+
 export const assetRouteLayer = HttpRouter.add(
   "GET",
   `${ASSET_ROUTE_PREFIX}/*`,
diff --git a/apps/server/src/keybindings.test.ts b/apps/server/src/keybindings.test.ts
index ec7070809435..fb256f25500a 100644
--- a/apps/server/src/keybindings.test.ts
+++ b/apps/server/src/keybindings.test.ts
@@ -567,13 +567,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       );
       yield* Effect.gen(function* () {
         const keybindings = yield* Keybindings.Keybindings;
-        yield* Effect.all(
-          commands.map((command, index) =>
+        yield* Effect.forEach(
+          commands,
+          (command, index) =>
             keybindings.upsertKeybindingRule({
               key: `mod+${String.fromCharCode(97 + index)}`,
               command,
             }),
-          ),
           { concurrency: "unbounded", discard: true },
         );
       });
diff --git a/apps/server/src/mcp/McpHttpServer.test.ts b/apps/server/src/mcp/McpHttpServer.test.ts
index 15518e47a497..5619f19b2549 100644
--- a/apps/server/src/mcp/McpHttpServer.test.ts
+++ b/apps/server/src/mcp/McpHttpServer.test.ts
@@ -6,7 +6,6 @@ import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
-import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
@@ -56,7 +55,7 @@ const PullRequestsTestLayer = McpHttpServer.PullRequestsToolkitRegistrationLive.
   Layer.provide(
     Layer.mergeAll(
       Layer.mock(ProjectionSnapshotQuery)({
-        getThreadShellById: () => Effect.succeed(Option.none()),
+        getThreadShellById: () => Effect.succeedNone,
       }),
       Layer.mock(OrchestrationEngineService)({}),
       NodeServices.layer,
@@ -162,21 +161,73 @@ it.effect.each([{}, { includeImage: false }])(
             Effect.provideService(McpSchema.McpServerClient, client),
           );
 
+        const message = "Preview automation snapshot failed on client mcp-failure-client.";
         expect(snapshot.isError).toBe(true);
         expect(snapshot.content).toEqual([
-          { type: "text", text: "Preview snapshot failed: PreviewAutomationExecutionError." },
+          { type: "text", text: `Preview snapshot failed: ${message}` },
         ]);
         expect(snapshot.structuredContent).toEqual({
           error: {
             _tag: "PreviewAutomationExecutionError",
             operation: "snapshot",
             failureCount: 1,
+            message,
           },
         });
       }),
     ).pipe(Effect.provide(TestLayer)),
 );
 
+it.effect.each([
+  { args: {}, advice: "No active preview tab was found for snapshot. Call preview_open first." },
+  {
+    args: { tabId: alternateTabId },
+    advice: `Preview tab ${alternateTabId} was not found for snapshot. Omit tabId to use the current tab, or call preview_open.`,
+  },
+])("tells the agent to open a tab when the snapshot has none $args", ({ args, advice }) =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
+      const connected = yield* Deferred.make<void>();
+      const events = yield* broker.connect({ clientId: "mcp-no-tab-client", environmentId });
+      yield* Stream.runForEach(events, (event) =>
+        event.type === "connected"
+          ? Deferred.succeed(connected, undefined)
+          : broker.respond({
+              clientId: "mcp-no-tab-client",
+              connectionId: event.connectionId,
+              requestId: event.request.requestId,
+              ok: false,
+              error: { _tag: "PreviewAutomationTabNotFoundError", message: "no tab" },
+            }),
+      ).pipe(Effect.forkScoped);
+      yield* Deferred.await(connected);
+
+      const snapshot = yield* callSnapshot(args);
+
+      expect(snapshot.isError).toBe(true);
+      expect(snapshot.content).toEqual([
+        { type: "text", text: `Preview snapshot failed: ${advice}` },
+      ]);
+    }),
+  ).pipe(Effect.provide(TestLayer)),
+);
+
+it.effect("tells the agent how to fall back when no desktop app can run the snapshot", () =>
+  Effect.gen(function* () {
+    const snapshot = yield* callSnapshot({});
+
+    expect(snapshot.isError).toBe(true);
+    const [text] = snapshot.content;
+    expect(text?.type === "text" ? text.text : "").toContain(
+      "use a headless browser from the shell",
+    );
+    expect(snapshot.structuredContent).toMatchObject({
+      error: { _tag: "PreviewAutomationNoAvailableHostError" },
+    });
+  }).pipe(Effect.provide(TestLayer)),
+);
+
 it.effect.each([
   { mode: "default", input: {}, images: true },
   { mode: "explicit image", input: { includeImage: true }, images: true },
@@ -249,7 +300,10 @@ it.effect.each([
         const metadata = { ...page, title: `Snapshot ${call}`, screenshot };
         const { accessibilityTree: _tree, ...boundedMetadata } = metadata;
         expect(snapshot.isError).toBe(false);
-        expect(snapshot.structuredContent).toEqual(metadata);
+        expect(snapshot.structuredContent).toEqual({
+          ...boundedMetadata,
+          omitted: ["accessibilityTree (use interactiveElements locators or preview_evaluate)"],
+        });
         const [identity, text, ...rest] = snapshot.content;
         expect(identity?.type === "text" ? decodeJsonText(identity.text) : null).toEqual({
           url: page.url,
@@ -288,7 +342,8 @@ it.effect.each([
         "text",
         "image",
       ]);
-      expect(nextDefault.structuredContent).toEqual({ ...page, title: "Snapshot 7", screenshot });
+      expect(nextDefault.structuredContent).toMatchObject({ title: "Snapshot 7", screenshot });
+      expect(nextDefault.structuredContent).not.toHaveProperty("accessibilityTree");
       expect(requests).toBe(7);
     }),
   ).pipe(Effect.provide(TestLayer)),
@@ -342,6 +397,15 @@ it.effect("saves the snapshot PNG on request and reports its path", () =>
 
       const unsaved = yield* callSnapshot({});
       expect(unsaved.structuredContent).not.toHaveProperty("screenshotPath");
+
+      // A save without the image skips the page dump.
+      const pathOnly = yield* callSnapshot({ save: true, includeImage: false });
+      const saved = pathOnly.structuredContent as { readonly screenshotPath: string };
+      expect(saved).toEqual({ url: snapshotResult.url, screenshotPath: expect.any(String) });
+      expect(Buffer.from(yield* fileSystem.readFile(saved.screenshotPath)).toString()).toBe("png");
+      const [only, ...others] = pathOnly.content;
+      expect(others).toEqual([]);
+      expect(only?.type === "text" ? decodeJsonText(only.text) : null).toEqual(saved);
     }),
   ).pipe(Effect.provide(TestLayer)),
 );
@@ -461,9 +525,10 @@ it.effect("keeps the snapshot text under the agent's output ceiling", () =>
       expect(parsed.consoleEntries[0]?.text).toBe("entry 60");
       expect(notice?.type === "text" ? notice.text : "").toContain("accessibilityTree");
       expect(notice?.type === "text" ? notice.text : "").toContain("60 older console entries");
-      // The structured result is untouched; only the text the agent reads is bounded.
-      expect(snapshot.structuredContent).toMatchObject({
-        accessibilityTree: oversized.accessibilityTree,
+      // Claude Code shows the model structuredContent instead of the text, so it is bounded too.
+      expect(snapshot.structuredContent).toEqual({
+        ...parsed,
+        omitted: expect.arrayContaining(["60 older console entries"]),
       });
     }),
   ).pipe(Effect.provide(TestLayer)),
@@ -501,6 +566,45 @@ it.effect("bounds the snapshot text even when nothing but logs and the title are
   ).pipe(Effect.provide(TestLayer)),
 );
 
+it.effect("bounds page text made of wide characters before dropping locators", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      // The character caps alone leave 8,000 three-byte characters, about 24 KB.
+      yield* serveSnapshots("mcp-wide-text-client", {
+        ...snapshotResult,
+        visibleText: "界".repeat(9_000),
+        interactiveElements: Array.from({ length: 20 }, (_, i) => ({
+          tag: "button",
+          role: "button",
+          name: `Button ${i}`,
+          selector: `#button-${i}`,
+          x: 0,
+          y: 0,
+          width: 10,
+          height: 10,
+        })),
+      });
+
+      const snapshot = yield* callSnapshot({ includeImage: false });
+
+      const [, text, notice] = snapshot.content;
+      const body = text?.type === "text" ? text.text : "";
+      expect(Buffer.byteLength(body, "utf8")).toBeLessThanOrEqual(
+        McpHttpServer.MAX_SNAPSHOT_TEXT_BYTES,
+      );
+      const parsed = decodeJsonText(body) as {
+        readonly visibleText: string;
+        readonly interactiveElements: ReadonlyArray<unknown>;
+      };
+      expect(parsed.visibleText).toMatch(/^界+…$/);
+      expect(parsed.interactiveElements).toHaveLength(20);
+      expect(notice?.type === "text" ? notice.text : "").toContain(
+        "visibleText after 4000 characters",
+      );
+    }),
+  ).pipe(Effect.provide(TestLayer)),
+);
+
 it.effect("sheds log entries before locators when every list is full", () =>
   Effect.scoped(
     Effect.gen(function* () {
diff --git a/apps/server/src/mcp/McpHttpServer.ts b/apps/server/src/mcp/McpHttpServer.ts
index 52130d69fa55..9ac823674952 100644
--- a/apps/server/src/mcp/McpHttpServer.ts
+++ b/apps/server/src/mcp/McpHttpServer.ts
@@ -13,6 +13,7 @@ import * as Stream from "effect/Stream";
 import type * as Types from "effect/Types";
 import { McpProtocol, McpSchema, McpServer, Tool } from "effect/unstable/ai";
 import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/unstable/http";
+import { PreviewAutomationError } from "@t3tools/contracts";
 
 import packageJson from "../../package.json" with { type: "json" };
 import * as ServerConfig from "../config.ts";
@@ -114,12 +115,15 @@ const McpAuthMiddlewareLive = HttpRouter.middleware<{
 }>()(makeMcpAuthMiddleware).layer;
 
 /**
- * Claude Code drops every MCP result above 25k tokens (~100 KB of text) and
- * hands the agent a truncation notice instead, so a snapshot that carries the
- * full accessibility tree and 20 KB of page text loses its locators too. Keep
- * the text under that ceiling and tell the agent what was cut.
+ * Claude Code moves an MCP result above its output limit to a file and hands
+ * the agent a notice instead, so a snapshot that carries the full
+ * accessibility tree and page text loses its locators too. Claude Code also
+ * shows the model `structuredContent` in place of the text blocks when a
+ * result has both, so both carry the same bounded snapshot. Keep it near
+ * 20 KB and tell the agent what was cut. The short `omitted` notes may go a
+ * little over; the provider limit is far above this.
  */
-export const MAX_SNAPSHOT_TEXT_BYTES = 60_000;
+export const MAX_SNAPSHOT_TEXT_BYTES = 20_000;
 const MAX_SNAPSHOT_VISIBLE_TEXT_CHARS = 8_000;
 const MAX_SNAPSHOT_ELEMENT_NAME_CHARS = 200;
 const MAX_SNAPSHOT_LOG_ENTRIES = 40;
@@ -164,12 +168,11 @@ type SnapshotMetadata = {
 /**
  * Drops the accessibility tree, shortens page text, element names, identifiers,
  * and log strings, keeps only the newest log entries, and finally sheds
- * interactive elements until the JSON fits. Returns the text plus notes on
- * what is missing so the agent can reach for preview_evaluate.
+ * interactive elements until the JSON fits. Returns the bounded value, its
+ * text, and notes on what is missing so the agent can reach for
+ * preview_evaluate.
  */
-const boundSnapshotMetadata = (
-  metadata: SnapshotMetadata,
-): { readonly text: string; readonly omitted: ReadonlyArray<string> } => {
+const boundSnapshotMetadata = (metadata: SnapshotMetadata) => {
   const omitted: Array<string> = [];
   const { accessibilityTree, ...withoutTree } = metadata;
   if (accessibilityTree !== undefined) {
@@ -198,16 +201,10 @@ const boundSnapshotMetadata = (
   ) {
     omitted.push(`element names longer than ${MAX_SNAPSHOT_ELEMENT_NAME_CHARS} characters`);
   }
-  if (metadata.visibleText.length > MAX_SNAPSHOT_VISIBLE_TEXT_CHARS) {
-    omitted.push(
-      `visibleText after ${MAX_SNAPSHOT_VISIBLE_TEXT_CHARS} characters (use preview_evaluate for more)`,
-    );
-  }
   const bounded = {
     ...withoutTree,
     url: cutText(metadata.url, MAX_SNAPSHOT_IDENTIFIER_CHARS),
     title: cutText(metadata.title, MAX_SNAPSHOT_IDENTIFIER_CHARS),
-    visibleText: cutText(metadata.visibleText, MAX_SNAPSHOT_VISIBLE_TEXT_CHARS),
     interactiveElements: metadata.interactiveElements.map((element) => ({
       ...element,
       name: cutText(element.name, MAX_SNAPSHOT_ELEMENT_NAME_CHARS),
@@ -218,9 +215,10 @@ const boundSnapshotMetadata = (
   };
 
   // Per-field caps do not sum below the ceiling: three log arrays of 40 capped
-  // entries alone can pass 60 KB. Shed the least useful lists first, halving
-  // one list per round, until the JSON fits. With every list empty the rest
-  // is bounded by the identifier and visibleText caps, so this terminates.
+  // entries alone can pass 60 KB, and the caps count characters, not bytes.
+  // Halve one thing per round until the JSON fits: logs first, then page
+  // text, then the locators. The identifier caps bound the rest, so this
+  // terminates.
   const shedOrder = [
     "actionTimeline",
     "networkEntries",
@@ -239,31 +237,51 @@ const boundSnapshotMetadata = (
     networkEntries: 0,
     actionTimeline: 0,
   };
-  let text = encodeJsonText({ ...bounded, ...lists });
+  let visibleTextChars = Math.min(metadata.visibleText.length, MAX_SNAPSHOT_VISIBLE_TEXT_CHARS);
+  const value = () => ({
+    ...bounded,
+    visibleText: cutText(metadata.visibleText, visibleTextChars),
+    ...lists,
+  });
+  let text = encodeJsonText(value());
   while (utf8Length(text) > MAX_SNAPSHOT_TEXT_BYTES) {
     // Elements carry the locators, so they go last; logs shed newest-last.
     const key =
       shedOrder.find(
         (candidate) => candidate !== "interactiveElements" && lists[candidate].length > 0,
-      ) ?? (lists.interactiveElements.length > 0 ? "interactiveElements" : undefined);
+      ) ??
+      (visibleTextChars > 0
+        ? "visibleText"
+        : lists.interactiveElements.length > 0
+          ? "interactiveElements"
+          : undefined);
     if (key === undefined) break;
-    const keep = Math.floor(lists[key].length / 2);
-    dropped[key] += lists[key].length - keep;
-    // slice(-0) keeps everything, so spell out the empty case.
-    lists[key] =
-      keep === 0
-        ? []
-        : key === "interactiveElements"
-          ? lists[key].slice(0, keep)
-          : lists[key].slice(-keep);
-    text = encodeJsonText({ ...bounded, ...lists });
+    if (key === "visibleText") {
+      visibleTextChars = Math.floor(visibleTextChars / 2);
+    } else {
+      const keep = Math.floor(lists[key].length / 2);
+      dropped[key] += lists[key].length - keep;
+      // slice(-0) keeps everything, so spell out the empty case.
+      lists[key] =
+        keep === 0
+          ? []
+          : key === "interactiveElements"
+            ? lists[key].slice(0, keep)
+            : lists[key].slice(-keep);
+    }
+    text = encodeJsonText(value());
+  }
+  if (visibleTextChars < metadata.visibleText.length) {
+    omitted.push(
+      `visibleText after ${visibleTextChars} characters (use preview_evaluate for more)`,
+    );
   }
   for (const key of shedOrder) {
     if (dropped[key] > 0) {
       omitted.push(`${dropped[key]} of ${bounded[key].length} ${key}`);
     }
   }
-  return { text, omitted };
+  return { value: value(), text, omitted };
 };
 
 export class PreviewScreenshotSaveError extends Schema.TaggedError<PreviewScreenshotSaveError>()(
@@ -311,6 +329,8 @@ const saveScreenshot = Effect.fn("McpHttpServer.saveScreenshot")(function* (
   return screenshotPath;
 });
 
+const isPreviewAutomationError = Schema.is(PreviewAutomationError);
+
 const previewSnapshotFailure = <E>(cause: Cause.Cause<E>) => {
   if (Cause.hasInterrupts(cause) || cause.reasons.some(Cause.isDieReason)) {
     return Effect.failCause(cause).pipe(Effect.orDie);
@@ -324,6 +344,9 @@ const previewSnapshotFailure = <E>(cause: Cause.Cause<E>) => {
     typeof firstFailure._tag === "string"
       ? firstFailure._tag
       : "PreviewSnapshotError";
+  // Preview errors build their message on the server, never from page output,
+  // and it tells the agent what to do next, such as falling back to a shell browser.
+  const message = isPreviewAutomationError(firstFailure) ? firstFailure.message : undefined;
   const result = new McpSchema.CallToolResult({
     isError: true,
     structuredContent: {
@@ -331,10 +354,11 @@ const previewSnapshotFailure = <E>(cause: Cause.Cause<E>) => {
         _tag: errorTag,
         operation: "snapshot",
         failureCount: failures.length,
+        ...(message === undefined ? {} : { message }),
       },
     },
-    // Agents usually see only the text content, so name the tag there too.
-    content: [{ type: "text", text: `Preview snapshot failed: ${errorTag}.` }],
+    // Some clients show only the text content and others only structuredContent, so both carry it.
+    content: [{ type: "text", text: `Preview snapshot failed: ${message ?? `${errorTag}.`}` }],
   });
   return Effect.logWarning("preview snapshot failed", {
     operation: "snapshot",
@@ -396,6 +420,18 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot
               const png = new Uint8Array(Buffer.from(screenshot.data, "base64"));
               const screenshotPath =
                 payload?.save === true ? yield* saveScreenshot(snapshot.url, png) : undefined;
+              if (screenshotPath !== undefined && payload?.includeImage === false) {
+                // The agent only wants a file to show the user. The url keeps the site icon on the tool row.
+                const saved = {
+                  url: cutText(snapshot.url, MAX_SNAPSHOT_IDENTIFIER_CHARS),
+                  screenshotPath,
+                };
+                return new McpSchema.CallToolResult({
+                  isError: false,
+                  structuredContent: saved,
+                  content: [{ type: "text", text: encodeJsonText(saved) }],
+                });
+              }
               const metadata = {
                 ...page,
                 screenshot: {
@@ -408,7 +444,10 @@ const registerPreviewSnapshot = Effect.fn("McpHttpServer.registerPreviewSnapshot
               const bounded = boundSnapshotMetadata(metadata);
               return new McpSchema.CallToolResult({
                 isError: false,
-                structuredContent: metadata,
+                structuredContent:
+                  bounded.omitted.length === 0
+                    ? bounded.value
+                    : { ...bounded.value, omitted: bounded.omitted },
                 content: [
                   // Keep the page identity readable even if a provider truncates the snapshot.
                   {
diff --git a/apps/server/src/mcp/McpInvocationContext.test.ts b/apps/server/src/mcp/McpInvocationContext.test.ts
index 123944206e37..4314c82e6ddc 100644
--- a/apps/server/src/mcp/McpInvocationContext.test.ts
+++ b/apps/server/src/mcp/McpInvocationContext.test.ts
@@ -34,7 +34,8 @@ it.effect("reports the scoped credential context when preview capability is unav
       providerSessionId: invocation.providerSessionId,
       providerInstanceId: invocation.providerInstanceId,
     });
-    expect(error.message).toBe("MCP credential does not grant the preview capability.");
+    expect(error.message).toContain("MCP credential does not grant the preview capability");
+    expect(error.message).toContain("use a headless browser from the shell");
   });
 });
 
diff --git a/apps/server/src/mcp/McpInvocationContext.ts b/apps/server/src/mcp/McpInvocationContext.ts
index eddfa7270a77..96ddd8f7bfc1 100644
--- a/apps/server/src/mcp/McpInvocationContext.ts
+++ b/apps/server/src/mcp/McpInvocationContext.ts
@@ -47,9 +47,11 @@ const missingCapability = (
 export const requireMcpCapability = <const C extends McpCapability>(
   capability: C,
 ): Effect.Effect<McpInvocationScope, McpCapabilityError<C>, McpInvocationContext> =>
-  Effect.flatMap(McpInvocationContext, (invocation) =>
-    invocation.capabilities.has(capability)
-      ? Effect.succeed(invocation)
-      : // The conditional type narrows what the literal argument decided at runtime.
-        Effect.fail(missingCapability(invocation, capability) as McpCapabilityError<C>),
-  ).pipe(Effect.withSpan("mcp.requireCapability"));
+  McpInvocationContext.pipe(
+    Effect.filterOrFail(
+      (invocation) => invocation.capabilities.has(capability),
+      // The conditional type narrows what the literal argument decided at runtime.
+      (invocation) => missingCapability(invocation, capability) as McpCapabilityError<C>,
+    ),
+    Effect.withSpan("mcp.requireCapability"),
+  );
diff --git a/apps/server/src/mcp/McpSessionRegistry.ts b/apps/server/src/mcp/McpSessionRegistry.ts
index fa0a17d826f9..50441df96a63 100644
--- a/apps/server/src/mcp/McpSessionRegistry.ts
+++ b/apps/server/src/mcp/McpSessionRegistry.ts
@@ -230,7 +230,7 @@ export const issueActiveMcpCredential = (
     ? activeMcpSessionRegistry
         .revokeThread(request.threadId)
         .pipe(Effect.andThen(activeMcpSessionRegistry.issue(request)))
-    : Effect.sync((): McpIssuedCredential | undefined => undefined);
+    : Effect.undefined;
 
 /**
  * Refreshes the liveness of a thread's MCP credential. Called on every provider
diff --git a/apps/server/src/mcp/PreviewAutomationBroker.test.ts b/apps/server/src/mcp/PreviewAutomationBroker.test.ts
index ef552f9b04d0..7a8ed739d734 100644
--- a/apps/server/src/mcp/PreviewAutomationBroker.test.ts
+++ b/apps/server/src/mcp/PreviewAutomationBroker.test.ts
@@ -685,6 +685,7 @@ it.effect("pins a provider session to its initial host despite later focus chang
         environmentId: scope.environmentId,
         connectionId: "connection-stale",
         focused: true,
+        liveTabs: [{ threadId: scope.threadId, tabId: PreviewTabId.make("stale-tab") }],
       });
       expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
         "second",
@@ -725,6 +726,130 @@ it.effect("pins a provider session to its initial host despite later focus chang
   ),
 );
 
+it.effect("prefers the live tab owner for new sessions without moving existing leases", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const broker = yield* makeBroker;
+      const connections = new Map<string, string>();
+      for (const clientId of ["owner", "other"]) {
+        const requests = requestsFrom(
+          yield* broker.connect(makeHost({ clientId })),
+          (connectionId) => connections.set(clientId, connectionId),
+        );
+        yield* Stream.runForEach(requests, (request) =>
+          broker.respond({
+            clientId,
+            connectionId: request.connectionId,
+            requestId: request.requestId,
+            ok: true,
+            result: clientId,
+          }),
+        ).pipe(Effect.forkScoped);
+      }
+      yield* Effect.yieldNow;
+      yield* broker.focusHost({
+        clientId: "owner",
+        environmentId: scope.environmentId,
+        connectionId: connections.get("owner")!,
+        focused: false,
+        liveTabs: [
+          { threadId: scope.threadId, tabId: PreviewTabId.make("signed-in"), visible: true },
+        ],
+      });
+      yield* broker.focusHost({
+        clientId: "other",
+        environmentId: scope.environmentId,
+        connectionId: connections.get("other")!,
+        focused: true,
+        liveTabs: [
+          { threadId: scope.threadId, tabId: PreviewTabId.make("signed-in"), visible: false },
+          {
+            threadId: ThreadId.make("another-thread"),
+            tabId: PreviewTabId.make("different-tab"),
+            visible: true,
+          },
+        ],
+      });
+      expect(yield* broker.invoke<string>({ scope, operation: "evaluate", input: {} })).toBe(
+        "owner",
+      );
+      expect(
+        yield* broker.invoke<string>({
+          scope: { ...scope, providerSessionId: "explicit-owner" },
+          tabId: PreviewTabId.make("signed-in"),
+          operation: "snapshot",
+          input: {},
+        }),
+      ).toBe("owner");
+      expect(
+        yield* broker.invoke<string>({
+          scope: { ...scope, providerSessionId: "other-tab" },
+          tabId: PreviewTabId.make("different-tab"),
+          operation: "evaluate",
+          input: {},
+        }),
+      ).toBe("other");
+
+      yield* broker.focusHost({
+        clientId: "owner",
+        environmentId: scope.environmentId,
+        connectionId: connections.get("owner")!,
+        focused: false,
+        liveTabs: [],
+      });
+      expect(yield* broker.invoke<string>({ scope, operation: "evaluate", input: {} })).toBe(
+        "owner",
+      );
+      expect(
+        yield* broker.invoke<string>({
+          scope: { ...scope, providerSessionId: "after-tab-closed" },
+          operation: "evaluate",
+          input: {},
+        }),
+      ).toBe("other");
+    }),
+  ),
+);
+
+it.effect("prefers a focused host over unrelated extra capabilities for a new session", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const broker = yield* makeBroker;
+      let focusedConnectionId = "";
+      for (const [clientId, supportedOperations] of [
+        ["focused", ["status"]],
+        ["background", ["status", "resize"]],
+      ] as const) {
+        const requests = requestsFrom(
+          yield* broker.connect(makeHost({ clientId, supportedOperations })),
+          (connectionId) => {
+            if (clientId === "focused") focusedConnectionId = connectionId;
+          },
+        );
+        yield* Stream.runForEach(requests, (request) =>
+          broker.respond({
+            clientId,
+            connectionId: request.connectionId,
+            requestId: request.requestId,
+            ok: true,
+            result: clientId,
+          }),
+        ).pipe(Effect.forkScoped);
+      }
+      yield* Effect.yieldNow;
+      yield* broker.focusHost({
+        clientId: "focused",
+        environmentId: scope.environmentId,
+        connectionId: focusedConnectionId,
+        focused: true,
+      });
+      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
+        "focused",
+      );
+    }),
+  ),
+);
+
 it.effect("does not route new operations to legacy hosts that did not advertise support", () =>
   Effect.scoped(
     Effect.gen(function* () {
@@ -921,6 +1046,7 @@ it.effect("fails over a pinned provider session only after its host disconnects"
         environmentId: scope.environmentId,
         connectionId: firstConnectionId,
         focused: true,
+        liveTabs: [{ threadId: scope.threadId, tabId: firstTabId }],
       });
       expect(yield* broker.invoke({ scope, operation: "open", input: {} })).toEqual({
         host: "first",
diff --git a/apps/server/src/mcp/PreviewAutomationBroker.ts b/apps/server/src/mcp/PreviewAutomationBroker.ts
index 527f71f5915d..65e3064f49a5 100644
--- a/apps/server/src/mcp/PreviewAutomationBroker.ts
+++ b/apps/server/src/mcp/PreviewAutomationBroker.ts
@@ -73,6 +73,7 @@ interface ClientConnection {
   readonly environmentId: PreviewAutomationHost["environmentId"];
   readonly supportedOperations: ReadonlySet<PreviewAutomationOperation>;
   readonly focused: boolean;
+  readonly liveTabs: NonNullable<PreviewAutomationHostFocus["liveTabs"]>;
   readonly focusOrder: number;
   readonly queue: Queue.Queue<PreviewAutomationStreamEvent, Cause.Done>;
 }
@@ -376,6 +377,7 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
       environmentId: host.environmentId,
       supportedOperations: new Set(host.supportedOperations ?? PREVIEW_AUTOMATION_V1_OPERATIONS),
       focused: false,
+      liveTabs: [],
       focusOrder: 0,
       queue,
     };
@@ -432,6 +434,7 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
       clients.set(host.clientId, {
         ...currentHost,
         focused: host.focused,
+        liveTabs: host.liveTabs ?? currentHost.liveTabs,
         focusOrder: host.focused ? focusSequence : currentHost.focusOrder,
       });
       return { ...current, clients, focusSequence };
@@ -492,6 +495,13 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
       // operation is not silently moved to a newer client: the caller gets a
       // capability failure and can deliberately start a fresh provider
       // session. A dead lease is pruned above and may fail over.
+      const ownsTargetTab = (host: ClientConnection, visibleOnly = false) =>
+        host.liveTabs.some(
+          (tab) =>
+            tab.threadId === input.scope.threadId &&
+            (!visibleOnly || tab.visible === true) &&
+            (input.tabId === undefined || tab.tabId === input.tabId),
+        );
       const connection =
         hasLiveAssignment && supportsOperation(assignedConnection, input.operation)
           ? assignedConnection
@@ -505,7 +515,8 @@ export const make = Effect.gen(function* PreviewAutomationBrokerMake() {
                 )
                 .sort(
                   (left, right) =>
-                    right.supportedOperations.size - left.supportedOperations.size ||
+                    Number(ownsTargetTab(right, true)) - Number(ownsTargetTab(left, true)) ||
+                    Number(ownsTargetTab(right)) - Number(ownsTargetTab(left)) ||
                     Number(right.focused) - Number(left.focused) ||
                     right.focusOrder - left.focusOrder,
                 )[0];
diff --git a/apps/server/src/mcp/toolkits/device/handlers.ts b/apps/server/src/mcp/toolkits/device/handlers.ts
index d2c23860c9b7..b6a8ed3d6323 100644
--- a/apps/server/src/mcp/toolkits/device/handlers.ts
+++ b/apps/server/src/mcp/toolkits/device/handlers.ts
@@ -59,7 +59,7 @@ export function agentDeviceQuickStart(
     `  ${executable} screenshot /tmp/shot.png ${target}        # or call device_screenshot`,
     `  ${executable} install <app> <path-to-.app-or-.apk> ${target}`,
     `Prefer snapshot refs over coordinates. Run ${executable} help for workflow guides and ${executable} <command> --help for flags.`,
-    "Do not call simctl, adb, xcrun, or serve-sim directly while these tools are attached; use agent-device.",
+    "Prefer agent-device for driving this device. simctl, adb, and xcrun remain available for anything it does not cover.",
     "For remote hosts, arrange builds, app installation, and any Metro reverse forwarding yourself. T3 provides discovery, streaming, and control only.",
     "Keep the returned --config and --session flags on every command. Other hosts can be used concurrently; opening one does not switch these commands.",
     platformNotes,
diff --git a/apps/server/src/mcp/toolkits/preview/handlers.ts b/apps/server/src/mcp/toolkits/preview/handlers.ts
index caa4cbd157cf..b70e68862683 100644
--- a/apps/server/src/mcp/toolkits/preview/handlers.ts
+++ b/apps/server/src/mcp/toolkits/preview/handlers.ts
@@ -87,7 +87,7 @@ const invoke = Effect.fn("PreviewToolkit.invoke")(function* <A>(
       updateCurrentTab: false,
       ...(statusTabId === undefined ? {} : { tabId: statusTabId }),
     })
-    .pipe(Effect.catch(() => Effect.succeed(null)));
+    .pipe(Effect.orElseSucceed(() => null));
   return {
     result,
     ...(page?.url && /^https?:\/\//i.test(page.url) && page.url.length <= 4096
@@ -175,10 +175,11 @@ export const claimPreviewRecording = Effect.fn("PreviewToolkit.claimRecording")(
     yield* fileSystem.rename(currentPath, finalPath);
   }).pipe(
     // Another stop may already have claimed this exact upload for this thread.
-    Effect.catch((cause) =>
-      cause._tag !== "PreviewAutomationRecordingTransferError" && cause.reason._tag === "NotFound"
-        ? validateFile(finalPath)
-        : Effect.fail(cause),
+    Effect.catchIf(
+      (cause) =>
+        cause._tag !== "PreviewAutomationRecordingTransferError" &&
+        cause.reason._tag === "NotFound",
+      () => validateFile(finalPath),
     ),
     Effect.mapError((cause) => new PreviewAutomationRecordingTransferError({ threadId, cause })),
   );
diff --git a/apps/server/src/mcp/toolkits/preview/tools.ts b/apps/server/src/mcp/toolkits/preview/tools.ts
index 3f80e84e9a59..1c790e8b643a 100644
--- a/apps/server/src/mcp/toolkits/preview/tools.ts
+++ b/apps/server/src/mcp/toolkits/preview/tools.ts
@@ -119,7 +119,7 @@ const PreviewSetAppearanceTool = safeBrowserTool(
 export const PreviewSnapshotTool = readonlyBrowserTool(
   Tool.make("preview_snapshot", {
     description:
-      "Inspect a page before interacting. Pass tabId to inspect a specific tab; omit it to use this agent session's current tab. Returns page state, semantic elements, diagnostics, action history, and a PNG screenshot. Set includeImage=false for text-only output with the same page metadata. Set save=true to also write the PNG to disk and get screenshotPath back; embed that path in your reply as ![alt](screenshotPath) so the user sees it. This is the only way to show the user a screenshot; the image in the tool result is not saved anywhere.",
+      "Inspect a page before interacting. Pass tabId to inspect a specific tab; omit it to use this agent session's current tab. Returns page state, semantic elements, diagnostics, action history, and a PNG screenshot. The text is capped near 20 KB and lists what it omitted; use preview_evaluate to read more. Set includeImage=false for text-only output with the same page metadata. Set save=true to also write the PNG to disk and get screenshotPath back; with includeImage=false, save=true returns only the url and screenshotPath. Embed that path in your reply as ![alt](screenshotPath) so the user sees it. This is the only way to show the user a screenshot; the image in the tool result is not saved anywhere.",
     parameters: Schema.Struct({
       ...PreviewAutomationTabTargetInput.fields,
       includeImage: Schema.optional(
@@ -131,7 +131,7 @@ export const PreviewSnapshotTool = readonlyBrowserTool(
       save: Schema.optional(
         Schema.Boolean.annotate({
           description:
-            "Write the screenshot PNG to disk and return its absolute path as screenshotPath. Defaults to false.",
+            "Write the screenshot PNG to disk and return its absolute path as screenshotPath. With includeImage=false, return only the url and screenshotPath. Defaults to false.",
         }),
       ),
     }),
diff --git a/apps/server/src/observability/EventLoopMonitor.test.ts b/apps/server/src/observability/EventLoopMonitor.test.ts
new file mode 100644
index 000000000000..fbe30157aec2
--- /dev/null
+++ b/apps/server/src/observability/EventLoopMonitor.test.ts
@@ -0,0 +1,77 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Tracer from "effect/Tracer";
+import * as TestClock from "effect/testing/TestClock";
+
+import { type EventLoopReadings, layerWith, stallMs } from "./EventLoopMonitor.ts";
+
+const ms = (value: number) => value * 1e6;
+
+// Node reports a stall of S as a gap of up to S + 1 s, the histogram resolution.
+const stalled: EventLoopReadings = {
+  delayMaxNs: ms(5_950),
+  activeMs: 6_200,
+  utilization: 0.176,
+  usage: {
+    userCPUTime: 310_400,
+    systemCPUTime: 95_600,
+    majorPageFault: 8_412,
+    minorPageFault: 20_031,
+    involuntaryContextSwitches: 57,
+  },
+  rssBytes: 1536 * 1024 * 1024,
+};
+// Over the threshold as read, but not once the resolution is subtracted.
+const quiet: EventLoopReadings = { ...stalled, delayMaxNs: ms(2_950) };
+
+describe("EventLoopMonitor", () => {
+  it.effect("records a warning span only for samples that saw a stall", () =>
+    Effect.gen(function* () {
+      const spans: Array<Tracer.NativeSpan> = [];
+      const tracer = Tracer.make({
+        span: (options) => {
+          const span = new Tracer.NativeSpan(options);
+          spans.push(span);
+          return span;
+        },
+      });
+      // The first sample covers startup, so the monitor discards it.
+      const samples = [stalled, quiet, stalled];
+
+      yield* Effect.gen(function* () {
+        yield* Layer.build(layerWith(Effect.succeed(Effect.sync(() => samples.shift() ?? quiet))));
+        yield* TestClock.adjust("60 seconds");
+        assert.lengthOf(spans, 0);
+        yield* TestClock.adjust("30 seconds");
+      }).pipe(Effect.scoped, Effect.withTracer(tracer));
+
+      assert.deepStrictEqual(
+        spans.map((span) => span.name),
+        ["server.eventLoop.stall"],
+      );
+      const [span] = spans;
+      assert.deepStrictEqual(Object.fromEntries(span!.attributes), {
+        delayMaxMs: 4_950,
+        utilization: 0.18,
+        cpuUserMs: 310,
+        cpuSystemMs: 96,
+        majorPageFaults: 8_412,
+        minorPageFaults: 20_031,
+        involuntaryContextSwitches: 57,
+        rssMb: 1536,
+      });
+      assert.deepStrictEqual(
+        span!.events.map(([name, , attributes]) => [name, attributes["effect.logLevel"]]),
+        [["event loop stalled for 4950 ms", "WARN"]],
+      );
+    }),
+  );
+
+  it("ignores delay the loop spent idle, such as a system sleep", () => {
+    // Waking from sleep reads as a long gap, but the loop was idle in poll for it.
+    const asleep: EventLoopReadings = { ...stalled, delayMaxNs: ms(600_000), activeMs: 900 };
+    assert.isUndefined(stallMs(asleep));
+    assert.strictEqual(stallMs({ ...asleep, activeMs: 600_000 }), 599_000);
+  });
+});
diff --git a/apps/server/src/observability/EventLoopMonitor.ts b/apps/server/src/observability/EventLoopMonitor.ts
new file mode 100644
index 000000000000..13b7b48c4cf7
--- /dev/null
+++ b/apps/server/src/observability/EventLoopMonitor.ts
@@ -0,0 +1,135 @@
+// @effect-diagnostics nodeBuiltinImport:off - only node:perf_hooks exposes the event loop delay histogram.
+import * as NodePerfHooks from "node:perf_hooks";
+
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import type * as Scope from "effect/Scope";
+
+// Node's delay histogram wakes a native timer every RESOLUTION_MS and records the
+// gap between wakeups, so an idle loop reads about RESOLUTION_MS and a stall of S
+// reads between S and S + RESOLUTION_MS. We subtract the resolution, so a delay can
+// undercount a stall by up to RESOLUTION_MS. With these values every stall over 3 s
+// is caught, at 1 wakeup per second that never enters JS.
+const RESOLUTION_MS = 1000;
+const STALL_THRESHOLD_MS = 2000;
+const SAMPLE_INTERVAL = "30 seconds";
+
+/** One sample interval as Node reports it. Delay in ns, active time in ms, CPU in µs. */
+export interface EventLoopReadings {
+  readonly delayMaxNs: number;
+  readonly activeMs: number;
+  readonly utilization: number;
+  readonly usage: Pick<
+    NodeJS.ResourceUsage,
+    | "userCPUTime"
+    | "systemCPUTime"
+    | "majorPageFault"
+    | "minorPageFault"
+    | "involuntaryContextSwitches"
+  >;
+  readonly rssBytes: number;
+}
+
+// Enables the delay histogram for the layer's lifetime. Each read returns the
+// readings since the previous read and resets the histogram. Node skips the first
+// gap after a reset, so a stall right at a sample boundary can be missed.
+const makeNodeSampler = Effect.gen(function* () {
+  const histogram = yield* Effect.acquireRelease(
+    Effect.sync(() => {
+      const histogram = NodePerfHooks.monitorEventLoopDelay({ resolution: RESOLUTION_MS });
+      histogram.enable();
+      return histogram;
+    }),
+    (histogram) => Effect.sync(() => histogram.disable()),
+  );
+  let elu = NodePerfHooks.performance.eventLoopUtilization();
+  let usage = process.resourceUsage();
+
+  // @effect-diagnostics-next-line returnEffectInGen:off - the read effect is the result.
+  return Effect.sync(() => {
+    const nextElu = NodePerfHooks.performance.eventLoopUtilization();
+    const nextUsage = process.resourceUsage();
+    const loop = NodePerfHooks.performance.eventLoopUtilization(nextElu, elu);
+    const readings: EventLoopReadings = {
+      delayMaxNs: histogram.max,
+      activeMs: loop.active,
+      utilization: loop.utilization,
+      usage: {
+        userCPUTime: nextUsage.userCPUTime - usage.userCPUTime,
+        systemCPUTime: nextUsage.systemCPUTime - usage.systemCPUTime,
+        majorPageFault: nextUsage.majorPageFault - usage.majorPageFault,
+        minorPageFault: nextUsage.minorPageFault - usage.minorPageFault,
+        involuntaryContextSwitches:
+          nextUsage.involuntaryContextSwitches - usage.involuntaryContextSwitches,
+      },
+      rssBytes: process.memoryUsage.rss(),
+    };
+    histogram.reset();
+    elu = nextElu;
+    usage = nextUsage;
+    return readings;
+  });
+});
+
+/**
+ * Returns the stall to report for one sample in ms, or undefined when there was none.
+ */
+export const stallMs = ({ delayMaxNs, activeMs }: EventLoopReadings) => {
+  const delayMs = Math.round(delayMaxNs / 1e6) - RESOLUTION_MS;
+  // A stall is time the loop spent running code, so it counts as active time. libuv's
+  // clock keeps running while the system sleeps on macOS and Windows, so a sleep also
+  // reads as delay, but the loop spent it idle in poll.
+  if (delayMs <= STALL_THRESHOLD_MS || activeMs < delayMs) return undefined;
+  return delayMs;
+};
+
+/**
+ * Samples event loop health every 30 s and records a `server.eventLoop.stall` span
+ * with a warning when the loop stalled for more than 2 s, so stalls land in
+ * the local trace file and Settings > Diagnostics without OTLP. Takes the sampler
+ * so tests can inject readings.
+ */
+export const layerWith = (
+  makeSampler: Effect.Effect<Effect.Effect<EventLoopReadings>, never, Scope.Scope>,
+) =>
+  Layer.effectDiscard(
+    Effect.gen(function* () {
+      const sample = yield* makeSampler;
+      const tick = Effect.gen(function* () {
+        const readings = yield* sample;
+        const delayMaxMs = stallMs(readings);
+        if (delayMaxMs === undefined) return;
+        const { utilization, usage, rssBytes } = readings;
+        // Root, as the stall has no caller to attach to. Warn level keeps it when
+        // T3CODE_TRACE_MIN_LEVEL is raised to cut trace noise.
+        yield* Effect.logWarning(`event loop stalled for ${delayMaxMs} ms`).pipe(
+          Effect.withSpan("server.eventLoop.stall", {
+            root: true,
+            level: "Warn",
+            attributes: {
+              delayMaxMs,
+              utilization: Math.round(utilization * 100) / 100,
+              cpuUserMs: Math.round(usage.userCPUTime / 1000),
+              cpuSystemMs: Math.round(usage.systemCPUTime / 1000),
+              majorPageFaults: usage.majorPageFault,
+              minorPageFaults: usage.minorPageFault,
+              involuntaryContextSwitches: usage.involuntaryContextSwitches,
+              rssMb: Math.round(rssBytes / 1024 / 1024),
+            },
+          }),
+        );
+      });
+      const wait = Effect.sleep(SAMPLE_INTERVAL);
+      // The layer builds before the rest of the server, so the first sample covers
+      // startup work such as migrations and projection bootstrap. That can block the
+      // loop for seconds on a large database, so skip it rather than warn at every
+      // launch. Layers build outside any span, so this fiber retains no parent span.
+      yield* wait.pipe(
+        Effect.andThen(sample),
+        Effect.andThen(wait.pipe(Effect.andThen(tick), Effect.forever)),
+        Effect.forkScoped,
+      );
+    }),
+  );
+
+export const layer = layerWith(makeNodeSampler);
diff --git a/apps/server/src/observability/HeapSnapshot.test.ts b/apps/server/src/observability/HeapSnapshot.test.ts
new file mode 100644
index 000000000000..0beb466e5019
--- /dev/null
+++ b/apps/server/src/observability/HeapSnapshot.test.ts
@@ -0,0 +1,36 @@
+// @effect-diagnostics nodeBuiltinImport:off - tests fake a failed write at the native v8 boundary.
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as NodeFS from "node:fs";
+import * as NodePath from "node:path";
+import * as NodeV8 from "node:v8";
+import { assert, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import { vi } from "vite-plus/test";
+
+import { writeHeapSnapshot } from "./HeapSnapshot.ts";
+
+vi.mock("node:v8", async (importOriginal) => {
+  const actual = await importOriginal<typeof NodeV8>();
+  return { ...actual, writeHeapSnapshot: vi.fn(actual.writeHeapSnapshot) };
+});
+
+it.layer(NodeServices.layer)("writeHeapSnapshot", (it) => {
+  it.effect("removes the partial file when the write fails", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const logsDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-heap-snapshot-test-" });
+      let partialPath: string | undefined;
+      vi.mocked(NodeV8.writeHeapSnapshot).mockImplementationOnce((path) => {
+        partialPath = path;
+        if (path) NodeFS.writeFileSync(path, "partial");
+        throw new Error("ENOSPC: no space left on device");
+      });
+
+      yield* writeHeapSnapshot(logsDir);
+
+      assert.strictEqual(NodePath.dirname(partialPath ?? ""), logsDir);
+      assert.deepEqual(yield* fs.readDirectory(logsDir), []);
+    }),
+  );
+});
diff --git a/apps/server/src/observability/HeapSnapshot.ts b/apps/server/src/observability/HeapSnapshot.ts
new file mode 100644
index 000000000000..827dfab2c6d6
--- /dev/null
+++ b/apps/server/src/observability/HeapSnapshot.ts
@@ -0,0 +1,52 @@
+// @effect-diagnostics nodeBuiltinImport:off - v8.writeHeapSnapshot has no Effect equivalent.
+import * as NodePath from "node:path";
+import * as NodeV8 from "node:v8";
+
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+
+import * as ServerConfig from "../config.ts";
+
+/**
+ * Writes one V8 heap snapshot into `logsDir` and logs its path. A failed write
+ * logs a warning and removes any partial file, because that file can hold
+ * secrets and the failure is often a full disk.
+ */
+export const writeHeapSnapshot = Effect.fn("server.heapSnapshot", { root: true })(
+  function* (logsDir: string) {
+    const fs = yield* FileSystem.FileSystem;
+    const timestamp = DateTime.formatIso(yield* DateTime.now).replaceAll(":", "-");
+    const path = NodePath.join(logsDir, `server-${process.pid}-${timestamp}.heapsnapshot`);
+    yield* Effect.annotateCurrentSpan({ path });
+    yield* Effect.try(() => NodeV8.writeHeapSnapshot(path)).pipe(
+      Effect.tapError(() => fs.remove(path, { force: true }).pipe(Effect.ignore)),
+    );
+    yield* Effect.logInfo("Wrote heap snapshot.", { path });
+  },
+  Effect.catch((cause) => Effect.logWarning("Failed to write heap snapshot.", { cause })),
+);
+
+/**
+ * Writes a heap snapshot when the process gets SIGUSR2 (`kill -USR2 <pid>`),
+ * so a maintainer can see what a long-running server holds. See "Heap
+ * Snapshots" in docs/operations/observability.md.
+ *
+ * The write blocks the event loop, so two snapshots never overlap: a signal
+ * sent during a write waits until it finishes. Windows has no SIGUSR2, so the
+ * layer does nothing there.
+ */
+export const layer = Layer.effectDiscard(
+  Effect.gen(function* () {
+    if ((yield* HostProcessPlatform) === "win32") return;
+    const { logsDir } = yield* ServerConfig.ServerConfig;
+    const runFork = Effect.runForkWith(yield* Effect.context<FileSystem.FileSystem>());
+    const onSignal = () => void runFork(writeHeapSnapshot(logsDir));
+    yield* Effect.acquireRelease(
+      Effect.sync(() => process.on("SIGUSR2", onSignal)),
+      () => Effect.sync(() => process.off("SIGUSR2", onSignal)),
+    );
+  }),
+);
diff --git a/apps/server/src/observability/Layers/Observability.ts b/apps/server/src/observability/Layers/Observability.ts
index 8f7b607745f4..77ebe8410a91 100644
--- a/apps/server/src/observability/Layers/Observability.ts
+++ b/apps/server/src/observability/Layers/Observability.ts
@@ -4,6 +4,7 @@ import {
   makeTraceSink,
   otlpSerializationLayer,
 } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as References from "effect/References";
@@ -20,6 +21,7 @@ import * as BrowserTraceCollector from "../BrowserTraceCollector.ts";
 export const ObservabilityLive = Layer.unwrap(
   Effect.gen(function* () {
     const config = yield* ServerConfig.ServerConfig;
+
     const traces = config.otlpTracesExport;
     const metrics = config.otlpMetricsExport;
     // The trace serializer stays in the returned context because the browser
@@ -86,6 +88,18 @@ export const ObservabilityLive = Layer.unwrap(
             resource,
           }).pipe(Layer.provide(otlpSerializationLayer(metrics.protocol)));
 
-    return Layer.mergeAll(ServerLoggerLive, traceReferencesLayer, tracerLayer, metricsLayer);
+    // Logged once the server's loggers are installed, so the warnings use them.
+    const otelWarningsLayer = Layer.effectDiscard(
+      Effect.forEach(config.otelEnvironment.warnings, (warning) => Effect.logWarning(warning)),
+    );
+
+    return otelWarningsLayer.pipe(
+      Layer.provideMerge(
+        Layer.mergeAll(ServerLoggerLive, traceReferencesLayer, tracerLayer, metricsLayer),
+      ),
+      Layer.provide(
+        OtelEnvironment.layerResourceAttributes(config.otelEnvironment.resourceAttributes),
+      ),
+    );
   }),
 );
diff --git a/apps/server/src/orchestration/Layers/CheckpointReactor.ts b/apps/server/src/orchestration/Layers/CheckpointReactor.ts
index 4cfdccfd8f74..7814a9eec9e6 100644
--- a/apps/server/src/orchestration/Layers/CheckpointReactor.ts
+++ b/apps/server/src/orchestration/Layers/CheckpointReactor.ts
@@ -97,12 +97,12 @@ const make = Effect.gen(function* () {
   const entryRefreshWorker = yield* makeDrainableWorker((cwd: string) =>
     Effect.sync(() => queuedEntryRefreshes.delete(cwd)).pipe(
       Effect.andThen(workspaceEntries.refresh(cwd)),
-      Effect.catchCause((cause) =>
-        Cause.hasInterruptsOnly(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("failed to refresh checkpoint workspace entries", {
-              cwd,
-            }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        () =>
+          Effect.logWarning("failed to refresh checkpoint workspace entries", {
+            cwd,
+          }),
       ),
     ),
   );
@@ -625,15 +625,14 @@ const make = Effect.gen(function* () {
         branch: checkedOutBranch,
       });
     }).pipe(
-      Effect.catchCause((cause) => {
-        if (Cause.hasInterruptsOnly(cause)) {
-          return Effect.failCause(cause);
-        }
-        return Effect.logWarning("failed to follow worktree branch drift", {
-          threadId: input.threadId,
-          cause: Cause.pretty(cause),
-        });
-      }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        (cause) =>
+          Effect.logWarning("failed to follow worktree branch drift", {
+            threadId: input.threadId,
+            cause: Cause.pretty(cause),
+          }),
+      ),
     );
   });
 
@@ -643,12 +642,12 @@ const make = Effect.gen(function* () {
   const statusRefreshWorker = yield* makeDrainableWorker(
     (event: Extract<ProviderRuntimeEvent, { type: "turn.completed" }>) =>
       refreshLocalGitStatusFromTurnCompletion(event).pipe(
-        Effect.catchCause((cause) =>
-          Cause.hasInterruptsOnly(cause)
-            ? Effect.failCause(cause)
-            : Effect.logWarning("failed to refresh git status after turn completion", {
-                threadId: event.threadId,
-              }),
+        Effect.catchCauseIf(
+          (cause) => !Cause.hasInterruptsOnly(cause),
+          () =>
+            Effect.logWarning("failed to refresh git status after turn completion", {
+              threadId: event.threadId,
+            }),
         ),
       ),
   );
@@ -749,11 +748,7 @@ const make = Effect.gen(function* () {
     for (const candidate of paths) {
       const otherCwd = yield* fileSystem
         .realPath(candidate)
-        .pipe(
-          Effect.catch((error) =>
-            error.reason._tag === "NotFound" ? Effect.succeed(null) : Effect.fail(error),
-          ),
-        );
+        .pipe(Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed(null)));
       if (otherCwd === null) continue;
       const isWithin = (parent: string, child: string) => {
         const relative = path.relative(parent, child);
@@ -791,7 +786,7 @@ const make = Effect.gen(function* () {
       preferSessionRuntime: true,
     }).pipe(
       Effect.catch((error) =>
-        event.payload.restoreFiles === false ? Effect.succeed(undefined) : Effect.fail(error),
+        event.payload.restoreFiles === false ? Effect.undefined : Effect.fail(error),
       ),
     );
 
@@ -1014,16 +1009,15 @@ const make = Effect.gen(function* () {
 
   const processInputSafely = (input: ReactorInput) =>
     processInput(input).pipe(
-      Effect.catchCause((cause) => {
-        if (Cause.hasInterruptsOnly(cause)) {
-          return Effect.failCause(cause);
-        }
-        return Effect.logWarning("checkpoint reactor failed to process input", {
-          source: input.source,
-          eventType: input.event.type,
-          cause: Cause.pretty(cause),
-        });
-      }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        (cause) =>
+          Effect.logWarning("checkpoint reactor failed to process input", {
+            source: input.source,
+            eventType: input.event.type,
+            cause: Cause.pretty(cause),
+          }),
+      ),
     );
 
   const worker = yield* makeDrainableWorker(processInputSafely);
diff --git a/apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts b/apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
index 078750967471..9ccf78ca1744 100644
--- a/apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
+++ b/apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
@@ -435,6 +435,7 @@ describe("OrchestrationEngine", () => {
               updatedAt: projectionSnapshot.updatedAt,
             }),
           getDeletedWorktreeThreads: () => Effect.die("unused"),
+          listThreadsWithPullRequests: () => Effect.die("unused"),
           getArchivedShellSnapshot: () =>
             Effect.succeed({
               snapshotSequence: projectionSnapshot.snapshotSequence,
@@ -446,18 +447,18 @@ describe("OrchestrationEngine", () => {
             Effect.succeed({ snapshotSequence: projectionSnapshot.snapshotSequence }),
           getCounts: () => Effect.succeed({ projectCount: 1, threadCount: 1 }),
           getEventReplayStats: () => Effect.die("unused"),
-          getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
-          getProjectShellById: () => Effect.succeed(Option.none()),
+          getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
+          getProjectShellById: () => Effect.succeedNone,
           getProjectShells: () => Effect.succeed([]),
-          getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+          getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
           getImportedAgentSessionSources: () => Effect.die("unused"),
-          getThreadCheckpointContext: () => Effect.succeed(Option.none()),
-          getFullThreadDiffContext: () => Effect.succeed(Option.none()),
+          getThreadCheckpointContext: () => Effect.succeedNone,
+          getFullThreadDiffContext: () => Effect.succeedNone,
           getThreadRuntimeContext: () => Effect.die("unused"),
           getTurnStartMessage: () => Effect.die("unused"),
-          getThreadShellById: () => Effect.succeed(Option.none()),
-          getThreadDetailById: () => Effect.succeed(Option.none()),
-          getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+          getThreadShellById: () => Effect.succeedNone,
+          getThreadDetailById: () => Effect.succeedNone,
+          getThreadDetailSnapshot: () => Effect.succeedNone,
           searchThreads: () => Effect.succeed({ matches: [] }),
         }),
       ),
diff --git a/apps/server/src/orchestration/Layers/OrchestrationEngine.ts b/apps/server/src/orchestration/Layers/OrchestrationEngine.ts
index fb2fadde5e63..9136d080c1c3 100644
--- a/apps/server/src/orchestration/Layers/OrchestrationEngine.ts
+++ b/apps/server/src/orchestration/Layers/OrchestrationEngine.ts
@@ -400,7 +400,7 @@ const makeOrchestrationEngine = Effect.gen(function* () {
                   status: "rejected",
                   error: error.message,
                 })
-                .pipe(Effect.catch(() => Effect.void));
+                .pipe(Effect.ignore);
             }
           }
 
diff --git a/apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts b/apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts
index d25c442ac8b2..207ad9a20d34 100644
--- a/apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts
+++ b/apps/server/src/orchestration/Layers/OrchestrationReactor.test.ts
@@ -108,6 +108,7 @@ describe("OrchestrationReactor", () => {
         Layer.provideMerge(
           Layer.succeed(AgentAwarenessRelay.AgentAwarenessRelay, {
             publishThread: () => Effect.void,
+            requestCatchUp: () => Effect.void,
             start: () => {
               started.push("agent-awareness-relay");
               return Effect.void;
diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
index 844a32f062a2..b8a1268b1814 100644
--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
@@ -21,6 +21,7 @@ import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
+import * as Tracer from "effect/Tracer";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 
 import { makeSqlStatementCounter } from "../../../integration/SqlStatementCounter.integration.ts";
@@ -114,6 +115,66 @@ it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-curs
   },
 );
 
+it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-projection-cleanup-span-")))(
+  "OrchestrationProjectionPipeline attachment cleanup span",
+  (it) => {
+    it.effect("runs attachment cleanup only for events that remove attachments", () =>
+      Effect.gen(function* () {
+        const projectionPipeline = yield* OrchestrationProjectionPipeline;
+        const eventStore = yield* OrchestrationEventStore;
+        let cleanupSpans = 0;
+        const tracer = Tracer.make({
+          span: (options) => {
+            if (options.name === "applyAttachmentSideEffects") cleanupSpans += 1;
+            return new Tracer.NativeSpan(options);
+          },
+        });
+        const now = "2026-01-01T00:00:00.000Z";
+        const projectId = ProjectId.make("project-cleanup-span");
+        const threadId = ThreadId.make("thread-cleanup-span");
+
+        const projectCreated = yield* eventStore.append({
+          type: "project.created",
+          eventId: EventId.make("evt-cleanup-span-project"),
+          aggregateKind: "project",
+          aggregateId: projectId,
+          occurredAt: now,
+          commandId: CommandId.make("cmd-cleanup-span-project"),
+          causationEventId: null,
+          correlationId: null,
+          metadata: {},
+          payload: {
+            projectId,
+            title: "Cleanup span project",
+            workspaceRoot: "/tmp/project-cleanup-span",
+            defaultModelSelection: null,
+            scripts: [],
+            createdAt: now,
+            updatedAt: now,
+          },
+        });
+        yield* projectionPipeline.projectEvent(projectCreated).pipe(Effect.withTracer(tracer));
+        assert.strictEqual(cleanupSpans, 0);
+
+        const threadDeleted = yield* eventStore.append({
+          type: "thread.deleted",
+          eventId: EventId.make("evt-cleanup-span-thread-delete"),
+          aggregateKind: "thread",
+          aggregateId: threadId,
+          occurredAt: now,
+          commandId: CommandId.make("cmd-cleanup-span-thread-delete"),
+          causationEventId: null,
+          correlationId: null,
+          metadata: {},
+          payload: { threadId, deletedAt: now },
+        });
+        yield* projectionPipeline.projectEvent(threadDeleted).pipe(Effect.withTracer(tracer));
+        assert.strictEqual(cleanupSpans, 1);
+      }),
+    );
+  },
+);
+
 it.layer(Layer.fresh(makeProjectionPipelinePrefixedTestLayer("t3-import-shell-")))(
   "imported thread shell projection",
   (it) => {
diff --git a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts b/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
index 414c8f3f2363..280acb18fc9a 100644
--- a/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionPipeline.ts
@@ -670,6 +670,7 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
             pinnedAt: null,
             pinOrderKey: null,
             activeOrderKey: null,
+            autoSettleDisabledAt: null,
             titleRegenerationRequestId: null,
             titleRegenerationStartedAt: null,
             latestUserMessageAt: null,
@@ -819,6 +820,21 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
           return;
         }
 
+        case "thread.auto-settle-set": {
+          const existingRow = yield* projectionThreadRepository.getById({
+            threadId: event.payload.threadId,
+          });
+          if (Option.isNone(existingRow)) {
+            return;
+          }
+          yield* projectionThreadRepository.upsert({
+            ...existingRow.value,
+            autoSettleDisabledAt: event.payload.autoSettleDisabledAt,
+            updatedAt: event.payload.updatedAt,
+          });
+          return;
+        }
+
         case "thread.pin-reordered": {
           const existingRow = yield* projectionThreadRepository.getById({
             threadId: event.payload.threadId,
@@ -2012,13 +2028,6 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
 
     const applyAttachmentSideEffects = Effect.fn("applyAttachmentSideEffects")(
       function* (event: OrchestrationEvent, sideEffects: AttachmentSideEffects) {
-        if (
-          sideEffects.deletedThreadIds.size === 0 &&
-          sideEffects.prunedThreadRelativePaths.size === 0
-        ) {
-          return;
-        }
-
         const deletedThreadIds = new Set<string>();
         for (const threadId of sideEffects.deletedThreadIds) {
           const recreatedLater = yield* eventStore.hasEventAfter({
@@ -2190,9 +2199,15 @@ const makeOrchestrationProjectionPipeline = Effect.fn("makeOrchestrationProjecti
               );
             }),
           );
+          const hasCleanup =
+            attachmentSideEffects.deletedThreadIds.size > 0 ||
+            attachmentSideEffects.prunedThreadRelativePaths.size > 0;
           // Return the cleanup effect so the caller runs it after the outer transaction commits.
+          // Most events have no cleanup, so they skip the call and write no cleanup span.
           // @effect-diagnostics-next-line returnEffectInGen:off
-          return applyAttachmentSideEffects(event, attachmentSideEffects).pipe(Effect.asVoid);
+          return hasCleanup
+            ? applyAttachmentSideEffects(event, attachmentSideEffects).pipe(Effect.asVoid)
+            : Effect.void;
         },
         Effect.provideService(FileSystem.FileSystem, fileSystem),
         Effect.provideService(Path.Path, path),
diff --git a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
index ff5ed5ffa34b..1ed3ea97a721 100644
--- a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
@@ -30,6 +30,7 @@ import * as ThreadPlanProgress from "../ThreadPlanProgress.ts";
 import { ProjectionSnapshotQuery } from "../Services/ProjectionSnapshotQuery.ts";
 import { encodeThreadDetailPageCursor } from "../threadDetailCursor.ts";
 import { projectThreadDetailSnapshot } from "../ActivityPayloadProjection.ts";
+import { readSweepSnapshot } from "../ThreadPullRequestReactor.ts";
 import { makeSqlStatementCounter } from "../../../integration/SqlStatementCounter.integration.ts";
 
 const asProjectId = (value: string): ProjectId => ProjectId.make(value);
@@ -485,6 +486,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
           pinnedAt: "2026-02-24T00:00:01.000Z",
           pinOrderKey: "gm",
           activeOrderKey: "hq",
+          autoSettleDisabledAt: null,
           titleRegeneration: null,
           titleState: null,
           deletedAt: null,
@@ -611,6 +613,7 @@ projectionSnapshotLayer("ProjectionSnapshotQuery", (it) => {
           pinnedAt: "2026-02-24T00:00:01.000Z",
           pinOrderKey: "gm",
           activeOrderKey: "hq",
+          autoSettleDisabledAt: null,
           titleRegeneration: null,
           titleState: null,
           session: {
@@ -3507,6 +3510,224 @@ it.effect("omits foreign-host PRs from legacy snapshots while preserving native
   }).pipe(Effect.provide(layer));
 });
 
+it.effect(
+  "lists linked threads like the shell snapshot, in one query and without identities",
+  () => {
+    const resolved: string[] = [];
+    const layer = OrchestrationProjectionSnapshotQueryLive.pipe(
+      Layer.provide(ThreadBackgroundLiveness.layer),
+      Layer.provide(ThreadPlanProgress.layer),
+      Layer.provide(
+        Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
+          resolve: (root) =>
+            Effect.sync(() => {
+              resolved.push(root);
+              return null;
+            }),
+        }),
+      ),
+      Layer.provideMerge(SqlitePersistenceMemory),
+    );
+    return Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      const query = yield* ProjectionSnapshotQuery;
+      yield* sql`INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at)
+      VALUES ('p1', 'One', '/one', '[]', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z'),
+        ('p2', 'Two', '/two', '[]', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z')`;
+      yield* sql`INSERT INTO projection_threads (thread_id, project_id, title, model_selection_json, runtime_mode, interaction_mode, created_at, updated_at, archived_at, deleted_at, settled_override, settled_at)
+      VALUES
+        ('t-late', 'p1', 'Late', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-03T00:00:00Z', '2026-09-03T00:00:00Z', NULL, NULL, 'settled', '2026-09-04T00:00:00Z'),
+        ('t-early', 'p2', 'Early', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', NULL, NULL, NULL, NULL),
+        ('t-first', 'p1', 'First', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', NULL, NULL, NULL, NULL),
+        ('t-plain', 'p1', 'Plain', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', NULL, NULL, NULL, NULL),
+        ('t-archived', 'p1', 'Archived', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', '2026-09-05T00:00:00Z', NULL, NULL, NULL),
+        ('t-deleted', 'p1', 'Deleted', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z', NULL, '2026-09-05T00:00:00Z', NULL, NULL)`;
+      yield* sql`INSERT INTO projection_thread_pull_requests (thread_id, host, repository, number, url, source, linked_at, snapshot_json)
+      VALUES
+        ('t-late', 'github.com', 'acme/web', 3, 'https://github.com/acme/web/pull/3', 'manual', '2026-09-03T00:00:00Z', NULL),
+        ('t-early', 'github.com', 'acme/api', 4, 'https://github.com/acme/api/pull/4', 'agent', '2026-09-01T00:00:00Z', NULL),
+        ('t-first', 'github.com', 'acme/web', 2, 'https://github.com/acme/web/pull/2', 'stack-dismissed', '2026-09-02T00:00:00Z', NULL),
+        ('t-first', 'github.com', 'acme/web', 1, 'https://github.com/acme/web/pull/1', 'created', '2026-09-02T00:00:00Z',
+          '{"state":"open","title":"One","headBranch":"one","baseBranch":"main","isDraft":false,"updatedAt":null,"syncedAt":"2026-09-02T00:00:00Z"}'),
+        ('t-archived', 'github.com', 'acme/web', 5, 'https://github.com/acme/web/pull/5', 'manual', '2026-09-02T00:00:00Z', NULL),
+        ('t-deleted', 'github.com', 'acme/web', 6, 'https://github.com/acme/web/pull/6', 'manual', '2026-09-02T00:00:00Z', NULL)`;
+      const expected = (yield* query.getShellSnapshot()).threads
+        .filter((thread) => thread.pullRequests.length > 0)
+        .map(({ id, projectId, settledOverride, settledAt, pullRequests }) => ({
+          id,
+          projectId,
+          settledOverride,
+          settledAt,
+          pullRequests,
+        }));
+      resolved.length = 0;
+
+      const counter = makeSqlStatementCounter();
+      const threads = yield* query
+        .listThreadsWithPullRequests()
+        .pipe(Effect.withTracer(counter.tracer));
+      assert.deepStrictEqual(
+        threads.map((thread) => [thread.id, thread.pullRequests.map((link) => link.number)]),
+        [
+          ["t-first", [1, 2]],
+          ["t-late", [3]],
+          ["t-early", [4]],
+        ],
+      );
+      assert.deepStrictEqual(threads, expected);
+      assert.strictEqual(counter.count(), 1);
+      assert.deepStrictEqual(resolved, []);
+    }).pipe(Effect.provide(layer));
+  },
+);
+
+it.effect("reads one sweep thread and its projects like the shell snapshot", () => {
+  const layer = OrchestrationProjectionSnapshotQueryLive.pipe(
+    Layer.provide(ThreadBackgroundLiveness.layer),
+    Layer.provide(ThreadPlanProgress.layer),
+    Layer.provide(
+      Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
+        resolve: () =>
+          Effect.succeed({
+            canonicalKey: "github.com/acme/web",
+            provider: "github",
+            displayName: "acme/web",
+            locator: {
+              source: "git-remote" as const,
+              remoteName: "origin",
+              remoteUrl: "https://github.com/acme/web.git",
+            },
+          }),
+      }),
+    ),
+    Layer.provideMerge(SqlitePersistenceMemory),
+  );
+  return Effect.gen(function* () {
+    const sql = yield* SqlClient.SqlClient;
+    const query = yield* ProjectionSnapshotQuery;
+    yield* sql`INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at)
+      VALUES ('p1', 'One', '/one', '[]', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z'),
+        ('p2', 'Two', '/two', '[]', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z'),
+        ('p3', 'Three', '/three', '[]', '2026-09-03T00:00:00Z', '2026-09-03T00:00:00Z')`;
+    yield* sql`INSERT INTO projection_threads (thread_id, project_id, title, model_selection_json, runtime_mode, interaction_mode, branch, worktree_path, branch_pull_request_json, latest_turn_id, latest_user_message_at, pending_approval_count, snoozed_until, snoozed_at, created_at, updated_at, settled_override, settled_at)
+      VALUES
+        ('t-linked', 'p1', 'Linked', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'feature', '/one/wt', NULL, 'turn-1', '2026-09-02T00:00:00Z', 1, NULL, NULL, '2026-09-01T00:00:00Z', '2026-09-02T00:00:00Z', NULL, NULL),
+        ('t-branch', 'p1', 'Branch', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'other', NULL,
+          '{"projectId":"p2","repository":"acme/web","number":8,"url":"https://github.com/acme/web/pull/8"}',
+          NULL, NULL, 0, '2026-09-10T00:00:00Z', '2026-09-02T00:00:00Z', '2026-09-01T00:00:00Z', '2026-09-02T00:00:00Z', 'settled', '2026-09-03T00:00:00Z'),
+        ('t-other', 'p3', 'Other', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, NULL, NULL, NULL, 0, NULL, NULL, '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', NULL, NULL)`;
+    yield* sql`INSERT INTO projection_thread_pull_requests (thread_id, host, repository, number, url, source, linked_at)
+      VALUES ('t-linked', 'github.com', 'acme/web', 7, 'https://github.com/acme/web/pull/7', 'agent', '2026-09-02T00:00:00Z')`;
+    yield* sql`INSERT INTO projection_turns (thread_id, turn_id, state, requested_at, started_at, completed_at, checkpoint_files_json)
+      VALUES ('t-linked', 'turn-1', 'completed', '2026-09-02T00:00:00Z', '2026-09-02T00:00:01Z', '2026-09-02T00:00:02Z', '[]')`;
+    yield* sql`INSERT INTO projection_thread_sessions (thread_id, status, provider_name, active_turn_id, last_error, updated_at)
+      VALUES ('t-linked', 'ready', 'codex', NULL, NULL, '2026-09-02T00:00:03Z')`;
+    for (const projector of Object.values(ORCHESTRATION_PROJECTOR_NAMES)) {
+      yield* sql`INSERT INTO projection_state (projector, last_applied_sequence, updated_at)
+        VALUES (${projector}, 9, '2026-09-02T00:00:03Z')`;
+    }
+
+    const full = yield* query.getShellSnapshot();
+    // The seeded fields must reach the snapshot, or the parity check is empty.
+    const linked = full.threads.find((thread) => thread.id === ThreadId.make("t-linked"));
+    assert.strictEqual(full.snapshotSequence, 9);
+    assert.strictEqual(linked?.linkedPullRequest?.number, 7);
+    assert.strictEqual(linked?.latestTurn?.turnId, asTurnId("turn-1"));
+    assert.strictEqual(linked?.session?.status, "ready");
+
+    for (const [threadId, projectIds] of [
+      [ThreadId.make("t-linked"), [asProjectId("p1")]],
+      // Settlement also needs the project that the saved branch PR names.
+      [ThreadId.make("t-branch"), [asProjectId("p1"), asProjectId("p2")]],
+    ] as const) {
+      assert.deepStrictEqual(yield* readSweepSnapshot(query, threadId), {
+        snapshotSequence: full.snapshotSequence,
+        projects: full.projects.filter((project) => projectIds.includes(project.id)),
+        threads: full.threads.filter((thread) => thread.id === threadId),
+      });
+    }
+  }).pipe(Effect.provide(layer));
+});
+
+it.effect("reads a full sweep from unsettled threads and every project", () => {
+  const resolved: string[] = [];
+  const layer = OrchestrationProjectionSnapshotQueryLive.pipe(
+    Layer.provide(ThreadBackgroundLiveness.layer),
+    Layer.provide(ThreadPlanProgress.layer),
+    Layer.provide(
+      Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
+        resolve: (root) =>
+          Effect.sync(() => {
+            resolved.push(root);
+            return null;
+          }),
+      }),
+    ),
+    Layer.provideMerge(SqlitePersistenceMemory),
+  );
+  return Effect.gen(function* () {
+    const sql = yield* SqlClient.SqlClient;
+    const query = yield* ProjectionSnapshotQuery;
+    yield* sql`INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at)
+      VALUES ('p1', 'One', '/one', '[]', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z'),
+        ('p2', 'Two', '/two', '[]', '2026-09-02T00:00:00Z', '2026-09-02T00:00:00Z'),
+        ('p3', 'Three', '/three', '[]', '2026-09-03T00:00:00Z', '2026-09-03T00:00:00Z'),
+        ('p4', 'Four', '/four', '[]', '2026-09-04T00:00:00Z', '2026-09-04T00:00:00Z')`;
+    yield* sql`INSERT INTO projection_threads (thread_id, project_id, title, model_selection_json, runtime_mode, interaction_mode, branch_pull_request_json, latest_turn_id, created_at, updated_at, archived_at, settled_override, settled_at)
+      VALUES
+        ('t-open', 'p1', 'Open', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, 'turn-open', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', NULL, NULL, NULL),
+        ('t-resumed', 'p1', 'Resumed', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', NULL, 'active', NULL),
+        ('t-branch', 'p1', 'Branch', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default',
+          '{"projectId":"p2","repository":"acme/web","number":8,"url":"https://github.com/acme/web/pull/8"}',
+          NULL, '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', NULL, NULL, NULL),
+        ('t-settled', 'p3', 'Settled', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, 'turn-settled', '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', NULL, 'settled', '2026-09-03T00:00:00Z'),
+        ('t-archived', 'p4', 'Archived', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, '2026-09-01T00:00:00Z', '2026-09-01T00:00:00Z', '2026-09-04T00:00:00Z', NULL, NULL)`;
+    // The open and the settled thread both have a row in each joined table. The
+    // settled thread's turn and session are the newest rows, so updatedAt shows
+    // whether those two reads skip it.
+    yield* sql`INSERT INTO projection_thread_pull_requests (thread_id, host, repository, number, url, source, linked_at)
+      VALUES ('t-open', 'github.com', 'acme/web', 7, 'https://github.com/acme/web/pull/7', 'agent', '2026-09-02T00:00:00Z'),
+        ('t-settled', 'github.com', 'acme/web', 9, 'https://github.com/acme/web/pull/9', 'agent', '2026-09-02T00:00:00Z')`;
+    yield* sql`INSERT INTO projection_turns (thread_id, turn_id, state, requested_at, checkpoint_files_json)
+      VALUES ('t-open', 'turn-open', 'completed', '2026-09-02T00:00:00Z', '[]'),
+        ('t-settled', 'turn-settled', 'completed', '2026-09-09T00:00:00Z', '[]')`;
+    yield* sql`INSERT INTO projection_thread_sessions (thread_id, status, provider_name, active_turn_id, last_error, updated_at)
+      VALUES ('t-open', 'ready', 'codex', NULL, NULL, '2026-09-02T00:00:00Z'),
+        ('t-settled', 'stopped', 'codex', NULL, NULL, '2026-09-10T00:00:00Z')`;
+
+    const full = yield* query.getShellSnapshot();
+    // The settled thread's rows must reach the full read, or skipping them proves nothing.
+    const settled = full.threads.find((thread) => thread.id === ThreadId.make("t-settled"));
+    assert.strictEqual(settled?.pullRequests[0]?.number, 9);
+    assert.strictEqual(settled?.latestTurn?.turnId, asTurnId("turn-settled"));
+    assert.strictEqual(settled?.session?.status, "stopped");
+    assert.strictEqual(full.updatedAt, "2026-09-10T00:00:00Z");
+    resolved.length = 0;
+
+    const sweep = yield* readSweepSnapshot(query, null);
+    assert.strictEqual(sweep.snapshotSequence, full.snapshotSequence);
+    assert.deepStrictEqual(
+      sweep.threads,
+      full.threads.filter((thread) => thread.id !== ThreadId.make("t-settled")),
+    );
+    assert.deepStrictEqual(
+      sweep.threads.map((thread) => thread.id),
+      ["t-branch", "t-open", "t-resumed"],
+    );
+    // Like the full read, the sweep resolves every project, so it keeps the
+    // repository identity cache warm for client connects.
+    assert.deepStrictEqual(sweep.projects, full.projects);
+    assert.deepStrictEqual(resolved.toSorted(), ["/four", "/one", "/three", "/two"]);
+    // A settled thread's link that no longer decodes breaks the full read, but
+    // not the sweep, which never reads it.
+    yield* sql`UPDATE projection_thread_pull_requests SET snapshot_json = 'invalid-json' WHERE thread_id = 't-settled'`;
+    assert.strictEqual((yield* Effect.exit(query.getShellSnapshot()))._tag, "Failure");
+    const unsettled = yield* query.getShellSnapshot({ unsettledOnly: true });
+    assert.deepStrictEqual(unsettled.threads, sweep.threads);
+    assert.strictEqual(unsettled.updatedAt, "2026-09-04T00:00:00Z");
+  }).pipe(Effect.provide(layer));
+});
+
 projectionSnapshotLayer("ProjectionSnapshotQuery activities by kind", (it) => {
   it.effect("lists one kind across active threads only, without hydrating the threads", () =>
     Effect.gen(function* () {
diff --git a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
index 3bb620973cae..ea818ac13938 100644
--- a/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
+++ b/apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
@@ -12,7 +12,7 @@ import {
   OrchestrationProposedPlanId,
   OrchestrationReadModel,
   OrchestrationThreadSearchSource,
-  OrchestrationShellSnapshot,
+  type OrchestrationShellSnapshot,
   OrchestrationThread,
   OrchestrationThreadDetailSnapshot,
   ProjectScript,
@@ -77,11 +77,11 @@ import {
   type ProjectionSnapshotCounts,
   type ProjectionThreadCheckpointContext,
   type ProjectionThreadDetailQuery,
+  type ProjectionThreadPullRequests,
   type ProjectionSnapshotQueryShape,
 } from "../Services/ProjectionSnapshotQuery.ts";
 
 const decodeReadModel = Schema.decodeUnknownEffect(OrchestrationReadModel);
-const decodeShellSnapshot = Schema.decodeUnknownEffect(OrchestrationShellSnapshot);
 const decodeThread = Schema.decodeUnknownEffect(OrchestrationThread);
 const decodeImportedTranscriptsPayload = Schema.decodeUnknownOption(
   Schema.fromJsonString(
@@ -185,6 +185,7 @@ const EventReplayStatsRowSchema = Schema.Struct({
   eventCount: Schema.Number,
   payloadBytes: Schema.Number,
 });
+const ActiveThreadRowsRequest = Schema.Struct({ unsettledOnly: Schema.Boolean });
 const ProjectionThreadSearchRequest = Schema.Struct({
   pattern: Schema.String,
   limit: Schema.Int,
@@ -627,6 +628,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           pinned_at AS "pinnedAt",
           pin_order_key AS "pinOrderKey",
           active_order_key AS "activeOrderKey",
+          auto_settle_disabled_at AS "autoSettleDisabledAt",
           title_regeneration_request_id AS "titleRegenerationRequestId",
           title_regeneration_started_at AS "titleRegenerationStartedAt",
           latest_user_message_at AS "latestUserMessageAt",
@@ -639,10 +641,16 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
       `,
   });
 
+  // Background sweeps skip settled threads, the same check PR discovery makes.
+  const unsettledThreadsFilter = (unsettledOnly: boolean) =>
+    unsettledOnly
+      ? sql`AND threads.settled_at IS NULL AND threads.settled_override IS NOT 'settled'`
+      : sql``;
+
   const listActiveThreadRows = SqlSchema.findAll({
-    Request: Schema.Void,
+    Request: ActiveThreadRowsRequest,
     Result: ProjectionThreadDbRowSchema,
-    execute: () =>
+    execute: (request) =>
       sql`
         SELECT
           thread_id AS "threadId",
@@ -668,6 +676,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           pinned_at AS "pinnedAt",
           pin_order_key AS "pinOrderKey",
           active_order_key AS "activeOrderKey",
+          auto_settle_disabled_at AS "autoSettleDisabledAt",
           title_regeneration_request_id AS "titleRegenerationRequestId",
           title_regeneration_started_at AS "titleRegenerationStartedAt",
           latest_user_message_at AS "latestUserMessageAt",
@@ -675,9 +684,10 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           pending_user_input_count AS "pendingUserInputCount",
           has_actionable_proposed_plan AS "hasActionableProposedPlan",
           deleted_at AS "deletedAt"
-        FROM projection_threads
+        FROM projection_threads threads
         WHERE deleted_at IS NULL
           AND archived_at IS NULL
+          ${unsettledThreadsFilter(request.unsettledOnly)}
         ORDER BY project_id ASC, created_at ASC, thread_id ASC
       `,
   });
@@ -741,6 +751,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           pinned_at AS "pinnedAt",
           pin_order_key AS "pinOrderKey",
           active_order_key AS "activeOrderKey",
+          auto_settle_disabled_at AS "autoSettleDisabledAt",
           title_regeneration_request_id AS "titleRegenerationRequestId",
           title_regeneration_started_at AS "titleRegenerationStartedAt",
           latest_user_message_at AS "latestUserMessageAt",
@@ -816,9 +827,9 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
   });
 
   const listActiveThreadPullRequestRows = SqlSchema.findAll({
-    Request: Schema.Void,
+    Request: ActiveThreadRowsRequest,
     Result: ProjectionThreadPullRequestDbRowSchema,
-    execute: () =>
+    execute: (request) =>
       sql`
         SELECT
           links.thread_id AS "threadId",
@@ -835,10 +846,46 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           ON threads.thread_id = links.thread_id
         WHERE threads.deleted_at IS NULL
           AND threads.archived_at IS NULL
+          ${unsettledThreadsFilter(request.unsettledOnly)}
         ORDER BY links.thread_id ASC, links.linked_at ASC, links.number ASC
       `,
   });
 
+  // One row per link, in the shell snapshot's thread order and link order.
+  const listActiveThreadPullRequestSyncRows = SqlSchema.findAll({
+    Request: Schema.Void,
+    Result: ProjectionThreadPullRequestDbRowSchema.mapFields(
+      Struct.assign({
+        projectId: ProjectionThread.fields.projectId,
+        settledOverride: ProjectionThread.fields.settledOverride,
+        settledAt: ProjectionThread.fields.settledAt,
+      }),
+    ),
+    execute: () =>
+      sql`
+        SELECT
+          links.thread_id AS "threadId",
+          threads.project_id AS "projectId",
+          threads.settled_override AS "settledOverride",
+          threads.settled_at AS "settledAt",
+          links.host,
+          links.repository,
+          links.number,
+          links.url,
+          links.source,
+          links.linked_at AS "linkedAt",
+          links.snapshot_json AS "snapshot",
+          links.stack_json AS "stack"
+        FROM projection_thread_pull_requests links
+        INNER JOIN projection_threads threads
+          ON threads.thread_id = links.thread_id
+        WHERE threads.deleted_at IS NULL
+          AND threads.archived_at IS NULL
+        ORDER BY threads.project_id ASC, threads.created_at ASC, threads.thread_id ASC,
+          links.linked_at ASC, links.number ASC
+      `,
+  });
+
   const listArchivedThreadPullRequestRows = SqlSchema.findAll({
     Request: Schema.Void,
     Result: ProjectionThreadPullRequestDbRowSchema,
@@ -924,9 +971,9 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
   });
 
   const listActiveThreadSessionRows = SqlSchema.findAll({
-    Request: Schema.Void,
+    Request: ActiveThreadRowsRequest,
     Result: ProjectionThreadSessionDbRowSchema,
-    execute: () =>
+    execute: (request) =>
       sql`
         SELECT
           sessions.thread_id AS "threadId",
@@ -944,6 +991,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           ON threads.thread_id = sessions.thread_id
         WHERE threads.deleted_at IS NULL
           AND threads.archived_at IS NULL
+          ${unsettledThreadsFilter(request.unsettledOnly)}
         ORDER BY sessions.thread_id ASC
       `,
   });
@@ -1018,9 +1066,9 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
   });
 
   const listActiveLatestTurnRows = SqlSchema.findAll({
-    Request: Schema.Void,
+    Request: ActiveThreadRowsRequest,
     Result: ProjectionLatestTurnDbRowSchema,
-    execute: () =>
+    execute: (request) =>
       sql`
         SELECT
           turns.thread_id AS "threadId",
@@ -1039,6 +1087,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
         WHERE threads.deleted_at IS NULL
           AND threads.archived_at IS NULL
           AND threads.latest_turn_id IS NOT NULL
+          ${unsettledThreadsFilter(request.unsettledOnly)}
         ORDER BY turns.thread_id ASC
       `,
   });
@@ -1321,6 +1370,7 @@ const makeProjectionSnapshotQuery = Effect.gen(function* () {
           pinned_at AS "pinnedAt",
           pin_order_key AS "pinOrderKey",
           active_order_key AS "activeOrderKey",
+          auto_settle_disabled_at AS "autoSettleDisabledAt",
           title_regeneration_request_id AS "titleRegenerationRequestId",
           title_regeneration_started_at AS "titleRegenerationStartedAt",
           latest_user_message_at AS "latestUserMessageAt",
@@ -2408,6 +2458,7 @@ pending_approval_requests AS (
                 pinnedAt: row.pinnedAt,
                 pinOrderKey: row.pinOrderKey ?? null,
                 activeOrderKey: row.activeOrderKey ?? null,
+                autoSettleDisabledAt: row.autoSettleDisabledAt ?? null,
                 titleRegeneration: mapTitleRegeneration(row),
                 titleState: row.titleState,
                 deletedAt: row.deletedAt,
@@ -2653,6 +2704,7 @@ pending_approval_requests AS (
                   pinnedAt: row.pinnedAt,
                   pinOrderKey: row.pinOrderKey ?? null,
                   activeOrderKey: row.activeOrderKey ?? null,
+                  autoSettleDisabledAt: row.autoSettleDisabledAt ?? null,
                   titleRegeneration: mapTitleRegeneration(row),
                   titleState: row.titleState,
                   deletedAt: row.deletedAt,
@@ -2680,8 +2732,9 @@ pending_approval_requests AS (
         }),
       );
 
-  const getShellSnapshot: ProjectionSnapshotQueryShape["getShellSnapshot"] = () =>
-    sql
+  const getShellSnapshot: ProjectionSnapshotQueryShape["getShellSnapshot"] = (options) => {
+    const unsettledOnly = options?.unsettledOnly === true;
+    return sql
       .withTransaction(
         Effect.all([
           listProjectRows(undefined).pipe(
@@ -2692,7 +2745,7 @@ pending_approval_requests AS (
               ),
             ),
           ),
-          listActiveThreadRows(undefined).pipe(
+          listActiveThreadRows({ unsettledOnly }).pipe(
             Effect.mapError(
               toPersistenceSqlOrDecodeError(
                 "ProjectionSnapshotQuery.getShellSnapshot:listThreads:query",
@@ -2700,7 +2753,7 @@ pending_approval_requests AS (
               ),
             ),
           ),
-          listActiveThreadSessionRows(undefined).pipe(
+          listActiveThreadSessionRows({ unsettledOnly }).pipe(
             Effect.mapError(
               toPersistenceSqlOrDecodeError(
                 "ProjectionSnapshotQuery.getShellSnapshot:listThreadSessions:query",
@@ -2708,7 +2761,7 @@ pending_approval_requests AS (
               ),
             ),
           ),
-          listActiveThreadPullRequestRows(undefined).pipe(
+          listActiveThreadPullRequestRows({ unsettledOnly }).pipe(
             Effect.mapError(
               toPersistenceSqlOrDecodeError(
                 "ProjectionSnapshotQuery.getShellSnapshot:listThreadPullRequests:query",
@@ -2716,7 +2769,7 @@ pending_approval_requests AS (
               ),
             ),
           ),
-          listActiveLatestTurnRows(undefined).pipe(
+          listActiveLatestTurnRows({ unsettledOnly }).pipe(
             Effect.mapError(
               toPersistenceSqlOrDecodeError(
                 "ProjectionSnapshotQuery.getShellSnapshot:listLatestTurns:query",
@@ -2771,7 +2824,10 @@ pending_approval_requests AS (
               );
               const pullRequestsByThread = groupPullRequestRowsByThread(pullRequestRows);
 
-              const snapshot = {
+              // Built from schema-decoded rows, so no second decode here. The HTTP
+              // and RPC layers encode it against OrchestrationShellSnapshot on the
+              // way out, like the per-item shells from getThreadShellById.
+              return {
                 snapshotSequence: computeSnapshotSequence(stateRows),
                 projects: Arr.filterMap(projectRows, (row) =>
                   row.deletedAt === null
@@ -2809,6 +2865,7 @@ pending_approval_requests AS (
                         pinnedAt: row.pinnedAt,
                         pinOrderKey: row.pinOrderKey ?? null,
                         activeOrderKey: row.activeOrderKey ?? null,
+                        autoSettleDisabledAt: row.autoSettleDisabledAt ?? null,
                         titleRegeneration: mapTitleRegeneration(row),
                         titleState: row.titleState,
                         session: sessionByThread.get(row.threadId) ?? null,
@@ -2824,15 +2881,7 @@ pending_approval_requests AS (
                     : Result.failVoid,
                 ),
                 updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",
-              };
-
-              return yield* decodeShellSnapshot(snapshot).pipe(
-                Effect.mapError(
-                  toPersistenceDecodeError(
-                    "ProjectionSnapshotQuery.getShellSnapshot:decodeShellSnapshot",
-                  ),
-                ),
-              );
+              } satisfies OrchestrationShellSnapshot;
             }),
         ),
         Effect.mapError((error) => {
@@ -2842,6 +2891,36 @@ pending_approval_requests AS (
           return toPersistenceSqlError("ProjectionSnapshotQuery.getShellSnapshot:query")(error);
         }),
       );
+  };
+
+  const listThreadsWithPullRequests: ProjectionSnapshotQueryShape["listThreadsWithPullRequests"] =
+    () =>
+      listActiveThreadPullRequestSyncRows(undefined).pipe(
+        Effect.map((rows) => {
+          const threads = new Map<
+            ThreadId,
+            ProjectionThreadPullRequests & { readonly pullRequests: Array<ThreadPullRequestLink> }
+          >();
+          for (const row of rows) {
+            const thread = threads.get(row.threadId) ?? {
+              id: row.threadId,
+              projectId: row.projectId,
+              settledOverride: row.settledOverride,
+              settledAt: row.settledAt,
+              pullRequests: [],
+            };
+            thread.pullRequests.push(mapPullRequestRow(row));
+            threads.set(row.threadId, thread);
+          }
+          return [...threads.values()];
+        }),
+        Effect.mapError(
+          toPersistenceSqlOrDecodeError(
+            "ProjectionSnapshotQuery.listThreadsWithPullRequests:query",
+            "ProjectionSnapshotQuery.listThreadsWithPullRequests:decodeRows",
+          ),
+        ),
+      );
 
   const getArchivedShellSnapshot: ProjectionSnapshotQueryShape["getArchivedShellSnapshot"] = () =>
     sql
@@ -2936,7 +3015,7 @@ pending_approval_requests AS (
                 sessionRows.map((row) => [row.threadId, mapSessionRow(row)] as const),
               );
 
-              const snapshot = {
+              return {
                 snapshotSequence: computeSnapshotSequence(stateRows),
                 projects: Arr.filterMap(projectRows, (row) =>
                   row.deletedAt === null && activeProjectIds.has(row.projectId)
@@ -2972,6 +3051,7 @@ pending_approval_requests AS (
                   pinnedAt: row.pinnedAt,
                   pinOrderKey: row.pinOrderKey ?? null,
                   activeOrderKey: row.activeOrderKey ?? null,
+                  autoSettleDisabledAt: row.autoSettleDisabledAt ?? null,
                   titleRegeneration: mapTitleRegeneration(row),
                   titleState: row.titleState,
                   session: sessionByThread.get(row.threadId) ?? null,
@@ -2985,15 +3065,7 @@ pending_approval_requests AS (
                   planProgress: threadPlanProgress.getThreadPlanProgress(row.threadId),
                 })),
                 updatedAt: updatedAt ?? "1970-01-01T00:00:00.000Z",
-              };
-
-              return yield* decodeShellSnapshot(snapshot).pipe(
-                Effect.mapError(
-                  toPersistenceDecodeError(
-                    "ProjectionSnapshotQuery.getArchivedShellSnapshot:decodeShellSnapshot",
-                  ),
-                ),
-              );
+              } satisfies OrchestrationShellSnapshot;
             }),
         ),
         Effect.mapError((error) => {
@@ -3328,6 +3400,7 @@ pending_approval_requests AS (
         pinnedAt: threadRow.value.pinnedAt,
         pinOrderKey: threadRow.value.pinOrderKey ?? null,
         activeOrderKey: threadRow.value.activeOrderKey ?? null,
+        autoSettleDisabledAt: threadRow.value.autoSettleDisabledAt ?? null,
         titleRegeneration: mapTitleRegeneration(threadRow.value),
         titleState: threadRow.value.titleState,
         session: Option.isSome(sessionRow) ? mapSessionRow(sessionRow.value) : null,
@@ -3623,6 +3696,7 @@ pending_approval_requests AS (
         pinnedAt: threadRow.value.pinnedAt,
         pinOrderKey: threadRow.value.pinOrderKey ?? null,
         activeOrderKey: threadRow.value.activeOrderKey ?? null,
+        autoSettleDisabledAt: threadRow.value.autoSettleDisabledAt ?? null,
         titleRegeneration: mapTitleRegeneration(threadRow.value),
         titleState: threadRow.value.titleState,
         deletedAt: null,
@@ -3829,6 +3903,7 @@ pending_approval_requests AS (
     listActivitiesByKind,
     getSnapshot,
     getShellSnapshot,
+    listThreadsWithPullRequests,
     getArchivedShellSnapshot,
     getDeletedWorktreeThreads,
     searchThreads,
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
index c7d9417bc75b..87f9bd03d46c 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
@@ -55,6 +55,7 @@ import {
 import { ProviderAuthService } from "../../provider/Services/ProviderAuthService.ts";
 import { makeProviderRegistryLayer } from "../../provider/testUtils/providerRegistryMock.ts";
 import { TextGeneration } from "../../textGeneration/TextGeneration.ts";
+import { TerminalManager } from "../../terminal/Manager.ts";
 import * as RepositoryIdentityResolver from "../../project/RepositoryIdentityResolver.ts";
 import { OrchestrationEngineLive } from "./OrchestrationEngine.ts";
 import { OrchestrationProjectionPipelineLive } from "./ProjectionPipeline.ts";
@@ -307,6 +308,7 @@ describe("ProviderCommandReactor", () => {
       }),
     );
     const pruneWorktrees = vi.fn((_: { readonly cwd: string }) => Effect.void);
+    const closeIdleTerminals = vi.fn((_: { readonly threadId: string }) => Effect.void);
     const createWorktree = vi.fn(
       (input: { readonly refName: string; readonly path: string | null }) =>
         Effect.succeed({ worktree: { path: input.path ?? "", refName: input.refName } }),
@@ -490,6 +492,7 @@ describe("ProviderCommandReactor", () => {
           generateThreadTitle,
         }),
       ),
+      Layer.provideMerge(Layer.mock(TerminalManager)({ closeIdle: closeIdleTerminals })),
       Layer.provideMerge(ServerSettingsService.layerTest()),
       Layer.provideMerge(SqlitePersistenceMemory),
       Layer.provideMerge(ServerConfig.layerTest(process.cwd(), baseDir)),
@@ -621,6 +624,7 @@ describe("ProviderCommandReactor", () => {
       renameBranch,
       pruneWorktrees,
       createWorktree,
+      closeIdleTerminals,
       refreshStatus,
       generateBranchName,
       generateThreadTitle,
@@ -887,8 +891,92 @@ describe("ProviderCommandReactor", () => {
     expect(thread?.session?.threadId).toBe("thread-1");
     expect(thread?.session?.status).toBe("starting");
     expect(thread?.session?.runtimeMode).toBe("approval-required");
+    expect(harness.startSession.mock.calls[0]?.[1]).not.toHaveProperty("title");
   });
 
+  effectIt.effect("forwards only a user-renamed title when starting a provider session", () =>
+    Effect.gen(function* () {
+      const harness = yield* Effect.promise(() =>
+        createHarness({ initialTitle: "Add a progressive blur as you scroll" }),
+      );
+      const now = "2026-01-01T00:00:00.000Z";
+      const modelSelection = {
+        instanceId: ProviderInstanceId.make("codex"),
+        model: "gpt-5-codex",
+      };
+      const startTurn = (threadId: string, text: string, titleSeed: string) =>
+        harness.engine.dispatch({
+          type: "thread.turn.start",
+          commandId: CommandId.make(`cmd-title-${threadId}`),
+          threadId: ThreadId.make(threadId),
+          message: {
+            messageId: asMessageId(`message-${threadId}`),
+            role: "user",
+            text,
+            attachments: [],
+          },
+          titleSeed,
+          interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+          runtimeMode: "approval-required",
+          createdAt: now,
+        });
+
+      yield* startTurn(
+        "thread-1",
+        "Add a progressive blur as you scroll",
+        "Add a progressive blur as you scroll",
+      );
+      yield* Effect.promise(() => waitFor(() => harness.startSession.mock.calls.length === 1));
+      expect(harness.startSession.mock.calls[0]?.[1]).not.toHaveProperty("title");
+
+      yield* harness.engine.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("cmd-thread-create-renamed"),
+        threadId: ThreadId.make("thread-renamed"),
+        projectId: asProjectId("project-1"),
+        title: "New thread",
+        modelSelection,
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        branch: null,
+        worktreePath: null,
+        createdAt: now,
+      });
+      yield* harness.engine.dispatch({
+        type: "thread.meta.update",
+        commandId: CommandId.make("cmd-thread-rename"),
+        threadId: ThreadId.make("thread-renamed"),
+        title: "Keep this name",
+      });
+      yield* startTurn("thread-renamed", "hello there", "hello there");
+      yield* Effect.promise(() => waitFor(() => harness.startSession.mock.calls.length === 2));
+      expect(harness.startSession.mock.calls[1]?.[1]).toMatchObject({ title: "Keep this name" });
+
+      yield* harness.engine.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("cmd-thread-create-seeded"),
+        threadId: ThreadId.make("thread-seeded"),
+        projectId: asProjectId("project-1"),
+        title: "New thread",
+        modelSelection,
+        interactionMode: DEFAULT_PROVIDER_INTERACTION_MODE,
+        runtimeMode: "approval-required",
+        branch: null,
+        worktreePath: null,
+        createdAt: now,
+      });
+      yield* harness.engine.dispatch({
+        type: "thread.meta.update",
+        commandId: CommandId.make("cmd-thread-autotitle"),
+        threadId: ThreadId.make("thread-seeded"),
+        title: "hello there",
+      });
+      yield* startTurn("thread-seeded", "hello there", "hello there");
+      yield* Effect.promise(() => waitFor(() => harness.startSession.mock.calls.length === 3));
+      expect(harness.startSession.mock.calls[2]?.[1]).not.toHaveProperty("title");
+    }),
+  );
+
   effectIt.effect("projects inline context before sending the provider turn", () =>
     Effect.gen(function* () {
       const harness = yield* Effect.promise(() => createHarness());
@@ -4339,6 +4427,77 @@ describe("ProviderCommandReactor", () => {
       expect(thread?.settledOverride).toBe("settled");
       expect(thread?.session?.status).toBe("stopped");
       expect(thread?.session?.providerInstanceId).toBe(ProviderInstanceId.make("codex_work"));
+      expect(harness.closeIdleTerminals).toHaveBeenCalledWith({
+        threadId: ThreadId.make("thread-1"),
+      });
     }),
   );
+
+  effectIt.effect("closes idle terminals when a thread without a session settles", () =>
+    Effect.gen(function* () {
+      const harness = yield* Effect.promise(() => createHarness());
+      const terminalsClosed = yield* Deferred.make<void>();
+      harness.closeIdleTerminals.mockImplementation(() =>
+        Deferred.succeed(terminalsClosed, undefined).pipe(Effect.asVoid),
+      );
+
+      yield* harness.engine.dispatch({
+        type: "thread.settle",
+        commandId: CommandId.make("cmd-settle-without-session"),
+        threadId: ThreadId.make("thread-1"),
+      });
+      yield* Deferred.await(terminalsClosed);
+      yield* Effect.promise(() => harness.drain());
+
+      expect(harness.closeIdleTerminals).toHaveBeenCalledWith({
+        threadId: ThreadId.make("thread-1"),
+      });
+      expect(harness.stopSession).not.toHaveBeenCalled();
+    }),
+  );
+
+  effectIt.effect(
+    "keeps terminals when the thread is un-settled before its settle event runs",
+    () =>
+      Effect.gen(function* () {
+        const harness = yield* Effect.promise(() => createHarness());
+        const threadId = ThreadId.make("thread-1");
+        const firstCloseStarted = yield* Deferred.make<void>();
+        const releaseFirstClose = yield* Deferred.make<void>();
+        harness.closeIdleTerminals.mockImplementationOnce(() =>
+          Deferred.succeed(firstCloseStarted, undefined).pipe(
+            Effect.andThen(Deferred.await(releaseFirstClose)),
+          ),
+        );
+
+        yield* harness.engine.dispatch({
+          type: "thread.settle",
+          commandId: CommandId.make("cmd-settle-first"),
+          threadId,
+        });
+        // The reactor is busy with the first settle while the user changes their mind.
+        yield* Deferred.await(firstCloseStarted);
+        yield* harness.engine.dispatch({
+          type: "thread.unsettle",
+          commandId: CommandId.make("cmd-unsettle-first"),
+          threadId,
+          reason: "user",
+        });
+        yield* harness.engine.dispatch({
+          type: "thread.settle",
+          commandId: CommandId.make("cmd-settle-second"),
+          threadId,
+        });
+        yield* harness.engine.dispatch({
+          type: "thread.unsettle",
+          commandId: CommandId.make("cmd-unsettle-second"),
+          threadId,
+          reason: "user",
+        });
+        yield* Deferred.succeed(releaseFirstClose, undefined);
+        yield* Effect.promise(() => harness.drain());
+
+        expect(harness.closeIdleTerminals).toHaveBeenCalledTimes(1);
+      }),
+  );
 });
diff --git a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
index bdf4fe8e69d9..77022a8518d7 100644
--- a/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
+++ b/apps/server/src/orchestration/Layers/ProviderCommandReactor.ts
@@ -65,6 +65,7 @@ import {
 import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
 import { VcsStatusBroadcaster } from "../../vcs/VcsStatusBroadcaster.ts";
 import { GitWorkflowService } from "../../git/GitWorkflowService.ts";
+import * as TerminalManager from "../../terminal/Manager.ts";
 const isProviderAdapterProcessError = Schema.is(ProviderAdapterProcessError);
 const isProviderAdapterRequestError = Schema.is(ProviderAdapterRequestError);
 const isProviderAdapterValidationError = Schema.is(ProviderAdapterValidationError);
@@ -222,6 +223,7 @@ const make = Effect.gen(function* () {
   const vcsStatusBroadcaster = yield* VcsStatusBroadcaster;
   const textGeneration = yield* TextGeneration;
   const serverSettingsService = yield* ServerSettingsService;
+  const terminalManager = yield* TerminalManager.TerminalManager;
   /** Environment settings with the thread's project overrides applied. */
   const projectSettingsForThread = Effect.fnUntraced(function* (threadId: ThreadId) {
     const settings = yield* serverSettingsService.getSettings;
@@ -511,14 +513,14 @@ const make = Effect.gen(function* () {
       Effect.andThen(
         gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath }, { submodules }),
       ),
-      Effect.catchCause((cause) =>
-        Cause.hasInterruptsOnly(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("provider command reactor failed to recreate worktree", {
-              threadId: thread.id,
-              worktreePath,
-              cause: Cause.pretty(cause),
-            }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        (cause) =>
+          Effect.logWarning("provider command reactor failed to recreate worktree", {
+            threadId: thread.id,
+            worktreePath,
+            cause: Cause.pretty(cause),
+          }),
       ),
     );
   });
@@ -573,6 +575,9 @@ const make = Effect.gen(function* () {
     options?: {
       readonly modelSelection?: ModelSelection;
       readonly pendingTurnStart?: boolean;
+      // First-turn prompt seed. A manual title that still equals this seed was
+      // written by the client's auto-title, not a user rename.
+      readonly titleSeed?: string;
     },
   ) {
     const thread = yield* resolveThreadShell(threadId);
@@ -710,6 +715,15 @@ const make = Effect.gen(function* () {
           .refreshWorkspaceSnapshot({ instanceId: desiredInstanceId, cwd: effectiveCwd })
           .pipe(Effect.forkDetach)
       : Effect.void;
+    // OpenCode skips SessionPrompt.ensureTitle when session.create already has
+    // a title. Prompt seeds and "New thread" are not user titles, so omit them
+    // and let the provider generate one. A real rename is source "manual" and
+    // differs from the first-turn prompt seed (the web client writes that seed
+    // through thread.meta.update, which also marks the title manual).
+    const manualTitle = thread.titleState?.source === "manual" ? thread.title.trim() : "";
+    const promptSeed = options?.titleSeed?.trim();
+    const sessionTitle =
+      manualTitle.length > 0 && manualTitle !== promptSeed ? thread.title : undefined;
 
     const startProviderSession = (input?: {
       readonly resumeCursor?: unknown;
@@ -721,7 +735,7 @@ const make = Effect.gen(function* () {
           ...(preferredProvider ? { provider: preferredProvider } : {}),
           providerInstanceId: desiredInstanceId,
           ...(effectiveCwd ? { cwd: effectiveCwd } : {}),
-          ...(thread.title ? { title: thread.title } : {}),
+          ...(sessionTitle ? { title: sessionTitle } : {}),
           modelSelection: desiredModelSelection,
           ...(input?.resumeCursor !== undefined ? { resumeCursor: input.resumeCursor } : {}),
           runtimeMode: desiredRuntimeMode,
@@ -837,6 +851,7 @@ const make = Effect.gen(function* () {
     readonly modelSelection?: ModelSelection;
     readonly interactionMode?: "default" | "plan";
     readonly createdAt: string;
+    readonly titleSeed?: string;
   }) {
     const thread = yield* resolveThreadShell(input.threadId);
     if (!thread) {
@@ -846,6 +861,7 @@ const make = Effect.gen(function* () {
     }
     yield* ensureSessionForThread(input.threadId, input.createdAt, {
       ...(input.modelSelection !== undefined ? { modelSelection: input.modelSelection } : {}),
+      ...(input.titleSeed !== undefined ? { titleSeed: input.titleSeed } : {}),
       pendingTurnStart: true,
     });
     if (input.modelSelection !== undefined) {
@@ -1154,15 +1170,14 @@ const make = Effect.gen(function* () {
         return;
       }
       const result = yield* regenerateThreadTitle(event, requestId).pipe(
-        Effect.catchCause((cause) => {
-          if (Cause.hasInterruptsOnly(cause)) {
-            return Effect.failCause(cause);
-          }
-          return Effect.logWarning("provider command reactor failed to regenerate thread title", {
-            threadId: event.payload.threadId,
-            cause: Cause.pretty(cause),
-          }).pipe(Effect.as({ _tag: "Completed", title: undefined } as const));
-        }),
+        Effect.catchCauseIf(
+          (cause) => !Cause.hasInterruptsOnly(cause),
+          (cause) =>
+            Effect.logWarning("provider command reactor failed to regenerate thread title", {
+              threadId: event.payload.threadId,
+              cause: Cause.pretty(cause),
+            }).pipe(Effect.as({ _tag: "Completed", title: undefined } as const)),
+        ),
       );
       if (result._tag === "Superseded") {
         return;
@@ -1174,34 +1189,26 @@ const make = Effect.gen(function* () {
         ...(result.title !== undefined ? { title: result.title } : {}),
       };
       yield* dispatchThreadTitleRegenerationCompletion(completion).pipe(
-        Effect.catchCause((cause) => {
-          if (Cause.hasInterruptsOnly(cause)) {
-            return Effect.failCause(cause);
-          }
-          return Effect.logWarning(
-            "provider command reactor retrying title regeneration completion",
-            {
+        Effect.catchCauseIf(
+          (cause) => !Cause.hasInterruptsOnly(cause),
+          (cause) =>
+            Effect.logWarning("provider command reactor retrying title regeneration completion", {
               threadId: event.payload.threadId,
               cause: Cause.pretty(cause),
-            },
-          ).pipe(Effect.andThen(dispatchThreadTitleRegenerationCompletion(completion)));
-        }),
+            }).pipe(Effect.andThen(dispatchThreadTitleRegenerationCompletion(completion))),
+        ),
       );
     },
     (effect, event) =>
       effect.pipe(
-        Effect.catchCause((cause) => {
-          if (Cause.hasInterruptsOnly(cause)) {
-            return Effect.failCause(cause);
-          }
-          return Effect.logWarning(
-            "provider command reactor failed to complete title regeneration",
-            {
+        Effect.catchCauseIf(
+          (cause) => !Cause.hasInterruptsOnly(cause),
+          (cause) =>
+            Effect.logWarning("provider command reactor failed to complete title regeneration", {
               threadId: event.payload.threadId,
               cause: Cause.pretty(cause),
-            },
-          );
-        }),
+            }),
+        ),
       ),
   );
   const threadTitleRegenerationWorker = yield* makeDrainableWorker(
@@ -1495,8 +1502,13 @@ const make = Effect.gen(function* () {
         : {}),
       interactionMode: event.payload.interactionMode,
       createdAt: event.payload.createdAt,
+      // Later turns must not reuse the current title as titleSeed. Only the
+      // first prompt seed should suppress a not-yet-renamed session title.
+      ...(!hasOtherUserMessages && event.payload.titleSeed !== undefined
+        ? { titleSeed: event.payload.titleSeed }
+        : {}),
     }).pipe(
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.catchCause((cause) => handleTurnStartFailure(cause).pipe(Effect.as(Option.none()))),
     );
 
@@ -1831,11 +1843,14 @@ const make = Effect.gen(function* () {
         return;
       case "thread.settled": {
         const thread = yield* projectionSnapshotQuery.getThreadShellById(event.payload.threadId);
-        if (
-          Option.isNone(thread) ||
-          thread.value.session == null ||
-          thread.value.session.status === "stopped"
-        ) {
+        // A thread re-engaged before this event ran keeps its shells and session.
+        if (Option.isNone(thread) || thread.value.settledOverride !== "settled") {
+          return;
+        }
+        // Idle shells close so they stop holding the worktree. A terminal that
+        // runs a command (a dev server, an editor) stays for the user to close.
+        yield* terminalManager.closeIdle({ threadId: event.payload.threadId });
+        if (thread.value.session == null || thread.value.session.status === "stopped") {
           return;
         }
         yield* orchestrationEngine.dispatch({
diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
index d61739f72c21..4c6e3703ba82 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
@@ -3944,6 +3944,7 @@ describe("ProviderRuntimeIngestion", () => {
       turnId: asTurnId("turn-runtime-error-activity"),
       payload: {
         message: "runtime activity exploded",
+        code: "subscription_sharing_usage_limit_exceeded",
       },
     });
 
@@ -3960,6 +3961,7 @@ describe("ProviderRuntimeIngestion", () => {
 
     expect(activity?.kind).toBe("runtime.error");
     expect(activityPayload?.message).toBe("runtime activity exploded");
+    expect(activityPayload?.code).toBe("subscription_sharing_usage_limit_exceeded");
   });
 
   it("keeps the session running when a runtime.warning arrives during an active turn", async () => {
@@ -5174,4 +5176,59 @@ describe("splitBufferedAssistantText", () => {
       rest: "```\n- one\n- two\n",
     });
   });
+
+  it("holds a heading until the block under it is done", () => {
+    expect(splitBufferedAssistantText("intro\n\n## Setup\n\nInstall it")).toEqual({
+      ready: "intro\n\n",
+      rest: "## Setup\n\nInstall it",
+    });
+    expect(
+      splitBufferedAssistantText("intro\n\n# Plan\n\n## Setup\n\nInstall it.\n\nNext"),
+    ).toEqual({
+      ready: "intro\n\n# Plan\n\n## Setup\n\nInstall it.\n\n",
+      rest: "Next",
+    });
+  });
+
+  it("delivers the paragraph above a heading with no blank line between them", () => {
+    expect(splitBufferedAssistantText("para\n## Setup\n\nInstall")).toEqual({
+      ready: "para\n",
+      rest: "## Setup\n\nInstall",
+    });
+    // A bold line there continues the paragraph, so both stay buffered.
+    expect(splitBufferedAssistantText("para\n**Setup**\n\nInstall")).toEqual({
+      ready: "",
+      rest: "para\n**Setup**\n\nInstall",
+    });
+  });
+
+  it("holds a line of only bold text like a heading", () => {
+    expect(splitBufferedAssistantText("**Risk by area:**\n\n| a |\n|---|\n")).toEqual({
+      ready: "",
+      rest: "**Risk by area:**\n\n| a |\n|---|\n",
+    });
+    expect(splitBufferedAssistantText("**Use *npm* now**\n\nInstall it")).toEqual({
+      ready: "",
+      rest: "**Use *npm* now**\n\nInstall it",
+    });
+    expect(splitBufferedAssistantText("**Note:** read this.\n\nNext")).toEqual({
+      ready: "**Note:** read this.\n\n",
+      rest: "Next",
+    });
+  });
+
+  it("delivers a held heading with its first list item or its whole code block", () => {
+    expect(splitBufferedAssistantText("## Steps\n\n- one\n- tw")).toEqual({
+      ready: "## Steps\n\n- one\n",
+      rest: "- tw",
+    });
+    expect(splitBufferedAssistantText("## Code\n\n```ts\na\n\nb\n")).toEqual({
+      ready: "",
+      rest: "## Code\n\n```ts\na\n\nb\n",
+    });
+    expect(splitBufferedAssistantText("## Code\n\n```ts\na\n```\nafter")).toEqual({
+      ready: "## Code\n\n```ts\na\n```\n",
+      rest: "after",
+    });
+  });
 });
diff --git a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
index 0db70e491235..2584a7578200 100644
--- a/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
+++ b/apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
@@ -211,6 +211,12 @@ const BLANK_LINE_PATTERN = /^[ \t]*$/;
 // nested items count. The trailing space is required, so a partial `-` or
 // `1.` never matches before the model finishes the marker.
 const LIST_ITEM_START_PATTERN = /^[ \t]*(?:[-*+]|\d{1,9}[.)])[ \t]/;
+// A section title: an ATX heading, or a line of only bold text, which models
+// often use as a heading.
+const SECTION_TITLE_PATTERN = /^ {0,3}(?:#{1,6}(?:[ \t]|$)|\*\*(?:[^*]|\*(?!\*))+\*\*:?$)/;
+// An unindented ATX heading ends the paragraph or list above it, even with no
+// blank line between them. A bold line would continue the paragraph instead.
+const TOP_LEVEL_HEADING_PATTERN = /^#{1,6}(?:[ \t]|$)/;
 
 /**
  * Splits buffered assistant text at the last blank line, closing code fence,
@@ -221,17 +227,26 @@ const LIST_ITEM_START_PATTERN = /^[ \t]*(?:[-*+]|\d{1,9}[.)])[ \t]/;
  * never leaks; a list item start is the one lookahead that may sit on the
  * partial line, since tight lists have no blank lines between items and would
  * otherwise land all at once.
+ *
+ * A section title holds the boundary until a content line follows it, so a
+ * title never lands alone and waits above a block that is still streaming.
  */
 export function splitBufferedAssistantText(text: string): { ready: string; rest: string } {
   let openFence: { marker: string; indent: number } | null = null;
   let boundary = -1;
   let lineStart = 0;
+  let titleAwaitingContent = false;
   for (;;) {
     const newline = text.indexOf("\n", lineStart);
     const line = text
       .slice(lineStart, newline === -1 ? text.length : newline)
       .replace(/[ \t\r]+$/, "");
-    if (openFence === null && lineStart > 0 && LIST_ITEM_START_PATTERN.test(line)) {
+    if (
+      openFence === null &&
+      lineStart > 0 &&
+      !titleAwaitingContent &&
+      LIST_ITEM_START_PATTERN.test(line)
+    ) {
       boundary = lineStart;
     }
     if (newline === -1) {
@@ -243,6 +258,7 @@ export function splitBufferedAssistantText(text: string): { ready: string; rest:
       const marker = fenceMatch[2]!;
       if (openFence === null) {
         openFence = { marker, indent };
+        titleAwaitingContent = false;
       } else if (
         marker[0] === openFence.marker[0] &&
         marker.length >= openFence.marker.length &&
@@ -254,7 +270,14 @@ export function splitBufferedAssistantText(text: string): { ready: string; rest:
         boundary = newline + 1;
       }
     } else if (openFence === null && BLANK_LINE_PATTERN.test(line) && lineStart > 0) {
-      boundary = newline + 1;
+      if (!titleAwaitingContent) {
+        boundary = newline + 1;
+      }
+    } else if (openFence === null) {
+      if (lineStart > 0 && !titleAwaitingContent && TOP_LEVEL_HEADING_PATTERN.test(line)) {
+        boundary = lineStart;
+      }
+      titleAwaitingContent = SECTION_TITLE_PATTERN.test(line);
     }
     lineStart = newline + 1;
   }
@@ -548,6 +571,7 @@ export function runtimeEventToActivities(
           summary: "Runtime error",
           payload: {
             message: truncateDetail(event.payload.message),
+            ...(event.payload.code ? { code: event.payload.code } : {}),
           },
           turnId: toTurnId(event.turnId) ?? null,
           ...maybeSequence,
@@ -2648,17 +2672,16 @@ const make = Effect.gen(function* () {
     (source: string, event: { readonly eventId: string; readonly type: string }) =>
     <E, R>(effect: Effect.Effect<void, E, R>) =>
       effect.pipe(
-        Effect.catchCause((cause) => {
-          if (Cause.hasInterruptsOnly(cause)) {
-            return Effect.failCause(cause);
-          }
-          return Effect.logWarning("provider runtime ingestion failed to process event", {
-            source,
-            eventId: event.eventId,
-            eventType: event.type,
-            cause: Cause.pretty(cause),
-          });
-        }),
+        Effect.catchCauseIf(
+          (cause) => !Cause.hasInterruptsOnly(cause),
+          (cause) =>
+            Effect.logWarning("provider runtime ingestion failed to process event", {
+              source,
+              eventId: event.eventId,
+              eventType: event.type,
+              cause: Cause.pretty(cause),
+            }),
+        ),
       );
 
   const worker = yield* makeDrainableWorker((input: RuntimeIngestionInput) =>
diff --git a/apps/server/src/orchestration/Layers/ThreadDeletionReactor.ts b/apps/server/src/orchestration/Layers/ThreadDeletionReactor.ts
index 14a92a5eaef5..092ca1b1d471 100644
--- a/apps/server/src/orchestration/Layers/ThreadDeletionReactor.ts
+++ b/apps/server/src/orchestration/Layers/ThreadDeletionReactor.ts
@@ -27,15 +27,14 @@ export const logCleanupCauseUnlessInterrupted = <R, E>({
   readonly threadId: ThreadDeletedEvent["payload"]["threadId"];
 }): Effect.Effect<void, E, R> =>
   effect.pipe(
-    Effect.catchCause((cause) => {
-      if (Cause.hasInterruptsOnly(cause)) {
-        return Effect.failCause(cause);
-      }
-      return Effect.logDebug(message, {
-        threadId,
-        cause: Cause.pretty(cause),
-      });
-    }),
+    Effect.catchCauseIf(
+      (cause) => !Cause.hasInterruptsOnly(cause),
+      (cause) =>
+        Effect.logDebug(message, {
+          threadId,
+          cause: Cause.pretty(cause),
+        }),
+    ),
   );
 
 const make = Effect.gen(function* () {
@@ -67,16 +66,15 @@ const make = Effect.gen(function* () {
 
   const processThreadDeletedSafely = (event: ThreadDeletedEvent) =>
     processThreadDeleted(event).pipe(
-      Effect.catchCause((cause) => {
-        if (Cause.hasInterruptsOnly(cause)) {
-          return Effect.failCause(cause);
-        }
-        return Effect.logWarning("thread deletion reactor failed to process event", {
-          eventType: event.type,
-          threadId: event.payload.threadId,
-          cause: Cause.pretty(cause),
-        });
-      }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        (cause) =>
+          Effect.logWarning("thread deletion reactor failed to process event", {
+            eventType: event.type,
+            threadId: event.payload.threadId,
+            cause: Cause.pretty(cause),
+          }),
+      ),
     );
 
   const worker = yield* makeDrainableWorker(processThreadDeletedSafely);
diff --git a/apps/server/src/orchestration/PullRequestSyncReactor.test.ts b/apps/server/src/orchestration/PullRequestSyncReactor.test.ts
index 5502376e691e..e6a18c2856a1 100644
--- a/apps/server/src/orchestration/PullRequestSyncReactor.test.ts
+++ b/apps/server/src/orchestration/PullRequestSyncReactor.test.ts
@@ -172,6 +172,7 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
   const snapshots = yield* Ref.make(options.snapshot);
   const events = yield* PubSub.unbounded<OrchestrationEvent>();
   const snapshotReads = yield* Queue.unbounded<void>();
+  const shellSnapshotReads = yield* Ref.make(0);
   const syncCommands = yield* Ref.make<ReadonlyArray<SyncCommand>>([]);
   const linkCommands = yield* Ref.make<ReadonlyArray<LinkCommand>>([]);
   const summaryCalls = yield* Ref.make<ReadonlyArray<PullRequestRef>>([]);
@@ -209,8 +210,16 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
 
   const dependencies = Layer.mergeAll(
     Layer.mock(ProjectionSnapshotQuery)({
+      listThreadsWithPullRequests: () =>
+        Queue.offer(snapshotReads, undefined).pipe(
+          Effect.andThen(Ref.get(snapshots)),
+          Effect.map((snapshot) => snapshot.threads),
+        ),
       getShellSnapshot: () =>
-        Queue.offer(snapshotReads, undefined).pipe(Effect.andThen(Ref.get(snapshots))),
+        Ref.update(shellSnapshotReads, (count) => count + 1).pipe(
+          Effect.andThen(Queue.offer(snapshotReads, undefined)),
+          Effect.andThen(Ref.get(snapshots)),
+        ),
     }),
     Layer.mock(PullRequestService)({
       summary,
@@ -235,6 +244,7 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
     activation,
     snapshots,
     snapshotReads,
+    shellSnapshotReads,
     syncCommands,
     linkCommands,
     summaryCalls,
@@ -511,6 +521,8 @@ describe("PullRequestSyncReactor", () => {
             ],
           );
           assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+          // Reads only linked threads, never the full shell snapshot of every thread.
+          assert.strictEqual(yield* Ref.get(fixture.shellSnapshotReads), 0);
         }).pipe(Effect.provide(fixture.layer));
       }),
     ),
diff --git a/apps/server/src/orchestration/PullRequestSyncReactor.ts b/apps/server/src/orchestration/PullRequestSyncReactor.ts
index 35819d9e7430..ffcc9fb3c26d 100644
--- a/apps/server/src/orchestration/PullRequestSyncReactor.ts
+++ b/apps/server/src/orchestration/PullRequestSyncReactor.ts
@@ -1,7 +1,6 @@
 import { siblingPullRequestUrl } from "@t3tools/shared/changeRequestUrl";
 import {
   CommandId,
-  type OrchestrationThreadShell,
   type PullRequestSummary,
   type ThreadPullRequestKey,
   type ThreadPullRequestLink,
@@ -36,7 +35,7 @@ const SLOW_SYNC_INTERVAL_MS = 15 * 60 * 1_000;
 type SnapshotFields = Omit<ThreadPullRequestSnapshot, "syncedAt">;
 
 interface LinkEntry {
-  readonly thread: OrchestrationThreadShell;
+  readonly thread: ProjectionSnapshotQuery.ProjectionThreadPullRequests;
   readonly link: ThreadPullRequestLink;
 }
 
@@ -104,15 +103,15 @@ function stacksEqual(
   );
 }
 
-function isUnsettled(thread: OrchestrationThreadShell): boolean {
+function isUnsettled(thread: ProjectionSnapshotQuery.ProjectionThreadPullRequests): boolean {
   return thread.settledOverride !== "settled" && thread.settledAt === null;
 }
 
 /**
  * Keeps every thread ↔ pull request link's host snapshot current. One sweep a minute reads
- * the shell snapshot, groups visible links by pull request so the host is asked once per PR
- * no matter how many threads share it, and writes back only what changed. Native stacks the
- * host reports are auto-linked to the thread as `source: "stack"`.
+ * only the active threads that have links, groups visible links by pull request so the host
+ * is asked once per PR no matter how many threads share it, and writes back only what
+ * changed. Native stacks the host reports are auto-linked to the thread as `source: "stack"`.
  */
 export class PullRequestSyncReactor extends Context.Service<
   PullRequestSyncReactor,
@@ -153,14 +152,13 @@ export const make = Effect.gen(function* () {
       Cause.hasInterruptsOnly(cause) ? Effect.failCause(cause) : Effect.logWarning(message, fields);
 
   const sweep = Effect.fn("PullRequestSyncReactor.sweep")(function* (requestedKey?: string) {
-    const snapshot = yield* snapshots.getShellSnapshot();
+    const threads = yield* snapshots.listThreadsWithPullRequests();
     const now = yield* DateTime.now;
     const nowMs = DateTime.toEpochMillis(now);
     const nowIso = DateTime.formatIso(now);
 
     const groups = new Map<string, Array<LinkEntry>>();
-    for (const thread of snapshot.threads) {
-      if (thread.archivedAt !== null) continue;
+    for (const thread of threads) {
       for (const link of visibleThreadPullRequests(thread.pullRequests)) {
         const key = threadPullRequestKeyOf(link);
         const entries = groups.get(key) ?? [];
@@ -259,12 +257,12 @@ export const make = Effect.gen(function* () {
             Effect.map((stack) => ({
               stack: stack === null ? null : ({ kind: "native", ...stack } as const),
             })),
-            Effect.catchCause((cause) =>
-              Cause.hasInterruptsOnly(cause)
-                ? Effect.failCause(cause)
-                : Effect.logWarning("pull request stack lookup failed", {
-                    key,
-                  }).pipe(Effect.as(null)),
+            Effect.catchCauseIf(
+              (cause) => !Cause.hasInterruptsOnly(cause),
+              () =>
+                Effect.logWarning("pull request stack lookup failed", {
+                  key,
+                }).pipe(Effect.as(null)),
             ),
           )
         : null;
@@ -303,7 +301,9 @@ export const make = Effect.gen(function* () {
               Effect.catchCause(logSkipped("pull request sync skipped", { key })),
             )
           : Effect.void,
-      { concurrency: 8, discard: true },
+      // As wide as one batched summary read, so the sweep's reads on a host arrive together and
+      // GitHub answers them in one request rather than one `gh pr view` apiece.
+      { concurrency: 25, discard: true },
     );
   });
 
diff --git a/apps/server/src/orchestration/Schemas.ts b/apps/server/src/orchestration/Schemas.ts
index 29468dc3f84e..f4fe2e0104f6 100644
--- a/apps/server/src/orchestration/Schemas.ts
+++ b/apps/server/src/orchestration/Schemas.ts
@@ -16,6 +16,7 @@ import {
   ThreadPinnedPayload as ContractsThreadPinnedPayloadSchema,
   ThreadUnpinnedPayload as ContractsThreadUnpinnedPayloadSchema,
   ThreadPinReorderedPayload as ContractsThreadPinReorderedPayloadSchema,
+  ThreadAutoSettleSetPayload as ContractsThreadAutoSettleSetPayloadSchema,
   ThreadPullRequestLinkedPayload as ContractsThreadPullRequestLinkedPayloadSchema,
   ThreadPullRequestUnlinkedPayload as ContractsThreadPullRequestUnlinkedPayloadSchema,
   ThreadPullRequestSyncedPayload as ContractsThreadPullRequestSyncedPayloadSchema,
@@ -51,6 +52,7 @@ export const ThreadUnsnoozedPayload = ContractsThreadUnsnoozedPayloadSchema;
 export const ThreadPinnedPayload = ContractsThreadPinnedPayloadSchema;
 export const ThreadUnpinnedPayload = ContractsThreadUnpinnedPayloadSchema;
 export const ThreadPinReorderedPayload = ContractsThreadPinReorderedPayloadSchema;
+export const ThreadAutoSettleSetPayload = ContractsThreadAutoSettleSetPayloadSchema;
 export const ThreadPullRequestLinkedPayload = ContractsThreadPullRequestLinkedPayloadSchema;
 export const ThreadPullRequestUnlinkedPayload = ContractsThreadPullRequestUnlinkedPayloadSchema;
 export const ThreadPullRequestSyncedPayload = ContractsThreadPullRequestSyncedPayloadSchema;
diff --git a/apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts b/apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
index eac3ede9c1ee..08da6e00940c 100644
--- a/apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
+++ b/apps/server/src/orchestration/Services/ProjectionSnapshotQuery.ts
@@ -64,6 +64,12 @@ export interface ProjectionFullThreadDiffContext {
   readonly toCheckpointRef: CheckpointRef | null;
 }
 
+/** The thread fields pull request sync reads, for a thread with at least one link. */
+export type ProjectionThreadPullRequests = Pick<
+  OrchestrationThreadShell,
+  "id" | "projectId" | "settledOverride" | "settledAt" | "pullRequests"
+>;
+
 export interface ProjectionThreadDetailQuery {
   /**
    * Limit activities before SQLite returns and decodes their payloads.
@@ -114,11 +120,15 @@ export interface ProjectionSnapshotQueryShape {
    *
    * Returns only projects and thread shell summaries so clients can bootstrap
    * lightweight navigation state without hydrating every thread body.
+   *
+   * `unsettledOnly` is for background sweeps, not clients. It skips settled
+   * threads and their sessions, PR links, and turns, and its `updatedAt`
+   * ignores those rows. It still resolves every project, which keeps
+   * repository identities cached for client connects.
    */
-  readonly getShellSnapshot: () => Effect.Effect<
-    OrchestrationShellSnapshot,
-    ProjectionRepositoryError
-  >;
+  readonly getShellSnapshot: (options?: {
+    readonly unsettledOnly?: boolean;
+  }) => Effect.Effect<OrchestrationShellSnapshot, ProjectionRepositoryError>;
 
   /**
    * Read archived thread shell summaries for the archive page.
@@ -131,6 +141,16 @@ export interface ProjectionSnapshotQueryShape {
     ProjectionRepositoryError
   >;
 
+  /**
+   * Read active (not deleted, not archived) threads that have at least one pull
+   * request link, in shell snapshot order. Skips repository identity, so no
+   * legacy `linkedPullRequest` is derived.
+   */
+  readonly listThreadsWithPullRequests: () => Effect.Effect<
+    ReadonlyArray<ProjectionThreadPullRequests>,
+    ProjectionRepositoryError
+  >;
+
   /** Durable worktree ownership retained after thread deletion, including across restarts. */
   readonly getDeletedWorktreeThreads: () => Effect.Effect<
     ReadonlyArray<{
diff --git a/apps/server/src/orchestration/ThreadPullRequestReactor.test.ts b/apps/server/src/orchestration/ThreadPullRequestReactor.test.ts
index d6572083dad2..2a08dd03bc54 100644
--- a/apps/server/src/orchestration/ThreadPullRequestReactor.test.ts
+++ b/apps/server/src/orchestration/ThreadPullRequestReactor.test.ts
@@ -21,18 +21,27 @@ import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as PubSub from "effect/PubSub";
 import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import * as Stream from "effect/Stream";
 import { TestClock } from "effect/testing";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
 
 import { GitManager, type GitBranchPullRequest } from "../git/GitManager.ts";
+import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
 import { PullRequestService } from "../pullRequest/PullRequestService.ts";
 import { RepositoryIdentityResolver } from "../project/RepositoryIdentityResolver.ts";
 import { ServerActivation } from "../serverActivation.ts";
+import { OrchestrationProjectionSnapshotQueryLive } from "./Layers/ProjectionSnapshotQuery.ts";
 import { OrchestrationEngineService } from "./Services/OrchestrationEngine.ts";
-import { ProjectionSnapshotQuery } from "./Services/ProjectionSnapshotQuery.ts";
+import {
+  ProjectionSnapshotQuery,
+  type ProjectionSnapshotQueryShape,
+} from "./Services/ProjectionSnapshotQuery.ts";
+import * as ThreadBackgroundLiveness from "./ThreadBackgroundLiveness.ts";
+import * as ThreadPlanProgress from "./ThreadPlanProgress.ts";
 import * as ThreadPullRequestReactor from "./ThreadPullRequestReactor.ts";
 
 const NOW = "2026-09-01T12:00:00.000Z";
@@ -134,6 +143,8 @@ const makeHarness = Effect.fn("makeThreadPullRequestHarness")(function* (options
   readonly existingWorktrees?: ReadonlyArray<string>;
   readonly project?: OrchestrationProjectShell;
   readonly resolveRepositoryIdentity?: RepositoryIdentityResolver["Service"]["resolve"];
+  /** Serve full sweep reads from this instead of `threads`. */
+  readonly getShellSnapshot?: ProjectionSnapshotQueryShape["getShellSnapshot"];
 }) {
   const activation = yield* Deferred.make<void>();
   const snapshots = yield* Ref.make<OrchestrationShellSnapshot>({
@@ -142,7 +153,8 @@ const makeHarness = Effect.fn("makeThreadPullRequestHarness")(function* (options
     threads: options.threads,
     updatedAt: NOW,
   });
-  const reads = yield* Queue.unbounded<void>();
+  // Each shell read: a thread id for a one-thread read, null for a full read.
+  const reads = yield* Queue.unbounded<ThreadId | null>();
   const events = yield* PubSub.unbounded<OrchestrationEvent>();
   const commands = yield* Ref.make<ReadonlyArray<SyncCommand>>([]);
   const branchCalls = yield* Ref.make<
@@ -152,8 +164,27 @@ const makeHarness = Effect.fn("makeThreadPullRequestHarness")(function* (options
   let uuid = 0;
   const dependencies = Layer.mergeAll(
     Layer.mock(ProjectionSnapshotQuery)({
-      getShellSnapshot: () =>
-        Ref.get(snapshots).pipe(Effect.tap(() => Queue.offer(reads, undefined))),
+      getShellSnapshot: (readOptions) =>
+        (options.getShellSnapshot?.(readOptions) ?? Ref.get(snapshots)).pipe(
+          Effect.tap(() => Queue.offer(reads, null)),
+        ),
+      getSnapshotSequence: () =>
+        Ref.get(snapshots).pipe(Effect.map(({ snapshotSequence }) => ({ snapshotSequence }))),
+      getThreadShellById: (threadId) =>
+        Ref.get(snapshots).pipe(
+          Effect.map(({ threads }) =>
+            Option.fromUndefinedOr(
+              threads.find((thread) => thread.id === threadId && thread.archivedAt === null),
+            ),
+          ),
+          Effect.tap(() => Queue.offer(reads, threadId)),
+        ),
+      getProjectShells: (projectIds) =>
+        Ref.get(snapshots).pipe(
+          Effect.map(({ projects }) =>
+            projects.filter((project) => projectIds?.includes(project.id) ?? true),
+          ),
+        ),
     }),
     Layer.mock(GitManager)({
       branchPullRequest: (input, readOptions) =>
@@ -376,7 +407,7 @@ describe("ThreadPullRequestReactor", () => {
                 : [checkpointEvent, sessionEvent];
             for (const event of events) {
               yield* fixture.publish(event);
-              yield* Queue.take(fixture.reads);
+              expect(yield* Queue.take(fixture.reads)).toBe(current.id);
               yield* reactor.drain;
             }
             expect((yield* Ref.get(fixture.commands))[0]?.branchPullRequest).toEqual(reference(42));
@@ -388,6 +419,51 @@ describe("ThreadPullRequestReactor", () => {
       ),
   );
 
+  it.effect("refreshes the project identity when a turn adds the remote", () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const current = thread("new-remote");
+        const fixture = yield* makeHarness({
+          threads: [current],
+          project: { ...project, repositoryIdentity: null },
+          branchPullRequest: () => Effect.succeed(branchPullRequest()),
+          resolveRepositoryIdentity: (_cwd, options) =>
+            Effect.succeed(options?.refresh ? project.repositoryIdentity : null),
+        });
+        yield* Effect.gen(function* () {
+          const reactor = yield* fixture.start();
+          expect(yield* Ref.get(fixture.commands)).toHaveLength(0);
+
+          yield* fixture.publish({
+            type: "thread.turn-diff-completed",
+            sequence: 2,
+            eventId: EventId.make("checkpoint-finished"),
+            aggregateKind: "thread",
+            aggregateId: current.id,
+            occurredAt: NOW,
+            commandId: null,
+            causationEventId: null,
+            correlationId: null,
+            metadata: {},
+            payload: {
+              threadId: current.id,
+              turnId: TurnId.make("turn"),
+              checkpointTurnCount: 1,
+              checkpointRef: CheckpointRef.make("checkpoint"),
+              status: "ready",
+              files: [],
+              assistantMessageId: null,
+              completedAt: NOW,
+            },
+          });
+          yield* Queue.take(fixture.reads);
+          yield* reactor.drain;
+          expect((yield* Ref.get(fixture.commands))[0]?.branchPullRequest).toEqual(reference(42));
+        }).pipe(Effect.provide(fixture.layer));
+      }),
+    ),
+  );
+
   it.effect("uses live worktrees and falls back to the project for removed worktrees", () =>
     Effect.scoped(
       Effect.gen(function* () {
@@ -516,6 +592,23 @@ describe("ThreadPullRequestReactor", () => {
           yield* Effect.gen(function* () {
             const reactor = yield* fixture.start();
             expect(yield* Ref.get(fixture.commands)).toHaveLength(0);
+            // A one-thread read cannot show that other pending threads are gone.
+            const gone = ThreadId.make("gone");
+            yield* fixture.publish({
+              type: "thread.unarchived",
+              sequence: 2,
+              eventId: EventId.make("gone-unarchived"),
+              aggregateKind: "thread",
+              aggregateId: gone,
+              occurredAt: NOW,
+              commandId: null,
+              causationEventId: null,
+              correlationId: null,
+              metadata: {},
+              payload: { threadId: gone, updatedAt: NOW },
+            });
+            expect(yield* Queue.take(fixture.reads)).toBe(gone);
+            yield* reactor.drain;
             yield* Ref.set(online, true);
             yield* TestClock.adjust("1 minute");
             yield* Queue.take(fixture.reads);
@@ -564,6 +657,113 @@ describe("ThreadPullRequestReactor", () => {
     ),
   );
 
+  it.effect("discovers the same PRs from the unsettled read as from the full read", () =>
+    Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      const query = yield* ProjectionSnapshotQuery;
+      yield* sql`INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at)
+        VALUES ('project', 'Project', '/workspace/project', '[]', ${NOW}, ${NOW}),
+          ('dormant', 'Dormant', '/workspace/dormant', '[]', ${NOW}, ${NOW})`;
+      yield* sql`INSERT INTO projection_threads (thread_id, project_id, title, model_selection_json, runtime_mode, interaction_mode, branch, branch_pull_request_json, created_at, updated_at, archived_at, settled_override, settled_at)
+        VALUES
+          ('open', 'project', 'Open', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'open', NULL, ${NOW}, ${NOW}, NULL, NULL, NULL),
+          ('resumed', 'project', 'Resumed', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'resumed', NULL, ${NOW}, ${NOW}, NULL, 'active', NULL),
+          ('linked', 'project', 'Linked', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'linked', '{"projectId":"project","repository":"owner/repository","number":3,"url":"https://github.com/owner/repository/pull/3"}', ${NOW}, ${NOW}, NULL, NULL, NULL),
+          ('settled', 'project', 'Settled', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'settled', '{"projectId":"project","repository":"owner/repository","number":4,"url":"https://github.com/owner/repository/pull/4"}', ${NOW}, ${NOW}, NULL, 'settled', ${NOW}),
+          ('backfill', 'project', 'Backfill', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'backfill', NULL, ${NOW}, ${NOW}, NULL, 'settled', ${NOW}),
+          ('imported', 'dormant', 'Imported', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, ${NOW}, ${NOW}, NULL, 'settled', ${NOW}),
+          ('archived', 'project', 'Archived', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'archived', NULL, ${NOW}, ${NOW}, ${NOW}, NULL, NULL)`;
+      const numbers = new Map([
+        ["open", 1],
+        ["resumed", 2],
+        ["linked", 3],
+        ["settled", 4],
+        ["backfill", 5],
+        ["archived", 6],
+      ]);
+
+      // Startup, then two periodic passes. The startup backfill lookup fails,
+      // so the first periodic pass retries it from the full read.
+      const discover = (read: ProjectionSnapshotQueryShape["getShellSnapshot"]) =>
+        Effect.gen(function* () {
+          const online = yield* Ref.make(false);
+          const reads: Array<ReadonlyArray<string>> = [];
+          const fixture = yield* makeHarness({
+            threads: [],
+            getShellSnapshot: (options) =>
+              read(options).pipe(
+                Effect.tap((snapshot) =>
+                  Effect.sync(() => reads.push(snapshot.threads.map(({ id }) => id).toSorted())),
+                ),
+              ),
+            branchPullRequest: ({ cwd, branch }) =>
+              Effect.gen(function* () {
+                if (branch === "backfill" && !(yield* Ref.get(online))) {
+                  return yield* new GitManagerError({
+                    operation: "branchPullRequest",
+                    cwd,
+                    detail: "Offline",
+                  });
+                }
+                const number = numbers.get(branch);
+                return number === undefined ? null : branchPullRequest(number);
+              }),
+          });
+          return yield* Effect.gen(function* () {
+            const reactor = yield* fixture.start();
+            const startupCalls = (yield* Ref.get(fixture.branchCalls)).length;
+            const startupCommands = (yield* Ref.get(fixture.commands)).length;
+            yield* Ref.set(online, true);
+            for (let pass = 0; pass < 2; pass++) {
+              yield* TestClock.adjust("1 minute");
+              yield* Queue.take(fixture.reads);
+              yield* reactor.drain;
+            }
+            return {
+              reads,
+              branchCalls: (yield* Ref.get(fixture.branchCalls))
+                .slice(startupCalls)
+                .map(({ branch }) => branch)
+                .toSorted(),
+              commands: (yield* Ref.get(fixture.commands))
+                .slice(startupCommands)
+                .map(
+                  ({ threadId, branchPullRequest }) => `${threadId} ${branchPullRequest?.number}`,
+                )
+                .toSorted(),
+            };
+          }).pipe(Effect.provide(fixture.layer));
+        }).pipe(Effect.scoped);
+
+      const { reads: unsettledReads, ...unsettled } = yield* discover(query.getShellSnapshot);
+      const { reads: fullReads, ...full } = yield* discover(() => query.getShellSnapshot());
+      expect(unsettled).toEqual(full);
+      expect(unsettled.commands).toEqual([
+        "backfill 5",
+        "open 1",
+        "open 1",
+        "resumed 2",
+        "resumed 2",
+      ]);
+      // The last pass has no backfill left, so it reads no settled thread.
+      expect(fullReads.at(-1)).toContain("imported");
+      expect(unsettledReads.at(-1)).toEqual(["linked", "open", "resumed"]);
+    }).pipe(
+      Effect.provide(
+        OrchestrationProjectionSnapshotQueryLive.pipe(
+          Layer.provide(ThreadBackgroundLiveness.layer),
+          Layer.provide(ThreadPlanProgress.layer),
+          Layer.provide(
+            Layer.succeed(RepositoryIdentityResolver, {
+              resolve: () => Effect.succeed(project.repositoryIdentity),
+            }),
+          ),
+          Layer.provideMerge(SqlitePersistenceMemory),
+        ),
+      ),
+    ),
+  );
+
   it.effect("matches Azure SSH projects to HTTPS PRs with the provider repository selector", () =>
     Effect.scoped(
       Effect.gen(function* () {
diff --git a/apps/server/src/orchestration/ThreadPullRequestReactor.ts b/apps/server/src/orchestration/ThreadPullRequestReactor.ts
index 86026632a6af..66ff81d5a9e7 100644
--- a/apps/server/src/orchestration/ThreadPullRequestReactor.ts
+++ b/apps/server/src/orchestration/ThreadPullRequestReactor.ts
@@ -6,6 +6,7 @@ import {
   CommandId,
   type OrchestrationEvent,
   type OrchestrationProjectShell,
+  type OrchestrationShellSnapshot,
   type ThreadId,
   type ThreadLinkedPullRequest,
 } from "@t3tools/contracts";
@@ -16,11 +17,13 @@ import * as Crypto from "effect/Crypto";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as Schedule from "effect/Schedule";
 import type * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 
 import * as GitManager from "../git/GitManager.ts";
+import type { ProjectionRepositoryError } from "../persistence/Errors.ts";
 import * as PullRequestService from "../pullRequest/PullRequestService.ts";
 import * as RepositoryIdentityResolver from "../project/RepositoryIdentityResolver.ts";
 import { forkParked } from "../serverActivation.ts";
@@ -69,6 +72,37 @@ export function pullRequestMatchesProject(
   );
 }
 
+/**
+ * Read the shell state for a discovery or settlement sweep. A sweep for one
+ * thread reads that thread and the projects it names, not every thread. A
+ * sweep over all threads reads only unsettled threads, since both sweeps skip
+ * settled ones. Discovery's backfill does its own full read.
+ */
+export const readSweepSnapshot = (
+  snapshots: ProjectionSnapshotQuery.ProjectionSnapshotQueryShape,
+  threadId: ThreadId | null,
+): Effect.Effect<
+  Pick<OrchestrationShellSnapshot, "snapshotSequence" | "projects" | "threads">,
+  ProjectionRepositoryError
+> =>
+  threadId === null
+    ? snapshots.getShellSnapshot({ unsettledOnly: true })
+    : Effect.gen(function* () {
+        // Read the sequence first. The thread is then at least this new, so a
+        // command guarded by the sequence is rejected rather than missing a change.
+        const { snapshotSequence } = yield* snapshots.getSnapshotSequence();
+        const thread = yield* snapshots.getThreadShellById(threadId);
+        if (Option.isNone(thread)) return { snapshotSequence, projects: [], threads: [] };
+        // Settlement also checks the project a saved pull request names.
+        const reference = thread.value.linkedPullRequest ?? thread.value.branchPullRequest;
+        const projects = yield* snapshots.getProjectShells(
+          reference == null
+            ? [thread.value.projectId]
+            : [thread.value.projectId, reference.projectId],
+        );
+        return { snapshotSequence, projects, threads: [thread.value] };
+      });
+
 /** @public Service construction is part of the canonical Effect module API. */
 export const make = Effect.gen(function* () {
   const engine = yield* OrchestrationEngine.OrchestrationEngineService;
@@ -97,7 +131,11 @@ export const make = Effect.gen(function* () {
   const synchronize = Effect.fn("ThreadPullRequestReactor.synchronize")(function* (
     request: RefreshRequest,
   ) {
-    const snapshot = yield* snapshots.getShellSnapshot();
+    // Backfill looks up settled threads, so its passes read every thread.
+    const snapshot =
+      request.threadId === null && (request.backfill || pendingBackfill.size > 0)
+        ? yield* snapshots.getShellSnapshot()
+        : yield* readSweepSnapshot(snapshots, request.threadId);
     const projects = new Map(snapshot.projects.map((project) => [project.id, project]));
     if (request.backfill) {
       for (const thread of snapshot.threads) {
@@ -109,14 +147,19 @@ export const make = Effect.gen(function* () {
         }
       }
     }
-    const threadIds = new Set(snapshot.threads.map((thread) => thread.id));
-    for (const threadId of pendingBackfill.keys()) {
-      if (!threadIds.has(threadId)) pendingBackfill.delete(threadId);
+    // A single-thread read only shows whether its own thread is gone. A thread
+    // with no branch has nothing to look up, and its entry would keep every
+    // periodic pass on the full read.
+    const branchThreadIds = new Set(
+      snapshot.threads.filter((thread) => thread.branch !== null).map((thread) => thread.id),
+    );
+    const checkedIds = request.threadId === null ? pendingBackfill.keys() : [request.threadId];
+    for (const threadId of checkedIds) {
+      if (!branchThreadIds.has(threadId)) pendingBackfill.delete(threadId);
     }
     const threads = snapshot.threads.filter(
       (thread) =>
         thread.archivedAt === null &&
-        (request.threadId === null || thread.id === request.threadId) &&
         ((thread.settledOverride !== "settled" && thread.settledAt === null) ||
           request.threadId !== null ||
           pendingBackfill.has(thread.id)) &&
@@ -131,8 +174,19 @@ export const make = Effect.gen(function* () {
       (group) =>
         Effect.gen(function* () {
           const first = group[0]!;
-          const project = projects.get(first.projectId);
-          if (project === undefined) return finishBackfill(group);
+          const snapshotProject = projects.get(first.projectId);
+          if (snapshotProject === undefined) return finishBackfill(group);
+          // A finished turn may have added the remote this PR lives on. A failed
+          // refresh resolves to null, so keep the snapshot's identity then.
+          const project = request.refresh
+            ? {
+                ...snapshotProject,
+                repositoryIdentity:
+                  (yield* repositoryIdentities.resolve(snapshotProject.workspaceRoot, {
+                    refresh: true,
+                  })) ?? snapshotProject.repositoryIdentity,
+              }
+            : snapshotProject;
           const repository = sourceControlRepositorySelector(project.repositoryIdentity);
           if (first.branch !== null && repository === null) return finishBackfill(group);
           const worktreeExists =
@@ -207,16 +261,16 @@ export const make = Effect.gen(function* () {
               }
               return { thread, branchPullRequest, replacement };
             }).pipe(
-              Effect.catchCause((cause) =>
-                Cause.hasInterruptsOnly(cause)
-                  ? Effect.failCause(cause)
-                  : Effect.logWarning("thread pull request discovery failed", {
-                      threadId: thread.id,
-                      cause: Cause.pretty(cause),
-                    }).pipe(
-                      Effect.tap(() => Effect.sync(() => failBackfill([thread]))),
-                      Effect.as(null),
-                    ),
+              Effect.catchCauseIf(
+                (cause) => !Cause.hasInterruptsOnly(cause),
+                (cause) =>
+                  Effect.logWarning("thread pull request discovery failed", {
+                    threadId: thread.id,
+                    cause: Cause.pretty(cause),
+                  }).pipe(
+                    Effect.tap(() => Effect.sync(() => failBackfill([thread]))),
+                    Effect.as(null),
+                  ),
               ),
             ),
           );
@@ -273,25 +327,25 @@ export const make = Effect.gen(function* () {
                   OrchestrationCommandInvariantError: () =>
                     Effect.sync(() => finishBackfill([thread])),
                 }),
-                Effect.catchCause((cause) =>
-                  Cause.hasInterruptsOnly(cause)
-                    ? Effect.failCause(cause)
-                    : Effect.logWarning("thread pull request update failed", {
-                        threadId: thread.id,
-                        cause: Cause.pretty(cause),
-                      }).pipe(Effect.tap(() => Effect.sync(() => failBackfill([thread])))),
+                Effect.catchCauseIf(
+                  (cause) => !Cause.hasInterruptsOnly(cause),
+                  (cause) =>
+                    Effect.logWarning("thread pull request update failed", {
+                      threadId: thread.id,
+                      cause: Cause.pretty(cause),
+                    }).pipe(Effect.tap(() => Effect.sync(() => failBackfill([thread])))),
                 ),
               ),
             { discard: true },
           );
         }).pipe(
-          Effect.catchCause((cause) =>
-            Cause.hasInterruptsOnly(cause)
-              ? Effect.failCause(cause)
-              : Effect.logWarning("thread branch pull request lookup failed", {
-                  threadIds: group.map((thread) => thread.id),
-                  cause: Cause.pretty(cause),
-                }).pipe(Effect.tap(() => Effect.sync(() => failBackfill(group)))),
+          Effect.catchCauseIf(
+            (cause) => !Cause.hasInterruptsOnly(cause),
+            (cause) =>
+              Effect.logWarning("thread branch pull request lookup failed", {
+                threadIds: group.map((thread) => thread.id),
+                cause: Cause.pretty(cause),
+              }).pipe(Effect.tap(() => Effect.sync(() => failBackfill(group)))),
           ),
         ),
       { concurrency: 8, discard: true },
@@ -300,12 +354,12 @@ export const make = Effect.gen(function* () {
 
   const worker = yield* makeDrainableWorker((request: RefreshRequest) =>
     synchronize(request).pipe(
-      Effect.catchCause((cause) =>
-        Cause.hasInterruptsOnly(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("thread pull request refresh failed", {
-              cause: Cause.pretty(cause),
-            }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        (cause) =>
+          Effect.logWarning("thread pull request refresh failed", {
+            cause: Cause.pretty(cause),
+          }),
       ),
     ),
   );
diff --git a/apps/server/src/orchestration/ThreadSettlementPolicy.test.ts b/apps/server/src/orchestration/ThreadSettlementPolicy.test.ts
index 252b99439400..8a1588b18752 100644
--- a/apps/server/src/orchestration/ThreadSettlementPolicy.test.ts
+++ b/apps/server/src/orchestration/ThreadSettlementPolicy.test.ts
@@ -171,6 +171,15 @@ describe("resolveAutoSettlementAt", () => {
 
   it("blocks pins, snooze, pending work, live sessions, and queued starts", () => {
     expect(decide(makeThread({ settledOverride: "active" }))).toBe(false);
+  });
+
+  it("never settles a thread whose auto-settle is turned off, by inactivity or merge", () => {
+    const held = makeThread({ autoSettleDisabledAt: "2026-08-21T00:00:00.000Z" });
+    expect(decide(held)).toBe(false);
+    expect(
+      decide(held, { state: "merged", mergedAt: "2026-08-21T00:00:00.000Z", closedAt: null }),
+    ).toBe(false);
+    expect(decide(makeThread({ autoSettleDisabledAt: null }))).toBe(true);
     expect(decide(makeThread({ snoozedUntil: "2026-08-29T00:00:00.000Z" }))).toBe(false);
     expect(decide(makeThread({ hasPendingApprovals: true }))).toBe(false);
     expect(decide(makeThread({ hasPendingUserInput: true }))).toBe(false);
@@ -248,6 +257,21 @@ const terminalSnapshot = (
   syncedAt: NOW,
 });
 
+describe("per-thread auto-settle opt out", () => {
+  it("blocks both inactivity and merge settlement while auto-settle is off", () => {
+    const merged = linkedRequest(1, terminalSnapshot("merged", NOW));
+    expect(decide(makeThread({ latestUserMessageAt: "2026-08-01T00:00:00.000Z" }))).toBe(true);
+    expect(decide(makeThread({ pullRequests: [merged] }), null, { days: null })).toBe(true);
+    const held = { autoSettleDisabledAt: NOW };
+    expect(decide(makeThread({ ...held, latestUserMessageAt: "2026-08-01T00:00:00.000Z" }))).toBe(
+      false,
+    );
+    expect(decide(makeThread({ ...held, pullRequests: [merged] }), null, { days: null })).toBe(
+      false,
+    );
+  });
+});
+
 describe("linked request settlement", () => {
   it.each(["closed", "merged"] as const)(
     "uses the latest actual %s transition despite later comments on another PR",
diff --git a/apps/server/src/orchestration/ThreadSettlementPolicy.ts b/apps/server/src/orchestration/ThreadSettlementPolicy.ts
index 92063745eff5..113d68204e59 100644
--- a/apps/server/src/orchestration/ThreadSettlementPolicy.ts
+++ b/apps/server/src/orchestration/ThreadSettlementPolicy.ts
@@ -117,6 +117,7 @@ export function resolveAutoSettlementAt(input: {
 /** Cheap checks that run before any source control lookup. */
 export function isAutoSettlementCandidate(thread: OrchestrationThreadShell, now: string): boolean {
   if (thread.archivedAt !== null || thread.settledOverride !== null) return false;
+  if (thread.autoSettleDisabledAt != null) return false;
   if (thread.hasPendingApprovals || thread.hasPendingUserInput) return false;
   if (thread.session?.status === "starting" || thread.session?.status === "running") return false;
   if (thread.backgroundLiveness != null) return false;
diff --git a/apps/server/src/orchestration/ThreadSettlementReactor.test.ts b/apps/server/src/orchestration/ThreadSettlementReactor.test.ts
index 7719cd8833ed..70b79725c628 100644
--- a/apps/server/src/orchestration/ThreadSettlementReactor.test.ts
+++ b/apps/server/src/orchestration/ThreadSettlementReactor.test.ts
@@ -24,13 +24,17 @@ import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as PubSub from "effect/PubSub";
 import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import * as Stream from "effect/Stream";
 import { TestClock } from "effect/testing";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
 
 import { GitManager, type GitBranchPullRequest } from "../git/GitManager.ts";
+import { SqlitePersistenceMemory } from "../persistence/Layers/Sqlite.ts";
+import { RepositoryIdentityResolver } from "../project/RepositoryIdentityResolver.ts";
 import {
   PullRequestService,
   type PullRequestMergeEvent,
@@ -38,11 +42,17 @@ import {
 import { ServerActivation } from "../serverActivation.ts";
 import { ServerSettingsService } from "../serverSettings.ts";
 import { OrchestrationCommandInvariantError } from "./Errors.ts";
+import { OrchestrationProjectionSnapshotQueryLive } from "./Layers/ProjectionSnapshotQuery.ts";
 import {
   OrchestrationEngineService,
   type OrchestrationEngineShape,
 } from "./Services/OrchestrationEngine.ts";
-import { ProjectionSnapshotQuery } from "./Services/ProjectionSnapshotQuery.ts";
+import {
+  ProjectionSnapshotQuery,
+  type ProjectionSnapshotQueryShape,
+} from "./Services/ProjectionSnapshotQuery.ts";
+import * as ThreadBackgroundLiveness from "./ThreadBackgroundLiveness.ts";
+import * as ThreadPlanProgress from "./ThreadPlanProgress.ts";
 import * as ThreadSettlementReactor from "./ThreadSettlementReactor.ts";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as Path from "effect/Path";
@@ -170,6 +180,8 @@ function makeBranchPullRequest(
 
 interface HarnessOptions {
   readonly snapshot: OrchestrationShellSnapshot;
+  /** Serve full sweep reads from this instead of `snapshot`. */
+  readonly getShellSnapshot?: ProjectionSnapshotQueryShape["getShellSnapshot"];
   readonly settings?: ServerSettings;
   readonly branchPullRequest?: GitManager["Service"]["branchPullRequest"];
   readonly pullRequestSummary?: PullRequestService["Service"]["summary"];
@@ -183,7 +195,8 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
   const activation = yield* Deferred.make<void>();
   const snapshots = yield* Ref.make(options.snapshot);
   const snapshotReadCount = yield* Ref.make(0);
-  const snapshotReads = yield* Queue.unbounded<number>();
+  // Each shell read: a thread id for a one-thread read, null for a full read.
+  const snapshotReads = yield* Queue.unbounded<ThreadId | null>();
   const settings = yield* Ref.make(options.settings ?? DEFAULT_SERVER_SETTINGS);
   const settingsReads = yield* Queue.unbounded<ServerSettings>();
   const settingsChanges = yield* PubSub.unbounded<ServerSettings>();
@@ -256,10 +269,27 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
 
   const dependencies = Layer.mergeAll(
     Layer.mock(ProjectionSnapshotQuery)({
-      getShellSnapshot: () =>
-        Ref.updateAndGet(snapshotReadCount, (count) => count + 1).pipe(
-          Effect.tap((count) => Queue.offer(snapshotReads, count)),
-          Effect.andThen(Ref.get(snapshots)),
+      getShellSnapshot: (readOptions) =>
+        Ref.update(snapshotReadCount, (count) => count + 1).pipe(
+          Effect.andThen(Queue.offer(snapshotReads, null)),
+          Effect.andThen(options.getShellSnapshot?.(readOptions) ?? Ref.get(snapshots)),
+        ),
+      getSnapshotSequence: () =>
+        Ref.get(snapshots).pipe(Effect.map(({ snapshotSequence }) => ({ snapshotSequence }))),
+      getThreadShellById: (threadId) =>
+        Ref.get(snapshots).pipe(
+          Effect.map(({ threads }) =>
+            Option.fromUndefinedOr(
+              threads.find((thread) => thread.id === threadId && thread.archivedAt === null),
+            ),
+          ),
+          Effect.tap(() => Queue.offer(snapshotReads, threadId)),
+        ),
+      getProjectShells: (projectIds) =>
+        Ref.get(snapshots).pipe(
+          Effect.map(({ projects }) =>
+            projects.filter((project) => projectIds?.includes(project.id) ?? true),
+          ),
         ),
     }),
     Layer.mock(GitManager)({
@@ -315,7 +345,7 @@ const makeHarness = Effect.fn("makeThreadSettlementHarness")(function* (options:
 const startHarness = Effect.fn("startThreadSettlementHarness")(function* (
   reactor: ThreadSettlementReactor.ThreadSettlementReactor["Service"],
   activation: Deferred.Deferred<void>,
-  snapshotReads: Queue.Queue<number>,
+  snapshotReads: Queue.Queue<ThreadId | null>,
 ) {
   // Automatic sweeps are muted for the boot delay. Step past it before starting
   // so the periodic tick fired by `start()` is allowed to sweep straight away.
@@ -448,7 +478,7 @@ describe("ThreadSettlementReactor", () => {
                   updatedAt: NOW,
                 },
               });
-              yield* Queue.take(fixture.snapshotReads);
+              assert.strictEqual(yield* Queue.take(fixture.snapshotReads), thread.id);
               yield* reactor.drain;
             }
             assert.deepStrictEqual(
@@ -468,7 +498,7 @@ describe("ThreadSettlementReactor", () => {
               aggregateId: readySession.threadId,
               payload: { threadId: readySession.threadId, session: readySession },
             });
-            yield* Queue.take(fixture.snapshotReads);
+            assert.strictEqual(yield* Queue.take(fixture.snapshotReads), readySession.threadId);
             yield* reactor.drain;
             assert.deepStrictEqual(
               (yield* Ref.get(fixture.commands)).map(({ threadId }) => threadId),
@@ -480,6 +510,49 @@ describe("ThreadSettlementReactor", () => {
         }),
       ),
   );
+  it.effect("skips the branch recheck when a terminal link would settle nothing", () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        yield* TestClock.setTime(Date.parse(NOW));
+        const previous = {
+          projectId: PROJECT_ID,
+          repository: "owner/repository",
+          number: 1,
+          url: "https://example.test/owner/repository/pull/1",
+        };
+        const fixture = yield* makeHarness({
+          snapshot: makeSnapshot(
+            [
+              makeThread("resumed-manual", {
+                branch: "main",
+                linkedPullRequest: previous,
+                latestUserMessageAt: "2026-08-28T00:00:00.000Z",
+              }),
+            ],
+            [makeProject()],
+          ),
+          settings: {
+            ...DEFAULT_SERVER_SETTINGS,
+            sidebarAutoSettleAfterDays: null,
+            sidebarAutoSettleOnMerge: true,
+          },
+          branchPullRequest: () => Effect.succeed(makeBranchPullRequest("open")),
+          pullRequestSummary: (input) =>
+            Effect.succeed({
+              ...makePullRequestSummary({ ...input, state: "merged" }),
+              mergedAt: "2026-08-27T00:00:00.000Z",
+            }),
+        });
+        yield* Effect.gen(function* () {
+          const reactor = yield* ThreadSettlementReactor.ThreadSettlementReactor;
+          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+          assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
+          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 1);
+          assert.deepStrictEqual(yield* Ref.get(fixture.branchCalls), []);
+        }).pipe(Effect.provide(fixture.layer));
+      }),
+    ),
+  );
   it.effect("uses saved PRs without settling resumed threads or branches with newer PRs", () =>
     Effect.scoped(
       Effect.gen(function* () {
@@ -1421,7 +1494,7 @@ describe("ThreadSettlementReactor", () => {
           assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
 
           yield* TestClock.adjust("1 minute");
-          assert.strictEqual(yield* Queue.take(fixture.snapshotReads), 1);
+          assert.strictEqual(yield* Queue.take(fixture.snapshotReads), null);
           yield* reactor.drain;
           assert.deepStrictEqual(
             (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
@@ -1451,7 +1524,7 @@ describe("ThreadSettlementReactor", () => {
           assert.strictEqual(yield* Ref.get(fixture.snapshotReadCount), 1);
 
           yield* TestClock.adjust("1 minute");
-          assert.strictEqual(yield* Queue.take(fixture.snapshotReads), 2);
+          assert.strictEqual(yield* Queue.take(fixture.snapshotReads), null);
           yield* reactor.drain;
           assert.strictEqual(yield* Ref.get(fixture.snapshotReadCount), 2);
         }).pipe(Effect.provide(fixture.layer));
@@ -1533,7 +1606,7 @@ describe("ThreadSettlementReactor", () => {
           assert.strictEqual(yield* Ref.get(fixture.snapshotReadCount), 0);
 
           yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 4 });
-          assert.strictEqual(yield* Queue.take(fixture.snapshotReads), 1);
+          assert.strictEqual(yield* Queue.take(fixture.snapshotReads), null);
           yield* reactor.drain;
           assert.deepStrictEqual(
             (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
@@ -1543,6 +1616,88 @@ describe("ThreadSettlementReactor", () => {
       }),
     ),
   );
+
+  it.effect("settles the same threads from the unsettled read as from the full read", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const sql = yield* SqlClient.SqlClient;
+      const query = yield* ProjectionSnapshotQuery;
+      yield* sql`INSERT INTO projection_projects (project_id, title, workspace_root, scripts_json, created_at, updated_at)
+        VALUES ('settlement-project', 'Project', '/workspace/project', '[]', ${NOW}, ${NOW}),
+          ('linked-settlement-project', 'Linked', '/workspace/linked', '[]', ${NOW}, ${NOW}),
+          ('dormant-project', 'Dormant', '/workspace/dormant', '[]', ${NOW}, ${NOW})`;
+      yield* sql`INSERT INTO projection_threads (thread_id, project_id, title, model_selection_json, runtime_mode, interaction_mode, branch, branch_pull_request_json, latest_user_message_at, created_at, updated_at, archived_at, settled_override, settled_at)
+        VALUES
+          ('idle', 'settlement-project', 'Idle', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, '2026-08-20T00:00:00.000Z', '2026-08-01T00:00:00.000Z', ${NOW}, NULL, NULL, NULL),
+          ('merged', 'settlement-project', 'Merged', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'feature',
+            '{"projectId":"linked-settlement-project","repository":"owner/repository","number":42,"url":"https://example.test/owner/repository/pull/42"}',
+            '2026-08-27T00:00:00.000Z', '2026-08-01T00:00:00.000Z', ${NOW}, NULL, NULL, NULL),
+          ('linked', 'settlement-project', 'Linked', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, '2026-08-27T00:00:00.000Z', '2026-08-01T00:00:00.000Z', ${NOW}, NULL, NULL, NULL),
+          ('open', 'settlement-project', 'Open', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'open-feature', NULL, '2026-08-27T00:00:00.000Z', '2026-08-01T00:00:00.000Z', ${NOW}, NULL, NULL, NULL),
+          ('resumed', 'settlement-project', 'Resumed', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, '2026-08-20T00:00:00.000Z', '2026-08-01T00:00:00.000Z', ${NOW}, NULL, 'active', NULL),
+          ('settled', 'dormant-project', 'Settled', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', 'done', NULL, '2026-08-20T00:00:00.000Z', '2026-08-01T00:00:00.000Z', ${NOW}, NULL, 'settled', '2026-08-21T00:00:00.000Z'),
+          ('archived', 'settlement-project', 'Archived', '{"provider":"codex","model":"gpt-5"}', 'full-access', 'default', NULL, NULL, '2026-08-20T00:00:00.000Z', '2026-08-01T00:00:00.000Z', ${NOW}, ${NOW}, NULL, NULL)`;
+      yield* sql`INSERT INTO projection_thread_pull_requests (thread_id, host, repository, number, url, source, linked_at, snapshot_json)
+        VALUES ('linked', 'example.test', 'owner/repository', 7, 'https://example.test/owner/repository/pull/7', 'manual', ${NOW},
+          '{"state":"merged","title":"Review","headBranch":"linked","baseBranch":"main","isDraft":false,"updatedAt":"2026-08-28T12:00:00.000Z","syncedAt":"2026-08-28T12:00:00.000Z","mergedAt":"2026-08-28T12:00:00.000Z","closedAt":null}')`;
+
+      const sweep = (read: ProjectionSnapshotQueryShape["getShellSnapshot"]) =>
+        Effect.gen(function* () {
+          const readThreadIds: Array<string> = [];
+          const fixture = yield* makeHarness({
+            snapshot: makeSnapshot([]),
+            getShellSnapshot: (options) =>
+              read(options).pipe(
+                Effect.tap((snapshot) =>
+                  Effect.sync(() => readThreadIds.push(...snapshot.threads.map(({ id }) => id))),
+                ),
+              ),
+            branchPullRequest: ({ branch }) =>
+              Effect.succeed(branch === "open-feature" ? makeBranchPullRequest("open") : null),
+            pullRequestSummary: (input) =>
+              Effect.succeed(makePullRequestSummary({ ...input, state: "merged" })),
+          });
+          return yield* Effect.gen(function* () {
+            const reactor = yield* ThreadSettlementReactor.ThreadSettlementReactor;
+            yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+            return {
+              readThreadIds: readThreadIds.toSorted(),
+              commands: (yield* Ref.get(fixture.commands))
+                .map(({ threadId, settledAt }) => `${threadId} ${settledAt}`)
+                .toSorted(),
+              branchCalls: (yield* Ref.get(fixture.branchCalls))
+                .map(({ branch }) => branch)
+                .toSorted(),
+              summaryCalls: yield* Ref.get(fixture.summaryCalls),
+            };
+          }).pipe(Effect.provide(fixture.layer));
+        }).pipe(Effect.scoped);
+
+      const { readThreadIds: unsettledReads, ...unsettled } = yield* sweep(query.getShellSnapshot);
+      const { readThreadIds: fullReads, ...full } = yield* sweep(() => query.getShellSnapshot());
+      assert.deepStrictEqual(unsettled, full);
+      // A settle for inactivity, for a synced merged link, and for a saved
+      // branch PR whose project only that PR names.
+      assert.deepStrictEqual(unsettled.commands, [
+        "idle 2026-08-20T00:00:00.000Z",
+        "linked 2026-08-27T00:00:00.000Z",
+        "merged 2026-08-27T00:00:00.000Z",
+      ]);
+      assert.deepStrictEqual(fullReads, [...unsettledReads, "settled"].toSorted());
+      assert.deepStrictEqual(unsettledReads, ["idle", "linked", "merged", "open", "resumed"]);
+    }).pipe(
+      Effect.provide(
+        OrchestrationProjectionSnapshotQueryLive.pipe(
+          Layer.provide(ThreadBackgroundLiveness.layer),
+          Layer.provide(ThreadPlanProgress.layer),
+          Layer.provide(
+            Layer.succeed(RepositoryIdentityResolver, { resolve: () => Effect.succeed(null) }),
+          ),
+          Layer.provideMerge(SqlitePersistenceMemory),
+        ),
+      ),
+    ),
+  );
 });
 
 describe("storage cleanup", () => {
diff --git a/apps/server/src/orchestration/ThreadSettlementReactor.ts b/apps/server/src/orchestration/ThreadSettlementReactor.ts
index d8fa14488a38..ea36ed59107c 100644
--- a/apps/server/src/orchestration/ThreadSettlementReactor.ts
+++ b/apps/server/src/orchestration/ThreadSettlementReactor.ts
@@ -26,7 +26,7 @@ import * as ServerSettings from "../serverSettings.ts";
 import { forkParked } from "../serverActivation.ts";
 import * as OrchestrationEngine from "./Services/OrchestrationEngine.ts";
 import * as ProjectionSnapshotQuery from "./Services/ProjectionSnapshotQuery.ts";
-import { pullRequestMatchesProject } from "./ThreadPullRequestReactor.ts";
+import { pullRequestMatchesProject, readSweepSnapshot } from "./ThreadPullRequestReactor.ts";
 import {
   isAutoSettlementCandidate,
   resolveAutoSettlementAt,
@@ -149,20 +149,16 @@ export const make = Effect.gen(function* () {
     if (!autoSettlementConfigured(settings)) {
       return;
     }
-    const snapshot = yield* snapshots.getShellSnapshot();
+    const snapshot = yield* readSweepSnapshot(snapshots, threadId ?? null);
     const now = DateTime.formatIso(yield* DateTime.now);
     const projects = new Map(snapshot.projects.map((project) => [project.id, project]));
     // A merge rechecks all candidates, including branches that discovery has
     // not linked yet. Those lookups can still have cached the PR as open.
-    const candidates = snapshot.threads.filter(
-      (thread) =>
-        (threadId === undefined || thread.id === threadId) &&
-        isAutoSettlementCandidate(thread, now),
-    );
+    const candidates = snapshot.threads.filter((thread) => isAutoSettlementCandidate(thread, now));
 
     // Return the thread when it still needs a pull request decision. A rejected
     // dispatch skips it for this snapshot instead of retrying through a lookup.
-    const settleThread = Effect.fn("ThreadSettlementReactor.settleThread")(
+    const settleThread = Effect.fnUntraced(
       function* (thread: (typeof candidates)[number], pullRequest: SettlementPullRequest | null) {
         const settings = resolveProjectSettings(
           yield* settingsService.getSettings,
@@ -191,13 +187,13 @@ export const make = Effect.gen(function* () {
       },
       (effect, thread) =>
         effect.pipe(
-          Effect.catchCause((cause) =>
-            Cause.hasInterruptsOnly(cause)
-              ? Effect.failCause(cause)
-              : Effect.logWarning("automatic thread settlement skipped", {
-                  threadId: thread.id,
-                  cause: Cause.pretty(cause),
-                }).pipe(Effect.as(null)),
+          Effect.catchCauseIf(
+            (cause) => !Cause.hasInterruptsOnly(cause),
+            (cause) =>
+              Effect.logWarning("automatic thread settlement skipped", {
+                threadId: thread.id,
+                cause: Cause.pretty(cause),
+              }).pipe(Effect.as(null)),
           ),
         ),
     );
@@ -263,9 +259,30 @@ export const make = Effect.gen(function* () {
     };
     const groups = Map.groupBy(lookupCandidates, lookupKey);
 
+    const wouldSettle = Effect.fn("ThreadSettlementReactor.wouldSettle")(function* (
+      group: ReadonlyArray<(typeof candidates)[number]>,
+      pullRequest: SettlementPullRequest,
+    ) {
+      const currentSettings = yield* settingsService.getSettings;
+      const decisionNow = DateTime.formatIso(yield* DateTime.now);
+      return group.some((thread) => {
+        const { settings } = resolveProjectSettings(currentSettings, thread.projectId);
+        return (
+          resolveAutoSettlementAt({
+            thread,
+            pullRequest,
+            now: decisionNow,
+            autoSettleAfterDays: settings.sidebarAutoSettleAfterDays,
+            autoSettleOnMerge: settings.sidebarAutoSettleOnMerge,
+          }) !== null
+        );
+      });
+    });
+
     const pullRequestFor = Effect.fn("ThreadSettlementReactor.pullRequestFor")(function* (
-      thread: (typeof candidates)[number],
+      group: ReadonlyArray<(typeof candidates)[number]>,
     ) {
+      const thread = group[0]!;
       const reference = thread.linkedPullRequest ?? thread.branchPullRequest;
       if (reference != null) {
         const matchesMerge =
@@ -290,10 +307,21 @@ export const make = Effect.gen(function* () {
               },
               { recoverTransientFailure: false },
             );
+        const terminal = {
+          state: summary.state,
+          closedAt: summary.closedAt ?? null,
+          mergedAt: summary.mergedAt ?? null,
+        } satisfies SettlementPullRequest;
         const cwd = lookupCwdByThreadId.get(thread.id);
         if (summary.state !== "open" && thread.branch !== null && cwd !== undefined) {
           // A reused branch can already have a new open PR while discovery
           // is replacing its old link. Do not let settlement win that race.
+          // Only pay for the uncached lookup when this sweep would otherwise
+          // settle: a terminal link that settles nothing (resumed thread,
+          // settle-on-merge off) would re-query the host every minute. A
+          // group that becomes eligible after this check waits for the next
+          // sweep rather than settling on the unverified link.
+          if (!(yield* wouldSettle(group, terminal))) return undefined;
           const current = yield* git.branchPullRequest(
             { cwd, branch: thread.branch },
             { refresh: true },
@@ -307,11 +335,7 @@ export const make = Effect.gen(function* () {
             return current;
           }
         }
-        return {
-          state: summary.state,
-          closedAt: summary.closedAt ?? null,
-          mergedAt: summary.mergedAt ?? null,
-        } satisfies SettlementPullRequest;
+        return terminal;
       }
       if (thread.branch === null) return null;
       const cwd = lookupCwdByThreadId.get(thread.id);
@@ -325,18 +349,19 @@ export const make = Effect.gen(function* () {
       groups.values(),
       (group) =>
         Effect.gen(function* () {
-          const pullRequest = yield* pullRequestFor(group[0]!);
+          const pullRequest = yield* pullRequestFor(group);
+          if (pullRequest === undefined) return;
           yield* Effect.forEach(group, (thread) => settleThread(thread, pullRequest), {
             discard: true,
           });
         }).pipe(
-          Effect.catchCause((cause) =>
-            Cause.hasInterruptsOnly(cause)
-              ? Effect.failCause(cause)
-              : Effect.logWarning("automatic thread settlement skipped", {
-                  threadIds: group.map((thread) => thread.id),
-                  cause: Cause.pretty(cause),
-                }),
+          Effect.catchCauseIf(
+            (cause) => !Cause.hasInterruptsOnly(cause),
+            (cause) =>
+              Effect.logWarning("automatic thread settlement skipped", {
+                threadIds: group.map((thread) => thread.id),
+                cause: Cause.pretty(cause),
+              }),
           ),
         ),
       { concurrency: SETTLEMENT_SWEEP_CONCURRENCY, discard: true },
@@ -348,12 +373,12 @@ export const make = Effect.gen(function* () {
     threadId?: ThreadId,
   ) =>
     sweep(mergedPullRequest, threadId).pipe(
-      Effect.catchCause((cause) =>
-        Cause.hasInterruptsOnly(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("automatic thread settlement sweep failed", {
-              cause: Cause.pretty(cause),
-            }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        (cause) =>
+          Effect.logWarning("automatic thread settlement sweep failed", {
+            cause: Cause.pretty(cause),
+          }),
       ),
     );
 
diff --git a/apps/server/src/orchestration/commandInvariants.ts b/apps/server/src/orchestration/commandInvariants.ts
index 873eab007bea..244a6a9e9cab 100644
--- a/apps/server/src/orchestration/commandInvariants.ts
+++ b/apps/server/src/orchestration/commandInvariants.ts
@@ -119,15 +119,13 @@ export function requireThreadArchived(input: {
   readonly threadId: ThreadId;
 }): Effect.Effect<OrchestrationThread, OrchestrationCommandInvariantError> {
   return requireThread(input).pipe(
-    Effect.flatMap((thread) =>
-      thread.archivedAt !== null
-        ? Effect.succeed(thread)
-        : Effect.fail(
-            invariantError(
-              input.command.type,
-              `Thread '${input.threadId}' is not archived for command '${input.command.type}'.`,
-            ),
-          ),
+    Effect.filterOrFail(
+      (thread) => thread.archivedAt !== null,
+      () =>
+        invariantError(
+          input.command.type,
+          `Thread '${input.threadId}' is not archived for command '${input.command.type}'.`,
+        ),
     ),
   );
 }
@@ -138,15 +136,13 @@ export function requireThreadNotArchived(input: {
   readonly threadId: ThreadId;
 }): Effect.Effect<OrchestrationThread, OrchestrationCommandInvariantError> {
   return requireThread(input).pipe(
-    Effect.flatMap((thread) =>
-      thread.archivedAt === null
-        ? Effect.succeed(thread)
-        : Effect.fail(
-            invariantError(
-              input.command.type,
-              `Thread '${input.threadId}' is already archived and cannot handle command '${input.command.type}'.`,
-            ),
-          ),
+    Effect.filterOrFail(
+      (thread) => thread.archivedAt === null,
+      () =>
+        invariantError(
+          input.command.type,
+          `Thread '${input.threadId}' is already archived and cannot handle command '${input.command.type}'.`,
+        ),
     ),
   );
 }
diff --git a/apps/server/src/orchestration/decider.autoSettleSet.test.ts b/apps/server/src/orchestration/decider.autoSettleSet.test.ts
new file mode 100644
index 000000000000..99657069cc74
--- /dev/null
+++ b/apps/server/src/orchestration/decider.autoSettleSet.test.ts
@@ -0,0 +1,154 @@
+import {
+  CommandId,
+  ProjectId,
+  ProviderInstanceId,
+  ThreadId,
+  type OrchestrationReadModel,
+} from "@t3tools/contracts";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { expect, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+
+import { decideOrchestrationCommand } from "./decider.ts";
+
+const NOW = "2026-01-01T00:00:00.000Z";
+const DISABLED_AT = "2025-12-30T00:00:00.000Z";
+
+function makeReadModel(input: {
+  readonly autoSettleDisabledAt?: string | null;
+  readonly settledOverride?: "settled" | "active" | null;
+}): OrchestrationReadModel {
+  return {
+    snapshotSequence: 0,
+    projects: [],
+    threads: [
+      {
+        id: ThreadId.make("thread-1"),
+        projectId: ProjectId.make("project-1"),
+        title: "Thread",
+        modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: null,
+        pullRequests: [],
+        latestTurn: null,
+        createdAt: NOW,
+        updatedAt: NOW,
+        archivedAt: null,
+        settledOverride: input.settledOverride ?? null,
+        settledAt: input.settledOverride === "settled" ? NOW : null,
+        autoSettleDisabledAt: input.autoSettleDisabledAt ?? null,
+        deletedAt: null,
+        messages: [],
+        proposedPlans: [],
+        activities: [],
+        checkpoints: [],
+        session: null,
+      },
+    ],
+    updatedAt: NOW,
+  };
+}
+
+const events = (event: Effect.Success<ReturnType<typeof decideOrchestrationCommand>>) =>
+  Array.isArray(event) ? event : [event];
+
+it.layer(NodeServices.layer)("thread.auto-settle.set decider", (it) => {
+  it.effect("turning auto-settle off stamps autoSettleDisabledAt and updatedAt together", () =>
+    Effect.gen(function* () {
+      const [event] = events(
+        yield* decideOrchestrationCommand({
+          command: {
+            type: "thread.auto-settle.set",
+            commandId: CommandId.make("cmd-off"),
+            threadId: ThreadId.make("thread-1"),
+            enabled: false,
+          },
+          readModel: makeReadModel({}),
+        }),
+      );
+      expect(event?.type).toBe("thread.auto-settle-set");
+      if (event?.type === "thread.auto-settle-set") {
+        expect(event.payload.autoSettleDisabledAt).toBe(event.payload.updatedAt);
+        expect(event.payload.updatedAt).not.toBe(NOW);
+      }
+    }),
+  );
+
+  it.effect("turning it off again keeps the original stamp and updatedAt", () =>
+    Effect.gen(function* () {
+      const [event] = events(
+        yield* decideOrchestrationCommand({
+          command: {
+            type: "thread.auto-settle.set",
+            commandId: CommandId.make("cmd-off-again"),
+            threadId: ThreadId.make("thread-1"),
+            enabled: false,
+          },
+          readModel: makeReadModel({ autoSettleDisabledAt: DISABLED_AT }),
+        }),
+      );
+      expect(event?.type).toBe("thread.auto-settle-set");
+      if (event?.type === "thread.auto-settle-set") {
+        expect(event.payload.autoSettleDisabledAt).toBe(DISABLED_AT);
+        expect(event.payload.updatedAt).toBe(NOW);
+      }
+    }),
+  );
+
+  it.effect("turning auto-settle back on clears the stamp", () =>
+    Effect.gen(function* () {
+      const [event] = events(
+        yield* decideOrchestrationCommand({
+          command: {
+            type: "thread.auto-settle.set",
+            commandId: CommandId.make("cmd-on"),
+            threadId: ThreadId.make("thread-1"),
+            enabled: true,
+          },
+          readModel: makeReadModel({ autoSettleDisabledAt: DISABLED_AT }),
+        }),
+      );
+      expect(event?.type).toBe("thread.auto-settle-set");
+      if (event?.type === "thread.auto-settle-set") {
+        expect(event.payload.autoSettleDisabledAt).toBeNull();
+        expect(event.payload.updatedAt).not.toBe(NOW);
+      }
+    }),
+  );
+
+  it.effect("automatic settlement is rejected while auto-settle is off", () =>
+    Effect.gen(function* () {
+      const result = yield* Effect.exit(
+        decideOrchestrationCommand({
+          command: {
+            type: "thread.auto-settle",
+            commandId: CommandId.make("cmd-auto"),
+            threadId: ThreadId.make("thread-1"),
+            snapshotSequence: 0,
+            settledAt: NOW,
+          },
+          readModel: makeReadModel({ autoSettleDisabledAt: DISABLED_AT }),
+        }),
+      );
+      expect(result._tag).toBe("Failure");
+    }),
+  );
+
+  it.effect("a manual settle still works while auto-settle is off", () =>
+    Effect.gen(function* () {
+      const [event] = events(
+        yield* decideOrchestrationCommand({
+          command: {
+            type: "thread.settle",
+            commandId: CommandId.make("cmd-manual"),
+            threadId: ThreadId.make("thread-1"),
+          },
+          readModel: makeReadModel({ autoSettleDisabledAt: DISABLED_AT }),
+        }),
+      );
+      expect(event?.type).toBe("thread.settled");
+    }),
+  );
+});
diff --git a/apps/server/src/orchestration/decider.pullRequests.test.ts b/apps/server/src/orchestration/decider.pullRequests.test.ts
index b79ca01a8dea..7a961af12d5b 100644
--- a/apps/server/src/orchestration/decider.pullRequests.test.ts
+++ b/apps/server/src/orchestration/decider.pullRequests.test.ts
@@ -295,7 +295,7 @@ it.layer(NodeServices.layer)("pull request link decider", (it) => {
         for (const planned of events) {
           const event = { ...planned, sequence: model.snapshotSequence + 1 };
           const encoded = yield* Schema.encodeEffect(OrchestrationEvent)(event);
-          const decoded = yield* Schema.decodeUnknownEffect(OrchestrationEvent)(encoded);
+          const decoded = yield* Schema.decodeEffect(OrchestrationEvent)(encoded);
           // Older detail-event unions must never receive the new PR discriminants.
           expect(isThreadDetailEvent(decoded)).toBe(false);
           model = yield* projectEvent(model, decoded);
diff --git a/apps/server/src/orchestration/decider.ts b/apps/server/src/orchestration/decider.ts
index 689910a0d6b7..dcb715eaf3ab 100644
--- a/apps/server/src/orchestration/decider.ts
+++ b/apps/server/src/orchestration/decider.ts
@@ -484,13 +484,14 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
         command,
         threadId: command.threadId,
       });
-      if (command.type === "thread.auto-settle" && thread.settledOverride !== null) {
-        return yield* Effect.fail(
-          new OrchestrationCommandInvariantError({
-            commandType: command.type,
-            detail: `thread ${command.threadId} changed before automatic settlement`,
-          }),
-        );
+      if (
+        command.type === "thread.auto-settle" &&
+        (thread.settledOverride !== null || thread.autoSettleDisabledAt != null)
+      ) {
+        return yield* new OrchestrationCommandInvariantError({
+          commandType: command.type,
+          detail: `thread ${command.threadId} changed before automatic settlement`,
+        });
       }
       // The server owns settle eligibility. A stale command must not settle
       // a thread whose session is coming alive or working.
@@ -642,36 +643,30 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
       // structurally just a string): NaN fails every comparison, and an
       // unparseable snoozedUntil must never persist.
       if (!(Date.parse(command.snoozedUntil) > Date.parse(occurredAt))) {
-        return yield* Effect.fail(
-          new OrchestrationCommandInvariantError({
-            commandType: command.type,
-            detail: `thread ${command.threadId} snooze wake time ${command.snoozedUntil} is not in the future`,
-          }),
-        );
+        return yield* new OrchestrationCommandInvariantError({
+          commandType: command.type,
+          detail: `thread ${command.threadId} snooze wake time ${command.snoozedUntil} is not in the future`,
+        });
       }
       // Blocked-on-you work must not be snoozed away: a pending approval or
       // user-input request is the agent waiting on the user, and hiding it
       // defeats the request. (A running session IS snoozable — snooze only
       // affects visibility, never the agent.)
       if (openRequests(thread).size > 0) {
-        return yield* Effect.fail(
-          new OrchestrationCommandInvariantError({
-            commandType: command.type,
-            detail: `thread ${command.threadId} has a pending approval or user-input request and cannot be snoozed`,
-          }),
-        );
+        return yield* new OrchestrationCommandInvariantError({
+          commandType: command.type,
+          detail: `thread ${command.threadId} has a pending approval or user-input request and cannot be snoozed`,
+        });
       }
       // A queued turn start — a user message no turn has adopted yet — is
       // invisible pending work: no session, no pending flags. Snoozing in
       // that window would hide a just-requested turn exactly the way settle
       // would.
       if (hasQueuedTurnStartForThread(thread, occurredAt)) {
-        return yield* Effect.fail(
-          new OrchestrationCommandInvariantError({
-            commandType: command.type,
-            detail: `thread ${command.threadId} has a queued turn start and cannot be snoozed`,
-          }),
-        );
+        return yield* new OrchestrationCommandInvariantError({
+          commandType: command.type,
+          detail: `thread ${command.threadId} has a queued turn start and cannot be snoozed`,
+        });
       }
       // Re-snoozing an already-snoozed thread to the SAME wake time is a
       // duplicate (double-click, raced clients): re-emit with the original
@@ -833,12 +828,10 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
       // (rather than silently pinning) keeps a raced reorder-after-unpin
       // from resurrecting a pin the user just cleared.
       if (thread.pinnedAt == null) {
-        return yield* Effect.fail(
-          new OrchestrationCommandInvariantError({
-            commandType: command.type,
-            detail: `thread ${command.threadId} is not pinned and cannot be reordered`,
-          }),
-        );
+        return yield* new OrchestrationCommandInvariantError({
+          commandType: command.type,
+          detail: `thread ${command.threadId} is not pinned and cannot be reordered`,
+        });
       }
       // Idempotent by re-emission (see thread.settle): a duplicate drop on
       // the same slot keeps the existing updatedAt so it projects as a no-op.
@@ -860,6 +853,37 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
       };
     }
 
+    case "thread.auto-settle.set": {
+      const thread = yield* requireThreadNotArchived({
+        readModel,
+        command,
+        threadId: command.threadId,
+      });
+      // Idempotent by re-emission (see thread.unpin): setting the current
+      // state again keeps the existing timestamps so duplicates do not churn
+      // ordering. The flag is independent of the settled lifecycle: it only
+      // gates the automatic paths, so it never blocks a manual settle.
+      const currentlyDisabledAt = thread.autoSettleDisabledAt ?? null;
+      const unchanged = command.enabled
+        ? currentlyDisabledAt === null
+        : currentlyDisabledAt !== null;
+      const occurredAt = yield* nowIso;
+      return {
+        ...(yield* withEventBase({
+          aggregateKind: "thread",
+          aggregateId: command.threadId,
+          occurredAt,
+          commandId: command.commandId,
+        })),
+        type: "thread.auto-settle-set",
+        payload: {
+          threadId: command.threadId,
+          autoSettleDisabledAt: command.enabled ? null : (currentlyDisabledAt ?? occurredAt),
+          updatedAt: unchanged ? thread.updatedAt : occurredAt,
+        },
+      };
+    }
+
     case "thread.active.reorder": {
       const thread = yield* requireThreadNotArchived({
         readModel,
@@ -919,12 +943,10 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
       if (command.linkedPullRequest != null) {
         const { linkedPullRequest: linked, ...metadata } = command;
         const project = readModel.projects.find((project) => project.id === thread.projectId);
-        let host = project?.repositoryIdentity?.canonicalKey.split("/")[0] ?? "unknown";
-        try {
-          host = new URL(linked.url).hostname;
-        } catch {
-          // Historical clients can send links without a parseable URL.
-        }
+        // Historical clients can send links without a parseable URL.
+        const host = URL.canParse(linked.url)
+          ? new URL(linked.url).hostname
+          : (project?.repositoryIdentity?.canonicalKey.split("/")[0] ?? "unknown");
         const hasMetadata = Object.entries(metadata).some(
           ([key, value]) => !["type", "commandId", "threadId"].includes(key) && value !== undefined,
         );
@@ -1842,12 +1864,10 @@ export const decideOrchestrationCommand = Effect.fn("decideOrchestrationCommand"
           sessionComingAlive ||
           hasQueuedTurnStartForThread(thread, command.createdAt)
         ) {
-          return yield* Effect.fail(
-            new OrchestrationCommandInvariantError({
-              commandType: command.type,
-              detail: `thread ${command.threadId} was re-engaged after settle; skipping session stop`,
-            }),
-          );
+          return yield* new OrchestrationCommandInvariantError({
+            commandType: command.type,
+            detail: `thread ${command.threadId} was re-engaged after settle; skipping session stop`,
+          });
         }
       }
       return {
diff --git a/apps/server/src/orchestration/projector.autoSettleSet.test.ts b/apps/server/src/orchestration/projector.autoSettleSet.test.ts
new file mode 100644
index 000000000000..cc12f6905910
--- /dev/null
+++ b/apps/server/src/orchestration/projector.autoSettleSet.test.ts
@@ -0,0 +1,105 @@
+import {
+  CommandId,
+  EventId,
+  ProjectId,
+  ThreadId,
+  type OrchestrationEvent,
+} from "@t3tools/contracts";
+import { expect, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+
+import { createEmptyReadModel, projectEvent } from "./projector.ts";
+
+function makeEvent(input: {
+  readonly sequence: number;
+  readonly type: OrchestrationEvent["type"];
+  readonly payload: unknown;
+}): OrchestrationEvent {
+  return {
+    sequence: input.sequence,
+    eventId: EventId.make(`event-${input.sequence}`),
+    type: input.type,
+    aggregateKind: "thread",
+    aggregateId: ThreadId.make("thread-1"),
+    occurredAt: "2026-01-01T00:00:00.000Z",
+    commandId: CommandId.make(`command-${input.sequence}`),
+    causationEventId: null,
+    correlationId: null,
+    metadata: {},
+    payload: input.payload as never,
+  } as OrchestrationEvent;
+}
+
+it.effect("projects auto-settle opt-out and survives a manual settle", () =>
+  Effect.gen(function* () {
+    const now = "2026-01-01T00:00:00.000Z";
+    const later = "2026-01-02T00:00:00.000Z";
+    const created = yield* projectEvent(
+      createEmptyReadModel(now),
+      makeEvent({
+        sequence: 1,
+        type: "thread.created",
+        payload: {
+          threadId: ThreadId.make("thread-1"),
+          projectId: ProjectId.make("project-1"),
+          title: "Thread",
+          modelSelection: { provider: "codex", model: "gpt-5.4" },
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+          createdAt: now,
+          updatedAt: now,
+        },
+      }),
+    );
+    expect(created.threads[0]?.autoSettleDisabledAt ?? null).toBeNull();
+
+    const disabled = yield* projectEvent(
+      created,
+      makeEvent({
+        sequence: 2,
+        type: "thread.auto-settle-set",
+        payload: { threadId: ThreadId.make("thread-1"), autoSettleDisabledAt: now, updatedAt: now },
+      }),
+    );
+    expect(disabled.threads[0]?.autoSettleDisabledAt).toBe(now);
+
+    // The flag is independent of the settled lifecycle: settling by hand and
+    // un-settling later must not clear it.
+    const settled = yield* projectEvent(
+      disabled,
+      makeEvent({
+        sequence: 3,
+        type: "thread.settled",
+        payload: { threadId: ThreadId.make("thread-1"), settledAt: later, updatedAt: later },
+      }),
+    );
+    expect(settled.threads[0]?.settledOverride).toBe("settled");
+    expect(settled.threads[0]?.autoSettleDisabledAt).toBe(now);
+
+    const unsettled = yield* projectEvent(
+      settled,
+      makeEvent({
+        sequence: 4,
+        type: "thread.unsettled",
+        payload: { threadId: ThreadId.make("thread-1"), reason: "user", updatedAt: later },
+      }),
+    );
+    expect(unsettled.threads[0]?.autoSettleDisabledAt).toBe(now);
+
+    const enabled = yield* projectEvent(
+      unsettled,
+      makeEvent({
+        sequence: 5,
+        type: "thread.auto-settle-set",
+        payload: {
+          threadId: ThreadId.make("thread-1"),
+          autoSettleDisabledAt: null,
+          updatedAt: later,
+        },
+      }),
+    );
+    expect(enabled.threads[0]?.autoSettleDisabledAt).toBeNull();
+  }),
+);
diff --git a/apps/server/src/orchestration/projector.test.ts b/apps/server/src/orchestration/projector.test.ts
index c4e1996f1ddd..516b85fbdae8 100644
--- a/apps/server/src/orchestration/projector.test.ts
+++ b/apps/server/src/orchestration/projector.test.ts
@@ -93,6 +93,7 @@ describe("orchestration projector", () => {
         updatedAt: now,
         archivedAt: null,
         activeOrderKey: null,
+        autoSettleDisabledAt: null,
         settledOverride: null,
         settledAt: null,
         unsettledAt: null,
diff --git a/apps/server/src/orchestration/projector.ts b/apps/server/src/orchestration/projector.ts
index 53013770b15b..dd418b95b9bc 100644
--- a/apps/server/src/orchestration/projector.ts
+++ b/apps/server/src/orchestration/projector.ts
@@ -42,6 +42,7 @@ import {
   ThreadSettledPayload,
   ThreadPinnedPayload,
   ThreadPinReorderedPayload,
+  ThreadAutoSettleSetPayload,
   ThreadPullRequestLinkedPayload,
   ThreadPullRequestSyncedPayload,
   ThreadPullRequestUnlinkedPayload,
@@ -116,12 +117,26 @@ function settledTurnStateForSessionStatus(
   }
 }
 
+// Runs for every thread event (including streaming deltas) against every
+// thread the server has ever seen, so copy the array rather than map it.
 function updateThread(
   threads: ReadonlyArray<OrchestrationThread>,
   threadId: ThreadId,
   patch: ThreadPatch,
-): OrchestrationThread[] {
-  return threads.map((thread) => (thread.id === threadId ? { ...thread, ...patch } : thread));
+): ReadonlyArray<OrchestrationThread> {
+  const index = threads.findIndex((thread) => thread.id === threadId);
+  return index === -1 ? threads : patchThreadAt(threads, index, patch);
+}
+
+/** For callers that already located the thread and must not scan again. */
+function patchThreadAt(
+  threads: ReadonlyArray<OrchestrationThread>,
+  index: number,
+  patch: ThreadPatch,
+): ReadonlyArray<OrchestrationThread> {
+  const next = threads.slice();
+  next[index] = { ...threads[index]!, ...patch };
+  return next;
 }
 
 /** Patch that swaps a thread's links and re-derives the legacy single-PR field from them. */
@@ -440,6 +455,7 @@ export function projectEvent(
             settledAt: null,
             unsettledAt: null,
             activeOrderKey: null,
+            autoSettleDisabledAt: null,
             snoozedUntil: null,
             snoozedAt: null,
             deletedAt: null,
@@ -580,6 +596,17 @@ export function projectEvent(
         })),
       );
 
+    case "thread.auto-settle-set":
+      return decodeForEvent(ThreadAutoSettleSetPayload, event.payload, event.type, "payload").pipe(
+        Effect.map((payload) => ({
+          ...nextBase,
+          threads: updateThread(nextBase.threads, payload.threadId, {
+            autoSettleDisabledAt: payload.autoSettleDisabledAt,
+            updatedAt: payload.updatedAt,
+          }),
+        })),
+      );
+
     case "thread.pin-reordered":
       return decodeForEvent(ThreadPinReorderedPayload, event.payload, event.type, "payload").pipe(
         Effect.map((payload) => ({
@@ -754,7 +781,8 @@ export function projectEvent(
           event.type,
           "payload",
         );
-        const thread = nextBase.threads.find((entry) => entry.id === payload.threadId);
+        const threadIndex = nextBase.threads.findIndex((entry) => entry.id === payload.threadId);
+        const thread = nextBase.threads[threadIndex];
         if (!thread) {
           return nextBase;
         }
@@ -802,7 +830,7 @@ export function projectEvent(
 
         return {
           ...nextBase,
-          threads: updateThread(nextBase.threads, payload.threadId, {
+          threads: patchThreadAt(nextBase.threads, threadIndex, {
             messages: cappedMessages,
             updatedAt: event.occurredAt,
           }),
@@ -1042,7 +1070,8 @@ export function projectEvent(
         "payload",
       ).pipe(
         Effect.map((payload) => {
-          const thread = nextBase.threads.find((entry) => entry.id === payload.threadId);
+          const threadIndex = nextBase.threads.findIndex((entry) => entry.id === payload.threadId);
+          const thread = nextBase.threads[threadIndex];
           if (!thread) {
             return nextBase;
           }
@@ -1056,7 +1085,7 @@ export function projectEvent(
 
           return {
             ...nextBase,
-            threads: updateThread(nextBase.threads, payload.threadId, {
+            threads: patchThreadAt(nextBase.threads, threadIndex, {
               activities,
               updatedAt: event.occurredAt,
             }),
diff --git a/apps/server/src/orchestration/workflowScriptQuery.ts b/apps/server/src/orchestration/workflowScriptQuery.ts
index 06bbd35ccf62..184abc6147ce 100644
--- a/apps/server/src/orchestration/workflowScriptQuery.ts
+++ b/apps/server/src/orchestration/workflowScriptQuery.ts
@@ -32,9 +32,10 @@ export const readWorkflowScript = Effect.fn("orchestration.readWorkflowScript")(
   const requested = input.scriptPath;
 
   if (!NodePath.isAbsolute(requested) || NodePath.extname(requested) !== ".js") {
-    return yield* Effect.fail(
-      new OrchestrationGetWorkflowScriptError({ reason: "invalid-path", scriptPath: requested }),
-    );
+    return yield* new OrchestrationGetWorkflowScriptError({
+      reason: "invalid-path",
+      scriptPath: requested,
+    });
   }
 
   const root = yield* Effect.tryPromise({
@@ -60,14 +61,16 @@ export const readWorkflowScript = Effect.fn("orchestration.readWorkflowScript")(
   });
 
   if (resolved !== root && !resolved.startsWith(`${root}${NodePath.sep}`)) {
-    return yield* Effect.fail(
-      new OrchestrationGetWorkflowScriptError({ reason: "outside-root", scriptPath: resolved }),
-    );
+    return yield* new OrchestrationGetWorkflowScriptError({
+      reason: "outside-root",
+      scriptPath: resolved,
+    });
   }
   if (NodePath.extname(resolved) !== ".js") {
-    return yield* Effect.fail(
-      new OrchestrationGetWorkflowScriptError({ reason: "not-js", scriptPath: resolved }),
-    );
+    return yield* new OrchestrationGetWorkflowScriptError({
+      reason: "not-js",
+      scriptPath: resolved,
+    });
   }
 
   // TOCTOU-safe read (review finding): open FIRST, then verify what was
diff --git a/apps/server/src/persistence/AuthPairingLinks.ts b/apps/server/src/persistence/AuthPairingLinks.ts
index aae55dd2fe06..7ad1d95ed7bc 100644
--- a/apps/server/src/persistence/AuthPairingLinks.ts
+++ b/apps/server/src/persistence/AuthPairingLinks.ts
@@ -268,7 +268,7 @@ export const make = Effect.gen(function* () {
       ),
       Effect.flatMap((rowOption) =>
         Option.match(rowOption, {
-          onNone: () => Effect.succeed(Option.none()),
+          onNone: () => Effect.succeedNone,
           onSome: (row) =>
             decodeAuthPairingLinkDbRow(row).pipe(
               Effect.mapError((cause) =>
@@ -278,7 +278,7 @@ export const make = Effect.gen(function* () {
                   { pairingLinkId: row.id },
                 ),
               ),
-              Effect.map(Option.some),
+              Effect.asSome,
             ),
         }),
       ),
@@ -329,7 +329,7 @@ export const make = Effect.gen(function* () {
       ),
       Effect.flatMap((rowOption) =>
         Option.match(rowOption, {
-          onNone: () => Effect.succeed(Option.none()),
+          onNone: () => Effect.succeedNone,
           onSome: (row) =>
             decodeAuthPairingLinkDbRow(row).pipe(
               Effect.mapError((cause) =>
@@ -339,7 +339,7 @@ export const make = Effect.gen(function* () {
                   { pairingLinkId: row.id },
                 ),
               ),
-              Effect.map(Option.some),
+              Effect.asSome,
             ),
         }),
       ),
diff --git a/apps/server/src/persistence/AuthSessions.ts b/apps/server/src/persistence/AuthSessions.ts
index 836b1f8f2e30..bbc8fc75685a 100644
--- a/apps/server/src/persistence/AuthSessions.ts
+++ b/apps/server/src/persistence/AuthSessions.ts
@@ -422,7 +422,7 @@ export const make = Effect.gen(function* () {
       ),
       Effect.flatMap((rowOption) =>
         Option.match(rowOption, {
-          onNone: () => Effect.succeed(Option.none()),
+          onNone: () => Effect.succeedNone,
           onSome: (row) =>
             decodeAuthSessionDbRow(row).pipe(
               Effect.mapError((cause) =>
diff --git a/apps/server/src/persistence/Layers/ProjectionThreads.ts b/apps/server/src/persistence/Layers/ProjectionThreads.ts
index af36578f286e..595bc0b5594c 100644
--- a/apps/server/src/persistence/Layers/ProjectionThreads.ts
+++ b/apps/server/src/persistence/Layers/ProjectionThreads.ts
@@ -54,6 +54,7 @@ const makeProjectionThreadRepository = Effect.gen(function* () {
           pinned_at,
           pin_order_key,
           active_order_key,
+          auto_settle_disabled_at,
           title_regeneration_request_id,
           title_regeneration_started_at,
           latest_user_message_at,
@@ -86,6 +87,7 @@ const makeProjectionThreadRepository = Effect.gen(function* () {
           ${row.pinnedAt},
           ${row.pinOrderKey ?? null},
           ${row.activeOrderKey ?? null},
+          ${row.autoSettleDisabledAt ?? null},
           ${row.titleRegenerationRequestId ?? null},
           ${row.titleRegenerationStartedAt ?? null},
           ${row.latestUserMessageAt},
@@ -118,6 +120,7 @@ const makeProjectionThreadRepository = Effect.gen(function* () {
           pinned_at = excluded.pinned_at,
           pin_order_key = excluded.pin_order_key,
           active_order_key = excluded.active_order_key,
+          auto_settle_disabled_at = excluded.auto_settle_disabled_at,
           title_regeneration_request_id = excluded.title_regeneration_request_id,
           title_regeneration_started_at = excluded.title_regeneration_started_at,
           latest_user_message_at = excluded.latest_user_message_at,
@@ -157,6 +160,7 @@ const makeProjectionThreadRepository = Effect.gen(function* () {
           pinned_at AS "pinnedAt",
           pin_order_key AS "pinOrderKey",
           active_order_key AS "activeOrderKey",
+          auto_settle_disabled_at AS "autoSettleDisabledAt",
           title_regeneration_request_id AS "titleRegenerationRequestId",
           title_regeneration_started_at AS "titleRegenerationStartedAt",
           latest_user_message_at AS "latestUserMessageAt",
diff --git a/apps/server/src/persistence/Layers/ProjectionTurns.ts b/apps/server/src/persistence/Layers/ProjectionTurns.ts
index bd57a4eaa30a..94443c867f04 100644
--- a/apps/server/src/persistence/Layers/ProjectionTurns.ts
+++ b/apps/server/src/persistence/Layers/ProjectionTurns.ts
@@ -317,9 +317,8 @@ const makeProjectionTurnRepository = Effect.gen(function* () {
       ),
       Effect.flatMap((rowOption) =>
         Option.match(rowOption, {
-          onNone: () => Effect.succeed(Option.none()),
-          onSome: (row) =>
-            Effect.succeed(Option.some(row as Schema.Schema.Type<typeof ProjectionTurnById>)),
+          onNone: () => Effect.succeedNone,
+          onSome: (row) => Effect.succeedSome(row as Schema.Schema.Type<typeof ProjectionTurnById>),
         }),
       ),
     );
diff --git a/apps/server/src/persistence/Layers/Sqlite.test.ts b/apps/server/src/persistence/Layers/Sqlite.test.ts
index 0b64e4f7fdcb..5bcbd35e918c 100644
--- a/apps/server/src/persistence/Layers/Sqlite.test.ts
+++ b/apps/server/src/persistence/Layers/Sqlite.test.ts
@@ -10,7 +10,11 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 
-import { SqlitePersistenceMemory, makeSqlitePersistenceLive } from "./Sqlite.ts";
+import {
+  SqlitePersistenceMemory,
+  WAL_SIZE_LIMIT_BYTES,
+  makeSqlitePersistenceLive,
+} from "./Sqlite.ts";
 
 const lockHolderSource = `
 const { DatabaseSync } = require("node:sqlite");
@@ -57,6 +61,32 @@ it.effect("waits out a concurrent writer instead of failing with SQLITE_BUSY", (
   );
 });
 
+it.effect("shrinks the WAL file back to the size limit after a large write", () => {
+  const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-sqlite-wal-"));
+  const dbPath = NodePath.join(tempDir, "state.sqlite");
+  const walFileSize = () => NodeFS.statSync(`${dbPath}-wal`).size;
+  // About 25% more 4 KB rows than the limit holds, in one transaction.
+  const rowCount = Math.ceil((WAL_SIZE_LIMIT_BYTES * 1.25) / 4000);
+
+  return Effect.gen(function* () {
+    const sql = yield* SqlClient.SqlClient;
+    yield* sql`CREATE TABLE wal_probe(payload BLOB)`;
+    yield* sql`
+      WITH RECURSIVE n(i) AS (SELECT 1 UNION ALL SELECT i + 1 FROM n WHERE i < ${rowCount})
+      INSERT INTO wal_probe(payload) SELECT randomblob(4000) FROM n
+    `;
+    assert.isAbove(walFileSize(), WAL_SIZE_LIMIT_BYTES);
+
+    // The auto-checkpoint after the large commit copied every frame into the
+    // database, so the next commit restarts the WAL and cuts the file back.
+    yield* sql`INSERT INTO wal_probe(payload) VALUES (x'00')`;
+    assert.isAtMost(walFileSize(), WAL_SIZE_LIMIT_BYTES);
+  }).pipe(
+    Effect.provide(makeSqlitePersistenceLive(dbPath).pipe(Layer.provide(NodeServices.layer))),
+    Effect.ensuring(Effect.sync(() => NodeFS.rmSync(tempDir, { recursive: true, force: true }))),
+  );
+});
+
 it.effect("applies busy_timeout in the shared persistence setup", () =>
   Effect.gen(function* () {
     const sql = yield* SqlClient.SqlClient;
diff --git a/apps/server/src/persistence/Layers/Sqlite.ts b/apps/server/src/persistence/Layers/Sqlite.ts
index 750edaab8986..19809b3773b2 100644
--- a/apps/server/src/persistence/Layers/Sqlite.ts
+++ b/apps/server/src/persistence/Layers/Sqlite.ts
@@ -8,6 +8,9 @@ import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 import { runMigrations } from "../Migrations.ts";
 import { ServerConfig } from "../../config.ts";
 
+// Size the -wal file is cut back to on the first commit after a WAL reset.
+export const WAL_SIZE_LIMIT_BYTES = 32 * 1024 * 1024;
+
 const setup = Layer.effectDiscard(
   Effect.gen(function* () {
     const sql = yield* SqlClient.SqlClient;
@@ -18,6 +21,9 @@ const setup = Layer.effectDiscard(
     // T3 Turbo: the standard WAL companion. An app crash still loses nothing; only a power loss
     // or hard reset can drop the most recent commits.
     yield* sql`PRAGMA synchronous = NORMAL;`;
+    // PASSIVE checkpoints never shrink the -wal file, so it otherwise keeps its
+    // largest size until the last connection closes.
+    yield* sql.unsafe(`PRAGMA journal_size_limit = ${WAL_SIZE_LIMIT_BYTES};`);
     yield* runMigrations();
   }),
 );
@@ -35,7 +41,7 @@ export const makeSqlitePersistenceLive = Effect.fn("makeSqlitePersistenceLive")(
       filename: dbPath,
       spanAttributes: {
         "db.name": path.basename(dbPath),
-        "service.name": "t3-server",
+        "service.name": "t3code-server",
       },
     }),
   );
diff --git a/apps/server/src/persistence/Migrations.ts b/apps/server/src/persistence/Migrations.ts
index 18aae09febf8..c837ae3f4c50 100644
--- a/apps/server/src/persistence/Migrations.ts
+++ b/apps/server/src/persistence/Migrations.ts
@@ -65,6 +65,7 @@ import Migration0050 from "./Migrations/050_ProjectionThreadPullRequests.ts";
 import Migration0051 from "./Migrations/051_ProjectionThreadMessageContext.ts";
 import Migration0052 from "./Migrations/052_ProjectionThreadTitleState.ts";
 import Migration0053 from "./Migrations/053_PullRequestFilesViewed.ts";
+import Migration0054 from "./Migrations/054_ProjectionThreadsAutoSettleDisabledAt.ts";
 
 /**
  * Migration loader with all migrations defined inline.
@@ -130,6 +131,7 @@ const migrationEntries = [
   [51, "ProjectionThreadMessageContext", Migration0051],
   [52, "ProjectionThreadTitleState", Migration0052],
   [53, "PullRequestFilesViewed", Migration0053],
+  [54, "ProjectionThreadsAutoSettleDisabledAt", Migration0054],
 ] as const;
 
 export const migrationManifest = migrationEntries.map(([id, name]) => [id, name] as const);
diff --git a/apps/server/src/persistence/Migrations/054_ProjectionThreadsAutoSettleDisabledAt.test.ts b/apps/server/src/persistence/Migrations/054_ProjectionThreadsAutoSettleDisabledAt.test.ts
new file mode 100644
index 000000000000..df6403316e5b
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/054_ProjectionThreadsAutoSettleDisabledAt.test.ts
@@ -0,0 +1,41 @@
+import { assert, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
+
+import { runMigrations } from "../Migrations.ts";
+import migrateAutoSettleDisabledAt from "./054_ProjectionThreadsAutoSettleDisabledAt.ts";
+
+it.layer(NodeSqliteClient.layer({ filename: ":memory:" }))(
+  "054_ProjectionThreadsAutoSettleDisabledAt",
+  (it) => {
+    it.effect("adds the column with auto-settle left on for existing threads", () =>
+      Effect.gen(function* () {
+        const sql = yield* SqlClient.SqlClient;
+        yield* runMigrations({ toMigrationInclusive: 53 });
+        const now = "2026-01-01T00:00:00.000Z";
+        yield* sql`
+        INSERT INTO projection_threads (
+          thread_id, project_id, title, model_selection_json, runtime_mode,
+          created_at, updated_at
+        ) VALUES (
+          'thread-1', 'project-1', 'Existing thread',
+          '{"instanceId":"codex","model":"gpt-5.4"}', 'full-access', ${now}, ${now}
+        )
+      `;
+        yield* runMigrations({ toMigrationInclusive: 54 });
+        const migrated = yield* sql<{ readonly autoSettleDisabledAt: string | null }>`
+        SELECT auto_settle_disabled_at AS "autoSettleDisabledAt" FROM projection_threads WHERE thread_id = 'thread-1'
+      `;
+        assert.deepEqual(migrated, [{ autoSettleDisabledAt: null }]);
+        // Re-running against a database that already has the column keeps its value.
+        yield* sql`UPDATE projection_threads SET auto_settle_disabled_at = ${now} WHERE thread_id = 'thread-1'`;
+        yield* migrateAutoSettleDisabledAt;
+        const rows = yield* sql<{ readonly autoSettleDisabledAt: string | null }>`
+        SELECT auto_settle_disabled_at AS "autoSettleDisabledAt" FROM projection_threads WHERE thread_id = 'thread-1'
+      `;
+        assert.deepEqual(rows, [{ autoSettleDisabledAt: now }]);
+      }),
+    );
+  },
+);
diff --git a/apps/server/src/persistence/Migrations/054_ProjectionThreadsAutoSettleDisabledAt.ts b/apps/server/src/persistence/Migrations/054_ProjectionThreadsAutoSettleDisabledAt.ts
new file mode 100644
index 000000000000..f91f6d8abdfa
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/054_ProjectionThreadsAutoSettleDisabledAt.ts
@@ -0,0 +1,15 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/unstable/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+  const columns = yield* sql<{ readonly name: string }>`
+    PRAGMA table_info(projection_threads)
+  `;
+  if (!columns.some((column) => column.name === "auto_settle_disabled_at")) {
+    yield* sql`
+      ALTER TABLE projection_threads
+      ADD COLUMN auto_settle_disabled_at TEXT
+    `;
+  }
+});
diff --git a/apps/server/src/persistence/ProviderSessionRuntime.ts b/apps/server/src/persistence/ProviderSessionRuntime.ts
index 2673512edf10..1ec7adcd623b 100644
--- a/apps/server/src/persistence/ProviderSessionRuntime.ts
+++ b/apps/server/src/persistence/ProviderSessionRuntime.ts
@@ -102,11 +102,14 @@ export class ProviderSessionRuntimeRepository extends Context.Service<
     >;
 
     /**
-     * List all provider runtime rows.
+     * List provider runtime rows.
      *
-     * Returned in ascending last-seen order.
+     * Returned in ascending last-seen order. `excludeStopped` filters stopped
+     * rows in SQL. Long-lived installs keep thousands for their resume cursors.
      */
-    readonly list: () => Effect.Effect<
+    readonly list: (options?: {
+      readonly excludeStopped?: boolean;
+    }) => Effect.Effect<
       ReadonlyArray<ProviderSessionRuntime>,
       ProviderSessionRuntimeRepositoryError
     >;
@@ -336,9 +339,9 @@ export const make = Effect.gen(function* () {
   });
 
   const listRuntimeRows = SqlSchema.findAll({
-    Request: Schema.Void,
+    Request: Schema.Struct({ excludeStopped: Schema.Boolean }),
     Result: ProviderSessionRuntimeRawDbRowSchema,
-    execute: () =>
+    execute: ({ excludeStopped }) =>
       sql`
         SELECT
           thread_id AS "threadId",
@@ -351,6 +354,7 @@ export const make = Effect.gen(function* () {
           resume_cursor_json AS "resumeCursor",
           runtime_payload_json AS "runtimePayload"
         FROM provider_session_runtime
+        ${excludeStopped ? sql`WHERE status != 'stopped'` : sql``}
         ORDER BY last_seen_at ASC, thread_id ASC
       `,
   });
@@ -398,7 +402,7 @@ export const make = Effect.gen(function* () {
       ),
       Effect.flatMap((runtimeRowOption) =>
         Option.match(runtimeRowOption, {
-          onNone: () => Effect.succeed(Option.none()),
+          onNone: () => Effect.succeedNone,
           onSome: (row) =>
             decodeRuntimeRow(row).pipe(
               Effect.mapError((cause) =>
@@ -408,14 +412,14 @@ export const make = Effect.gen(function* () {
                   { threadId: input.threadId },
                 ),
               ),
-              Effect.map((runtime) => Option.some(runtime)),
+              Effect.asSome,
             ),
         }),
       ),
     );
 
-  const list: ProviderSessionRuntimeRepository["Service"]["list"] = () =>
-    listRuntimeRows(undefined).pipe(
+  const list: ProviderSessionRuntimeRepository["Service"]["list"] = (options) =>
+    listRuntimeRows({ excludeStopped: options?.excludeStopped === true }).pipe(
       Effect.mapError(
         toPersistenceSqlOrDecodeError(
           "ProviderSessionRuntimeRepository.list:query",
@@ -428,7 +432,7 @@ export const make = Effect.gen(function* () {
         // every consumer that enumerates sessions, such as the reaper.
         Effect.forEach(rows, (row) =>
           decodeRuntimeRow(row).pipe(
-            Effect.map(Option.some),
+            Effect.asSome,
             Effect.catch((cause) =>
               Effect.logWarning("provider.session.runtime.row-skipped", {
                 threadId: row.threadId,
diff --git a/apps/server/src/persistence/Services/ProjectionThreads.ts b/apps/server/src/persistence/Services/ProjectionThreads.ts
index 895fe596db24..abd964382a09 100644
--- a/apps/server/src/persistence/Services/ProjectionThreads.ts
+++ b/apps/server/src/persistence/Services/ProjectionThreads.ts
@@ -50,6 +50,7 @@ export const ProjectionThread = Schema.Struct({
   pinnedAt: Schema.NullOr(IsoDateTime),
   pinOrderKey: Schema.optional(Schema.NullOr(Schema.String)),
   activeOrderKey: Schema.optional(Schema.NullOr(Schema.String)),
+  autoSettleDisabledAt: Schema.optional(Schema.NullOr(IsoDateTime)),
   titleRegenerationRequestId: Schema.optional(Schema.NullOr(CommandId)),
   titleRegenerationStartedAt: Schema.optional(Schema.NullOr(IsoDateTime)),
   latestUserMessageAt: Schema.NullOr(IsoDateTime),
diff --git a/apps/server/src/preview/PortScanner.test.ts b/apps/server/src/preview/PortScanner.test.ts
index 7fa15defeca9..d790002f95f1 100644
--- a/apps/server/src/preview/PortScanner.test.ts
+++ b/apps/server/src/preview/PortScanner.test.ts
@@ -18,6 +18,7 @@ import * as Layer from "effect/Layer";
 import * as PlatformError from "effect/PlatformError";
 import * as Scope from "effect/Scope";
 import * as TestClock from "effect/testing/TestClock";
+import * as Tracer from "effect/Tracer";
 import { expect } from "vite-plus/test";
 import { FetchHttpClient } from "effect/unstable/http";
 
@@ -441,6 +442,26 @@ effectIt.effect("stops probing a subscriber's configured paths after its scope c
   }).pipe(Effect.scoped, Effect.provide(layer));
 });
 
+effectIt.effect("writes no poll span while no client retains the scanner", () => {
+  let pollSpans = 0;
+  const tracer = Tracer.make({
+    span: (options) => {
+      if (options.name === "PortDiscovery.pollTick") pollSpans += 1;
+      return new Tracer.NativeSpan(options);
+    },
+  });
+  const layer = makeProbeFailureLayer(processProbeFailure);
+
+  return Effect.gen(function* () {
+    const scanner = yield* PortScanner.PortDiscovery;
+    yield* TestClock.adjust(Duration.seconds(15));
+    expect(pollSpans).toBe(0);
+
+    yield* scanner.retain;
+    expect(pollSpans).toBe(1);
+  }).pipe(Effect.scoped, Effect.provide(layer), Effect.withTracer(tracer));
+});
+
 effectIt.effect("uses the current configured fragment when readiness comes from cache", () => {
   const requests: string[] = [];
   const fetchFn = ((input: Parameters<typeof globalThis.fetch>[0]) => {
diff --git a/apps/server/src/preview/PortScanner.ts b/apps/server/src/preview/PortScanner.ts
index f4d73d62320d..9eee1a3e215e 100644
--- a/apps/server/src/preview/PortScanner.ts
+++ b/apps/server/src/preview/PortScanner.ts
@@ -550,7 +550,6 @@ export const make = Effect.gen(function* PortDiscoveryMake() {
 
   const pollTick = Effect.fn("PortDiscovery.pollTick")(
     function* () {
-      if ((yield* Ref.get(stateRef)).retainCount <= 0) return;
       const configuredUrls = [
         ...new Set(
           [...(yield* Ref.get(stateRef)).listeners.values()].flatMap(
@@ -579,9 +578,12 @@ export const make = Effect.gen(function* PortDiscoveryMake() {
     ),
   );
 
-  // Single layer-scoped polling fiber. Ticks are no-ops when no client is
-  // currently retained, so the cost is one Ref.get every POLL_INTERVAL.
-  yield* Effect.forkScoped(pollTick().pipe(Effect.repeat(Schedule.spaced(POLL_INTERVAL))));
+  // Single layer-scoped polling fiber. Ticks skip the scan and its span when no
+  // client is currently retained, so the cost is one Ref.get every POLL_INTERVAL.
+  const pollIfRetained = Ref.get(stateRef).pipe(
+    Effect.flatMap((state) => (state.retainCount > 0 ? pollTick() : Effect.void)),
+  );
+  yield* Effect.forkScoped(pollIfRetained.pipe(Effect.repeat(Schedule.spaced(POLL_INTERVAL))));
 
   const acquireRetention = Effect.fn("PortDiscovery.retain")(function* () {
     const wasIdle = yield* Ref.modify(stateRef, (state) => [
diff --git a/apps/server/src/process/externalLauncher.test.ts b/apps/server/src/process/externalLauncher.test.ts
index 965860e714b1..91b0912b3ef2 100644
--- a/apps/server/src/process/externalLauncher.test.ts
+++ b/apps/server/src/process/externalLauncher.test.ts
@@ -974,6 +974,18 @@ it.effect("discovers editors through the service API", () =>
 );
 
 for (const { platform, installPath, editor, args } of [
+  {
+    platform: "darwin",
+    installPath: "Applications/Antigravity IDE.app/Contents/Resources/app/bin/antigravity-ide",
+    editor: "antigravity",
+    args: ["--goto", "/workspace with spaces/file.ts:12:4"],
+  },
+  {
+    platform: "linux",
+    installPath: ".local/bin/antigravity-ide",
+    editor: "antigravity",
+    args: ["--goto", "/workspace with spaces/file.ts:12:4"],
+  },
   {
     platform: "darwin",
     installPath: "Applications/Cursor.app/Contents/Resources/app/bin/code",
@@ -1079,6 +1091,45 @@ for (const { platform, installPath, editor, args } of [
   );
 }
 
+// `agy` is the standalone Antigravity CLI, which installs to ~/.local/bin on
+// macOS and Linux and to its own bin folder on Windows. It is not the IDE.
+for (const { platform, installPath, onPath } of [
+  { platform: "darwin", installPath: ".local/bin/agy", onPath: true },
+  { platform: "linux", installPath: ".local/bin/agy", onPath: false },
+  { platform: "win32", installPath: "agy/bin/agy.cmd", onPath: true },
+] as const) {
+  it.effect.skipIf(windowsHost && platform !== "win32")(
+    `does not report the agy CLI as the Antigravity IDE on ${platform}`,
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-agy-cli-" });
+        const executable = path.join(home, installPath);
+        yield* fs.makeDirectory(path.dirname(executable), { recursive: true });
+        yield* fs.writeFileString(executable, "#!/bin/sh\n");
+        yield* fs.chmod(executable, 0o755);
+        const editors = yield* Effect.gen(function* () {
+          const launcher = yield* ExternalLauncher.ExternalLauncher;
+          return yield* launcher.resolveAvailableEditors();
+        }).pipe(
+          Effect.provide(
+            testLayer({
+              platform,
+              env: {
+                HOME: home,
+                LOCALAPPDATA: home,
+                PATH: onPath ? path.dirname(executable) : path.join(home, "empty"),
+                PATHEXT: ".COM;.EXE;.BAT;.CMD",
+              },
+            }),
+          ),
+        );
+        assert.notInclude(editors, "antigravity");
+      }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+}
+
 it.effect.skipIf(windowsHost)("ignores unusable app bundles and keeps PATH launchers first", () =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
diff --git a/apps/server/src/process/externalLauncher.ts b/apps/server/src/process/externalLauncher.ts
index d470bbfd5751..119ba883e0ca 100644
--- a/apps/server/src/process/externalLauncher.ts
+++ b/apps/server/src/process/externalLauncher.ts
@@ -22,7 +22,11 @@ import {
 } from "@t3tools/contracts";
 import { resolveEditorCommand } from "@t3tools/shared/editor";
 import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
-import { isCommandAvailable, resolveSpawnCommand } from "@t3tools/shared/shell";
+import {
+  isCommandAvailable,
+  resolveSpawnCommand,
+  withPathDirectoryListings,
+} from "@t3tools/shared/shell";
 import * as Clock from "effect/Clock";
 import * as Config from "effect/Config";
 import * as Context from "effect/Context";
@@ -448,7 +452,7 @@ const resolveBrowserLaunch = Effect.fn("externalLauncher.resolveBrowserLaunch")(
 const resolveAvailableEditors = Effect.fn("externalLauncher.resolveAvailableEditors")(function* () {
   const platform = yield* HostProcessPlatform;
   const env = { ...(yield* readBrowserLaunchEnv), ...(yield* readCommandLookupEnv) };
-  return yield* buildAvailableEditors(platform, env);
+  return yield* buildAvailableEditors(platform, env).pipe(withPathDirectoryListings);
 });
 
 const resolveFileManagerRevealKind = Effect.fn("externalLauncher.resolveFileManagerRevealKind")(
diff --git a/apps/server/src/processRunner.test.ts b/apps/server/src/processRunner.test.ts
index e264ba7849da..d7f3799e103b 100644
--- a/apps/server/src/processRunner.test.ts
+++ b/apps/server/src/processRunner.test.ts
@@ -412,3 +412,11 @@ describe("isWindowsCommandNotFound", () => {
     }),
   );
 });
+
+describe("commandName", () => {
+  it("drops the directory from POSIX and Windows paths", () => {
+    expect(ProcessRunner.commandName("/Users/me/.local/bin/claude")).toBe("claude");
+    expect(ProcessRunner.commandName("C:\\Program Files\\nodejs\\npx.cmd")).toBe("npx.cmd");
+    expect(ProcessRunner.commandName("git")).toBe("git");
+  });
+});
diff --git a/apps/server/src/processRunner.ts b/apps/server/src/processRunner.ts
index 0a9bb9b04a43..049125de3fbf 100644
--- a/apps/server/src/processRunner.ts
+++ b/apps/server/src/processRunner.ts
@@ -171,7 +171,8 @@ export const isWindowsCommandNotFound = Effect.fn("processRunner.isWindowsComman
   },
 );
 
-const collectText = Effect.fn("processRunner.collectText")(function* (input: {
+// Untraced: no attributes, and its time is the runProcessCore span. Errors fail that span.
+const collectText = Effect.fnUntraced(function* (input: {
   readonly command: string;
   readonly args: ReadonlyArray<string>;
   readonly cwd?: string | undefined;
@@ -285,10 +286,14 @@ function finalizeRunProcess<R>(
   );
 }
 
+/** The executable name without its directory, recorded as `process.command` on process spans. */
+export const commandName = (command: string) => command.replace(/^.*[\\/]/, "");
+
 const runProcessCore = Effect.fn("processRunner.runProcessCore")(function* (
   spawner: ChildProcessSpawner.ChildProcessSpawner["Service"],
   input: ProcessRunInput,
 ): Effect.fn.Return<ProcessRunOutput, ProcessRunError, Scope.Scope> {
+  yield* Effect.annotateCurrentSpan("process.command", commandName(input.command));
   const maxOutputBytes = input.maxOutputBytes ?? DEFAULT_MAX_OUTPUT_BYTES;
   const outputMode = input.outputMode ?? "error";
   const truncatedMarker = input.truncatedMarker ?? "";
diff --git a/apps/server/src/project/AgentSessionImporter.test.ts b/apps/server/src/project/AgentSessionImporter.test.ts
index 4eb03a5cc036..2438edca8b1b 100644
--- a/apps/server/src/project/AgentSessionImporter.test.ts
+++ b/apps/server/src/project/AgentSessionImporter.test.ts
@@ -56,6 +56,7 @@ import { makeProviderRegistryLayer } from "../provider/testUtils/providerRegistr
 import { ServerSettingsService } from "../serverSettings.ts";
 import * as AnalyticsService from "../telemetry/AnalyticsService.ts";
 import { TextGeneration } from "../textGeneration/TextGeneration.ts";
+import { TerminalManager } from "../terminal/Manager.ts";
 import { VcsStatusBroadcaster } from "../vcs/VcsStatusBroadcaster.ts";
 import * as RepositoryIdentityResolver from "./RepositoryIdentityResolver.ts";
 import { importRecentAgentThreads } from "./AgentSessionImporter.ts";
@@ -232,7 +233,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
           upsert: (binding) => Effect.sync(() => void bindings.push(binding)),
           getProvider: () => Effect.die("unused"),
           recordImportedTranscript: () => Effect.void,
-          getBinding: () => Effect.succeed(Option.none()),
+          getBinding: () => Effect.succeedNone,
           listThreadIds: () => Effect.die("unused"),
           listBindings: () => Effect.die("unused"),
         });
@@ -456,7 +457,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
           upsert: () => Effect.die("must not replace an active binding"),
           getProvider: () => Effect.die("unused"),
           recordImportedTranscript: () => Effect.void,
-          getBinding: () => Effect.succeed(Option.some(runningBinding)),
+          getBinding: () => Effect.succeedSome(runningBinding),
           listThreadIds: () => Effect.die("unused"),
           listBindings: () => Effect.die("unused"),
         });
@@ -511,7 +512,7 @@ it.layer(NodeServices.layer)("AgentSessionImporter", (it) => {
           upsert: () => Effect.die("must not bind malformed or wrong-project sessions"),
           getProvider: () => Effect.die("unused"),
           recordImportedTranscript: () => Effect.die("unused"),
-          getBinding: () => Effect.succeed(Option.none()),
+          getBinding: () => Effect.succeedNone,
           listThreadIds: () => Effect.die("unused"),
           listBindings: () => Effect.die("unused"),
         });
@@ -931,6 +932,7 @@ it.layer(integrationLayer)("AgentSessionImporter integration", (it) => {
           Layer.provide(Layer.mock(GitWorkflowService)({})),
           Layer.provide(Layer.mock(VcsStatusBroadcaster)({})),
           Layer.provide(Layer.mock(TextGeneration)({})),
+          Layer.provide(Layer.mock(TerminalManager)({ closeIdle: () => Effect.void })),
           Layer.provide(ServerSettingsService.layerTest()),
         );
 
diff --git a/apps/server/src/project/AgentSessionImporter.ts b/apps/server/src/project/AgentSessionImporter.ts
index 5ebb41a1bb54..bf9eb702ebe5 100644
--- a/apps/server/src/project/AgentSessionImporter.ts
+++ b/apps/server/src/project/AgentSessionImporter.ts
@@ -87,6 +87,7 @@ function hasImportBlockingActivity(
     thread.snoozedAt != null ||
     thread.pinnedAt != null ||
     thread.pinOrderKey != null ||
+    thread.autoSettleDisabledAt != null ||
     thread.titleRegeneration != null ||
     thread.linkedPullRequest != null ||
     thread.unsettledAt != null ||
diff --git a/apps/server/src/project/AgentSessionJson.test.ts b/apps/server/src/project/AgentSessionJson.test.ts
new file mode 100644
index 000000000000..515aa50b1b97
--- /dev/null
+++ b/apps/server/src/project/AgentSessionJson.test.ts
@@ -0,0 +1,60 @@
+import { describe, expect, it } from "@effect/vitest";
+
+import { createTranscriptJsonReader, TranscriptJsonLimitError } from "./AgentSessionJson.ts";
+
+function read(
+  json: string,
+  size: number,
+  select: (path: ReadonlyArray<string | number | null>) => boolean = () => true,
+) {
+  const reader = createTranscriptJsonReader(() => {}, select);
+  for (let offset = 0; offset < json.length; offset += size)
+    reader.write(json.slice(offset, offset + size));
+  return reader.finish();
+}
+
+describe("transcript JSON projection", () => {
+  it.each([1, 2, 7, 64, 1024])("matches JSON.parse across %i-character boundaries", (size) => {
+    for (const text of [
+      '{"a":1,"a":2,"b":"before","b":"after"}',
+      '{"a":{"x":1},"a":{"y":2},"b":[],"c":{}}',
+      '{"a":[null,true,false,1,-2.3e4,"😀\\u0061\\\\\\\"",{},[],[1,2]]}',
+      '{"a":"s","a":null,"b":null,"b":"s","c":0,"c":false}',
+      '{"__proto__":{"polluted":true},"constructor":1,"__proto__":2}',
+    ])
+      expect(read(text, size)).toEqual(JSON.parse(text));
+  });
+
+  it("projects siblings and array elements without merging repeated parent objects", () => {
+    const text =
+      '{"message":{"usage":{"input":100},"content":"large"},"message":{"usage":{"output":5},"content":[1,2]},"rows":[{"keep":1,"drop":2},{"keep":3}],"drop":{"keep":4}}';
+    const projected = read(text, 1, (path) => {
+      if (path[0] === "drop") return false;
+      return !path.includes("content") && !path.includes("drop");
+    });
+    expect(projected).toEqual({
+      message: { usage: { output: 5 } },
+      rows: [{ keep: 1 }, { keep: 3 }],
+    });
+  });
+
+  it.each(['{"a":', '{"a":1} trailing', '{"a":1}{"a":2}', '{"a":"bad\\x"}', '{"a":[1,]}'])(
+    "rejects malformed input %s",
+    (text) => {
+      expect(read(text, 1)).toBeUndefined();
+    },
+  );
+
+  it("retains the import allocation and depth limits", () => {
+    const limited = createTranscriptJsonReader(
+      () => {
+        throw new TranscriptJsonLimitError("budget");
+      },
+      () => true,
+    );
+    expect(() => limited.write('{"a":1}')).toThrow(TranscriptJsonLimitError);
+    expect(() => read("[".repeat(129) + "0" + "]".repeat(129), 10)).toThrow(
+      TranscriptJsonLimitError,
+    );
+  });
+});
diff --git a/apps/server/src/project/AgentSessionJson.ts b/apps/server/src/project/AgentSessionJson.ts
index d31c47833d70..4deba0a67794 100644
--- a/apps/server/src/project/AgentSessionJson.ts
+++ b/apps/server/src/project/AgentSessionJson.ts
@@ -1,7 +1,6 @@
 import * as SchemaAST from "effect/SchemaAST";
-import { isMany, none, type Many } from "stream-chain/defs.js";
+import { none, type Many } from "stream-chain/defs.js";
 import { Assembler } from "stream-json/core/assembler.js";
-import { filter } from "stream-json/core/filters/filter.js";
 import * as StreamJson from "stream-json/core/parser.js";
 import type { ParserOptions, Token } from "stream-json/core/parser.js";
 
@@ -55,6 +54,7 @@ export class TranscriptJsonLimitError extends Error {}
 export function createTranscriptJsonReader(
   reserve: (bytes: number) => void,
   selectPath: (path: JsonPath) => boolean,
+  options?: { readonly maxDepth?: number },
 ) {
   // The synchronous tokenizer is exported at runtime in 3.6.0, but omitted
   // from its bundled types. Unlike parser(), it does not wrap tokens in an
@@ -65,9 +65,6 @@ export function createTranscriptJsonReader(
     ) => (input: string | typeof none) => Many<Token> | typeof none;
   };
   const tokenize = jsonParser({ packValues: false });
-  const select = filter({ filter: selectPath, streamKeys: false }) as (
-    input: Token | typeof none,
-  ) => Token | Many<Token> | typeof none;
   const assembler = new Assembler();
   let key: string | null = null;
   let value = "";
@@ -100,13 +97,62 @@ export function createTranscriptJsonReader(
         assembler.consume(token);
     }
   };
+  // Forward actual selected keys instead of reconstructing them from path
+  // changes: adjacent duplicate keys have the same path but JSON.parse keeps
+  // the last value. Reconstructing paths can silently retain the first value.
+  const stack: Array<{ path: JsonPath; key: string | number | null; selected: boolean }> = [];
+  let selectedValue = false;
+  const startValue = () => {
+    const parent = stack.at(-1);
+    const path = parent?.selected ? [...parent.path, parent.key] : [];
+    const selected = (parent?.selected ?? true) && selectPath(path);
+    if (selected && typeof parent?.key === "string") {
+      assemble({ name: "keyValue", value: parent.key });
+    }
+    return { path, selected };
+  };
+  const endValue = () => {
+    const parent = stack.at(-1);
+    if (parent && typeof parent.key === "number") parent.key++;
+  };
   const selectToken = (token: Token | typeof none) => {
-    const selected = select(token);
-    if (selected === none) return;
-    if (isMany(selected)) {
-      for (const item of selected.values) assemble(item);
-    } else {
-      assemble(selected);
+    if (token === none) return;
+    switch (token.name) {
+      case "keyValue": {
+        const parent = stack.at(-1);
+        if (parent) parent.key = token.value;
+        return;
+      }
+      case "startObject":
+      case "startArray": {
+        const frame = startValue();
+        stack.push({ ...frame, key: token.name === "startArray" ? 0 : null });
+        if (frame.selected) assemble(token);
+        return;
+      }
+      case "endObject":
+      case "endArray":
+        if (stack.pop()?.selected) assemble(token);
+        endValue();
+        return;
+      case "startString":
+      case "startNumber":
+        selectedValue = startValue().selected;
+        if (selectedValue) assemble(token);
+        return;
+      case "endString":
+      case "endNumber":
+        if (selectedValue) assemble(token);
+        endValue();
+        return;
+      case "nullValue":
+      case "trueValue":
+      case "falseValue":
+        if (startValue().selected) assemble(token);
+        endValue();
+        return;
+      default:
+        if (selectedValue) assemble(token);
     }
   };
   const consume = (input: string | typeof none) => {
@@ -116,8 +162,8 @@ export function createTranscriptJsonReader(
       if (tokens === none) return;
       for (const token of tokens.values) {
         if (token.name === "startObject" || token.name === "startArray") {
-          if (++depth > 128)
-            throw new TranscriptJsonLimitError("Transcript JSON nesting exceeds 128 levels");
+          if (++depth > (options?.maxDepth ?? 128))
+            throw new TranscriptJsonLimitError("Transcript JSON nesting exceeds the depth limit");
         } else if (token.name === "endObject" || token.name === "endArray") {
           if (--depth === 0) complete = true;
         }
diff --git a/apps/server/src/project/AgentSessionScanner.test.ts b/apps/server/src/project/AgentSessionScanner.test.ts
index 792ef92310ff..2dde0643ed60 100644
--- a/apps/server/src/project/AgentSessionScanner.test.ts
+++ b/apps/server/src/project/AgentSessionScanner.test.ts
@@ -48,6 +48,7 @@ const makeProjectionSnapshotQueryLayer = (importedWorkspaceRoots: ReadonlyArray<
         updatedAt: "2026-01-01T00:00:00.000Z",
       }),
     getDeletedWorktreeThreads: () => Effect.die("unused"),
+    listThreadsWithPullRequests: () => Effect.die("unused"),
     getArchivedShellSnapshot: () => Effect.die("unused"),
     getSnapshotSequence: () => Effect.die("unused"),
     getCounts: () => Effect.die("unused"),
diff --git a/apps/server/src/project/AgentSessionScanner.ts b/apps/server/src/project/AgentSessionScanner.ts
index 975192e70033..8a8f3b310e03 100644
--- a/apps/server/src/project/AgentSessionScanner.ts
+++ b/apps/server/src/project/AgentSessionScanner.ts
@@ -662,7 +662,7 @@ export const make = Effect.gen(function* () {
     fileSystem.readDirectory(directory).pipe(Effect.orElseSucceed((): ReadonlyArray<string> => []));
 
   const statOption = (target: string) =>
-    fileSystem.stat(target).pipe(Effect.map(Option.some), Effect.orElseSucceed(Option.none));
+    fileSystem.stat(target).pipe(Effect.asSome, Effect.orElseSucceed(Option.none));
 
   /** Match directory aliases without assuming the host volume is case-insensitive. */
   const directoryIdentity = Effect.fn("AgentSessionScanner.directoryIdentity")(function* (
diff --git a/apps/server/src/project/ProjectFaviconResolver.ts b/apps/server/src/project/ProjectFaviconResolver.ts
index 4fd36cb67b94..90cbcb574e81 100644
--- a/apps/server/src/project/ProjectFaviconResolver.ts
+++ b/apps/server/src/project/ProjectFaviconResolver.ts
@@ -143,7 +143,7 @@ const optionOnNotFound = <A, R>(
   effect: Effect.Effect<A, PlatformError.PlatformError, R>,
 ): Effect.Effect<Option.Option<A>, PlatformError.PlatformError, R> =>
   effect.pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catchTags({
       PlatformError: (error) =>
         error.reason._tag === "NotFound" ? Effect.succeed(Option.none<A>()) : Effect.fail(error),
@@ -175,7 +175,7 @@ export const make = Effect.gen(function* () {
               relativePath,
             })
       ).pipe(
-        Effect.map(Option.some),
+        Effect.asSome,
         Effect.catchTags({
           WorkspacePathOutsideRootError: () =>
             Effect.succeed(
diff --git a/apps/server/src/project/ProjectSetupScriptRunner.test.ts b/apps/server/src/project/ProjectSetupScriptRunner.test.ts
index dd341a7f7859..69c553a4deaf 100644
--- a/apps/server/src/project/ProjectSetupScriptRunner.test.ts
+++ b/apps/server/src/project/ProjectSetupScriptRunner.test.ts
@@ -34,6 +34,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
     getSnapshot: () => Effect.die("unused"),
     getShellSnapshot: () => Effect.die("unused"),
     getDeletedWorktreeThreads: () => Effect.die("unused"),
+    listThreadsWithPullRequests: () => Effect.die("unused"),
     getArchivedShellSnapshot: () => Effect.die("unused"),
     getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 1 }),
     getCounts: () => Effect.die("unused"),
@@ -58,7 +59,7 @@ const makeProjectionSnapshotQueryLayer = (project: OrchestrationProject) =>
   });
 
 type TerminalOverrides = Pick<TerminalManager.TerminalManager["Service"], "open" | "write"> &
-  Partial<Pick<TerminalManager.TerminalManager["Service"], "subscribe">>;
+  Partial<Pick<TerminalManager.TerminalManager["Service"], "subscribe" | "closeIdle">>;
 
 const makeTerminalManagerLayer = (overrides: TerminalOverrides) =>
   Layer.succeed(TerminalManager.TerminalManager, {
@@ -67,6 +68,7 @@ const makeTerminalManagerLayer = (overrides: TerminalOverrides) =>
     clear: () => Effect.void,
     restart: () => Effect.die(new Error("unused")),
     close: () => Effect.void,
+    closeIdle: () => Effect.void,
     subscribe: () => Effect.succeed(() => undefined),
     subscribeMetadata: () => Effect.succeed(() => undefined),
     ...overrides,
@@ -262,6 +264,7 @@ describe("ProjectSetupScriptRunner", () => {
           listener = null;
         });
       });
+      const closeIdle = vi.fn(() => Effect.void);
       const project = makeProject([
         {
           id: "setup",
@@ -329,14 +332,82 @@ describe("ProjectSetupScriptRunner", () => {
         ]);
         // The subscription is torn down once the sentinel arrives.
         expect(listener).toBeNull();
+        // A failed run keeps its shell open for a look.
+        expect(closeIdle).not.toHaveBeenCalled();
       }).pipe(
-        Effect.provide(testLayer(project, { open, write, subscribe })),
+        Effect.provide(testLayer(project, { open, write, subscribe, closeIdle })),
         Effect.provideService(HostProcessPlatform, "linux"),
         Effect.provideService(HostProcessEnvironment, { SHELL: "/bin/zsh" }),
       );
     },
   );
 
+  it.effect("closes the idle setup shell after a clean exit", () => {
+    const open = vi.fn(() =>
+      Effect.succeed({
+        threadId: "thread-1",
+        terminalId: "setup-setup",
+        cwd: "/repo/worktrees/a",
+        worktreePath: "/repo/worktrees/a",
+        status: "running" as const,
+        pid: 123,
+        history: "",
+        exitCode: null,
+        exitSignal: null,
+        label: "setup-setup",
+        updatedAt: "2026-01-01T00:00:00.000Z",
+      }),
+    );
+    let written = "";
+    const write = vi.fn((input: { data: string }) =>
+      Effect.sync(() => void (written = input.data)),
+    );
+    let listener: ((event: TerminalEvent) => Effect.Effect<void>) | null = null;
+    const subscribe = vi.fn((next: (event: TerminalEvent) => Effect.Effect<void>) => {
+      listener = next;
+      return Effect.succeed(() => {
+        listener = null;
+      });
+    });
+    const closeIdle = vi.fn(() => Effect.void);
+    const project = makeProject([
+      {
+        id: "setup",
+        name: "Setup",
+        command: "bun install",
+        icon: "configure",
+        runOnWorktreeCreate: true,
+      },
+    ]);
+
+    return Effect.gen(function* () {
+      const runner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
+      const result = yield* runner.runForThread({
+        threadId: "thread-1",
+        projectCwd: "/repo/project",
+        worktreePath: "/repo/worktrees/a",
+        observeCompletion: {},
+      });
+      if (result.status !== "started" || !result.completion) {
+        return yield* Effect.die("expected an observed setup run");
+      }
+      const sentinel = /__T3_SETUP_DONE___[0-9a-f]{32}:/.exec(written)?.[0];
+      yield* listener!({
+        threadId: "thread-1",
+        terminalId: "setup-setup",
+        type: "output",
+        data: `${sentinel}0\r\n`,
+      });
+
+      expect((yield* result.completion).exitCode).toBe(0);
+      expect(closeIdle).toHaveBeenCalledWith({ threadId: "thread-1", terminalId: "setup-setup" });
+    }).pipe(
+      Effect.provide(testLayer(project, { open, write, subscribe, closeIdle })),
+      Effect.provideService(HostProcessPlatform, "linux"),
+      Effect.provideService(HostProcessEnvironment, { SHELL: "/bin/zsh" }),
+    );
+  });
+
   it.effect("unsubscribes from terminal output when the command cannot be written", () => {
     const open = vi.fn(() =>
       Effect.succeed({
diff --git a/apps/server/src/project/ProjectSetupScriptRunner.ts b/apps/server/src/project/ProjectSetupScriptRunner.ts
index 16cbfaa59496..74bc41e5e8cd 100644
--- a/apps/server/src/project/ProjectSetupScriptRunner.ts
+++ b/apps/server/src/project/ProjectSetupScriptRunner.ts
@@ -36,6 +36,7 @@ export interface ProjectSetupScriptRunnerResultStarted {
    * Resolves when the script's shell prints the completion sentinel. The
    * exit code is null when the terminal exited or was closed before the
    * sentinel arrived. Only present when `observeCompletion` was requested.
+   * An exit code of 0 closes the setup shell if it has nothing left running.
    */
   readonly completion?: Effect.Effect<ProjectSetupScriptCompletion>;
 }
@@ -412,6 +413,16 @@ export const make = Effect.gen(function* () {
         Effect.tapError(() => Effect.sync(() => observed?.unsubscribe())),
       );
 
+    // A clean run leaves only an idle prompt behind; its output stays in the
+    // terminal history. A failed run keeps its shell open for a look.
+    const completion = observed?.completion.pipe(
+      Effect.tap(({ exitCode }) =>
+        exitCode === 0
+          ? terminalManager.closeIdle({ threadId: input.threadId, terminalId })
+          : Effect.void,
+      ),
+    );
+
     return {
       status: "started",
       scriptId: script.id,
@@ -420,7 +431,7 @@ export const make = Effect.gen(function* () {
       terminalId,
       cwd,
       async: script.async !== false,
-      ...(observed ? { completion: observed.completion } : {}),
+      ...(completion ? { completion } : {}),
     } as const;
   });
 
diff --git a/apps/server/src/project/RepositoryIdentityResolver.test.ts b/apps/server/src/project/RepositoryIdentityResolver.test.ts
index d6ddb0b9263f..5d75e1a3d6d5 100644
--- a/apps/server/src/project/RepositoryIdentityResolver.test.ts
+++ b/apps/server/src/project/RepositoryIdentityResolver.test.ts
@@ -94,6 +94,8 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
       const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
       const first = yield* resolver.resolve("/repo/packages/web");
       rootPath = "/repo/packages/web";
+      // Longer than the one-minute cadence of the background sweeps.
+      yield* TestClock.adjust(Duration.minutes(10));
       const second = yield* resolver.resolve("/repo/packages/web");
 
       expect(first?.canonicalKey).toBe("github.com/t3tools/t3code");
@@ -123,10 +125,10 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
       const unavailable = yield* resolver.resolve(rootPath, { refresh: true });
       expect(unavailable?.webUrl).toBeUndefined();
       expect(unavailable?.canonicalKey).toBe("ssh.forge.test/team/repo");
-    }).pipe(Effect.provide(resolverLayer));
+    }).pipe(Effect.provide(Layer.merge(TestClock.layer(), resolverLayer)));
   });
 
-  it.effect("retries Git root discovery after a failed lookup", () => {
+  it.effect("retries Git root discovery after the negative TTL", () => {
     const calls: Array<ReadonlyArray<string>> = [];
     let rootAttempts = 0;
     const processRunner = Layer.succeed(ProcessRunner.ProcessRunner, {
@@ -159,7 +161,9 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
     return Effect.gen(function* () {
       const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
       expect(yield* resolver.resolve("/repo/packages/web")).toBeNull();
+      expect(yield* resolver.resolve("/repo/packages/web")).toBeNull();
 
+      yield* TestClock.adjust(RepositoryIdentityResolver.DEFAULT_NEGATIVE_CACHE_TTL);
       const recovered = yield* resolver.resolve("/repo/packages/web");
       expect(recovered?.rootPath).toBe("/repo");
       expect(calls).toEqual([
@@ -167,7 +171,7 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
         ["-C", "/repo/packages/web", "rev-parse", "--show-toplevel"],
         ["-C", "/repo", "remote", "-v"],
       ]);
-    }).pipe(Effect.provide(resolverLayer));
+    }).pipe(Effect.provide(Layer.merge(TestClock.layer(), resolverLayer)));
   });
 
   it.effect("normalizes equivalent GitHub remotes into a stable repository identity", () =>
diff --git a/apps/server/src/project/RepositoryIdentityResolver.ts b/apps/server/src/project/RepositoryIdentityResolver.ts
index b5e4c4be46f1..1aaaa4a4722c 100644
--- a/apps/server/src/project/RepositoryIdentityResolver.ts
+++ b/apps/server/src/project/RepositoryIdentityResolver.ts
@@ -13,11 +13,12 @@ import * as Layer from "effect/Layer";
 import * as ProcessRunner from "../processRunner.ts";
 
 const DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY = 512;
-// Turbo (shell-snapshot-budget): upstream keeps both at 1 minute, so every
-// shell snapshot after a quiet minute re-spawns `git rev-parse` and
-// `git remote -v` for every project. A repository's remote does not change
-// minute to minute; the cached identity is only cosmetic (PR links, icons)
-// and a restart or an explicit refresh still re-resolves it.
+// Turbo (shell-snapshot-budget): upstream uses 15 minutes positive / 1 minute
+// negative, so shell snapshots after a quiet window still re-spawn
+// `git rev-parse` and `git remote -v` for every project. A repository's remote
+// does not change minute to minute; the cached identity is only cosmetic (PR
+// links, icons). Clone, publish, and PR discovery (after a turn and before it
+// saves links) resolve with `refresh: true`, and a restart re-resolves too.
 export const DEFAULT_POSITIVE_CACHE_TTL = Duration.hours(12);
 export const DEFAULT_NEGATIVE_CACHE_TTL = Duration.minutes(10);
 
@@ -146,53 +147,49 @@ export const make = Effect.fn("RepositoryIdentityResolver.make")(function* (
 ) {
   const processRunner = yield* ProcessRunner.ProcessRunner;
   const cacheCapacity = options.cacheCapacity ?? DEFAULT_REPOSITORY_IDENTITY_CACHE_CAPACITY;
+  const refine = options.refine ?? Effect.succeed;
+  // Git errors and timeouts resolve to null, so they use the negative TTL like
+  // "no repository" or "no remote". Only interrupts and defects skip the cache.
+  const timeToLive = (exit: Exit.Exit<unknown>) =>
+    Exit.match(exit, {
+      onSuccess: (value) =>
+        value === null
+          ? (options.negativeCacheTtl ?? DEFAULT_NEGATIVE_CACHE_TTL)
+          : (options.positiveCacheTtl ?? DEFAULT_POSITIVE_CACHE_TTL),
+      onFailure: () => Duration.zero,
+    });
 
   const repositoryRootCache = yield* Cache.makeWith<string, string | null>(
     (cwd) =>
       resolveRepositoryIdentityCacheKey(cwd).pipe(
         Effect.provideService(ProcessRunner.ProcessRunner, processRunner),
       ),
-    {
-      capacity: cacheCapacity,
-      timeToLive: Exit.match({
-        onSuccess: (value) =>
-          value === null ? Duration.zero : (options.positiveCacheTtl ?? DEFAULT_POSITIVE_CACHE_TTL),
-        onFailure: () => Duration.zero,
-      }),
-    },
+    { capacity: cacheCapacity, timeToLive },
   );
 
   const repositoryIdentityCache = yield* Cache.makeWith<string, RepositoryIdentity | null>(
     (cacheKey) =>
       resolveRepositoryIdentityFromCacheKey(cacheKey).pipe(
         Effect.provideService(ProcessRunner.ProcessRunner, processRunner),
-        Effect.flatMap((identity) =>
-          identity !== null && options.refine
-            ? options.refine(identity).pipe(Effect.catch(() => Effect.succeed(identity)))
-            : Effect.succeed(identity),
+        Effect.filterOrElse(
+          (identity): identity is null => identity === null,
+          (identity) => refine(identity).pipe(Effect.orElseSucceed(() => identity)),
         ),
       ),
-    {
-      capacity: cacheCapacity,
-      timeToLive: Exit.match({
-        onSuccess: (value) =>
-          value === null
-            ? (options.negativeCacheTtl ?? DEFAULT_NEGATIVE_CACHE_TTL)
-            : (options.positiveCacheTtl ?? DEFAULT_POSITIVE_CACHE_TTL),
-        onFailure: () => Duration.zero,
-      }),
-    },
+    { capacity: cacheCapacity, timeToLive },
   );
 
-  const resolve: RepositoryIdentityResolver["Service"]["resolve"] = Effect.fn(
-    "RepositoryIdentityResolver.resolve",
-  )(function* (cwd, options) {
-    if (options?.refresh) yield* Cache.invalidate(repositoryRootCache, cwd);
-    const cacheKey = yield* Cache.get(repositoryRootCache, cwd);
-    if (cacheKey === null) return null;
-    if (options?.refresh) yield* Cache.invalidate(repositoryIdentityCache, cacheKey);
-    return yield* Cache.get(repositoryIdentityCache, cacheKey);
-  });
+  // Untraced because almost every call is a cache hit. The lookups that spawn
+  // git keep their own spans.
+  const resolve: RepositoryIdentityResolver["Service"]["resolve"] = Effect.fnUntraced(
+    function* (cwd, options) {
+      if (options?.refresh) yield* Cache.invalidate(repositoryRootCache, cwd);
+      const cacheKey = yield* Cache.get(repositoryRootCache, cwd);
+      if (cacheKey === null) return null;
+      if (options?.refresh) yield* Cache.invalidate(repositoryIdentityCache, cacheKey);
+      return yield* Cache.get(repositoryIdentityCache, cacheKey);
+    },
+  );
 
   return RepositoryIdentityResolver.of({ resolve });
 });
diff --git a/apps/server/src/project/T3ProjectFileLoader.ts b/apps/server/src/project/T3ProjectFileLoader.ts
index 105e6b09a317..4ad874b9090b 100644
--- a/apps/server/src/project/T3ProjectFileLoader.ts
+++ b/apps/server/src/project/T3ProjectFileLoader.ts
@@ -68,7 +68,7 @@ export const make = Effect.gen(function* () {
     function* (workspaceRoot) {
       const filePath = path.join(workspaceRoot, T3_PROJECT_FILE_NAME);
       const raw = yield* fileSystem.readFileString(filePath).pipe(
-        Effect.map(Option.some),
+        Effect.asSome,
         Effect.catchTags({
           PlatformError: (error) =>
             error.reason._tag === "NotFound"
@@ -87,7 +87,7 @@ export const make = Effect.gen(function* () {
         return Option.none<T3ProjectFile>();
       }
       return yield* decodeT3ProjectFileJson(raw.value).pipe(
-        Effect.map(Option.some),
+        Effect.asSome,
         Effect.catchTags({
           SchemaError: (error) =>
             logT3ProjectFileLoadError(
diff --git a/apps/server/src/provider/AntigravityInstallation.test.ts b/apps/server/src/provider/AntigravityInstallation.test.ts
index e2bab831712a..de72ebcc4e23 100644
--- a/apps/server/src/provider/AntigravityInstallation.test.ts
+++ b/apps/server/src/provider/AntigravityInstallation.test.ts
@@ -342,6 +342,8 @@ it.layer(NodeServices.layer)("Antigravity installation", (it) => {
           if (!profile) return yield* Effect.die("Expected a disposable validation profile.");
           profiles.add(profile);
           const helper = command.args[0] === "-e";
+          // The runtime unpacks straight into the disposable profile.
+          if (!helper) expect(command.options.env?.TMPDIR).toBe(profile);
           const output = yield* Queue.unbounded<Uint8Array>();
           const exited = yield* Deferred.make<ChildProcessSpawner.ExitCode>();
           const terminate = Deferred.succeed(exited, ChildProcessSpawner.ExitCode(0)).pipe(
diff --git a/apps/server/src/provider/AntigravityInstallation.ts b/apps/server/src/provider/AntigravityInstallation.ts
index 24eb4e3d6df8..f3c3d2a4d70a 100644
--- a/apps/server/src/provider/AntigravityInstallation.ts
+++ b/apps/server/src/provider/AntigravityInstallation.ts
@@ -315,7 +315,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
       );
     }
     const contents = yield* fs.readFileString(filePath);
-    return yield* Schema.decodeUnknownEffect(Schema.fromJsonString(schema))(contents);
+    return yield* Schema.decodeEffect(Schema.fromJsonString(schema))(contents);
   });
 
   const executableFile = Effect.fn("AntigravityInstallation.executableFile")(function* (
@@ -476,6 +476,9 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
           profileDirectory,
           platform,
           baseEnv: environment,
+          // The profile is scoped, so it cleans up the unpack; a shallow
+          // root keeps it under Windows' path limit.
+          tempDirectory: profileDirectory,
         });
         const runtime = yield* makeAntigravityAcpRuntime({
           spawn: buildAntigravityAcpSpawnInput({
diff --git a/apps/server/src/provider/CodexAuthCallback.test.ts b/apps/server/src/provider/CodexAuthCallback.test.ts
new file mode 100644
index 000000000000..0dafa54cd1f5
--- /dev/null
+++ b/apps/server/src/provider/CodexAuthCallback.test.ts
@@ -0,0 +1,105 @@
+// @effect-diagnostics nodeBuiltinImport:off globalFetchInEffect:off - Exercise the real local callback receiver without contacting OpenAI.
+import { expect, it } from "@effect/vitest";
+import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as Stream from "effect/Stream";
+import * as NodeHttp from "node:http";
+import { subscribeCodexAuthCallback } from "./CodexAuthCallback.ts";
+
+async function input() {
+  const server = NodeHttp.createServer();
+  await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("address");
+  await new Promise<void>((resolve) => server.close(() => resolve()));
+  const authorizationUrl = new URL("https://auth.openai.com/api/accounts/authorize");
+  authorizationUrl.search = new URLSearchParams({
+    client_id: "dynamic_agent_client",
+    response_type: "code",
+    redirect_uri: `http://127.0.0.1:${address.port}/auth/callback`,
+    state: "a".repeat(43),
+    code_challenge_method: "S256",
+    code_challenge: "b".repeat(43),
+  }).toString();
+  return {
+    authorizationUrl: authorizationUrl.toString(),
+    returnUrl: "http://localhost:7001/welcome#agents:remote-nuc",
+    environmentId: EnvironmentId.make("remote-nuc"),
+    instanceId: ProviderInstanceId.make("work"),
+    flowId: "remote-flow",
+  };
+}
+function callback(authorizationUrl: string) {
+  const request = new URL(authorizationUrl);
+  const url = new URL(request.searchParams.get("redirect_uri")!);
+  url.search = new URLSearchParams({
+    state: request.searchParams.get("state")!,
+    code: "test-code",
+    client_id: "oaiapp_test",
+  }).toString();
+  return url;
+}
+
+it.effect("a local primary environment receives sign-in for a remote secondary environment", () =>
+  Effect.gen(function* () {
+    const request = yield* Effect.promise(input);
+    const ready = yield* Deferred.make<void>();
+    const states: string[] = [];
+    let receivedCallbackUrl: string | undefined;
+    const receiver = yield* subscribeCodexAuthCallback(request).pipe(
+      Stream.runForEach((state) =>
+        Effect.gen(function* () {
+          states.push(state.phase);
+          if (state.phase === "finished") receivedCallbackUrl = state.callbackUrl;
+          if (state.phase === "ready") yield* Deferred.succeed(ready, undefined);
+        }),
+      ),
+      Effect.forkScoped,
+    );
+    yield* Deferred.await(ready);
+    const expected = callback(request.authorizationUrl);
+    const foreign = new URL(expected);
+    foreign.searchParams.set("state", "foreign");
+    expect((yield* Effect.promise(() => fetch(foreign))).status).toBe(400);
+    const response = yield* Effect.promise(() => fetch(expected, { redirect: "manual" }));
+    expect(response.status).toBe(303);
+    expect(response.headers.get("cache-control")).toBe("no-store");
+    expect(response.headers.get("location")).toBe(request.returnUrl);
+    yield* Fiber.join(receiver);
+    expect(receivedCallbackUrl).toBe(expected.toString());
+    expect(states).toEqual(["ready", "finished"]);
+  }).pipe(Effect.scoped),
+);
+
+it.effect("disconnecting the receiving client releases the exact callback port for retry", () =>
+  Effect.gen(function* () {
+    const request = yield* Effect.promise(input);
+    const ready = yield* Deferred.make<void>();
+    const receiver = yield* subscribeCodexAuthCallback(request).pipe(
+      Stream.runForEach(() => Deferred.succeed(ready, undefined)),
+      Effect.forkScoped,
+    );
+    yield* Deferred.await(ready);
+    yield* Fiber.interrupt(receiver);
+    yield* subscribeCodexAuthCallback(request).pipe(
+      Stream.runForEach((state) =>
+        state.phase === "ready"
+          ? Effect.promise(() => fetch(callback(request.authorizationUrl), { redirect: "manual" }))
+          : Effect.void,
+      ),
+    );
+  }).pipe(Effect.scoped),
+);
+
+it.effect("the local server refuses nonlocal return destinations", () =>
+  Effect.gen(function* () {
+    const request = yield* Effect.promise(input);
+    const result = yield* subscribeCodexAuthCallback({
+      ...request,
+      returnUrl: "https://app.t3.codes/welcome",
+    }).pipe(Stream.runDrain, Effect.result);
+    expect(result._tag).toBe("Failure");
+  }),
+);
diff --git a/apps/server/src/provider/CodexAuthCallback.ts b/apps/server/src/provider/CodexAuthCallback.ts
new file mode 100644
index 000000000000..3194e179e62c
--- /dev/null
+++ b/apps/server/src/provider/CodexAuthCallback.ts
@@ -0,0 +1,60 @@
+import { ProviderSetupError, type CodexAuthCallbackInput } from "@t3tools/contracts";
+import { receiveCodexAuthCallback } from "@t3tools/shared/codexAuthCallback";
+import { codexAuthorizationRequest } from "@t3tools/shared/codexAuthHandoff";
+import { providerAuthReturnUrl } from "@t3tools/shared/providerAuthReturnUrl";
+import { isLoopbackHost } from "@t3tools/shared/preview";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as Stream from "effect/Stream";
+
+/** A connected local environment receives the callback; only the remote environment owns tokens. */
+export function subscribeCodexAuthCallback(input: CodexAuthCallbackInput) {
+  const failure = (error: unknown) =>
+    new ProviderSetupError({
+      instanceId: input.instanceId,
+      operation: "callback",
+      detail:
+        error instanceof Error ? error.message : "Could not receive sign-in on this computer.",
+    });
+  return Stream.unwrap(
+    Effect.gen(function* () {
+      const destination = yield* Effect.try({
+        try: () => {
+          codexAuthorizationRequest(input.authorizationUrl);
+          const destination = providerAuthReturnUrl(input.returnUrl);
+          if (!destination || !isLoopbackHost(new URL(destination).hostname))
+            throw new Error("The local sign-in receiver needs a local T3 Code return address.");
+          return destination;
+        },
+        catch: failure,
+      });
+      const ready = yield* Deferred.make<void, ProviderSetupError>();
+      const runSync = Effect.runSyncWith(yield* Effect.context<never>());
+      const callback = yield* Effect.tryPromise({
+        try: (signal) =>
+          receiveCodexAuthCallback(
+            input.authorizationUrl,
+            async () => {
+              runSync(Deferred.succeed(ready, undefined));
+              return true;
+            },
+            () => destination,
+            signal,
+          ),
+        catch: failure,
+      }).pipe(
+        Effect.tapError((error) => Deferred.fail(ready, error)),
+        Effect.forkScoped,
+      );
+      return Stream.fromEffect(Deferred.await(ready)).pipe(
+        Stream.map(() => ({ phase: "ready" as const })),
+        Stream.concat(
+          Stream.fromEffect(Fiber.join(callback)).pipe(
+            Stream.map((callbackUrl) => ({ phase: "finished" as const, callbackUrl })),
+          ),
+        ),
+      );
+    }),
+  );
+}
diff --git a/apps/server/src/provider/CodexAuthCallbackPage.ts b/apps/server/src/provider/CodexAuthCallbackPage.ts
new file mode 100644
index 000000000000..66b5543523c0
--- /dev/null
+++ b/apps/server/src/provider/CodexAuthCallbackPage.ts
@@ -0,0 +1,42 @@
+import { providerAuthReturnUrl } from "@t3tools/shared/providerAuthReturnUrl";
+
+export const codexAuthReturnUrl = providerAuthReturnUrl;
+
+const escapeHtml = (value: string) =>
+  value.replace(
+    /[&<>"']/gu,
+    (character) =>
+      ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[character]!,
+  );
+
+export function codexAuthCallbackPage(
+  success: boolean,
+  returnUrl: string | undefined,
+  nonce: string,
+) {
+  const destination = codexAuthReturnUrl(returnUrl);
+  const title = success ? "You're signed in" : "Sign-in couldn't finish";
+  const description = success
+    ? destination
+      ? "Returning to T3 Code. You're ready to continue."
+      : "Return to T3 Code to continue. You can close this tab."
+    : "Return to T3 Code and try signing in again.";
+  return `<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="color-scheme" content="light dark"><title>${escapeHtml(title)} · T3 Code</title>
+${success && destination ? `<meta http-equiv="refresh" content="1;url=${escapeHtml(destination)}">` : ""}
+<style>
+:root{font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;color:#18181b;background:#fafafa;color-scheme:light dark}
+*{box-sizing:border-box}body{margin:0;min-height:100svh;display:grid;place-items:center;padding:24px}
+main{width:100%;max-width:440px;background:#fff;border:1px solid #e4e4e7;border-radius:20px;padding:32px;box-shadow:0 12px 40px #00000008}
+.brand{font-size:18px;letter-spacing:-.5px;margin-bottom:36px;color:#71717a}.brand strong{color:#18181b}
+.status{width:40px;height:40px;border-radius:50%;display:grid;place-items:center;background:${success ? "#ecfdf5" : "#fef2f2"};color:${success ? "#059669" : "#dc2626"};margin-bottom:20px}
+h1{font-size:24px;font-weight:600;letter-spacing:-.7px;line-height:1.25;margin:0 0 12px}p{font-size:15px;line-height:1.6;color:#71717a;margin:0}
+a{display:inline-flex;align-items:center;justify-content:center;margin-top:28px;padding:10px 16px;border-radius:8px;background:#2563eb;color:white;font-size:14px;font-weight:500;text-decoration:none}a:focus-visible{outline:3px solid #93c5fd;outline-offset:3px}
+@media(prefers-color-scheme:dark){:root{color:#fafafa;background:#09090b}main{background:#18181b;border-color:#27272a;box-shadow:0 12px 40px #0003}.brand,p{color:#a1a1aa}.brand strong{color:#fafafa}.status{background:${success ? "#064e3b" : "#450a0a"};color:${success ? "#34d399" : "#f87171"}}}
+</style></head><body><main><div class="brand"><strong>T3</strong> Code</div>
+<div class="status" aria-hidden="true"><svg width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">${success ? '<path d="m5 12 4 4L19 6"/>' : '<path d="m6 6 12 12M6 18 18 6"/>'}</svg></div>
+<h1>${escapeHtml(title)}</h1><p>${description}</p>
+${destination ? `<a href="${escapeHtml(destination)}">Return to T3 Code</a>` : ""}
+</main><script nonce="${escapeHtml(nonce)}">history.replaceState(null,"","/auth/callback");</script></body></html>`;
+}
diff --git a/apps/server/src/provider/CodexChatGptAuth.test.ts b/apps/server/src/provider/CodexChatGptAuth.test.ts
new file mode 100644
index 000000000000..e7166968b498
--- /dev/null
+++ b/apps/server/src/provider/CodexChatGptAuth.test.ts
@@ -0,0 +1,2063 @@
+// @effect-diagnostics nodeBuiltinImport:off globalFetchInEffect:off preferSchemaOverJson:off - Local mock OAuth server validates the browser callback boundary.
+import * as NodeHttp from "node:http";
+import * as NodeCrypto from "node:crypto";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { assert, it } from "@effect/vitest";
+import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Stream from "effect/Stream";
+import * as Fiber from "effect/Fiber";
+import * as Deferred from "effect/Deferred";
+import * as TestClock from "effect/testing/TestClock";
+import { subscribeChatGptHandoff } from "./CodexChatGptHandoff.ts";
+import { FetchHttpClient } from "effect/unstable/http";
+import { exportJWK, generateKeyPair, SignJWT } from "jose";
+import { ServerSecretStore } from "../auth/ServerSecretStore.ts";
+import { ServerEnvironmentIdentity } from "../environment/ServerEnvironment.ts";
+import * as ProviderCredentialStore from "./ProviderCredentialStore.ts";
+import { layerTest as settingsLayerTest } from "../serverSettings.ts";
+import { AnalyticsService } from "../telemetry/AnalyticsService.ts";
+import { makeCodexChatGptAuth } from "./CodexChatGptAuth.ts";
+
+const assertSameCallback = (actual: string | null, expected: string | null) => {
+  const left = new URL(actual!);
+  const right = new URL(expected!);
+  assert.strictEqual(left.protocol, right.protocol);
+  assert.strictEqual(left.hostname, right.hostname);
+  assert.strictEqual(left.pathname, right.pathname);
+};
+const environmentIds = new WeakMap<Map<string, Uint8Array>, EnvironmentId>();
+const instanceId = ProviderInstanceId.make("managed-codex-test");
+const makeHarnessFor = Effect.fnUntraced(function* (
+  instanceId: ProviderInstanceId,
+  bytes: Map<string, Uint8Array> = new Map(),
+  failAnalytics = false,
+) {
+  const environmentId = environmentIds.get(bytes) ?? EnvironmentId.make(NodeCrypto.randomUUID());
+  environmentIds.set(bytes, environmentId);
+  const environment = ServerEnvironmentIdentity.of({
+    getEnvironmentId: Effect.succeed(environmentId),
+  });
+  const keys = yield* Effect.promise(() => generateKeyPair("RS256"));
+  const jwk = yield* Effect.promise(() => exportJWK(keys.publicKey));
+  const untrustedKeys = yield* Effect.promise(() => generateKeyPair("RS256"));
+  const secrets = ServerSecretStore.of({
+    get: (name) => Effect.sync(() => Option.fromUndefinedOr(bytes.get(name))),
+    set: (name, value) =>
+      Effect.sync(() => {
+        bytes.set(name, value);
+      }),
+    remove: (name) =>
+      Effect.sync(() => {
+        bytes.delete(name);
+      }),
+    create: () => Effect.die("unused"),
+    getOrCreateRandom: () => Effect.die("Host identity must come from the environment."),
+  });
+  let authorize: URL | undefined;
+  let refreshes = 0;
+  let revoked = false;
+  let refreshError: string | undefined;
+  let revocationStatus = 200;
+  let codeError: string | undefined;
+  const revocations: URLSearchParams[] = [];
+  let transient = false;
+  let invalidNonce = false;
+  let identityFailure: "issuer" | "audience" | "signature" | undefined;
+  let mismatchedState = false;
+  let callbackClientId: string | undefined;
+  let subject = "user-test";
+  let email = "hidden@example.test";
+  let grantScope = "openid profile email offline_access resource.invoke chatgpt.tokens.use.direct";
+  let origin = "";
+  const exchanges: URLSearchParams[] = [];
+  const authorizationRequests: URL[] = [];
+  const callbackResponses: { body: string; headers: Headers }[] = [];
+  let returnUrl = "http://localhost:7001/welcome";
+  const server = yield* Effect.acquireRelease(
+    Effect.promise(
+      () =>
+        new Promise<NodeHttp.Server>((resolve) => {
+          const server = NodeHttp.createServer(async (request, response) => {
+            response.setHeader("content-type", "application/json");
+            if (request.url === "/discovery") {
+              response.end(
+                JSON.stringify({
+                  issuer: origin,
+                  authorization_endpoint: `${origin}/authorize`,
+                  token_endpoint: `${origin}/token`,
+                  jwks_uri: `${origin}/jwks`,
+                  revocation_endpoint: `${origin}/revoke`,
+                }),
+              );
+              return;
+            }
+            if (request.url === "/jwks") {
+              response.end(
+                JSON.stringify({ keys: [{ ...jwk, kid: "test", alg: "RS256", use: "sig" }] }),
+              );
+              return;
+            }
+            if (request.url === "/revoke") {
+              let text = "";
+              for await (const chunk of request) text += chunk.toString();
+              revocations.push(new URLSearchParams(text));
+              response.statusCode = revocationStatus;
+              response.end();
+              return;
+            }
+            if (request.url === "/token") {
+              let text = "";
+              for await (const chunk of request) text += chunk.toString();
+              assert.strictEqual(
+                request.headers["content-type"],
+                "application/x-www-form-urlencoded",
+              );
+              assert.isUndefined(request.headers.authorization);
+              const body = new URLSearchParams(text);
+              assert.isFalse(body.has("client_secret"));
+              assert.strictEqual(body.get("resource"), `${origin}/v1`);
+              exchanges.push(body);
+              if (body.get("grant_type") === "refresh_token") {
+                refreshes++;
+                if (transient) {
+                  response.statusCode = 503;
+                  response.end(JSON.stringify({ error: "temporarily_unavailable" }));
+                  return;
+                }
+                if (revoked || refreshError) {
+                  response.statusCode = 400;
+                  response.end(JSON.stringify({ error: refreshError ?? "invalid_grant" }));
+                  return;
+                }
+                response.end(
+                  JSON.stringify({
+                    access_token: `access-${refreshes}`,
+                    refresh_token: `refresh-${refreshes}`,
+                    token_type: "Bearer",
+                    expires_in: 3600,
+                    scope: grantScope,
+                  }),
+                );
+                return;
+              }
+              if (codeError) {
+                response.statusCode = 400;
+                response.end(JSON.stringify({ error: codeError }));
+                return;
+              }
+              if (!authorize) {
+                response.statusCode = 400;
+                response.end("{}");
+                return;
+              }
+              assertSameCallback(
+                body.get("redirect_uri"),
+                authorize.searchParams.get("redirect_uri"),
+              );
+              assert.strictEqual(
+                NodeCrypto.createHash("sha256")
+                  .update(body.get("code_verifier")!)
+                  .digest("base64url"),
+                authorize.searchParams.get("code_challenge"),
+              );
+              const token = await new SignJWT({
+                nonce: invalidNonce ? "incorrect" : authorize.searchParams.get("nonce"),
+                email,
+              })
+                .setProtectedHeader({ alg: "RS256", kid: "test" })
+                .setIssuer(identityFailure === "issuer" ? "https://untrusted-issuer.test" : origin)
+                .setAudience(
+                  identityFailure === "audience"
+                    ? "oaiapp_untrusted_audience"
+                    : body.get("client_id")!,
+                )
+                .setSubject(subject)
+                .setIssuedAt()
+                .setExpirationTime("1h")
+                .sign(identityFailure === "signature" ? untrustedKeys.privateKey : keys.privateKey);
+              response.end(
+                JSON.stringify({
+                  access_token: "initial-access",
+                  refresh_token: "initial-refresh",
+                  id_token: token,
+                  token_type: "Bearer",
+                  expires_in: 3600,
+                  scope: grantScope,
+                }),
+              );
+              return;
+            }
+            response.statusCode = 404;
+            response.end("{}");
+          });
+          server.listen(0, "127.0.0.1", () => resolve(server));
+        }),
+    ),
+    (server) =>
+      Effect.promise(
+        () =>
+          new Promise<void>((resolve) => {
+            server.closeAllConnections();
+            server.close(() => resolve());
+          }),
+      ),
+  );
+  const address = server.address();
+  if (!address || typeof address === "string") throw new Error("mock address");
+  origin = `http://127.0.0.1:${address.port}`;
+  const analyticsEvents: {
+    event: string;
+    properties: Readonly<Record<string, unknown>> | undefined;
+  }[] = [];
+  const analytics = AnalyticsService.of({
+    record: (event, properties) =>
+      failAnalytics
+        ? Effect.die("analytics unavailable")
+        : Effect.sync(() => {
+            analyticsEvents.push({ event, properties });
+          }),
+    flush: Effect.void,
+  });
+  const auth = yield* makeCodexChatGptAuth({
+    instanceId,
+    discoveryUrl: `${origin}/discovery`,
+    resource: `${origin}/v1`,
+  }).pipe(
+    Effect.provideService(AnalyticsService, analytics),
+    Effect.provideService(ServerSecretStore, secrets),
+    Effect.provideService(ServerEnvironmentIdentity, environment),
+  );
+  const phase = (phase: string) =>
+    auth.controller.subscribe("owner").pipe(
+      Stream.filter((state) => state.phase === phase),
+      Stream.runHead,
+      Effect.map(Option.getOrThrow),
+    );
+  const prepareCallback = (waiting: { authorizationUrl: string | null }) => {
+    authorize = new URL(waiting.authorizationUrl!);
+    authorizationRequests.push(authorize);
+    const callback = new URL(authorize.searchParams.get("redirect_uri")!);
+    callback.search = new URLSearchParams({
+      code: "authorization-code",
+      state: mismatchedState ? "unmatched-state" : authorize.searchParams.get("state")!,
+      ...(callbackClientId
+        ? { client_id: callbackClientId }
+        : authorize.searchParams.get("client_id") === "dynamic_agent_client"
+          ? { client_id: "oaiapp_test" }
+          : {}),
+    }).toString();
+    return callback;
+  };
+  const startRemote = (methodId?: string) =>
+    Effect.gen(function* () {
+      yield* auth.controller.start("owner", Effect.void, methodId, returnUrl, "client");
+      const waiting = yield* phase("waiting");
+      return { waiting, callbackUrl: prepareCallback(waiting).toString() };
+    });
+  const signInWithMethod = (methodId?: string) =>
+    Effect.gen(function* () {
+      yield* auth.controller.start("owner", Effect.void, methodId, returnUrl);
+      const waiting = yield* phase("waiting");
+      assert.strictEqual(waiting.interaction?.type, "browser");
+      const callback = prepareCallback(waiting);
+      yield* Effect.promise(async () => {
+        const response = await fetch(callback);
+        callbackResponses.push({ body: await response.text(), headers: response.headers });
+      });
+    });
+  const seedExpired = Effect.gen(function* () {
+    const stored = yield* auth.read;
+    const record = Option.getOrThrow(stored);
+    const store = yield* ProviderCredentialStore.make("codex-chatgpt", instanceId).pipe(
+      Effect.provideService(ServerSecretStore, secrets),
+    );
+    yield* store.set(new TextEncoder().encode(JSON.stringify({ ...record, expiresAt: 0 })));
+  });
+  return {
+    auth,
+    analyticsEvents,
+    secrets,
+    environmentId,
+    bytes,
+    handoff: (profile: Parameters<typeof subscribeChatGptHandoff>[0]["profile"]) =>
+      subscribeChatGptHandoff(
+        {
+          instanceId,
+          environmentId,
+          attemptId: "test-handoff",
+          returnUrl,
+          profile,
+        },
+        "owner",
+        { discoveryUrl: `${origin}/discovery`, resource: `${origin}/v1` },
+      ).pipe(Stream.provideService(AnalyticsService, analytics)),
+    finishCallback: (state: { authorizationUrl: string | null }) =>
+      Effect.promise(() => fetch(prepareCallback(state))),
+    destination: Effect.gen(function* () {
+      const destinationBytes = new Map<string, Uint8Array>();
+      const destinationStore = ServerSecretStore.of({
+        ...secrets,
+        get: (name) => Effect.sync(() => Option.fromUndefinedOr(destinationBytes.get(name))),
+        set: (name, value) =>
+          Effect.sync(() => {
+            destinationBytes.set(name, value);
+          }),
+        remove: (name) =>
+          Effect.sync(() => {
+            destinationBytes.delete(name);
+          }),
+      });
+      const destination = yield* makeCodexChatGptAuth({
+        instanceId,
+        discoveryUrl: `${origin}/discovery`,
+        resource: `${origin}/v1`,
+      }).pipe(
+        Effect.provideService(AnalyticsService, analytics),
+        Effect.provideService(ServerSecretStore, destinationStore),
+        Effect.provideService(ServerEnvironmentIdentity, environment),
+      );
+      return { auth: destination, bytes: destinationBytes };
+    }),
+    recreateAuth: makeCodexChatGptAuth({
+      instanceId,
+      discoveryUrl: `${origin}/discovery`,
+      resource: `${origin}/v1`,
+    }).pipe(
+      Effect.provideService(ServerSecretStore, secrets),
+      Effect.provideService(ServerEnvironmentIdentity, environment),
+    ),
+    startRemote,
+    signIn: signInWithMethod(),
+    changeAccount: signInWithMethod("chatgpt-change-account"),
+    reconnectProfile: (clientId: string) => signInWithMethod(`chatgpt-profile:${clientId}`),
+    phase,
+    seedExpired,
+    exchanges,
+    authorizationRequests,
+    callbackResponses,
+    setReturnUrl: (value: string) => {
+      returnUrl = value;
+    },
+    origin,
+    storedRecords: () =>
+      Array.from(bytes.entries()).flatMap(([, value]) => {
+        const record = JSON.parse(new TextDecoder().decode(value));
+        return record.sessions ?? [record];
+      }),
+    revocations,
+    setRefreshError: (value: string) => {
+      refreshError = value;
+    },
+    setRevocationStatus: (value: number) => {
+      revocationStatus = value;
+    },
+    setCodeError: (value: string | undefined) => {
+      codeError = value;
+    },
+    refreshes: () => refreshes,
+    setRevoked: () => {
+      revoked = true;
+    },
+    setTransient: (value: boolean) => {
+      transient = value;
+    },
+    setInvalidNonce: () => {
+      invalidNonce = true;
+    },
+    setIdentityFailure: (value: "issuer" | "audience" | "signature") => {
+      identityFailure = value;
+    },
+    mismatchCallbackState: () => {
+      mismatchedState = true;
+    },
+    setCallbackClientId: (value: string) => {
+      callbackClientId = value;
+    },
+    setIdentity: (newSubject: string, newEmail: string) => {
+      subject = newSubject;
+      email = newEmail;
+    },
+    declineSharing: () => {
+      grantScope = "openid profile email";
+    },
+  };
+});
+const makeHarness = makeHarnessFor(instanceId);
+const provision = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+  effect.pipe(
+    Effect.scoped,
+    Effect.provide(Layer.mergeAll(FetchHttpClient.layer, NodeServices.layer)),
+  );
+it.effect(
+  "changing account registers a new user-owned client and then reuses that registration",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        h.setCallbackClientId("oaiapp_other_account");
+        h.setIdentity("other-user", "other@example.test");
+        yield* h.changeAccount;
+        yield* h.phase("succeeded");
+        assert.strictEqual(
+          h.authorizationRequests[1]!.searchParams.get("client_id"),
+          "dynamic_agent_client",
+        );
+        assert.strictEqual(h.exchanges[1]!.get("client_id"), "oaiapp_other_account");
+        const saved = Option.getOrThrow(yield* h.auth.read);
+        assert.strictEqual(saved.clientId, "oaiapp_other_account");
+        assert.strictEqual(saved.subject, "other-user");
+        assert.strictEqual(saved.email, "other@example.test");
+        const redirectUri = h.authorizationRequests[1]!.searchParams.get("redirect_uri");
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        assert.strictEqual(
+          h.authorizationRequests[2]!.searchParams.get("client_id"),
+          "oaiapp_other_account",
+        );
+        assertSameCallback(
+          h.authorizationRequests[2]!.searchParams.get("redirect_uri"),
+          redirectUri,
+        );
+      }),
+    ),
+);
+for (const failure of ["identity", "sharing"] as const) {
+  it.effect(
+    `failed account change preserves the original credentials and registration: ${failure}`,
+    () =>
+      provision(
+        Effect.gen(function* () {
+          const h = yield* makeHarness;
+          yield* h.signIn;
+          yield* h.phase("succeeded");
+          const before = h.storedRecords();
+          h.setCallbackClientId("oaiapp_other_account");
+          if (failure === "identity") h.setInvalidNonce();
+          else h.declineSharing();
+          yield* h.changeAccount;
+          yield* h.phase("failed");
+          assert.strictEqual(
+            h.authorizationRequests[1]!.searchParams.get("client_id"),
+            "dynamic_agent_client",
+          );
+          if (failure === "sharing") {
+            assert.deepEqual(
+              Option.getOrThrow(yield* h.auth.read),
+              before.find((record) => record.accessToken),
+            );
+            assert.lengthOf(h.storedRecords().find((record) => record.profiles).profiles, 2);
+          } else assert.deepEqual(h.storedRecords(), before);
+        }),
+      ),
+  );
+}
+it.effect("retains the callback host and path after controller recreation and token removal", () =>
+  provision(
+    Effect.gen(function* () {
+      const bytes = new Map<string, Uint8Array>();
+      const first = yield* makeHarnessFor(instanceId, bytes);
+      yield* first.signIn;
+      yield* first.phase("succeeded");
+      const redirectUri = first.authorizationRequests[0]!.searchParams.get("redirect_uri");
+      yield* first.auth.revoke;
+      const restarted = yield* makeHarnessFor(instanceId, bytes);
+      yield* restarted.signIn;
+      yield* restarted.phase("succeeded");
+      assert.strictEqual(
+        restarted.authorizationRequests[0]!.searchParams.get("client_id"),
+        "oaiapp_test",
+      );
+      assertSameCallback(
+        restarted.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+        redirectUri,
+      );
+      assert.strictEqual(
+        restarted.exchanges[0]!.get("redirect_uri"),
+        restarted.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+      );
+    }),
+  ),
+);
+it.effect("reauthorizes on an available port when the original callback port is occupied", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      const port = Number(
+        new URL(h.authorizationRequests[0]!.searchParams.get("redirect_uri")!).port,
+      );
+      yield* Effect.acquireRelease(
+        Effect.promise(
+          () =>
+            new Promise<NodeHttp.Server>((resolve, reject) => {
+              const server = NodeHttp.createServer();
+              server.once("error", reject);
+              server.listen(port, "127.0.0.1", () => resolve(server));
+            }),
+        ),
+        (server) =>
+          Effect.promise(() => new Promise<void>((resolve) => server.close(() => resolve()))),
+      );
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      assert.notStrictEqual(
+        Number(new URL(h.authorizationRequests[1]!.searchParams.get("redirect_uri")!).port),
+        port,
+      );
+      assert.strictEqual(h.authorizationRequests[1]!.searchParams.get("client_id"), "oaiapp_test");
+      assert.strictEqual(h.exchanges.length, 2);
+    }),
+  ),
+);
+
+it.effect("registers a fresh client when the original registration is no longer stored", () =>
+  provision(
+    Effect.gen(function* () {
+      const bytes = new Map<string, Uint8Array>();
+      const h = yield* makeHarnessFor(instanceId, bytes);
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      for (const [key, value] of bytes) {
+        const record = JSON.parse(new TextDecoder().decode(value));
+        if (record.profiles) bytes.delete(key);
+      }
+      h.setCallbackClientId("oaiapp_replacement");
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      assert.strictEqual(
+        h.authorizationRequests[1]!.searchParams.get("client_id"),
+        "dynamic_agent_client",
+      );
+      assert.strictEqual(h.exchanges[1]!.get("client_id"), "oaiapp_replacement");
+      assert.strictEqual(Option.getOrThrow(yield* h.auth.read).clientId, "oaiapp_replacement");
+    }),
+  ),
+);
+it.effect("reauthorizes a registration without persisting its original port", () =>
+  provision(
+    Effect.gen(function* () {
+      const bytes = new Map<string, Uint8Array>();
+      const h = yield* makeHarnessFor(instanceId, bytes);
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      yield* h.auth.revoke;
+      for (const [key, value] of bytes) {
+        const record = JSON.parse(new TextDecoder().decode(value));
+        if (record.profiles)
+          bytes.set(key, new TextEncoder().encode(JSON.stringify({ clientId: "oaiapp_test" })));
+      }
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      assert.strictEqual(h.authorizationRequests[1]!.searchParams.get("client_id"), "oaiapp_test");
+      assert.strictEqual(new URL(h.exchanges[1]!.get("redirect_uri")!).hostname, "127.0.0.1");
+    }),
+  ),
+);
+
+it.effect(
+  "separate Codex accounts register independently and disconnect only their own tokens",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const bytes = new Map<string, Uint8Array>();
+        const personal = yield* makeHarnessFor(ProviderInstanceId.make("codex_personal"), bytes);
+        const work = yield* makeHarnessFor(ProviderInstanceId.make("codex_work"), bytes);
+        yield* personal.signIn;
+        yield* personal.phase("succeeded");
+        const personalCredentials = Option.getOrThrow(yield* personal.auth.read);
+        assert.isTrue(Option.isNone(yield* work.auth.read));
+        yield* work.signIn;
+        yield* work.phase("succeeded");
+        assert.strictEqual(
+          work.authorizationRequests[0]!.searchParams.get("client_id"),
+          "dynamic_agent_client",
+        );
+        assert.notStrictEqual(
+          personal.auth.controller.credentialBinding?.key,
+          work.auth.controller.credentialBinding?.key,
+        );
+        yield* work.auth.controller.logout(Effect.void);
+        assert.isTrue(Option.isNone(yield* work.auth.read));
+        assert.deepEqual(Option.getOrThrow(yield* personal.auth.read), personalCredentials);
+      }),
+    ),
+);
+it.effect(
+  "emits the guide's first-time authorization request and fresh reauthorization values",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        assert.include(
+          h.callbackResponses[0]!.body,
+          'content="1;url=http://localhost:7001/welcome"',
+        );
+        const first = h.authorizationRequests[0]!;
+        assert.strictEqual(
+          first.searchParams.get("ext_agent_host_id"),
+          `urn:uuid:${h.environmentId}`,
+        );
+        assert.strictEqual(first.origin, h.origin);
+        assert.strictEqual(first.pathname, "/authorize");
+        assert.deepEqual(Array.from(first.searchParams.keys()).sort(), [
+          "agent_name_hint",
+          "client_id",
+          "code_challenge",
+          "code_challenge_method",
+          "ext_agent_host_id",
+          "nonce",
+          "redirect_uri",
+          "resource",
+          "response_type",
+          "scope",
+          "state",
+        ]);
+        assert.strictEqual(first.searchParams.get("client_id"), "dynamic_agent_client");
+        assert.strictEqual(first.searchParams.get("agent_name_hint"), "T3 Code");
+        assert.strictEqual(first.searchParams.get("response_type"), "code");
+        assert.strictEqual(
+          first.searchParams.get("scope"),
+          "openid profile email offline_access resource.invoke chatgpt.tokens.use.direct",
+        );
+        assert.strictEqual(first.searchParams.get("resource"), `${h.origin}/v1`);
+        assert.strictEqual(first.searchParams.get("code_challenge_method"), "S256");
+        const callback = new URL(first.searchParams.get("redirect_uri")!);
+        assert.strictEqual(callback.protocol, "http:");
+        assert.strictEqual(callback.hostname, "127.0.0.1");
+        assert.strictEqual(callback.pathname, "/auth/callback");
+        assert.isAbove(Number(callback.port), 0);
+        for (const key of ["state", "nonce", "code_challenge"]) {
+          assert.match(first.searchParams.get(key)!, /^[A-Za-z0-9_-]{43}$/u);
+        }
+        assert.notStrictEqual(first.searchParams.get("state"), first.searchParams.get("nonce"));
+        const originalIdToken = Option.getOrThrow(yield* h.auth.read).idToken;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        const second = h.authorizationRequests[1]!;
+        assert.strictEqual(second.searchParams.get("client_id"), "oaiapp_test");
+        assert.isFalse(second.searchParams.has("agent_name_hint"));
+        assert.strictEqual(second.searchParams.get("login_hint"), "hidden@example.test");
+        assert.strictEqual(second.searchParams.get("id_token_hint"), originalIdToken);
+        assert.strictEqual(
+          second.searchParams.get("ext_agent_host_id"),
+          first.searchParams.get("ext_agent_host_id"),
+        );
+        assertSameCallback(
+          second.searchParams.get("redirect_uri"),
+          first.searchParams.get("redirect_uri"),
+        );
+        assert.deepEqual(
+          Array.from(second.searchParams.keys()).sort(),
+          [
+            ...Array.from(first.searchParams.keys()).filter((key) => key !== "agent_name_hint"),
+            "login_hint",
+            "id_token_hint",
+          ].sort(),
+        );
+        for (const key of ["state", "nonce", "code_challenge"]) {
+          assert.notStrictEqual(first.searchParams.get(key), second.searchParams.get(key));
+        }
+        yield* h.auth.controller.logout(Effect.void);
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        const reconnect = h.authorizationRequests[2]!;
+        assert.strictEqual(reconnect.searchParams.get("client_id"), "oaiapp_test");
+        assertSameCallback(
+          reconnect.searchParams.get("redirect_uri"),
+          first.searchParams.get("redirect_uri"),
+        );
+        assert.isFalse(reconnect.searchParams.has("agent_name_hint"));
+        assert.isFalse(reconnect.searchParams.has("id_token_hint"));
+        assert.strictEqual(reconnect.searchParams.get("login_hint"), "hidden@example.test");
+        assert.strictEqual(
+          reconnect.searchParams.get("ext_agent_host_id"),
+          first.searchParams.get("ext_agent_host_id"),
+        );
+        assert.strictEqual(
+          h.exchanges[2]!.get("redirect_uri"),
+          reconnect.searchParams.get("redirect_uri"),
+        );
+      }),
+    ),
+);
+it.effect(
+  "returns to the initiating client only after sign-in has verified and saved credentials",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        h.setReturnUrl(
+          "http://localhost:7001/settings/providers?instanceId=codex_work&code=secret-code",
+        );
+        yield* h.signIn;
+        assert.isTrue(Option.isSome(yield* h.auth.read));
+        const response = h.callbackResponses[0]!;
+        assert.include(response.headers.get("content-type")!, "text/html");
+        assert.strictEqual(response.headers.get("cache-control"), "no-store");
+        assert.strictEqual(response.headers.get("referrer-policy"), "no-referrer");
+        assert.include(response.headers.get("content-security-policy")!, "default-src 'none'");
+        assert.include(response.body, "You're signed in".replace("'", "&#39;"));
+        assert.include(
+          response.body,
+          'content="1;url=http://localhost:7001/settings/providers?instanceId=codex_work"',
+        );
+        assert.notInclude(response.body, "secret-code");
+        assert.include(response.body, 'history.replaceState(null,"","/auth/callback")');
+        assert.notInclude(response.body, "authorization-code");
+        assert.notInclude(response.body, "initial-access");
+        assert.notInclude(response.body, "hidden@example.test");
+      }),
+    ),
+);
+it.effect("preserves the Welcome agents step and strips unrelated callback return parameters", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      h.setReturnUrl("http://localhost:7001/welcome?code=never-forward#agents:test-environment");
+      yield* h.signIn;
+      assert.include(
+        h.callbackResponses[0]!.body,
+        'content="1;url=http://localhost:7001/welcome#agents:test-environment"',
+      );
+      assert.notInclude(h.callbackResponses[0]!.body, "never-forward");
+    }),
+  ),
+);
+it.effect(
+  "does not redirect to an arbitrary return URL or claim success after verification fails",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        h.setReturnUrl("https://attacker.example/welcome");
+        h.setInvalidNonce();
+        yield* h.signIn;
+        yield* h.phase("failed");
+        const response = h.callbackResponses[0]!;
+        assert.include(response.body, "Sign-in couldn&#39;t finish");
+        assert.notInclude(response.body, 'http-equiv="refresh"');
+        assert.notInclude(response.body, "attacker.example");
+        assert.isTrue(Option.isNone(yield* h.auth.read));
+      }),
+    ),
+);
+it.effect(
+  "verifies registration, PKCE, identity and persists rotating refresh before concurrent access",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        assert.strictEqual(Option.getOrThrow(yield* h.auth.read).subject, "user-test");
+        assert.strictEqual(h.exchanges[0]?.get("client_id"), "oaiapp_test");
+        yield* h.seedExpired;
+        const records = yield* Effect.all([h.auth.access, h.auth.access], {
+          concurrency: "unbounded",
+        });
+        assert.strictEqual(h.refreshes(), 1);
+        assert.strictEqual(records[0].accessToken, "access-1");
+        assert.strictEqual(records[1].refreshToken, "refresh-1");
+        assert.isNull(h.exchanges[1]?.get("scope"));
+        yield* h.auth.controller.logout(Effect.void);
+        assert.isTrue(Option.isNone(yield* h.auth.read));
+      }),
+    ),
+);
+it.effect("rejects invalid ID token nonce without saving credentials", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      h.setInvalidNonce();
+      yield* h.signIn;
+      assert.include((yield* h.phase("failed")).message!, "could not be verified");
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+    }),
+  ),
+);
+it.effect("retains identity after declined sharing but never admits inference", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      h.declineSharing();
+      yield* h.signIn;
+      yield* h.phase("failed");
+      assert.isTrue(Option.isSome(yield* h.auth.read));
+      const result = yield* h.auth.access.pipe(Effect.result);
+      assert.strictEqual(result._tag, "Failure");
+      assert.strictEqual(h.refreshes(), 0);
+    }),
+  ),
+);
+it.effect("clears revoked refresh credentials and does not replay them", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      yield* h.seedExpired;
+      h.setRevoked();
+      yield* h.auth.access.pipe(Effect.result);
+      yield* h.auth.access.pipe(Effect.result);
+      assert.strictEqual(h.refreshes(), 1);
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+    }),
+  ),
+);
+
+it.effect(
+  "preserves credentials through temporary renewal failure and retries the latest refresh",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        yield* h.seedExpired;
+        h.setTransient(true);
+        yield* h.auth.access.pipe(Effect.result);
+        assert.strictEqual(Option.getOrThrow(yield* h.auth.read).refreshToken, "initial-refresh");
+        h.setTransient(false);
+        const renewed = yield* h.auth.access;
+        assert.strictEqual(renewed.refreshToken, "refresh-2");
+        assert.strictEqual(h.exchanges.at(-1)?.get("refresh_token"), "initial-refresh");
+      }),
+    ),
+);
+
+it.effect(
+  "disconnect retains the remembered account profile while a different account registers afresh",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        assert.strictEqual(
+          h.authorizationRequests[0]?.searchParams.get("client_id"),
+          "dynamic_agent_client",
+        );
+        yield* h.auth.controller.logout(Effect.void);
+        assert.isTrue(Option.isNone(yield* h.auth.read));
+        assert.deepEqual(h.storedRecords(), [
+          {
+            profiles: [
+              {
+                clientId: "oaiapp_test",
+                connectionLabel: "Connection 1",
+                sharingEnabled: true,
+                redirectUri: h.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+                subject: "user-test",
+                email: "hidden@example.test",
+              },
+            ],
+            lastClientId: "oaiapp_test",
+          },
+        ]);
+        const disconnected = yield* h.auth.controller
+          .subscribe("owner")
+          .pipe(Stream.runHead, Effect.map(Option.getOrThrow));
+        assert.include(
+          disconnected.methods!.find((method) => method.id === "chatgpt")!.description!,
+          "hidden@example.test",
+        );
+        assert.strictEqual(
+          disconnected.methods!.find((method) => method.id === "chatgpt")!.accountEmail,
+          "hidden@example.test",
+        );
+        assert.strictEqual(
+          disconnected.methods!.find((method) => method.id === "chatgpt-profile:oaiapp_test")!
+            .accountEmail,
+          "hidden@example.test",
+        );
+        assert.strictEqual((yield* h.auth.access.pipe(Effect.result))._tag, "Failure");
+        assert.strictEqual(h.refreshes(), 0);
+        h.setCallbackClientId("oaiapp_different_workspace");
+        h.setIdentity("different-user", "different@example.test");
+        yield* h.changeAccount;
+        yield* h.phase("succeeded");
+        assert.strictEqual(
+          h.authorizationRequests[1]?.searchParams.get("client_id"),
+          "dynamic_agent_client",
+        );
+        assert.strictEqual(h.exchanges[1]?.get("client_id"), "oaiapp_different_workspace");
+        assert.strictEqual(Option.getOrThrow(yield* h.auth.read).subject, "different-user");
+      }),
+    ),
+);
+it.effect("revoked connection clears tokens but preserves registration for reconnect", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      yield* h.seedExpired;
+      h.setRevoked();
+      yield* h.auth.access.pipe(Effect.result);
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+      assert.deepEqual(h.storedRecords(), [
+        {
+          profiles: [
+            {
+              clientId: "oaiapp_test",
+              connectionLabel: "Connection 1",
+              sharingEnabled: true,
+              redirectUri: h.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+              subject: "user-test",
+              email: "hidden@example.test",
+            },
+          ],
+          lastClientId: "oaiapp_test",
+        },
+      ]);
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      assert.strictEqual(h.authorizationRequests[1]?.searchParams.get("client_id"), "oaiapp_test");
+    }),
+  ),
+);
+
+it.effect("fresh sign-in ignores a registration left by the old disconnect behavior", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      yield* h.auth.revoke;
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+      assert.strictEqual(h.storedRecords().length, 1);
+      h.setCallbackClientId("oaiapp_new_workspace");
+      h.setIdentity("new-workspace-user", "new@example.test");
+      yield* h.changeAccount;
+      yield* h.phase("succeeded");
+      assert.strictEqual(
+        h.authorizationRequests[1]!.searchParams.get("client_id"),
+        "dynamic_agent_client",
+      );
+      assert.strictEqual(Option.getOrThrow(yield* h.auth.read).clientId, "oaiapp_new_workspace");
+      assert.strictEqual(Option.getOrThrow(yield* h.auth.read).subject, "new-workspace-user");
+    }),
+  ),
+);
+
+it.effect("rejects mismatched callback state before any token exchange or credential write", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      h.mismatchCallbackState();
+      yield* h.signIn;
+      assert.include((yield* h.phase("failed")).message!, "could not be verified");
+      assert.strictEqual(h.exchanges.length, 0);
+      assert.deepEqual(h.storedRecords(), []);
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+    }),
+  ),
+);
+for (const invalidClaim of ["issuer", "audience", "signature"] as const) {
+  it.effect(
+    `rejects ID token ${invalidClaim} verification before saving tokens or registration`,
+    () =>
+      provision(
+        Effect.gen(function* () {
+          const h = yield* makeHarness;
+          h.setIdentityFailure(invalidClaim);
+          yield* h.signIn;
+          assert.include((yield* h.phase("failed")).message!, "could not be verified");
+          assert.strictEqual(h.exchanges.length, 1);
+          assert.deepEqual(h.storedRecords(), []);
+          assert.isTrue(Option.isNone(yield* h.auth.read));
+        }),
+      ),
+  );
+}
+for (const revoked of [false, true]) {
+  it.effect(
+    `rejects conflicting callback client ID on reauthorization ${revoked ? "after token removal" : "without changing the current account"}`,
+    () =>
+      provision(
+        Effect.gen(function* () {
+          const h = yield* makeHarness;
+          yield* h.signIn;
+          yield* h.phase("succeeded");
+          if (revoked) yield* h.auth.revoke;
+          const before = h.storedRecords();
+          h.setCallbackClientId("oaiapp_untrusted_callback");
+          yield* h.signIn;
+          assert.include((yield* h.phase("failed")).message!, "registration is incomplete");
+          assert.strictEqual(
+            h.authorizationRequests[1]?.searchParams.get("client_id"),
+            "oaiapp_test",
+          );
+          assert.strictEqual(h.exchanges.length, 1);
+          assert.deepEqual(h.storedRecords(), before);
+          assert.strictEqual(Option.isNone(yield* h.auth.read), revoked);
+        }),
+      ),
+  );
+}
+
+it.effect("returns successful desktop sign-in to the original Welcome step", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      h.setReturnUrl("t3code-dev://app/welcome#agents:test-environment");
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      assert.include(
+        h.callbackResponses[0]!.body,
+        'content="1;url=t3code-dev://app/welcome#agents:test-environment"',
+      );
+      assert.include(
+        h.callbackResponses[0]!.body,
+        'href="t3code-dev://app/welcome#agents:test-environment"',
+      );
+    }),
+  ),
+);
+
+it.effect(
+  "completes remote sign-in on the owning environment and reuses its exact callback for reauthorization",
+  () =>
+    Effect.gen(function* () {
+      const harness = yield* makeHarnessFor(instanceId);
+      const first = yield* harness.startRemote();
+      assert.isTrue(
+        first.waiting.interaction?.type === "browser" && first.waiting.interaction.acceptsCallback,
+      );
+      yield* harness.auth.controller.complete("owner", {
+        flowId: first.waiting.flowId!,
+        callbackUrl: first.callbackUrl,
+      });
+      yield* harness.phase("succeeded");
+      assert.strictEqual(Option.getOrThrow(yield* harness.auth.read).email, "hidden@example.test");
+      const second = yield* harness.startRemote();
+      assertSameCallback(second.callbackUrl, first.callbackUrl);
+      assert.strictEqual(
+        new URL(second.waiting.authorizationUrl!).searchParams.get("client_id"),
+        "oaiapp_test",
+      );
+      yield* harness.auth.controller.complete("owner", {
+        flowId: second.waiting.flowId!,
+        callbackUrl: second.callbackUrl,
+      });
+      yield* harness.phase("succeeded");
+      assert.strictEqual(harness.exchanges.length, 2);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer)),
+    ),
+);
+
+it.effect(
+  "rejects foreign clients and malformed remote callbacks without consuming the owner's sign-in",
+  () =>
+    Effect.gen(function* () {
+      const harness = yield* makeHarnessFor(instanceId);
+      const { waiting, callbackUrl } = yield* harness.startRemote();
+      assert.isTrue(Option.isNone(yield* harness.auth.read));
+      yield* Effect.flip(
+        harness.auth.controller.complete("other-client", { flowId: waiting.flowId!, callbackUrl }),
+      );
+      const wrongPort = new URL(callbackUrl);
+      wrongPort.port = wrongPort.port === "65535" ? "65534" : "65535";
+      for (const invalid of [
+        wrongPort.toString(),
+        callbackUrl.replace("/auth/callback", "/other"),
+        callbackUrl + "&state=foreign",
+        callbackUrl + "&code=duplicate",
+        callbackUrl + "&error=access_denied",
+        callbackUrl.replace("127.0.0.1", "attacker.example"),
+      ]) {
+        yield* Effect.flip(
+          harness.auth.controller.complete("owner", {
+            flowId: waiting.flowId!,
+            callbackUrl: invalid,
+          }),
+        );
+      }
+      assert.strictEqual(harness.exchanges.length, 0);
+      assert.isTrue(Option.isNone(yield* harness.auth.read));
+      yield* harness.auth.controller.complete("owner", { flowId: waiting.flowId!, callbackUrl });
+      yield* harness.phase("succeeded");
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer)),
+    ),
+);
+
+it.effect("keeps simultaneous remote accounts and environments independent", () =>
+  Effect.gen(function* () {
+    const first = yield* makeHarnessFor(instanceId);
+    const second = yield* makeHarnessFor(instanceId);
+    second.setIdentity("other-user", "other@example.test");
+    second.setCallbackClientId("oaiapp_other");
+    const a = yield* first.startRemote();
+    const b = yield* second.startRemote();
+    assert.notStrictEqual(
+      new URL(a.waiting.authorizationUrl!).searchParams.get("ext_agent_host_id"),
+      new URL(b.waiting.authorizationUrl!).searchParams.get("ext_agent_host_id"),
+    );
+    yield* Effect.flip(
+      first.auth.controller.complete("owner", {
+        flowId: a.waiting.flowId!,
+        callbackUrl: b.callbackUrl,
+      }),
+    );
+    yield* first.auth.controller.complete("owner", {
+      flowId: a.waiting.flowId!,
+      callbackUrl: a.callbackUrl,
+    });
+    yield* second.auth.controller.complete("owner", {
+      flowId: b.waiting.flowId!,
+      callbackUrl: b.callbackUrl,
+    });
+    yield* first.phase("succeeded");
+    yield* second.phase("succeeded");
+    assert.strictEqual(Option.getOrThrow(yield* first.auth.read).subject, "user-test");
+    assert.strictEqual(Option.getOrThrow(yield* second.auth.read).subject, "other-user");
+  }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, FetchHttpClient.layer))),
+);
+
+it.effect(
+  "reconnects after Disconnect and restart with the same client and host on an available port",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const bytes = new Map<string, Uint8Array>();
+        const first = yield* makeHarnessFor(instanceId, bytes);
+        yield* first.signIn;
+        yield* first.phase("succeeded");
+        const redirectUri = first.authorizationRequests[0]!.searchParams.get("redirect_uri");
+        yield* first.auth.controller.logout(Effect.void);
+        const restarted = yield* makeHarnessFor(instanceId, bytes);
+        yield* restarted.signIn;
+        yield* restarted.phase("succeeded");
+        assert.strictEqual(
+          restarted.authorizationRequests[0]!.searchParams.get("client_id"),
+          "oaiapp_test",
+        );
+        assertSameCallback(
+          restarted.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+          redirectUri,
+        );
+        assert.strictEqual(
+          restarted.exchanges[0]!.get("redirect_uri"),
+          restarted.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+        );
+        assert.strictEqual(Option.getOrThrow(yield* restarted.auth.read).subject, "user-test");
+      }),
+    ),
+);
+
+for (const disconnected of [false, true]) {
+  it.effect(
+    `rejects a different verified identity during saved-profile reauth ${disconnected ? "after Disconnect" : "while connected"}`,
+    () =>
+      provision(
+        Effect.gen(function* () {
+          const h = yield* makeHarness;
+          yield* h.signIn;
+          yield* h.phase("succeeded");
+          if (disconnected) yield* h.auth.controller.logout(Effect.void);
+          const before = h.storedRecords();
+          h.setIdentity("another-user", "another@example.test");
+          yield* h.signIn;
+          assert.include((yield* h.phase("failed")).message!, "different ChatGPT account");
+          assert.deepEqual(h.storedRecords(), before);
+          assert.strictEqual(Option.isNone(yield* h.auth.read), disconnected);
+        }),
+      ),
+  );
+}
+
+it.effect(
+  "retains both profiles and reuses the original account's client and callback when returning from another account",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const bytes = new Map<string, Uint8Array>();
+        const first = yield* makeHarnessFor(instanceId, bytes);
+        yield* first.signIn;
+        yield* first.phase("succeeded");
+        const redirectUri = first.authorizationRequests[0]!.searchParams.get("redirect_uri");
+        first.setIdentity("other-user", "other@example.test");
+        first.setCallbackClientId("oaiapp_other_account");
+        yield* first.changeAccount;
+        const changed = yield* first.phase("succeeded");
+        assert.isTrue(
+          changed.methods!.some((method) => method.id === "chatgpt-profile:oaiapp_test"),
+        );
+        assert.isTrue(
+          changed.methods!.some((method) => method.id === "chatgpt-profile:oaiapp_other_account"),
+        );
+        yield* first.auth.controller.logout(Effect.void);
+        const restarted = yield* makeHarnessFor(instanceId, bytes);
+        yield* restarted.reconnectProfile("oaiapp_test");
+        yield* restarted.phase("succeeded");
+        assert.strictEqual(
+          restarted.authorizationRequests[0]!.searchParams.get("client_id"),
+          "oaiapp_test",
+        );
+        assertSameCallback(
+          restarted.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+          redirectUri,
+        );
+        assert.strictEqual(Option.getOrThrow(yield* restarted.auth.read).subject, "user-test");
+      }),
+    ),
+);
+
+it.effect("fresh sign-in to the same identity preserves separate registration profiles", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      h.setIdentity("other-user", "other@example.test");
+      h.setCallbackClientId("oaiapp_other_account");
+      yield* h.changeAccount;
+      yield* h.phase("succeeded");
+      h.setIdentity("user-test", "hidden@example.test");
+      h.setCallbackClientId("oaiapp_replacement");
+      yield* h.changeAccount;
+      const changed = yield* h.phase("succeeded");
+      assert.deepEqual(
+        changed
+          .methods!.filter((method) => method.id.startsWith("chatgpt-profile:"))
+          .map((method) => method.id),
+        [
+          "chatgpt-profile:oaiapp_replacement",
+          "chatgpt-profile:oaiapp_other_account",
+          "chatgpt-profile:oaiapp_test",
+        ],
+      );
+      assert.strictEqual(Option.getOrThrow(yield* h.auth.read).clientId, "oaiapp_replacement");
+      const redirectUri = h.authorizationRequests[2]!.searchParams.get("redirect_uri");
+      yield* h.auth.controller.logout(Effect.void);
+      yield* h.reconnectProfile("oaiapp_replacement");
+      yield* h.phase("succeeded");
+      assert.strictEqual(
+        h.authorizationRequests[3]!.searchParams.get("client_id"),
+        "oaiapp_replacement",
+      );
+      assertSameCallback(h.authorizationRequests[3]!.searchParams.get("redirect_uri"), redirectUri);
+    }),
+  ),
+);
+
+it.effect("preserves legacy profiles with the same email and subject", () =>
+  provision(
+    Effect.gen(function* () {
+      const bytes = new Map<string, Uint8Array>();
+      const h = yield* makeHarnessFor(instanceId, bytes);
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      const redirectUri = h.authorizationRequests[0]!.searchParams.get("redirect_uri");
+      for (const [key, value] of bytes) {
+        const record = JSON.parse(new TextDecoder().decode(value));
+        if (record.profiles)
+          bytes.set(
+            key,
+            new TextEncoder().encode(
+              JSON.stringify({
+                ...record,
+                profiles: [
+                  { ...record.profiles[0], clientId: "oaiapp_old_duplicate" },
+                  ...record.profiles,
+                ],
+              }),
+            ),
+          );
+      }
+      const restarted = yield* makeHarnessFor(instanceId, bytes);
+      const state = yield* restarted.auth.controller.subscribe("owner").pipe(
+        Stream.filter((state) => state.methods != null),
+        Stream.runHead,
+        Effect.map(Option.getOrThrow),
+      );
+      assert.deepEqual(
+        state
+          .methods!.filter((method) => method.id.startsWith("chatgpt-profile:"))
+          .map((method) => method.id),
+        ["chatgpt-profile:oaiapp_test", "chatgpt-profile:oaiapp_old_duplicate"],
+      );
+      yield* restarted.signIn;
+      yield* restarted.phase("succeeded");
+      assert.strictEqual(
+        restarted.authorizationRequests[0]!.searchParams.get("client_id"),
+        "oaiapp_test",
+      );
+      assertSameCallback(
+        restarted.authorizationRequests[0]!.searchParams.get("redirect_uri"),
+        redirectUri,
+      );
+      assert.lengthOf(restarted.storedRecords().find((record) => record.profiles).profiles, 2);
+    }),
+  ),
+);
+
+it.effect("keeps distinct verified identities even when their email matches", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      h.setIdentity("other-user", "hidden@example.test");
+      h.setCallbackClientId("oaiapp_other_account");
+      yield* h.changeAccount;
+      const changed = yield* h.phase("succeeded");
+      assert.lengthOf(
+        changed.methods!.filter((method) => method.id.startsWith("chatgpt-profile:")),
+        2,
+      );
+    }),
+  ),
+);
+
+it.effect(
+  "migrates a legacy registration and retains its verified identity when credentials are cleared",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const bytes = new Map<string, Uint8Array>();
+        const first = yield* makeHarnessFor(instanceId, bytes);
+        yield* first.signIn;
+        yield* first.phase("succeeded");
+        const redirectUri = first.authorizationRequests[0]!.searchParams.get("redirect_uri");
+        for (const [key, value] of bytes) {
+          const saved = JSON.parse(new TextDecoder().decode(value));
+          if (saved.profiles)
+            bytes.set(
+              key,
+              new TextEncoder().encode(JSON.stringify({ clientId: "oaiapp_test", redirectUri })),
+            );
+        }
+        yield* first.auth.revoke;
+        assert.deepEqual(first.storedRecords(), [
+          {
+            profiles: [
+              {
+                clientId: "oaiapp_test",
+                connectionLabel: "Connection 1",
+                redirectUri,
+                subject: "user-test",
+                email: "hidden@example.test",
+              },
+            ],
+            lastClientId: "oaiapp_test",
+          },
+        ]);
+        const restarted = yield* makeHarnessFor(instanceId, bytes);
+        restarted.setIdentity("another-user", "another@example.test");
+        yield* restarted.signIn;
+        assert.include((yield* restarted.phase("failed")).message!, "different ChatGPT account");
+        assert.isTrue(Option.isNone(yield* restarted.auth.read));
+        assert.strictEqual(
+          restarted.authorizationRequests[0]!.searchParams.get("ext_agent_host_id"),
+          first.authorizationRequests[0]!.searchParams.get("ext_agent_host_id"),
+        );
+      }),
+    ),
+);
+
+it.effect("declined sharing on an older profile does not replace the active account", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      h.setIdentity("other-user", "other@example.test");
+      h.setCallbackClientId("oaiapp_other_account");
+      yield* h.changeAccount;
+      yield* h.phase("succeeded");
+      const before = h.storedRecords();
+      h.setIdentity("user-test", "hidden@example.test");
+      h.setCallbackClientId("oaiapp_test");
+      h.declineSharing();
+      yield* h.reconnectProfile("oaiapp_test");
+      assert.include(
+        (yield* h.phase("failed")).message!,
+        "existing ChatGPT connection is unchanged",
+      );
+      assert.deepEqual(
+        Option.getOrThrow(yield* h.auth.read),
+        before.find((record) => record.clientId === "oaiapp_other_account"),
+      );
+    }),
+  ),
+);
+
+it.effect(
+  "Disconnect preserves a remote profile's callback URI for client-delivered reconnect",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        const first = yield* h.startRemote();
+        yield* h.auth.controller.complete("owner", {
+          flowId: first.waiting.flowId!,
+          callbackUrl: first.callbackUrl,
+        });
+        yield* h.phase("succeeded");
+        yield* h.auth.controller.logout(Effect.void);
+        const second = yield* h.startRemote();
+        assert.strictEqual(
+          new URL(second.waiting.authorizationUrl!).searchParams.get("client_id"),
+          "oaiapp_test",
+        );
+        assertSameCallback(
+          new URL(second.waiting.authorizationUrl!).searchParams.get("redirect_uri"),
+          new URL(first.waiting.authorizationUrl!).searchParams.get("redirect_uri"),
+        );
+        yield* h.auth.controller.complete("owner", {
+          flowId: second.waiting.flowId!,
+          callbackUrl: second.callbackUrl,
+        });
+        yield* h.phase("succeeded");
+        assert.strictEqual(Option.getOrThrow(yield* h.auth.read).subject, "user-test");
+      }),
+    ),
+);
+
+for (const code of [
+  "invalid_grant",
+  "invalid_refresh_token",
+  "token_expired",
+  "refresh_token_expired",
+  "refresh_token_invalidated",
+  "refresh_token_reused",
+  "invalid_client",
+  "invalid_token",
+]) {
+  it.effect(`refresh recovery follows the machine-readable code: ${code}`, () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        yield* h.seedExpired;
+        h.setRefreshError(code);
+        yield* Effect.flip(h.auth.access);
+        assert.strictEqual(
+          Option.isNone(yield* h.auth.read),
+          !["invalid_client", "invalid_token"].includes(code),
+        );
+        assert.isTrue(
+          h
+            .storedRecords()
+            .some((record) =>
+              record.profiles?.some(
+                (profile: { clientId: string }) => profile.clientId === "oaiapp_test",
+              ),
+            ),
+        );
+      }),
+    ),
+  );
+}
+
+it.effect(
+  "logout revokes the latest refresh token with the selected client and clears its ID hint",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        const host = h.authorizationRequests[0]!.searchParams.get("ext_agent_host_id");
+        assert.match(host!, /^urn:uuid:[0-9a-f-]{36}$/u);
+        yield* h.seedExpired;
+        yield* h.auth.access;
+        const state = yield* h.auth.controller.logout(Effect.void);
+        assert.strictEqual(state.message, "Signed out.");
+        assert.deepEqual(Array.from(h.revocations[0]!), [
+          ["token", "refresh-1"],
+          ["token_type_hint", "refresh_token"],
+          ["client_id", "oaiapp_test"],
+        ]);
+        assert.isTrue(Option.isNone(yield* h.auth.read));
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        assert.isFalse(h.authorizationRequests[1]!.searchParams.has("id_token_hint"));
+        assert.strictEqual(h.authorizationRequests[1]!.searchParams.get("ext_agent_host_id"), host);
+      }),
+    ),
+);
+
+it.live("logout retries temporary revocation failures and reports local-only sign-out", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      h.setRevocationStatus(503);
+      const state = yield* h.auth.controller.logout(Effect.void);
+      assert.lengthOf(h.revocations, 3);
+      assert.strictEqual(state.phase, "idle");
+      assert.include(state.message!, "Remote revocation could not be confirmed");
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+      assert.isFalse(h.storedRecords().some((record) => record.idToken));
+    }),
+  ),
+);
+
+it.effect(
+  "reauth hints come from the selected profile, including after another profile logs out",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        const personal = Option.getOrThrow(yield* h.auth.read);
+        h.setCallbackClientId("oaiapp_work");
+        h.setIdentity("work-user", "work@example.test");
+        yield* h.changeAccount;
+        yield* h.phase("succeeded");
+        assert.isFalse(h.authorizationRequests[1]!.searchParams.has("id_token_hint"));
+        assert.isFalse(h.authorizationRequests[1]!.searchParams.has("login_hint"));
+        yield* h.auth.controller.logout(Effect.void);
+        h.setCallbackClientId("oaiapp_test");
+        h.setIdentity("user-test", "hidden@example.test");
+        yield* h.reconnectProfile("oaiapp_test");
+        yield* h.phase("succeeded");
+        assert.strictEqual(
+          h.authorizationRequests[2]!.searchParams.get("id_token_hint"),
+          personal.idToken,
+        );
+        assert.strictEqual(
+          h.authorizationRequests[2]!.searchParams.get("login_hint"),
+          personal.email,
+        );
+      }),
+    ),
+);
+
+it.effect("an expired initial code retains the issued ID for a fresh authorization", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      h.setCodeError("invalid_grant");
+      yield* h.signIn;
+      const failed = yield* h.phase("failed");
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+      assert.isTrue(failed.methods!.some((method) => method.id === "chatgpt-profile:oaiapp_test"));
+      h.setCodeError(undefined);
+      yield* h.reconnectProfile("oaiapp_test");
+      yield* h.phase("succeeded");
+      assert.strictEqual(h.authorizationRequests[1]!.searchParams.get("client_id"), "oaiapp_test");
+      assert.notStrictEqual(
+        h.authorizationRequests[0]!.searchParams.get("state"),
+        h.authorizationRequests[1]!.searchParams.get("state"),
+      );
+    }),
+  ),
+);
+
+it.effect("identity-only sign-in requests consent on an explicit retry, then rechecks scopes", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      h.declineSharing();
+      yield* h.signIn;
+      yield* h.phase("failed");
+      yield* h.reconnectProfile("oaiapp_test");
+      yield* h.phase("failed");
+      assert.strictEqual(h.authorizationRequests[1]!.searchParams.get("prompt"), "consent");
+      assert.isFalse(h.authorizationRequests[1]!.searchParams.has("force_reconsent"));
+      assert.include(
+        h.authorizationRequests[1]!.searchParams.get("scope")!,
+        "chatgpt.tokens.use.direct",
+      );
+      yield* Effect.flip(h.auth.access);
+    }),
+  ),
+);
+
+it.effect(
+  "controller replacement shares refresh serialization for the same environment session",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        const replacement = yield* h.recreateAuth;
+        yield* h.seedExpired;
+        const records = yield* Effect.all([h.auth.access, replacement.access], {
+          concurrency: "unbounded",
+        });
+        assert.strictEqual(h.refreshes(), 1);
+        assert.strictEqual(records[0].refreshToken, "refresh-1");
+        assert.deepEqual(records[0], records[1]);
+      }),
+    ),
+);
+
+it.effect(
+  "old localhost registrations retain their profile while a new client gets its own identity",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const bytes = new Map<string, Uint8Array>();
+        const h = yield* makeHarnessFor(instanceId, bytes);
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        for (const [key, value] of bytes) {
+          const record = JSON.parse(new TextDecoder().decode(value));
+          if (record.profiles)
+            bytes.set(
+              key,
+              new TextEncoder().encode(
+                JSON.stringify({
+                  ...record,
+                  profiles: record.profiles.map((profile: { redirectUri: string }) => ({
+                    ...profile,
+                    redirectUri: profile.redirectUri.replace("127.0.0.1", "localhost"),
+                  })),
+                }),
+              ),
+            );
+        }
+        h.setCallbackClientId("oaiapp_migrated");
+        h.setIdentity("new-client-subject", "hidden@example.test");
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        assert.strictEqual(
+          h.authorizationRequests[1]!.searchParams.get("client_id"),
+          "dynamic_agent_client",
+        );
+        assert.strictEqual(
+          new URL(h.authorizationRequests[1]!.searchParams.get("redirect_uri")!).hostname,
+          "127.0.0.1",
+        );
+        assert.strictEqual(Option.getOrThrow(yield* h.auth.read).subject, "new-client-subject");
+        const profiles = (yield* h.phase("succeeded")).methods!;
+        assert.isTrue(profiles.some((profile) => profile.id === "chatgpt-profile:oaiapp_test"));
+        assert.isTrue(profiles.some((profile) => profile.id === "chatgpt-profile:oaiapp_migrated"));
+        yield* h.signIn;
+        yield* h.phase("succeeded");
+        assert.strictEqual(
+          h.authorizationRequests[2]!.searchParams.get("client_id"),
+          "oaiapp_migrated",
+        );
+        assert.strictEqual(
+          h.authorizationRequests[2]!.searchParams.get("login_hint"),
+          "hidden@example.test",
+        );
+        assert.isTrue(h.authorizationRequests[2]!.searchParams.has("id_token_hint"));
+      }),
+    ),
+);
+
+it.effect("keeps the active connection first when another profile declines sharing", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      h.setCallbackClientId("oaiapp_identity_only");
+      h.setIdentity("other-user", "other@example.test");
+      h.declineSharing();
+      yield* h.changeAccount;
+      const state = yield* h.phase("failed");
+      assert.strictEqual(Option.getOrThrow(yield* h.auth.read).clientId, "oaiapp_test");
+      const profiles = state.methods!.filter((method) => method.id.startsWith("chatgpt-profile:"));
+      assert.strictEqual(profiles[0]!.id, "chatgpt-profile:oaiapp_test");
+      assert.include(profiles[0]!.name, "Connection 1");
+      assert.include(profiles[1]!.name, "Connection 2");
+    }),
+  ),
+);
+
+it.effect("primary completes OAuth and destination imports and owns the refresh session", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      const destination = yield* h.destination;
+      const before = h.bytes.size;
+      const waiting = yield* Deferred.make<{ authorizationUrl: string | null }>();
+      const transferred = yield* h.handoff(null).pipe(
+        Stream.tap((state) =>
+          state.phase === "auth" && state.state.phase === "waiting"
+            ? Deferred.succeed(waiting, state.state)
+            : Effect.void,
+        ),
+        Stream.filter((state) => state.phase === "finished"),
+        Stream.runHead,
+        Effect.map(Option.getOrThrow),
+        Effect.forkChild,
+      );
+      yield* h.finishCallback(yield* Deferred.await(waiting));
+      const result = yield* Fiber.join(transferred);
+      assert.strictEqual(result.phase, "finished");
+      if (result.phase !== "finished") return;
+      assert.strictEqual(h.bytes.size, before);
+      assert.isTrue(Option.isNone(yield* h.auth.read));
+      let stopped = false;
+      const imported = yield* destination.auth.controller.importProfile!(
+        result.profile,
+        Effect.sync(() => {
+          stopped = true;
+        }),
+      );
+      assert.isTrue(stopped);
+      assert.strictEqual(imported.phase, "succeeded");
+      assert.deepStrictEqual(
+        h.analyticsEvents.map(({ event }) => event),
+        [
+          "chatgpt.auth.started",
+          "chatgpt.auth.completed",
+          "chatgpt.transfer.started",
+          "chatgpt.transfer.completed",
+        ],
+      );
+      assert.isTrue(
+        h.analyticsEvents.every(({ properties }) => properties?.flow === "primary_handoff"),
+      );
+      assert.strictEqual(h.analyticsEvents[1]?.properties?.outcome, "succeeded");
+      assert.strictEqual(h.analyticsEvents[3]?.properties?.outcome, "succeeded");
+      assert.notProperty(h.analyticsEvents[1]?.properties ?? {}, "connectedAccountCount");
+      assert.strictEqual(h.analyticsEvents[1]?.properties?.intent, "different_account");
+      assert.strictEqual(h.analyticsEvents[3]?.properties?.connectedAccountCount, 1);
+      assert.strictEqual(h.analyticsEvents[3]?.properties?.savedConnectionCount, 1);
+      const saved = Option.getOrThrow(yield* destination.auth.read);
+      assert.strictEqual(saved.clientId, result.profile.registration.clientId);
+      assert.strictEqual(saved.refreshToken, "initial-refresh");
+      const reconnect = yield* destination.auth.controller.reconnectProfile!("chatgpt");
+      assert.strictEqual(reconnect?.idTokenHint, result.profile.credentials.idToken);
+      assert.isFalse("refreshToken" in reconnect!);
+      const store = yield* ProviderCredentialStore.make("codex-chatgpt", instanceId).pipe(
+        Effect.provideService(
+          ServerSecretStore,
+          ServerSecretStore.of({
+            get: (name) => Effect.sync(() => Option.fromUndefinedOr(destination.bytes.get(name))),
+            set: (name, value) =>
+              Effect.sync(() => {
+                destination.bytes.set(name, value);
+              }),
+            remove: () => Effect.void,
+            create: () => Effect.die("unused"),
+            getOrCreateRandom: () => Effect.die("unused"),
+          }),
+        ),
+      );
+      yield* store.set(new TextEncoder().encode(JSON.stringify({ ...saved, expiresAt: 0 })));
+      yield* destination.auth.access;
+      assert.strictEqual(
+        h.exchanges.filter((entry) => entry.get("grant_type") === "authorization_code").length,
+        1,
+      );
+      assert.strictEqual(
+        h.exchanges.filter((entry) => entry.get("grant_type") === "refresh_token").length,
+        1,
+      );
+    }),
+  ),
+);
+
+it.effect("transferred profiles reject mismatched identities without overwriting credentials", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      const profile = yield* h.auth.exportProfile;
+      const destination = yield* h.destination;
+      yield* destination.auth.controller.importProfile!(profile, Effect.void);
+      const original = Option.getOrThrow(yield* destination.auth.read);
+      for (const credentials of [
+        { ...profile.credentials, subject: "wrong-user" },
+        { ...profile.credentials, clientId: "oaiapp_wrong" },
+        { ...profile.credentials, idToken: "not-a-jwt" },
+        { ...profile.credentials, scopes: ["openid"] },
+        { ...profile.credentials, expiresAt: 0 },
+      ]) {
+        const result = yield* destination.auth.controller.importProfile!(
+          { ...profile, credentials },
+          Effect.void,
+        ).pipe(Effect.result);
+        assert.strictEqual(result._tag, "Failure");
+        assert.deepEqual(Option.getOrThrow(yield* destination.auth.read), original);
+      }
+    }),
+  ),
+);
+
+it.effect("primary handoff reuses the selected registration and ID token hint", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      const profile = yield* h.auth.controller.reconnectProfile!("chatgpt");
+      const waiting = yield* Deferred.make<{ authorizationUrl: string | null }>();
+      const resultFiber = yield* h.handoff(profile).pipe(
+        Stream.tap((state) =>
+          state.phase === "auth" && state.state.phase === "waiting"
+            ? Deferred.succeed(waiting, state.state)
+            : Effect.void,
+        ),
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+      const state = yield* Deferred.await(waiting);
+      const url = new URL(state.authorizationUrl!);
+      assert.strictEqual(url.searchParams.get("client_id"), profile!.clientId);
+      assert.strictEqual(url.searchParams.get("id_token_hint"), profile!.idTokenHint);
+      assert.strictEqual(url.searchParams.get("login_hint"), profile!.email);
+      assert.strictEqual(url.searchParams.get("ext_agent_host_id"), `urn:uuid:${h.environmentId}`);
+      yield* h.finishCallback(state);
+      const results = yield* Fiber.join(resultFiber);
+      assert.strictEqual(results.at(-1)?.phase, "finished");
+    }),
+  ),
+);
+
+it.effect(
+  "cancelling primary handoff closes its callback listener without saving credentials",
+  () =>
+    provision(
+      Effect.gen(function* () {
+        const h = yield* makeHarness;
+        const waiting = yield* Deferred.make<{ authorizationUrl: string | null }>();
+        const flow = yield* h.handoff(null).pipe(
+          Stream.tap((state) =>
+            state.phase === "auth" && state.state.phase === "waiting"
+              ? Deferred.succeed(waiting, state.state)
+              : Effect.void,
+          ),
+          Stream.runDrain,
+          Effect.forkChild,
+        );
+        const state = yield* Deferred.await(waiting);
+        yield* Fiber.interrupt(flow);
+        const callback = new URL(
+          new URL(state.authorizationUrl!).searchParams.get("redirect_uri")!,
+        );
+        const request = yield* Effect.tryPromise(() => fetch(callback)).pipe(Effect.result);
+        assert.strictEqual(request._tag, "Failure");
+        assert.isTrue(Option.isNone(yield* h.auth.read));
+      }),
+    ),
+);
+
+it.effect("records one anonymous auth outcome per success, failure, or cancellation", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      h.setInvalidNonce();
+      yield* h.signIn;
+      yield* h.phase("failed");
+      const { waiting } = yield* h.startRemote();
+      yield* h.auth.controller.cancel("owner", waiting.flowId!);
+      yield* h.phase("cancelled");
+      const completed = h.analyticsEvents.filter(({ event }) => event === "chatgpt.auth.completed");
+      assert.deepStrictEqual(
+        completed.map(({ properties }) => properties?.outcome),
+        ["succeeded", "failed", "cancelled"],
+      );
+      assert.strictEqual(
+        h.analyticsEvents.filter(({ event }) => event === "chatgpt.auth.started").length,
+        3,
+      );
+      assert.strictEqual(completed[1]?.properties?.failureStage, "verify");
+      for (const { properties } of completed) {
+        assert.isNumber(properties?.durationMs);
+        assert.strictEqual(properties?.flow, "direct");
+        assert.deepStrictEqual(
+          Object.keys(properties!).sort(),
+          [
+            ...(properties?.outcome === "succeeded"
+              ? [
+                  "accountCountScope",
+                  "connectedAccountCount",
+                  "connectedConnectionCount",
+                  "savedConnectionCount",
+                  "unidentifiedConnectedConnectionCount",
+                ]
+              : []),
+            "callbackMode",
+            "durationMs",
+            ...(properties?.failureStage ? ["failureStage"] : []),
+            "flow",
+            "intent",
+            "outcome",
+          ].sort(),
+        );
+      }
+      const serialized = JSON.stringify(h.analyticsEvents);
+      for (const secret of [
+        "hidden@example.test",
+        "oaiapp_test",
+        "user-test",
+        "access_token",
+        "refresh_token",
+      ]) {
+        assert.notInclude(serialized, secret);
+      }
+    }),
+  ),
+);
+
+it.effect("telemetry failures do not fail a verified ChatGPT sign-in", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarnessFor(instanceId, new Map(), true);
+      yield* h.signIn;
+      const state = yield* h.phase("succeeded");
+      assert.strictEqual(state.phase, "succeeded");
+      assert.isTrue(Option.isSome(yield* h.auth.read));
+    }),
+  ),
+);
+
+it.effect("counts accounts separately from saved connections across additions and reconnects", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      h.setCallbackClientId("oaiapp_same_account");
+      h.setIdentity("another-client-subject", "HIDDEN@example.test");
+      yield* h.changeAccount;
+      yield* h.phase("succeeded");
+      h.setCallbackClientId("oaiapp_other_account");
+      h.setIdentity("other-user", "other@example.test");
+      yield* h.changeAccount;
+      yield* h.phase("succeeded");
+      yield* h.auth.controller.logout(Effect.void);
+      h.setCallbackClientId("oaiapp_test");
+      h.setIdentity("user-test", "hidden@example.test");
+      yield* h.reconnectProfile("oaiapp_test");
+      yield* h.phase("succeeded");
+      const completed = h.analyticsEvents.filter(({ event }) => event === "chatgpt.auth.completed");
+      assert.deepStrictEqual(
+        completed.map(({ properties }) => [
+          properties?.connectedAccountCount,
+          properties?.connectedConnectionCount,
+          properties?.savedConnectionCount,
+        ]),
+        [
+          [1, 1, 1],
+          [1, 1, 1],
+          [1, 2, 2],
+          [2, 3, 3],
+          [1, 2, 3],
+        ],
+      );
+      assert.isTrue(
+        completed.every(({ properties }) => properties?.unidentifiedConnectedConnectionCount === 0),
+      );
+      assert.notInclude(JSON.stringify(h.analyticsEvents), "example.test");
+    }),
+  ),
+);
+
+it.effect("includes accounts from other Codex instances in the environment", () =>
+  provision(
+    Effect.gen(function* () {
+      const bytes = new Map<string, Uint8Array>();
+      const personal = yield* makeHarnessFor(instanceId, bytes);
+      const work = yield* makeHarnessFor(ProviderInstanceId.make("managed-work"), bytes);
+      yield* personal.signIn;
+      yield* personal.phase("succeeded");
+      work.setCallbackClientId("oaiapp_work");
+      work.setIdentity("work-user", "work@example.test");
+      yield* work.signIn;
+      yield* work.phase("succeeded");
+      const completed = work.analyticsEvents.find(
+        ({ event }) => event === "chatgpt.auth.completed",
+      );
+      assert.strictEqual(completed?.properties?.accountCountScope, "environment");
+      assert.strictEqual(completed?.properties?.connectedAccountCount, 2);
+      assert.strictEqual(completed?.properties?.connectedConnectionCount, 2);
+      assert.strictEqual(completed?.properties?.savedConnectionCount, 2);
+    }).pipe(
+      Effect.provide(
+        settingsLayerTest({
+          providerInstances: {
+            [instanceId]: { driver: "codex", enabled: true },
+            [ProviderInstanceId.make("managed-work")]: { driver: "codex", enabled: true },
+          },
+        }),
+      ),
+    ),
+  ),
+);
+
+it.effect("an unreadable unrelated profile omits counts without failing sign-in", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      const unrelated = yield* ProviderCredentialStore.make("codex-chatgpt", "codex").pipe(
+        Effect.provideService(ServerSecretStore, h.secrets),
+      );
+      // The harness owns its store; seed the corresponding binding in that store.
+      h.bytes.set(unrelated.binding.key, new TextEncoder().encode("invalid"));
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      const completed = h.analyticsEvents.find(({ event }) => event === "chatgpt.auth.completed");
+      assert.strictEqual(completed?.properties?.outcome, "succeeded");
+      assert.notProperty(completed?.properties ?? {}, "connectedAccountCount");
+    }).pipe(Effect.provide(settingsLayerTest())),
+  ),
+);
+
+it.effect("reports connections without an email separately from identifiable accounts", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.signIn;
+      yield* h.phase("succeeded");
+      const store = yield* ProviderCredentialStore.make("codex-chatgpt", instanceId).pipe(
+        Effect.provideService(ServerSecretStore, h.secrets),
+      );
+      yield* store.set(
+        new TextEncoder().encode(
+          JSON.stringify({
+            activeClientId: "oaiapp_test",
+            sessions: [{ ...Option.getOrThrow(yield* h.auth.read), email: null }],
+          }),
+        ),
+      );
+      h.setCallbackClientId("oaiapp_other_account");
+      h.setIdentity("other-user", "other@example.test");
+      yield* h.changeAccount;
+      yield* h.phase("succeeded");
+      const completed = h.analyticsEvents.findLast(
+        ({ event }) => event === "chatgpt.auth.completed",
+      );
+      assert.strictEqual(completed?.properties?.connectedAccountCount, 1);
+      assert.strictEqual(completed?.properties?.connectedConnectionCount, 2);
+      assert.strictEqual(completed?.properties?.unidentifiedConnectedConnectionCount, 1);
+    }),
+  ),
+);
+
+it.effect("records an expired auth outcome when sign-in reaches its deadline", () =>
+  provision(
+    Effect.gen(function* () {
+      const h = yield* makeHarness;
+      yield* h.startRemote();
+      yield* TestClock.adjust(300_001);
+      assert.include((yield* h.phase("failed")).message ?? "", "expired");
+      const completed = h.analyticsEvents.filter(({ event }) => event === "chatgpt.auth.completed");
+      assert.strictEqual(completed.length, 1);
+      assert.strictEqual(completed[0]?.properties?.outcome, "expired");
+      assert.isAtLeast(completed[0]?.properties?.durationMs as number, 300_000);
+    }),
+  ),
+);
diff --git a/apps/server/src/provider/CodexChatGptAuth.ts b/apps/server/src/provider/CodexChatGptAuth.ts
new file mode 100644
index 000000000000..365025dbb09c
--- /dev/null
+++ b/apps/server/src/provider/CodexChatGptAuth.ts
@@ -0,0 +1,985 @@
+// @effect-diagnostics nodeBuiltinImport:off - OAuth loopback listener and PKCE use Node APIs.
+import * as NodeCrypto from "node:crypto";
+import * as NodeHttp from "node:http";
+import { createRemoteJWKSet, jwtVerify } from "jose";
+import {
+  ProviderSetupError,
+  type ChatGptReconnectProfile,
+  type ChatGptTransferredProfile,
+  type ProviderInstanceId,
+} from "@t3tools/contracts";
+import { codexCallbackUrl } from "@t3tools/shared/codexAuthHandoff";
+import * as Clock from "effect/Clock";
+import * as Cause from "effect/Cause";
+import { AnalyticsService } from "../telemetry/AnalyticsService.ts";
+import * as Exit from "effect/Exit";
+import { codexAuthCallbackPage, codexAuthReturnUrl } from "./CodexAuthCallbackPage.ts";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Semaphore from "effect/Semaphore";
+import * as ProviderAuthFlow from "./ProviderAuthFlow.ts";
+import type { ProviderAuthFlowContext } from "./ProviderAuthFlow.ts";
+import { HttpClient, HttpClientRequest } from "effect/unstable/http";
+import * as ProviderCredentialStore from "./ProviderCredentialStore.ts";
+import { withChatGptSessionLock } from "./CodexChatGptSessionLock.ts";
+import { ServerSecretStore } from "../auth/ServerSecretStore.ts";
+import { ServerSettingsService } from "../serverSettings.ts";
+import { ServerEnvironmentIdentity } from "../environment/ServerEnvironment.ts";
+
+const isSetupError = Schema.is(ProviderSetupError);
+const RESOURCE = "https://api.openai.com/v1";
+const REQUIRED_SCOPE = "chatgpt.tokens.use.direct";
+const DISCOVERY = "https://auth.openai.com/.well-known/openid-configuration";
+const TokenResponse = Schema.Struct({
+  access_token: Schema.NonEmptyString,
+  refresh_token: Schema.optionalKey(Schema.NonEmptyString),
+  id_token: Schema.optionalKey(Schema.String),
+  token_type: Schema.String,
+  expires_in: Schema.Int.check(Schema.isGreaterThan(0)),
+  scope: Schema.String,
+  earliest_refresh_at: Schema.optionalKey(Schema.Union([Schema.Finite, Schema.String])),
+});
+const Record = Schema.Struct({
+  clientId: Schema.String,
+  accessToken: Schema.String,
+  refreshToken: Schema.NullOr(Schema.String),
+  expiresAt: Schema.Finite,
+  earliestRefreshAt: Schema.NullOr(Schema.Finite),
+  scopes: Schema.Array(Schema.String),
+  subject: Schema.String,
+  email: Schema.NullOr(Schema.String),
+  idToken: Schema.optionalKey(Schema.String),
+  issuer: Schema.optionalKey(Schema.String),
+});
+export type CodexChatGptCredentials = typeof Record.Type;
+const Sessions = Schema.Struct({
+  activeClientId: Schema.NullOr(Schema.String),
+  sessions: Schema.Array(Record),
+});
+const sessionLocks = new WeakMap<
+  typeof ServerSecretStore.Service,
+  Map<string, Semaphore.Semaphore>
+>();
+const Registration = Schema.Struct({
+  clientId: Schema.String.check(Schema.isPattern(/^oaiapp_/u)),
+  subject: Schema.optionalKey(Schema.String),
+  connectionLabel: Schema.optionalKey(Schema.String),
+  sharingEnabled: Schema.optionalKey(Schema.Boolean),
+  email: Schema.optionalKey(Schema.NullOr(Schema.String)),
+  redirectUri: Schema.optionalKey(
+    Schema.String.check(
+      Schema.isPattern(/^http:\/\/(?:127\.0\.0\.1|localhost):[1-9]\d{0,4}\/auth\/callback$/u),
+    ),
+  ),
+});
+const RegistrationProfiles = Schema.Struct({
+  profiles: Schema.Array(Registration),
+  lastClientId: Schema.NullOr(Schema.String),
+});
+const decodeRegistration = Schema.decodeUnknownEffect(
+  Schema.fromJsonString(Schema.Union([RegistrationProfiles, Registration])),
+);
+const encodeRegistration = Schema.encodeEffect(Schema.fromJsonString(RegistrationProfiles));
+const profileMethodId = (clientId: string) => `chatgpt-profile:${clientId}`;
+const Discovery = Schema.Struct({
+  issuer: Schema.String,
+  authorization_endpoint: Schema.String,
+  token_endpoint: Schema.String,
+  jwks_uri: Schema.String,
+  revocation_endpoint: Schema.optionalKey(Schema.String),
+});
+const OAuthError = Schema.Struct({ error: Schema.String });
+const decodeSessions = Schema.decodeUnknownEffect(
+  Schema.fromJsonString(Schema.Union([Sessions, Record])),
+);
+const encodeSessions = Schema.encodeEffect(Schema.fromJsonString(Sessions));
+const decodeTokens = Schema.decodeUnknownSync(TokenResponse);
+const decodeDiscoveryEffect = Schema.decodeUnknownEffect(Discovery);
+const decodeOAuthError = Schema.decodeUnknownSync(OAuthError);
+
+export const makeCodexChatGptAuth = Effect.fn("makeCodexChatGptAuth")(function* (options: {
+  readonly instanceId: ProviderInstanceId;
+  readonly discoveryUrl?: string;
+  readonly resource?: string;
+  readonly defaultReturnUrl?: string;
+  readonly reconnectProfile?: ChatGptReconnectProfile | null;
+  readonly telemetryFlow?: "direct" | "primary_handoff";
+}) {
+  const analytics = yield* Effect.serviceOption(AnalyticsService);
+  const settings = yield* Effect.serviceOption(ServerSettingsService);
+  const track = <A, E extends ProviderSetupError, R>(
+    event: "auth" | "transfer",
+    properties: Readonly<Record<string, string>>,
+    task: Effect.Effect<A, E, R>,
+    expiresAt?: number,
+  ) =>
+    Effect.gen(function* () {
+      if (Option.isNone(analytics)) return yield* task;
+      const record = (name: string, properties: Readonly<Record<string, unknown>>) =>
+        analytics.value.record(name, properties).pipe(Effect.ignoreCause);
+      const startedAt = yield* Clock.currentTimeMillis;
+      yield* record(`chatgpt.${event}.started`, properties);
+      return yield* task.pipe(
+        Effect.onExit((result) =>
+          Effect.gen(function* () {
+            const endedAt = yield* Clock.currentTimeMillis;
+            const error = Exit.isFailure(result)
+              ? Cause.findErrorOption(result.cause)
+              : Option.none();
+            const counts =
+              Exit.isSuccess(result) &&
+              (event === "transfer" || options.telemetryFlow !== "primary_handoff")
+                ? yield* accountCounts.pipe(Effect.catchCause(() => Effect.succeed({})))
+                : {};
+            yield* record(`chatgpt.${event}.completed`, {
+              ...counts,
+              ...properties,
+              outcome: Exit.isSuccess(result)
+                ? "succeeded"
+                : Cause.hasInterruptsOnly(result.cause)
+                  ? expiresAt !== undefined && endedAt >= expiresAt
+                    ? "expired"
+                    : "cancelled"
+                  : "failed",
+              durationMs: Math.max(0, endedAt - startedAt),
+              ...(Option.isSome(error) && isSetupError(error.value)
+                ? { failureStage: error.value.operation }
+                : {}),
+            });
+          }),
+        ),
+      );
+    });
+  const http = yield* HttpClient.HttpClient;
+  const store = yield* ProviderCredentialStore.make("codex-chatgpt", options.instanceId);
+  const registrationStore = yield* ProviderCredentialStore.make(
+    "codex-chatgpt-registration",
+    options.instanceId,
+  );
+  const secrets = yield* ServerSecretStore;
+  const environmentLocks = sessionLocks.get(secrets) ?? new Map<string, Semaphore.Semaphore>();
+  sessionLocks.set(secrets, environmentLocks);
+  const lock = environmentLocks.get(store.binding.key) ?? (yield* Semaphore.make(1));
+  environmentLocks.set(store.binding.key, lock);
+  const withSessionLock = <A, E, R>(task: Effect.Effect<A, E, R>) =>
+    withChatGptSessionLock(secrets.directory, store.binding.key, options.instanceId, task);
+  const environment = yield* ServerEnvironmentIdentity;
+  const hostId = `urn:uuid:${yield* environment.getEnvironmentId}`;
+  const resource = options.resource ?? RESOURCE;
+  const failure = (operation: string, detail: string) =>
+    new ProviderSetupError({ instanceId: options.instanceId, operation, detail });
+  let metadata: typeof Discovery.Type | undefined;
+  let jwks: ReturnType<typeof createRemoteJWKSet> | undefined;
+  const discover = Effect.gen(function* () {
+    if (metadata) return metadata;
+    const result = yield* http.get(options.discoveryUrl ?? DISCOVERY).pipe(
+      Effect.flatMap((response) =>
+        Effect.gen(function* () {
+          if (response.status < 200 || response.status >= 300)
+            return yield* failure("discover", "Could not reach ChatGPT sign-in. Try again.");
+          return yield* response.json;
+        }),
+      ),
+      Effect.flatMap(decodeDiscoveryEffect),
+      Effect.mapError(() => failure("discover", "Could not reach ChatGPT sign-in. Try again.")),
+    );
+    if (
+      !options.discoveryUrl &&
+      (result.issuer !== "https://auth.openai.com" ||
+        [
+          result.authorization_endpoint,
+          result.token_endpoint,
+          result.jwks_uri,
+          ...(result.revocation_endpoint ? [result.revocation_endpoint] : []),
+        ].some((url) => new URL(url).origin !== result.issuer))
+    )
+      return yield* failure("discover", "ChatGPT sign-in configuration could not be verified.");
+    metadata = result;
+    jwks = createRemoteJWKSet(new URL(result.jwks_uri));
+    return result;
+  });
+  const readSessions = store.get.pipe(
+    Effect.mapError(() => failure("read", "Could not read the saved ChatGPT connection.")),
+    Effect.flatMap((bytes) =>
+      Option.isNone(bytes)
+        ? Effect.succeed<typeof Sessions.Type>({ activeClientId: null, sessions: [] })
+        : decodeSessions(new TextDecoder().decode(bytes.value)).pipe(
+            Effect.map((saved) =>
+              "sessions" in saved ? saved : { activeClientId: saved.clientId, sessions: [saved] },
+            ),
+            Effect.mapError(() =>
+              failure("read", "The saved ChatGPT connection is invalid. Sign in again."),
+            ),
+          ),
+    ),
+  );
+  const read = readSessions.pipe(
+    Effect.map((saved) =>
+      Option.fromUndefinedOr(
+        saved.sessions.find((session) => session.clientId === saved.activeClientId),
+      ),
+    ),
+  );
+  const writeSessions = (saved: typeof Sessions.Type) =>
+    encodeSessions(saved).pipe(
+      Effect.flatMap((json) => store.set(new TextEncoder().encode(json))),
+      Effect.mapError(() => failure("save", "Could not save the ChatGPT connection.")),
+    );
+  // Registration profiles outlive tokens, but belong only to this environment/instance.
+  // Accept the original single-registration record until it is next saved.
+  const readRegistrations = registrationStore.get.pipe(
+    Effect.mapError(() =>
+      failure("registration", "Could not read the ChatGPT sign-in registration. Try again."),
+    ),
+    Effect.flatMap((bytes) =>
+      Option.isNone(bytes)
+        ? Effect.succeed<typeof RegistrationProfiles.Type>({ profiles: [], lastClientId: null })
+        : decodeRegistration(new TextDecoder().decode(bytes.value)).pipe(
+            Effect.map((record) => {
+              const saved =
+                "profiles" in record
+                  ? record
+                  : { profiles: [record], lastClientId: record.clientId };
+              const last = saved.profiles.find(
+                (profile) => profile.clientId === saved.lastClientId,
+              );
+              const ordered = last
+                ? [last, ...saved.profiles.filter((profile) => profile.clientId !== last.clientId)]
+                : saved.profiles;
+              return {
+                ...saved,
+                profiles: ordered.map((profile) => ({
+                  ...profile,
+                  connectionLabel:
+                    profile.connectionLabel ?? `Connection ${saved.profiles.indexOf(profile) + 1}`,
+                })),
+              };
+            }),
+            Effect.mapError(() =>
+              failure("registration", "The saved ChatGPT sign-in registration is invalid."),
+            ),
+          ),
+    ),
+  );
+  const accountCounts = Effect.gen(function* () {
+    const instanceIds = new Set<string>([options.instanceId]);
+    if (Option.isSome(settings)) {
+      const current = yield* settings.value.getSettings;
+      // Include the legacy default instance as well as explicitly configured ones.
+      instanceIds.add("codex");
+      for (const [id, instance] of Object.entries(current.providerInstances)) {
+        if (instance.driver === "codex") instanceIds.add(id);
+      }
+    }
+    const accounts = new Set<string>();
+    const connections = new Set<string>();
+    const savedConnections = new Set<string>();
+    let unidentifiedConnectedConnectionCount = 0;
+    for (const id of instanceIds) {
+      const registrations = yield* ProviderCredentialStore.make("codex-chatgpt-registration", id);
+      const registrationBytes = yield* registrations.get;
+      if (Option.isSome(registrationBytes)) {
+        const saved = yield* decodeRegistration(new TextDecoder().decode(registrationBytes.value));
+        for (const profile of "profiles" in saved ? saved.profiles : [saved]) {
+          savedConnections.add(profile.clientId);
+        }
+      }
+      const credentials = yield* ProviderCredentialStore.make("codex-chatgpt", id);
+      const credentialBytes = yield* credentials.get;
+      if (Option.isNone(credentialBytes)) continue;
+      const saved = yield* decodeSessions(new TextDecoder().decode(credentialBytes.value));
+      for (const session of "sessions" in saved ? saved.sessions : [saved]) {
+        if (!session.scopes.includes(REQUIRED_SCOPE) || connections.has(session.clientId)) continue;
+        connections.add(session.clientId);
+        // Subjects are client-scoped. Use verified email only for counting locally,
+        // never export it or merge the underlying profiles.
+        const email = session.email?.trim().toLowerCase();
+        if (email) accounts.add(email);
+        else unidentifiedConnectedConnectionCount++;
+      }
+    }
+    return {
+      accountCountScope: Option.isSome(settings) ? "environment" : "provider_instance",
+      connectedAccountCount: accounts.size,
+      connectedConnectionCount: connections.size,
+      savedConnectionCount: savedConnections.size,
+      unidentifiedConnectedConnectionCount,
+    };
+  }).pipe(Effect.provideService(ServerSecretStore, secrets));
+  const saveRegistration = Effect.fnUntraced(function* (profile: typeof Registration.Type) {
+    const saved = yield* readRegistrations;
+    profile = {
+      ...profile,
+      connectionLabel:
+        saved.profiles.find((entry) => entry.clientId === profile.clientId)?.connectionLabel ??
+        profile.connectionLabel ??
+        `Connection ${saved.profiles.length + 1}`,
+    };
+    yield* encodeRegistration({
+      profiles: [profile, ...saved.profiles.filter((entry) => entry.clientId !== profile.clientId)],
+      lastClientId: profile.clientId,
+    }).pipe(
+      Effect.flatMap((json) => registrationStore.set(new TextEncoder().encode(json))),
+      Effect.mapError(() =>
+        failure("registration", "Could not save the ChatGPT sign-in registration. Try again."),
+      ),
+    );
+  });
+  // The active pointer and all profile token sets change in one protected atomic write.
+  const save = Effect.fnUntraced(function* (record: CodexChatGptCredentials, activate = true) {
+    const saved = yield* readSessions;
+    yield* writeSessions({
+      activeClientId: activate ? record.clientId : saved.activeClientId,
+      sessions: [
+        ...saved.sessions.filter((session) => session.clientId !== record.clientId),
+        record,
+      ],
+    });
+  });
+  const clearTokens = Effect.gen(function* () {
+    const saved = yield* readSessions;
+    const sessions = saved.sessions.filter((session) => session.clientId !== saved.activeClientId);
+    if (sessions.length) yield* writeSessions({ activeClientId: null, sessions });
+    else
+      yield* store.remove.pipe(
+        Effect.mapError(() =>
+          failure("disconnect", "Could not clear the ChatGPT connection. Try again."),
+        ),
+      );
+  });
+  const remove = Effect.gen(function* () {
+    // Promote legacy identity into the retained profile before deleting credentials.
+    const credentials = yield* read;
+    if (Option.isSome(credentials)) {
+      const { clientId, subject, email } = credentials.value;
+      const saved = yield* readRegistrations;
+      const profile = saved.profiles.find((entry) => entry.clientId === clientId);
+      if (profile && (profile.subject === undefined || profile.email === undefined))
+        yield* saveRegistration({ ...profile, subject, email });
+    }
+    yield* clearTokens;
+  });
+  const exchange = Effect.fn("CodexChatGptAuth.exchange")(function* (body: URLSearchParams) {
+    const endpoints = yield* discover;
+    const response = yield* http
+      .execute(
+        HttpClientRequest.post(endpoints.token_endpoint).pipe(
+          HttpClientRequest.setHeader("accept", "application/json"),
+          HttpClientRequest.bodyText(body.toString(), "application/x-www-form-urlencoded"),
+        ),
+      )
+      .pipe(
+        Effect.flatMap((result) =>
+          result.json.pipe(
+            Effect.map((raw) => ({
+              ok: result.status >= 200 && result.status < 300,
+              status: result.status,
+              raw,
+            })),
+          ),
+        ),
+        Effect.mapError(() =>
+          failure("exchange", "ChatGPT sign-in is temporarily unavailable. Try again."),
+        ),
+      );
+    if (!response.ok) {
+      const error = yield* Effect.try({
+        try: () => decodeOAuthError(response.raw).error,
+        catch: () => failure("exchange", "ChatGPT did not accept this sign-in. Try again."),
+      });
+      if (
+        body.get("grant_type") === "refresh_token" &&
+        [
+          "invalid_grant",
+          "invalid_refresh_token",
+          "token_expired",
+          "refresh_token_expired",
+          "refresh_token_invalidated",
+          "refresh_token_reused",
+        ].includes(error)
+      ) {
+        yield* remove;
+        return yield* failure(
+          "refresh",
+          "Your ChatGPT connection expired or was disconnected. Sign in again.",
+        );
+      }
+      if (error === "invalid_client")
+        return yield* failure(
+          "client",
+          "OpenAI rejected this app's client registration. Check the ChatGPT connection configuration.",
+        );
+      if (body.get("grant_type") === "authorization_code" && error === "invalid_grant")
+        return yield* failure("code-expired", "This sign-in code expired. Start again.");
+      return yield* failure(
+        "exchange",
+        error === "access_denied"
+          ? "ChatGPT sign-in was declined. Sign in again when you are ready."
+          : "ChatGPT could not complete sign-in. Try again.",
+      );
+    }
+    return yield* Effect.try({
+      try: () => decodeTokens(response.raw),
+      catch: () =>
+        failure("exchange", "ChatGPT returned an invalid token response. Sign in again."),
+    });
+  });
+  const earliest = (value: (typeof TokenResponse.Type)["earliest_refresh_at"]) => {
+    if (value === undefined) return null;
+    const time = typeof value === "number" ? value * 1000 : Date.parse(value);
+    return Number.isFinite(time) ? time : null;
+  };
+  const authenticate = Effect.fn("CodexChatGptAuth.authenticate")(function* (
+    method: string,
+    context: ProviderAuthFlowContext,
+  ) {
+    const endpoints = yield* discover;
+    const existing = yield* read;
+    const previous = Option.getOrUndefined(existing);
+    const registrations = yield* readRegistrations;
+    const changingAccount = method === "chatgpt-change-account";
+    const selectedClientId = method.startsWith("chatgpt-profile:")
+      ? method.slice("chatgpt-profile:".length)
+      : (previous?.clientId ?? registrations.lastClientId);
+    const savedRegistration = changingAccount
+      ? undefined
+      : registrations.profiles.find((profile) => profile.clientId === selectedClientId);
+    // Older development registrations used localhost, which cannot be changed on reauth.
+    // Register a 127.0.0.1 connection instead, preserving the verified account.
+    const legacyCallback = savedRegistration?.redirectUri?.includes("//localhost:") === true;
+    const registeredClientId = legacyCallback ? undefined : savedRegistration?.clientId;
+    const selectedTokens = (yield* readSessions).sessions.find(
+      (session) => session.clientId === selectedClientId,
+    );
+    const state = NodeCrypto.randomBytes(32).toString("base64url");
+    const nonce = NodeCrypto.randomBytes(32).toString("base64url");
+    const verifier = NodeCrypto.randomBytes(64).toString("base64url");
+    const returnUrl =
+      codexAuthReturnUrl(context.returnUrl) ?? codexAuthReturnUrl(options.defaultReturnUrl);
+    const pageNonce = NodeCrypto.randomBytes(24).toString("base64url");
+    const callback = Promise.withResolvers<{ url: URL; response?: NodeHttp.ServerResponse }>();
+    const clientCallback = context.callbackMode === "client";
+    let used = false;
+    const server = clientCallback
+      ? undefined
+      : yield* Effect.acquireRelease(
+          Effect.tryPromise({
+            try: () =>
+              new Promise<NodeHttp.Server>((resolve, reject) => {
+                const server = NodeHttp.createServer((request, response) => {
+                  const url = new URL(request.url ?? "/", "http://127.0.0.1");
+                  if (request.method !== "GET" || url.pathname !== "/auth/callback") {
+                    response.writeHead(404).end();
+                    return;
+                  }
+                  if (used) {
+                    response.writeHead(410).end("Sign-in is no longer active.");
+                    return;
+                  }
+                  used = true;
+                  callback.resolve({ url, response });
+                });
+                server.once("error", reject);
+                server.listen(0, "127.0.0.1", () => resolve(server));
+              }),
+            catch: () =>
+              failure("callback", "Could not start the local sign-in callback. Try again."),
+          }),
+          (server) =>
+            Effect.promise(
+              () =>
+                new Promise<void>((resolve) => {
+                  server.closeAllConnections();
+                  server.close(() => resolve());
+                }),
+            ),
+        );
+    const address = server?.address();
+    if (!clientCallback && (!address || typeof address === "string"))
+      return yield* failure("callback", "Could not start the local sign-in callback.");
+    // Only the port may vary between attempts; token exchange uses this exact URI.
+    const port =
+      address && typeof address !== "string" ? address.port : NodeCrypto.randomInt(49_152, 65_536);
+    const redirectUri = `http://127.0.0.1:${port}/auth/callback`;
+    const idTokenHint = selectedTokens?.idToken ?? options.reconnectProfile?.idTokenHint;
+    const url = new URL(endpoints.authorization_endpoint);
+    url.search = new URLSearchParams({
+      client_id: registeredClientId ?? "dynamic_agent_client",
+      ...(registeredClientId
+        ? {
+            ...(savedRegistration?.email ? { login_hint: savedRegistration.email } : {}),
+            ...(idTokenHint ? { id_token_hint: idTokenHint } : {}),
+            ...(savedRegistration?.sharingEnabled === false ||
+            (selectedTokens && !selectedTokens.scopes.includes(REQUIRED_SCOPE))
+              ? { prompt: "consent" }
+              : {}),
+          }
+        : { agent_name_hint: "T3 Code" }),
+      ext_agent_host_id: hostId,
+      response_type: "code",
+      redirect_uri: redirectUri,
+      scope: "openid profile email offline_access resource.invoke chatgpt.tokens.use.direct",
+      resource,
+      state,
+      nonce,
+      code_challenge_method: "S256",
+      code_challenge: NodeCrypto.createHash("sha256").update(verifier).digest("base64url"),
+    }).toString();
+    yield* context.setInteraction(
+      {
+        type: "browser",
+        id: context.flowId,
+        url: url.toString(),
+        requiresConsent: false,
+        acceptsCallback: true,
+      },
+      undefined,
+      (callbackUrl) =>
+        Effect.try({
+          try: () => {
+            const returned = codexCallbackUrl(callbackUrl, redirectUri, state);
+            if (used) throw new Error("used");
+            used = true;
+            callback.resolve({ url: returned });
+          },
+          catch: () =>
+            failure("complete", "This redirect URL does not belong to the active ChatGPT sign-in."),
+        }),
+    );
+    const received = yield* Effect.tryPromise({
+      try: () => callback.promise,
+      catch: () => failure("callback", "ChatGPT sign-in could not be completed."),
+    });
+    const returned = received.url;
+    yield* Effect.gen(function* () {
+      if (returned.searchParams.get("state") !== state)
+        return yield* failure("callback", "ChatGPT sign-in could not be verified. Start again.");
+      if (returned.searchParams.has("error"))
+        return yield* failure(
+          "callback",
+          returned.searchParams.get("error") === "access_denied"
+            ? "ChatGPT sign-in was declined. Sign in again when you are ready."
+            : "ChatGPT sign-in could not be completed. Start again.",
+        );
+      const code = returned.searchParams.get("code");
+      const clientId = registeredClientId ?? returned.searchParams.get("client_id");
+      if (
+        !code ||
+        !clientId ||
+        !clientId.startsWith("oaiapp_") ||
+        (registeredClientId &&
+          returned.searchParams.has("client_id") &&
+          returned.searchParams.get("client_id") !== registeredClientId)
+      )
+        return yield* failure(
+          "callback",
+          "ChatGPT registration is incomplete. Start sign-in again.",
+        );
+      yield* context.verifying;
+      const tokens = yield* exchange(
+        new URLSearchParams({
+          grant_type: "authorization_code",
+          client_id: clientId,
+          code,
+          code_verifier: verifier,
+          redirect_uri: redirectUri,
+          resource,
+        }),
+      ).pipe(
+        Effect.catch((error) =>
+          Effect.gen(function* () {
+            if (error.operation === "code-expired") {
+              if (!registeredClientId)
+                yield* withSessionLock(saveRegistration({ clientId, redirectUri }));
+              return yield* failure(
+                "exchange",
+                "This sign-in code expired. Reconnect the saved ChatGPT profile to start a fresh sign-in.",
+              );
+            }
+            return yield* error;
+          }),
+        ),
+      );
+      if (!tokens.id_token)
+        return yield* failure(
+          "verify",
+          "ChatGPT did not return a verified identity. Sign in again.",
+        );
+      const identity = yield* Effect.tryPromise({
+        try: async () => {
+          const { payload } = await jwtVerify(tokens.id_token!, jwks!, {
+            issuer: endpoints.issuer,
+            audience: clientId,
+            algorithms: ["RS256", "ES256"],
+            clockTolerance: 5,
+          });
+          if (payload.nonce !== nonce || !payload.sub || !payload.exp) throw new Error("identity");
+          return {
+            subject: payload.sub,
+            email: typeof payload.email === "string" ? payload.email : null,
+          };
+        },
+        catch: () => failure("verify", "ChatGPT sign-in could not be verified. Start again."),
+      });
+      const expectedSubject =
+        savedRegistration?.subject ??
+        (previous?.clientId === registeredClientId ? previous?.subject : undefined);
+      // Subjects are checked within the same registration. Legacy callback migration
+      // registers a new client, whose subject cannot be compared with the old client.
+      if (registeredClientId && expectedSubject && identity.subject !== expectedSubject)
+        return yield* failure(
+          "verify",
+          "This sign-in returned a different ChatGPT account. Use the different-account sign-in option instead. Your saved connection is unchanged.",
+        );
+      const knownProfile = registrations.profiles.find((profile) => profile.clientId === clientId);
+      if (
+        knownProfile &&
+        ((knownProfile.redirectUri &&
+          (() => {
+            const original = new URL(knownProfile.redirectUri);
+            const current = new URL(redirectUri);
+            return (
+              original.protocol !== current.protocol ||
+              original.hostname !== current.hostname ||
+              original.pathname !== current.pathname
+            );
+          })()) ||
+          (knownProfile.subject && knownProfile.subject !== identity.subject))
+      )
+        return yield* failure(
+          "verify",
+          "ChatGPT returned a conflicting account registration. Start again.",
+        );
+      if (tokens.token_type.toLowerCase() !== "bearer")
+        return yield* failure(
+          "verify",
+          "ChatGPT returned an unsupported connection. Sign in again.",
+        );
+      const scopes = tokens.scope.split(/\s+/).filter(Boolean);
+      yield* withSessionLock(
+        Effect.gen(function* () {
+          yield* saveRegistration({
+            clientId,
+            redirectUri,
+            sharingEnabled: scopes.includes(REQUIRED_SCOPE),
+            ...identity,
+          });
+          yield* save(
+            {
+              clientId,
+              accessToken: tokens.access_token,
+              idToken: tokens.id_token!,
+              issuer: endpoints.issuer,
+              refreshToken: tokens.refresh_token ?? null,
+              expiresAt: (yield* Clock.currentTimeMillis) + tokens.expires_in * 1000,
+              earliestRefreshAt: earliest(tokens.earliest_refresh_at),
+              scopes,
+              ...identity,
+            },
+            scopes.includes(REQUIRED_SCOPE) || Option.isNone(yield* read),
+          );
+        }),
+      );
+      if (!scopes.includes(REQUIRED_SCOPE))
+        return yield* failure(
+          "sharing",
+          previous && previous.clientId !== clientId
+            ? "Token sharing was not enabled for the new account. Your existing ChatGPT connection is unchanged."
+            : "Signed in with ChatGPT, but token sharing is disabled. Sign in again and enable token sharing, or use another provider.",
+        );
+    }).pipe(
+      Effect.onExit((result) =>
+        Effect.promise(
+          () =>
+            new Promise<void>((resolve) => {
+              const response = received.response;
+              if (!response || response.destroyed) {
+                resolve();
+                return;
+              }
+              response.once("close", resolve);
+              response
+                .writeHead(200, {
+                  "content-type": "text/html; charset=utf-8",
+                  "cache-control": "no-store",
+                  "referrer-policy": "no-referrer",
+                  "content-security-policy": `default-src 'none'; style-src 'unsafe-inline'; script-src 'nonce-${pageNonce}'; base-uri 'none'; frame-ancestors 'none'`,
+                  "x-content-type-options": "nosniff",
+                })
+                .end(codexAuthCallbackPage(Exit.isSuccess(result), returnUrl, pageNonce), resolve);
+            }),
+        ),
+      ),
+    );
+  });
+  const access = lock.withPermit(
+    withSessionLock(
+      Effect.uninterruptible(
+        Effect.gen(function* () {
+          const saved = yield* read;
+          if (Option.isNone(saved))
+            return yield* failure("access", "Sign in with ChatGPT to use managed Codex.");
+          let record = saved.value;
+          if (!record.scopes.includes(REQUIRED_SCOPE))
+            return yield* failure(
+              "sharing",
+              "Token sharing is disabled. Sign in with ChatGPT and enable token sharing.",
+            );
+          const now = yield* Clock.currentTimeMillis;
+          if (record.expiresAt - now > 60_000) return record;
+          if (record.earliestRefreshAt !== null && record.earliestRefreshAt > now) {
+            if (record.expiresAt > now) return record;
+            return yield* failure(
+              "refresh",
+              "ChatGPT cannot renew this connection yet. Try again shortly.",
+            );
+          }
+          if (!record.refreshToken) {
+            yield* remove;
+            return yield* failure("refresh", "Your ChatGPT connection expired. Sign in again.");
+          }
+          const tokens = yield* exchange(
+            new URLSearchParams({
+              grant_type: "refresh_token",
+              client_id: record.clientId,
+              refresh_token: record.refreshToken,
+              resource,
+            }),
+          ).pipe(
+            Effect.interruptible,
+            Effect.timeout("20 seconds"),
+            Effect.mapError((error) =>
+              error._tag === "ProviderSetupError" && error.operation === "client"
+                ? error
+                : failure(
+                    "refresh",
+                    "Could not renew the ChatGPT connection. Retry, or sign in again.",
+                  ),
+            ),
+          );
+          if (!tokens.refresh_token || tokens.token_type.toLowerCase() !== "bearer") {
+            return yield* failure("refresh", "ChatGPT returned an invalid renewal. Sign in again.");
+          }
+          record = {
+            ...record,
+            accessToken: tokens.access_token,
+            refreshToken: tokens.refresh_token,
+            expiresAt: (yield* Clock.currentTimeMillis) + tokens.expires_in * 1000,
+            earliestRefreshAt: earliest(tokens.earliest_refresh_at),
+            scopes: tokens.scope.split(/\s+/).filter(Boolean),
+          };
+          yield* save(record);
+          if (!record.scopes.includes(REQUIRED_SCOPE))
+            return yield* failure(
+              "sharing",
+              "ChatGPT token sharing is no longer enabled. Sign in again.",
+            );
+          return record;
+        }),
+      ),
+    ),
+  );
+  const logout = Effect.gen(function* () {
+    const credentials = Option.getOrUndefined(yield* read);
+    let confirmed = !credentials?.refreshToken;
+    if (credentials?.refreshToken) {
+      for (let attempt = 0; attempt < 3; attempt++) {
+        const result = yield* Effect.gen(function* () {
+          const endpoints = yield* discover;
+          if (!endpoints.revocation_endpoint) return { confirmed: false, retry: false };
+          const response = yield* http.execute(
+            HttpClientRequest.post(endpoints.revocation_endpoint).pipe(
+              HttpClientRequest.bodyText(
+                new URLSearchParams({
+                  token: credentials.refreshToken!,
+                  token_type_hint: "refresh_token",
+                  client_id: credentials.clientId,
+                }).toString(),
+                "application/x-www-form-urlencoded",
+              ),
+            ),
+          );
+          return { confirmed: response.status === 200, retry: response.status >= 500 };
+        }).pipe(
+          Effect.timeout("10 seconds"),
+          Effect.orElseSucceed(() => ({ confirmed: false, retry: true })),
+        );
+        confirmed = result.confirmed;
+        if (confirmed || !result.retry || attempt === 2) break;
+        yield* Effect.sleep(attempt === 0 ? "250 millis" : "1 second");
+      }
+    }
+    yield* remove;
+    return confirmed
+      ? undefined
+      : "Signed out locally. Remote revocation could not be confirmed. Disconnect the app in ChatGPT Settings.";
+  });
+  if (options.reconnectProfile) {
+    const { idTokenHint: _hint, ...registration } = options.reconnectProfile;
+    yield* saveRegistration(registration).pipe(Effect.orDie);
+  }
+  const controller = yield* ProviderAuthFlow.make({
+    instanceId: options.instanceId,
+    credentialBinding: store.binding,
+    refreshMethodsAfterAuth: true,
+    methods: Effect.gen(function* () {
+      const saved = yield* readRegistrations;
+      const active = Option.getOrUndefined(yield* read);
+      const current = saved.profiles.find(
+        (profile) => profile.clientId === (active?.clientId ?? saved.lastClientId),
+      );
+      const profiles = current
+        ? [current, ...saved.profiles.filter((profile) => profile.clientId !== current.clientId)]
+        : saved.profiles;
+      return [
+        {
+          id: "chatgpt",
+          name: "Sign in with ChatGPT",
+          description: current?.email ? `Reconnect ${current.email}.` : null,
+          ...(current?.email ? { accountEmail: current.email } : {}),
+          type: "agent" as const,
+        },
+        {
+          id: "chatgpt-change-account",
+          name: "Use a different ChatGPT account",
+          description: "Register a connection for another ChatGPT account.",
+          type: "agent" as const,
+        },
+        // The wire contract allows 32 methods; advertise the 30 most recent profiles.
+        ...profiles.slice(0, 30).map((profile) => ({
+          id: profileMethodId(profile.clientId),
+          name: `${profile.email ?? "ChatGPT account"} · ${profile.connectionLabel}`,
+          ...(profile.email ? { accountEmail: profile.email } : {}),
+          description: "Reuse this account's original sign-in registration.",
+          type: "agent" as const,
+        })),
+      ];
+    }),
+    authenticate: (method, context) =>
+      lock.withPermit(
+        track(
+          "auth",
+          {
+            flow: options.telemetryFlow ?? "direct",
+            intent:
+              options.telemetryFlow === "primary_handoff"
+                ? options.reconnectProfile
+                  ? "saved_profile"
+                  : "different_account"
+                : method === "chatgpt-change-account"
+                  ? "different_account"
+                  : method.startsWith("chatgpt-profile:")
+                    ? "saved_profile"
+                    : "default",
+            callbackMode: context.callbackMode ?? "server",
+          },
+          authenticate(method, context),
+          context.expiresAt,
+        ),
+      ),
+    logout: lock.withPermit(withSessionLock(logout)),
+  });
+  const reconnectProfile = Effect.fnUntraced(function* (methodId: string) {
+    if (methodId === "chatgpt-change-account") return null;
+    const registrations = yield* readRegistrations;
+    const active = Option.getOrUndefined(yield* read);
+    const clientId = methodId.startsWith("chatgpt-profile:")
+      ? methodId.slice("chatgpt-profile:".length)
+      : (active?.clientId ?? registrations.lastClientId);
+    const registration = registrations.profiles.find((profile) => profile.clientId === clientId);
+    if (!registration) {
+      if (methodId.startsWith("chatgpt-profile:"))
+        return yield* failure("export", "This saved connection is no longer available.");
+      return null;
+    }
+    const session = (yield* readSessions).sessions.find((session) => session.clientId === clientId);
+    return { ...registration, ...(session?.idToken ? { idTokenHint: session.idToken } : {}) };
+  });
+  const exportProfile = Effect.gen(function* () {
+    const credentials = Option.getOrUndefined(yield* read);
+    const registration =
+      credentials &&
+      (yield* readRegistrations).profiles.find(
+        (profile) => profile.clientId === credentials.clientId,
+      );
+    if (!credentials?.idToken || !credentials.issuer || !registration)
+      return yield* failure(
+        "export",
+        "Complete ChatGPT sign-in before transferring this connection.",
+      );
+    return {
+      registration,
+      credentials: { ...credentials, idToken: credentials.idToken, issuer: credentials.issuer },
+    } satisfies ChatGptTransferredProfile;
+  });
+  const importProfile = (
+    profile: ChatGptTransferredProfile,
+    stopSessions: Effect.Effect<void, ProviderSetupError>,
+  ) => {
+    const validate = Effect.gen(function* () {
+      const endpoints = yield* discover;
+      const credentials = profile.credentials;
+      if (
+        credentials.clientId !== profile.registration.clientId ||
+        credentials.issuer !== endpoints.issuer ||
+        !credentials.scopes.includes(REQUIRED_SCOPE) ||
+        credentials.expiresAt <= (yield* Clock.currentTimeMillis)
+      )
+        return yield* failure(
+          "import",
+          "The transferred ChatGPT connection is invalid or expired.",
+        );
+      const identity = yield* Effect.tryPromise({
+        try: () =>
+          jwtVerify(credentials.idToken, jwks!, {
+            issuer: endpoints.issuer,
+            audience: credentials.clientId,
+            algorithms: ["RS256", "ES256"],
+            clockTolerance: 5,
+          }),
+        catch: () => failure("import", "The transferred ChatGPT identity could not be verified."),
+      });
+      if (
+        identity.payload.sub !== credentials.subject ||
+        profile.registration.subject !== credentials.subject ||
+        (identity.payload.email ?? null) !== credentials.email ||
+        (profile.registration.email !== undefined &&
+          profile.registration.email !== credentials.email)
+      )
+        return yield* failure(
+          "import",
+          "The transferred ChatGPT identity does not match its profile.",
+        );
+    });
+    const saveImported = Effect.gen(function* () {
+      const { idTokenHint: _hint, ...registration } = profile.registration;
+      const existing = (yield* readRegistrations).profiles.find(
+        (saved) => saved.clientId === registration.clientId,
+      );
+      if (existing?.subject && existing.subject !== profile.credentials.subject)
+        return yield* failure(
+          "import",
+          "The transferred identity conflicts with the saved ChatGPT connection.",
+        );
+      yield* saveRegistration(registration);
+      yield* save(profile.credentials, true);
+    });
+    return lock.withPermit(
+      track(
+        "transfer",
+        { flow: "primary_handoff" },
+        validate.pipe(
+          Effect.andThen(controller.adoptCredentials!(withSessionLock(saveImported), stopSessions)),
+        ),
+      ),
+    );
+  };
+  return {
+    controller: { ...controller, reconnectProfile, importProfile },
+    read,
+    access,
+    exportProfile,
+    revoke: lock.withPermit(withSessionLock(remove)),
+  };
+});
diff --git a/apps/server/src/provider/CodexChatGptHandoff.ts b/apps/server/src/provider/CodexChatGptHandoff.ts
new file mode 100644
index 000000000000..2a1dce4a6a96
--- /dev/null
+++ b/apps/server/src/provider/CodexChatGptHandoff.ts
@@ -0,0 +1,63 @@
+import type { ChatGptHandoffInput, ChatGptHandoffState } from "@t3tools/contracts";
+import { ProviderSetupError } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Stream from "effect/Stream";
+import { FetchHttpClient } from "effect/unstable/http";
+import { ServerSecretStore } from "../auth/ServerSecretStore.ts";
+import { ServerEnvironmentIdentity } from "../environment/ServerEnvironment.ts";
+import { makeCodexChatGptAuth } from "./CodexChatGptAuth.ts";
+
+// The primary owns OAuth for this stream; the destination owns the refresh session.
+export function subscribeChatGptHandoff(
+  input: ChatGptHandoffInput,
+  owner: string,
+  endpoints: { discoveryUrl: string; resource: string } | undefined = undefined,
+) {
+  return Stream.unwrap(
+    Effect.gen(function* () {
+      const bytes = new Map<string, Uint8Array>();
+      yield* Effect.addFinalizer(() => Effect.sync(() => bytes.clear()));
+      const store = ServerSecretStore.of({
+        get: (key) => Effect.sync(() => Option.fromUndefinedOr(bytes.get(key))),
+        set: (key, value) =>
+          Effect.sync(() => {
+            bytes.set(key, value);
+          }),
+        remove: (key) =>
+          Effect.sync(() => {
+            bytes.delete(key);
+          }),
+        create: () => Effect.die("Handoff does not create persistent secrets."),
+        getOrCreateRandom: () => Effect.die("Handoff uses the destination environment identity."),
+      });
+      const auth = yield* makeCodexChatGptAuth({
+        ...endpoints,
+        instanceId: input.instanceId,
+        reconnectProfile: input.profile,
+        telemetryFlow: "primary_handoff",
+        defaultReturnUrl: input.returnUrl,
+      }).pipe(
+        Effect.provideService(ServerSecretStore, store),
+        Effect.provideService(
+          ServerEnvironmentIdentity,
+          ServerEnvironmentIdentity.of({
+            getEnvironmentId: Effect.succeed(input.environmentId),
+          }),
+        ),
+        Effect.provide(FetchHttpClient.layer),
+      );
+      yield* auth.controller.start(owner, Effect.void, "chatgpt", input.returnUrl, "server");
+      return auth.controller.subscribe(owner).pipe(
+        Stream.takeUntil((state) => ["succeeded", "failed", "cancelled"].includes(state.phase)),
+        Stream.mapEffect((state): Effect.Effect<ChatGptHandoffState, ProviderSetupError> =>
+          state.phase === "succeeded"
+            ? auth.exportProfile.pipe(
+                Effect.map((profile) => ({ phase: "finished" as const, profile })),
+              )
+            : Effect.succeed({ phase: "auth" as const, state }),
+        ),
+      );
+    }),
+  );
+}
diff --git a/apps/server/src/provider/CodexChatGptModels.test.ts b/apps/server/src/provider/CodexChatGptModels.test.ts
new file mode 100644
index 000000000000..9e7ec690d1df
--- /dev/null
+++ b/apps/server/src/provider/CodexChatGptModels.test.ts
@@ -0,0 +1,75 @@
+// @effect-diagnostics preferSchemaOverJson:off - Mock HTTP responses use JSON fixtures.
+import { assert, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import { HttpClient, HttpClientResponse } from "effect/unstable/http";
+import { chatGptModels } from "./CodexChatGptModels.ts";
+
+it.effect(
+  "uses each selected profile's token and the server's visible catalog order and names",
+  () =>
+    Effect.gen(function* () {
+      const requests: string[] = [];
+      const http = HttpClient.make((request) =>
+        Effect.sync(() => {
+          assert.strictEqual(request.url, "https://api.openai.com/v1/models");
+          requests.push(request.headers.authorization!);
+          return HttpClientResponse.fromWeb(
+            request,
+            new Response(
+              JSON.stringify({
+                models:
+                  request.headers.authorization === "Bearer account-a"
+                    ? [
+                        { slug: "second", display_name: "Second from OpenAI", visibility: "list" },
+                        { slug: "hidden", display_name: "Hidden", visibility: "hidden" },
+                        { slug: "first", display_name: "First from OpenAI", visibility: "list" },
+                      ]
+                    : [{ slug: "account-b-only", display_name: "B", visibility: "list" }],
+              }),
+            ),
+          );
+        }),
+      );
+      const native = [
+        {
+          slug: "first",
+          name: "Cached first",
+          isCustom: false,
+          capabilities: { optionDescriptors: [] },
+        },
+        { slug: "not-entitled", name: "Cached other", isCustom: false, capabilities: null },
+      ];
+      const a = yield* chatGptModels("account-a", native).pipe(
+        Effect.provideService(HttpClient.HttpClient, http),
+      );
+      assert.deepEqual(
+        a.map((model) => [model.slug, model.name]),
+        [
+          ["second", "Second from OpenAI"],
+          ["first", "First from OpenAI"],
+        ],
+      );
+      assert.deepEqual(a[1]!.capabilities, native[0]!.capabilities);
+      assert.isNull(a[0]!.capabilities);
+      const b = yield* chatGptModels("account-b", native).pipe(
+        Effect.provideService(HttpClient.HttpClient, http),
+      );
+      assert.deepEqual(
+        b.map((model) => model.slug),
+        ["account-b-only"],
+      );
+      assert.deepEqual(requests, ["Bearer account-a", "Bearer account-b"]);
+    }),
+);
+
+it.effect("does not present a cached catalog as account entitlements when discovery fails", () =>
+  Effect.gen(function* () {
+    const http = HttpClient.make((request) =>
+      Effect.succeed(HttpClientResponse.fromWeb(request, new Response(null, { status: 503 }))),
+    );
+    const error = yield* Effect.flip(
+      chatGptModels("account-a", []).pipe(Effect.provideService(HttpClient.HttpClient, http)),
+    );
+    assert.strictEqual(error._tag, "ChatGptCatalogError");
+  }),
+);
diff --git a/apps/server/src/provider/CodexChatGptModels.ts b/apps/server/src/provider/CodexChatGptModels.ts
new file mode 100644
index 000000000000..5b00d1d82886
--- /dev/null
+++ b/apps/server/src/provider/CodexChatGptModels.ts
@@ -0,0 +1,47 @@
+import type { ServerProviderModel } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import { HttpClient, HttpClientRequest } from "effect/unstable/http";
+
+export class ChatGptCatalogError extends Schema.TaggedError<ChatGptCatalogError>()(
+  "ChatGptCatalogError",
+  { status: Schema.Int },
+) {}
+
+const Catalog = Schema.Struct({
+  models: Schema.Array(
+    Schema.Struct({
+      slug: Schema.NonEmptyString,
+      display_name: Schema.NonEmptyString,
+      visibility: Schema.String,
+    }),
+  ),
+});
+
+/** Account choices come from OpenAI; native model/list contributes capability metadata only. */
+export const chatGptModels = Effect.fn("chatGptModels")(function* (
+  accessToken: string,
+  nativeModels: ReadonlyArray<ServerProviderModel>,
+) {
+  const http = yield* HttpClient.HttpClient;
+  const response = yield* http.execute(
+    HttpClientRequest.get("https://api.openai.com/v1/models").pipe(
+      HttpClientRequest.bearerToken(accessToken),
+    ),
+  );
+  if (response.status !== 200) return yield* new ChatGptCatalogError({ status: response.status });
+  const catalog = yield* response.json.pipe(Effect.flatMap(Schema.decodeUnknownEffect(Catalog)));
+  return catalog.models
+    .filter((model) => model.visibility === "list")
+    .map(
+      (model) =>
+        ({
+          ...nativeModels.find((native) => native.slug === model.slug),
+          capabilities:
+            nativeModels.find((native) => native.slug === model.slug)?.capabilities ?? null,
+          slug: model.slug,
+          name: model.display_name,
+          isCustom: false,
+        }) satisfies ServerProviderModel,
+    );
+}, Effect.timeout("15 seconds"));
diff --git a/apps/server/src/provider/CodexChatGptSessionLock.test.ts b/apps/server/src/provider/CodexChatGptSessionLock.test.ts
new file mode 100644
index 000000000000..b8bdd3a0e976
--- /dev/null
+++ b/apps/server/src/provider/CodexChatGptSessionLock.test.ts
@@ -0,0 +1,75 @@
+// @effect-diagnostics nodeBuiltinImport:off - A separate Node process proves filesystem exclusion.
+import * as NodeChildProcess from "node:child_process";
+import * as NodeModule from "node:module";
+import * as NodePath from "node:path";
+import * as NodeUtil from "node:util";
+import { assert, it } from "@effect/vitest";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { ProviderInstanceId } from "@t3tools/contracts";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import * as FileSystem from "effect/FileSystem";
+import { withChatGptSessionLock } from "./CodexChatGptSessionLock.ts";
+
+const execFile = NodeUtil.promisify(NodeChildProcess.execFile);
+const lockModule = NodeModule.createRequire(import.meta.url).resolve("proper-lockfile");
+const instanceId = ProviderInstanceId.make("cross-process-test");
+const probe = (directory: string) =>
+  Effect.promise(async () => {
+    const { stdout } = await execFile(process.execPath, [
+      "-e",
+      `
+    const { lock } = require(process.argv[1]);
+    lock(process.argv[2], { realpath: false }).then(async release => {
+      await release(); process.stdout.write('acquired');
+    }, error => {
+      if (error.code === 'ELOCKED') process.stdout.write('blocked');
+      else { console.error(error); process.exitCode = 1; }
+    });
+  `,
+      lockModule,
+      NodePath.join(directory, "session.bin"),
+    ]);
+    return stdout;
+  });
+
+it.live("excludes another process and releases after the credential update", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const directory = yield* fs.makeTempDirectoryScoped();
+      const blocked = yield* withChatGptSessionLock(
+        directory,
+        "session",
+        instanceId,
+        probe(directory),
+      );
+      assert.strictEqual(blocked, "blocked");
+      assert.strictEqual(yield* probe(directory), "acquired");
+    }),
+  ).pipe(Effect.provide(NodeServices.layer)),
+);
+
+it.live("releases the cross-process lease when the operation is interrupted", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const directory = yield* fs.makeTempDirectoryScoped();
+      const entered = yield* Deferred.make<void>();
+      const operation = yield* withChatGptSessionLock(
+        directory,
+        "session",
+        instanceId,
+        Effect.gen(function* () {
+          yield* Deferred.succeed(entered, undefined);
+          return yield* Effect.never;
+        }),
+      ).pipe(Effect.forkScoped);
+      yield* Deferred.await(entered);
+      assert.strictEqual(yield* probe(directory), "blocked");
+      yield* Fiber.interrupt(operation);
+      assert.strictEqual(yield* probe(directory), "acquired");
+    }),
+  ).pipe(Effect.provide(NodeServices.layer)),
+);
diff --git a/apps/server/src/provider/CodexChatGptSessionLock.ts b/apps/server/src/provider/CodexChatGptSessionLock.ts
new file mode 100644
index 000000000000..e580f2a78eb2
--- /dev/null
+++ b/apps/server/src/provider/CodexChatGptSessionLock.ts
@@ -0,0 +1,45 @@
+// @effect-diagnostics nodeBuiltinImport:off - Credential leases coordinate Node server processes.
+import * as NodePath from "node:path";
+import { lock } from "proper-lockfile";
+import { ProviderSetupError, type ProviderInstanceId } from "@t3tools/contracts";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+
+/** Keep rotating tokens and their active profile atomic across servers sharing a secret store. */
+export const withChatGptSessionLock = <A, E, R>(
+  directory: string | undefined,
+  key: string,
+  instanceId: ProviderInstanceId,
+  task: Effect.Effect<A, E, R>,
+): Effect.Effect<A, E | ProviderSetupError, R> => {
+  // In-memory stores have no shared filesystem; the auth controller still serializes its callers.
+  if (!directory) return task;
+  const failure = () =>
+    new ProviderSetupError({
+      instanceId,
+      operation: "credential-lock",
+      detail: "Could not lock the ChatGPT connection for an update. Try again.",
+    });
+  return Effect.scoped(
+    Effect.gen(function* () {
+      const compromised = yield* Deferred.make<never, ProviderSetupError>();
+      const services = yield* Effect.context<never>();
+      yield* Effect.acquireRelease(
+        Effect.tryPromise({
+          try: () =>
+            lock(NodePath.join(directory, `${key}.bin`), {
+              realpath: false,
+              stale: 120_000,
+              update: 10_000,
+              retries: { retries: 80, factor: 1, minTimeout: 500, maxTimeout: 500 },
+              onCompromised: () =>
+                Effect.runSyncWith(services)(Deferred.fail(compromised, failure())),
+            }),
+          catch: failure,
+        }),
+        (release) => Effect.promise(() => release()).pipe(Effect.ignore),
+      );
+      return yield* Effect.raceFirst(task, Deferred.await(compromised));
+    }),
+  );
+};
diff --git a/apps/server/src/provider/CodexDeveloperInstructions.ts b/apps/server/src/provider/CodexDeveloperInstructions.ts
index 7ec7b58c0bd5..d74795480566 100644
--- a/apps/server/src/provider/CodexDeveloperInstructions.ts
+++ b/apps/server/src/provider/CodexDeveloperInstructions.ts
@@ -1,23 +1,18 @@
 import type { ProviderInteractionMode } from "@t3tools/contracts";
+import type { V2TurnStartParams__AdditionalContextEntry } from "effect-codex-app-server/schema";
 import { buildRuntimeInstructions } from "./RuntimeInstructions.ts";
 
-const T3_CODE_BROWSER_TOOL_INSTRUCTIONS = `
-
-## T3 Turbo collaborative browser
+const T3_CODE_BROWSER_TOOL_INSTRUCTIONS = `## T3 Turbo collaborative browser
 
 You are running inside T3 Turbo. The \`t3-code\` MCP server is the product-native collaborative browser shared with the user. When it exposes \`preview_*\` tools, prefer those tools for browser navigation, inspection, interaction, screenshots, and recordings.
 
 For browser work, first call \`preview_status\`. If no automation-capable preview is attached, call \`preview_open\` before concluding that the browser is unavailable. Then use \`preview_navigate\`, \`preview_snapshot\`, and the focused interaction tools. Prefer snapshot-provided locators over coordinates.
 
-Do not switch to global browser skills, Chrome, Node REPL browser automation, standalone Playwright, or agent-browser merely because the preview is initially closed or a first call fails. Use an alternative browser system only when the T3 preview tools are absent, the user explicitly requests another browser, or \`preview_open\` returns an explicit unsupported/unavailable error. A failed T3 preview tool call should be inspected and retried with corrected arguments when the error is actionable.
-`;
-
-const T3_CODE_DEVICE_TOOL_INSTRUCTIONS = `
+Do not switch to global browser skills, Chrome, Node REPL browser automation, standalone Playwright, or agent-browser merely because the preview is initially closed or a first call fails. Use an alternative browser system only when the T3 preview tools are absent, the user explicitly requests another browser, or \`preview_open\` returns an explicit unsupported/unavailable error. A failed T3 preview tool call should be inspected and retried with corrected arguments when the error is actionable.`;
 
-## T3 Code devices
+const T3_CODE_DEVICE_TOOL_INSTRUCTIONS = `## T3 Code devices
 
-The \`t3-code\` MCP server also exposes \`device_*\` tools for iOS Simulators and Android Emulators on this environment. For mobile verification, call \`device_list\`, then \`device_open\` so the user can watch the device in their Device panel; its result explains how to drive the device. Driving happens through the \`agent-device\` CLI, which is on PATH. Keep the host config and session flags returned by \`device_open\` on every command so concurrent devices stay independent: prefer \`agent-device snapshot -i\` refs over coordinates, and use \`device_screenshot\` when you need to see the screen. Do not call simctl, adb, xcrun, or serve-sim directly while these tools are present. If \`device_list\` reports a platform as unavailable, say so instead of trying another route.
-`;
+The \`t3-code\` MCP server also exposes \`device_*\` tools for iOS Simulators and Android Emulators on this environment. For mobile verification, call \`device_list\`, then \`device_open\` so the user can watch the device in their Device panel; its result explains how to drive the device. Driving happens through the \`agent-device\` CLI, which is on PATH. Keep the host config and session flags returned by \`device_open\` on every command so concurrent devices stay independent: prefer \`agent-device snapshot -i\` refs over coordinates, and use \`device_screenshot\` when you need to see the screen. Prefer these tools and \`agent-device\` for opening and driving devices. Platform tools such as \`xcrun simctl\` and \`adb\` remain available for anything they do not cover, such as builds, logs, or port forwarding. If \`device_list\` reports a platform as unavailable, say so.`;
 
 export interface T3CodeToolAvailability {
   readonly browser: boolean;
@@ -36,16 +31,17 @@ const normalizeAvailability = (
  * from Playwright, agent-browser, and raw simctl/adb, so leaving them in would
  * talk it out of the only automation it still has.
  */
-const browserToolInstructions = (availability: boolean | T3CodeToolAvailability): string => {
+const toolInstructions = (availability: boolean | T3CodeToolAvailability): string => {
   const tools = normalizeAvailability(availability);
-  return `${tools.browser ? T3_CODE_BROWSER_TOOL_INSTRUCTIONS : ""}${
-    tools.device ? T3_CODE_DEVICE_TOOL_INSTRUCTIONS : ""
-  }`;
+  return [
+    tools.browser ? T3_CODE_BROWSER_TOOL_INSTRUCTIONS : "",
+    tools.device ? T3_CODE_DEVICE_TOOL_INSTRUCTIONS : "",
+  ]
+    .filter(Boolean)
+    .join("\n\n");
 };
 
-const codexPlanModeDeveloperInstructions = (
-  browserToolsAvailable: boolean | T3CodeToolAvailability,
-): string => `<collaboration_mode># Plan Mode (Conversational)
+const CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Plan Mode (Conversational)
 
 You work in 3 phases, and you should *chat your way* to a great plan before finalizing it. A great plan is very detailed-intent- and implementation-wise-so that it can be handed to another engineer or agent to be implemented right away. It must be **decision complete**, where the implementer does not need to make any decisions.
 
@@ -173,12 +169,9 @@ Do not ask "should I proceed?" in the final output. The user can easily switch o
 Only produce at most one \`<proposed_plan>\` block per turn, and only when you are presenting a complete spec.
 
 If the user stays in Plan mode and asks for revisions after a prior \`<proposed_plan>\`, any new \`<proposed_plan>\` must be a complete replacement. If the user indicates that the prior plan is not acceptable but does not provide enough information to produce a complete replacement, address the concern and continue planning without producing a \`<proposed_plan>\` block. If the follow-up neither requires changes nor calls the plan into question (e.g. clarifying question), answer it before the block, then reproduce the prior \`<proposed_plan>\` unchanged.
-${browserToolInstructions(browserToolsAvailable)}
 </collaboration_mode>`;
 
-const codexDefaultModeDeveloperInstructions = (
-  browserToolsAvailable: boolean | T3CodeToolAvailability,
-): string => `<collaboration_mode># Collaboration Mode: Default
+const CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS = `<collaboration_mode># Collaboration Mode: Default
 
 You are now in Default mode. Any previous instructions for other modes (e.g. Plan mode) are no longer active.
 
@@ -189,29 +182,46 @@ Your active mode changes only when new developer instructions with a different \
 Use the \`request_user_input\` tool only when it is listed in the available tools for this turn.
 
 In Default mode, strongly prefer making reasonable assumptions and executing the user's request rather than stopping to ask questions. If you absolutely must ask a question because the answer cannot be discovered from local context and a reasonable assumption would be risky, ask the user directly with a concise plain-text question. Never write a multiple choice question as a textual assistant message.
-${browserToolInstructions(browserToolsAvailable)}
 </collaboration_mode>`;
 
 export interface CodexRuntimeInfo {
   readonly model: string;
+  readonly modelName?: string | undefined;
   readonly reasoningEffort: string;
 }
 
-export function buildCodexDeveloperInstructions(
-  interactionMode: ProviderInteractionMode,
+/** Mode prompt for `turn/start.collaborationMode.settings.developer_instructions`. */
+export function buildCodexDeveloperInstructions(interactionMode: ProviderInteractionMode): string {
+  return interactionMode === "plan"
+    ? CODEX_PLAN_MODE_DEVELOPER_INSTRUCTIONS
+    : CODEX_DEFAULT_MODE_DEVELOPER_INSTRUCTIONS;
+}
+
+/**
+ * T3 Code context for `turn/start.additionalContext`. Codex renders each entry
+ * as a `<key>value</key>` developer message and resends it only when the value
+ * changes.
+ *
+ * This must stay out of the collaboration mode: when the model catalog ships
+ * its own text for a mode, as newer models do, Codex uses that text and drops
+ * the client's `developer_instructions` entirely.
+ */
+export function buildCodexAdditionalContext(
   runtime: CodexRuntimeInfo,
   /**
    * Whether the `t3-code` MCP server is attached to this turn. Callers derive
    * it from the session's actual MCP configuration rather than re-reading the
    * setting, so the prompt cannot claim tools the turn doesn't have.
    */
-  browserToolsAvailable: boolean | T3CodeToolAvailability = true,
-): string {
-  const base =
-    interactionMode === "plan"
-      ? codexPlanModeDeveloperInstructions(browserToolsAvailable)
-      : codexDefaultModeDeveloperInstructions(browserToolsAvailable);
-  return `${base}
-
-${buildRuntimeInstructions({ harness: "Codex", ...runtime })}`;
+  toolsAvailable: boolean | T3CodeToolAvailability = true,
+): Record<string, V2TurnStartParams__AdditionalContextEntry> {
+  const tools = toolInstructions(toolsAvailable);
+  // Separate keys keep each value under Codex's per-entry token cap.
+  return {
+    t3_code_runtime: {
+      kind: "application",
+      value: buildRuntimeInstructions({ harness: "Codex", ...runtime }),
+    },
+    ...(tools ? { t3_code_tools: { kind: "application", value: tools } } : {}),
+  };
 }
diff --git a/apps/server/src/provider/CodexInstallation.test.ts b/apps/server/src/provider/CodexInstallation.test.ts
new file mode 100644
index 000000000000..906d04bab699
--- /dev/null
+++ b/apps/server/src/provider/CodexInstallation.test.ts
@@ -0,0 +1,366 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { BUNDLED_MODEL_MANIFEST, ModelManifest, type ModelManifestData } from "./ModelManifest.ts";
+import { expect, it } from "@effect/vitest";
+import {
+  HostProcessArchitecture,
+  HostProcessEnvironment,
+  HostProcessPlatform,
+} from "@t3tools/shared/hostProcess";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Exit from "effect/Exit";
+import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
+import { HttpClient, HttpClientResponse } from "effect/unstable/http";
+import * as NodeCrypto from "node:crypto";
+import {
+  makeCodexInstallation,
+  type CodexInstallation,
+  type CodexInstallationOptions,
+  resolveCodexReleaseAsset,
+} from "./CodexInstallation.ts";
+
+const archive = Buffer.from(
+  "H4sIAAAAAAAC/+3W0W6DIBQGYB/FcD0sKNSkD7J7aom6tmAQtzXL3n3QZM3qdWVt+n8XoCckJp78wLY3q8bu9Ge2HBbUUp7nYD4H8s9zrNdSsCxnWQLT6JULn8ye09K9h/u2/c0/jSM9xqGzo0+bf3Gdf15WQiD/Kdy61/CA+z8dlO9Wrv2387+c5Z9VZY38p7BY0+Gh8t/sVauLt9Ga9Pnnop7ln1e4/6fxRQ7qZCf/qt3YW0M2OX/JyfvljbCCy3XBSaiGH9VqH4tKuaZbC6qG4aDpTrmP3sQV2nh3Gmxvzqsud0vyjaABAAAAAAAAAAAAAAAk8gOq19rvACgAAA==",
+  "base64",
+);
+const asset = {
+  version: "0.156.1",
+  target: "aarch64-apple-darwin",
+  url: "https://github.com/openai/codex/releases/download/test/package.tar.gz",
+  sha256: NodeCrypto.createHash("sha256").update(archive).digest("hex"),
+  archiveBytes: archive.length,
+};
+const makeHarness = Effect.fn("test.makeCodexInstallation")(function* (
+  input: {
+    options?: Partial<CodexInstallationOptions>;
+    manifestCurrent?: Effect.Effect<ModelManifestData>;
+    body?: Stream.Stream<Uint8Array>;
+    baseDir?: string;
+    local?: { version: string; appServerFails?: boolean; versionFails?: boolean };
+  } = {},
+) {
+  const fs = yield* FileSystem.FileSystem;
+  const baseDir =
+    input.baseDir ?? (yield* fs.makeTempDirectoryScoped({ prefix: "t3-codex-install-test-" }));
+  const localDirectory = `${baseDir}/local`;
+  const localBinaryPath = `${localDirectory}/codex`;
+  const probeLog = `${baseDir}/local-probes.txt`;
+  if (input.local) {
+    yield* fs.makeDirectory(localDirectory, { recursive: true });
+    yield* fs.writeFileString(
+      localBinaryPath,
+      `#!/bin/sh\nprintf '%s\\n' "$*" >> '${probeLog}'\ncase "$1" in\n--version) ${input.local.versionFails ? "exit 1" : `printf '%s\\n' 'codex-cli ${input.local.version}'`};;\napp-server) exit ${input.local.appServerFails ? "1" : "0"};;\nesac\n`,
+      { mode: 0o755 },
+    );
+  }
+  let downloads = 0;
+  const installation = yield* makeCodexInstallation({
+    baseDir,
+    releaseAsset: asset,
+    validate: () => Effect.void,
+    ...input.options,
+  }).pipe(
+    Effect.provideService(ModelManifest, {
+      current: input.manifestCurrent ?? Effect.succeed(BUNDLED_MODEL_MANIFEST),
+      refresh: Effect.succeed(BUNDLED_MODEL_MANIFEST),
+      forceRefresh: Effect.succeed(BUNDLED_MODEL_MANIFEST),
+      refreshInBackground: Effect.void,
+    }),
+    Effect.provideService(HostProcessPlatform, "darwin"),
+    Effect.provideService(HostProcessArchitecture, "arm64"),
+    Effect.provideService(HostProcessEnvironment, { PATH: input.local ? localDirectory : "" }),
+    Effect.provideService(
+      HttpClient.HttpClient,
+      HttpClient.make((request) =>
+        Effect.sync(() => {
+          downloads++;
+          return Object.defineProperty(
+            HttpClientResponse.fromWeb(request, new Response(null)),
+            "stream",
+            {
+              value: input.body ?? Stream.succeed(archive),
+            },
+          );
+        }),
+      ),
+    ),
+  );
+  return { installation, fs, baseDir, localBinaryPath, probeLog, downloads: () => downloads };
+});
+const terminalState = (installation: CodexInstallation["Service"]) =>
+  installation.changes.pipe(
+    Stream.filter((state) => ["succeeded", "failed", "cancelled"].includes(state.phase)),
+    Stream.runHead,
+    Effect.map(Option.getOrThrow),
+  );
+
+for (const version of ["0.156.0", "0.156.1", "0.156.2", "0.157.0"]) {
+  it.effect(`reuses installed Codex ${version} without downloading or taking ownership of it`, () =>
+    Effect.gen(function* () {
+      const h = yield* makeHarness({ local: { version } });
+      expect(yield* h.installation.start).toMatchObject({
+        source: "local",
+        phase: "succeeded",
+        installedVersion: version,
+        executablePath: h.localBinaryPath,
+        canRemove: false,
+      });
+      expect(yield* h.installation.resolve()).toMatchObject({
+        source: "local",
+        executablePath: h.localBinaryPath,
+        managedVersionDirectory: null,
+        version,
+      });
+      yield* h.installation.acquire().pipe(Effect.scoped);
+      expect(h.downloads()).toBe(0);
+      expect(yield* h.fs.exists(h.installation.managedDirectory)).toBe(false);
+      expect((yield* h.fs.readFileString(h.probeLog)).trim().split("\n")).toEqual([
+        "--version",
+        "app-server --help",
+      ]);
+      yield* h.installation.remove();
+      expect(yield* h.fs.exists(h.localBinaryPath)).toBe(true);
+      expect((yield* h.installation.state).source).toBe("local");
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+}
+for (const local of [
+  { version: "0.128.9" },
+  { version: "0.145.0" },
+  { version: "0.155.1" },
+  { version: "0.155.9" },
+  { version: "0.156.1-alpha.1" },
+  { version: "unknown" },
+  { version: "0.156.1", appServerFails: true },
+  { version: "0.156.1", versionFails: true },
+]) {
+  it.effect(
+    `downloads the pinned release when the local CLI is unsupported or broken: ${JSON.stringify(local)}`,
+    () =>
+      Effect.gen(function* () {
+        const h = yield* makeHarness({ local });
+        expect((yield* h.installation.state).installedVersion).toBeNull();
+        yield* h.installation.start;
+        const installed = yield* terminalState(h.installation);
+        expect(installed.phase).toBe("succeeded");
+        const executable = yield* h.installation.resolve();
+        expect(executable.source).toBe("managed");
+        expect(installed.executablePath).toBe(executable.executablePath);
+        expect(h.downloads()).toBe(1);
+        expect(yield* h.fs.exists(h.localBinaryPath)).toBe(true);
+      }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+}
+it.effect("falls back to a managed download when the reused local executable disappears", () =>
+  Effect.gen(function* () {
+    const h = yield* makeHarness({ local: { version: "0.156.1" } });
+    expect((yield* h.installation.resolve()).source).toBe("local");
+    yield* h.fs.remove(h.localBinaryPath);
+    yield* h.installation.start;
+    expect((yield* terminalState(h.installation)).phase).toBe("succeeded");
+    expect((yield* h.installation.resolve()).source).toBe("managed");
+    expect(h.downloads()).toBe(1);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("rechecks compatibility after the local executable is replaced", () =>
+  Effect.gen(function* () {
+    const h = yield* makeHarness({ local: { version: "0.156.1" } });
+    expect((yield* h.installation.resolve()).source).toBe("local");
+    yield* h.fs.remove(h.localBinaryPath);
+    yield* h.fs.writeFileString(h.localBinaryPath, "#!/bin/sh\nprintf 'codex-cli 0.128.9\\n'\n", {
+      mode: 0o755,
+    });
+    yield* h.installation.start;
+    expect((yield* terminalState(h.installation)).phase).toBe("succeeded");
+    expect((yield* h.installation.resolve()).source).toBe("managed");
+    expect(h.downloads()).toBe(1);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("rechecks a cached local executable when the shared manifest policy changes", () =>
+  Effect.gen(function* () {
+    let manifest = BUNDLED_MODEL_MANIFEST;
+    const h = yield* makeHarness({
+      local: { version: "0.156.0" },
+      manifestCurrent: Effect.sync(() => manifest),
+    });
+    expect((yield* h.installation.resolve()).source).toBe("local");
+    manifest = {
+      ...manifest,
+      compatibility: [
+        {
+          driver: "codex",
+          t3CodeRange: ">=0.0.42",
+          ranges: [
+            { range: ">=0.156.1", status: "supported" },
+            { range: "<0.156.1", status: "broken" },
+          ],
+        },
+      ],
+    };
+    yield* h.installation.start;
+    expect((yield* terminalState(h.installation)).phase).toBe("succeeded");
+    expect((yield* h.installation.resolve()).source).toBe("managed");
+    expect(h.downloads()).toBe(1);
+    expect((yield* h.fs.readFileString(h.probeLog)).trim().split("\n")).toEqual([
+      "--version",
+      "app-server --help",
+    ]);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("uses bundled Codex compatibility when the remote manifest omits its policy", () =>
+  Effect.gen(function* () {
+    const h = yield* makeHarness({
+      local: { version: "0.156.0" },
+      manifestCurrent: Effect.succeed({ ...BUNDLED_MODEL_MANIFEST, compatibility: [] }),
+    });
+    expect((yield* h.installation.start).source).toBe("local");
+    expect(h.downloads()).toBe(0);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("preserves the invoked name of version-manager launcher symlinks", () =>
+  Effect.gen(function* () {
+    const h = yield* makeHarness({ local: { version: "0.156.1" } });
+    const launcher = `${h.baseDir}/launcher`;
+    yield* h.fs.writeFileString(
+      launcher,
+      '#!/bin/sh\ncase "$0" in */codex) ;; *) exit 1;; esac\ncase "$1" in --version) printf "codex-cli 0.156.1\\n";; app-server) exit 0;; esac\n',
+      { mode: 0o755 },
+    );
+    yield* h.fs.remove(h.localBinaryPath);
+    yield* h.fs.symlink(launcher, h.localBinaryPath);
+    expect(yield* h.installation.start).toMatchObject({ source: "local", phase: "succeeded" });
+    expect((yield* h.installation.resolve()).executablePath).toBe(h.localBinaryPath);
+    expect(h.downloads()).toBe(0);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect(
+  "installs the complete verified package in tools/codex/version and survives a restart",
+  () =>
+    Effect.gen(function* () {
+      const { installation, fs, baseDir } = yield* makeHarness();
+      yield* installation.start;
+      expect((yield* terminalState(installation)).phase).toBe("succeeded");
+      const executable = yield* installation.resolve();
+      expect(executable.executablePath).toBe(`${baseDir}/tools/codex/0.156.1/bin/codex`);
+      expect(
+        yield* fs.readFileString(`${executable.managedVersionDirectory}/bin/codex-code-mode-host`),
+      ).toBe("host");
+      expect(yield* fs.readFileString(`${executable.managedVersionDirectory}/codex-path/rg`)).toBe(
+        "rg",
+      );
+      const restarted = yield* makeHarness({ baseDir });
+      expect((yield* restarted.installation.resolve()).version).toBe("0.156.1");
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("requires an update before running an older activated managed installation", () =>
+  Effect.gen(function* () {
+    const first = yield* makeHarness();
+    yield* first.installation.start;
+    yield* terminalState(first.installation);
+    const executable = yield* first.installation.resolve();
+    const oldDirectory = `${first.installation.managedDirectory}/0.155.1`;
+    yield* first.fs.rename(executable.managedVersionDirectory!, oldDirectory);
+    for (const name of ["codex-package.json", ".install-complete.json"]) {
+      const file = `${oldDirectory}/${name}`;
+      yield* first.fs.writeFileString(
+        file,
+        (yield* first.fs.readFileString(file)).replaceAll("0.156.1", "0.155.1"),
+      );
+    }
+    yield* first.fs.writeFileString(
+      `${first.installation.managedDirectory}/active.json`,
+      '{"version":"0.155.1"}',
+    );
+    const restarted = yield* makeHarness({ baseDir: first.baseDir });
+    expect((yield* Effect.flip(restarted.installation.resolve())).detail).toContain(
+      "outside the supported range",
+    );
+    yield* restarted.installation.start;
+    expect((yield* terminalState(restarted.installation)).phase).toBe("succeeded");
+    expect((yield* restarted.installation.resolve()).version).toBe("0.156.1");
+    expect(restarted.downloads()).toBe(1);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("rejects corrupted downloads without publishing a runtime", () =>
+  Effect.gen(function* () {
+    const { installation, fs } = yield* makeHarness({
+      options: { releaseAsset: { ...asset, sha256: "0".repeat(64) } },
+    });
+    yield* installation.start;
+    const state = yield* terminalState(installation);
+    expect(state.phase).toBe("failed");
+    expect(state.message).toContain("SHA-256");
+    expect(yield* fs.exists(`${installation.managedDirectory}/active.json`)).toBe(false);
+    expect(yield* fs.exists(`${installation.managedDirectory}/0.156.1`)).toBe(false);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("cancels an in-flight download and cleans the staging directory", () =>
+  Effect.gen(function* () {
+    const downloading = yield* Deferred.make<void>();
+    const body = Stream.fromEffect(
+      Deferred.succeed(downloading, undefined).pipe(Effect.andThen(Effect.never)),
+    );
+    const { installation, fs } = yield* makeHarness({ body });
+    const started = yield* installation.start;
+    yield* Deferred.await(downloading);
+    expect((yield* installation.cancel(started.operationId!)).phase).toBe("cancelled");
+    expect(
+      (yield* fs.readDirectory(installation.managedDirectory)).filter((name) =>
+        name.startsWith(".install-"),
+      ),
+    ).toEqual([]);
+    expect(yield* fs.exists(`${installation.managedDirectory}/active.json`)).toBe(false);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("protects active process leases and removes the runtime after release", () =>
+  Effect.gen(function* () {
+    const { installation, fs } = yield* makeHarness();
+    yield* installation.start;
+    yield* terminalState(installation);
+    const leaseScope = yield* Scope.make();
+    yield* installation.acquire().pipe(Effect.provideService(Scope.Scope, leaseScope));
+    expect((yield* Effect.flip(installation.remove())).detail).toContain("Stop Codex sessions");
+    yield* Scope.close(leaseScope, Exit.void);
+    yield* installation.remove();
+    expect(yield* fs.exists(installation.managedDirectory)).toBe(false);
+    expect((yield* installation.state).installedVersion).toBeNull();
+    expect((yield* installation.state).executablePath).toBeNull();
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("keeps an activated runtime when a later update fails verification", () =>
+  Effect.gen(function* () {
+    const first = yield* makeHarness();
+    yield* first.installation.start;
+    yield* terminalState(first.installation);
+    const update = yield* makeHarness({
+      baseDir: first.baseDir,
+      options: { releaseAsset: { ...asset, version: "0.156.2", sha256: "0".repeat(64) } },
+    });
+    expect((yield* update.installation.state).executablePath).toBe(
+      (yield* first.installation.resolve()).executablePath,
+    );
+    yield* update.installation.start;
+    expect((yield* terminalState(update.installation)).phase).toBe("failed");
+    expect((yield* update.installation.resolve()).version).toBe("0.156.1");
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it("publishes complete packages for all supported platforms", () => {
+  for (const platform of ["darwin", "linux", "win32"] as const)
+    for (const arch of ["x64", "arm64"])
+      expect(resolveCodexReleaseAsset(platform, arch)?.url).toContain("codex-package-");
+  expect(resolveCodexReleaseAsset("linux", "riscv64")).toBeNull();
+});
diff --git a/apps/server/src/provider/CodexInstallation.ts b/apps/server/src/provider/CodexInstallation.ts
new file mode 100644
index 000000000000..4beec81770a6
--- /dev/null
+++ b/apps/server/src/provider/CodexInstallation.ts
@@ -0,0 +1,734 @@
+// @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest.
+import { ProviderDriverKind, type ProviderInstallState } from "@t3tools/contracts";
+import {
+  HostProcessArchitecture,
+  HostProcessEnvironment,
+  HostProcessPlatform,
+} from "@t3tools/shared/hostProcess";
+import { resolveCommandPath, resolveSpawnCommand } from "@t3tools/shared/shell";
+import * as Clock from "effect/Clock";
+import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
+import * as Crypto from "effect/Crypto";
+import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
+import * as Semaphore from "effect/Semaphore";
+import * as Stream from "effect/Stream";
+import * as SubscriptionRef from "effect/SubscriptionRef";
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
+import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
+import * as NodeCrypto from "node:crypto";
+import { ServerConfig } from "../config.ts";
+import { BUNDLED_MODEL_MANIFEST, ModelManifest } from "./ModelManifest.ts";
+import { resolveProviderCompatibility } from "./providerCompatibility.ts";
+
+const DRIVER = ProviderDriverKind.make("codex");
+const Version = Schema.String.check(Schema.isPattern(/^\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?$/u));
+const ActiveRelease = Schema.Struct({ version: Version });
+const InstalledRelease = Schema.Struct({
+  version: Version,
+  target: Schema.String,
+  sha256: Schema.String,
+});
+const PackageManifest = Schema.Struct({
+  layoutVersion: Schema.Literal(1),
+  version: Version,
+  target: Schema.String,
+  entrypoint: Schema.String,
+});
+const decodeVersion = Schema.decodeUnknownEffect(Version);
+const encodeRecord = Schema.encodeEffect(Schema.fromJsonString(InstalledRelease));
+const encodeActive = Schema.encodeEffect(Schema.fromJsonString(ActiveRelease));
+export interface CodexReleaseAsset {
+  readonly version: string;
+  readonly target: string;
+  readonly url: string;
+  readonly sha256: string;
+  readonly archiveBytes: number;
+}
+// Official complete packages retain the code-mode, search, and resource companions.
+const RELEASES: Readonly<Record<string, CodexReleaseAsset>> = {
+  "darwin-arm64": {
+    version: "0.156.1",
+    target: "aarch64-apple-darwin",
+    url: "https://github.com/openai/codex/releases/download/rust-v0.156.1/codex-package-aarch64-apple-darwin.tar.gz",
+    sha256: "fea42f9625091f011e38f059da974d52e57ba31831648bb1c7f0b1a385fde547",
+    archiveBytes: 127394863,
+  },
+  "darwin-x64": {
+    version: "0.156.1",
+    target: "x86_64-apple-darwin",
+    url: "https://github.com/openai/codex/releases/download/rust-v0.156.1/codex-package-x86_64-apple-darwin.tar.gz",
+    sha256: "618dbcd55419fa041871f777a14b107ceb3fe2d339ef81e21e6ab5374420dc71",
+    archiveBytes: 138670455,
+  },
+  "linux-arm64": {
+    version: "0.156.1",
+    target: "aarch64-unknown-linux-musl",
+    url: "https://github.com/openai/codex/releases/download/rust-v0.156.1/codex-package-aarch64-unknown-linux-musl.tar.gz",
+    sha256: "fdd47ed6aade0360796fd3f6f95a45096f327c15e19e8c7339f9dc5633041786",
+    archiveBytes: 136933361,
+  },
+  "linux-x64": {
+    version: "0.156.1",
+    target: "x86_64-unknown-linux-musl",
+    url: "https://github.com/openai/codex/releases/download/rust-v0.156.1/codex-package-x86_64-unknown-linux-musl.tar.gz",
+    sha256: "8b711520beddf385467b8da4d2c93736637c6ba1e46811cf0d8606b7c490b6f6",
+    archiveBytes: 145976992,
+  },
+  "win32-arm64": {
+    version: "0.156.1",
+    target: "aarch64-pc-windows-msvc",
+    url: "https://github.com/openai/codex/releases/download/rust-v0.156.1/codex-package-aarch64-pc-windows-msvc.tar.gz",
+    sha256: "85994caecdc7609c49fd585c1cdb5677fa9d0acbf789650cff23a13afc9505db",
+    archiveBytes: 142037952,
+  },
+  "win32-x64": {
+    version: "0.156.1",
+    target: "x86_64-pc-windows-msvc",
+    url: "https://github.com/openai/codex/releases/download/rust-v0.156.1/codex-package-x86_64-pc-windows-msvc.tar.gz",
+    sha256: "a2e017db9807e6a2269a26fea0e1d9546469cef4d472a33016bc9f3ad7d3b733",
+    archiveBytes: 153839991,
+  },
+};
+export const resolveCodexReleaseAsset = (platform: NodeJS.Platform, arch: string) =>
+  RELEASES[`${platform}-${arch}`] ?? null;
+export class CodexInstallationError extends Schema.TaggedError<CodexInstallationError>()(
+  "CodexInstallationError",
+  {
+    operation: Schema.String,
+    detail: Schema.String,
+    cause: Schema.optional(Schema.Defect()),
+  },
+) {
+  override get message() {
+    return this.detail;
+  }
+}
+const isInstallationError = Schema.is(CodexInstallationError);
+const installationError = (operation: string, detail: string, cause?: unknown) =>
+  new CodexInstallationError({ operation, detail, ...(cause === undefined ? {} : { cause }) });
+const wrapFailure = (operation: string, detail: string) => (cause: unknown) =>
+  isInstallationError(cause) ? cause : installationError(operation, detail, cause);
+export interface CodexExecutable {
+  readonly executablePath: string;
+  readonly source: "managed" | "local";
+  readonly version: string;
+  readonly managedVersionDirectory: string | null;
+}
+interface CodexInstallationService {
+  readonly managedDirectory: string;
+  readonly resolve: () => Effect.Effect<CodexExecutable, CodexInstallationError>;
+  readonly acquire: () => Effect.Effect<CodexExecutable, CodexInstallationError, Scope.Scope>;
+  readonly start: Effect.Effect<ProviderInstallState, CodexInstallationError>;
+  readonly cancel: (
+    operationId: string,
+  ) => Effect.Effect<ProviderInstallState, CodexInstallationError>;
+  readonly state: Effect.Effect<ProviderInstallState>;
+  readonly changes: Stream.Stream<ProviderInstallState>;
+  readonly remove: (
+    protectedBinaryPaths?: ReadonlyArray<string>,
+  ) => Effect.Effect<void, CodexInstallationError>;
+}
+export class CodexInstallation extends Context.Service<
+  CodexInstallation,
+  CodexInstallationService
+>()("t3/provider/CodexInstallation") {
+  static readonly layer = Layer.effect(
+    CodexInstallation,
+    Effect.gen(function* () {
+      const config = yield* ServerConfig;
+      return yield* makeCodexInstallation({ baseDir: config.baseDir });
+    }),
+  );
+}
+export interface CodexInstallationOptions {
+  readonly baseDir: string;
+  readonly releaseAsset?: CodexReleaseAsset | null;
+  readonly validate?: (
+    executable: CodexExecutable,
+    expectedVersion: string,
+  ) => Effect.Effect<void, CodexInstallationError, Scope.Scope>;
+}
+const isRunning = (state: ProviderInstallState) =>
+  ["downloading", "extracting", "verifying"].includes(state.phase);
+export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function* (
+  options: CodexInstallationOptions,
+) {
+  const manifestService = yield* ModelManifest;
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const crypto = yield* Crypto.Crypto;
+  const http = yield* HttpClient.HttpClient;
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const serviceScope = yield* Effect.scope;
+  const platform = yield* HostProcessPlatform;
+  const environment = yield* HostProcessEnvironment;
+  const arch = yield* HostProcessArchitecture;
+  const asset =
+    options.releaseAsset === undefined
+      ? resolveCodexReleaseAsset(platform, arch)
+      : options.releaseAsset;
+  const managedDirectory = path.join(options.baseDir, "tools", "codex");
+  const activePath = path.join(managedDirectory, "active.json");
+  const executableName = platform === "win32" ? "codex.exe" : "codex";
+  const gate = yield* Semaphore.make(1);
+  let leases = 0;
+  let running: { readonly operationId: string; readonly fiber: Fiber.Fiber<void> } | undefined;
+  const state = yield* SubscriptionRef.make<ProviderInstallState>({
+    driver: DRIVER,
+    operationId: null,
+    phase: "idle",
+    downloadedBytes: 0,
+    totalBytes: asset?.archiveBytes ?? null,
+    version: asset?.version ?? null,
+    installedVersion: null,
+    executablePath: null,
+    canRemove: false,
+    message: null,
+  });
+  const readRecord = Effect.fn("CodexInstallation.readRecord")(function* <A>(
+    file: string,
+    schema: Schema.Codec<A>,
+  ) {
+    const info = yield* fs.stat(file);
+    if (info.type !== "File" || Number(info.size) > 8192)
+      return yield* installationError(
+        "resolve",
+        "The managed Codex installation record is invalid. Reinstall Codex.",
+      );
+    return yield* Schema.decodeUnknownEffect(Schema.fromJsonString(schema))(
+      yield* fs.readFileString(file),
+    );
+  });
+  const fromDirectory = Effect.fn("CodexInstallation.fromDirectory")(function* (
+    directory: string,
+    version: string,
+    target: string,
+  ) {
+    const manifest = yield* readRecord(path.join(directory, "codex-package.json"), PackageManifest);
+    if (
+      manifest.version !== version ||
+      manifest.target !== target ||
+      manifest.entrypoint !== `bin/${executableName}`
+    )
+      return yield* installationError(
+        "verify",
+        "The downloaded Codex package does not match the expected release.",
+      );
+    for (const name of [
+      `bin/${executableName}`,
+      `bin/codex-code-mode-host${platform === "win32" ? ".exe" : ""}`,
+      `codex-path/rg${platform === "win32" ? ".exe" : ""}`,
+    ]) {
+      const info = yield* fs.stat(path.join(directory, name));
+      if (
+        info.type !== "File" ||
+        Number(info.size) === 0 ||
+        (platform !== "win32" && (info.mode & 0o111) === 0)
+      )
+        return yield* installationError(
+          "verify",
+          "The managed Codex package is incomplete. Reinstall Codex.",
+        );
+    }
+    return {
+      executablePath: path.join(directory, "bin", executableName),
+      source: "managed",
+      version,
+      managedVersionDirectory: directory,
+    } satisfies CodexExecutable;
+  });
+  const completedRelease = Effect.fn("CodexInstallation.completedRelease")(function* (
+    version: string,
+  ) {
+    yield* decodeVersion(version);
+    const directory = path.join(managedDirectory, version);
+    const record = yield* readRecord(
+      path.join(directory, ".install-complete.json"),
+      InstalledRelease,
+    );
+    if (record.version !== version)
+      return yield* installationError(
+        "resolve",
+        "The managed Codex installation record has the wrong version.",
+      );
+    return yield* fromDirectory(directory, version, record.target);
+  });
+  const compatibility = Effect.fn("CodexInstallation.compatibility")(function* (version: string) {
+    const manifest = yield* manifestService.current;
+    return (
+      resolveProviderCompatibility(manifest.compatibility, DRIVER, version) ??
+      resolveProviderCompatibility(BUNDLED_MODEL_MANIFEST.compatibility, DRIVER, version)
+    );
+  });
+  const resolveManaged = Effect.fn("CodexInstallation.resolveManaged")(
+    function* () {
+      const active = yield* readRecord(activePath, ActiveRelease);
+      const executable = yield* completedRelease(active.version);
+      const advisory = yield* compatibility(executable.version);
+      if (advisory?.status !== "supported")
+        return yield* installationError(
+          "resolve",
+          advisory?.message ?? "Update the managed Codex installation to continue.",
+        );
+      return executable;
+    },
+    Effect.mapError(
+      wrapFailure("resolve", "Codex is not installed in T3 Code. Install it to continue."),
+    ),
+  );
+  const acquire = Effect.fn("CodexInstallation.acquire")(function* () {
+    return yield* Effect.acquireRelease(
+      gate.withPermit(
+        resolve().pipe(
+          Effect.tap(() =>
+            Effect.sync(() => {
+              leases += 1;
+            }),
+          ),
+        ),
+      ),
+      () =>
+        Effect.sync(() => {
+          leases -= 1;
+        }),
+    );
+  });
+  const runCommand = Effect.fn("CodexInstallation.runCommand")(function* (
+    command: string,
+    args: ReadonlyArray<string>,
+  ) {
+    const resolved = yield* resolveSpawnCommand(command, args).pipe(
+      Effect.provideService(HostProcessPlatform, platform),
+    );
+    const child = yield* spawner.spawn(
+      ChildProcess.make(resolved.command, resolved.args, { shell: resolved.shell }),
+    );
+    const [output, , exitCode] = yield* Effect.all(
+      [
+        child.stdout.pipe(Stream.decodeText(), Stream.mkString),
+        child.stderr.pipe(Stream.runDrain),
+        child.exitCode,
+      ],
+      { concurrency: "unbounded" },
+    );
+    if (exitCode !== 0)
+      return yield* installationError(
+        "verify",
+        "Could not unpack or start the downloaded Codex package.",
+      );
+    return output;
+  }, Effect.scoped);
+  const localCache = new Map<string, { fingerprint: string; executable: CodexExecutable | null }>();
+  const resolveLocal = Effect.fn("CodexInstallation.resolveLocal")(
+    function* () {
+      const executablePath = yield* resolveCommandPath("codex", { env: environment }).pipe(
+        Effect.provideService(HostProcessPlatform, platform),
+        Effect.provideService(FileSystem.FileSystem, fs),
+        Effect.provideService(Path.Path, path),
+      );
+      // Keep launcher symlinks intact: version-manager shims dispatch by their invoked name.
+      const realExecutablePath = yield* fs.realPath(executablePath);
+      // A PATH entry pointing into T3's download remains a managed installation.
+      const realManaged = yield* fs.realPath(managedDirectory).pipe(Effect.option);
+      if (
+        realExecutablePath.startsWith(
+          `${Option.getOrElse(realManaged, () => managedDirectory)}${path.sep}`,
+        )
+      )
+        return null;
+      const info = yield* fs.stat(executablePath);
+      const fingerprint = `${realExecutablePath}:${info.size}:${Option.getOrUndefined(info.mtime)?.getTime()}:${Option.getOrUndefined(info.ino)}`;
+      const cached = localCache.get(executablePath);
+      const executable =
+        cached?.fingerprint === fingerprint
+          ? cached.executable
+          : yield* Effect.gen(function* () {
+              const output = yield* runCommand(executablePath, ["--version"]);
+              const version = /^codex-cli (\d+\.\d+\.\d+)$/u.exec(output.trim())?.[1];
+              if (!version) return null;
+              yield* runCommand(executablePath, ["app-server", "--help"]);
+              return {
+                executablePath,
+                source: "local",
+                version,
+                managedVersionDirectory: null,
+              } satisfies CodexExecutable;
+            }).pipe(
+              Effect.timeout("5 seconds"),
+              Effect.orElseSucceed(() => null),
+            );
+      localCache.set(executablePath, { fingerprint, executable });
+      if (!executable) return null;
+      // Cache executable probes, but reclassify against the current manifest on every resolve.
+      const advisory = yield* compatibility(executable.version);
+      return advisory?.status === "supported" ? executable : null;
+    },
+    Effect.orElseSucceed(() => null),
+  );
+  const resolve = Effect.fn("CodexInstallation.resolve")(function* () {
+    const local = yield* resolveLocal();
+    return local ?? (yield* resolveManaged());
+  });
+  const reuseLocal = Effect.fn("CodexInstallation.reuseLocal")(function* () {
+    const local = yield* resolveLocal();
+    if (!local) return false;
+    yield* SubscriptionRef.update(
+      state,
+      (current) =>
+        ({
+          ...current,
+          phase: "succeeded",
+          source: "local",
+          operationId: null,
+          installedVersion: local.version,
+          executablePath: local.executablePath,
+          downloadedBytes: 0,
+          totalBytes: null,
+          message: null,
+        }) satisfies ProviderInstallState,
+    );
+    return true;
+  });
+  const validate =
+    options.validate ??
+    Effect.fn("CodexInstallation.validate")(
+      function* (executable: CodexExecutable, version: string) {
+        const output = yield* runCommand(executable.executablePath, ["--version"]);
+        if (output.trim() !== `codex-cli ${version}`)
+          return yield* installationError(
+            "verify",
+            "The downloaded Codex executable has the wrong version.",
+          );
+      },
+      Effect.mapError(wrapFailure("verify", "The downloaded Codex runtime could not start.")),
+    );
+  const install = Effect.fn("CodexInstallation.install")(
+    function* (release: CodexReleaseAsset) {
+      yield* decodeVersion(release.version);
+      yield* fs.makeDirectory(managedDirectory, { recursive: true });
+      yield* SubscriptionRef.update(state, (current) => ({ ...current, canRemove: true }));
+      const destination = path.join(managedDirectory, release.version);
+      const activate = Effect.fn("CodexInstallation.activate")(
+        function* () {
+          const executable = yield* completedRelease(release.version);
+          const temporary = yield* fs.makeTempDirectoryScoped({
+            directory: managedDirectory,
+            prefix: ".active-",
+          });
+          const pointer = path.join(temporary, "active.json");
+          yield* fs.writeFileString(pointer, yield* encodeActive({ version: release.version }), {
+            mode: 0o600,
+            flag: "wx",
+          });
+          yield* fs.rename(pointer, activePath);
+          yield* SubscriptionRef.update(
+            state,
+            (current) =>
+              ({
+                ...current,
+                phase: "succeeded",
+                source: "managed",
+                installedVersion: release.version,
+                executablePath: executable.executablePath,
+                message: null,
+              }) satisfies ProviderInstallState,
+          );
+        },
+        Effect.scoped,
+        Effect.uninterruptible,
+      );
+      if (yield* fs.exists(destination)) {
+        const existing = yield* completedRelease(release.version);
+        const record = yield* readRecord(
+          path.join(destination, ".install-complete.json"),
+          InstalledRelease,
+        );
+        if (record.sha256 !== release.sha256 || record.target !== release.target)
+          return yield* installationError(
+            "verify",
+            "The existing managed Codex release differs from the official package. Remove it and reinstall.",
+          );
+        yield* validate(existing, release.version).pipe(
+          Effect.scoped,
+          Effect.timeout("90 seconds"),
+        );
+        yield* activate();
+        return;
+      }
+      const staging = yield* fs.makeTempDirectoryScoped({
+        directory: managedDirectory,
+        prefix: ".install-",
+      });
+      const archivePath = path.join(staging, "download.tar.gz");
+      const runtime = path.join(staging, "runtime");
+      yield* fs.makeDirectory(runtime);
+      const hash = NodeCrypto.createHash("sha256");
+      let downloadedBytes = 0;
+      let lastProgressAt = yield* Clock.currentTimeMillis;
+      const response = yield* http
+        .execute(HttpClientRequest.get(release.url))
+        .pipe(Effect.flatMap(HttpClientResponse.filterStatusOk));
+      yield* response.stream.pipe(
+        Stream.tap((chunk) =>
+          Effect.gen(function* () {
+            downloadedBytes += chunk.byteLength;
+            if (downloadedBytes > release.archiveBytes)
+              return yield* installationError(
+                "download",
+                "The Codex download exceeded the expected release size.",
+              );
+            hash.update(chunk);
+            const now = yield* Clock.currentTimeMillis;
+            if (now - lastProgressAt >= 250 || downloadedBytes === release.archiveBytes) {
+              lastProgressAt = now;
+              yield* SubscriptionRef.update(state, (current) => ({ ...current, downloadedBytes }));
+            }
+          }),
+        ),
+        Stream.run(fs.sink(archivePath, { flag: "wx", mode: 0o600 })),
+        Effect.timeout("45 minutes"),
+      );
+      if (downloadedBytes !== release.archiveBytes || hash.digest("hex") !== release.sha256)
+        return yield* installationError(
+          "download",
+          "The Codex download failed its size or SHA-256 check. Nothing was installed.",
+        );
+      yield* SubscriptionRef.update(
+        state,
+        (current) =>
+          ({
+            ...current,
+            phase: "extracting",
+            message: "Extracting Codex.",
+          }) satisfies ProviderInstallState,
+      );
+      const entries = (yield* runCommand("tar", ["-tzf", archivePath])).trim().split("\n");
+      const types = (yield* runCommand("tar", ["-tvzf", archivePath])).trim().split("\n");
+      if (
+        entries.length > 10000 ||
+        entries.length !== types.length ||
+        types.some((line) => !["-", "d"].includes(line[0] ?? "")) ||
+        entries.some((entry) => {
+          const parts = entry.replace(/\/$/u, "").split("/");
+          return (
+            !entry ||
+            entry.includes("\\") ||
+            entry.startsWith("/") ||
+            parts.some((part) => part === ".." || part === "." || part === "" || part.includes(":"))
+          );
+        })
+      )
+        return yield* installationError("extract", "The Codex archive contains unsafe entries.");
+      yield* runCommand("tar", ["-xzf", archivePath, "-C", runtime]);
+      yield* SubscriptionRef.update(
+        state,
+        (current) =>
+          ({
+            ...current,
+            phase: "verifying",
+            message: "Checking Codex.",
+          }) satisfies ProviderInstallState,
+      );
+      const executable = yield* fromDirectory(runtime, release.version, release.target);
+      yield* validate(executable, release.version).pipe(
+        Effect.scoped,
+        Effect.timeout("90 seconds"),
+      );
+      yield* fs.writeFileString(
+        path.join(runtime, ".install-complete.json"),
+        yield* encodeRecord({
+          version: release.version,
+          target: release.target,
+          sha256: release.sha256,
+        }),
+        { flag: "wx", mode: 0o600 },
+      );
+      yield* fs.rename(runtime, destination);
+      yield* activate();
+    },
+    Effect.scoped,
+    Effect.mapError(
+      wrapFailure(
+        "install",
+        "Could not install Codex. Check disk space and directory access, then try again.",
+      ),
+    ),
+  );
+  const start = gate
+    .withPermit(
+      Effect.gen(function* () {
+        const current = yield* SubscriptionRef.get(state);
+        if (isRunning(current)) return current;
+        if (yield* reuseLocal()) return yield* SubscriptionRef.get(state);
+        if (!asset) {
+          return yield* installationError(
+            "start",
+            `OpenAI does not publish a Codex runtime for ${platform}-${arch}. Use a supported remote environment or a custom executable.`,
+          );
+        }
+        const operationId = yield* crypto.randomUUIDv4;
+        const next: ProviderInstallState = {
+          driver: DRIVER,
+          operationId,
+          phase: "downloading",
+          downloadedBytes: 0,
+          totalBytes: asset.archiveBytes,
+          version: asset.version,
+          installedVersion: current.installedVersion,
+          canRemove: current.canRemove,
+          message: "Downloading Codex.",
+        };
+        yield* SubscriptionRef.set(state, next);
+        const work = install(asset).pipe(
+          Effect.onExit((exit) =>
+            Exit.isFailure(exit)
+              ? SubscriptionRef.update(state, (value) => {
+                  if (value.operationId !== operationId || value.phase === "succeeded")
+                    return value;
+                  const error = Cause.findErrorOption(exit.cause);
+                  const cancelled = Cause.hasInterruptsOnly(exit.cause);
+                  return {
+                    ...value,
+                    phase: cancelled ? "cancelled" : "failed",
+                    message: cancelled
+                      ? "Installation cancelled. The previous runtime is unchanged."
+                      : Option.isSome(error)
+                        ? error.value.detail
+                        : "Could not finish the Codex installation. Check disk space and directory access.",
+                  } satisfies ProviderInstallState;
+                })
+              : Effect.void,
+          ),
+          Effect.ignoreCause,
+          Effect.ensuring(
+            Effect.sync(() => {
+              if (running?.operationId === operationId) running = undefined;
+            }),
+          ),
+        );
+        const fiber = yield* Effect.forkIn(Effect.interruptible(work), serviceScope);
+        running = { operationId, fiber };
+        return next;
+      }).pipe(Effect.uninterruptible),
+    )
+    .pipe(Effect.mapError(wrapFailure("start", "Could not start the Codex installation.")));
+
+  const cancel = Effect.fn("CodexInstallation.cancel")(function* (operationId: string) {
+    return yield* gate.withPermit(
+      Effect.gen(function* () {
+        const current = yield* SubscriptionRef.get(state);
+        if (current.operationId !== operationId) {
+          return yield* installationError(
+            "cancel",
+            "This installation is no longer current. Refresh its status before cancelling.",
+          );
+        }
+        if (running?.operationId === operationId && isRunning(current)) {
+          yield* Fiber.interrupt(running.fiber);
+        }
+        return yield* SubscriptionRef.get(state);
+      }),
+    );
+  });
+
+  const remove = Effect.fn("CodexInstallation.remove")(
+    function* (protectedBinaryPaths: ReadonlyArray<string> = []) {
+      yield* gate.withPermit(
+        Effect.gen(function* () {
+          if (isRunning(yield* SubscriptionRef.get(state)) || leases > 0) {
+            return yield* installationError(
+              "remove",
+              "Stop Codex sessions and sign-in flows before removing its managed runtime.",
+            );
+          }
+          const realManaged = yield* fs.realPath(managedDirectory).pipe(Effect.option);
+          if (Option.isSome(realManaged)) {
+            for (const binary of protectedBinaryPaths) {
+              const resolved = yield* fs.realPath(binary).pipe(Effect.option);
+              const candidate = Option.getOrElse(resolved, () => path.resolve(binary));
+              if (candidate.startsWith(`${realManaged.value}${path.sep}`))
+                return yield* installationError(
+                  "remove",
+                  "A provider instance uses a custom path inside managed Codex. Clear that path before removing it.",
+                );
+            }
+          }
+          yield* fs.remove(managedDirectory, { recursive: true, force: true });
+          yield* SubscriptionRef.update(
+            state,
+            (current) =>
+              ({
+                ...current,
+                operationId: null,
+                phase: "idle",
+                downloadedBytes: 0,
+                installedVersion: null,
+                executablePath: null,
+                source: null,
+                canRemove: false,
+                message: null,
+              }) satisfies ProviderInstallState,
+          );
+          yield* reuseLocal();
+        }).pipe(Effect.uninterruptible),
+      );
+    },
+    Effect.mapError(
+      wrapFailure(
+        "remove",
+        "Could not remove the managed Codex runtime. Check for open processes and try again.",
+      ),
+    ),
+  );
+
+  yield* Effect.gen(function* () {
+    const canRemove = yield* fs.exists(managedDirectory);
+    yield* SubscriptionRef.update(state, (current) => ({ ...current, canRemove }));
+    if (yield* reuseLocal()) return;
+    if (!(yield* fs.exists(activePath))) return;
+    const active = yield* readRecord(activePath, ActiveRelease);
+    const installed = yield* completedRelease(active.version);
+    yield* SubscriptionRef.update(
+      state,
+      (current) =>
+        ({
+          ...current,
+          installedVersion: installed.version,
+          executablePath: installed.executablePath,
+          source: "managed",
+        }) satisfies ProviderInstallState,
+    );
+  }).pipe(
+    Effect.catch(() =>
+      SubscriptionRef.update(
+        state,
+        (current) =>
+          ({
+            ...current,
+            phase: "failed",
+            message: "The managed Codex runtime is incomplete. Remove it and reinstall.",
+          }) satisfies ProviderInstallState,
+      ),
+    ),
+  );
+
+  return CodexInstallation.of({
+    managedDirectory,
+    resolve,
+    acquire,
+    start,
+    cancel,
+    state: SubscriptionRef.get(state),
+    changes: SubscriptionRef.changes(state),
+    remove,
+  });
+});
diff --git a/apps/server/src/provider/CodexManagedErrors.test.ts b/apps/server/src/provider/CodexManagedErrors.test.ts
new file mode 100644
index 000000000000..a1f253c922ed
--- /dev/null
+++ b/apps/server/src/provider/CodexManagedErrors.test.ts
@@ -0,0 +1,64 @@
+import { assert, it } from "@effect/vitest";
+import { classifyCodexManagedError } from "./CodexManagedErrors.ts";
+it("maps streamed failures to safe actionable messages and reconnect decisions", () => {
+  assert.deepEqual(
+    classifyCodexManagedError({
+      error: {
+        code: "subscription_sharing_v2_invalid_user",
+        message: "opaque token dummy-sensitive",
+      },
+    }),
+    {
+      message:
+        "ChatGPT could not validate this connection. Check the selected account and sharing permissions.",
+      revoke: false,
+      code: "subscription_sharing_v2_invalid_user",
+    },
+  );
+  assert.include(
+    classifyCodexManagedError("subscription_sharing_usage_limit_exceeded")!.message,
+    "Usage settings",
+  );
+  assert.equal(
+    classifyCodexManagedError("subscription_sharing_usage_limit_exceeded")!.code,
+    "subscription_sharing_usage_limit_exceeded",
+  );
+  assert.isFalse(classifyCodexManagedError("subscription_sharing_usage_unavailable")!.revoke);
+  assert.include(
+    classifyCodexManagedError("subscription_sharing_unsupported_capability")!.message,
+    "feature",
+  );
+  assert.isUndefined(classifyCodexManagedError(undefined));
+  assert.isUndefined(classifyCodexManagedError({ error: "unknown" }));
+});
+
+it("distinguishes unsupported tools from input items without exposing the raw response", () => {
+  const code = "subscription_sharing_unsupported_capability";
+  for (const [detail, expected] of [
+    ["tool 'namespace' is not supported", "tool namespace"],
+    ["input item 'additional_tools' is not supported", "input item"],
+  ]) {
+    const response = { error: { code, message: `${detail}; dummy-sensitive` } };
+    for (const value of [response, JSON.stringify(response)]) {
+      const failure = classifyCodexManagedError(value);
+      assert.isDefined(failure);
+      assert.include(failure!.message, expected!);
+      assert.notInclude(failure!.message, "dummy-sensitive");
+      assert.isFalse(failure!.revoke);
+    }
+  }
+});
+
+it("preserves credentials for the current subscriber and permission error codes", () => {
+  for (const code of [
+    "subscription_sharing_invalid_user",
+    "subscription_sharing_user_not_eligible",
+    "subscription_sharing_route_not_supported",
+    "subscription_sharing_user_unavailable",
+    "chatpass_v2_scope_not_authorized",
+    "chatpass_v2_invalid_authorization_context",
+  ]) {
+    assert.strictEqual(classifyCodexManagedError({ error: { code } })?.code, code);
+    assert.isFalse(classifyCodexManagedError({ error: { code } })!.revoke);
+  }
+});
diff --git a/apps/server/src/provider/CodexManagedErrors.ts b/apps/server/src/provider/CodexManagedErrors.ts
new file mode 100644
index 000000000000..9c8fe26bbb6e
--- /dev/null
+++ b/apps/server/src/provider/CodexManagedErrors.ts
@@ -0,0 +1,87 @@
+const legacyFailures = {
+  subscription_sharing_v2_user_not_eligible: {
+    message:
+      "ChatGPT sharing is unavailable for this account or workspace. Use another provider or check its sharing policy.",
+    revoke: false,
+  },
+  subscription_sharing_usage_limit_exceeded: {
+    message:
+      "Your ChatGPT usage limit was reached. Check ChatGPT Usage settings for your available allowance.",
+    revoke: false,
+  },
+  subscription_sharing_usage_unavailable: {
+    message: "ChatGPT usage is temporarily unavailable. Try again shortly.",
+    revoke: false,
+  },
+  subscription_sharing_unsupported_capability: {
+    message:
+      "Codex used a feature that ChatGPT sharing does not support. Use another provider for this request.",
+    revoke: false,
+  },
+  subscription_sharing_v2_client_not_enabled: {
+    message:
+      "This app is not enabled for this ChatGPT connection. Use your existing CLI or another provider.",
+    revoke: false,
+  },
+  subscription_sharing_v2_route_not_supported: {
+    message: "ChatGPT does not support this request route.",
+    revoke: false,
+  },
+  subscription_sharing_v2_invalid_user: {
+    message:
+      "ChatGPT could not validate this connection. Check the selected account and sharing permissions.",
+    revoke: false,
+  },
+  subscription_sharing_v2_user_unavailable: {
+    message: "ChatGPT is temporarily unavailable. Try again shortly.",
+    revoke: false,
+  },
+} as const;
+const failures = {
+  ...legacyFailures,
+  subscription_sharing_user_not_eligible: legacyFailures.subscription_sharing_v2_user_not_eligible,
+  subscription_sharing_route_not_supported:
+    legacyFailures.subscription_sharing_v2_route_not_supported,
+  subscription_sharing_invalid_user: legacyFailures.subscription_sharing_v2_invalid_user,
+  subscription_sharing_user_unavailable: legacyFailures.subscription_sharing_v2_user_unavailable,
+  chatpass_v2_scope_not_authorized: {
+    message:
+      "This ChatGPT grant does not authorize the request. Check the connection's sharing permissions.",
+    revoke: false,
+  },
+  chatpass_v2_invalid_authorization_context: {
+    message:
+      "ChatGPT could not authorize this connection. Check the client and sharing permissions.",
+    revoke: false,
+  },
+};
+export function classifyCodexManagedError(value: unknown) {
+  let text: string;
+  try {
+    text = typeof value === "string" ? value : JSON.stringify(value);
+  } catch {
+    return undefined;
+  }
+  if (typeof text !== "string") return undefined;
+  for (const [code, failure] of Object.entries(failures)) {
+    if (!text.includes(code)) continue;
+    if (code === "subscription_sharing_unsupported_capability") {
+      if (text.includes("tool 'namespace'"))
+        return {
+          ...failure,
+          code,
+          message:
+            "Codex sent a tool namespace that ChatGPT sharing does not support. Use another provider for this request.",
+        };
+      if (text.includes("additional_tools"))
+        return {
+          ...failure,
+          code,
+          message:
+            "Codex sent an input item that ChatGPT sharing does not support. Use another provider for this request.",
+        };
+    }
+    return { ...failure, code };
+  }
+  return undefined;
+}
diff --git a/apps/server/src/provider/CodexManagedHome.ts b/apps/server/src/provider/CodexManagedHome.ts
new file mode 100644
index 000000000000..7f6d6313e11e
--- /dev/null
+++ b/apps/server/src/provider/CodexManagedHome.ts
@@ -0,0 +1,20 @@
+import type { CodexSettings, ProviderInstanceId } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as Path from "effect/Path";
+import { resolveCodexHomeLayout } from "./Drivers/CodexHomeLayout.ts";
+
+export const resolveManagedCodexHomeLayout = Effect.fn("resolveManagedCodexHomeLayout")(function* (
+  stateDir: string,
+  instanceId: ProviderInstanceId,
+  config: CodexSettings,
+) {
+  const path = yield* Path.Path;
+  return yield* resolveCodexHomeLayout({
+    ...config,
+    shadowHomePath:
+      config.shadowHomePath.trim() ||
+      (instanceId === "codex"
+        ? ""
+        : path.join(stateDir, "providers", "codex", instanceId, "shadow")),
+  });
+});
diff --git a/apps/server/src/provider/CodexManagedRuntime.test.ts b/apps/server/src/provider/CodexManagedRuntime.test.ts
new file mode 100644
index 000000000000..aeba7c5bfe3d
--- /dev/null
+++ b/apps/server/src/provider/CodexManagedRuntime.test.ts
@@ -0,0 +1,225 @@
+// @effect-diagnostics nodeBuiltinImport:off - checks the host's default Codex directory without writing to it.
+import * as NodeOS from "node:os";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { assert, it } from "@effect/vitest";
+import { CodexSettings, EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
+import * as Clock from "effect/Clock";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import { HttpClient, HttpClientResponse } from "effect/unstable/http";
+import { ServerConfig } from "../config.ts";
+import { ServerSecretStore } from "../auth/ServerSecretStore.ts";
+import { ServerEnvironmentIdentity } from "../environment/ServerEnvironment.ts";
+import { CodexInstallation } from "./CodexInstallation.ts";
+import { makeCodexManagedRuntime } from "./CodexManagedRuntime.ts";
+import * as ProviderCredentialStore from "./ProviderCredentialStore.ts";
+import { codexAppServerArgs } from "./Layers/codexLaunchArgs.ts";
+import { resolveManagedCodexHomeLayout } from "./CodexManagedHome.ts";
+
+const encodeJson = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
+const decodeSettings = Schema.decodeSync(CodexSettings);
+it.effect("managed home defaults to the global Codex home and honors configured home paths", () =>
+  Effect.gen(function* () {
+    const path = yield* Path.Path;
+    const primary = yield* resolveManagedCodexHomeLayout(
+      "/t3-state",
+      ProviderInstanceId.make("codex"),
+      decodeSettings({}),
+    );
+    assert.equal(primary.sharedHomePath, path.join(NodeOS.homedir(), ".codex"));
+    assert.equal(primary.mode, "direct");
+    const additional = yield* resolveManagedCodexHomeLayout(
+      "/t3-state",
+      ProviderInstanceId.make("codex-work"),
+      decodeSettings({}),
+    );
+    assert.equal(additional.sharedHomePath, primary.sharedHomePath);
+    assert.equal(additional.mode, "authOverlay");
+    const configured = yield* resolveManagedCodexHomeLayout(
+      "/t3-state",
+      ProviderInstanceId.make("codex-work"),
+      decodeSettings({ homePath: "/custom/shared", shadowHomePath: "/custom/shadow" }),
+    );
+    assert.equal(configured.sharedHomePath, "/custom/shared");
+    assert.equal(configured.effectiveHomePath, "/custom/shadow");
+  }).pipe(Effect.provide(NodeServices.layer)),
+);
+for (const source of ["managed", "local"] as const)
+  for (const account of ["primary", "additional"] as const)
+    it.effect(
+      `${source} Codex ${account} account shares home state without routing owned tokens through ambient CLI overrides`,
+      () =>
+        Effect.gen(function* () {
+          const instanceId = ProviderInstanceId.make(
+            account === "primary" ? "codex" : "codex-personal",
+          );
+          const fs = yield* FileSystem.FileSystem;
+          const path = yield* Path.Path;
+          const sharedHome = yield* fs.makeTempDirectoryScoped({ prefix: "codex-shared-home-" });
+          yield* fs.writeFileString(path.join(sharedHome, "auth.json"), "native-auth-unchanged");
+          yield* fs.writeFileString(path.join(sharedHome, "config.toml"), "# shared config\n");
+          const data = new Map<string, Uint8Array>();
+          const secrets = ServerSecretStore.of({
+            get: (key) => Effect.sync(() => Option.fromUndefinedOr(data.get(key))),
+            set: (key, value) =>
+              Effect.sync(() => {
+                data.set(key, value);
+              }),
+            remove: (key) =>
+              Effect.sync(() => {
+                data.delete(key);
+              }),
+            create: () => Effect.die("unused"),
+            getOrCreateRandom: () => Effect.die("unused"),
+          });
+          let leases = 0;
+          const executable = {
+            executablePath:
+              source === "managed" ? "/isolated/tools/codex/0.156.1/bin/codex" : "/user/bin/codex",
+            managedVersionDirectory: source === "managed" ? "/isolated/tools/codex/0.156.1" : null,
+            source,
+            version: "0.156.1",
+          };
+          const installerLayer = Layer.mock(CodexInstallation)({
+            managedDirectory: "/isolated/tools/codex",
+            resolve: () => Effect.succeed(executable),
+            acquire: () =>
+              Effect.gen(function* () {
+                leases++;
+                yield* Effect.addFinalizer(() =>
+                  Effect.sync(() => {
+                    leases--;
+                  }),
+                );
+                return executable;
+              }),
+          });
+          yield* Effect.gen(function* () {
+            const store = yield* ProviderCredentialStore.make("codex-chatgpt", instanceId);
+            const json = yield* encodeJson({
+              clientId: "oaiapp_test",
+              accessToken: "dummy-owned-access",
+              refreshToken: "dummy-refresh",
+              expiresAt: (yield* Clock.currentTimeMillis) + 3_600_000,
+              earliestRefreshAt: null,
+              scopes: ["chatgpt.tokens.use.direct"],
+              subject: "test-user",
+              email: null,
+            });
+            yield* store.set(new TextEncoder().encode(json));
+            const ambient = {
+              CODEX_HOME: "/user/.codex",
+              OPENAI_API_KEY: "dummy-global-key",
+              OPENAI_BASE_URL: "https://user-proxy.test",
+              T3CODE_CODEX_LAUNCH_ARGS: "--config model_provider=global-proxy",
+              PATH: "/usr/bin",
+            };
+            const runtime = yield* makeCodexManagedRuntime({
+              instanceId,
+              enabled: true,
+              config: decodeSettings({ setupMode: "managed", homePath: sharedHome }),
+              environment: ambient,
+            });
+            yield* Effect.gen(function* () {
+              const effective = yield* runtime.resolve;
+              assert.strictEqual(leases, 1);
+              assert.strictEqual(effective.config.binaryPath, executable.executablePath);
+              assert.notStrictEqual(effective.config.homePath, ambient.CODEX_HOME);
+              assert.equal(runtime.homeLayout.sharedHomePath, sharedHome);
+              if (account === "primary") {
+                assert.equal(effective.config.homePath, sharedHome);
+                assert.equal(runtime.homeLayout.mode, "direct");
+              } else {
+                assert.include(effective.config.homePath, instanceId);
+                assert.include(effective.config.homePath, "userdata/providers/codex");
+                assert.equal(runtime.homeLayout.mode, "authOverlay");
+                assert.equal(
+                  yield* fs.readLink(path.join(effective.config.homePath, "sessions")),
+                  path.join(sharedHome, "sessions"),
+                );
+                assert.equal(
+                  yield* fs.readLink(path.join(effective.config.homePath, "config.toml")),
+                  path.join(sharedHome, "config.toml"),
+                );
+                assert.isFalse(yield* fs.exists(path.join(effective.config.homePath, "auth.json")));
+              }
+              assert.strictEqual(effective.environment.ACCESS_TOKEN, "dummy-owned-access");
+              assert.isUndefined(effective.environment.OPENAI_API_KEY);
+              assert.isUndefined(effective.environment.OPENAI_BASE_URL);
+              assert.isUndefined(effective.environment.T3CODE_CODEX_LAUNCH_ARGS);
+              const args = codexAppServerArgs(effective.config.launchArgs);
+              assert.include(
+                args,
+                'model_providers.openai_token_sharing.base_url="https://api.openai.com/v1"',
+              );
+              assert.include(
+                args,
+                'model_providers.openai_token_sharing.model_catalog_url="https://api.openai.com/v1/models"',
+              );
+              assert.include(args, "features.api_key_model_discovery=true");
+              assert.notInclude(effective.config.launchArgs, "model_catalog_json");
+              assert.notInclude(effective.config.launchArgs, "x-openai-chatpass-test");
+              assert.include(
+                args,
+                "model_providers.openai_token_sharing.supports_websockets=false",
+              );
+              assert.include(
+                args,
+                "model_providers.openai_token_sharing.requires_openai_auth=false",
+              );
+              assert.notInclude(effective.config.launchArgs, "dummy-owned-access");
+              assert.strictEqual(ambient.CODEX_HOME, "/user/.codex");
+            }).pipe(Effect.scoped);
+            assert.strictEqual(leases, 0);
+            yield* runtime.auth.controller.logout(Effect.void);
+            assert.equal(
+              yield* fs.readFileString(path.join(sharedHome, "auth.json")),
+              "native-auth-unchanged",
+            );
+          }).pipe(
+            Effect.provideService(ServerSecretStore, secrets),
+            Effect.provideService(ServerEnvironmentIdentity, {
+              getEnvironmentId: Effect.succeed(
+                EnvironmentId.make("00000000-0000-4000-8000-000000000001"),
+              ),
+            }),
+            Effect.provide(installerLayer),
+            Effect.provideService(
+              HttpClient.HttpClient,
+              HttpClient.make((request) =>
+                Effect.sync(() => {
+                  assert.isTrue(
+                    [
+                      "https://auth.openai.com/.well-known/openid-configuration",
+                      "https://auth.openai.com/revoke",
+                    ].includes(request.url),
+                  );
+                  return HttpClientResponse.fromWeb(
+                    request,
+                    request.url.endsWith("/revoke")
+                      ? new Response(null, { status: 200 })
+                      : Response.json({
+                          issuer: "https://auth.openai.com",
+                          authorization_endpoint: "https://auth.openai.com/api/accounts/authorize",
+                          token_endpoint: "https://auth.openai.com/api/accounts/oauth/token",
+                          jwks_uri: "https://auth.openai.com/jwks",
+                          revocation_endpoint: "https://auth.openai.com/revoke",
+                        }),
+                  );
+                }),
+              ),
+            ),
+          );
+        }).pipe(
+          Effect.scoped,
+          Effect.provide(
+            ServerConfig.layerTest(process.cwd(), { prefix: "t3-managed-runtime-" }).pipe(
+              Layer.provideMerge(NodeServices.layer),
+            ),
+          ),
+        ),
+    );
diff --git a/apps/server/src/provider/CodexManagedRuntime.ts b/apps/server/src/provider/CodexManagedRuntime.ts
new file mode 100644
index 000000000000..528673fc3406
--- /dev/null
+++ b/apps/server/src/provider/CodexManagedRuntime.ts
@@ -0,0 +1,112 @@
+import { resolveManagedCodexHomeLayout } from "./CodexManagedHome.ts";
+import { CodexSettings, ProviderSetupError, type ProviderInstanceId } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import { ServerConfig } from "../config.ts";
+import { CodexInstallation } from "./CodexInstallation.ts";
+import { makeCodexChatGptAuth } from "./CodexChatGptAuth.ts";
+import { materializeCodexShadowHome } from "./Drivers/CodexHomeLayout.ts";
+
+export interface CodexEffectiveRuntime {
+  readonly config: CodexSettings;
+  readonly environment: NodeJS.ProcessEnv;
+  readonly revision: string;
+}
+const decodeSettings = Schema.decodeSync(CodexSettings);
+// Managed sign-in stores tokens in T3's credential store and never writes native auth.json.
+const managedCodexLaunchArgs = [
+  'model_provider="openai_token_sharing"',
+  'model_providers.openai_token_sharing.name="OpenAI Token Sharing"',
+  'model_providers.openai_token_sharing.base_url="https://api.openai.com/v1"',
+  'model_providers.openai_token_sharing.model_catalog_url="https://api.openai.com/v1/models"',
+  "features.api_key_model_discovery=true",
+  'model_providers.openai_token_sharing.env_key="ACCESS_TOKEN"',
+  'model_providers.openai_token_sharing.wire_api="responses"',
+  "model_providers.openai_token_sharing.requires_openai_auth=false",
+  "model_providers.openai_token_sharing.supports_websockets=false",
+]
+  .map((value) => `-c '${value}'`)
+  .join(" ");
+
+export const makeCodexManagedRuntime = Effect.fn("makeCodexManagedRuntime")(function* (options: {
+  readonly instanceId: ProviderInstanceId;
+  readonly enabled: boolean;
+  readonly environment: NodeJS.ProcessEnv;
+  readonly config: CodexSettings;
+}) {
+  const installation = yield* CodexInstallation;
+  const config = yield* ServerConfig;
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const auth = yield* makeCodexChatGptAuth({
+    instanceId: options.instanceId,
+    defaultReturnUrl: new URL(
+      "/welcome",
+      config.devUrl ?? `http://localhost:${config.port}`,
+    ).toString(),
+  });
+  const homeLayout = yield* resolveManagedCodexHomeLayout(
+    config.stateDir,
+    options.instanceId,
+    options.config,
+  );
+  const homePath = homeLayout.effectiveHomePath ?? homeLayout.sharedHomePath;
+  const resolve = Effect.gen(function* () {
+    const executable = yield* installation.acquire().pipe(
+      Effect.mapError(
+        () =>
+          new ProviderSetupError({
+            instanceId: options.instanceId,
+            operation: "install",
+            detail: "Set up managed Codex before starting a session.",
+          }),
+      ),
+    );
+    const credentials = yield* auth.access;
+    yield* materializeCodexShadowHome(homeLayout).pipe(
+      Effect.provideService(FileSystem.FileSystem, fs),
+      Effect.provideService(Path.Path, path),
+      Effect.mapError(
+        (cause) =>
+          new ProviderSetupError({
+            instanceId: options.instanceId,
+            operation: "runtime",
+            detail: cause.message,
+          }),
+      ),
+    );
+    yield* fs.makeDirectory(homePath, { recursive: true }).pipe(
+      Effect.mapError(
+        () =>
+          new ProviderSetupError({
+            instanceId: options.instanceId,
+            operation: "runtime",
+            detail: "Could not prepare the managed Codex runtime.",
+          }),
+      ),
+    );
+    // Ambient CLI overrides cannot redirect a T3-owned token to a different provider.
+    const environment: NodeJS.ProcessEnv = {
+      ...options.environment,
+      ACCESS_TOKEN: credentials.accessToken,
+      CODEX_HOME: homePath,
+    };
+    delete environment.T3CODE_CODEX_LAUNCH_ARGS;
+    delete environment.OPENAI_API_KEY;
+    delete environment.OPENAI_BASE_URL;
+    return {
+      config: decodeSettings({
+        enabled: options.enabled,
+        setupMode: "managed",
+        binaryPath: executable.executablePath,
+        homePath,
+        launchArgs: managedCodexLaunchArgs,
+      }),
+      environment,
+      revision: credentials.accessToken,
+    } satisfies CodexEffectiveRuntime;
+  });
+  return { auth, resolve, installation, homePath, homeLayout };
+});
diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts
index cc9ccb074b9e..18f7aaffee06 100644
--- a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts
+++ b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts
@@ -31,8 +31,7 @@ import {
 } from "../AntigravityInstallation.ts";
 import {
   ANTIGRAVITY_AUTH_STDOUT_PREFIX,
-  resolveAntigravityProfileDirectory,
-  resolveAntigravityRuntimeTempDirectory,
+  resolveAntigravityInstanceDirectories,
 } from "../antigravityAuthSupport.ts";
 import { NoOpProviderEventLoggers, ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
 import * as ModelManifest from "../ModelManifest.ts";
@@ -74,7 +73,8 @@ const makeHarness = Effect.fn("makeAntigravityDriverHarness")(function* (
     new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
   );
   const requestLog = path.join(root, "requests.jsonl");
-  const profileDirectory = resolveAntigravityProfileDirectory(config.stateDir, instanceId);
+  const directories = yield* resolveAntigravityInstanceDirectories(config.stateDir, instanceId);
+  const profileDirectory = directories.profile;
   const instancePath = `${path.join(root, "instance-bin")}:${baseEnv.PATH ?? ""}`;
 
   const makeExecutable = Effect.fn("AntigravityDriverTest.makeExecutable")(function* (
@@ -233,6 +233,7 @@ const makeHarness = Effect.fn("makeAntigravityDriverHarness")(function* (
     fs,
     path,
     profileDirectory,
+    directories,
     instancePath,
     first,
     second,
@@ -475,7 +476,7 @@ it.layer(testLayer)("AntigravityDriver", (it) => {
     () =>
       Effect.gen(function* () {
         const h = yield* makeHarness();
-        const tempRoot = resolveAntigravityRuntimeTempDirectory(h.profileDirectory);
+        const tempRoot = h.directories.runtimeTemp;
         yield* h.refresh();
         yield* h.refresh();
         const directories = h.launches.flatMap((launch) =>
@@ -498,12 +499,17 @@ it.layer(testLayer)("AntigravityDriver", (it) => {
         const path = yield* Path.Path;
         const config = yield* ServerConfig;
         const instanceId = ProviderInstanceId.make("antigravity-orphan-sweep");
-        const tempRoot = resolveAntigravityRuntimeTempDirectory(
-          resolveAntigravityProfileDirectory(config.stateDir, instanceId),
+        const directories = yield* resolveAntigravityInstanceDirectories(
+          config.stateDir,
+          instanceId,
         );
-        const orphan = path.join(tempRoot, "run-orphan", "_MEI123", "google3");
-        yield* fs.makeDirectory(orphan, { recursive: true });
-        yield* fs.writeFileString(path.join(orphan, "payload.bin"), "stale");
+        // Older builds unpacked inside the profile.
+        const legacyRoot = path.join(directories.profile, "antigravity-acp", "tmp");
+        for (const root of [directories.runtimeTemp, legacyRoot]) {
+          const orphan = path.join(root, "run-orphan", "_MEI123", "google3");
+          yield* fs.makeDirectory(orphan, { recursive: true });
+          yield* fs.writeFileString(path.join(orphan, "payload.bin"), "stale");
+        }
         yield* AntigravityDriver.create({
           instanceId,
           displayName: "Sweep",
@@ -519,7 +525,8 @@ it.layer(testLayer)("AntigravityDriver", (it) => {
             }),
           ),
         );
-        expect(yield* fs.exists(tempRoot)).toBe(false);
+        expect(yield* fs.exists(directories.runtimeTemp)).toBe(false);
+        expect(yield* fs.exists(legacyRoot)).toBe(false);
       }).pipe(Effect.scoped),
   );
 
diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.ts b/apps/server/src/provider/Drivers/AntigravityDriver.ts
index 1141ac5856fc..fb9c7041b5fd 100644
--- a/apps/server/src/provider/Drivers/AntigravityDriver.ts
+++ b/apps/server/src/provider/Drivers/AntigravityDriver.ts
@@ -33,8 +33,7 @@ import {
   buildAntigravityAcpSpawnInput,
   isAntigravitySignInRequiredError,
   prepareAntigravityProfile,
-  resolveAntigravityProfileDirectory,
-  resolveAntigravityRuntimeTempDirectory,
+  resolveAntigravityInstanceDirectories,
   type AntigravityAuthConfig,
 } from "../antigravityAuthSupport.ts";
 import {
@@ -103,15 +102,34 @@ export const AntigravityDriver: ProviderDriver<AntigravitySettings, AntigravityD
       const authConfigIssue = antigravityAuthConfigIssue(auth);
       const processEnvironment = mergeProviderInstanceEnvironment(environment);
       const userHome = resolveAntigravityUserHome(yield* HostProcessPlatform, processEnvironment);
-      const profileDirectory = resolveAntigravityProfileDirectory(
+      const directories = yield* resolveAntigravityInstanceDirectories(
         serverConfig.stateDir,
         instanceId,
+      ).pipe(
+        Effect.provideService(Crypto.Crypto, crypto),
+        Effect.provideService(Path.Path, path),
+        Effect.mapError(
+          (cause) =>
+            new ProviderDriverError({
+              driver: DRIVER,
+              instanceId,
+              detail: "Could not resolve the Antigravity profile directory.",
+              cause,
+            }),
+        ),
       );
+      const profileDirectory = directories.profile;
       // No process of this instance exists yet, so every runtime temp
-      // directory left under the profile is an orphan from a killed server.
-      yield* removeAntigravityRuntimeTempDirs(
-        resolveAntigravityRuntimeTempDirectory(profileDirectory),
-      ).pipe(Effect.provideService(FileSystem.FileSystem, fileSystem));
+      // directory it owns is an orphan from a killed server. Older builds
+      // unpacked inside the profile.
+      for (const directory of [
+        directories.runtimeTemp,
+        path.join(profileDirectory, "antigravity-acp", "tmp"),
+      ]) {
+        yield* removeAntigravityRuntimeTempDirs(directory).pipe(
+          Effect.provideService(FileSystem.FileSystem, fileSystem),
+        );
+      }
       const continuationIdentity = defaultProviderContinuationIdentity({
         driverKind: DRIVER,
         instanceId,
@@ -165,6 +183,7 @@ export const AntigravityDriver: ProviderDriver<AntigravitySettings, AntigravityD
           baseEnv: processEnvironment,
           auth,
           userHome,
+          tempDirectory: directories.runtimeTemp,
         }).pipe(
           Effect.provideService(FileSystem.FileSystem, fileSystem),
           Effect.provideService(Path.Path, path),
diff --git a/apps/server/src/provider/Drivers/AntigravitySkills.ts b/apps/server/src/provider/Drivers/AntigravitySkills.ts
index f9627e72fb55..b11396467582 100644
--- a/apps/server/src/provider/Drivers/AntigravitySkills.ts
+++ b/apps/server/src/provider/Drivers/AntigravitySkills.ts
@@ -86,7 +86,7 @@ const readIfPresent = <A, R>(
     Effect.catchTags({
       PlatformError: (cause) =>
         cause.reason._tag === "NotFound"
-          ? Effect.succeed(undefined)
+          ? Effect.undefined
           : Effect.fail(
               new AntigravitySkillsProbeError({ reason: "filesystem-error", path, cause }),
             ),
diff --git a/apps/server/src/provider/Drivers/ClaudeDriver.ts b/apps/server/src/provider/Drivers/ClaudeDriver.ts
index b87a89dcf528..b0d7ec6d3ba6 100644
--- a/apps/server/src/provider/Drivers/ClaudeDriver.ts
+++ b/apps/server/src/provider/Drivers/ClaudeDriver.ts
@@ -31,6 +31,8 @@ import { ServerSettingsService } from "../../serverSettings.ts";
 import { ProviderDriverError } from "../Errors.ts";
 import { makeClaudeAdapter } from "../Layers/ClaudeAdapter.ts";
 import { makeClaudeScopedLimitNames } from "../Layers/claudeUsageLimits.ts";
+import * as ClaudeResetCredits from "../Layers/claudeResetCredits.ts";
+import * as ResetCreditCoordinator from "../Layers/resetCreditCoordinator.ts";
 import {
   checkClaudeProviderStatus,
   makePendingClaudeProvider,
@@ -59,7 +61,11 @@ import {
   makeProviderSnapshotSettingsSource,
   type ProviderSnapshotSettings,
 } from "../providerUpdateSettings.ts";
-import { makeClaudeCapabilitiesCacheKey, makeClaudeContinuationGroupKey } from "./ClaudeHome.ts";
+import {
+  makeClaudeCapabilitiesCacheKey,
+  makeClaudeContinuationGroupKey,
+  resolveClaudeHomePath,
+} from "./ClaudeHome.ts";
 import { discoverClaudeSkills } from "./ClaudeSkills.ts";
 const decodeClaudeSettings = Schema.decodeSync(ClaudeSettings);
 
@@ -87,6 +93,7 @@ const UPDATE = makePackageManagedProviderMaintenanceResolver({
 export type ClaudeDriverEnv =
   | BackgroundPolicy.BackgroundPolicy
   | ChildProcessSpawner.ChildProcessSpawner
+  | ResetCreditCoordinator.ResetCreditCoordinator
   | Crypto.Crypto
   | FileSystem.FileSystem
   | HttpClient.HttpClient
@@ -111,6 +118,7 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
       const path = yield* Path.Path;
       const { cwd } = yield* ServerConfig;
       const httpClient = yield* HttpClient.HttpClient;
+      const resetCreditCoordinator = yield* ResetCreditCoordinator.ResetCreditCoordinator;
       const serverSettings = yield* ServerSettingsService;
       const eventLoggers = yield* ProviderEventLoggers;
       const modelManifest = yield* ModelManifest.ModelManifest;
@@ -139,6 +147,12 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
         effectiveConfig,
         processEnv,
       );
+      const configDir = yield* resolveClaudeHomePath(effectiveConfig, processEnv);
+      const accountConfigPath = yield* ClaudeResetCredits.claudeAccountConfigPath(
+        effectiveConfig.homePath.trim() || processEnv.CLAUDE_CONFIG_DIR?.trim()
+          ? configDir
+          : undefined,
+      );
       const stampIdentity = withInstanceIdentity({
         instanceId,
         driverKind: DRIVER_KIND,
@@ -193,6 +207,12 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
                 cwd,
                 resolveClaudeModelCatalog(manifest),
                 scopedLimitNames,
+                (version) =>
+                  ClaudeResetCredits.readClaudeResetCredits(configDir, version).pipe(
+                    Effect.provideService(HttpClient.HttpClient, httpClient),
+                    Effect.provideService(FileSystem.FileSystem, fileSystem),
+                    Effect.provideService(Path.Path, path),
+                  ),
               ),
             ),
             Effect.map(stampIdentity),
@@ -250,6 +270,68 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
               Effect.provideService(Path.Path, path),
             );
 
+      // Same rules as Codex: serialised on the config directory that holds the
+      // login, one request id kept until Claude answers (a cooldown or rate
+      // limit is an answer), then a re-probe.
+      const consumeResetCredit: NonNullable<ProviderInstance["consumeResetCredit"]> = () =>
+        Effect.gen(function* () {
+          const current = yield* snapshot.getSnapshot;
+          const grantId = current.usageLimits?.resetCredits?.nextCreditId;
+          if (!grantId || !current.version) return "noCredit" as const;
+          const version = current.version;
+          return yield* resetCreditCoordinator.redeem(
+            configDir,
+            (requestId) =>
+              ClaudeResetCredits.consumeClaudeResetCredit({
+                configDir,
+                accountConfigPath,
+                version,
+                grantId,
+                requestId,
+              }),
+            ClaudeResetCredits.isSettledClaudeResetCreditFailure,
+          );
+        }).pipe(
+          Effect.provideService(HttpClient.HttpClient, httpClient),
+          Effect.provideService(FileSystem.FileSystem, fileSystem),
+          Effect.provideService(Path.Path, path),
+          Effect.mapError(
+            (cause) =>
+              new ProviderDriverError({
+                driver: DRIVER_KIND,
+                instanceId,
+                detail:
+                  cause._tag === "ClaudeResetCreditError"
+                    ? cause.message
+                    : "Claude could not redeem the reset.",
+                cause,
+              }),
+          ),
+          // Re-probe after any answer, but only a reset claims the limits
+          // changed, so only a reset reports an unconfirmed refresh.
+          Effect.tap((outcome) =>
+            Effect.gen(function* () {
+              const before = (yield* snapshot.getSnapshot).usageLimits?.checkedAt;
+              yield* Cache.invalidateAll(capabilitiesProbeCache);
+              const refreshed = yield* snapshot.refresh;
+              const after = refreshed.usageLimits?.checkedAt;
+              if (
+                outcome === "reset" &&
+                (after === undefined ||
+                  after === before ||
+                  refreshed.usageLimits?.unavailable?.reason === "probeFailed")
+              ) {
+                return yield* new ProviderDriverError({
+                  driver: DRIVER_KIND,
+                  instanceId,
+                  detail:
+                    "The reset was applied, but Claude could not confirm the new limits. Refresh to check.",
+                });
+              }
+            }),
+          ),
+        );
+
       return {
         instanceId,
         driverKind: DRIVER_KIND,
@@ -261,9 +343,11 @@ export const ClaudeDriver: ProviderDriver<ClaudeSettings, ClaudeDriverEnv> = {
         accentColor,
         enabled,
         snapshot,
+        invalidateCaches: Cache.invalidateAll(capabilitiesProbeCache),
         snapshotForCwd,
         adapter,
         textGeneration,
+        consumeResetCredit,
       } satisfies ProviderInstance;
     }),
 };
diff --git a/apps/server/src/provider/Drivers/CodexDriver.test.ts b/apps/server/src/provider/Drivers/CodexDriver.test.ts
index bac34db452fd..c9b11ffabd8f 100644
--- a/apps/server/src/provider/Drivers/CodexDriver.test.ts
+++ b/apps/server/src/provider/Drivers/CodexDriver.test.ts
@@ -1,23 +1,31 @@
+import { CodexInstallation } from "../CodexInstallation.ts";
+import { ServerSecretStore } from "../../auth/ServerSecretStore.ts";
+import { ServerEnvironmentIdentity } from "../../environment/ServerEnvironment.ts";
 // @effect-diagnostics nodeBuiltinImport:off
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
 import { expect, it } from "@effect/vitest";
-import { ProviderInstanceId } from "@t3tools/contracts";
+import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
 import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import * as Effect from "effect/Effect";
+import * as Deferred from "effect/Deferred";
+import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as PlatformError from "effect/PlatformError";
+import * as Schema from "effect/Schema";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
-import { HttpClient } from "effect/unstable/http";
+import { HttpClient, HttpClientResponse } from "effect/unstable/http";
 import * as ChildProcess from "effect/unstable/process/ChildProcess";
 import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
 
 import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts";
 import { ServerConfig } from "../../config.ts";
 import { ServerSettingsService } from "../../serverSettings.ts";
-import { layerTest as codexResetCreditLayerTest } from "../Layers/codexResetCredit.ts";
+import * as ResetCreditCoordinator from "../Layers/resetCreditCoordinator.ts";
 import { NoOpProviderEventLoggers, ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
 import * as ModelManifest from "../ModelManifest.ts";
 import {
@@ -26,14 +34,24 @@ import {
   resolveLatestProviderVersion,
 } from "../providerMaintenance.ts";
 import { CodexDriver } from "./CodexDriver.ts";
+import * as ProviderCredentialStore from "../ProviderCredentialStore.ts";
 
 const testLayer = ServerConfig.layerTest(process.cwd(), {
   prefix: "t3-codex-driver-maintenance-",
 }).pipe(
   Layer.provideMerge(NodeServices.layer),
+  Layer.provideMerge(
+    Layer.mock(CodexInstallation)({ managedDirectory: "unused-managed-installation" }),
+  ),
+  Layer.provideMerge(Layer.mock(ServerSecretStore)({})),
+  Layer.provideMerge(
+    Layer.succeed(ServerEnvironmentIdentity, {
+      getEnvironmentId: Effect.succeed(EnvironmentId.make("00000000-0000-4000-8000-000000000001")),
+    }),
+  ),
   Layer.provideMerge(ServerSettingsService.layerTest()),
   Layer.provideMerge(ModelManifest.layerTest),
-  Layer.provideMerge(codexResetCreditLayerTest),
+  Layer.provideMerge(ResetCreditCoordinator.layerTest),
   Layer.provideMerge(
     Layer.mock(BackgroundPolicy.BackgroundPolicy)({
       shouldRunScopeWork: () => Effect.succeed(false),
@@ -54,14 +72,144 @@ const windowsHost = HostProcessPlatform.defaultValue() === "win32";
 const noSpawn = ChildProcessSpawner.make(() =>
   Effect.die("Disabled Codex must not spawn a process"),
 );
+const encodeCredentials = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
 
 it.layer(testLayer)("CodexDriver", (it) => {
+  it.effect("disconnect refreshes a restored managed account while its auth flow is idle", () =>
+    Effect.gen(function* () {
+      const instanceId = ProviderInstanceId.make("restored-managed-account");
+      const credentials = new Map<string, Uint8Array>();
+      const secrets = ServerSecretStore.of({
+        get: (key) => Effect.sync(() => Option.fromUndefinedOr(credentials.get(key))),
+        set: (key, value) =>
+          Effect.sync(() => {
+            credentials.set(key, value);
+          }),
+        remove: (key) =>
+          Effect.sync(() => {
+            credentials.delete(key);
+          }),
+        create: () => Effect.die("unused"),
+        getOrCreateRandom: () => Effect.die("unused"),
+      });
+      yield* Effect.gen(function* () {
+        const store = yield* ProviderCredentialStore.make("codex-chatgpt", instanceId);
+        const json = yield* encodeCredentials({
+          clientId: "oaiapp_test",
+          accessToken: "dummy-owned-access",
+          refreshToken: "dummy-refresh",
+          expiresAt: Number.MAX_SAFE_INTEGER,
+          earliestRefreshAt: null,
+          scopes: ["chatgpt.tokens.use.direct"],
+          subject: "test-user",
+          email: "account@example.test",
+        });
+        yield* store.set(new TextEncoder().encode(json));
+        const executable = {
+          executablePath: "/user/bin/codex",
+          managedVersionDirectory: null,
+          source: "local" as const,
+          version: "0.156.1",
+        };
+        const installation = yield* CodexInstallation;
+        const serverConfig = yield* ServerConfig;
+        const sharedHome = NodePath.join(serverConfig.stateDir, "shared-codex-home");
+        const instance = yield* CodexDriver.create({
+          instanceId,
+          displayName: "Restored account",
+          enabled: true,
+          environment: [],
+          config: { ...CodexDriver.defaultConfig(), setupMode: "managed", homePath: sharedHome },
+        }).pipe(
+          Effect.provideService(
+            CodexInstallation,
+            CodexInstallation.of({
+              ...installation,
+              managedDirectory: "unused-managed-installation",
+              resolve: () => Effect.succeed(executable),
+              acquire: () => Effect.succeed(executable),
+            }),
+          ),
+          Effect.provideService(
+            ChildProcessSpawner.ChildProcessSpawner,
+            ChildProcessSpawner.make(() =>
+              Effect.fail(
+                PlatformError.badArgument({
+                  module: "ChildProcessSpawner",
+                  method: "spawn",
+                  description: "The fixture app-server is unavailable",
+                }),
+              ),
+            ),
+          ),
+        );
+        const observedAccount = yield* Deferred.make<void>();
+        const disconnected = yield* instance.snapshot.streamChanges.pipe(
+          Stream.tap((provider) =>
+            provider.auth.status === "authenticated"
+              ? Deferred.succeed(observedAccount, undefined).pipe(Effect.asVoid)
+              : Effect.void,
+          ),
+          Stream.filter((provider) => provider.auth.status === "unauthenticated"),
+          Stream.runHead,
+          Effect.forkScoped,
+        );
+        const restored = yield* instance.snapshot.refresh;
+        expect(restored.auth.email).toBe("account@example.test");
+        expect(restored.runtimePaths?.homePath).toBe(sharedHome);
+        expect(restored.runtimePaths?.shadowHomePath).toContain(
+          `providers/codex/${instanceId}/shadow`,
+        );
+        yield* Deferred.await(observedAccount);
+        const before = yield* instance.auth!.subscribe("test-owner").pipe(Stream.runHead);
+        expect(Option.getOrThrow(before).phase).toBe("idle");
+        yield* instance.auth!.logout(Effect.void);
+        const after = Option.getOrThrow(yield* Fiber.join(disconnected));
+        expect(after.auth.status).toBe("unauthenticated");
+        expect(after.auth.email).toBeUndefined();
+        expect(after.installed).toBe(true);
+        expect(after.models).toEqual([]);
+        expect(Option.isNone(yield* store.get)).toBe(true);
+      }).pipe(
+        Effect.provideService(ServerSecretStore, secrets),
+        Effect.provideService(
+          HttpClient.HttpClient,
+          HttpClient.make((request) =>
+            Effect.sync(() => {
+              expect([
+                "https://auth.openai.com/.well-known/openid-configuration",
+                "https://auth.openai.com/revoke",
+                "https://api.openai.com/v1/models",
+              ]).toContain(request.url);
+              if (request.url.endsWith("/models"))
+                return HttpClientResponse.fromWeb(request, Response.json({ models: [] }));
+              return HttpClientResponse.fromWeb(
+                request,
+                request.url.endsWith("/revoke")
+                  ? new Response(null, { status: 200 })
+                  : Response.json({
+                      issuer: "https://auth.openai.com",
+                      authorization_endpoint: "https://auth.openai.com/api/accounts/authorize",
+                      token_endpoint: "https://auth.openai.com/api/accounts/oauth/token",
+                      jwks_uri: "https://auth.openai.com/jwks",
+                      revocation_endpoint: "https://auth.openai.com/revoke",
+                    }),
+              );
+            }),
+          ),
+        ),
+      );
+    }).pipe(Effect.scoped),
+  );
+
   it.effect.skipIf(windowsHost)(
     "runs the standalone updater against the shared home, not the shadow home",
     () =>
       Effect.gen(function* () {
         const fs = yield* FileSystem.FileSystem;
-        const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-codex-driver-" });
+        const tempDir = yield* fs
+          .makeTempDirectoryScoped({ prefix: "t3-codex-driver-" })
+          .pipe(Effect.flatMap((directory) => fs.realPath(directory)));
         const sharedHome = NodePath.join(tempDir, "codex-home");
         const shadowHome = NodePath.join(tempDir, "codex-shadow");
         const binaryPath = NodePath.join(sharedHome, "packages", "standalone", "bin", "codex");
@@ -136,7 +284,9 @@ it.layer(testLayer)("CodexDriver", (it) => {
     it.effect.skipIf(windowsHost)(fixture.name, () =>
       Effect.gen(function* () {
         const fs = yield* FileSystem.FileSystem;
-        const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-codex-installer-" });
+        const tempDir = yield* fs
+          .makeTempDirectoryScoped({ prefix: "t3-codex-installer-" })
+          .pipe(Effect.flatMap((directory) => fs.realPath(directory)));
         const installPath = NodePath.join(tempDir, ...fixture.installSegments);
         const realBinaryPath = NodePath.join(
           installPath,
@@ -193,7 +343,9 @@ it.layer(testLayer)("CodexDriver", (it) => {
     it.effect.skipIf(windowsHost)(`leaves a mise ${layout} installation manual-only`, () =>
       Effect.gen(function* () {
         const fs = yield* FileSystem.FileSystem;
-        const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: `t3-codex-mise-${layout}-` });
+        const tempDir = yield* fs
+          .makeTempDirectoryScoped({ prefix: `t3-codex-mise-${layout}-` })
+          .pipe(Effect.flatMap((directory) => fs.realPath(directory)));
         const binaryPath =
           layout === "direct"
             ? NodePath.join(tempDir, "mise", "installs", "codex", "0.110.0", "codex")
@@ -268,7 +420,9 @@ it.layer(testLayer)("CodexDriver", (it) => {
     (fixture) =>
       Effect.gen(function* () {
         const fs = yield* FileSystem.FileSystem;
-        const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-codex-mise-shim-" });
+        const tempDir = yield* fs
+          .makeTempDirectoryScoped({ prefix: "t3-codex-mise-shim-" })
+          .pipe(Effect.flatMap((directory) => fs.realPath(directory)));
         const brewPrefix = NodePath.join(tempDir, "homebrew");
         const brewPath = NodePath.join(brewPrefix, "bin", "brew");
         const misePath = NodePath.join(brewPrefix, "Cellar", "mise", "2026.9.1", "bin", "mise");
@@ -361,7 +515,11 @@ it.layer(testLayer)("CodexDriver", (it) => {
         if (fixture.nodeFirst) {
           expect(capabilities.update).toMatchObject({
             executable: "npm",
-            args: expect.arrayContaining(["--prefix", npmPrefix, "@openai/codex@latest"]),
+            args: expect.arrayContaining([
+              "--prefix",
+              yield* fs.realPath(npmPrefix),
+              "@openai/codex@latest",
+            ]),
           });
         } else {
           expect(capabilities.update).toBeNull();
diff --git a/apps/server/src/provider/Drivers/CodexDriver.ts b/apps/server/src/provider/Drivers/CodexDriver.ts
index 22dd047f5c69..15ee69264c13 100644
--- a/apps/server/src/provider/Drivers/CodexDriver.ts
+++ b/apps/server/src/provider/Drivers/CodexDriver.ts
@@ -37,10 +37,7 @@ import { expandHomePath } from "../../pathExpansion.ts";
 import { ServerSettingsService } from "../../serverSettings.ts";
 import { ProviderDriverError } from "../Errors.ts";
 import { makeCodexAdapter } from "../Layers/CodexAdapter.ts";
-import {
-  CODEX_RESET_CREDIT_TIMEOUT,
-  CodexResetCreditCoordinator,
-} from "../Layers/codexResetCredit.ts";
+import * as ResetCreditCoordinator from "../Layers/resetCreditCoordinator.ts";
 import {
   checkCodexProviderStatus,
   makePendingCodexProvider,
@@ -71,6 +68,10 @@ import {
   materializeCodexShadowHome,
   resolveCodexHomeLayout,
 } from "./CodexHomeLayout.ts";
+import { makeManagedCodexProvider } from "./CodexManagedProvider.ts";
+import { CodexInstallation } from "../CodexInstallation.ts";
+import { ServerSecretStore } from "../../auth/ServerSecretStore.ts";
+import { ServerEnvironmentIdentity } from "../../environment/ServerEnvironment.ts";
 const decodeCodexSettings = Schema.decodeSync(CodexSettings);
 
 const DRIVER_KIND = ProviderDriverKind.make("codex");
@@ -106,7 +107,7 @@ function makeCodexMaintenanceResolver(sharedHomePath: string) {
 export type CodexDriverEnv =
   | BackgroundPolicy.BackgroundPolicy
   | ChildProcessSpawner.ChildProcessSpawner
-  | CodexResetCreditCoordinator
+  | ResetCreditCoordinator.ResetCreditCoordinator
   | Crypto.Crypto
   | FileSystem.FileSystem
   | HttpClient.HttpClient
@@ -114,7 +115,10 @@ export type CodexDriverEnv =
   | Path.Path
   | ProviderEventLoggers
   | ServerConfig
-  | ServerSettingsService;
+  | ServerSettingsService
+  | ServerSecretStore
+  | ServerEnvironmentIdentity
+  | CodexInstallation;
 
 export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
   driverKind: DRIVER_KIND,
@@ -126,8 +130,17 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
   defaultConfig: (): CodexSettings => decodeCodexSettings({}),
   create: ({ instanceId, displayName, accentColor, environment, enabled, config }) =>
     Effect.gen(function* () {
+      if (config.setupMode === "managed")
+        return yield* makeManagedCodexProvider({
+          instanceId,
+          displayName,
+          accentColor,
+          environment,
+          enabled,
+          config,
+        });
       const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const resetCreditCoordinator = yield* CodexResetCreditCoordinator;
+      const resetCreditCoordinator = yield* ResetCreditCoordinator.ResetCreditCoordinator;
       const fileSystem = yield* FileSystem.FileSystem;
       const pathService = yield* Path.Path;
       const httpClient = yield* HttpClient.HttpClient;
@@ -175,18 +188,6 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
         ),
       );
 
-      // `makeCodexAdapter` and `makeCodexTextGeneration` have `never` error
-      // channels at construction time — their failure modes are all on the
-      // per-operation closures they return. No `mapError` wrapper is needed
-      // here; the registry only has to worry about snapshot-build and
-      // spawner-availability failures surfaced from `checkCodexProviderStatus`
-      // below.
-      const adapter = yield* makeCodexAdapter(effectiveConfig, {
-        instanceId,
-        environment: processEnv,
-        ...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
-      });
-
       // Build a managed snapshot whose settings never change — mutations come
       // in as instance rebuilds from the registry rather than in-place
       // updates. Pre-provide `ChildProcessSpawner` so the check fits
@@ -241,11 +242,20 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
             }),
         ),
       );
-      const textGeneration = yield* makeCodexTextGeneration(
-        effectiveConfig,
-        processEnv,
-        snapshot.getSnapshot.pipe(Effect.map((value) => value.models)),
-      );
+      const models = snapshot.getSnapshot.pipe(Effect.map((value) => value.models));
+      // `makeCodexAdapter` and `makeCodexTextGeneration` have `never` error
+      // channels at construction time — their failure modes are all on the
+      // per-operation closures they return. No `mapError` wrapper is needed
+      // here; the registry only has to worry about snapshot-build and
+      // spawner-availability failures surfaced from `checkCodexProviderStatus`
+      // above.
+      const adapter = yield* makeCodexAdapter(effectiveConfig, {
+        instanceId,
+        environment: processEnv,
+        models,
+        ...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
+      });
+      const textGeneration = yield* makeCodexTextGeneration(effectiveConfig, processEnv, models);
       const snapshotForCwd = (cwd: string) =>
         !effectiveConfig.enabled
           ? snapshot.getSnapshot
@@ -299,7 +309,7 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
                 idempotencyKey,
               });
               return response.outcome;
-            }).pipe(Effect.scoped, Effect.timeout(CODEX_RESET_CREDIT_TIMEOUT)),
+            }).pipe(Effect.scoped, Effect.timeout("20 seconds")),
           )
           .pipe(
             Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
@@ -315,16 +325,19 @@ export const CodexDriver: ProviderDriver<CodexSettings, CodexDriverEnv> = {
             // The windows just changed; re-probe so the snapshot says so. A
             // failed probe republishes the pre-redemption limits rather than
             // marking them failed, so "confirmed" means `checkedAt` moved
-            // past what was published before the redemption started.
-            Effect.tap(() =>
+            // past what was published before the redemption started. Only a
+            // reset claims the limits changed, so only a reset reports an
+            // unconfirmed refresh.
+            Effect.tap((outcome) =>
               Effect.gen(function* () {
                 const before = (yield* snapshot.getSnapshot).usageLimits?.checkedAt;
                 const refreshed = yield* snapshot.refresh;
                 const after = refreshed.usageLimits?.checkedAt;
                 if (
-                  after === undefined ||
-                  after === before ||
-                  refreshed.usageLimits?.unavailable?.reason === "probeFailed"
+                  outcome === "reset" &&
+                  (after === undefined ||
+                    after === before ||
+                    refreshed.usageLimits?.unavailable?.reason === "probeFailed")
                 ) {
                   return yield* new ProviderDriverError({
                     driver: DRIVER_KIND,
diff --git a/apps/server/src/provider/Drivers/CodexManagedProvider.ts b/apps/server/src/provider/Drivers/CodexManagedProvider.ts
new file mode 100644
index 000000000000..cc6b185d4fd1
--- /dev/null
+++ b/apps/server/src/provider/Drivers/CodexManagedProvider.ts
@@ -0,0 +1,280 @@
+import { ProviderDriverKind, TextGenerationError, type CodexSettings } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as Stream from "effect/Stream";
+import * as Option from "effect/Option";
+import { ChildProcessSpawner } from "effect/unstable/process";
+import { makeCodexTextGeneration } from "../../textGeneration/CodexTextGeneration.ts";
+import { ServerSettingsService } from "../../serverSettings.ts";
+import { chatGptModels } from "../CodexChatGptModels.ts";
+import { makeCodexManagedRuntime } from "../CodexManagedRuntime.ts";
+import { ProviderDriverError } from "../Errors.ts";
+import { makeCodexAdapter } from "../Layers/CodexAdapter.ts";
+import {
+  checkCodexProviderStatus,
+  makePendingCodexProvider,
+  probeCodexSkillsForCwd,
+} from "../Layers/CodexProvider.ts";
+import { makeManagedServerProvider } from "../makeManagedServerProvider.ts";
+import { mergeProviderInstanceEnvironment } from "../ProviderInstanceEnvironment.ts";
+import { type ProviderDriverCreateInput, type ProviderInstance } from "../ProviderDriver.ts";
+import { codexContinuationIdentity } from "./CodexHomeLayout.ts";
+import { withInstanceIdentity } from "./instanceIdentity.ts";
+import { HttpClient } from "effect/unstable/http";
+const DRIVER = ProviderDriverKind.make("codex");
+
+export const makeManagedCodexProvider = Effect.fn("makeManagedCodexProvider")(function* (
+  input: ProviderDriverCreateInput<CodexSettings>,
+) {
+  const { instanceId, enabled, displayName, accentColor, config } = input;
+  const http = yield* HttpClient.HttpClient;
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const settings = yield* ServerSettingsService;
+  const runtime = yield* makeCodexManagedRuntime({
+    instanceId,
+    enabled,
+    config,
+    environment: mergeProviderInstanceEnvironment(input.environment),
+  });
+  const continuationIdentity = codexContinuationIdentity(runtime.homeLayout);
+  const stamp = withInstanceIdentity({
+    instanceId,
+    driverKind: DRIVER,
+    displayName,
+    accentColor,
+    continuationGroupKey: continuationIdentity.continuationKey,
+  });
+  const setup = { canAuthenticate: true, canInstall: true };
+  const runtimePaths = {
+    homePath: runtime.homeLayout.sharedHomePath,
+    shadowHomePath: runtime.homeLayout.mode === "authOverlay" ? runtime.homePath : null,
+  };
+  const pending = makePendingCodexProvider({ ...config, customModels: [] }).pipe(
+    Effect.map((draft) =>
+      stamp({
+        ...draft,
+        models: [],
+        setup,
+        runtimePaths,
+      }),
+    ),
+  );
+  const check = Effect.gen(function* () {
+    const base = yield* pending;
+    if (!enabled) return base;
+    const executable = yield* runtime.installation.resolve().pipe(Effect.option);
+    if (Option.isNone(executable))
+      return {
+        ...base,
+        installed: false,
+        models: [],
+        message: "Set up Codex to get started.",
+        auth: { status: "unauthenticated" as const },
+      };
+    const saved = yield* runtime.auth.read.pipe(Effect.orElseSucceed(() => Option.none()));
+    if (Option.isSome(saved) && !saved.value.scopes.includes("chatgpt.tokens.use.direct"))
+      return {
+        ...base,
+        installed: true,
+        version: executable.value.version,
+        models: [],
+        message:
+          "Signed in with ChatGPT, but token sharing is disabled. Sign in again and enable token sharing, or use another provider.",
+        auth: {
+          status: "unauthenticated" as const,
+          label: "ChatGPT",
+          ...(saved.value.email?.trim() ? { email: saved.value.email.trim() } : {}),
+        },
+      };
+    if (Option.isNone(saved))
+      return {
+        ...base,
+        installed: true,
+        version: executable.value.version,
+        models: [],
+        message: "Sign in with ChatGPT to use Codex.",
+        auth: { status: "unauthenticated" as const },
+      };
+    const usageLimits = {
+      checkedAt: base.checkedAt,
+      windows: [],
+      unavailable: {
+        reason: "unsupported" as const,
+        message:
+          "ChatGPT tracks subscription usage across connected apps. Open Usage settings with the account you connected to Codex.",
+      },
+      externalUsage: { label: "ChatGPT usage", url: "https://chatgpt.com/#settings/Usage" },
+    };
+    const managedAuth = {
+      subscriptionSharing: true,
+      profileId: saved.value.clientId,
+      status: "authenticated" as const,
+      type: "chatgpt",
+      label: "ChatGPT",
+      ...(saved.value.email?.trim() ? { email: saved.value.email.trim() } : {}),
+    };
+    return yield* runtime.auth.controller.withAccess!(runtime.resolve).pipe(
+      Effect.flatMap((effective) =>
+        Effect.gen(function* () {
+          const draft = yield* checkCodexProviderStatus(
+            effective.config,
+            undefined,
+            effective.environment,
+            managedAuth,
+          );
+          const models = yield* chatGptModels(
+            effective.environment.ACCESS_TOKEN!,
+            draft.models,
+          ).pipe(Effect.provideService(HttpClient.HttpClient, http));
+          return { ...draft, models };
+        }),
+      ),
+      Effect.map((draft) =>
+        stamp({
+          ...draft,
+          auth: managedAuth,
+          version: draft.version ?? executable.value.version,
+          usageLimits,
+          models: draft.models.map((model) => ({
+            ...model,
+            ...(model.capabilities
+              ? {
+                  capabilities: {
+                    ...model.capabilities,
+                    optionDescriptors: (model.capabilities.optionDescriptors ?? []).filter(
+                      (option) => option.id !== "serviceTier",
+                    ),
+                  },
+                }
+              : {}),
+          })),
+          setup,
+          runtimePaths,
+          ...(draft.slashCommands
+            ? {
+                slashCommands: draft.slashCommands.filter((command) => command.name !== "feedback"),
+              }
+            : {}),
+        }),
+      ),
+      Effect.catch(() =>
+        runtime.auth.read.pipe(
+          Effect.orElseSucceed(() => Option.none()),
+          Effect.map((current) => ({
+            ...base,
+            installed: true,
+            version: executable.value.version,
+            models: [],
+            auth: {
+              status:
+                Option.isSome(current) && current.value.scopes.includes("chatgpt.tokens.use.direct")
+                  ? ("authenticated" as const)
+                  : ("unauthenticated" as const),
+              label: "ChatGPT",
+              ...(Option.isSome(current) &&
+              current.value.scopes.includes("chatgpt.tokens.use.direct")
+                ? { subscriptionSharing: true, profileId: current.value.clientId }
+                : {}),
+              ...(Option.isSome(current) && current.value.email?.trim()
+                ? { email: current.value.email.trim() }
+                : {}),
+            },
+            ...(Option.isSome(current) && current.value.scopes.includes("chatgpt.tokens.use.direct")
+              ? { usageLimits }
+              : {}),
+            message: "Could not check Codex right now. Retry, or reconnect in provider settings.",
+          })),
+        ),
+      ),
+      Effect.scoped,
+    );
+  }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner));
+  const snapshot = yield* makeManagedServerProvider({
+    resolveMaintenance: () => Effect.succeed({ provider: DRIVER, packageName: null, update: null }),
+    getSettings: settings.getSettings,
+    streamSettings: settings.streamChanges,
+    haveSettingsChanged: () => false,
+    initialSnapshot: () => pending,
+    checkProvider: check,
+  }).pipe(
+    Effect.mapError(
+      (cause) =>
+        new ProviderDriverError({
+          driver: DRIVER,
+          instanceId,
+          detail: "Could not prepare managed Codex.",
+          cause,
+        }),
+    ),
+  );
+  yield* runtime.auth.controller.subscribe("managed-codex-snapshot").pipe(
+    // Disconnect also publishes idle when a saved account has no active sign-in flow.
+    Stream.filter((state) => ["idle", "succeeded", "failed", "cancelled"].includes(state.phase)),
+    Stream.runForEach(() => snapshot.refresh.pipe(Effect.asVoid)),
+    Effect.forkScoped,
+  );
+  const resolveRuntime = runtime.auth.controller.withAccess!(runtime.resolve);
+  const adapter = yield* makeCodexAdapter(config, {
+    instanceId,
+    resolveRuntime,
+    onManagedConnectionRevoked: runtime.auth.revoke.pipe(Effect.ignore),
+  });
+  const nativeGeneration = yield* makeCodexTextGeneration(
+    config,
+    undefined,
+    snapshot.getSnapshot.pipe(Effect.map((value) => value.models)),
+    resolveRuntime,
+  );
+  const protect = <A>(operation: string, effect: Effect.Effect<A, TextGenerationError>) =>
+    runtime.auth.controller.withAccess!(effect).pipe(
+      Effect.scoped,
+      Effect.mapError(
+        (cause) =>
+          new TextGenerationError({
+            operation,
+            detail: "detail" in cause ? cause.detail : "Codex text generation failed.",
+          }),
+      ),
+    );
+  const textGeneration: ProviderInstance["textGeneration"] = {
+    generateCommitMessage: (value) =>
+      protect("generateCommitMessage", nativeGeneration.generateCommitMessage(value)),
+    generatePrContent: (value) =>
+      protect("generatePrContent", nativeGeneration.generatePrContent(value)),
+    generateBranchName: (value) =>
+      protect("generateBranchName", nativeGeneration.generateBranchName(value)),
+    generateThreadTitle: (value) =>
+      protect("generateThreadTitle", nativeGeneration.generateThreadTitle(value)),
+  };
+  return {
+    instanceId,
+    driverKind: DRIVER,
+    continuationIdentity,
+    displayName,
+    accentColor,
+    enabled,
+    snapshot,
+    adapter,
+    textGeneration,
+    auth: runtime.auth.controller,
+    snapshotForCwd: (cwd: string) =>
+      enabled
+        ? resolveRuntime.pipe(
+            Effect.flatMap((effective) =>
+              probeCodexSkillsForCwd({
+                binaryPath: effective.config.binaryPath,
+                homePath: effective.config.homePath,
+                launchArgs: effective.config.launchArgs,
+                cwd,
+                environment: effective.environment,
+              }),
+            ),
+            Effect.flatMap((skills) =>
+              snapshot.getSnapshot.pipe(Effect.map((draft) => ({ ...draft, skills }))),
+            ),
+            Effect.scoped,
+            Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+            Effect.catch(() => snapshot.getSnapshot),
+          )
+        : snapshot.getSnapshot,
+  } satisfies ProviderInstance;
+});
diff --git a/apps/server/src/provider/Drivers/CursorDriver.ts b/apps/server/src/provider/Drivers/CursorDriver.ts
index 70af46ff6867..521c1b943e84 100644
--- a/apps/server/src/provider/Drivers/CursorDriver.ts
+++ b/apps/server/src/provider/Drivers/CursorDriver.ts
@@ -134,18 +134,29 @@ export const CursorDriver: ProviderDriver<CursorSettings, CursorDriverEnv> = {
 
       const textGeneration = yield* makeCursorTextGeneration(effectiveConfig, processEnv);
 
-      const discoverModels = yield* makeCursorModelDiscovery(effectiveConfig, processEnv);
+      const modelDiscovery = yield* makeCursorModelDiscovery(effectiveConfig, processEnv);
       const checkProvider = checkCursorProviderStatus(
         effectiveConfig,
         processEnv,
-        discoverModels,
+        modelDiscovery.discover,
       ).pipe(
-        Effect.flatMap((snapshot) =>
-          effectiveConfig.enabled && snapshot.installed && snapshot.auth.status === "authenticated"
-            ? readCursorUsageLimits(effectiveConfig, processEnv).pipe(
-                Effect.map((usageLimits) => ({ ...snapshot, usageLimits })),
-              )
-            : Effect.succeed(snapshot),
+        Effect.filterOrElse(
+          (snapshot) =>
+            !(
+              effectiveConfig.enabled &&
+              snapshot.installed &&
+              snapshot.auth.status === "authenticated"
+            ),
+          (snapshot) =>
+            Effect.gen(function* () {
+              const settings = yield* serverSettings.getSettings;
+              const usageLimits = yield* readCursorUsageLimits(
+                effectiveConfig,
+                processEnv,
+                settings.cursorKeychainUsageEnabled,
+              );
+              return { ...snapshot, usageLimits };
+            }),
         ),
         Effect.map(stampIdentity),
         Effect.provideService(HttpClient.HttpClient, httpClient),
@@ -217,6 +228,7 @@ export const CursorDriver: ProviderDriver<CursorSettings, CursorDriverEnv> = {
         accentColor,
         enabled,
         snapshot,
+        invalidateCaches: modelDiscovery.invalidate,
         snapshotForCwd: (cwd) =>
           !effectiveConfig.enabled
             ? snapshot.getSnapshot
diff --git a/apps/server/src/provider/Drivers/GrokDriver.test.ts b/apps/server/src/provider/Drivers/GrokDriver.test.ts
new file mode 100644
index 000000000000..916028edc60c
--- /dev/null
+++ b/apps/server/src/provider/Drivers/GrokDriver.test.ts
@@ -0,0 +1,97 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { expect, it } from "@effect/vitest";
+import { ProviderInstanceId } from "@t3tools/contracts";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
+import { HttpClient } from "effect/unstable/http";
+import * as ChildProcessSpawner from "effect/unstable/process/ChildProcessSpawner";
+
+import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts";
+import { ServerConfig } from "../../config.ts";
+import { ServerSettingsService } from "../../serverSettings.ts";
+import { NoOpProviderEventLoggers, ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
+import { GrokDriver } from "./GrokDriver.ts";
+
+const testLayer = ServerConfig.layerTest(process.cwd(), {
+  prefix: "t3-grok-driver-update-",
+}).pipe(
+  Layer.provideMerge(NodeServices.layer),
+  Layer.provideMerge(ServerSettingsService.layerTest()),
+  Layer.provideMerge(
+    Layer.mock(BackgroundPolicy.BackgroundPolicy)({
+      shouldRunScopeWork: () => Effect.succeed(false),
+    }),
+  ),
+  Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
+  Layer.provideMerge(
+    Layer.succeed(
+      HttpClient.HttpClient,
+      HttpClient.make(() => Effect.die("Disabled Grok must not make an HTTP request")),
+    ),
+  ),
+);
+
+const noSpawner = ChildProcessSpawner.make(() =>
+  Effect.die("Disabled Grok must not spawn a process"),
+);
+
+// The `#!/bin/sh` stub below cannot be resolved as an executable on Windows.
+const windowsHost = HostProcessPlatform.defaultValue() === "win32";
+
+it.layer(testLayer)("GrokDriver", (it) => {
+  it.effect.skipIf(windowsHost)("updates through the configured executable's own updater", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-grok-driver-" });
+      const grokHome = path.join(tempDir, "Grok Home");
+      const binaryPath = path.join(grokHome, "bin", "grok");
+      yield* fs.makeDirectory(path.dirname(binaryPath), { recursive: true });
+      yield* fs.writeFileString(binaryPath, "#!/bin/sh\n");
+      yield* fs.chmod(binaryPath, 0o755);
+
+      const instance = yield* GrokDriver.create({
+        instanceId: ProviderInstanceId.make("grok-update"),
+        displayName: "Grok test",
+        enabled: false,
+        environment: [{ name: "GROK_HOME", value: grokHome, sensitive: false }],
+        config: { ...GrokDriver.defaultConfig(), binaryPath },
+      });
+
+      const capabilities = yield* instance.snapshot.resolveMaintenance();
+      expect(capabilities.packageName).toBe("@xai-official/grok");
+      expect(capabilities.update).toMatchObject({
+        command: `'${binaryPath}' update`,
+        executable: binaryPath,
+        args: ["update"],
+      });
+      // `grok update` installs under GROK_HOME, so it must target this instance's home.
+      expect(capabilities.update?.env?.GROK_HOME).toBe(grokHome);
+    }).pipe(
+      Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawner),
+      Effect.scoped,
+    ),
+  );
+
+  it.effect("stays manual-only when the configured executable does not exist", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const tempDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-grok-missing-" });
+      const instance = yield* GrokDriver.create({
+        instanceId: ProviderInstanceId.make("grok-missing"),
+        displayName: "Grok test",
+        enabled: false,
+        environment: [],
+        config: { ...GrokDriver.defaultConfig(), binaryPath: path.join(tempDir, "grok") },
+      });
+      expect((yield* instance.snapshot.resolveMaintenance()).update).toBeNull();
+    }).pipe(
+      Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawner),
+      Effect.scoped,
+    ),
+  );
+});
diff --git a/apps/server/src/provider/Drivers/GrokDriver.ts b/apps/server/src/provider/Drivers/GrokDriver.ts
index 5f0cf4d90c71..70d7a3f6e378 100644
--- a/apps/server/src/provider/Drivers/GrokDriver.ts
+++ b/apps/server/src/provider/Drivers/GrokDriver.ts
@@ -19,7 +19,7 @@ import {
   enrichGrokSnapshot,
 } from "../Layers/GrokProvider.ts";
 import { ProviderEventLoggers } from "../Layers/ProviderEventLoggers.ts";
-import { readGrokUsageLimits } from "../Layers/grokUsageLimits.ts";
+import { readGrokAccount } from "../Layers/grokUsageLimits.ts";
 import { makeManagedServerProvider } from "../makeManagedServerProvider.ts";
 import {
   defaultProviderContinuationIdentity,
@@ -29,7 +29,13 @@ import {
 import { withInstanceIdentity } from "./instanceIdentity.ts";
 import { mergeProviderInstanceEnvironment } from "../ProviderInstanceEnvironment.ts";
 import { discoverGrokSkills } from "./GrokSkills.ts";
-import { makeManualOnlyProviderMaintenanceCapabilities } from "../providerMaintenance.ts";
+import {
+  makeCachedProviderMaintenanceResolution,
+  makeManualOnlyProviderMaintenanceCapabilities,
+  makeProviderMaintenanceCapabilities,
+  type ProviderMaintenanceCapabilitiesResolver,
+  resolveProviderMaintenanceCapabilitiesEffect,
+} from "../providerMaintenance.ts";
 import {
   haveProviderSnapshotSettingsChanged,
   makeProviderSnapshotSettingsSource,
@@ -38,10 +44,32 @@ import {
 const decodeGrokSettings = Schema.decodeSync(GrokSettings);
 
 const DRIVER_KIND = ProviderDriverKind.make("grok");
-const MAINTENANCE_CAPABILITIES = makeManualOnlyProviderMaintenanceCapabilities({
-  provider: DRIVER_KIND,
-  packageName: null,
-});
+// npm's `latest` tracks Grok's stable channel, the one `grok update` installs
+// by default, so the registry stays the source for "latest".
+const GROK_NPM_PACKAGE = "@xai-official/grok";
+// `grok update` finds the installer that owns the binary itself, so the
+// resolved executable is its own updater. It installs under `GROK_HOME`, so it
+// runs with the instance's environment. No executable means nothing to update,
+// not "whatever is on PATH".
+const UPDATE: ProviderMaintenanceCapabilitiesResolver = {
+  resolve: (context) =>
+    Effect.succeed(
+      context
+        ? makeProviderMaintenanceCapabilities({
+            provider: DRIVER_KIND,
+            packageName: GROK_NPM_PACKAGE,
+            updateExecutable: context.resolvedCommandPath,
+            updateArgs: ["update"],
+            updateLockKey: "grok",
+            platform: context.platform,
+            env: context.env,
+          })
+        : makeManualOnlyProviderMaintenanceCapabilities({
+            provider: DRIVER_KIND,
+            packageName: GROK_NPM_PACKAGE,
+          }),
+    ),
+};
 
 export type GrokDriverEnv =
   | BackgroundPolicy.BackgroundPolicy
@@ -85,6 +113,16 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {
         continuationGroupKey: continuationIdentity.continuationKey,
       });
       const effectiveConfig = { ...config, enabled } satisfies GrokSettings;
+      const resolveMaintenance = yield* makeCachedProviderMaintenanceResolution(
+        resolveProviderMaintenanceCapabilitiesEffect(UPDATE, {
+          binaryPath: effectiveConfig.binaryPath,
+          env: processEnv,
+        }).pipe(
+          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+          Effect.provideService(FileSystem.FileSystem, fileSystem),
+          Effect.provideService(Path.Path, path),
+        ),
+      );
       const adapter = yield* makeGrokAdapter(effectiveConfig, {
         environment: processEnv,
         ...(eventLoggers.native ? { nativeEventLogger: eventLoggers.native } : {}),
@@ -93,12 +131,22 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {
       const textGeneration = yield* makeGrokTextGeneration(effectiveConfig, processEnv);
 
       const checkProvider = checkGrokProviderStatus(effectiveConfig, processEnv, cwd).pipe(
-        Effect.flatMap((snapshot) =>
-          effectiveConfig.enabled && snapshot.installed && snapshot.auth.status === "authenticated"
-            ? readGrokUsageLimits(processEnv).pipe(
-                Effect.map((usageLimits) => ({ ...snapshot, usageLimits })),
-              )
-            : Effect.succeed(snapshot),
+        Effect.filterOrElse(
+          (snapshot) =>
+            !(
+              effectiveConfig.enabled &&
+              snapshot.installed &&
+              snapshot.auth.status === "authenticated"
+            ),
+          (snapshot) =>
+            readGrokAccount(processEnv).pipe(
+              // The email lets clients recognize one account signed in on several environments.
+              Effect.map(({ email, usageLimits }) => ({
+                ...snapshot,
+                auth: email ? { ...snapshot.auth, email } : snapshot.auth,
+                usageLimits,
+              })),
+            ),
         ),
         Effect.map(stampIdentity),
         Effect.provideService(HttpClient.HttpClient, httpClient),
@@ -110,7 +158,7 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {
 
       const snapshotSettings = makeProviderSnapshotSettingsSource(effectiveConfig, serverSettings);
       const snapshot = yield* makeManagedServerProvider<ProviderSnapshotSettings<GrokSettings>>({
-        resolveMaintenance: () => Effect.succeed(MAINTENANCE_CAPABILITIES),
+        resolveMaintenance,
         getSettings: snapshotSettings.getSettings,
         streamSettings: snapshotSettings.streamSettings,
         haveSettingsChanged: haveProviderSnapshotSettingsChanged,
@@ -118,13 +166,17 @@ export const GrokDriver: ProviderDriver<GrokSettings, GrokDriverEnv> = {
           buildInitialGrokProviderSnapshot(settings.provider).pipe(Effect.map(stampIdentity)),
         checkProvider,
         enrichSnapshot: ({ settings, snapshot: currentSnapshot, publishSnapshot }) =>
-          enrichGrokSnapshot({
-            snapshot: currentSnapshot,
-            maintenanceCapabilities: MAINTENANCE_CAPABILITIES,
-            enableProviderUpdateChecks: settings.enableProviderUpdateChecks,
-            publishSnapshot,
-            httpClient,
-          }),
+          resolveMaintenance().pipe(
+            Effect.flatMap((maintenanceCapabilities) =>
+              enrichGrokSnapshot({
+                snapshot: currentSnapshot,
+                maintenanceCapabilities,
+                enableProviderUpdateChecks: settings.enableProviderUpdateChecks,
+                publishSnapshot,
+                httpClient,
+              }),
+            ),
+          ),
       }).pipe(
         Effect.mapError(
           (cause) =>
diff --git a/apps/server/src/provider/Layers/AntigravityAdapter.test.ts b/apps/server/src/provider/Layers/AntigravityAdapter.test.ts
index 4bd0bb3e1010..cd245570d1ad 100644
--- a/apps/server/src/provider/Layers/AntigravityAdapter.test.ts
+++ b/apps/server/src/provider/Layers/AntigravityAdapter.test.ts
@@ -775,6 +775,44 @@ it.layer(layer)("AntigravityAdapter", (it) => {
     }),
   );
 
+  it.effect("stops commands left running after a turn when the idle turn is stopped", () =>
+    Effect.gen(function* () {
+      const h = yield* makeHarness();
+      yield* h.adapter.startSession({
+        threadId,
+        cwd: process.cwd(),
+        runtimeMode: "approval-required",
+      });
+      const sending = yield* h.adapter
+        .sendTurn({ threadId, input: "Start a watcher" })
+        .pipe(Effect.forkChild);
+      const prompt = yield* h.nextPrompt;
+      yield* h.emitNative({
+        _tag: "ToolCallUpdated",
+        toolCall: {
+          toolCallId: "watcher-1",
+          kind: "execute",
+          status: "inProgress",
+          command: "tail -f log",
+          data: {},
+        },
+        rawPayload: {},
+      });
+      yield* Deferred.succeed(prompt.result, { stopReason: "end_turn" });
+      yield* Fiber.join(sending);
+      const started = yield* h.waitForEvent((event) => event.type === "task.started");
+
+      // Monitoring's Stop reaches the adapter as a turn interrupt. With no
+      // prompt to cancel, it has to end the session to stop the command.
+      yield* h.adapter.interruptTurn(threadId);
+      const stopped = yield* h.waitForEvent((event) => event.type === "task.completed");
+      expect(stopped.payload).toMatchObject({ taskId: started.payload.taskId, status: "stopped" });
+      yield* h.waitForEvent((event) => event.type === "session.exited");
+      expect(yield* h.adapter.hasSession(threadId)).toBe(false);
+      expect(h.controls.closed).toBe(1);
+    }),
+  );
+
   it.effect("keeps a launched batch active while child tools continue", () =>
     Effect.gen(function* () {
       const h = yield* makeHarness();
diff --git a/apps/server/src/provider/Layers/AntigravityAdapter.ts b/apps/server/src/provider/Layers/AntigravityAdapter.ts
index 61a9b3c3a645..c5e6400d11b4 100644
--- a/apps/server/src/provider/Layers/AntigravityAdapter.ts
+++ b/apps/server/src/provider/Layers/AntigravityAdapter.ts
@@ -786,9 +786,9 @@ export const makeAntigravityAdapter = Effect.fn("makeAntigravityAdapter")(functi
             stopOwned,
             Effect.gen(function* () {
               const mcp = McpProviderSession.readMcpProviderSession(input.threadId);
-              // The attachments dir grant lets the agent read pasted files at
-              // the paths ProviderService injects into the turn text. It is a
-              // leaf directory holding only uploads.
+              // The attachments dir grant lets the agent read path-only uploads
+              // at the paths ProviderService injects into the turn text. It is
+              // a leaf directory holding only uploads.
               const runtime = yield* options.makeRuntime({
                 cwd,
                 clientInfo: { name: "t3-code", version: "0.0.0" },
@@ -844,7 +844,7 @@ export const makeAntigravityAdapter = Effect.fn("makeAntigravityAdapter")(functi
               const model = yield* applyAntigravityAcpModelSelection({
                 runtime,
                 model: input.modelSelection?.model,
-                defaultModel: yield* options.defaultModel ?? Effect.succeed(undefined),
+                defaultModel: yield* options.defaultModel ?? Effect.undefined,
                 mapError: (cause) => cause,
               });
               yield* runtime.setMode(antigravityPermissionMode(input.runtimeMode));
@@ -1035,7 +1035,7 @@ export const makeAntigravityAdapter = Effect.fn("makeAntigravityAdapter")(functi
           const model = resolveAntigravityModel({
             configOptions,
             model: requestedModel,
-            defaultModel: yield* options.defaultModel ?? Effect.succeed(undefined),
+            defaultModel: yield* options.defaultModel ?? Effect.undefined,
           });
           const availableModels = antigravityModelOptions(configOptions);
           if (model && !availableModels.some((option) => option.value === model)) {
@@ -1165,14 +1165,36 @@ export const makeAntigravityAdapter = Effect.fn("makeAntigravityAdapter")(functi
   const interruptTurn: Adapter["interruptTurn"] = (threadId) =>
     Effect.gen(function* () {
       const context = yield* requireSession(threadId);
+      // A command that outlived its turn keeps running in the agent, and
+      // session/cancel only stops a prompt. The agent kills its background
+      // commands when its session closes, so Stop with nothing else running
+      // ends the session, as Claude's does. The next turn resumes it.
+      let idleWithCommands = false;
       yield* context.promptLock
         .withPermit(
           Effect.gen(function* () {
+            // Decided under the prompt lock so a turn cannot start in between.
+            if (!context.promptFiber && [...context.commands.values()].some((c) => c.promoted)) {
+              context.stopped = true;
+              idleWithCommands = true;
+              return;
+            }
             yield* cancelRequests(context);
             yield* context.runtime.cancel;
           }),
         )
-        .pipe(Effect.mapError((cause) => mapAntigravityError(threadId, "session/cancel", cause)));
+        .pipe(
+          Effect.mapError((cause) => mapAntigravityError(threadId, "session/cancel", cause)),
+          // Once marked stopped the session must close, even if this call is
+          // interrupted, or it is left unreachable with its commands running.
+          Effect.ensuring(
+            Effect.suspend(() =>
+              idleWithCommands
+                ? withThreadLock(threadId, stopContext(context)).pipe(Effect.ignore)
+                : Effect.void,
+            ),
+          ),
+        );
     });
 
   const respondToRequest: Adapter["respondToRequest"] = (threadId, requestId, decision) =>
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
index f99e6714ee3b..e3ba3b005edf 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.test.ts
@@ -1,3 +1,4 @@
+// @effect-diagnostics abortControllerInEffect:off - Tests hand-built AbortSignals to the SDK query stub to exercise cancellation.
 import { buildRuntimeInstructions } from "../RuntimeInstructions.ts";
 // @effect-diagnostics nodeBuiltinImport:off
 import * as NodeFS from "node:fs";
@@ -72,6 +73,8 @@ class FakeClaudeQuery implements AsyncIterable<SDKMessage> {
   public readonly setMaxThinkingTokensCalls: Array<number | null> = [];
   public closeCalls = 0;
   public closeError: unknown | undefined;
+  /** Set by tests that exercise Claude's graceful interrupt. */
+  public interrupt?: () => Promise<unknown>;
 
   emit(message: SDKMessage): void {
     if (this.done) {
@@ -3254,6 +3257,83 @@ describe("ClaudeAdapterLive", () => {
     );
   });
 
+  it.effect("interruptTurn lets Claude abort the turn before closing the session", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: ProviderDriverKind.make("claudeAgent"),
+        runtimeMode: "full-access",
+      });
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+
+      const turnCompletedFiber = yield* adapter.streamEvents.pipe(
+        Stream.filter((event) => event.type === "turn.completed"),
+        Stream.take(1),
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+      let closeCallsAtInterrupt: number | undefined;
+      harness.query.interrupt = async () => {
+        closeCallsAtInterrupt = harness.query.closeCalls;
+        harness.query.emit({
+          type: "result",
+          subtype: "error_during_execution",
+          is_error: false,
+          errors: ["Error: Request was aborted."],
+          session_id: "sdk-session",
+          uuid: "result-interrupted",
+        } as unknown as SDKMessage);
+      };
+
+      yield* adapter.interruptTurn(session.threadId);
+
+      assert.equal(closeCallsAtInterrupt, 0);
+      assert.equal(harness.query.closeCalls, 1);
+      const [turnCompleted] = Array.from(yield* Fiber.join(turnCompletedFiber));
+      assert.equal(turnCompleted?.type, "turn.completed");
+      if (turnCompleted?.type === "turn.completed") {
+        assert.equal(turnCompleted.payload.state, "interrupted");
+      }
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
+  it.effect("interruptTurn closes the session when Claude never aborts the turn", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: ProviderDriverKind.make("claudeAgent"),
+        runtimeMode: "full-access",
+      });
+      yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+      harness.query.interrupt = () => new Promise(() => {});
+
+      const interruptFiber = yield* adapter.interruptTurn(session.threadId).pipe(Effect.forkChild);
+      yield* TestClock.adjust("3 seconds");
+      yield* Fiber.join(interruptFiber);
+
+      assert.equal(harness.query.closeCalls, 1);
+      assert.equal(yield* adapter.hasSession(session.threadId), false);
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
   it.effect("keeps the session available when process close fails", () => {
     const harness = makeHarness();
     return Effect.gen(function* () {
@@ -6837,6 +6917,56 @@ describe("ClaudeAdapterLive", () => {
     );
   });
 
+  it.effect("completed turns keep their ids but not the SDK messages", () => {
+    const harness = makeHarness();
+    return Effect.gen(function* () {
+      const adapter = yield* ClaudeAdapter;
+      const session = yield* adapter.startSession({
+        threadId: THREAD_ID,
+        provider: ProviderDriverKind.make("claudeAgent"),
+        runtimeMode: "full-access",
+      });
+      const turn = yield* adapter.sendTurn({
+        threadId: session.threadId,
+        input: "hello",
+        attachments: [],
+      });
+      const completedFiber = yield* Stream.filter(
+        adapter.streamEvents,
+        (event) => event.type === "turn.completed",
+      ).pipe(Stream.runHead, Effect.forkChild);
+
+      harness.query.emit({
+        type: "assistant",
+        session_id: "sdk-session-1",
+        uuid: "assistant-1",
+        parent_tool_use_id: null,
+        message: {
+          id: "assistant-message-1",
+          content: [{ type: "text", text: "Hi" }],
+        },
+      } as unknown as SDKMessage);
+      harness.query.emit({
+        type: "result",
+        subtype: "success",
+        is_error: false,
+        errors: [],
+        session_id: "sdk-session-1",
+        uuid: "result-1",
+      } as unknown as SDKMessage);
+      yield* Fiber.join(completedFiber);
+
+      const snapshot = yield* adapter.readThread(session.threadId);
+      assert.deepEqual(
+        snapshot.turns.map((entry) => ({ id: String(entry.id), items: entry.items })),
+        [{ id: String(turn.turnId), items: [] }],
+      );
+    }).pipe(
+      Effect.provideService(Random.Random, makeDeterministicRandomService()),
+      Effect.provide(harness.layer),
+    );
+  });
+
   it.effect("rewinds Claude history when the fork omits retained system messages", () => {
     const forkCalls: Array<Parameters<NonNullable<ClaudeAdapterLiveOptions["forkSession"]>>> = [];
     let firstTurnId = "";
diff --git a/apps/server/src/provider/Layers/ClaudeAdapter.ts b/apps/server/src/provider/Layers/ClaudeAdapter.ts
index a056c2828590..2d540b9077ca 100644
--- a/apps/server/src/provider/Layers/ClaudeAdapter.ts
+++ b/apps/server/src/provider/Layers/ClaudeAdapter.ts
@@ -267,7 +267,6 @@ interface ClaudeTurnState {
    * steered instead (the queued message continues the same turn).
    */
   readonly synthetic?: boolean;
-  readonly items: Array<unknown>;
   readonly assistantTextBlocks: Map<number, AssistantTextBlockState>;
   readonly assistantTextBlockOrder: Array<AssistantTextBlockState>;
   readonly capturedProposedPlanKeys: Set<string>;
@@ -386,6 +385,8 @@ interface ClaudeTaskAgentState {
  * lifetime; oldest entries evict first.
  */
 const PENDING_TASK_MODEL_CAP = 64;
+/** How long Stop waits for Claude to abort a turn before killing the process. */
+const CLAUDE_INTERRUPT_GRACE = "3 seconds";
 
 /**
  * Buffers a subagent snapshot's authoritative model under its
@@ -422,10 +423,11 @@ interface ClaudeSessionContext {
   resumeSessionId: string | undefined;
   readonly pendingApprovals: Map<ApprovalRequestId, PendingApproval>;
   readonly pendingUserInputs: Map<ApprovalRequestId, PendingUserInput>;
-  readonly turns: Array<{
-    id: TurnId;
-    items: Array<unknown>;
-  }>;
+  /** Completed turn ids, reported by readThread and trimmed on rollback.
+   * SDK messages are not kept: rollback reads Claude's own history through
+   * turnStartMessageIds, and a long-lived session would otherwise hold every
+   * message it ever produced. */
+  readonly turns: Array<{ readonly id: TurnId }>;
   readonly inFlightTools: Map<number, ToolInFlight>;
   readonly claudeTasks: Map<string, ClaudeTaskState>;
   readonly taskAgents: Map<string, ClaudeTaskAgentState>;
@@ -453,10 +455,14 @@ interface ClaudeSessionContext {
   lastThreadStartedId: string | undefined;
   /** Limits already announced for the running turn, keyed `window:resetsAt`. */
   announcedUsageLimits: { turnId: string; keys: Set<string> } | undefined;
+  /** Resolved by completeTurn while Stop waits for Claude to abort the turn. */
+  interruptedTurnSettled: Deferred.Deferred<void> | undefined;
   stopped: boolean;
 }
 
 interface ClaudeQueryRuntime extends AsyncIterable<SDKMessage> {
+  /** SDK Query.interrupt — present on real queries; optional for test doubles. */
+  readonly interrupt?: () => Promise<unknown>;
   readonly setModel: (model?: string) => Promise<void>;
   readonly setPermissionMode: (mode: PermissionMode) => Promise<void>;
   readonly setMaxThinkingTokens: (maxThinkingTokens: number | null) => Promise<void>;
@@ -2176,10 +2182,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
     }
     return {
       threadId,
-      turns: context.turns.map((turn) => ({
-        id: turn.id,
-        items: [...turn.items],
-      })),
+      turns: context.turns.map((turn) => ({ id: turn.id, items: [] })),
     };
   });
 
@@ -2808,10 +2811,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
       });
     }
 
-    context.turns.push({
-      id: turnState.turnId,
-      items: [...turnState.items],
-    });
+    context.turns.push({ id: turnState.turnId });
 
     yield* emitThreadTokenUsage(context, usageSnapshot, {
       rawMethod: "claude/result",
@@ -2842,6 +2842,9 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
 
     const updatedAt = yield* nowIso;
     context.turnState = undefined;
+    if (context.interruptedTurnSettled) {
+      yield* Deferred.succeed(context.interruptedTurnSettled, undefined);
+    }
     context.session = {
       ...context.session,
       status: "ready",
@@ -3175,10 +3178,6 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
       return;
     }
 
-    if (context.turnState) {
-      context.turnState.items.push(message.message);
-    }
-
     for (const toolResult of toolResultBlocksFromUserMessage(message)) {
       const toolEntry = Array.from(context.inFlightTools.entries()).find(
         ([, tool]) => tool.itemId === toolResult.toolUseId,
@@ -3378,7 +3377,6 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
         turnId,
         startedAt,
         synthetic: true,
-        items: [],
         assistantTextBlocks: new Map(),
         assistantTextBlockOrder: [],
         capturedProposedPlanKeys: new Set(),
@@ -3461,7 +3459,6 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
           cwd: path.resolve(context.session.cwd ?? "."),
         });
       }
-      context.turnState.items.push(message.message);
       if (
         normalizeClaudeActiveTokenUsage(
           message.message.usage,
@@ -5111,6 +5108,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
         lastAssistantUuid: resumeState?.resumeSessionAt,
         lastThreadStartedId: undefined,
         announcedUsageLimits: undefined,
+        interruptedTurnSettled: undefined,
         stopped: false,
       };
       yield* Ref.set(contextRef, context);
@@ -5259,7 +5257,6 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
       const turnState: ClaudeTurnState = {
         turnId,
         startedAt: yield* nowIso,
-        items: [],
         assistantTextBlocks: new Map(),
         assistantTextBlockOrder: [],
         capturedProposedPlanKeys: new Set(),
@@ -5343,6 +5340,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
   const interruptTurn: ClaudeAdapterShape["interruptTurn"] = Effect.fn("interruptTurn")(
     function* (threadId, _turnId) {
       const context = yield* requireSession(threadId);
+      yield* settleInterruptedTurn(context);
       // interrupt() can acknowledge while resumed background tasks keep the
       // CLI alive. Stop is a hard session boundary for Claude, so close the
       // query and let the SDK escalate to SIGKILL when graceful exit fails.
@@ -5350,6 +5348,25 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
     },
   );
 
+  // Lets Claude abort the running turn through its own path before Stop kills
+  // the process, so the prompt reaches the transcript. Killing a first turn
+  // before Claude writes it leaves a resume cursor for a session Claude never
+  // saved, and every later message fails with "No conversation found".
+  const settleInterruptedTurn = Effect.fn("settleInterruptedTurn")(function* (
+    context: ClaudeSessionContext,
+  ) {
+    const interrupt = context.query.interrupt?.bind(context.query);
+    if (context.stopped || !context.turnState || !interrupt) return;
+    const settled = yield* Deferred.make<void>();
+    context.interruptedTurnSettled = settled;
+    yield* Effect.tryPromise(interrupt).pipe(
+      Effect.ignore,
+      Effect.andThen(Deferred.await(settled)),
+      Effect.timeoutOption(CLAUDE_INTERRUPT_GRACE),
+    );
+    context.interruptedTurnSettled = undefined;
+  });
+
   const readThread: ClaudeAdapterShape["readThread"] = Effect.fn("readThread")(
     function* (threadId) {
       const context = yield* requireSession(threadId);
@@ -5411,6 +5428,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
       ) => {
         // SDK history helpers read process.env. Isolate the provider's home instead
         // of changing the server's environment while other providers are running.
+        // @effect-diagnostics-next-line runEffectInsideEffect:off - SDK callback runs outside the fiber; the spawn is self-contained
         const result = await Effect.runPromise(
           spawnAndCollect(
             process.execPath,
@@ -5601,7 +5619,7 @@ export const makeClaudeAdapter = Effect.fn("makeClaudeAdapter")(function* (
 
     for (const result of results) {
       if (result._tag === "Failure") {
-        return yield* Effect.fail(result.failure);
+        return yield* result.failure;
       }
     }
   });
diff --git a/apps/server/src/provider/Layers/ClaudeProvider.ts b/apps/server/src/provider/Layers/ClaudeProvider.ts
index ded1f0abdf6e..5f40b436a384 100644
--- a/apps/server/src/provider/Layers/ClaudeProvider.ts
+++ b/apps/server/src/provider/Layers/ClaudeProvider.ts
@@ -2,6 +2,7 @@ import {
   type ClaudeSettings,
   type ModelCapabilities,
   type ServerProviderSlashCommand,
+  type ServerProviderResetCredits,
 } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
@@ -426,6 +427,8 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
   modelCatalog: ClaudeModelCatalog = BUNDLED_CLAUDE_MODEL_CATALOG,
   /** Shared with the adapter so turn events reuse the scoped-bucket names this probe saw. */
   scopedLimitNames?: Ref.Ref<ClaudeScopedLimitNames>,
+  /** Banked resets for a subscription login, given the CLI version for the user agent. */
+  resolveResetCredits?: (version: string) => Effect.Effect<ServerProviderResetCredits | undefined>,
 ): Effect.fn.Return<
   ServerProviderDraft,
   never,
@@ -568,6 +571,13 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
           checkedAt,
         })
       : claudeUsageResponseToLimits({ response: capabilities.usage, checkedAt }).limits;
+  const resetCredits =
+    resolveResetCredits &&
+    capabilities.subscriptionType &&
+    !usageLimits.unavailable &&
+    parsedVersion
+      ? yield* resolveResetCredits(parsedVersion)
+      : undefined;
   return buildServerProvider({
     presentation: CLAUDE_PRESENTATION,
     enabled: claudeSettings.enabled,
@@ -585,7 +595,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
         ...(authMetadata ? authMetadata : {}),
       },
       ...(versionUpgradeMessage ? { message: versionUpgradeMessage } : {}),
-      usageLimits,
+      usageLimits: resetCredits ? { ...usageLimits, resetCredits } : usageLimits,
     },
   });
 });
diff --git a/apps/server/src/provider/Layers/CodexAdapter.test.ts b/apps/server/src/provider/Layers/CodexAdapter.test.ts
index 9f464bdaa177..9aff859521fc 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.test.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.test.ts
@@ -225,7 +225,7 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory
   recordImportedTranscript: () => Effect.die("unused"),
   getProvider: () =>
     Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
-  getBinding: () => Effect.succeed(Option.none()),
+  getBinding: () => Effect.succeedNone,
   listThreadIds: () => Effect.succeed([]),
   listBindings: () => Effect.succeed([]),
 });
@@ -2383,6 +2383,7 @@ lifecycleLayer("CodexAdapterLive lifecycle", (it) => {
           method: "item/tool/requestUserInput",
           requestId: ApprovalRequestId.make("req-user-input-1"),
           payload: {
+            isBlocking: true,
             itemId: "item-user-input-1",
             threadId: "thread-1",
             turnId: "turn-1",
@@ -3083,3 +3084,112 @@ usageLimitLayer("CodexAdapterLive usage limits", (it) => {
     }),
   );
 });
+
+it.effect("managed runtime rotation restarts app-server and resumes the same native thread", () => {
+  const runtimes: FakeCodexRuntime[] = [];
+  let revision = "first";
+  const layer = Layer.effect(
+    CodexAdapter,
+    Effect.gen(function* () {
+      return yield* makeCodexAdapter(decodeCodexSettings({}), {
+        resolveRuntime: Effect.sync(() => ({
+          config: decodeCodexSettings({
+            binaryPath: "/t3/tools/codex/0.155.1/bin/codex",
+            homePath: "/t3/caches/codex/home",
+            launchArgs: "-c 'model_provider=managed'",
+          }),
+          environment: { ACCESS_TOKEN: `dummy-${revision}` },
+          revision,
+        })),
+        makeRuntime: (options) => {
+          const runtime = new FakeCodexRuntime(options);
+          runtime.startImpl.mockImplementation(() =>
+            Promise.resolve({
+              provider: ProviderDriverKind.make("codex"),
+              threadId: options.threadId,
+              runtimeMode: options.runtimeMode,
+              cwd: options.cwd,
+              status: "ready",
+              createdAt: "2026-01-01T00:00:00Z",
+              updatedAt: "2026-01-01T00:00:00Z",
+              resumeCursor: { threadId: "native-managed-thread" },
+            }),
+          );
+          runtimes.push(runtime);
+          return Effect.succeed(runtime);
+        },
+      });
+    }),
+  ).pipe(
+    Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),
+    Layer.provideMerge(ServerSettingsService.layerTest()),
+    Layer.provideMerge(providerSessionDirectoryTestLayer),
+    Layer.provideMerge(NodeServices.layer),
+  );
+  return Effect.gen(function* () {
+    const adapter = yield* CodexAdapter;
+    const threadId = asThreadId("managed-token-rotation");
+    yield* adapter.startSession({ threadId, runtimeMode: "full-access" });
+    yield* adapter.sendTurn({ threadId, input: "first" });
+    NodeAssert.equal(runtimes.length, 1);
+    revision = "rotated";
+    yield* adapter.sendTurn({ threadId, input: "second" });
+    NodeAssert.equal(runtimes.length, 2);
+    NodeAssert.equal(runtimes[0]?.closeImpl.mock.calls.length, 1);
+    NodeAssert.deepEqual(runtimes[1]?.options.resumeCursor, { threadId: "native-managed-thread" });
+    NodeAssert.equal(runtimes[1]?.options.environment?.ACCESS_TOKEN, "dummy-rotated");
+    NodeAssert.equal(runtimes[1]?.options.binaryPath, "/t3/tools/codex/0.155.1/bin/codex");
+  }).pipe(Effect.provide(layer));
+});
+
+it.effect("managed turn failures preserve the sharing-limit code for client notices", () => {
+  const factory = makeRuntimeFactory();
+  const layer = Layer.effect(
+    CodexAdapter,
+    Effect.gen(function* () {
+      return yield* makeCodexAdapter(decodeCodexSettings({}), {
+        makeRuntime: factory.factory,
+        resolveRuntime: Effect.succeed({
+          config: decodeCodexSettings({}),
+          environment: {},
+          revision: "managed",
+        }),
+      });
+    }),
+  ).pipe(
+    Layer.provideMerge(ServerConfig.layerTest(process.cwd(), process.cwd())),
+    Layer.provideMerge(ServerSettingsService.layerTest()),
+    Layer.provideMerge(providerSessionDirectoryTestLayer),
+    Layer.provideMerge(NodeServices.layer),
+  );
+  return Effect.gen(function* () {
+    const adapter = yield* CodexAdapter;
+    yield* adapter.startSession({ threadId: asThreadId("thread-1"), runtimeMode: "full-access" });
+    const eventsFiber = yield* adapter.streamEvents.pipe(
+      Stream.take(2),
+      Stream.runCollect,
+      Effect.forkChild,
+    );
+    const notification = codexUsageLimitTurnFailed("managed-sharing-limit");
+    yield* factory.lastRuntime!.emit({
+      ...notification,
+      payload: {
+        threadId: "thread-1",
+        turn: {
+          id: "turn-limit",
+          items: [],
+          status: "failed",
+          error: { message: "subscription_sharing_usage_limit_exceeded", codexErrorInfo: "other" },
+        },
+      },
+    });
+    const events = Array.from(yield* Fiber.join(eventsFiber));
+    NodeAssert.equal(events[0]?.type, "runtime.error");
+    if (events[0]?.type === "runtime.error") {
+      NodeAssert.equal(events[0].payload.code, "subscription_sharing_usage_limit_exceeded");
+      NodeAssert.match(events[0].payload.message, /ChatGPT usage limit/);
+    }
+    NodeAssert.equal(events[1]?.type, "turn.completed");
+    if (events[1]?.type === "turn.completed") NodeAssert.equal(events[1].payload.state, "failed");
+  }).pipe(Effect.provide(layer));
+});
diff --git a/apps/server/src/provider/Layers/CodexAdapter.ts b/apps/server/src/provider/Layers/CodexAdapter.ts
index 0ecc9693ab04..64c7012c4a92 100644
--- a/apps/server/src/provider/Layers/CodexAdapter.ts
+++ b/apps/server/src/provider/Layers/CodexAdapter.ts
@@ -22,6 +22,7 @@ import {
   type ToolActivityNativeAppReference,
   type ToolActivitySource,
   type ProviderUserInputAnswers,
+  type ServerProviderModel,
   RuntimeItemId,
   RuntimeRequestId,
   RuntimeTaskId,
@@ -66,7 +67,6 @@ import {
   makeCodexSessionRuntime,
   type CodexSessionRuntimeError,
   type CodexSessionRuntimeOptions,
-  type CodexSessionRuntimeSendTurnInput,
   type CodexSessionRuntimeShape,
 } from "./CodexSessionRuntime.ts";
 import { type EventNdjsonLogger, makeEventNdjsonLogger } from "./EventNdjsonLogger.ts";
@@ -84,11 +84,14 @@ const isCodexSessionRuntimeThreadIdMissingError = Schema.is(
 );
 const isCodexResumeCursorSchema = Schema.is(CodexResumeCursorSchema);
 
+import { classifyCodexManagedError } from "../CodexManagedErrors.ts";
 const PROVIDER = ProviderDriverKind.make("codex");
 
 export interface CodexAdapterLiveOptions {
   readonly instanceId?: ProviderInstanceId;
   readonly environment?: NodeJS.ProcessEnv;
+  /** The provider's model list; supplies model display names for runtime info. */
+  readonly models?: Effect.Effect<ReadonlyArray<ServerProviderModel>>;
   readonly makeRuntime?: (
     options: CodexSessionRuntimeOptions,
   ) => Effect.Effect<
@@ -96,6 +99,12 @@ export interface CodexAdapterLiveOptions {
     CodexSessionRuntimeError,
     ChildProcessSpawner.ChildProcessSpawner | Scope.Scope
   >;
+  readonly resolveRuntime?: Effect.Effect<
+    import("../CodexManagedRuntime.ts").CodexEffectiveRuntime,
+    import("@t3tools/contracts").ProviderSetupError,
+    Scope.Scope
+  >;
+  readonly onManagedConnectionRevoked?: Effect.Effect<void>;
   readonly nativeEventLogPath?: string;
   readonly nativeEventLogger?: EventNdjsonLogger;
 }
@@ -106,6 +115,8 @@ interface CodexAdapterSessionContext {
   readonly runtime: CodexSessionRuntimeShape;
   readonly eventFiber: Fiber.Fiber<void, never>;
   readonly turnTokenUsage: CodexTurnTokenUsageState;
+  readonly startInput: Parameters<CodexAdapterShape["startSession"]>[0];
+  readonly runtimeRevision?: string;
   stopped: boolean;
 }
 
@@ -2267,8 +2278,28 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
           yield* Effect.suspend(() => stopSessionInternal(existing));
         }
 
+        const sessionScope = yield* Scope.make("sequential");
+        let sessionScopeTransferred = false;
+        yield* Effect.addFinalizer(() =>
+          sessionScopeTransferred ? Effect.void : Scope.close(sessionScope, Exit.void),
+        );
+        const resolved = options?.resolveRuntime
+          ? yield* options.resolveRuntime.pipe(
+              Effect.provideService(Scope.Scope, sessionScope),
+              Effect.mapError(
+                (cause) =>
+                  new ProviderAdapterValidationError({
+                    provider: PROVIDER,
+                    operation: "startSession",
+                    issue: cause.detail,
+                  }),
+              ),
+            )
+          : undefined;
+        const effectiveConfig = resolved?.config ?? codexConfig;
+        const effectiveEnvironment = resolved?.environment ?? options?.environment;
         const serviceTier =
-          input.modelSelection?.instanceId === boundInstanceId
+          !resolved && input.modelSelection?.instanceId === boundInstanceId
             ? getCodexServiceTierOptionValue(input.modelSelection)
             : undefined;
         const mcpSession = McpProviderSession.readMcpProviderSession(input.threadId);
@@ -2276,10 +2307,11 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
           threadId: input.threadId,
           providerInstanceId: boundInstanceId,
           cwd: input.cwd ?? process.cwd(),
-          binaryPath: codexConfig.binaryPath,
-          launchArgs: resolveCodexLaunchArgs(codexConfig.launchArgs, options?.environment),
-          ...(options?.environment ? { environment: options.environment } : {}),
-          ...(codexConfig.homePath ? { homePath: codexConfig.homePath } : {}),
+          ...(options?.models ? { models: options.models } : {}),
+          binaryPath: effectiveConfig.binaryPath,
+          launchArgs: resolveCodexLaunchArgs(effectiveConfig.launchArgs, effectiveEnvironment),
+          ...(effectiveEnvironment ? { environment: effectiveEnvironment } : {}),
+          ...(effectiveConfig.homePath ? { homePath: effectiveConfig.homePath } : {}),
           ...(isCodexResumeCursorSchema(input.resumeCursor)
             ? { resumeCursor: input.resumeCursor }
             : {}),
@@ -2292,7 +2324,7 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
             ? {
                 environment: {
                   ...McpProviderSession.withAgentDeviceEnvironment(
-                    options?.environment ?? process.env,
+                    effectiveEnvironment ?? process.env,
                     mcpSession,
                   ),
                   T3_MCP_BEARER_TOKEN: mcpSession.authorizationHeader.replace(/^Bearer\s+/, ""),
@@ -2314,11 +2346,6 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
         // after the stop and often sparse, so keep the session's merged view of
         // it and read it when a turn fails on the limit.
         let rateLimits: CodexRateLimitSnapshot | undefined;
-        const sessionScope = yield* Scope.make("sequential");
-        let sessionScopeTransferred = false;
-        yield* Effect.addFinalizer(() =>
-          sessionScopeTransferred ? Effect.void : Scope.close(sessionScope, Exit.void),
-        );
         const createRuntime = options?.makeRuntime ?? makeCodexSessionRuntime;
         const runtime = yield* createRuntime(runtimeInput).pipe(
           Effect.provideService(Scope.Scope, sessionScope),
@@ -2389,6 +2416,11 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
               if (errorPayload?.error.codexErrorInfo === "usageLimitExceeded") return;
             }
 
+            const managedError = options?.resolveRuntime
+              ? classifyCodexManagedError(event.payload)
+              : undefined;
+            if (managedError?.revoke && options?.onManagedConnectionRevoked)
+              yield* options.onManagedConnectionRevoked;
             let usageLimitError: ProviderRuntimeEvent | undefined;
             let usageLimitMessage: string | undefined;
             if (event.method === "turn/completed") {
@@ -2400,7 +2432,18 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
                 completedPayload?.turn.status === "failed"
                   ? completedPayload.turn.error
                   : undefined;
-              if (turnError?.codexErrorInfo === "usageLimitExceeded") {
+              if (turnError && managedError) {
+                usageLimitMessage = managedError.message;
+                usageLimitError = {
+                  ...runtimeEventBase(event, event.threadId),
+                  type: "runtime.error",
+                  payload: {
+                    message: managedError.message,
+                    code: managedError.code,
+                    class: "provider_error",
+                  },
+                };
+              } else if (turnError?.codexErrorInfo === "usageLimitExceeded") {
                 usageLimitMessage = codexUsageLimitMessage(rateLimits, event.createdAt);
                 usageLimitError = {
                   ...runtimeEventBase(event, event.threadId),
@@ -2415,12 +2458,27 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
             }
 
             const mappedEvents = mapToRuntimeEvents(event, event.threadId).map((runtimeEvent) => {
+              if (managedError && runtimeEvent.type === "runtime.error")
+                return {
+                  ...runtimeEvent,
+                  payload: {
+                    ...runtimeEvent.payload,
+                    message: managedError.message,
+                    detail: managedError.message,
+                    code: managedError.code,
+                  },
+                } satisfies ProviderRuntimeEvent;
+
               if (runtimeEvent.type === "turn.completed" && runtimeEvent.turnId) {
                 return {
                   ...runtimeEvent,
                   payload: {
                     ...runtimeEvent.payload,
-                    ...(usageLimitMessage ? { errorMessage: usageLimitMessage } : {}),
+                    ...(managedError
+                      ? { errorMessage: managedError.message }
+                      : usageLimitMessage
+                        ? { errorMessage: usageLimitMessage }
+                        : {}),
                     tokenUsage: completeCodexTurnTokenUsage(
                       turnTokenUsage,
                       String(runtimeEvent.turnId),
@@ -2485,6 +2543,8 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
           runtime,
           eventFiber,
           turnTokenUsage,
+          startInput: input,
+          ...(resolved ? { runtimeRevision: resolved.revision } : {}),
           stopped: false,
         });
         sessionScopeTransferred = true;
@@ -2526,13 +2586,34 @@ export const makeCodexAdapter = Effect.fn("makeCodexAdapter")(function* (
       { concurrency: 1 },
     );
 
-    const session = yield* requireSession(input.threadId);
+    let session = yield* requireSession(input.threadId);
+    if (options?.resolveRuntime) {
+      const next = yield* options.resolveRuntime.pipe(
+        Effect.scoped,
+        Effect.mapError(
+          (cause) =>
+            new ProviderAdapterValidationError({
+              provider: PROVIDER,
+              operation: "sendTurn",
+              issue: cause.detail,
+            }),
+        ),
+      );
+      if (next.revision !== session.runtimeRevision) {
+        const previous = yield* session.runtime.getSession;
+        yield* startSession({
+          ...session.startInput,
+          ...(previous.resumeCursor ? { resumeCursor: previous.resumeCursor } : {}),
+        });
+        session = yield* requireSession(input.threadId);
+      }
+    }
     const reasoningEffort =
       input.modelSelection?.instanceId === boundInstanceId
         ? getModelSelectionStringOptionValue(input.modelSelection, "reasoningEffort")
         : undefined;
     const serviceTier =
-      input.modelSelection?.instanceId === boundInstanceId
+      !options?.resolveRuntime && input.modelSelection?.instanceId === boundInstanceId
         ? getCodexServiceTierOptionValue(input.modelSelection)
         : undefined;
     return yield* session.runtime
diff --git a/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts b/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts
index 2a9fb56c186a..5405169926f5 100644
--- a/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts
+++ b/apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts
@@ -868,3 +868,76 @@ describe("CodexSessionRuntime collab integration", () => {
     );
   }
 });
+
+describe("CodexSessionRuntime compaction", () => {
+  it.effect("restores T3 context after the root thread compacts", () =>
+    Effect.gen(function* () {
+      const compacted = (threadId: string) => ({
+        method: "item/completed",
+        params: {
+          threadId,
+          turnId: `${threadId}-turn`,
+          completedAtMs: 0,
+          item: { type: "contextCompaction", id: `compaction-${threadId}` },
+        },
+      });
+      const script = {
+        rootThreadId: ROOT,
+        recordRequests: true,
+        // A child's compaction must not inject into the root thread.
+        notifications: [compacted(CHILD_A), compacted(ROOT)],
+      };
+      // @effect-diagnostics-next-line preferSchemaOverJson:off
+      NodeFS.writeFileSync(scriptPath, JSON.stringify(script), "utf8");
+      NodeFS.rmSync(`${scriptPath}.requests`, { force: true });
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          NodeFS.rmSync(scriptPath, { force: true });
+          NodeFS.rmSync(`${scriptPath}.requests`, { force: true });
+        }),
+      );
+
+      const runtime = yield* makeCodexSessionRuntime({
+        threadId: ThreadId.make("thread-compaction-context"),
+        binaryPath: peerPath,
+        cwd: NodeOS.tmpdir(),
+        runtimeMode: "full-access",
+        environment: { ...process.env, T3_CODEX_COLLAB_SCRIPT: scriptPath },
+        models: Effect.succeed([
+          { slug: "gpt-5.6-sol", name: "GPT-5.6 Sol", isCustom: false, capabilities: null },
+        ]),
+      });
+      const completedFiber = yield* runtime.events.pipe(
+        Stream.filter((event) => event.method === "turn/completed"),
+        Stream.take(1),
+        Stream.runCollect,
+        Effect.forkScoped,
+      );
+
+      yield* runtime.start();
+      yield* runtime.sendTurn({ input: "keep going", interactionMode: "default" });
+      yield* Fiber.join(completedFiber);
+
+      // The restore is awaited before later notifications, so it has landed.
+      const requests = readRecordedRequests();
+      assert.lengthOf(requests, 1);
+      const [inject] = requests;
+      assert.isDefined(inject);
+      assert.equal(inject.method, "thread/inject_items");
+      assert.equal(inject.params.threadId, ROOT);
+      const texts = (
+        inject.params.items as ReadonlyArray<{ role: string; content: [{ text: string }] }>
+      ).map((item) => {
+        assert.equal(item.role, "developer");
+        return item.content[0].text;
+      });
+      assert.lengthOf(texts, 1);
+      assert.match(
+        texts[0] ?? "",
+        /^<t3_code_runtime><runtime_info>.*as GPT-5\.6 Sol \(model slug: gpt-5\.6-sol\).*<\/t3_code_runtime>$/s,
+      );
+
+      yield* runtime.close;
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+});
diff --git a/apps/server/src/provider/Layers/CodexProvider.test.ts b/apps/server/src/provider/Layers/CodexProvider.test.ts
index 0c7a40d9bd9e..2c67b6f144db 100644
--- a/apps/server/src/provider/Layers/CodexProvider.test.ts
+++ b/apps/server/src/provider/Layers/CodexProvider.test.ts
@@ -81,6 +81,11 @@ it("uses standard routing when the catalog has no default service tier", () => {
         name: "Fast",
         description: "1.5x speed, increased usage",
       },
+      {
+        id: "ultrafast",
+        name: "Ultrafast",
+        description: "The fastest available responses for latency-sensitive work.",
+      },
     ],
     supportedReasoningEfforts: [],
   });
@@ -97,6 +102,11 @@ it("uses standard routing when the catalog has no default service tier", () => {
           label: "Fast",
           description: "1.5x speed, increased usage",
         },
+        {
+          id: "ultrafast",
+          label: "Ultrafast",
+          description: "Even faster, more expensive",
+        },
       ],
       currentValue: "default",
     },
diff --git a/apps/server/src/provider/Layers/CodexProvider.ts b/apps/server/src/provider/Layers/CodexProvider.ts
index bb49100e25f8..a610a1350185 100644
--- a/apps/server/src/provider/Layers/CodexProvider.ts
+++ b/apps/server/src/provider/Layers/CodexProvider.ts
@@ -90,6 +90,11 @@ const REASONING_EFFORT_LABELS: Readonly<Record<string, string>> = {
 
 const DEFAULT_SERVICE_TIER_ID = "default";
 
+/** Shorter copy for tiers whose catalog description wraps in the traits menu. */
+const SERVICE_TIER_DESCRIPTIONS: Readonly<Record<string, string>> = {
+  ultrafast: "Even faster, more expensive",
+};
+
 function reasoningEffortLabel(reasoningEffort: string): string {
   return REASONING_EFFORT_LABELS[reasoningEffort] ?? reasoningEffort;
 }
@@ -115,6 +120,8 @@ export function codexPlanLabel(planType: string | null | undefined): string | un
       return "ChatGPT Pro 20x Subscription";
     case "prolite":
       return "ChatGPT Pro 5x Subscription";
+    case "promax":
+      return "ChatGPT Pro Max Subscription";
     case "team":
       return "ChatGPT Team Subscription";
     case "self_serve_business_prolite":
@@ -195,12 +202,15 @@ export function mapCodexModelCapabilities(
           label: "Standard",
           ...(defaultServiceTier === DEFAULT_SERVICE_TIER_ID ? { isDefault: true } : {}),
         },
-        ...serviceTiers.map((tier) => ({
-          id: tier.id,
-          label: tier.name,
-          ...(tier.description ? { description: tier.description } : {}),
-          ...(defaultServiceTier === tier.id ? { isDefault: true } : {}),
-        })),
+        ...serviceTiers.map((tier) => {
+          const description = SERVICE_TIER_DESCRIPTIONS[tier.id] ?? tier.description;
+          return {
+            id: tier.id,
+            label: tier.name,
+            ...(description ? { description } : {}),
+            ...(defaultServiceTier === tier.id ? { isDefault: true } : {}),
+          };
+        }),
       ],
       currentValue: defaultServiceTier,
     });
@@ -343,8 +353,9 @@ const requestAllCodexModels = Effect.fn("requestAllCodexModels")(function* (
 export function buildCodexInitializeParams(): CodexSchema.V1InitializeParams {
   return {
     clientInfo: {
-      name: "t3code_desktop",
-      title: "T3 Turbo Desktop",
+      // `name` is the client identity Codex reports upstream; keep upstream's value.
+      name: "T3 Code",
+      title: "T3 Turbo",
       version: packageJson.version,
     },
     capabilities: {
@@ -416,6 +427,7 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
   readonly cwd: string;
   readonly customModels?: ReadonlyArray<CustomModelSetting>;
   readonly environment?: NodeJS.ProcessEnv;
+  readonly skipNativeUsage?: boolean;
 }) {
   const { client, initialize } = yield* withCodexAppServerClient(input);
 
@@ -441,31 +453,33 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
       requestAllCodexModels(client),
       // Usage is an enrichment: a failure or a slow answer degrades to "no
       // usage this probe" rather than costing the account and models.
-      client.request("account/rateLimits/read", undefined).pipe(
-        Effect.map((response): CodexRateLimitsProbe => ({
-          snapshot: response.rateLimits,
-          rateLimitsByLimitId: response.rateLimitsByLimitId,
-          resetCredits: response.rateLimitResetCredits,
-        })),
-        Effect.timeoutOption(Duration.millis(RATE_LIMITS_PROBE_TIMEOUT_MS)),
-        Effect.map(
-          Option.getOrElse((): CodexRateLimitsProbe => ({
-            failure: "Codex did not answer the usage request.",
-          })),
-        ),
-        Effect.catch((error) =>
-          Effect.logDebug("Codex rate-limit read failed.", { cause: error }).pipe(
-            Effect.as<CodexRateLimitsProbe>({ failure: codexRateLimitsFailureMessage(error) }),
+      input.skipNativeUsage
+        ? Effect.succeed(undefined)
+        : client.request("account/rateLimits/read", null).pipe(
+            Effect.map((response): CodexRateLimitsProbe => ({
+              snapshot: response.rateLimits,
+              rateLimitsByLimitId: response.rateLimitsByLimitId,
+              resetCredits: response.rateLimitResetCredits,
+            })),
+            Effect.timeoutOption(Duration.millis(RATE_LIMITS_PROBE_TIMEOUT_MS)),
+            Effect.map(
+              Option.getOrElse((): CodexRateLimitsProbe => ({
+                failure: "Codex did not answer the usage request.",
+              })),
+            ),
+            Effect.catch((error) =>
+              Effect.logDebug("Codex rate-limit read failed.", { cause: error }).pipe(
+                Effect.as<CodexRateLimitsProbe>({ failure: codexRateLimitsFailureMessage(error) }),
+              ),
+            ),
           ),
-        ),
-      ),
     ],
     { concurrency: "unbounded" },
   );
 
   return {
     account: accountResponse,
-    rateLimits,
+    ...(rateLimits ? { rateLimits } : {}),
     version,
     models: applyPreferredCodexDefaultModel(
       appendCustomCodexModels(models, input.customModels ?? []),
@@ -567,12 +581,14 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
     readonly cwd: string;
     readonly customModels: ReadonlyArray<CustomModelSetting>;
     readonly environment?: NodeJS.ProcessEnv;
+    readonly skipNativeUsage?: boolean;
   }) => Effect.Effect<
     CodexAppServerProviderSnapshot,
     CodexErrors.CodexAppServerError,
     ChildProcessSpawner.ChildProcessSpawner | Scope.Scope
   > = probeCodexAppServerProvider,
   environment?: NodeJS.ProcessEnv,
+  managedAuth?: ServerProvider["auth"],
 ): Effect.fn.Return<
   ServerProviderDraft,
   ServerSettingsError,
@@ -606,6 +622,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
     cwd: process.cwd(),
     customModels: codexSettings.customModels,
     environment: resolvedEnvironment,
+    ...(managedAuth ? { skipNativeUsage: true } : {}),
   }).pipe(
     Effect.scoped,
     Effect.timeoutOption(Duration.millis(AUTH_PROBE_TIMEOUT_MS)),
@@ -654,7 +671,9 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
   }
 
   const snapshot = probeResult.success.value;
-  const accountStatus = accountProbeStatus(snapshot.account);
+  const accountStatus = managedAuth
+    ? { status: "ready" as const, auth: managedAuth, message: undefined }
+    : accountProbeStatus(snapshot.account);
   const usageLimits =
     snapshot.account.account?.type === "apiKey"
       ? makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" })
@@ -691,7 +710,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
       status: accountStatus.status,
       auth: accountStatus.auth,
       ...(accountStatus.message ? { message: accountStatus.message } : {}),
-      usageLimits,
+      ...(managedAuth ? {} : { usageLimits }),
     },
   });
 });
diff --git a/apps/server/src/provider/Layers/CodexSessionRuntime.test.ts b/apps/server/src/provider/Layers/CodexSessionRuntime.test.ts
index c79eae9ffcee..6382173a1df1 100644
--- a/apps/server/src/provider/Layers/CodexSessionRuntime.test.ts
+++ b/apps/server/src/provider/Layers/CodexSessionRuntime.test.ts
@@ -9,7 +9,10 @@ import * as CodexErrors from "effect-codex-app-server/errors";
 import * as CodexRpc from "effect-codex-app-server/rpc";
 import * as EffectCodexSchema from "effect-codex-app-server/schema";
 
-import { buildCodexDeveloperInstructions } from "../CodexDeveloperInstructions.ts";
+import {
+  buildCodexAdditionalContext,
+  buildCodexDeveloperInstructions,
+} from "../CodexDeveloperInstructions.ts";
 import { codexSessionAppServerArgs } from "./codexLaunchArgs.ts";
 import {
   buildTurnStartParams,
@@ -90,25 +93,28 @@ describe("Codex thread history", () => {
     );
   }
 
-  it.effect("keeps the count-based rollback API for older threads", () =>
+  it.effect("surfaces Codex rejecting a revert of a legacy thread", () =>
     Effect.gen(function* () {
+      const rejection = CodexErrors.CodexAppServerRequestError.invalidRequest(
+        "thread/revert only supports paginated threads",
+      );
       const client: Parameters<typeof rollbackCodexThread>[0] = {
-        raw: { request: () => Effect.succeed({ thread: {} }) },
-        request: <M extends CodexRpc.ClientRequestMethod>(
-          method: M,
-          params: CodexRpc.ClientRequestParamsByMethod[M],
-        ) => {
-          NodeAssert.equal(method, "thread/rollback");
-          NodeAssert.deepEqual(params, { threadId: "legacy-thread", numTurns: 2 });
+        raw: {
+          request: (method) => {
+            if (method === "thread/read") return Effect.succeed({ thread: {} });
+            if (method === "thread/revert") return Effect.fail(rejection);
+            return Effect.die(`Unexpected raw request: ${method}`);
+          },
+        },
+        request: <M extends CodexRpc.ClientRequestMethod>(method: M) => {
+          NodeAssert.equal(method, "thread/read");
           return Effect.succeed({
-            thread: { id: "legacy-thread", turns: [] },
+            thread: { id: "legacy-thread", turns: [{ id: "turn-1", items: [] }] },
           } as unknown as CodexRpc.ClientRequestResponsesByMethod[M]);
         },
       };
-      NodeAssert.deepEqual(yield* rollbackCodexThread(client, "legacy-thread", 2), {
-        threadId: "legacy-thread",
-        turns: [],
-      });
+      const error = yield* Effect.flip(rollbackCodexThread(client, "legacy-thread", 1));
+      NodeAssert.strictEqual(error, rejection);
     }),
   );
 });
@@ -229,12 +235,13 @@ describe("buildTurnStartParams", () => {
         settings: {
           model: "gpt-5.3-codex",
           reasoning_effort: "medium",
-          developer_instructions: buildCodexDeveloperInstructions("plan", {
-            model: "gpt-5.3-codex",
-            reasoningEffort: "medium",
-          }),
+          developer_instructions: buildCodexDeveloperInstructions("plan"),
         },
       },
+      additionalContext: buildCodexAdditionalContext({
+        model: "gpt-5.3-codex",
+        reasoningEffort: "medium",
+      }),
     });
   });
 
@@ -278,12 +285,13 @@ describe("buildTurnStartParams", () => {
         settings: {
           model: "gpt-5.3-codex",
           reasoning_effort: "medium",
-          developer_instructions: buildCodexDeveloperInstructions("default", {
-            model: "gpt-5.3-codex",
-            reasoningEffort: "medium",
-          }),
+          developer_instructions: buildCodexDeveloperInstructions("default"),
         },
       },
+      additionalContext: buildCodexAdditionalContext({
+        model: "gpt-5.3-codex",
+        reasoningEffort: "medium",
+      }),
     });
   });
 
@@ -300,9 +308,29 @@ describe("buildTurnStartParams", () => {
     const settings = params.collaborationMode?.settings;
     NodeAssert.equal(settings?.model, DEFAULT_MODEL);
     NodeAssert.equal(settings?.reasoning_effort, "medium");
-    NodeAssert.ok(settings?.developer_instructions?.includes(`as ${DEFAULT_MODEL} with medium`));
+    NodeAssert.ok(
+      params.additionalContext?.t3_code_runtime?.value.includes(`as ${DEFAULT_MODEL} with medium`),
+    );
   });
 
+  it.effect("names the model by display name and slug in the runtime context", () =>
+    Effect.gen(function* () {
+      const params = yield* buildTurnStartParams({
+        threadId: "provider-thread-1",
+        runtimeMode: "full-access",
+        model: "gpt-5.3-codex",
+        modelName: "GPT-5.3-Codex",
+        effort: "high",
+        interactionMode: "plan",
+      });
+
+      NodeAssert.match(
+        params.additionalContext?.t3_code_runtime?.value ?? "",
+        /as GPT-5\.3-Codex \(model slug: gpt-5\.3-codex\) with high reasoning effort/,
+      );
+    }),
+  );
+
   it.effect("routes approvals to the auto reviewer in auto mode", () =>
     Effect.gen(function* () {
       const params = yield* buildTurnStartParams({
@@ -557,99 +585,83 @@ describe("Codex MCP elicitation approvals", () => {
 });
 
 describe("buildCodexDeveloperInstructions", () => {
-  it("appends runtime info after the mode instructions", () => {
-    const instructions = buildCodexDeveloperInstructions("default", {
-      model: "gpt-5.3-codex",
-      reasoningEffort: "high",
-    });
-
-    NodeAssert.match(instructions, /^<collaboration_mode># Collaboration Mode: Default/);
-    NodeAssert.match(instructions, /T3 Turbo/);
-    NodeAssert.match(instructions, /Codex harness/);
-    NodeAssert.match(instructions, /as gpt-5\.3-codex with high reasoning effort/);
-  });
-
-  it("describes Markdown media support in the runtime context in both modes", () => {
+  it("keeps T3 context out of the mode prompt, which the model catalog can replace", () => {
     for (const mode of ["default", "plan"] as const) {
-      const instructions = buildCodexDeveloperInstructions(mode, {
-        model: "gpt-5.3-codex",
-        reasoningEffort: "high",
-      });
-      NodeAssert.match(
-        instructions,
-        /<runtime_info>.*embed images and videos.*Markdown.*<\/runtime_info>/,
-      );
+      const instructions = buildCodexDeveloperInstructions(mode);
+      NodeAssert.match(instructions, /^<collaboration_mode>[\s\S]*<\/collaboration_mode>$/);
+      NodeAssert.doesNotMatch(instructions, /runtime_info|pull_request_linking|preview_|device_/);
     }
   });
+});
 
-  it("includes runtime info alongside plan mode instructions", () => {
-    const instructions = buildCodexDeveloperInstructions("plan", {
-      model: "gpt-5.3-codex",
-      reasoningEffort: "medium",
-    });
+describe("buildCodexAdditionalContext", () => {
+  const runtime = { model: "gpt-5.3-codex", reasoningEffort: "high" };
+  const runtimeValue = (context: ReturnType<typeof buildCodexAdditionalContext>) =>
+    context.t3_code_runtime?.value ?? "";
 
-    NodeAssert.match(instructions, /^<collaboration_mode># Plan Mode/);
-    NodeAssert.match(instructions, /as gpt-5\.3-codex with medium reasoning effort/);
+  it("describes the harness, model, effort, and Markdown media support", () => {
+    const context = buildCodexAdditionalContext(runtime);
+
+    NodeAssert.equal(context.t3_code_runtime?.kind, "application");
+    NodeAssert.match(runtimeValue(context), /running in T3 Turbo/);
+    NodeAssert.match(
+      runtimeValue(context),
+      /<runtime_info>.*Codex harness, as gpt-5\.3-codex with high reasoning effort.*embed images and videos.*Markdown.*<\/runtime_info>/,
+    );
   });
 
   it("varies with the model and effort of each turn", () => {
-    const first = buildCodexDeveloperInstructions("default", {
-      model: "gpt-5.3-codex",
-      reasoningEffort: "medium",
-    });
-    const second = buildCodexDeveloperInstructions("default", {
-      model: "gpt-5.4",
-      reasoningEffort: "high",
-    });
-
-    NodeAssert.notEqual(first, second);
+    NodeAssert.notEqual(
+      runtimeValue(
+        buildCodexAdditionalContext({ model: "gpt-5.3-codex", reasoningEffort: "medium" }),
+      ),
+      runtimeValue(buildCodexAdditionalContext({ model: "gpt-5.4", reasoningEffort: "high" })),
+    );
   });
 
   it("flattens multiline metadata into single-line runtime info", () => {
-    const instructions = buildCodexDeveloperInstructions("default", {
-      model: "gpt\n5.3\ncodex",
-      reasoningEffort: " high\neffort ",
-    });
+    const value = runtimeValue(
+      buildCodexAdditionalContext({ model: "gpt\n5.3\ncodex", reasoningEffort: " high\neffort " }),
+    );
 
-    NodeAssert.match(instructions, /as gpt 5\.3 codex with high effort reasoning effort/);
-    NodeAssert.doesNotMatch(instructions, /<runtime_info>[^<]*\n/);
+    NodeAssert.match(value, /as gpt 5\.3 codex with high effort reasoning effort/);
+    NodeAssert.doesNotMatch(value, /<runtime_info>[^<]*\n/);
+  });
+
+  it("keeps every entry under Codex's 1,000 token cap per entry", () => {
+    const context = buildCodexAdditionalContext(runtime, { browser: true, device: true });
+    for (const entry of Object.values(context)) {
+      // Codex estimates 4 bytes per token and truncates the middle of longer values.
+      NodeAssert.ok(Buffer.byteLength(entry.value) < 4_000);
+    }
   });
 });
 
-describe("T3 browser developer instructions", () => {
+describe("T3 tool instructions", () => {
   const runtime = { model: "gpt-5.3-codex", reasoningEffort: "high" };
 
-  it("prefers the product-native preview tools in both collaboration modes", () => {
-    for (const mode of ["default", "plan"] as const) {
-      const instructions = buildCodexDeveloperInstructions(mode, runtime, true);
-      NodeAssert.match(instructions, /t3-code/);
-      NodeAssert.match(instructions, /preview_status/);
-      NodeAssert.match(instructions, /preview_open/);
-      NodeAssert.match(instructions, /Do not switch to global browser skills/);
-    }
+  it("prefers the product-native preview tools when they are attached", () => {
+    const tools = buildCodexAdditionalContext(runtime, true).t3_code_tools?.value ?? "";
+    NodeAssert.match(tools, /t3-code/);
+    NodeAssert.match(tools, /preview_status/);
+    NodeAssert.match(tools, /preview_open/);
+    NodeAssert.match(tools, /Do not switch to global browser skills/);
+    NodeAssert.doesNotMatch(tools, /device_open/);
   });
 
-  it("omits the browser block entirely when the preview tools are not attached", () => {
-    for (const mode of ["default", "plan"] as const) {
-      const instructions = buildCodexDeveloperInstructions(mode, runtime, false);
-      NodeAssert.doesNotMatch(instructions, /preview_status/);
-      NodeAssert.doesNotMatch(instructions, /preview_open/);
-      NodeAssert.doesNotMatch(instructions, /T3 Code collaborative browser/);
-      // Steering away from other browser automation must go with the tools;
-      // keeping it would leave the model talked out of its only option.
-      NodeAssert.doesNotMatch(instructions, /Do not switch to global browser skills/);
-      // The rest of the collaboration mode is untouched.
-      NodeAssert.match(instructions, /<collaboration_mode>/);
-      NodeAssert.match(instructions, /<\/collaboration_mode>/);
-    }
+  it("describes device tools only when the credential grants them", () => {
+    const tools =
+      buildCodexAdditionalContext(runtime, { browser: false, device: true }).t3_code_tools?.value ??
+      "";
+    NodeAssert.match(tools, /device_open/);
+    NodeAssert.doesNotMatch(tools, /preview_open/);
   });
 
-  it("tracks the turn's MCP configuration rather than defaulting to on", () => {
-    NodeAssert.match(buildCodexDeveloperInstructions("default", runtime, true), /preview_open/);
-    NodeAssert.doesNotMatch(
-      buildCodexDeveloperInstructions("default", runtime, false),
-      /preview_open/,
-    );
+  it("omits the tool entry entirely when no tools are attached", () => {
+    // Steering away from other browser automation must go with the tools;
+    // keeping it would leave the model talked out of its only option.
+    const context = buildCodexAdditionalContext(runtime, false);
+    NodeAssert.deepStrictEqual(Object.keys(context), ["t3_code_runtime"]);
   });
 });
 
@@ -680,6 +692,7 @@ function makeThreadStartedNotification(
         id: threadId,
         modelProvider: "openai",
         preview: "",
+        projectId: null,
         sessionId: threadId,
         source,
         status: { type: "idle" as const },
diff --git a/apps/server/src/provider/Layers/CodexSessionRuntime.ts b/apps/server/src/provider/Layers/CodexSessionRuntime.ts
index 674d23327b65..f30baf011e8a 100644
--- a/apps/server/src/provider/Layers/CodexSessionRuntime.ts
+++ b/apps/server/src/provider/Layers/CodexSessionRuntime.ts
@@ -14,6 +14,7 @@ import {
   type ProviderTurnStartResult,
   type ProviderUserInputAnswers,
   RuntimeMode,
+  type ServerProviderModel,
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
@@ -40,6 +41,7 @@ import { buildCodexInitializeParams } from "./CodexProvider.ts";
 import { codexSessionAppServerArgs } from "./codexLaunchArgs.ts";
 import { expandHomePath } from "../../pathExpansion.ts";
 import {
+  buildCodexAdditionalContext,
   buildCodexDeveloperInstructions,
   type T3CodeToolAvailability,
 } from "../CodexDeveloperInstructions.ts";
@@ -119,7 +121,7 @@ const McpElicitationFormField = Schema.Struct({
   type: Schema.optionalKey(NullableMcpElicitationString),
   title: Schema.optionalKey(NullableMcpElicitationString),
   description: Schema.optionalKey(NullableMcpElicitationString),
-  default: Schema.optionalKey(Schema.Unknown),
+  default: Schema.optionalKey(Schema.Json),
   enum: Schema.optionalKey(Schema.NullOr(Schema.Array(Schema.String))),
   enumNames: Schema.optionalKey(Schema.NullOr(Schema.Array(Schema.String))),
   oneOf: Schema.optionalKey(
@@ -141,10 +143,13 @@ const isMcpElicitationMetadata = Schema.is(McpElicitationMetadata);
 const isMcpElicitationForm = Schema.is(McpElicitationForm);
 
 // TODO: Verify `packages/effect-codex-app-server/scripts/generate.ts` so the generated
-// `V2TurnStartParams` schema includes `collaborationMode` directly.
+// `V2TurnStartParams` schema includes its experimental fields directly.
 const CodexTurnStartParamsWithCollaborationMode = EffectCodexSchema.V2TurnStartParams.pipe(
   Schema.fieldsAssign({
     collaborationMode: Schema.optionalKey(EffectCodexSchema.V2TurnStartParams__CollaborationMode),
+    additionalContext: Schema.optionalKey(
+      Schema.Record(Schema.String, EffectCodexSchema.V2TurnStartParams__AdditionalContextEntry),
+    ),
   }),
 );
 const decodeCodexTurnStartParamsWithCollaborationMode = Schema.decodeUnknownEffect(
@@ -163,8 +168,7 @@ export type CodexTurnStartParamsWithCollaborationMode =
 export type CodexResumeCursor = typeof CodexResumeCursorSchema.Type;
 type CodexServiceTier = NonNullable<EffectCodexSchema.V2ThreadStartParams["serviceTier"]>;
 type CodexThreadItem =
-  | EffectCodexSchema.V2ThreadReadResponse["thread"]["turns"][number]["items"][number]
-  | EffectCodexSchema.V2ThreadRollbackResponse["thread"]["turns"][number]["items"][number];
+  EffectCodexSchema.V2ThreadReadResponse["thread"]["turns"][number]["items"][number];
 
 export interface CodexSessionRuntimeOptions {
   readonly threadId: ThreadId;
@@ -179,6 +183,8 @@ export interface CodexSessionRuntimeOptions {
   readonly serviceTier?: CodexServiceTier | undefined;
   readonly resumeCursor?: CodexResumeCursor;
   readonly appServerArgs?: ReadonlyArray<string>;
+  /** The provider's model list; supplies the display name for runtime info. */
+  readonly models?: Effect.Effect<ReadonlyArray<ServerProviderModel>>;
   /** Capabilities the session's `t3-code` MCP credential grants; drives the prompt blocks. */
   readonly mcpCapabilities?: ReadonlySet<string>;
 }
@@ -442,7 +448,7 @@ export function toMcpElicitationResponse(
         ? "always"
         : undefined;
   const form = mcpElicitationFormFields(payload);
-  const content: Record<string, unknown> = {};
+  const content: Record<string, Schema.Json> = {};
 
   for (const [key, field] of Object.entries(form?.properties ?? {})) {
     const options = mcpElicitationFieldOptions(field);
@@ -580,28 +586,31 @@ function runtimeModeToTurnSandboxPolicy(
   }
 }
 
-function buildCodexCollaborationMode(input: {
+function buildCodexTurnInstructions(input: {
   readonly interactionMode?: ProviderInteractionMode;
   readonly model?: string;
+  readonly modelName?: string;
   readonly effort?: EffectCodexSchema.V2TurnStartParams__ReasoningEffort;
   readonly browserToolsAvailable?: boolean | T3CodeToolAvailability;
-}): EffectCodexSchema.V2TurnStartParams__CollaborationMode | undefined {
+}): Pick<CodexTurnStartParamsWithCollaborationMode, "collaborationMode" | "additionalContext"> {
   if (input.interactionMode === undefined) {
-    return undefined;
+    return {};
   }
   const model = normalizeCodexModelSlug(input.model) ?? DEFAULT_MODEL;
   const reasoningEffort = input.effort ?? "medium";
   return {
-    mode: input.interactionMode,
-    settings: {
-      model,
-      reasoning_effort: reasoningEffort,
-      developer_instructions: buildCodexDeveloperInstructions(
-        input.interactionMode,
-        { model, reasoningEffort },
-        input.browserToolsAvailable ?? true,
-      ),
+    collaborationMode: {
+      mode: input.interactionMode,
+      settings: {
+        model,
+        reasoning_effort: reasoningEffort,
+        developer_instructions: buildCodexDeveloperInstructions(input.interactionMode),
+      },
     },
+    additionalContext: buildCodexAdditionalContext(
+      { model, modelName: input.modelName, reasoningEffort },
+      input.browserToolsAvailable ?? true,
+    ),
   };
 }
 
@@ -618,6 +627,8 @@ export function buildTurnStartParams(input: {
     readonly path: string;
   }>;
   readonly model?: string;
+  /** Display name of `model`, for runtime info. */
+  readonly modelName?: string;
   readonly serviceTier?: CodexServiceTier;
   readonly effort?: EffectCodexSchema.V2TurnStartParams__ReasoningEffort;
   readonly interactionMode?: ProviderInteractionMode;
@@ -639,9 +650,10 @@ export function buildTurnStartParams(input: {
   }
 
   const config = runtimeModeToThreadConfig(input.runtimeMode);
-  const collaborationMode = buildCodexCollaborationMode({
+  const turnInstructions = buildCodexTurnInstructions({
     ...(input.interactionMode ? { interactionMode: input.interactionMode } : {}),
     ...(input.model ? { model: input.model } : {}),
+    ...(input.modelName ? { modelName: input.modelName } : {}),
     ...(input.effort ? { effort: input.effort } : {}),
     browserToolsAvailable: input.browserToolsAvailable ?? true,
   });
@@ -655,7 +667,7 @@ export function buildTurnStartParams(input: {
     ...(input.model ? { model: input.model } : {}),
     ...(input.serviceTier ? { serviceTier: input.serviceTier } : {}),
     ...(input.effort ? { effort: input.effort } : {}),
-    ...(collaborationMode ? { collaborationMode } : {}),
+    ...turnInstructions,
   }).pipe(
     Effect.mapError((cause) =>
       CodexErrors.CodexAppServerProtocolParseError.fromSchemaError(
@@ -1185,7 +1197,7 @@ function updateSession(
 }
 
 function parseThreadSnapshot(
-  response: EffectCodexSchema.V2ThreadReadResponse | EffectCodexSchema.V2ThreadRollbackResponse,
+  response: EffectCodexSchema.V2ThreadReadResponse,
 ): CodexThreadSnapshot {
   return {
     threadId: response.thread.id,
@@ -1273,11 +1285,8 @@ export const rollbackCodexThread = Effect.fn("rollbackCodexThread")(function* (
   threadId: string,
   numTurns: number,
 ): Effect.fn.Return<CodexThreadSnapshot, CodexErrors.CodexAppServerError> {
-  if ((yield* readCodexHistoryMode(client, threadId)) !== "paginated") {
-    return parseThreadSnapshot(yield* client.request("thread/rollback", { threadId, numTurns }));
-  }
-  // Paginated threads replace history at a turn boundary instead of supporting
-  // the legacy count-based rollback endpoint.
+  // Codex replaces history at a turn boundary. It rejects threads that still
+  // use legacy history, which have no rollback API since Codex 0.156.
   const snapshot = yield* readCodexThread(client, threadId);
   const retainedCount = Math.max(0, snapshot.turns.length - numTurns);
   const firstRemoved = snapshot.turns[retainedCount];
@@ -1309,6 +1318,9 @@ export const makeCodexSessionRuntime = (
     const collabChildLiveTurnsRef = yield* Ref.make(new Map<string, string>());
     const suppressMemoryConsolidationNotification = makeMemoryConsolidationNotificationFilter();
     const closedRef = yield* Ref.make(false);
+    /** The `additionalContext` of the latest `turn/start`, restored after compaction. */
+    const lastAdditionalContextRef =
+      yield* Ref.make<CodexTurnStartParamsWithCollaborationMode["additionalContext"]>(undefined);
 
     // `~` is not shell-expanded when env vars are set via
     // `child_process.spawn`; `expandHomePath` lets a configured
@@ -1522,7 +1534,7 @@ export const makeCodexSessionRuntime = (
               }
             }),
           ),
-          Effect.catch(() => Effect.void),
+          Effect.ignore,
           Effect.forkIn(runtimeScope),
         );
     });
@@ -1860,6 +1872,35 @@ export const makeCodexSessionRuntime = (
         }
       });
 
+    /**
+     * Compaction rebuilds history from user messages and Codex's own context,
+     * which drops our `additionalContext` messages. Codex only resends an
+     * entry when its value changes, so without this the T3 context would stay
+     * lost until the model or effort changed. Awaited so the context is back
+     * before later notifications from the same turn are handled. Drop this if
+     * Codex enables its `retain_client_developer_messages` feature by default.
+     */
+    const restoreAdditionalContext = (threadId: string) =>
+      Effect.gen(function* () {
+        const context = yield* Ref.get(lastAdditionalContextRef);
+        if (!context) return;
+        yield* client.request("thread/inject_items", {
+          threadId,
+          items: Object.entries(context).map(([key, entry]) => ({
+            type: "message",
+            role: "developer",
+            content: [{ type: "input_text", text: `<${key}>${entry.value}</${key}>` }],
+          })),
+        });
+      }).pipe(
+        Effect.timeout("10 seconds"),
+        Effect.catch((cause) =>
+          Effect.logWarning("Failed to restore Codex additional context after compaction.", {
+            cause,
+          }),
+        ),
+      );
+
     const handleRawNotification = (notification: CodexServerNotification) =>
       Effect.gen(function* () {
         const isMemoryConsolidationNotification =
@@ -1946,6 +1987,14 @@ export const makeCodexSessionRuntime = (
           return;
         }
 
+        if (
+          notification.method === "item/completed" &&
+          notification.params.item.type === "contextCompaction" &&
+          notification.params.threadId === suppressRootId
+        ) {
+          yield* restoreAdditionalContext(notification.params.threadId);
+        }
+
         let requestId: ApprovalRequestId | undefined;
         let requestKind: ProviderRequestKind | undefined;
         let turnId = childParentTurnId ?? route.turnId;
@@ -2513,12 +2562,15 @@ export const makeCodexSessionRuntime = (
           const normalizedModel = normalizeCodexModelSlug(
             input.model ?? (yield* Ref.get(sessionRef)).model,
           );
+          const models = options.models ? yield* options.models : [];
+          const modelName = models.find((model) => model.slug === normalizedModel)?.name;
           const params = yield* buildTurnStartParams({
             threadId: providerThreadId,
             runtimeMode: options.runtimeMode,
             ...(input.input ? { prompt: input.input } : {}),
             ...(input.attachments ? { attachments: input.attachments } : {}),
             ...(normalizedModel ? { model: normalizedModel } : {}),
+            ...(modelName ? { modelName } : {}),
             ...(input.serviceTier ? { serviceTier: input.serviceTier } : {}),
             ...(input.effort ? { effort: input.effort } : {}),
             ...(input.interactionMode ? { interactionMode: input.interactionMode } : {}),
@@ -2530,6 +2582,7 @@ export const makeCodexSessionRuntime = (
               options.mcpCapabilities,
             ),
           });
+          yield* Ref.set(lastAdditionalContextRef, params.additionalContext);
           const rawResponse = yield* client.raw.request("turn/start", params);
           const response = yield* decodeV2TurnStartResponse(rawResponse).pipe(
             Effect.mapError((error) =>
diff --git a/apps/server/src/provider/Layers/CursorProvider.test.ts b/apps/server/src/provider/Layers/CursorProvider.test.ts
index 8a7560fe0e71..a3ee27addc86 100644
--- a/apps/server/src/provider/Layers/CursorProvider.test.ts
+++ b/apps/server/src/provider/Layers/CursorProvider.test.ts
@@ -742,7 +742,7 @@ describe("discoverCursorModelsViaAcp", () => {
           apiEndpoint: "",
           customModels: [],
         };
-        const discover = yield* makeCursorModelDiscovery(settings, {
+        const { discover, invalidate } = yield* makeCursorModelDiscovery(settings, {
           ...process.env,
           T3_ACP_REQUEST_LOG_PATH: requestLogPath,
         });
@@ -755,6 +755,10 @@ describe("discoverCursorModelsViaAcp", () => {
         yield* fileSystem.writeFileString(requestLogPath, "");
         expect(yield* discover(about)).toEqual(first);
         expect(yield* fileSystem.readFileString(requestLogPath)).toBe("");
+        yield* invalidate;
+        expect(yield* discover(about)).toEqual(first);
+        expect(yield* fileSystem.readFileString(requestLogPath)).toContain("initialize");
+        yield* fileSystem.writeFileString(requestLogPath, "");
         yield* discover({ ...about, version: "2026.08.12" });
         expect(yield* fileSystem.readFileString(requestLogPath)).toContain("initialize");
         yield* fileSystem.writeFileString(requestLogPath, "");
@@ -987,21 +991,21 @@ describe("Cursor usage limits", () => {
         {
           id: "totalPercentUsed",
           kind: "monthly",
-          label: "Monthly",
+          label: "Overall",
           usedPercent: 72.4,
           resetsAt: "2026-09-20T03:53:06.000Z",
         },
         {
           id: "autoPercentUsed",
           kind: "monthly",
-          label: "Monthly · Auto",
+          label: "Cursor Models",
           usedPercent: 69.5,
           resetsAt: "2026-09-20T03:53:06.000Z",
         },
         {
           id: "apiPercentUsed",
           kind: "monthly",
-          label: "Monthly · API",
+          label: "Other Models",
           usedPercent: 100,
           resetsAt: "2026-09-20T03:53:06.000Z",
         },
@@ -1015,10 +1019,10 @@ describe("Cursor usage limits", () => {
     );
     expect(
       cursorUsageResponseToLimits({ planUsage: { totalPercentUsed: 0 } }, checkedAt).windows,
-    ).toEqual([{ id: "totalPercentUsed", kind: "monthly", label: "Monthly", usedPercent: 0 }]);
+    ).toEqual([{ id: "totalPercentUsed", kind: "monthly", label: "Overall", usedPercent: 0 }]);
     expect(
       cursorUsageResponseToLimits({ planUsage: { totalPercentUsed: 150 } }, checkedAt).windows,
-    ).toEqual([{ id: "totalPercentUsed", kind: "monthly", label: "Monthly", usedPercent: 100 }]);
+    ).toEqual([{ id: "totalPercentUsed", kind: "monthly", label: "Overall", usedPercent: 100 }]);
   });
 
   it("reads the instance's credentials and endpoint even when usage enabled is false", async () => {
@@ -1075,6 +1079,10 @@ describe("Cursor usage limits", () => {
               AGENT_CLI_CREDENTIAL_STORE: platform === "linux" ? "memory" : "default",
               ...(token ? { CURSOR_AUTH_TOKEN: token } : {}),
             },
+            false,
+            async () => {
+              throw new Error("must not read Keychain before opt-in");
+            },
           ).pipe(
             Effect.provideService(HostProcessPlatform, platform),
             Effect.provideService(
@@ -1104,6 +1112,71 @@ describe("Cursor usage limits", () => {
     }
   });
 
+  it("reads the default macOS Cursor login from Keychain for limits", async () => {
+    const limits = await runNode(
+      readCursorUsageLimits({ apiEndpoint: "" }, {}, true, async () => "keychain-token").pipe(
+        Effect.provideService(HostProcessPlatform, "darwin"),
+        Effect.provideService(
+          FileSystem.FileSystem,
+          FileSystem.makeNoop({
+            readFileString: () => Effect.die("must not read a stale credential file"),
+          }),
+        ),
+        Effect.provideService(
+          HttpClient.HttpClient,
+          HttpClient.make((request) => {
+            expect(request.headers.authorization).toBe("Bearer keychain-token");
+            return Effect.succeed(
+              HttpClientResponse.fromWeb(
+                request,
+                Response.json({ planUsage: { totalPercentUsed: 42 } }),
+              ),
+            );
+          }),
+        ),
+      ),
+    );
+    expect(limits.windows[0]?.usedPercent).toBe(42);
+  });
+
+  it("reports a Keychain initialization failure without failing the provider refresh", async () => {
+    const limits = await runNode(
+      readCursorUsageLimits({ apiEndpoint: "" }, {}, true, async () => {
+        throw new Error("Keychain initialization failed");
+      }).pipe(
+        Effect.provideService(HostProcessPlatform, "darwin"),
+        Effect.provideService(
+          HttpClient.HttpClient,
+          HttpClient.make(() => Effect.die("must not request limits without a login")),
+        ),
+      ),
+    );
+    expect(limits.unavailable?.reason).toBe("probeFailed");
+  });
+
+  it("does not read Keychain or send its token to a custom endpoint", async () => {
+    for (const [apiEndpoint, environment] of [
+      ["http://localhost:3000", {}],
+      ["", { CURSOR_API_ENDPOINT: "http://localhost:3000" }],
+      ["https://cursor-proxy.example", {}],
+      ["", { CURSOR_API_ENDPOINT: "https://cursor-proxy.example" }],
+    ] as const) {
+      const limits = await runNode(
+        readCursorUsageLimits({ apiEndpoint }, environment, true, async () => {
+          throw new Error("must not read Keychain for a custom endpoint");
+        }).pipe(
+          Effect.provideService(HostProcessPlatform, "darwin"),
+          Effect.provideService(
+            HttpClient.HttpClient,
+            HttpClient.make(() => Effect.die("must not send a Keychain credential to a proxy")),
+          ),
+        ),
+      );
+      expect(limits.unavailable?.reason).toBe("unsupported");
+      expect(limits.unavailable?.message).toContain("default Cursor endpoint");
+    }
+  });
+
   it("reports failed requests without exposing credentials or response bodies", async () => {
     const limits = await runNode(
       readCursorUsageLimits({ apiEndpoint: "" }, { CURSOR_AUTH_TOKEN: "private-token" }).pipe(
diff --git a/apps/server/src/provider/Layers/CursorProvider.ts b/apps/server/src/provider/Layers/CursorProvider.ts
index 7974f27d8210..5bb770ab1154 100644
--- a/apps/server/src/provider/Layers/CursorProvider.ts
+++ b/apps/server/src/provider/Layers/CursorProvider.ts
@@ -678,8 +678,11 @@ export const makeCursorModelDiscovery = Effect.fn("makeCursorModelDiscovery")(fu
         Exit.isSuccess(exit) && exit.value.length > 0 ? Duration.minutes(30) : Duration.zero,
     },
   );
-  return (about: Pick<CursorAboutResult, "version" | "auth">) =>
-    Cache.get(cache, JSON.stringify([about.version, about.auth]));
+  return {
+    discover: (about: Pick<CursorAboutResult, "version" | "auth">) =>
+      Cache.get(cache, JSON.stringify([about.version, about.auth])),
+    invalidate: Cache.invalidateAll(cache),
+  };
 });
 
 function getCursorFallbackModels(
diff --git a/apps/server/src/provider/Layers/GrokAdapter.test.ts b/apps/server/src/provider/Layers/GrokAdapter.test.ts
index ecd73af72dbe..fb17d6839fda 100644
--- a/apps/server/src/provider/Layers/GrokAdapter.test.ts
+++ b/apps/server/src/provider/Layers/GrokAdapter.test.ts
@@ -363,6 +363,66 @@ it.layer(grokAdapterTestLayer)("GrokAdapterLive", (it) => {
     }),
   );
 
+  it.effect("retires a crashed process so a deliberate retry can resume", () =>
+    Effect.gen(function* () {
+      const threadId = ThreadId.make("grok-crash-recovery");
+      const tempDir = yield* Effect.promise(() =>
+        NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "grok-crash-recovery-")),
+      );
+      const requestLogPath = NodePath.join(tempDir, "requests.ndjson");
+      const wrapper = yield* Effect.promise(() =>
+        makeMockGrokWrapper({
+          T3_ACP_CRASH_PROMPT: "1",
+          T3_ACP_REQUEST_LOG_PATH: requestLogPath,
+        }),
+      );
+      const adapter = yield* makeTestAdapter(wrapper);
+      const exited =
+        yield* Deferred.make<Extract<ProviderRuntimeEvent, { type: "session.exited" }>>();
+      const events = yield* Stream.runForEach(adapter.streamEvents, (event) =>
+        event.type === "session.exited"
+          ? Deferred.succeed(exited, event).pipe(Effect.asVoid)
+          : Effect.void,
+      ).pipe(Effect.forkChild);
+      const input = {
+        threadId,
+        provider: ProviderDriverKind.make("grok"),
+        cwd: process.cwd(),
+        runtimeMode: "full-access" as const,
+      };
+      const session = yield* adapter.startSession(input);
+      const failure = yield* Effect.flip(
+        adapter.sendTurn({ threadId, input: "crash now", attachments: [] }),
+      );
+      assert.isDefined(failure);
+      assert.isFalse(yield* adapter.hasSession(threadId));
+      const retryDuringTeardown = yield* Effect.flip(
+        adapter.sendTurn({ threadId, input: "retry during teardown", attachments: [] }),
+      );
+      assert.equal(retryDuringTeardown._tag, "ProviderAdapterSessionNotFoundError");
+      assert.equal((yield* Deferred.await(exited)).payload.exitKind, "error");
+      assert.deepStrictEqual(yield* adapter.listSessions(), []);
+      yield* Fiber.interrupt(events);
+      yield* adapter.startSession({ ...input, resumeCursor: session.resumeCursor });
+      const turn = yield* adapter.sendTurn({ threadId, input: "retry now", attachments: [] });
+      assert.equal(turn.threadId, threadId);
+      yield* adapter.stopSession(threadId);
+      const requests = yield* Effect.promise(() => readJsonLines(requestLogPath));
+      assert.equal(requests.filter((request) => request.method === "session/new").length, 1);
+      assert.deepStrictEqual(session.resumeCursor, {
+        schemaVersion: 1,
+        sessionId: "mock-session-1",
+      });
+      const resumes = requests.filter((request) => request.method === "session/load");
+      assert.equal(resumes.length, 1);
+      assert.deepStrictEqual(resumes[0]?.params, {
+        sessionId: "mock-session-1",
+        cwd: process.cwd(),
+        mcpServers: [],
+      });
+    }),
+  );
+
   it.effect("starts a session and maps mock ACP prompt flow to runtime events", () =>
     Effect.gen(function* () {
       const threadId = ThreadId.make("grok-mock-thread");
diff --git a/apps/server/src/provider/Layers/GrokAdapter.ts b/apps/server/src/provider/Layers/GrokAdapter.ts
index bec0fc39faa0..63ff71eca257 100644
--- a/apps/server/src/provider/Layers/GrokAdapter.ts
+++ b/apps/server/src/provider/Layers/GrokAdapter.ts
@@ -175,6 +175,7 @@ interface GrokSessionContext {
   currentModelId: string | undefined;
   currentReasoningEffort: string | undefined;
   stopped: boolean;
+  terminated: boolean;
   /** Live monitor/shell identities and their originating turns. */
   readonly backgroundTasks: Map<string, GrokBackgroundTaskRecord>;
 }
@@ -345,6 +346,7 @@ export function grokPromptSettlementBelongsToContext(input: {
 
 export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapterLiveOptions) {
   return Effect.gen(function* () {
+    const ownerScope = yield* Effect.scope;
     const boundInstanceId = options?.instanceId ?? ProviderInstanceId.make("grok");
     const fileSystem = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
@@ -776,46 +778,45 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
       );
     });
 
-    const runTurnLivenessWatchdog = Effect.fn("GrokAdapter.runTurnLivenessWatchdog")(
-      function* (ctx: GrokSessionContext) {
-        while (true) {
-          if (ctx.stopped) {
-            return;
-          }
-          const turnId = ctx.livenessTurnId;
-          if (
-            turnId === undefined ||
-            ctx.interruptedTurnIds.has(turnId) ||
-            !isLiveTurn(ctx, turnId) ||
-            hasLivenessPause(ctx)
-          ) {
-            yield* Queue.take(ctx.livenessSignals);
-            continue;
-          }
+    const runTurnLivenessWatchdog = Effect.fn("GrokAdapter.runTurnLivenessWatchdog")(function* (
+      ctx: GrokSessionContext,
+    ) {
+      while (true) {
+        if (ctx.stopped) {
+          return;
+        }
+        const turnId = ctx.livenessTurnId;
+        if (
+          turnId === undefined ||
+          ctx.interruptedTurnIds.has(turnId) ||
+          !isLiveTurn(ctx, turnId) ||
+          hasLivenessPause(ctx)
+        ) {
+          yield* Queue.take(ctx.livenessSignals);
+          continue;
+        }
 
-          const lastActivityAtNanos = ctx.lastTurnActivityAtNanos;
-          if (lastActivityAtNanos === undefined) {
-            yield* Queue.take(ctx.livenessSignals);
-            continue;
-          }
-          const nowNanos = yield* Clock.monotonicTimeNanos;
-          const remainingNanos = livenessTimeoutFor(ctx).nanos - (nowNanos - lastActivityAtNanos);
-          if (remainingNanos <= 0n) {
-            yield* settleStalledTurn(ctx, turnId);
-            continue;
-          }
+        const lastActivityAtNanos = ctx.lastTurnActivityAtNanos;
+        if (lastActivityAtNanos === undefined) {
+          yield* Queue.take(ctx.livenessSignals);
+          continue;
+        }
+        const nowNanos = yield* Clock.monotonicTimeNanos;
+        const remainingNanos = livenessTimeoutFor(ctx).nanos - (nowNanos - lastActivityAtNanos);
+        if (remainingNanos <= 0n) {
+          yield* settleStalledTurn(ctx, turnId);
+          continue;
+        }
 
-          const wakeReason = yield* Effect.raceFirst(
-            Effect.sleep(Duration.nanos(remainingNanos)).pipe(Effect.as("timeout" as const)),
-            Queue.take(ctx.livenessSignals).pipe(Effect.as("activity" as const)),
-          );
-          if (wakeReason === "timeout") {
-            yield* settleStalledTurn(ctx, turnId);
-          }
+        const wakeReason = yield* Effect.raceFirst(
+          Effect.sleep(Duration.nanos(remainingNanos)).pipe(Effect.as("timeout" as const)),
+          Queue.take(ctx.livenessSignals).pipe(Effect.as("activity" as const)),
+        );
+        if (wakeReason === "timeout") {
+          yield* settleStalledTurn(ctx, turnId);
         }
-      },
-      Effect.catch(() => Effect.void),
-    );
+      }
+    }, Effect.ignore());
 
     const logNative = (threadId: ThreadId, method: string, payload: unknown) =>
       Effect.gen(function* () {
@@ -923,7 +924,7 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
       threadId: ThreadId,
     ): Effect.Effect<GrokSessionContext, ProviderAdapterSessionNotFoundError> => {
       const ctx = sessions.get(threadId);
-      if (!ctx || ctx.stopped) {
+      if (!ctx || ctx.stopped || ctx.terminated) {
         return Effect.fail(
           new ProviderAdapterSessionNotFoundError({ provider: PROVIDER, threadId }),
         );
@@ -947,7 +948,7 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
           ...(yield* makeEventStamp()),
           provider: PROVIDER,
           threadId: ctx.threadId,
-          payload: { exitKind: "graceful" },
+          payload: { exitKind: ctx.terminated ? "error" : "graceful" },
         });
       });
 
@@ -1317,12 +1318,35 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
                 ? normalizeGrokReasoningEffort(requestedStartReasoningEffort)
                 : currentStartReasoningEffort,
             stopped: false,
+            terminated: false,
             backgroundTasks: new Map(),
           };
 
           const nf = yield* Stream.runDrain(
             Stream.mapEffect(acp.getEvents(), (event) =>
               Effect.gen(function* () {
+                if (event._tag === "ConnectionTerminated") {
+                  ctx.terminated = true;
+                  yield* withThreadLock(
+                    ctx.threadId,
+                    Effect.gen(function* () {
+                      if (sessions.get(ctx.threadId) !== ctx) return;
+                      if (ctx.activeTurnId) {
+                        yield* settlePromptInFlight(
+                          ctx.threadId,
+                          ctx.activeTurnId,
+                          ctx.acpSessionId,
+                          {
+                            errorMessage: "Grok connection terminated.",
+                            settleAllPrompts: true,
+                          },
+                        );
+                      }
+                      yield* stopSessionInternal(ctx);
+                    }),
+                  ).pipe(Effect.forkIn(ownerScope));
+                  return;
+                }
                 if (event._tag === "EventStreamBarrier") {
                   yield* Deferred.succeed(event.acknowledge, undefined);
                   return;
@@ -2008,7 +2032,7 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
                   errorMessage: errorMessage ?? "Grok prompt request failed.",
                 }),
               );
-            }).pipe(Effect.catch(() => Effect.void)),
+            }).pipe(Effect.ignore),
           ),
         );
       });
@@ -2166,12 +2190,16 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
       );
 
     const listSessions: GrokAdapterShape["listSessions"] = () =>
-      Effect.sync(() => Array.from(sessions.values(), (c) => ({ ...c.session })));
+      Effect.sync(() =>
+        Array.from(sessions.values())
+          .filter((c) => !c.terminated)
+          .map((c) => ({ ...c.session })),
+      );
 
     const hasSession: GrokAdapterShape["hasSession"] = (threadId) =>
       Effect.sync(() => {
         const c = sessions.get(threadId);
-        return c !== undefined && !c.stopped;
+        return c !== undefined && !c.stopped && !c.terminated;
       });
 
     const stopAll: GrokAdapterShape["stopAll"] = () =>
diff --git a/apps/server/src/provider/Layers/GrokProvider.test.ts b/apps/server/src/provider/Layers/GrokProvider.test.ts
index 495feaf8d61b..a51b124aadf5 100644
--- a/apps/server/src/provider/Layers/GrokProvider.test.ts
+++ b/apps/server/src/provider/Layers/GrokProvider.test.ts
@@ -19,7 +19,7 @@ import {
   parseGrokModelsCliOutput,
 } from "./GrokProvider.ts";
 import { execScriptSource, writeFakeCli } from "../../testUtils/fakeCli.ts";
-import { grokUsageResponseToLimits, readGrokUsageLimits } from "./grokUsageLimits.ts";
+import { grokUsageResponseToLimits, readGrokAccount } from "./grokUsageLimits.ts";
 
 const decodeGrokSettings = Schema.decodeSync(GrokSettings);
 const __dirname = NodePath.dirname(NodeURL.fileURLToPath(import.meta.url));
@@ -564,7 +564,10 @@ describe("Grok usage limits", () => {
     for (const response of [{}, { config: {} }, { config: { creditUsagePercent: NaN } }]) {
       const limits = grokUsageResponseToLimits(response, checkedAt);
       expect(limits.windows).toEqual([]);
-      expect(limits.unavailable?.reason).toBe("unsupported");
+      // Nothing metered yet, which xAI reports by omitting the field until
+      // usage registers. Marking it `unsupported` would drop the account from
+      // the Limits view for good; leaving the marker off keeps it listed.
+      expect(limits.unavailable).toBeUndefined();
     }
     expect(
       grokUsageResponseToLimits({ config: { creditUsagePercent: 0 } }, checkedAt).windows,
@@ -583,7 +586,7 @@ describe("Grok usage limits", () => {
   });
 });
 
-it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
+it.layer(NodeServices.layer)("readGrokAccount", (it) => {
   it.effect("reads the configured Grok home and prefers the current login scope to legacy", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
@@ -592,7 +595,7 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
         NodePath.join(directory, "auth.json"),
         '{"https://auth.x.ai::b1a00492-073a-47ea-816f-4c329264a828":{"key":"session-token","auth_mode":"oauth"},"https://accounts.x.ai/sign-in":{"key":"legacy-token"}}',
       );
-      const limits = yield* readGrokUsageLimits({
+      const { usageLimits: limits } = yield* readGrokAccount({
         GROK_HOME: directory,
         HOME: "/unrelated-home",
       }).pipe(
@@ -618,7 +621,7 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
   it.effect(
     "uses GROK_AUTH without reading stored credentials and accepts the legacy login scope",
     () =>
-      readGrokUsageLimits({
+      readGrokAccount({
         GROK_AUTH: '{"https://accounts.x.ai/sign-in":{"key":"legacy-token"}}',
       }).pipe(
         Effect.provideService(
@@ -642,7 +645,9 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
             );
           }),
         ),
-        Effect.tap((limits) => Effect.sync(() => expect(limits.windows[0]?.usedPercent).toBe(12))),
+        Effect.tap(({ usageLimits }) =>
+          Effect.sync(() => expect(usageLimits.windows[0]?.usedPercent).toBe(12)),
+        ),
       ),
   );
 
@@ -681,7 +686,7 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
           GROK_CONFIG_PATH: "/custom-config.toml",
         },
       ]) {
-        const limits = yield* readGrokUsageLimits({
+        const { usageLimits: limits } = yield* readGrokAccount({
           HOME: "/definitely/not/a/grok-home",
           ...environment,
         }).pipe(
@@ -703,7 +708,7 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
         const fs = yield* FileSystem.FileSystem;
         const directory = yield* fs.makeTempDirectoryScoped();
         const client = HttpClient.make(() => Effect.die("must not request without credentials"));
-        const missing = yield* readGrokUsageLimits({ HOME: directory }).pipe(
+        const { usageLimits: missing } = yield* readGrokAccount({ HOME: directory }).pipe(
           Effect.provideService(HttpClient.HttpClient, client),
         );
         expect(missing.unavailable?.reason).toBe("unsupported");
@@ -711,7 +716,7 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
           "private-token-invalid-json",
           '{"https://accounts.x.ai/sign-in":{"key":42}}',
         ]) {
-          const malformed = yield* readGrokUsageLimits({
+          const { usageLimits: malformed } = yield* readGrokAccount({
             GROK_HOME: directory,
             GROK_AUTH: contents,
           }).pipe(Effect.provideService(HttpClient.HttpClient, client));
@@ -732,7 +737,7 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
           '[grok_com_config]\nissuer = "https://custom.example"',
           'endpoints.proxy = "https://custom.example"',
         ]) {
-          const limits = yield* readGrokUsageLimits({
+          const { usageLimits: limits } = yield* readGrokAccount({
             GROK_AUTH: '{"https://accounts.x.ai/sign-in":{"key":"stored-token"}}',
           }).pipe(
             Effect.provideService(
@@ -755,15 +760,16 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
       }),
   );
 
-  it.effect("sanitizes HTTP failures and malformed billing responses", () =>
+  it.effect("sanitizes HTTP failures and malformed billing responses, keeping the account", () =>
     Effect.gen(function* () {
       for (const response of [
         new Response("private response", { status: 401 }),
         Response.json({ config: { creditUsagePercent: "private-value" } }),
       ]) {
-        const limits = yield* readGrokUsageLimits({
+        const { email, usageLimits: limits } = yield* readGrokAccount({
           HOME: "/definitely/not/a/grok-home",
-          GROK_AUTH: '{"https://accounts.x.ai/sign-in":{"key":"private-token"}}',
+          GROK_AUTH:
+            '{"https://accounts.x.ai/sign-in":{"key":"private-token","email":"someone@example.com"}}',
         }).pipe(
           Effect.provideService(
             HttpClient.HttpClient,
@@ -772,6 +778,7 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
             ),
           ),
         );
+        expect(email).toBe("someone@example.com");
         expect(limits.windows).toEqual([]);
         expect(limits.unavailable).toEqual({
           reason: "probeFailed",
@@ -781,3 +788,58 @@ it.layer(NodeServices.layer)("readGrokUsageLimits", (it) => {
     }),
   );
 });
+
+it.layer(NodeServices.layer)("readGrokAccount email", (it) => {
+  it.effect("names the account whose limits were read, and nothing for other auth", () =>
+    Effect.gen(function* () {
+      const current = '"https://auth.x.ai::b1a00492-073a-47ea-816f-4c329264a828"';
+      const cases = [
+        [
+          { GROK_AUTH: `{${current}:{"key":"t","email":" Someone@Example.com "}}` },
+          "Someone@Example.com",
+        ],
+        [
+          {
+            GROK_AUTH: `{${current}:{"key":"t","email":"current@example.com"},"https://accounts.x.ai/sign-in":{"key":"t","email":"legacy@example.com"}}`,
+          },
+          "current@example.com",
+        ],
+        [{ GROK_AUTH: `{${current}:{"key":"t"}}` }, undefined],
+        [
+          {
+            GROK_AUTH: `{${current}:{"key":"t","email":"someone@example.com"}}`,
+            XAI_API_KEY: "api-key",
+          },
+          undefined,
+        ],
+        [
+          {
+            GROK_AUTH: `{${current}:{"key":"t","email":"someone@example.com","auth_mode":"api_key"}}`,
+          },
+          undefined,
+        ],
+        [{ GROK_AUTH: "not-json" }, undefined],
+      ] as const;
+      for (const [environment, expected] of cases) {
+        const { email, usageLimits } = yield* readGrokAccount({
+          HOME: "/definitely/not/a/grok-home",
+          ...environment,
+        }).pipe(
+          Effect.provideService(
+            HttpClient.HttpClient,
+            HttpClient.make((request) =>
+              Effect.succeed(
+                HttpClientResponse.fromWeb(
+                  request,
+                  Response.json({ config: { creditUsagePercent: 25 } }),
+                ),
+              ),
+            ),
+          ),
+        );
+        expect(email).toBe(expected);
+        if (expected) expect(usageLimits.windows[0]?.usedPercent).toBe(25);
+      }
+    }),
+  );
+});
diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts
index 601917d35864..40d034089ae9 100644
--- a/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts
+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.test.ts
@@ -2,6 +2,7 @@ import * as NodeAssert from "node:assert/strict";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
 import * as Cause from "effect/Cause";
+import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
 import * as Crypto from "effect/Crypto";
 import * as Deferred from "effect/Deferred";
@@ -578,7 +579,7 @@ const providerSessionDirectoryTestLayer = Layer.succeed(ProviderSessionDirectory
   recordImportedTranscript: () => Effect.die("unused"),
   getProvider: () =>
     Effect.die(new Error("ProviderSessionDirectory.getProvider is not used in test")),
-  getBinding: () => Effect.succeed(Option.none()),
+  getBinding: () => Effect.succeedNone,
   listThreadIds: () => Effect.succeed([]),
   listBindings: () => Effect.succeed([]),
 });
@@ -781,6 +782,56 @@ it.layer(OpenCodeAdapterTestLayer)("OpenCodeAdapterLive", (it) => {
     }),
   );
 
+  it.effect(
+    "stopSession completes after sendTurn is interrupted before the prompt is submitted",
+    () =>
+      Effect.gen(function* () {
+        const adapter = yield* OpenCodeAdapter;
+        const threadId = asThreadId("thread-opencode-interrupted-before-submit");
+        runtimeMock.state.createdSessionIds.push("ses_interrupted_before_submit");
+        yield* adapter.startSession({
+          provider: ProviderDriverKind.make("opencode"),
+          threadId,
+          runtimeMode: "full-access",
+        });
+
+        const baseClock = yield* Clock.clockWith(Effect.succeed);
+        const reached = yield* Deferred.make<void>();
+        const release = yield* Deferred.make<void>();
+        let calls = 0;
+        const gatedClock: Clock.Clock = {
+          ...baseClock,
+          currentTimeMillisUnsafe: () => baseClock.currentTimeMillisUnsafe(),
+          currentTimeMillis: Effect.suspend(() => {
+            calls += 1;
+            return calls === 2
+              ? Deferred.succeed(reached, undefined).pipe(
+                  Effect.andThen(Deferred.await(release)),
+                  Effect.andThen(baseClock.currentTimeMillis),
+                )
+              : baseClock.currentTimeMillis;
+          }),
+        };
+
+        const sendFiber = yield* adapter
+          .sendTurn({
+            threadId,
+            input: "This prompt must not be submitted",
+            modelSelection: createModelSelection(
+              ProviderInstanceId.make("opencode"),
+              "opencode/kimi-k3",
+            ),
+          })
+          .pipe(Effect.provideService(Clock.Clock, gatedClock), Effect.exit, Effect.forkChild);
+        yield* Deferred.await(reached);
+        yield* Fiber.interrupt(sendFiber);
+
+        const stopExit = yield* adapter.stopSession(threadId).pipe(Effect.exit);
+        NodeAssert.equal(Exit.isSuccess(stopExit), true);
+        NodeAssert.equal(yield* adapter.hasSession(threadId), false);
+      }),
+  );
+
   it.effect("aborts a held teardown request before closing the session scope", () =>
     Effect.gen(function* () {
       const adapter = yield* OpenCodeAdapter;
diff --git a/apps/server/src/provider/Layers/OpenCodeAdapter.ts b/apps/server/src/provider/Layers/OpenCodeAdapter.ts
index 41bf634c0d3b..34ebd1b544fb 100644
--- a/apps/server/src/provider/Layers/OpenCodeAdapter.ts
+++ b/apps/server/src/provider/Layers/OpenCodeAdapter.ts
@@ -822,7 +822,7 @@ const abortOpenCodeDescendants = Effect.fn("abortOpenCodeDescendants")(function*
         .pipe(
           Effect.catchIf(
             (cause) => isOpenCodeNotFound(cause),
-            () => Effect.void,
+            () => Effect.undefined,
           ),
           Effect.result,
         );
@@ -1097,7 +1097,7 @@ export function makeOpenCodeAdapter(
         readonly observedAt: string;
         readonly event: Record<string, unknown>;
       },
-    ) => writeNativeEvent(threadId, event).pipe(Effect.catchCause(() => Effect.void));
+    ) => writeNativeEvent(threadId, event).pipe(Effect.ignoreCause);
 
     const cancelIdleReconciliation = Effect.fn("cancelIdleReconciliation")(function* (
       context: OpenCodeSessionContext,
@@ -1262,7 +1262,7 @@ export function makeOpenCodeAdapter(
           yield* Effect.sleep(`${delayMs} millis`);
         }
       }).pipe(
-        Effect.catchCause(() => Effect.void),
+        Effect.ignoreCause,
         Effect.ensuring(
           Effect.sync(() => {
             if (context.pendingIdleReconciliation === pending) {
@@ -1492,7 +1492,7 @@ export function makeOpenCodeAdapter(
         }
         yield* failPromptAdmissionRecovery(context, promptAdmission);
       }).pipe(
-        Effect.catchCause(() => Effect.void),
+        Effect.ignoreCause,
         Effect.ensuring(
           Effect.sync(() => {
             delete promptAdmission.recoveryFiber;
@@ -1699,7 +1699,7 @@ export function makeOpenCodeAdapter(
           }),
           Effect.catchIf(
             (cause) => isOpenCodeNotFound(cause),
-            () => Effect.succeed(undefined),
+            () => Effect.undefined,
           ),
         );
       let sessionId: string | undefined = candidateSessionId;
@@ -2044,7 +2044,7 @@ export function makeOpenCodeAdapter(
           yield* Effect.sleep(`${delayMs} millis`);
         }
       }).pipe(
-        Effect.catchCause(() => Effect.void),
+        Effect.ignoreCause,
         Effect.ensuring(
           Effect.sync(() => {
             if (context.requestRelationRetries.get(requestId) === retry) {
@@ -2163,7 +2163,7 @@ export function makeOpenCodeAdapter(
           return;
         }
       }).pipe(
-        Effect.catchCause(() => Effect.void),
+        Effect.ignoreCause,
         Effect.ensuring(
           Effect.sync(() => {
             if (context.pendingRequestRecovery === recovery) {
@@ -2730,6 +2730,7 @@ export function makeOpenCodeAdapter(
       // the scope closes (explicit stop, unexpected exit, or layer
       // shutdown) and cancels the in-flight `event.subscribe` fetch so
       // the async iterable unwinds cleanly.
+      // @effect-diagnostics-next-line abortControllerInEffect:off - aborted by a scope finalizer to cancel the SDK's event.subscribe fetch
       const eventsAbortController = new AbortController();
       let lastStreamError: unknown;
       let warnedAboutDisconnect = false;
@@ -3530,7 +3531,18 @@ export function makeOpenCodeAdapter(
               ? { resumeCursor: context.session.resumeCursor }
               : {}),
           };
-        }),
+        }).pipe(
+          // stopSession waits on submissionSettled; an interrupted sendTurn
+          // must not leave it pending.
+          Effect.ensuring(
+            Effect.suspend(() => {
+              const admission = context.promptAdmission;
+              return admission
+                ? Deferred.succeed(admission.submissionSettled, undefined).pipe(Effect.ignore)
+                : Effect.void;
+            }),
+          ),
+        ),
       );
     });
 
diff --git a/apps/server/src/provider/Layers/OpenCodeProvider.test.ts b/apps/server/src/provider/Layers/OpenCodeProvider.test.ts
index b50a51f6cb31..55e159197e6b 100644
--- a/apps/server/src/provider/Layers/OpenCodeProvider.test.ts
+++ b/apps/server/src/provider/Layers/OpenCodeProvider.test.ts
@@ -1,4 +1,5 @@
 import * as NodeAssert from "node:assert/strict";
+import * as NodeCrypto from "node:crypto";
 
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { it } from "@effect/vitest";
@@ -71,6 +72,10 @@ it.effect("reads Go limits with the instance's XDG credentials and preserves res
       Effect.provide(NodeServices.layer),
     );
     NodeAssert.equal(limits.unavailable, undefined);
+    NodeAssert.equal(
+      limits.credentialFingerprint,
+      NodeCrypto.createHash("sha256").update("opencode-go\0instance-key").digest("hex"),
+    );
     NodeAssert.deepEqual(
       limits.windows.map(({ kind, usedPercent, resetsAt: reset }) => ({
         kind,
@@ -139,6 +144,7 @@ it.effect("keeps Go entitlement absence distinct from failed or malformed usage
         Effect.provide(NodeServices.layer),
       );
       NodeAssert.equal(limits.unavailable?.reason, reason);
+      NodeAssert.equal(limits.credentialFingerprint, undefined);
       NodeAssert.deepEqual(limits.windows, []);
     }
   }),
diff --git a/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts b/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts
index bb8ff7835c8f..6a24b49dc930 100644
--- a/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts
+++ b/apps/server/src/provider/Layers/ProviderAdapterRegistry.test.ts
@@ -1,15 +1,21 @@
 import {
   defaultInstanceIdForDriver,
   ProviderDriverKind,
+  ThreadId,
   type ServerProvider,
 } from "@t3tools/contracts";
 import { it, assert, vi } from "@effect/vitest";
 
 import * as Effect from "effect/Effect";
+import * as Deferred from "effect/Deferred";
+import * as Fiber from "effect/Fiber";
+import * as Exit from "effect/Exit";
 import * as Layer from "effect/Layer";
 import * as PubSub from "effect/PubSub";
 import * as Stream from "effect/Stream";
 
+import * as ProviderAuthFlow from "../ProviderAuthFlow.ts";
+
 import type * as ClaudeAdapter from "../Services/ClaudeAdapter.ts";
 import type * as CodexAdapter from "../Services/CodexAdapter.ts";
 import type * as CursorAdapter from "../Services/CursorAdapter.ts";
@@ -185,3 +191,95 @@ it.layer(layer)("ProviderAdapterRegistryLive", (it) => {
       ]);
     }));
 });
+
+it.effect("blocks shared credential session startup and preserves guarded adapter identity", () =>
+  Effect.gen(function* () {
+    const target = fakeInstances[0]!;
+    const peer = fakeInstances[1]!;
+    const auth = yield* ProviderAuthFlow.make({
+      instanceId: target.instanceId,
+      credentialBinding: { owner: "t3", key: "shared-auth" },
+      methods: Effect.succeed([
+        { id: "browser", name: "Browser", description: null, type: "agent" },
+      ]),
+      authenticate: () => Effect.never,
+      logout: Effect.void,
+    });
+    const peerAuth = yield* ProviderAuthFlow.make({
+      instanceId: peer.instanceId,
+      credentialBinding: { owner: "t3", key: "shared-auth" },
+      methods: Effect.succeed([]),
+      authenticate: () => Effect.void,
+      logout: Effect.void,
+    });
+    const session = {
+      threadId: ThreadId.make("new-session"),
+      provider: peer.driverKind,
+      providerInstanceId: peer.instanceId,
+      status: "ready" as const,
+      runtimeMode: "approval-required" as const,
+      createdAt: "2026-09-21T00:00:00.000Z",
+      updatedAt: "2026-09-21T00:00:00.000Z",
+    };
+    const start = vi.fn(() => Effect.succeed(session));
+    const instances = [
+      { ...target, auth },
+      { ...peer, auth: peerAuth, adapter: { ...peer.adapter, startSession: start } },
+    ];
+    const registry = yield* ProviderAdapterRegistry.ProviderAdapterRegistry.pipe(
+      Effect.provide(
+        ProviderAdapterRegistryLayer.ProviderAdapterRegistryLive.pipe(
+          Layer.provide(
+            Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
+              getInstance: (id) =>
+                Effect.succeed(instances.find((instance) => instance.instanceId === id)),
+              listInstances: Effect.succeed(instances),
+            }),
+          ),
+        ),
+      ),
+    );
+    const guarded = yield* registry.getByInstance(peer.instanceId);
+    assert.strictEqual(yield* registry.getByInstance(peer.instanceId), guarded);
+    const flow = yield* auth.start("owner");
+    const error = yield* guarded
+      .startSession({
+        threadId: session.threadId,
+        providerInstanceId: peer.instanceId,
+        runtimeMode: "approval-required",
+      })
+      .pipe(Effect.flip);
+    assert.strictEqual(error._tag, "ProviderAdapterValidationError");
+    assert.strictEqual(start.mock.calls.length, 0);
+    yield* auth.cancel("owner", flow.flowId!);
+    assert.deepStrictEqual(
+      yield* guarded.startSession({
+        threadId: session.threadId,
+        providerInstanceId: peer.instanceId,
+        runtimeMode: "approval-required",
+      }),
+      session,
+    );
+    assert.strictEqual(start.mock.calls.length, 1);
+    const entered = yield* Deferred.make<void>();
+    const stopped = yield* Deferred.make<void>();
+    start.mockImplementation(() =>
+      Effect.gen(function* () {
+        yield* Deferred.succeed(entered, undefined);
+        return yield* Effect.never;
+      }).pipe(Effect.ensuring(Deferred.succeed(stopped, undefined))),
+    );
+    const startup = yield* guarded
+      .startSession({
+        threadId: session.threadId,
+        providerInstanceId: peer.instanceId,
+        runtimeMode: "approval-required",
+      })
+      .pipe(Effect.forkChild);
+    yield* Deferred.await(entered);
+    // Signing out through another instance must drain its peer's startup too.
+    yield* auth.logout(Effect.void);
+    yield* Deferred.await(stopped);
+    assert.strictEqual(Exit.isFailure(yield* Fiber.await(startup)), true);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
diff --git a/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts b/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts
index 9e8e3c5d1f90..5d70ee0d3d75 100644
--- a/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts
+++ b/apps/server/src/provider/Layers/ProviderAdapterRegistry.ts
@@ -15,19 +15,89 @@
  *
  * @module ProviderAdapterRegistryLive
  */
-import { ProviderInstanceId } from "@t3tools/contracts";
+import { ProviderInstanceId, ProviderSetupError, type ProviderSession } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
 import * as Layer from "effect/Layer";
+import type * as Scope from "effect/Scope";
 
-import { ProviderUnsupportedError } from "../Errors.ts";
+import {
+  ProviderUnsupportedError,
+  ProviderAdapterValidationError,
+  type ProviderAdapterError,
+} from "../Errors.ts";
 import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";
 import {
   ProviderAdapterRegistry,
   type ProviderAdapterRegistryShape,
 } from "../Services/ProviderAdapterRegistry.ts";
 
+import type { ProviderInstance } from "../ProviderDriver.ts";
+import type { ProviderAdapterShape } from "../Services/ProviderAdapter.ts";
+
+const isSetupError = Schema.is(ProviderSetupError);
+
 const makeProviderAdapterRegistry = Effect.fn("makeProviderAdapterRegistry")(function* () {
   const registry = yield* ProviderInstanceRegistry;
+  // Stable identity keeps ProviderService's event subscriptions attached once.
+  const guarded = new WeakMap<ProviderInstance, ProviderAdapterShape<ProviderAdapterError>>();
+  const guard = (instance: ProviderInstance) => {
+    const auth = instance.auth;
+    if (!auth || (!auth.withAccess && !auth.isChangingCredentials && !auth.credentialBinding))
+      return instance.adapter;
+    const cached = guarded.get(instance);
+    if (cached) return cached;
+    const adapter: ProviderAdapterShape<ProviderAdapterError> = {
+      ...instance.adapter,
+      startSession: (input) => {
+        const start = Effect.gen(function* () {
+          const binding = auth.credentialBinding;
+          const related = binding
+            ? (yield* registry.listInstances).filter(
+                (peer) =>
+                  peer.auth?.credentialBinding?.key === binding.key &&
+                  peer.auth.credentialBinding.owner === binding.owner,
+              )
+            : [instance];
+          for (const peer of related) {
+            if (peer.auth?.isChangingCredentials && (yield* peer.auth.isChangingCredentials)) {
+              return yield* new ProviderSetupError({
+                instanceId: instance.instanceId,
+                operation: "session",
+                detail: "Provider sign-in is changing. Try again after it finishes.",
+              });
+            }
+          }
+          let admitted: Effect.Effect<
+            ProviderSession,
+            ProviderAdapterError | ProviderSetupError,
+            Scope.Scope
+          > = instance.adapter.startSession(input);
+          // Every shared owner holds the startup scope. A credential change
+          // interrupts admitted startup before it can escape the session drain.
+          for (const peer of related) {
+            if (peer.auth?.withAccess) admitted = peer.auth.withAccess(admitted);
+          }
+          return yield* Effect.scoped(admitted);
+        });
+        // Adapters own established session lifetimes. This scope guards startup;
+        // ProviderAuthService drains routed sessions before changing credentials.
+        return start.pipe(
+          Effect.mapError((cause) =>
+            isSetupError(cause)
+              ? new ProviderAdapterValidationError({
+                  provider: instance.driverKind,
+                  operation: "startSession",
+                  issue: cause.detail,
+                })
+              : cause,
+          ),
+        );
+      },
+    };
+    guarded.set(instance, adapter);
+    return adapter;
+  };
 
   const getByInstance: ProviderAdapterRegistryShape["getByInstance"] = (instanceId) =>
     registry.getInstance(instanceId).pipe(
@@ -38,7 +108,7 @@ const makeProviderAdapterRegistry = Effect.fn("makeProviderAdapterRegistry")(fun
                 provider: instanceId,
               }),
             )
-          : Effect.succeed(instance.adapter),
+          : Effect.succeed(guard(instance)),
       ),
     );
 
diff --git a/apps/server/src/provider/Layers/ProviderAuthService.test.ts b/apps/server/src/provider/Layers/ProviderAuthService.test.ts
index fb961b710486..8430ad3e1319 100644
--- a/apps/server/src/provider/Layers/ProviderAuthService.test.ts
+++ b/apps/server/src/provider/Layers/ProviderAuthService.test.ts
@@ -112,6 +112,14 @@ const makeHarness = Effect.fn("ProviderAuthService.test.makeHarness")(function*
     directoryError?: ProviderSessionDirectoryPersistenceError;
     stopError?: ProviderServiceError;
     logoutError?: ProviderSetupError;
+    sharedCredentials?: boolean;
+    sharedBusy?: boolean;
+    sharedBusyEffect?: Effect.Effect<boolean>;
+    responds?: boolean;
+    beforeLogout?: Effect.Effect<void>;
+    beforeStop?: Effect.Effect<void>;
+    beforeListSessions?: Effect.Effect<void>;
+    onLookup?: Effect.Effect<void>;
   } = {},
 ) {
   const actions: string[] = [];
@@ -138,6 +146,18 @@ const makeHarness = Effect.fn("ProviderAuthService.test.makeHarness")(function*
   });
 
   const auth: ProviderAuthController = {
+    ...(input.sharedCredentials
+      ? { credentialBinding: { owner: "provider" as const, key: "shared" } }
+      : {}),
+    ...(input.responds
+      ? {
+          respond: Effect.fn(function* (ownerSessionId, request) {
+            yield* checkOwner(ownerSessionId, request.flowId, "respond");
+            actions.push(`respond:${request.response.type}`);
+            return state;
+          }),
+        }
+      : {}),
     start: Effect.fn(function* (ownerSessionId, stopSessions) {
       gateClosed = true;
       actions.push("close-gate");
@@ -169,6 +189,7 @@ const makeHarness = Effect.fn("ProviderAuthService.test.makeHarness")(function*
       actions.push("close-gate");
       yield* stopSessions;
       if (input.logoutError) return yield* input.logoutError;
+      yield* input.beforeLogout ?? Effect.void;
       actions.push("native-logout");
       state = idle;
       flowOwner = undefined;
@@ -181,13 +202,34 @@ const makeHarness = Effect.fn("ProviderAuthService.test.makeHarness")(function*
   const instances = [
     makeInstance({ instanceId, enabled: input.enabled ?? true, auth }),
     makeInstance({ instanceId: unsupportedInstanceId, enabled: true }),
+    ...(input.sharedCredentials
+      ? [
+          makeInstance({
+            instanceId: otherInstanceId,
+            enabled: true,
+            auth: {
+              ...auth,
+              isChangingCredentials:
+                input.sharedBusyEffect ?? Effect.succeed(input.sharedBusy ?? false),
+              invalidate: Effect.sync(() => {
+                actions.push("invalidate-shared");
+              }),
+            },
+          }),
+        ]
+      : []),
   ];
   const service = yield* makeProviderAuthService.pipe(
     Effect.provide(
       Layer.mergeAll(
         Layer.mock(ProviderInstanceRegistry)({
           getInstance: (id) =>
-            Effect.succeed(instances.find((instance) => instance.instanceId === id)),
+            Effect.gen(function* () {
+              const found = instances.find((instance) => instance.instanceId === id);
+              yield* input.onLookup ?? Effect.void;
+              return found;
+            }),
+          listInstances: Effect.succeed(instances),
           subscribeChanges: PubSub.subscribe(registryChanges),
         }),
         Layer.mock(ProviderSessionDirectory)({
@@ -202,26 +244,44 @@ const makeHarness = Effect.fn("ProviderAuthService.test.makeHarness")(function*
         }),
         Layer.mock(ProviderService)({
           listSessions: () =>
-            Effect.sync(() => {
+            Effect.gen(function* () {
               assert.isTrue(gateClosed);
               actions.push("list-sessions");
+              yield* input.beforeListSessions ?? Effect.void;
               return [...sessions.values()];
             }),
           stopSession: ({ threadId }) =>
-            Effect.suspend(() => {
+            Effect.gen(function* () {
               assert.isTrue(gateClosed);
               actions.push(`stop:${threadId}`);
-              if (input.stopError) return Effect.fail(input.stopError);
+              yield* input.beforeStop ?? Effect.void;
+              if (input.stopError) return yield* input.stopError;
               sessions.delete(threadId);
               const binding = bindings.get(threadId);
               if (binding) bindings.set(threadId, { ...binding, status: "stopped" });
-              return Effect.void;
             }),
         }),
       ),
     ),
   );
-  return { service, actions, sessions, bindings };
+  return {
+    service,
+    actions,
+    sessions,
+    bindings,
+    auth,
+    addInstance: (instance: ProviderInstance) => instances.push(instance),
+    replaceInstance: (replacement: ProviderInstance) => {
+      const index = instances.findIndex(
+        (instance) => instance.instanceId === replacement.instanceId,
+      );
+      assert.isAtLeast(index, 0);
+      instances[index] = replacement;
+    },
+    replaceAuth: (next: ProviderAuthController) => {
+      instances[0] = makeInstance({ instanceId, enabled: input.enabled ?? true, auth: next });
+    },
+  };
 });
 
 const makeStreamingController = Effect.fn("ProviderAuthService.test.makeStreamingController")(
@@ -305,6 +365,56 @@ const observeAuth = Effect.fn("ProviderAuthService.test.observeAuth")(function*
 });
 
 describe("ProviderAuthService", () => {
+  it.effect(
+    "stops sessions sharing credentials and invalidates their processes before logout",
+    () =>
+      Effect.gen(function* () {
+        const { service, actions, sessions } = yield* makeHarness({
+          sharedCredentials: true,
+          sessions: [
+            makeSession("target"),
+            makeSession("shared", otherInstanceId),
+            makeSession("unrelated", unsupportedInstanceId),
+          ],
+        });
+        yield* service.logout({ instanceId });
+        assert.deepStrictEqual([...sessions.keys()], [ThreadId.make("unrelated")]);
+        assert.isBelow(actions.indexOf("stop:shared"), actions.indexOf("invalidate-shared"));
+        assert.isBelow(actions.indexOf("invalidate-shared"), actions.indexOf("native-logout"));
+      }),
+  );
+  it.effect("rejects overlapping changes to a shared sign-in", () =>
+    Effect.gen(function* () {
+      const { service, actions } = yield* makeHarness({
+        sharedCredentials: true,
+        sharedBusy: true,
+      });
+      for (const task of [service.start({ instanceId }, owner), service.logout({ instanceId })]) {
+        const error = yield* task.pipe(Effect.flip);
+        assert.include(error.detail, "shared sign-in");
+      }
+      assert.deepStrictEqual(actions, []);
+    }),
+  );
+  it.effect("routes typed interactions to the flow owner and rejects unsupported controllers", () =>
+    Effect.gen(function* () {
+      const { service, actions } = yield* makeHarness({ responds: true });
+      yield* service.start({ instanceId }, owner);
+      const request = {
+        instanceId,
+        flowId,
+        interactionId: "consent",
+        response: { type: "browser" as const, action: "accept" as const },
+      };
+      const rejected = yield* service.respond(request, otherOwner).pipe(Effect.flip);
+      assert.strictEqual(rejected.operation, "respond");
+      yield* service.respond(request, owner);
+      assert.strictEqual(actions.at(-1), "respond:browser");
+      const unsupported = yield* makeHarness();
+      const error = yield* unsupported.service.respond(request, owner).pipe(Effect.flip);
+      assert.include(error.detail, "does not accept");
+    }),
+  );
   it.effect("stops routed sessions before sign-in, including for a disabled instance", () =>
     Effect.gen(function* () {
       const { service, actions, sessions } = yield* makeHarness({
@@ -606,3 +716,200 @@ describe("ProviderAuthService", () => {
     }),
   );
 });
+
+it.effect("queued logout prompts resolve the current controller after provider replacement", () =>
+  Effect.gen(function* () {
+    const entered = yield* Deferred.make<void>();
+    const release = yield* Deferred.make<void>();
+    const lookup = yield* Deferred.make<void>();
+    let observeLookup = false;
+    const harness = yield* makeHarness({
+      beforeLogout: Deferred.succeed(entered, undefined).pipe(
+        Effect.andThen(Deferred.await(release)),
+      ),
+      onLookup: Effect.suspend(() =>
+        observeLookup ? Deferred.succeed(lookup, undefined).pipe(Effect.asVoid) : Effect.void,
+      ),
+    });
+    const first = yield* harness.service.logout({ instanceId }).pipe(Effect.forkChild);
+    yield* Deferred.await(entered);
+    observeLookup = true;
+    const queued = yield* harness.service
+      .tryHandlePromptCommand({ instanceId, text: "/logout", hasAttachments: false })
+      .pipe(Effect.forkChild);
+    yield* Deferred.await(lookup);
+    let replacementLoggedOut = false;
+    harness.replaceAuth({
+      ...harness.auth,
+      logout: (stopSessions) =>
+        stopSessions.pipe(
+          Effect.andThen(
+            Effect.sync(() => {
+              replacementLoggedOut = true;
+              return idleAuthState;
+            }),
+          ),
+        ),
+    });
+    yield* Deferred.succeed(release, undefined);
+    yield* Fiber.join(first);
+    assert.isTrue(yield* Fiber.join(queued));
+    assert.isTrue(replacementLoggedOut);
+    assert.strictEqual(harness.actions.filter((action) => action === "native-logout").length, 1);
+  }).pipe(Effect.scoped),
+);
+
+it.effect.each(["start", "logout", "prompt"] as const)(
+  "%s uses the same credential controller for shared exclusion and mutation during replacement",
+  (action) =>
+    Effect.gen(function* () {
+      const checked = yield* Deferred.make<void>();
+      const continueCheck = yield* Deferred.make<void>();
+      const replacementPeerId = ProviderInstanceId.make("replacement-shared-peer");
+      const harness = yield* makeHarness({
+        sharedCredentials: true,
+        sharedBusyEffect: Deferred.succeed(checked, undefined).pipe(
+          Effect.andThen(Deferred.await(continueCheck)),
+          Effect.as(false),
+        ),
+        sessions: [
+          makeSession("old-shared", otherInstanceId),
+          makeSession("replacement-shared", replacementPeerId),
+        ],
+      });
+      harness.addInstance(
+        makeInstance({
+          instanceId: replacementPeerId,
+          enabled: true,
+          auth: {
+            ...harness.auth,
+            credentialBinding: { owner: "provider", key: "replacement-binding" },
+            isChangingCredentials: Effect.succeed(true),
+            invalidate: Effect.die(
+              "The unrelated replacement credential binding must stay intact.",
+            ),
+          },
+        }),
+      );
+      const operation =
+        action === "start"
+          ? harness.service.start({ instanceId }, owner)
+          : action === "logout"
+            ? harness.service.logout({ instanceId })
+            : harness.service.tryHandlePromptCommand({
+                instanceId,
+                text: "/logout",
+                hasAttachments: false,
+              });
+      const running = yield* operation.pipe(Effect.forkChild);
+      yield* Deferred.await(checked);
+      let replacementMutations = 0;
+      harness.replaceAuth({
+        ...harness.auth,
+        credentialBinding: { owner: "provider", key: "replacement-binding" },
+        start: () =>
+          Effect.sync(() => {
+            replacementMutations++;
+            return waitingAuthState;
+          }),
+        logout: () =>
+          Effect.sync(() => {
+            replacementMutations++;
+            return idleAuthState;
+          }),
+      });
+      yield* Deferred.succeed(continueCheck, undefined);
+      yield* Fiber.join(running);
+      assert.equal(replacementMutations, 0);
+      assert.include(harness.actions, action === "start" ? "start-sign-in" : "native-logout");
+      assert.isFalse(harness.sessions.has(ThreadId.make("old-shared")));
+      assert.isTrue(harness.sessions.has(ThreadId.make("replacement-shared")));
+      const blocked = yield* Effect.flip(harness.service.logout({ instanceId }));
+      assert.include(blocked.detail, "shared sign-in");
+      assert.equal(replacementMutations, 0);
+    }).pipe(Effect.scoped),
+);
+
+it.effect.each([
+  { owner: "provider" as const, key: "different-binding" },
+  { owner: "t3" as const, key: "shared" },
+])(
+  "does not invalidate a peer that switches credential binding during session draining %#",
+  (binding) =>
+    Effect.gen(function* () {
+      const draining = yield* Deferred.make<void>();
+      const continueDrain = yield* Deferred.make<void>();
+      const harness = yield* makeHarness({
+        sharedCredentials: true,
+        sessions: [makeSession("shared-draining", otherInstanceId)],
+        beforeStop: Deferred.succeed(draining, undefined).pipe(
+          Effect.andThen(Deferred.await(continueDrain)),
+        ),
+      });
+      const logout = yield* harness.service.logout({ instanceId }).pipe(Effect.forkChild);
+      yield* Deferred.await(draining);
+      let replacementInvalidated = false;
+      harness.replaceInstance(
+        makeInstance({
+          instanceId: otherInstanceId,
+          enabled: true,
+          auth: {
+            ...harness.auth,
+            credentialBinding: binding,
+            invalidate: Effect.sync(() => {
+              replacementInvalidated = true;
+            }),
+          },
+        }),
+      );
+      yield* Deferred.succeed(continueDrain, undefined);
+      yield* Fiber.join(logout);
+      assert.isFalse(replacementInvalidated);
+      assert.isFalse(harness.sessions.has(ThreadId.make("shared-draining")));
+      assert.include(harness.actions, "native-logout");
+    }).pipe(Effect.scoped),
+);
+
+it.effect.each(["selection", "drain"] as const)(
+  "preserves replacement peer sessions when credentials change during session %s",
+  (phase) =>
+    Effect.gen(function* () {
+      const entered = yield* Deferred.make<void>();
+      const proceed = yield* Deferred.make<void>();
+      const block = Deferred.succeed(entered, undefined).pipe(
+        Effect.andThen(Deferred.await(proceed)),
+      );
+      const harness = yield* makeHarness({
+        sharedCredentials: true,
+        sessions: [
+          makeSession("target-draining"),
+          makeSession("peer-replacement", otherInstanceId),
+        ],
+        bindings: [
+          makeBinding("target-draining", "running"),
+          makeBinding("peer-persisted", "running", otherInstanceId),
+        ],
+        ...(phase === "selection" ? { beforeListSessions: block } : { beforeStop: block }),
+      });
+      const logout = yield* harness.service.logout({ instanceId }).pipe(Effect.forkChild);
+      yield* Deferred.await(entered);
+      harness.replaceInstance(
+        makeInstance({
+          instanceId: otherInstanceId,
+          enabled: true,
+          auth: {
+            ...harness.auth,
+            credentialBinding: { owner: "provider", key: "replacement-credentials" },
+            invalidate: Effect.die("The replacement peer's credentials must not be invalidated."),
+          },
+        }),
+      );
+      yield* Deferred.succeed(proceed, undefined);
+      yield* Fiber.join(logout);
+      assert.isTrue(harness.sessions.has(ThreadId.make("peer-replacement")));
+      assert.notInclude(harness.actions, "stop:peer-replacement");
+      assert.notInclude(harness.actions, "stop:peer-persisted");
+      assert.isFalse(harness.sessions.has(ThreadId.make("target-draining")));
+      assert.include(harness.actions, "native-logout");
+    }).pipe(Effect.scoped),
+);
diff --git a/apps/server/src/provider/Layers/ProviderAuthService.ts b/apps/server/src/provider/Layers/ProviderAuthService.ts
index 3b69c5082528..f9213268a33a 100644
--- a/apps/server/src/provider/Layers/ProviderAuthService.ts
+++ b/apps/server/src/provider/Layers/ProviderAuthService.ts
@@ -2,8 +2,9 @@ import { ProviderSetupError, type ProviderInstanceId } from "@t3tools/contracts"
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Stream from "effect/Stream";
+import * as Semaphore from "effect/Semaphore";
 
-import { ProviderAuthService } from "../Services/ProviderAuthService.ts";
+import * as ProviderAuthService from "../Services/ProviderAuthService.ts";
 import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";
 import { ProviderService } from "../Services/ProviderService.ts";
 import { ProviderSessionDirectory } from "../Services/ProviderSessionDirectory.ts";
@@ -12,6 +13,7 @@ export const makeProviderAuthService = Effect.gen(function* () {
   const registry = yield* ProviderInstanceRegistry;
   const providers = yield* ProviderService;
   const directory = yield* ProviderSessionDirectory;
+  const credentialChanges = yield* Semaphore.make(1);
 
   const getController = Effect.fn("ProviderAuthService.getController")(function* (
     instanceId: ProviderInstanceId,
@@ -30,9 +32,25 @@ export const makeProviderAuthService = Effect.gen(function* () {
     return instance.auth;
   });
 
+  // Native sessions may still belong to the previous provider after the
+  // selected model changes. Read session bindings, not the selected model,
+  // when invalidating credentials for sign-in or sign-out.
   const stopSessions = Effect.fn("ProviderAuthService.stopSessions")(function* (
     instanceId: ProviderInstanceId,
+    binding: ProviderAuthService.ProviderAuthController["credentialBinding"],
   ) {
+    const affectedIds = new Set([
+      instanceId,
+      ...(binding === undefined
+        ? []
+        : (yield* registry.listInstances)
+            .filter(
+              (instance) =>
+                instance.auth?.credentialBinding?.key === binding.key &&
+                instance.auth.credentialBinding.owner === binding.owner,
+            )
+            .map((instance) => instance.instanceId)),
+    ]);
     const bindings = yield* directory.listBindings().pipe(
       Effect.mapError(
         () =>
@@ -44,39 +62,140 @@ export const makeProviderAuthService = Effect.gen(function* () {
       ),
     );
     const sessions = yield* providers.listSessions();
-    const threadIds = new Set(
-      bindings
-        .filter(
-          (binding) => binding.providerInstanceId === instanceId && binding.status !== "stopped",
-        )
-        .map((binding) => binding.threadId),
+    const sessionsToStop = new Map(
+      bindings.flatMap((session) =>
+        session.providerInstanceId !== undefined &&
+        affectedIds.has(session.providerInstanceId) &&
+        session.status !== "stopped"
+          ? [[session.threadId, session.providerInstanceId] as const]
+          : [],
+      ),
     );
     for (const session of sessions) {
-      if (session.providerInstanceId === instanceId) {
-        threadIds.add(session.threadId);
+      if (session.providerInstanceId !== undefined && affectedIds.has(session.providerInstanceId)) {
+        sessionsToStop.set(session.threadId, session.providerInstanceId);
       }
     }
     yield* Effect.forEach(
-      threadIds,
-      (threadId) =>
-        providers.stopSession({ threadId }).pipe(
-          Effect.mapError(
-            () =>
-              new ProviderSetupError({
-                instanceId,
-                operation: "stopSessions",
-                detail: "Could not stop all sessions for this provider. Try again.",
-              }),
-          ),
-        ),
+      sessionsToStop,
+      ([threadId, sessionInstanceId]) =>
+        Effect.gen(function* () {
+          if (sessionInstanceId !== instanceId) {
+            const current = yield* registry.getInstance(sessionInstanceId);
+            if (
+              !binding ||
+              current?.auth?.credentialBinding?.key !== binding.key ||
+              current.auth.credentialBinding.owner !== binding.owner
+            )
+              return;
+          }
+          yield* providers.stopSession({ threadId }).pipe(
+            Effect.mapError(
+              () =>
+                new ProviderSetupError({
+                  instanceId,
+                  operation: "stopSessions",
+                  detail: "Could not stop all sessions for this provider. Try again.",
+                }),
+            ),
+          );
+        }),
       { discard: true },
     );
+    if (binding) {
+      yield* Effect.forEach(
+        (yield* registry.listInstances).filter(
+          (instance) =>
+            instance.instanceId !== instanceId &&
+            affectedIds.has(instance.instanceId) &&
+            instance.auth?.credentialBinding?.key === binding.key &&
+            instance.auth.credentialBinding.owner === binding.owner,
+        ),
+        (instance) => instance.auth?.invalidate ?? Effect.void,
+        { discard: true },
+      );
+    }
   });
 
-  return ProviderAuthService.of({
+  const checkSharedBinding = Effect.fnUntraced(function* (
+    instanceId: ProviderInstanceId,
+    operation: "start" | "logout",
+    auth: ProviderAuthService.ProviderAuthController,
+  ) {
+    const binding = auth.credentialBinding;
+    if (!binding) return;
+    const instances = yield* registry.listInstances;
+    for (const instance of instances) {
+      if (
+        instance.instanceId !== instanceId &&
+        instance.auth?.credentialBinding?.key === binding.key &&
+        instance.auth.credentialBinding.owner === binding.owner &&
+        instance.auth.isChangingCredentials &&
+        (yield* instance.auth.isChangingCredentials)
+      ) {
+        return yield* new ProviderSetupError({
+          instanceId,
+          operation,
+          detail:
+            "Another provider instance is changing this shared sign-in. Finish or cancel it first.",
+        });
+      }
+    }
+  });
+
+  return ProviderAuthService.ProviderAuthService.of({
+    reconnectProfile: Effect.fnUntraced(function* (input) {
+      const auth = yield* getController(input.instanceId, "export");
+      if (!auth.reconnectProfile)
+        return yield* new ProviderSetupError({
+          instanceId: input.instanceId,
+          operation: "export",
+          detail: "This provider does not support ChatGPT profile transfer.",
+        });
+      return yield* auth.reconnectProfile(input.methodId);
+    }),
+    importProfile: (input) =>
+      credentialChanges.withPermit(
+        Effect.gen(function* () {
+          const auth = yield* getController(input.instanceId, "import");
+          yield* checkSharedBinding(input.instanceId, "start", auth);
+          if (!auth.importProfile)
+            return yield* new ProviderSetupError({
+              instanceId: input.instanceId,
+              operation: "import",
+              detail: "This provider does not support ChatGPT profile transfer.",
+            });
+          return yield* auth.importProfile(
+            input.profile,
+            stopSessions(input.instanceId, auth.credentialBinding),
+          );
+        }),
+      ),
     start: Effect.fn("ProviderAuthService.start")(function* (input, ownerSessionId) {
-      const auth = yield* getController(input.instanceId, "start");
-      return yield* auth.start(ownerSessionId, stopSessions(input.instanceId));
+      return yield* credentialChanges.withPermit(
+        Effect.gen(function* () {
+          const auth = yield* getController(input.instanceId, "start");
+          yield* checkSharedBinding(input.instanceId, "start", auth);
+          return yield* auth.start(
+            ownerSessionId,
+            stopSessions(input.instanceId, auth.credentialBinding),
+            input.methodId,
+            input.returnUrl,
+            input.callbackMode,
+          );
+        }),
+      );
+    }),
+    respond: Effect.fn("ProviderAuthService.respond")(function* (input, ownerSessionId) {
+      const auth = yield* getController(input.instanceId, "respond");
+      if (!auth.respond) {
+        return yield* new ProviderSetupError({
+          instanceId: input.instanceId,
+          operation: "respond",
+          detail: "This provider does not accept this sign-in interaction.",
+        });
+      }
+      return yield* auth.respond(ownerSessionId, input);
     }),
     complete: Effect.fn("ProviderAuthService.complete")(function* (input, ownerSessionId) {
       const auth = yield* getController(input.instanceId, "complete");
@@ -87,8 +206,13 @@ export const makeProviderAuthService = Effect.gen(function* () {
       return yield* auth.cancel(ownerSessionId, input.flowId);
     }),
     logout: Effect.fn("ProviderAuthService.logout")(function* (input) {
-      const auth = yield* getController(input.instanceId, "logout");
-      return yield* auth.logout(stopSessions(input.instanceId));
+      return yield* credentialChanges.withPermit(
+        Effect.gen(function* () {
+          const auth = yield* getController(input.instanceId, "logout");
+          yield* checkSharedBinding(input.instanceId, "logout", auth);
+          return yield* auth.logout(stopSessions(input.instanceId, auth.credentialBinding));
+        }),
+      );
     }),
     subscribe: (input, ownerSessionId) =>
       Effect.gen(function* () {
@@ -110,11 +234,21 @@ export const makeProviderAuthService = Effect.gen(function* () {
         if (!instance?.auth?.isLogoutPrompt?.(input.text, input.hasAttachments)) {
           return false;
         }
-        yield* instance.auth.logout(stopSessions(input.instanceId));
-        return true;
+        return yield* credentialChanges.withPermit(
+          Effect.gen(function* () {
+            const auth = yield* getController(input.instanceId, "logout");
+            if (!auth.isLogoutPrompt?.(input.text, input.hasAttachments)) return false;
+            yield* checkSharedBinding(input.instanceId, "logout", auth);
+            yield* auth.logout(stopSessions(input.instanceId, auth.credentialBinding));
+            return true;
+          }),
+        );
       },
     ),
   });
 });
 
-export const ProviderAuthServiceLive = Layer.effect(ProviderAuthService, makeProviderAuthService);
+export const ProviderAuthServiceLive = Layer.effect(
+  ProviderAuthService.ProviderAuthService,
+  makeProviderAuthService,
+);
diff --git a/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts b/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts
index 25dafa5ba040..0186d2dc4503 100644
--- a/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts
+++ b/apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts
@@ -1,3 +1,6 @@
+import { CodexInstallation } from "../CodexInstallation.ts";
+import { ServerSecretStore } from "../../auth/ServerSecretStore.ts";
+import { ServerEnvironmentIdentity } from "../../environment/ServerEnvironment.ts";
 /**
  * Multi-instance validation slices for `ProviderInstanceRegistryLive`.
  *
@@ -25,6 +28,7 @@
 import { describe, expect, it } from "@effect/vitest";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import {
+  EnvironmentId,
   type ClaudeSettings,
   type CodexSettings,
   type CursorSettings,
@@ -34,7 +38,7 @@ import {
   type ProviderInstanceConfigMap,
   ProviderInstanceId,
 } from "@t3tools/contracts";
-import { isHostWindows } from "@t3tools/shared/hostProcess";
+import { HostProcessPlatform, isHostWindows } from "@t3tools/shared/hostProcess";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
@@ -56,7 +60,7 @@ import { GrokDriver } from "../Drivers/GrokDriver.ts";
 import { OpenCodeDriver } from "../Drivers/OpenCodeDriver.ts";
 import * as ModelManifest from "../ModelManifest.ts";
 import { OpenCodeRuntimeLive } from "../opencodeRuntime.ts";
-import * as CodexResetCredit from "./codexResetCredit.ts";
+import * as ResetCreditCoordinator from "./resetCreditCoordinator.ts";
 import { NoOpProviderEventLoggers, ProviderEventLoggers } from "./ProviderEventLoggers.ts";
 import { makeProviderInstanceRegistry } from "./ProviderInstanceRegistryLive.ts";
 
@@ -178,6 +182,7 @@ const makeTildeProviderFixtures = Effect.fn(
     claudePath,
     [
       "#!/usr/bin/env node",
+      'import { existsSync } from "node:fs";',
       'import * as NodeReadline from "node:readline";',
       'if (process.argv.includes("--version")) {',
       '  process.stdout.write("claude 2.1.219\\n");',
@@ -186,7 +191,26 @@ const makeTildeProviderFixtures = Effect.fn(
       "const lines = NodeReadline.createInterface({ input: process.stdin });",
       'lines.on("line", (line) => {',
       "  const message = JSON.parse(line);",
-      '  if (message.type !== "control_request" || message.request?.subtype !== "initialize") return;',
+      '  if (message.type !== "control_request") return;',
+      '  if (message.request?.subtype === "get_usage") {',
+      "    const marker = process.env.T3_CLAUDE_RESET_MARKER;",
+      "    if (process.env.T3_CLAUDE_USAGE_FAILS_AFTER_CLAIM && marker && existsSync(marker)) {",
+      "      process.stdout.write(JSON.stringify({",
+      '        type: "control_response",',
+      '        response: { subtype: "error", request_id: message.request_id, error: "usage failed" },',
+      '      }) + "\\n");',
+      "      return;",
+      "    }",
+      "    process.stdout.write(JSON.stringify({",
+      '      type: "control_response",',
+      '      response: { subtype: "success", request_id: message.request_id, response: {',
+      '        session: {}, subscription_type: "pro", rate_limits_available: true,',
+      "        rate_limits: { five_hour: { utilization: marker && existsSync(marker) ? 0 : 100, resets_at: null } },",
+      "      } },",
+      '    }) + "\\n");',
+      "    return;",
+      "  }",
+      '  if (message.request?.subtype !== "initialize") return;',
       "  process.stdout.write(JSON.stringify({",
       '    type: "control_response",',
       "    response: {",
@@ -226,12 +250,23 @@ describe("ProviderInstanceRegistryLive — multi-instance codex slice", () => {
     prefix: "provider-instance-registry-test",
   }).pipe(
     Layer.provideMerge(NodeServices.layer),
+    Layer.provideMerge(
+      Layer.mock(CodexInstallation)({ managedDirectory: "unused-managed-installation" }),
+    ),
+    Layer.provideMerge(Layer.mock(ServerSecretStore)({})),
+    Layer.provideMerge(
+      Layer.succeed(ServerEnvironmentIdentity, {
+        getEnvironmentId: Effect.succeed(
+          EnvironmentId.make("00000000-0000-4000-8000-000000000001"),
+        ),
+      }),
+    ),
     Layer.provideMerge(BackgroundPolicyAlwaysRunLayer),
     Layer.provideMerge(ServerSettingsService.layerTest()),
     Layer.provideMerge(TestHttpClientLive),
     Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
     Layer.provideMerge(ModelManifest.layerTest),
-    Layer.provideMerge(CodexResetCredit.layerTest),
+    Layer.provideMerge(ResetCreditCoordinator.layerTest),
   );
 
   it.live("boots two independent codex instances from a ProviderInstanceConfigMap", () =>
@@ -338,6 +373,44 @@ describe("ProviderInstanceRegistryLive — multi-instance codex slice", () => {
     }).pipe(Effect.provide(testLayer)),
   );
 
+  it.live("reports Codex's answer when a redemption changed nothing", () =>
+    Effect.gen(function* () {
+      if (yield* isHostWindows) return;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const fixtures = yield* makeTildeProviderFixtures();
+      yield* fileSystem.writeFileString(
+        fixtures.codexScriptPath,
+        // @effect-diagnostics-next-line preferSchemaOverJson:off - fixed script document read by the external Codex mock peer.
+        JSON.stringify({
+          rootThreadId: "probe-thread",
+          notifications: [],
+          account: { type: "chatgpt", email: "test@example.com", planType: "plus" },
+          failRateLimitsRead: true,
+          resetCreditOutcome: "alreadyRedeemed",
+        }),
+      );
+      const codexId = ProviderInstanceId.make("codex_reset");
+      const { registry } = yield* makeProviderInstanceRegistry({
+        drivers: [CodexDriver],
+        configMap: {
+          [codexId]: {
+            driver: ProviderDriverKind.make("codex"),
+            enabled: true,
+            environment: [
+              { name: "T3_CODEX_COLLAB_SCRIPT", value: fixtures.codexScriptPath, sensitive: false },
+            ],
+            config: makeCodexConfig({ enabled: true, binaryPath: fixtures.codexBinaryPath }),
+          },
+        },
+      });
+      const codex = yield* registry.getInstance(codexId);
+      expect(codex).toBeDefined();
+      // The usage read fails, so the re-probe cannot confirm new limits.
+      yield* codex!.snapshot.refresh;
+      expect(yield* codex!.consumeResetCredit!()).toBe("alreadyRedeemed");
+    }).pipe(Effect.provide(testLayer)),
+  );
+
   it.live("runs Codex and Claude readiness probes from configured tilde paths", () =>
     Effect.gen(function* () {
       if (yield* isHostWindows) return;
@@ -392,6 +465,96 @@ describe("ProviderInstanceRegistryLive — multi-instance codex slice", () => {
     }).pipe(Effect.provide(testLayer)),
   );
 
+  const redeemClaudeReset = (claim: { result: string; usageFailsAfterClaim: boolean }) =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const fixtures = yield* makeTildeProviderFixtures();
+      const marker = path.join(fixtures.claudeHomePath, "redeemed");
+      yield* fs.writeFileString(
+        path.join(fixtures.claudeHomePath, ".credentials.json"),
+        '{"claudeAiOauth":{"accessToken":"fake-token"}}',
+      );
+      yield* fs.writeFileString(
+        path.join(fixtures.claudeHomePath, ".claude.json"),
+        '{"oauthAccount":{"organizationUuid":"fake-org"}}',
+      );
+      const client = HttpClient.make((request) =>
+        Effect.gen(function* () {
+          if (request.url.endsWith("/api/oauth/usage")) {
+            return HttpClientResponse.fromWeb(
+              request,
+              Response.json({
+                cedar_ember: {
+                  eligible: true,
+                  next_grant_id: "grant_a",
+                  grants: [{ id: "grant_a", resets_left: 1, usable_now: true }],
+                },
+              }),
+            );
+          }
+          if (request.url.endsWith("/reset_rate_limits")) {
+            yield* fs.writeFileString(marker, "redeemed").pipe(Effect.orDie);
+            return HttpClientResponse.fromWeb(request, Response.json({ result: claim.result }));
+          }
+          return HttpClientResponse.fromWeb(request, Response.json({ version: "0.0.0" }));
+        }),
+      );
+      const instanceId = ProviderInstanceId.make("claude_reset");
+      const { registry } = yield* makeProviderInstanceRegistry({
+        drivers: [ClaudeDriver],
+        configMap: {
+          [instanceId]: {
+            driver: ProviderDriverKind.make("claudeAgent"),
+            enabled: true,
+            environment: [
+              { name: "T3_CLAUDE_RESET_MARKER", value: marker, sensitive: false },
+              ...(claim.usageFailsAfterClaim
+                ? [{ name: "T3_CLAUDE_USAGE_FAILS_AFTER_CLAIM", value: "1", sensitive: false }]
+                : []),
+            ],
+            config: makeClaudeConfig({
+              enabled: true,
+              binaryPath: fixtures.claudeBinaryPath,
+              homePath: fixtures.claudeHomePath,
+            }),
+          },
+        },
+      }).pipe(Effect.provideService(HttpClient.HttpClient, client));
+      const instance = yield* registry.getInstance(instanceId);
+      expect(instance).toBeDefined();
+      const before = yield* instance!.snapshot.refresh;
+      expect(before.usageLimits?.windows[0]?.usedPercent).toBe(100);
+      expect(before.usageLimits?.resetCredits?.nextCreditId).toBe("grant_a");
+      const outcome = yield* instance!.consumeResetCredit!().pipe(Effect.result);
+      return { outcome, after: yield* instance!.snapshot.getSnapshot };
+    }).pipe(
+      // macOS logins live in the Keychain, where resets are never read.
+      Effect.provideService(HostProcessPlatform, "linux"),
+      Effect.provide(testLayer),
+    );
+
+  it.live("refreshes Claude usage after redeeming a reset", () =>
+    Effect.gen(function* () {
+      const { outcome, after } = yield* redeemClaudeReset({
+        result: "reset",
+        usageFailsAfterClaim: false,
+      });
+      expect(outcome).toMatchObject({ _tag: "Success", success: "reset" });
+      expect(after.usageLimits?.windows[0]?.usedPercent).toBe(0);
+    }),
+  );
+
+  it.live("reports Claude's answer when a claim changed nothing and the re-probe fails", () =>
+    Effect.gen(function* () {
+      const { outcome } = yield* redeemClaudeReset({
+        result: "already_used",
+        usageFailsAfterClaim: true,
+      });
+      expect(outcome).toMatchObject({ _tag: "Success", success: "alreadyRedeemed" });
+    }),
+  );
+
   it.live(
     "shadows instances whose driver is not registered in this build without failing boot",
     () =>
@@ -446,7 +609,20 @@ describe("ProviderInstanceRegistryLive — all drivers slice", () => {
   // provides `OpenCodeRuntimeLive`'s deps while keeping its own outputs
   // surfaced; that merged layer then provides `ServerConfig.layerTest`'s
   // `FileSystem` dep while keeping everything else surfaced to the test.
-  const infraLayer = OpenCodeRuntimeLive.pipe(Layer.provideMerge(NodeServices.layer));
+  const infraLayer = OpenCodeRuntimeLive.pipe(
+    Layer.provideMerge(NodeServices.layer),
+    Layer.provideMerge(
+      Layer.mock(CodexInstallation)({ managedDirectory: "unused-managed-installation" }),
+    ),
+    Layer.provideMerge(Layer.mock(ServerSecretStore)({})),
+    Layer.provideMerge(
+      Layer.succeed(ServerEnvironmentIdentity, {
+        getEnvironmentId: Effect.succeed(
+          EnvironmentId.make("00000000-0000-4000-8000-000000000001"),
+        ),
+      }),
+    ),
+  );
   const testLayer = AntigravityInstallation.layer.pipe(
     Layer.provideMerge(
       ServerConfig.layerTest(process.cwd(), {
@@ -459,7 +635,7 @@ describe("ProviderInstanceRegistryLive — all drivers slice", () => {
     Layer.provideMerge(TestHttpClientLive),
     Layer.provideMerge(Layer.succeed(ProviderEventLoggers, NoOpProviderEventLoggers)),
     Layer.provideMerge(ModelManifest.layerTest),
-    Layer.provideMerge(CodexResetCredit.layerTest),
+    Layer.provideMerge(ResetCreditCoordinator.layerTest),
   );
 
   it.live("boots one instance of every shipped driver from a single config map", () =>
diff --git a/apps/server/src/provider/Layers/ProviderRegistry.test.ts b/apps/server/src/provider/Layers/ProviderRegistry.test.ts
index 1dcd20cf69c5..36e1dcf26fd5 100644
--- a/apps/server/src/provider/Layers/ProviderRegistry.test.ts
+++ b/apps/server/src/provider/Layers/ProviderRegistry.test.ts
@@ -1,3 +1,6 @@
+import { CodexInstallation } from "../CodexInstallation.ts";
+import { ServerSecretStore } from "../../auth/ServerSecretStore.ts";
+import { ServerEnvironmentIdentity } from "../../environment/ServerEnvironment.ts";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, it, assert } from "@effect/vitest";
 import * as DateTime from "effect/DateTime";
@@ -16,6 +19,7 @@ import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
 import * as CodexErrors from "effect-codex-app-server/errors";
 import {
+  EnvironmentId,
   ClaudeSettings,
   CodexSettings,
   DEFAULT_SERVER_SETTINGS,
@@ -38,7 +42,8 @@ import { checkClaudeProviderStatus } from "./ClaudeProvider.ts";
 import * as BackgroundPolicy from "../../background/BackgroundPolicy.ts";
 import { AntigravityInstallation } from "../AntigravityInstallation.ts";
 import * as ModelManifest from "../ModelManifest.ts";
-import * as CodexResetCredit from "./codexResetCredit.ts";
+import { applyProviderCompatibility } from "../providerCompatibility.ts";
+import * as ResetCreditCoordinator from "./resetCreditCoordinator.ts";
 import * as OpenCodeRuntime from "../opencodeRuntime.ts";
 import * as ProviderEventLoggers from "./ProviderEventLoggers.ts";
 import { ProviderInstanceRegistryHydrationLive } from "./ProviderInstanceRegistryHydration.ts";
@@ -76,13 +81,20 @@ process.env.T3CODE_CURSOR_ENABLED = "1";
 
 const encoder = new TextEncoder();
 const TEST_EPOCH = DateTime.makeUnsafe("1970-01-01T00:00:00.000Z");
+const withBundledCompatibility = (snapshot: ServerProvider) =>
+  applyProviderCompatibility(
+    snapshot,
+    undefined,
+    ModelManifest.BUNDLED_MODEL_MANIFEST.compatibility,
+  );
 
+// Provider metadata checks use a bundled manifest and stubbed HTTP.
 const TestHttpClientLive = Layer.succeed(
   HttpClient.HttpClient,
   HttpClient.make((request) =>
     Effect.succeed(HttpClientResponse.fromWeb(request, Response.json({ version: "0.0.0" }))),
   ),
-);
+).pipe(Layer.provideMerge(ModelManifest.layerTest));
 
 const BackgroundPolicyAlwaysRunLayer = Layer.mock(BackgroundPolicy.BackgroundPolicy)({
   reportClientActivity: () => Effect.void,
@@ -361,7 +373,16 @@ const awaitPersistedProvider = (
     Effect.forkScoped,
   );
 
-it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), TestHttpClientLive))(
+const TestNodeServices = Layer.mergeAll(
+  NodeServices.layer,
+  Layer.mock(CodexInstallation)({ managedDirectory: "unused-managed-installation" }),
+  Layer.mock(ServerSecretStore)({}),
+  Layer.succeed(ServerEnvironmentIdentity, {
+    getEnvironmentId: Effect.succeed(EnvironmentId.make("00000000-0000-4000-8000-000000000001")),
+  }),
+);
+
+it.layer(Layer.mergeAll(TestNodeServices, ServerSettingsModule.layerTest(), TestHttpClientLive))(
   "ProviderRegistry",
   (it) => {
     describe("checkCodexProviderStatus", () => {
@@ -1753,7 +1774,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
             );
             assert.deepStrictEqual(
               recoveredProviders.find((provider) => provider.instanceId === codexInstanceId),
-              codexProvider,
+              withBundledCompatibility(codexProvider),
             );
 
             yield* Ref.set(catalogSnapshot, changedCatalogProvider);
@@ -1765,7 +1786,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
             );
             assert.deepStrictEqual(
               changedProviders.find((provider) => provider.instanceId === codexInstanceId),
-              codexProvider,
+              withBundledCompatibility(codexProvider),
             );
           }).pipe(Effect.provide(runtimeServices));
 
@@ -1879,10 +1900,13 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
             yield* Fiber.join(persisted);
             const cachedProvider = yield* readProviderStatusCache(filePath);
 
-            assert.deepStrictEqual(cachedProvider, {
-              ...refreshedProvider,
-              models: [...initialProvider.models],
-            });
+            assert.deepStrictEqual(
+              cachedProvider,
+              withBundledCompatibility({
+                ...refreshedProvider,
+                models: [...initialProvider.models],
+              }),
+            );
           }).pipe(Effect.provide(runtimeServices));
         }),
       );
@@ -2094,10 +2118,14 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
           yield* Effect.gen(function* () {
             const registry = yield* ProviderRegistry.ProviderRegistry;
 
-            assert.deepStrictEqual(yield* registry.getProviders, [cachedProvider]);
-            assert.deepStrictEqual(yield* registry.refresh(codexDriver), [cachedProvider]);
+            assert.deepStrictEqual(yield* registry.getProviders, [
+              withBundledCompatibility(cachedProvider),
+            ]);
+            assert.deepStrictEqual(yield* registry.refresh(codexDriver), [
+              withBundledCompatibility(cachedProvider),
+            ]);
             assert.deepStrictEqual(yield* registry.refreshInstance(codexInstanceId), [
-              cachedProvider,
+              withBundledCompatibility(cachedProvider),
             ]);
           }).pipe(Effect.provide(runtimeServices));
         }),
@@ -2205,7 +2233,9 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
 
           yield* Effect.gen(function* () {
             const registry = yield* ProviderRegistry.ProviderRegistry;
-            assert.deepStrictEqual(yield* registry.getProviders, [codexProvider]);
+            assert.deepStrictEqual(yield* registry.getProviders, [
+              withBundledCompatibility(codexProvider),
+            ]);
 
             yield* Ref.set(failNextList, true);
             yield* PubSub.publish(changes, undefined);
@@ -2304,7 +2334,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
               ),
             ),
             Layer.provideMerge(ModelManifest.layerTest),
-            Layer.provideMerge(CodexResetCredit.layerTest),
+            Layer.provideMerge(ResetCreditCoordinator.layerTest),
             Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
             Layer.provideMerge(BackgroundPolicyAlwaysRunLayer),
             // NO spawner mock — `ChildProcessSpawner` is supplied by the
@@ -2403,7 +2433,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
               ),
             ),
             Layer.provideMerge(ModelManifest.layerTest),
-            Layer.provideMerge(CodexResetCredit.layerTest),
+            Layer.provideMerge(ResetCreditCoordinator.layerTest),
             Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
             Layer.updateService(ChildProcessSpawner.ChildProcessSpawner, (spawner) =>
               ChildProcessSpawner.make((command) => {
@@ -2519,7 +2549,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
               ),
             ),
             Layer.provideMerge(ModelManifest.layerTest),
-            Layer.provideMerge(CodexResetCredit.layerTest),
+            Layer.provideMerge(ResetCreditCoordinator.layerTest),
             Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
             Layer.provideMerge(NodeServices.layer),
             Layer.provideMerge(BackgroundPolicyAlwaysRunLayer),
@@ -2581,8 +2611,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
                 ),
               ),
               Layer.provideMerge(ModelManifest.layerTest),
-              Layer.provideMerge(CodexResetCredit.layerTest),
-              Layer.provideMerge(CodexResetCredit.layerTest),
+              Layer.provideMerge(ResetCreditCoordinator.layerTest),
               Layer.provideMerge(OpenCodeRuntime.OpenCodeRuntimeLive),
               Layer.provideMerge(BackgroundPolicyAlwaysRunLayer),
               Layer.provideMerge(
@@ -2736,6 +2765,42 @@ it.layer(Layer.mergeAll(NodeServices.layer, ServerSettingsModule.layerTest(), Te
         ),
       );
 
+      it.effect("reads banked resets only for subscription logins", () =>
+        Effect.gen(function* () {
+          const check = (overrides: Partial<TestClaudeCapabilities>) =>
+            checkClaudeProviderStatus(
+              defaultClaudeSettings,
+              () =>
+                Effect.succeed({
+                  email: undefined,
+                  subscriptionType: undefined,
+                  tokenSource: undefined,
+                  apiProvider: undefined,
+                  slashCommands: [],
+                  usage: { rate_limits_available: true, rate_limits: {} },
+                  ...overrides,
+                }),
+              undefined,
+              undefined,
+              undefined,
+              undefined,
+              () => Effect.succeed({ availableCount: 2 }),
+            );
+          const subscription = yield* check({ subscriptionType: "max" });
+          const bedrock = yield* check({ apiProvider: "bedrock" });
+          assert.deepStrictEqual(subscription.usageLimits?.resetCredits, { availableCount: 2 });
+          assert.strictEqual(bedrock.usageLimits?.resetCredits, undefined);
+        }).pipe(
+          Effect.provide(
+            mockSpawnerLayer((args) => {
+              const joined = args.join(" ");
+              if (joined === "--version") return { stdout: "1.0.0\n", stderr: "", code: 0 };
+              throw new Error(`Unexpected args: ${joined}`);
+            }),
+          ),
+        ),
+      );
+
       it.effect("does not duplicate Claude in full subscription labels", () =>
         Effect.gen(function* () {
           const status = yield* checkClaudeProviderStatus(
diff --git a/apps/server/src/provider/Layers/ProviderRegistry.ts b/apps/server/src/provider/Layers/ProviderRegistry.ts
index a8e6caf95aa7..a65bc66edf32 100644
--- a/apps/server/src/provider/Layers/ProviderRegistry.ts
+++ b/apps/server/src/provider/Layers/ProviderRegistry.ts
@@ -40,6 +40,8 @@ import * as Ref from "effect/Ref";
 import * as Stream from "effect/Stream";
 import * as Semaphore from "effect/Semaphore";
 
+import * as ModelManifest from "../ModelManifest.ts";
+import { applyProviderCompatibility } from "../providerCompatibility.ts";
 import { ServerConfig } from "../../config.ts";
 import { ProviderInstanceRegistry } from "../Services/ProviderInstanceRegistry.ts";
 import { ProviderRegistry, type ProviderRegistryShape } from "../Services/ProviderRegistry.ts";
@@ -278,6 +280,8 @@ export const ProviderRegistryLive = Layer.effect(
   ProviderRegistry,
   Effect.gen(function* () {
     const instanceRegistry = yield* ProviderInstanceRegistry;
+    const manifestService = yield* ModelManifest.ModelManifest;
+    const serviceScope = yield* Effect.scope;
     const config = yield* ServerConfig;
     const fileSystem = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
@@ -356,7 +360,19 @@ export const ProviderRegistryLive = Layer.effect(
         ),
       ),
     );
-    const providersRef = yield* Ref.make<ReadonlyArray<ServerProvider>>(cachedProviders);
+    const initialManifest = yield* manifestService.current;
+    const classifyCompatibility = (
+      provider: ServerProvider,
+      manifest: ModelManifest.ModelManifestData,
+    ) =>
+      applyProviderCompatibility(
+        provider,
+        manifest.compatibility,
+        ModelManifest.BUNDLED_MODEL_MANIFEST.compatibility,
+      );
+    const providersRef = yield* Ref.make<ReadonlyArray<ServerProvider>>(
+      cachedProviders.map((provider) => classifyCompatibility(provider, initialManifest)),
+    );
     const workspaceRefreshesRef = yield* Ref.make<
       ReadonlyMap<ProviderInstance, ReadonlySet<string>>
     >(new Map());
@@ -424,6 +440,7 @@ export const ProviderRegistryLive = Layer.effect(
         readonly replace?: boolean;
       },
     ) {
+      const manifest = yield* manifestService.current;
       const nextProvidersWithUpdateState = yield* Effect.forEach(
         nextProviders,
         applyProviderUpdateState,
@@ -450,7 +467,11 @@ export const ProviderRegistryLive = Layer.effect(
             );
           }
 
-          const providers = orderProviderSnapshots([...mergedProviders.values()]);
+          const providers = orderProviderSnapshots(
+            [...mergedProviders.values()].map((provider) =>
+              classifyCompatibility(provider, manifest),
+            ),
+          );
           const providersToPersist = providers.filter((provider) =>
             updatedKeys.has(snapshotInstanceKey(provider)),
           );
@@ -473,13 +494,24 @@ export const ProviderRegistryLive = Layer.effect(
       return providers;
     });
 
+    const compatibilityRefreshRunning = yield* Ref.make(false);
     const syncProvider = Effect.fn("syncProvider")(function* (
       provider: ServerProvider,
       options?: {
         readonly publish?: boolean;
       },
     ) {
-      return yield* upsertProviders([provider], options);
+      const providers = yield* upsertProviders([provider], options);
+      // Reclassify the current read model after fetching. Never republish the
+      // probe captured before the fetch: a newer health result may have landed.
+      if (!(yield* Ref.getAndSet(compatibilityRefreshRunning, true))) {
+        yield* manifestService.refresh.pipe(
+          Effect.andThen(upsertProviders([], { persist: false })),
+          Effect.ensuring(Ref.set(compatibilityRefreshRunning, false)),
+          Effect.forkIn(serviceScope),
+        );
+      }
+      return providers;
     });
 
     const setProviderMaintenanceActionState = Effect.fn("setProviderMaintenanceActionState")(
diff --git a/apps/server/src/provider/Layers/ProviderService.test.ts b/apps/server/src/provider/Layers/ProviderService.test.ts
index 5afb3da81d12..91c077048ccb 100644
--- a/apps/server/src/provider/Layers/ProviderService.test.ts
+++ b/apps/server/src/provider/Layers/ProviderService.test.ts
@@ -418,6 +418,7 @@ function makeProviderServiceLayer(
     readonly directory?: ProviderSessionDirectory.ProviderSessionDirectory["Service"];
     readonly supportsConversationRollback?: boolean;
     readonly analyticsLayer?: Layer.Layer<AnalyticsService.AnalyticsService>;
+    readonly settingsLayer?: typeof defaultServerSettingsLayer;
     readonly registry?: ProviderAdapterRegistry.ProviderAdapterRegistry["Service"];
   } = {},
 ) {
@@ -450,7 +451,7 @@ function makeProviderServiceLayer(
         Layer.provide(NodeServices.layer),
         Layer.provide(providerAdapterLayer),
         Layer.provide(directoryLayer),
-        Layer.provide(defaultServerSettingsLayer),
+        Layer.provide(input.settingsLayer ?? defaultServerSettingsLayer),
         Layer.provide(serverConfigTestLayer),
         Layer.provideMerge(input.analyticsLayer ?? AnalyticsService.layerTest),
         Layer.provide(
@@ -648,6 +649,78 @@ it.effect("ProviderServiceLive catches stopAll failures during shutdown", () =>
   }),
 );
 
+it.effect("ProviderServiceLive shutdown leaves settled session rows untouched", () =>
+  Effect.gen(function* () {
+    const recordedAnalytics = makeRecordingAnalytics();
+    const codex = makeFakeCodexAdapter();
+    const persistence = yield* Layer.build(
+      ProviderSessionDirectoryLive.pipe(
+        Layer.provide(ProviderSessionRuntime.layer.pipe(Layer.provide(SqlitePersistenceMemory))),
+      ),
+    );
+    const directory = yield* ProviderSessionDirectory.ProviderSessionDirectory.pipe(
+      Effect.provide(persistence),
+    );
+    const seed = (threadId: ThreadId, status: "running" | "stopped", activeTurnId: TurnId | null) =>
+      directory.upsert({
+        threadId,
+        provider: CODEX_DRIVER,
+        providerInstanceId: codexInstanceId,
+        status,
+        runtimePayload: { cwd: "/repo", activeTurnId },
+      });
+    const readBindings = directory
+      .listBindings()
+      .pipe(
+        Effect.map((bindings) => new Map(bindings.map((binding) => [binding.threadId, binding]))),
+      );
+    const settledId = asThreadId("shutdown-settled");
+    const runningId = asThreadId("shutdown-running");
+    const stoppedWithTurnId = asThreadId("shutdown-stopped-with-turn");
+    yield* seed(settledId, "stopped", null);
+    yield* seed(runningId, "running", asTurnId("running-turn"));
+    yield* seed(stoppedWithTurnId, "stopped", asTurnId("stale-turn"));
+    const settledBefore = (yield* readBindings).get(settledId);
+    assert(settledBefore !== undefined);
+
+    const scope = yield* Scope.make();
+    yield* Layer.build(
+      makeProviderServiceLive().pipe(
+        Layer.provide(NodeServices.layer),
+        Layer.provide(Layer.succeed(ProviderSessionDirectory.ProviderSessionDirectory, directory)),
+        Layer.provide(
+          Layer.succeed(
+            ProviderAdapterRegistry.ProviderAdapterRegistry,
+            makeStaticInstanceRegistry([[codexInstanceId, codex.adapter]]),
+          ),
+        ),
+        Layer.provide(defaultServerSettingsLayer),
+        Layer.provide(serverConfigTestLayer),
+        Layer.provide(recordedAnalytics.layer),
+        Layer.provide(
+          Layer.succeed(
+            ProviderEventLoggers.ProviderEventLoggers,
+            ProviderEventLoggers.NoOpProviderEventLoggers,
+          ),
+        ),
+      ),
+    ).pipe(Scope.provide(scope));
+    yield* TestClock.adjust("1 minute");
+    yield* Scope.close(scope, Exit.void);
+
+    const byThread = yield* readBindings;
+    assert.deepStrictEqual(byThread.get(settledId), settledBefore);
+    for (const threadId of [runningId, stoppedWithTurnId]) {
+      const binding = byThread.get(threadId);
+      assert.equal(binding?.status, "stopped");
+      assert.propertyVal(binding?.runtimePayload, "activeTurnId", null);
+      assert.propertyVal(binding?.runtimePayload, "lastRuntimeEvent", "provider.stopAll");
+    }
+    const [stoppedAll] = recordedAnalytics.eventsByName("provider.sessions.stopped_all");
+    assert.equal(stoppedAll?.properties?.stoppedSessionCount, 2);
+  }).pipe(Effect.provide(NodeServices.layer)),
+);
+
 it.effect("ProviderServiceLive flushes deferred completions during shutdown", () =>
   Effect.gen(function* () {
     const recordedAnalytics = makeRecordingAnalytics();
@@ -5139,6 +5212,57 @@ validation.layer("ProviderServiceLive validation", (it) => {
     }),
   );
 
+  it.effect("rejects a file when its path cannot fit in the prompt", () =>
+    Effect.gen(function* () {
+      const provider = yield* ProviderService.ProviderService;
+      validation.codex.sendTurn.mockClear();
+      const failure = yield* provider
+        .sendTurn({
+          threadId: asThreadId("thread-file-path-context-limit"),
+          input: "x".repeat(PROVIDER_SEND_TURN_MAX_INPUT_CHARS),
+          attachments: [
+            {
+              type: "file",
+              id: "thread-attach-12345678-1234-1234-1234-123456789abc-zip",
+              name: "archive.zip",
+              mimeType: "application/zip",
+              sizeBytes: 1024,
+            },
+          ],
+        })
+        .pipe(Effect.flip);
+
+      assert.instanceOf(failure, ProviderValidationError);
+      assert.include(failure.issue, String(PROVIDER_SEND_TURN_MAX_INPUT_CHARS));
+      assert.equal(validation.codex.sendTurn.mock.calls.length, 0);
+    }),
+  );
+
+  it.effect("sends a native image when its path cannot fit in the prompt", () =>
+    Effect.gen(function* () {
+      const provider = yield* ProviderService.ProviderService;
+      const threadId = asThreadId("thread-image-path-context-limit");
+      yield* provider.startSession(threadId, {
+        provider: ProviderDriverKind.make("codex"),
+        providerInstanceId: codexInstanceId,
+        threadId,
+        runtimeMode: "full-access",
+      });
+      validation.codex.sendTurn.mockClear();
+      const attachment = {
+        type: "image" as const,
+        id: "thread-attach-12345678-1234-1234-1234-123456789abc-png",
+        name: "screen.png",
+        mimeType: "image/png",
+        sizeBytes: 1024,
+      };
+      const input = "x".repeat(PROVIDER_SEND_TURN_MAX_INPUT_CHARS);
+      yield* provider.sendTurn({ threadId, input, attachments: [attachment] });
+      assert.equal(validation.codex.sendTurn.mock.calls[0]?.[0].input, input);
+      assert.deepEqual(validation.codex.sendTurn.mock.calls[0]?.[0].attachments, [attachment]);
+    }),
+  );
+
   it.effect("rejects citation-expanded input over the provider character limit", () =>
     Effect.gen(function* () {
       const provider = yield* ProviderService.ProviderService;
@@ -5304,13 +5428,11 @@ const listThreadIds = vi.fn(() =>
   Effect.succeed([activeSessionThreadId, historicalSessionThreadId]),
 );
 const getBinding = vi.fn((threadId: ThreadId) =>
-  Effect.succeed(
-    Option.some({
-      threadId,
-      provider: CODEX_DRIVER,
-      providerInstanceId: codexInstanceId,
-    }),
-  ),
+  Effect.succeedSome({
+    threadId,
+    provider: CODEX_DRIVER,
+    providerInstanceId: codexInstanceId,
+  }),
 );
 const boundedListing = makeProviderServiceLayer({
   directory: {
@@ -5381,6 +5503,7 @@ describe("agent browser access", () => {
         getSnapshot: () => Effect.die("unused"),
         getShellSnapshot: () => Effect.die("unused"),
         getDeletedWorktreeThreads: () => Effect.die("unused"),
+        listThreadsWithPullRequests: () => Effect.die("unused"),
         getArchivedShellSnapshot: () => Effect.die("unused"),
         getSnapshotSequence: () => Effect.die("unused"),
         getCounts: () => Effect.die("unused"),
@@ -5560,3 +5683,89 @@ describe("agent browser access", () => {
     }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
+
+const chatGptAnalytics = makeRecordingAnalytics();
+const chatGptAdapter = makeFakeCodexAdapter();
+const chatGptTelemetry = makeProviderServiceLayer({
+  analyticsLayer: chatGptAnalytics.layer,
+  settingsLayer: ServerSettings.ServerSettingsService.layerTest({
+    providerInstances: {
+      [secondaryCodexInstanceId]: { driver: CODEX_DRIVER, config: { setupMode: "managed" } },
+    },
+  }),
+  registry: makeStaticInstanceRegistry([[secondaryCodexInstanceId, chatGptAdapter.adapter]]),
+});
+chatGptTelemetry.layer("ChatGPT connector turn analytics", (it) => {
+  it.effect("tags attempts, sends, and one terminal outcome without recording the prompt", () =>
+    Effect.gen(function* () {
+      chatGptAnalytics.reset();
+      const provider = yield* ProviderService.ProviderService;
+      const threadId = asThreadId("chatgpt-analytics-success");
+      yield* provider.startSession(threadId, {
+        provider: CODEX_DRIVER,
+        providerInstanceId: secondaryCodexInstanceId,
+        threadId,
+        runtimeMode: "full-access",
+      });
+      const turn = yield* provider.sendTurn({ threadId, input: "private test prompt" });
+      const drain = yield* Stream.take(provider.streamEvents, 2).pipe(
+        Stream.runDrain,
+        Effect.forkChild,
+      );
+      yield* Effect.yieldNow;
+      const completion: LegacyProviderRuntimeEvent = {
+        type: "turn.completed",
+        eventId: asEventId("chatgpt-completed"),
+        provider: CODEX_DRIVER,
+        createdAt: "2026-01-01T00:00:00.000Z",
+        threadId,
+        turnId: turn.turnId,
+        payload: { state: "completed" },
+      };
+      chatGptAdapter.emit(completion);
+      chatGptAdapter.emit({ ...completion, eventId: asEventId("chatgpt-completed-duplicate") });
+      yield* Fiber.join(drain);
+      for (const event of [
+        "provider.turn.attempted",
+        "provider.turn.sent",
+        "provider.turn.completed",
+      ]) {
+        const events = chatGptAnalytics.eventsByName(event);
+        assert.equal(events.length, 1);
+        assert.equal(events[0]?.properties?.subscriptionSharing, true);
+        assert.notProperty(events[0]?.properties ?? {}, "input");
+        assert.notProperty(events[0]?.properties ?? {}, "threadId");
+        assert.notProperty(events[0]?.properties ?? {}, "providerInstanceId");
+      }
+    }),
+  );
+  it.effect("records rejected sends as failures without an accepted-turn event", () =>
+    Effect.gen(function* () {
+      chatGptAnalytics.reset();
+      const provider = yield* ProviderService.ProviderService;
+      const threadId = asThreadId("chatgpt-analytics-rejection");
+      yield* provider.startSession(threadId, {
+        provider: CODEX_DRIVER,
+        providerInstanceId: secondaryCodexInstanceId,
+        threadId,
+        runtimeMode: "full-access",
+      });
+      chatGptAdapter.sendTurn.mockImplementationOnce(() =>
+        Effect.fail(new ProviderAdapterSessionNotFoundError({ provider: CODEX_DRIVER, threadId })),
+      );
+      const result = yield* provider
+        .sendTurn({ threadId, input: "private rejected prompt" })
+        .pipe(Effect.result);
+      assert.equal(result._tag, "Failure");
+      assert.equal(chatGptAnalytics.eventsByName("provider.turn.attempted").length, 1);
+      assert.equal(chatGptAnalytics.eventsByName("provider.turn.sent").length, 0);
+      const rejected = chatGptAnalytics.eventsByName("provider.turn.rejected");
+      assert.equal(rejected.length, 1);
+      assert.deepStrictEqual(rejected[0]?.properties, {
+        provider: CODEX_DRIVER,
+        subscriptionSharing: true,
+        errorType: "ProviderAdapterSessionNotFoundError",
+      });
+    }),
+  );
+});
diff --git a/apps/server/src/provider/Layers/ProviderService.ts b/apps/server/src/provider/Layers/ProviderService.ts
index d79ce83b8890..f469b7b81428 100644
--- a/apps/server/src/provider/Layers/ProviderService.ts
+++ b/apps/server/src/provider/Layers/ProviderService.ts
@@ -264,6 +264,7 @@ interface TurnAnalyticsMetadata {
   readonly provider: ProviderDriverKind;
   readonly startedAtMs: number;
   readonly mixedModels: boolean;
+  readonly subscriptionSharing?: boolean;
   readonly model?: string;
   readonly effort?: string;
   readonly interactionMode?: string;
@@ -428,6 +429,14 @@ function readPersistedCwd(
   return trimmed.length > 0 ? trimmed : undefined;
 }
 
+/** Stopped rows with no active turn are settled; shutdown leaves them untouched. */
+function isSettledBinding(binding: ProviderSessionDirectory.ProviderRuntimeBinding): boolean {
+  if (binding.status !== "stopped") return false;
+  const payload = binding.runtimePayload;
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return true;
+  return !("activeTurnId" in payload) || payload.activeTurnId == null;
+}
+
 const dieOnMissingBindingInstanceId = (
   operation: string,
   payload: {
@@ -536,6 +545,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
 
     return {
       ...input.completion.terminalProperties,
+      ...(metadata?.subscriptionSharing ? { subscriptionSharing: true } : {}),
       ...(metadata?.model ? { model: metadata.model } : {}),
       ...(metadata?.effort ? { effort: metadata.effort } : {}),
       ...(metadata?.interactionMode ? { interactionMode: metadata.interactionMode } : {}),
@@ -581,6 +591,21 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
     readonly runtimeMode: string | undefined;
   }) {
     const startedAtMs = DateTime.toEpochMillis(yield* DateTime.now);
+    const settings = yield* serverSettings.getSettings.pipe(Effect.option);
+    const instance = Option.isSome(settings)
+      ? settings.value.providerInstances[input.providerInstanceId]
+      : undefined;
+    const subscriptionSharing =
+      input.provider === "codex" &&
+      (instance
+        ? instance.driver === "codex" &&
+          typeof instance.config === "object" &&
+          instance.config !== null &&
+          "setupMode" in instance.config &&
+          instance.config.setupMode === "managed"
+        : input.providerInstanceId === "codex" &&
+          Option.isSome(settings) &&
+          settings.value.providers.codex.setupMode === "managed");
     turnAnalyticsRequestId += 1;
     const requestId = turnAnalyticsRequestId;
     const effort = turnEffort(input.modelSelection);
@@ -593,6 +618,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
       };
       const metadata: TurnAnalyticsMetadata = {
         provider: input.provider,
+        ...(subscriptionSharing ? { subscriptionSharing: true } : {}),
         startedAtMs,
         mixedModels: false,
         requestId,
@@ -1764,10 +1790,12 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
             ? `[Pasted text "${attachment.name}" is saved at: ${attachmentPath}. Inspect it as needed.]`
             : `[Attached ${attachment.type} "${attachment.name}" is saved at: ${attachmentPath}]`,
       );
-      if (isPastedText && !appended) {
+      // Most adapters see generic files only through this path line, so a file
+      // without one would be silently dropped. Images still go natively.
+      if (!appended && attachment.type === "file") {
         return yield* toValidationError(
           "ProviderService.sendTurn",
-          `Input plus pasted-text attachment context exceeds the ${PROVIDER_SEND_TURN_MAX_INPUT_CHARS} character limit`,
+          `Input plus attachment context exceeds the ${PROVIDER_SEND_TURN_MAX_INPUT_CHARS} character limit`,
         );
       }
     }
@@ -1859,6 +1887,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
       yield* McpSessionRegistry.touchActiveMcpThread(input.threadId);
       const analyticsModelSelection =
         input.modelSelection?.instanceId === routed.instanceId ? input.modelSelection : undefined;
+      let subscriptionSharing = false;
       const turn = yield* Effect.acquireUseRelease(
         beginTurnAnalytics({
           providerInstanceId: routed.instanceId,
@@ -1870,7 +1899,22 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
         }),
         (turnMetadata) =>
           Effect.gen(function* () {
-            const turn = yield* routed.adapter.sendTurn(input);
+            subscriptionSharing = turnMetadata.subscriptionSharing === true;
+            yield* analytics.record("provider.turn.attempted", {
+              provider: routed.adapter.provider,
+              ...(turnMetadata.subscriptionSharing ? { subscriptionSharing: true } : {}),
+              model: input.modelSelection?.model,
+              runtimeMode: routed.runtimeMode,
+            });
+            const turn = yield* routed.adapter.sendTurn(input).pipe(
+              Effect.tapError((error) =>
+                analytics.record("provider.turn.rejected", {
+                  provider: routed.adapter.provider,
+                  ...(turnMetadata.subscriptionSharing ? { subscriptionSharing: true } : {}),
+                  errorType: error._tag,
+                }),
+              ),
+            );
             yield* associateTurnAnalytics({
               providerInstanceId: routed.instanceId,
               threadId: input.threadId,
@@ -1904,6 +1948,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
       });
       yield* analytics.record("provider.turn.sent", {
         provider: routed.adapter.provider,
+        ...(subscriptionSharing ? { subscriptionSharing: true } : {}),
         model: input.modelSelection?.model,
         interactionMode: input.interactionMode,
         // Session-start events alone skew runtime mode toward users who toggle
@@ -2436,7 +2481,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
     // Continuation is project-scopable, so decide it per session's project;
     // without orchestration the environment value is all there is.
     const stopSettings = yield* serverSettings.getSettings.pipe(
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.orElseSucceed(() => Option.none<ServerSettingsValue>()),
     );
     const continueAfterRestartFor = Effect.fn("continueAfterRestartFor")(function* (
@@ -2469,7 +2514,6 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
       return [completed, state] as const;
     });
     yield* recordCompletedTurnProperties(properties);
-    const threadIds = yield* directory.listThreadIds();
     const currentAdapters = yield* getAdapterEntries;
     const activeSessions = yield* Effect.forEach(currentAdapters, ([instanceId, adapter]) =>
       adapter.listSessions().pipe(
@@ -2500,7 +2544,12 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
     yield* Effect.forEach(currentAdapters, ([, adapter]) => adapter.stopAll()).pipe(Effect.asVoid);
     yield* McpSessionRegistry.revokeAllActiveMcpCredentials();
     McpProviderSession.clearAllMcpProviderSessions();
-    const bindings = yield* directory.listBindings().pipe(Effect.orElseSucceed(() => []));
+    // Stopped rows stay for their resume cursors, so long-lived installs hold
+    // thousands. Only rewrite the ones this shutdown actually stops.
+    const bindings = yield* directory.listBindings().pipe(
+      Effect.map((all) => all.filter((binding) => !isSettledBinding(binding))),
+      Effect.orElseSucceed(() => []),
+    );
     yield* Effect.forEach(bindings, (binding) =>
       Effect.gen(function* () {
         const providerInstanceId = dieOnMissingBindingInstanceId(
@@ -2520,8 +2569,10 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
         });
       }),
     ).pipe(Effect.asVoid);
+    // Not `sessionCount`: that older property counted every row, so a new name
+    // keeps the two meanings in separate series.
     yield* analytics.record("provider.sessions.stopped_all", {
-      sessionCount: threadIds.length,
+      stoppedSessionCount: bindings.length,
     });
     yield* analytics.flush;
   });
diff --git a/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts b/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts
index 8b41bd3e518c..45615fe7b440 100644
--- a/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts
+++ b/apps/server/src/provider/Layers/ProviderSessionDirectory.test.ts
@@ -372,6 +372,41 @@ it.layer(makeDirectoryLayer(SqlitePersistenceMemory))("ProviderSessionDirectoryL
     }),
   );
 
+  it.effect("lists only bindings that are not stopped when asked", () =>
+    Effect.gen(function* () {
+      const directory = yield* ProviderSessionDirectory;
+      const runtimeRepository = yield* ProviderSessionRuntime.ProviderSessionRuntimeRepository;
+      const statuses = ["running", "starting", "error", "stopped"] as const;
+      const threadIds = new Set<string>();
+
+      for (const status of statuses) {
+        const threadId = ThreadId.make(`thread-exclude-stopped-${status}`);
+        threadIds.add(threadId);
+        yield* runtimeRepository.upsert({
+          threadId,
+          providerName: "codex",
+          providerInstanceId: ProviderInstanceId.make("codex"),
+          adapterKey: "codex",
+          runtimeMode: "full-access",
+          status,
+          lastSeenAt: "2026-04-14T12:00:00.000Z",
+          resumeCursor: null,
+          runtimePayload: null,
+        });
+      }
+
+      const liveStatuses = (yield* directory.listBindings({ excludeStopped: true }))
+        .filter((binding) => threadIds.has(binding.threadId))
+        .map((binding) => binding.status);
+      const allStatuses = (yield* directory.listBindings())
+        .filter((binding) => threadIds.has(binding.threadId))
+        .map((binding) => binding.status);
+
+      assert.deepEqual(liveStatuses.toSorted(), ["error", "running", "starting"]);
+      assert.deepEqual(allStatuses.toSorted(), ["error", "running", "starting", "stopped"]);
+    }),
+  );
+
   it.effect(
     "resets adapterKey to the new provider when provider changes without an explicit adapter key",
     () =>
diff --git a/apps/server/src/provider/Layers/ProviderSessionDirectory.ts b/apps/server/src/provider/Layers/ProviderSessionDirectory.ts
index 29ec8d2ed168..0e9de8fb868f 100644
--- a/apps/server/src/provider/Layers/ProviderSessionDirectory.ts
+++ b/apps/server/src/provider/Layers/ProviderSessionDirectory.ts
@@ -93,9 +93,7 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
         Option.match(runtime, {
           onNone: () => Effect.succeed(Option.none<ProviderRuntimeBinding>()),
           onSome: (value) =>
-            toRuntimeBinding(value, "ProviderSessionDirectory.getBinding").pipe(
-              Effect.map((binding) => Option.some(binding)),
-            ),
+            toRuntimeBinding(value, "ProviderSessionDirectory.getBinding").pipe(Effect.asSome),
         }),
       ),
     );
@@ -184,8 +182,8 @@ const makeProviderSessionDirectory = Effect.gen(function* () {
       Effect.map((rows) => rows.map((row) => row.threadId)),
     );
 
-  const listBindings: ProviderSessionDirectoryShape["listBindings"] = () =>
-    repository.list().pipe(
+  const listBindings: ProviderSessionDirectoryShape["listBindings"] = (options) =>
+    repository.list(options).pipe(
       Effect.mapError(toPersistenceError("ProviderSessionDirectory.listBindings:list")),
       Effect.flatMap((rows) =>
         Effect.forEach(
diff --git a/apps/server/src/provider/Layers/ProviderSessionReaper.test.ts b/apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
index 8f2d57429dd5..3d71e4d7ec94 100644
--- a/apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
+++ b/apps/server/src/provider/Layers/ProviderSessionReaper.test.ts
@@ -252,6 +252,7 @@ describe("ProviderSessionReaper", () => {
           getSnapshot: () => Effect.die("unused"),
           getShellSnapshot: () => Effect.die("unused"),
           getDeletedWorktreeThreads: () => Effect.die("unused"),
+          listThreadsWithPullRequests: () => Effect.die("unused"),
           getArchivedShellSnapshot: () => Effect.die("unused"),
           getSnapshotSequence: () =>
             Effect.succeed({ snapshotSequence: input.readModel.snapshotSequence }),
diff --git a/apps/server/src/provider/Layers/ProviderSessionReaper.ts b/apps/server/src/provider/Layers/ProviderSessionReaper.ts
index 9991ca6a9d95..c3c0d627f3bb 100644
--- a/apps/server/src/provider/Layers/ProviderSessionReaper.ts
+++ b/apps/server/src/provider/Layers/ProviderSessionReaper.ts
@@ -55,15 +55,13 @@ const makeProviderSessionReaper = (options?: ProviderSessionReaperLiveOptions) =
     );
 
     const sweep = Effect.gen(function* () {
-      const bindings = yield* directory.listBindings();
+      // Stopped rows stay for their resume cursors and far outnumber live
+      // ones, so the query skips them.
+      const bindings = yield* directory.listBindings({ excludeStopped: true });
       const now = yield* Clock.currentTimeMillis;
       let reapedCount = 0;
 
       for (const binding of bindings) {
-        if (binding.status === "stopped") {
-          continue;
-        }
-
         const lastSeenMs = Date.parse(binding.lastSeenAt);
         if (Number.isNaN(lastSeenMs)) {
           yield* Effect.logWarning("provider.session.reaper.invalid-last-seen", {
@@ -147,7 +145,7 @@ const makeProviderSessionReaper = (options?: ProviderSessionReaperLiveOptions) =
       if (reapedCount > 0) {
         yield* Effect.logInfo("provider.session.reaper.sweep-complete", {
           reapedCount,
-          totalBindings: bindings.length,
+          liveBindings: bindings.length,
         });
       }
     });
diff --git a/apps/server/src/provider/Layers/claudeResetCredits.test.ts b/apps/server/src/provider/Layers/claudeResetCredits.test.ts
new file mode 100644
index 000000000000..17f9a03c48bd
--- /dev/null
+++ b/apps/server/src/provider/Layers/claudeResetCredits.test.ts
@@ -0,0 +1,259 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { it as effectIt } from "@effect/vitest";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Fiber from "effect/Fiber";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as TestClock from "effect/testing/TestClock";
+import { HttpClient, HttpClientResponse, UrlParams } from "effect/unstable/http";
+import { describe, expect, it } from "vite-plus/test";
+
+import * as ClaudeResetCredits from "./claudeResetCredits.ts";
+
+const NOW = Date.parse("2026-09-22T12:00:00.000Z");
+const grant = (overrides: Record<string, unknown>) => ({
+  id: "grant_a",
+  resets_left: 1,
+  usable_now: true,
+  ...overrides,
+});
+
+const writeLogin = Effect.gen(function* () {
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const directory = yield* fs.makeTempDirectoryScoped();
+  yield* fs.writeFileString(
+    path.join(directory, ".credentials.json"),
+    '{"claudeAiOauth":{"accessToken":"oauth-token"}}',
+  );
+  const accountConfigPath = path.join(directory, ".claude.json");
+  yield* fs.writeFileString(accountConfigPath, '{"oauthAccount":{"organizationUuid":"org-1"}}');
+  return { configDir: directory, accountConfigPath };
+});
+
+const respond = (status: number, body: unknown) =>
+  HttpClient.make((request) =>
+    Effect.succeed(HttpClientResponse.fromWeb(request, Response.json(body, { status }))),
+  );
+const refuseRequests = HttpClient.make(() => Effect.die("must not send a request"));
+
+describe("claudeResetCreditsToContract", () => {
+  it("counts live grants and pins the next usable one", () => {
+    expect(
+      ClaudeResetCredits.claudeResetCreditsToContract(
+        {
+          eligible: true,
+          next_grant_id: "grant_a",
+          grants: [
+            grant({ resets_left: 2, ends_at: "2026-10-01T00:00:00Z" }),
+            grant({ id: "paused", paused: true }),
+            grant({ id: "expired", ends_at: "2026-09-01T00:00:00Z" }),
+            grant({ id: "garbled", ends_at: "not a date" }),
+            grant({ id: "date_only", ends_at: "2026-10-01" }),
+            grant({ id: "impossible", ends_at: "2027-02-30T00:00:00Z" }),
+            grant({ id: "empty", ends_at: "" }),
+            grant({ id: "Not Valid" }),
+            grant({ id: "grant_b", resets_left: 3, usable_now: false }),
+          ],
+        },
+        NOW,
+      ),
+    ).toEqual({
+      availableCount: 2,
+      nextCreditId: "grant_a",
+      nextExpiresAt: "2026-10-01T00:00:00.000Z",
+    });
+  });
+
+  it("offers nothing to redeem without a usable next grant or an eligible account", () => {
+    expect(
+      ClaudeResetCredits.claudeResetCreditsToContract(
+        { eligible: true, next_grant_id: "grant_a", grants: [grant({ usable_now: false })] },
+        NOW,
+      ),
+    ).toEqual({ availableCount: 0 });
+    expect(
+      ClaudeResetCredits.claudeResetCreditsToContract({ eligible: true, grants: [grant({})] }, NOW),
+    ).toEqual({
+      availableCount: 0,
+    });
+    expect(
+      ClaudeResetCredits.claudeResetCreditsToContract(
+        { eligible: false, grants: [grant({})] },
+        NOW,
+      ),
+    ).toBeUndefined();
+    expect(ClaudeResetCredits.claudeResetCreditsToContract(undefined, NOW)).toBeUndefined();
+  });
+});
+
+effectIt.layer(NodeServices.layer)("readClaudeResetCredits", (it) => {
+  it.effect("reads the grants with the CLI's request", () =>
+    Effect.gen(function* () {
+      const { configDir } = yield* writeLogin;
+      const client = HttpClient.make((request) => {
+        expect(request.method).toBe("GET");
+        expect(request.url).toBe("https://api.anthropic.com/api/oauth/usage");
+        expect(UrlParams.toString(request.urlParams)).toBe("cedar_ember=1&skip_spend=1");
+        expect(request.headers.authorization).toBe("Bearer oauth-token");
+        expect(request.headers["anthropic-beta"]).toBe("oauth-2025-04-20");
+        expect(request.headers["user-agent"]).toBe("claude-cli/2.1.0 (external, cli)");
+        return Effect.succeed(
+          HttpClientResponse.fromWeb(
+            request,
+            Response.json({
+              cedar_ember: { eligible: true, next_grant_id: "grant_a", grants: [grant({})] },
+            }),
+          ),
+        );
+      });
+      const credits = yield* ClaudeResetCredits.readClaudeResetCredits(configDir, "2.1.0").pipe(
+        Effect.provideService(HostProcessPlatform, "linux"),
+        Effect.provideService(HttpClient.HttpClient, client),
+      );
+      expect(credits).toEqual({ availableCount: 1, nextCreditId: "grant_a" });
+    }),
+  );
+
+  it.effect("reads nothing from keychain logins or failed requests", () =>
+    Effect.gen(function* () {
+      const { configDir } = yield* writeLogin;
+      const darwin = yield* ClaudeResetCredits.readClaudeResetCredits(configDir, "2.1.0").pipe(
+        Effect.provideService(HostProcessPlatform, "darwin"),
+        Effect.provideService(HttpClient.HttpClient, refuseRequests),
+      );
+      const limited = yield* ClaudeResetCredits.readClaudeResetCredits(configDir, "2.1.0").pipe(
+        Effect.provideService(HostProcessPlatform, "linux"),
+        Effect.provideService(HttpClient.HttpClient, respond(429, {})),
+      );
+      expect([darwin, limited]).toEqual([undefined, undefined]);
+    }),
+  );
+});
+
+const ClaimBody = Schema.fromJsonString(
+  Schema.Struct({ program: Schema.String, grant_id: Schema.String, request_id: Schema.String }),
+);
+const decodeClaimBody = Schema.decodeEffect(ClaimBody);
+
+const consume = (client: HttpClient.HttpClient, ids = { grantId: "grant_a", requestId: "r-1" }) =>
+  Effect.gen(function* () {
+    const login = yield* writeLogin;
+    return yield* ClaudeResetCredits.consumeClaudeResetCredit({
+      ...login,
+      version: "2.1.0",
+      ...ids,
+    }).pipe(
+      Effect.provideService(HostProcessPlatform, "linux"),
+      Effect.provideService(HttpClient.HttpClient, client),
+      Effect.result,
+    );
+  });
+
+effectIt.layer(NodeServices.layer)("consumeClaudeResetCredit", (it) => {
+  it.effect("claims the grant for the organization", () =>
+    Effect.gen(function* () {
+      const client = HttpClient.make((request) =>
+        Effect.gen(function* () {
+          expect(request.method).toBe("POST");
+          expect(request.url).toBe(
+            "https://api.anthropic.com/api/organizations/org-1/reset_rate_limits",
+          );
+          expect(request.headers.authorization).toBe("Bearer oauth-token");
+          const body =
+            request.body._tag === "Uint8Array" ? new TextDecoder().decode(request.body.body) : "";
+          expect(yield* decodeClaimBody(body)).toEqual({
+            program: "cedar_ember",
+            grant_id: "grant_a",
+            request_id: "r-1",
+          });
+          return HttpClientResponse.fromWeb(request, Response.json({ result: "reset" }));
+        }).pipe(Effect.orDie),
+      );
+      expect(yield* consume(client)).toMatchObject({ _tag: "Success", success: "reset" });
+    }),
+  );
+
+  it.effect("maps each answer to an outcome or a failure", () =>
+    Effect.gen(function* () {
+      for (const [result, outcome] of [
+        ["not_limited", "nothingToReset"],
+        ["already_used", "alreadyRedeemed"],
+        ["ineligible", "noCredit"],
+      ] as const) {
+        expect(yield* consume(respond(200, { result }))).toMatchObject({ success: outcome });
+      }
+      for (const client of [
+        respond(200, { result: "cooldown" }),
+        respond(429, {}),
+        respond(401, {}),
+      ]) {
+        const result = yield* consume(client);
+        expect(result).toMatchObject({ _tag: "Failure" });
+        // Claude answered, so a retry must be a new claim.
+        if (result._tag === "Failure") {
+          expect(ClaudeResetCredits.isSettledClaudeResetCreditFailure(result.failure)).toBe(true);
+        }
+      }
+      // No answer, or Claude could not confirm the claim: a retry is the same claim.
+      for (const client of [respond(500, {}), respond(200, { result: "unavailable" })]) {
+        const unanswered = yield* consume(client);
+        expect(unanswered).toMatchObject({ _tag: "Failure" });
+        if (unanswered._tag === "Failure") {
+          expect(ClaudeResetCredits.isSettledClaudeResetCreditFailure(unanswered.failure)).toBe(
+            false,
+          );
+        }
+      }
+    }),
+  );
+
+  it.effect("times out a stalled claim body", () =>
+    Effect.gen(function* () {
+      const login = yield* writeLogin;
+      const readingBody = yield* Deferred.make<void>();
+      const client = HttpClient.make((request) => {
+        const response = HttpClientResponse.fromWeb(request, Response.json({ result: "reset" }));
+        Object.defineProperty(response, "json", {
+          value: Deferred.succeed(readingBody, undefined).pipe(Effect.andThen(Effect.never)),
+        });
+        return Effect.succeed(response);
+      });
+      const claim = yield* ClaudeResetCredits.consumeClaudeResetCredit({
+        ...login,
+        version: "2.1.0",
+        grantId: "grant_a",
+        requestId: "r-1",
+      }).pipe(
+        Effect.provideService(HostProcessPlatform, "linux"),
+        Effect.provideService(HttpClient.HttpClient, client),
+        Effect.result,
+        Effect.forkChild,
+      );
+      yield* Deferred.await(readingBody);
+      yield* TestClock.adjust("26 seconds");
+      expect(yield* Fiber.join(claim)).toMatchObject({
+        _tag: "Failure",
+        failure: {
+          _tag: "ClaudeResetCreditError",
+          reason: "requestFailed",
+          cause: { _tag: "TimeoutError" },
+        },
+      });
+    }).pipe(Effect.provide(TestClock.layer())),
+  );
+
+  it.effect("refuses malformed ids without sending anything", () =>
+    Effect.gen(function* () {
+      for (const ids of [
+        { grantId: "Bad Grant", requestId: "r-1" },
+        { grantId: "grant_a", requestId: "has space" },
+      ]) {
+        expect(yield* consume(refuseRequests, ids)).toMatchObject({ _tag: "Failure" });
+      }
+    }),
+  );
+});
diff --git a/apps/server/src/provider/Layers/claudeResetCredits.ts b/apps/server/src/provider/Layers/claudeResetCredits.ts
new file mode 100644
index 000000000000..f02c17214c83
--- /dev/null
+++ b/apps/server/src/provider/Layers/claudeResetCredits.ts
@@ -0,0 +1,270 @@
+/**
+ * Claude banked resets (the CLI's `cedar_ember` program). The CLI reads the
+ * grants from the OAuth usage endpoint and claims one against the
+ * organization; this module does the same with the credentials the CLI keeps
+ * in its config directory. macOS keeps them in the keychain, so there the
+ * feature is not offered.
+ *
+ * @module provider/Layers/claudeResetCredits
+ */
+import * as NodeOS from "node:os";
+import type {
+  ProviderConsumeResetCreditOutcome,
+  ServerProviderResetCredits,
+} from "@t3tools/contracts";
+import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http";
+
+const API_BASE = "https://api.anthropic.com";
+const PROGRAM = "cedar_ember";
+const GRANT_ID = /^[a-z0-9_-]{1,40}$/;
+const REQUEST_ID = /^[A-Za-z0-9_-]{1,64}$/;
+const COMPLETE_TIMESTAMP = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:Z|[+-]\d{2}:\d{2})$/;
+
+const Credentials = Schema.Struct({
+  claudeAiOauth: Schema.optional(Schema.Struct({ accessToken: Schema.optional(Schema.String) })),
+});
+const Config = Schema.Struct({
+  oauthAccount: Schema.optional(
+    Schema.Struct({ organizationUuid: Schema.optional(Schema.String) }),
+  ),
+});
+const Grant = Schema.Struct({
+  id: Schema.String.check(Schema.isPattern(GRANT_ID)),
+  resets_left: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0)),
+  ends_at: Schema.optional(Schema.NullOr(Schema.String)),
+  paused: Schema.optional(Schema.Boolean),
+  usable_now: Schema.optional(Schema.Boolean),
+});
+const decodeGrant = Schema.decodeUnknownOption(Grant);
+const CedarEmber = Schema.Struct({
+  eligible: Schema.Boolean,
+  grants: Schema.optional(Schema.Array(Schema.Unknown)),
+  next_grant_id: Schema.optional(Schema.NullOr(Schema.String)),
+});
+const UsageResponse = Schema.Struct({
+  cedar_ember: Schema.optional(Schema.NullOr(Schema.Unknown)),
+});
+const decodeCedarEmber = Schema.decodeUnknownOption(CedarEmber);
+const ClaimResponse = Schema.Struct({
+  result: Schema.Literals([
+    "reset",
+    "already_used",
+    "not_limited",
+    "cooldown",
+    "ineligible",
+    "unavailable",
+  ]),
+});
+
+const RESET_CREDIT_FAILURES = {
+  malformedCredit: "Claude returned a malformed reset credit.",
+  loginUnreadable: "Claude could not read its login.",
+  accountUnreadable: "Claude could not read its account.",
+  signedOut: "Sign in to Claude again to redeem resets.",
+  rateLimited: "Claude is rate limiting resets. Try again soon.",
+  coolingDown: "Claude resets are cooling down. Try again later.",
+  unconfirmed:
+    "Claude could not confirm the reset. If you are still limited in a moment, try again.",
+  requestFailed: "Claude could not redeem the reset.",
+} as const;
+
+class ClaudeResetCreditError extends Schema.TaggedError<ClaudeResetCreditError>()(
+  "ClaudeResetCreditError",
+  {
+    reason: Schema.Literals(
+      Object.keys(RESET_CREDIT_FAILURES) as Array<keyof typeof RESET_CREDIT_FAILURES>,
+    ),
+    cause: Schema.optional(Schema.Defect()),
+  },
+) {
+  override get message(): string {
+    return RESET_CREDIT_FAILURES[this.reason];
+  }
+}
+
+const isClaudeResetCreditError = Schema.is(ClaudeResetCreditError);
+
+/**
+ * Every reset failure except `requestFailed` and `unconfirmed` is final:
+ * Claude answered, or nothing was sent. An unanswered or unconfirmed claim
+ * retries with the same request id.
+ */
+export const isSettledClaudeResetCreditFailure = (error: unknown) =>
+  isClaudeResetCreditError(error) &&
+  error.reason !== "requestFailed" &&
+  error.reason !== "unconfirmed";
+
+/** Rejects unparseable and calendar-invalid timestamps such as February 30. */
+const isFutureTimestamp = (value: string, nowMs: number) => {
+  if (!COMPLETE_TIMESTAMP.test(value)) return false;
+  const [year, month, day] = value.slice(0, 10).split("-").map(Number);
+  return (
+    Date.parse(value) > nowMs && Date.UTC(year!, month! - 1, day!) <= Date.UTC(year!, month!, 0)
+  );
+};
+
+/** Grants that are paused or past `ends_at` cannot be claimed and do not count. */
+export function claudeResetCreditsToContract(
+  block: unknown,
+  nowMs: number,
+): ServerProviderResetCredits | undefined {
+  const parsed = decodeCedarEmber(block);
+  if (Option.isNone(parsed) || !parsed.value.eligible) return undefined;
+  const live = (parsed.value.grants ?? [])
+    .flatMap((raw) => Option.toArray(decodeGrant(raw)))
+    .filter(
+      (grant) =>
+        !grant.paused &&
+        grant.usable_now &&
+        (grant.ends_at == null || isFutureTimestamp(grant.ends_at, nowMs)),
+    );
+  const next = live.find((grant) => grant.id === parsed.value.next_grant_id);
+  const nextExpiresAt = next?.ends_at ? DateTime.make(next.ends_at) : Option.none();
+  return {
+    availableCount: next ? live.reduce((sum, grant) => sum + grant.resets_left, 0) : 0,
+    ...(Option.isSome(nextExpiresAt)
+      ? { nextExpiresAt: DateTime.formatIso(nextExpiresAt.value) }
+      : {}),
+    ...(next ? { nextCreditId: next.id } : {}),
+  };
+}
+
+const readJson = <S extends Schema.Top>(schema: S, file: string) =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    return yield* fs.readFileString(file).pipe(
+      Effect.catchTags({
+        PlatformError: (error) =>
+          error.reason._tag === "NotFound" ? Effect.succeed("{}") : Effect.fail(error),
+      }),
+      Effect.flatMap(Schema.decodeEffect(Schema.fromJsonString(schema))),
+    );
+  });
+
+const readAccessToken = (configDir: string) =>
+  Effect.gen(function* () {
+    if ((yield* HostProcessPlatform) === "darwin") return undefined;
+    const path = yield* Path.Path;
+    const credentials = yield* readJson(Credentials, path.join(configDir, ".credentials.json"));
+    return credentials.claudeAiOauth?.accessToken?.trim() || undefined;
+  });
+
+const withClaudeHeaders = (token: string, version: string) =>
+  HttpClientRequest.setHeaders({
+    authorization: `Bearer ${token}`,
+    "anthropic-beta": "oauth-2025-04-20",
+    "user-agent": `claude-cli/${version} (external, cli)`,
+  });
+
+/**
+ * Reads the banked resets for the login in `configDir`. Any failure reads as
+ * "no resets" so the usage bars never break on this optional extra.
+ */
+export const readClaudeResetCredits = Effect.fn("readClaudeResetCredits")(
+  function* (configDir: string, version: string) {
+    const token = yield* readAccessToken(configDir);
+    if (!token) return undefined;
+    const client = yield* HttpClient.HttpClient;
+    const response = yield* client.execute(
+      HttpClientRequest.get(`${API_BASE}/api/oauth/usage`, {
+        urlParams: { cedar_ember: "1", skip_spend: "1" },
+      }).pipe(withClaudeHeaders(token, version)),
+    );
+    const body = yield* HttpClientResponse.schemaBodyJson(UsageResponse)(
+      yield* HttpClientResponse.filterStatusOk(response),
+    );
+    return claudeResetCreditsToContract(
+      body.cedar_ember,
+      DateTime.toEpochMillis(yield* DateTime.now),
+    );
+  },
+  Effect.timeout("10 seconds"),
+  Effect.orElseSucceed(() => undefined),
+);
+
+/** The CLI keeps the account record beside its settings, or in the home directory by default. */
+export const claudeAccountConfigPath = (configDir: string | undefined) =>
+  Effect.map(Path.Path, (path) =>
+    configDir ? path.join(configDir, ".claude.json") : path.join(NodeOS.homedir(), ".claude.json"),
+  );
+
+const CLAIM_OUTCOMES = {
+  reset: "reset",
+  not_limited: "nothingToReset",
+  already_used: "alreadyRedeemed",
+  ineligible: "noCredit",
+} as const satisfies Record<string, ProviderConsumeResetCreditOutcome>;
+
+/**
+ * Claims `grantId`. `requestId` is the idempotency key: a retry with the same
+ * id is the same claim. Ids are checked before anything is sent.
+ */
+export const consumeClaudeResetCredit = Effect.fn("consumeClaudeResetCredit")(function* (input: {
+  readonly configDir: string;
+  readonly accountConfigPath: string;
+  readonly version: string;
+  readonly grantId: string;
+  readonly requestId: string;
+}) {
+  if (!GRANT_ID.test(input.grantId) || !REQUEST_ID.test(input.requestId)) {
+    return yield* new ClaudeResetCreditError({ reason: "malformedCredit" });
+  }
+  const token = yield* readAccessToken(input.configDir).pipe(
+    Effect.mapError((cause) => new ClaudeResetCreditError({ reason: "loginUnreadable", cause })),
+  );
+  const config = yield* readJson(Config, input.accountConfigPath).pipe(
+    Effect.mapError((cause) => new ClaudeResetCreditError({ reason: "accountUnreadable", cause })),
+  );
+  const organization = config.oauthAccount?.organizationUuid?.trim();
+  if (!token || !organization) {
+    return yield* new ClaudeResetCreditError({ reason: "signedOut" });
+  }
+  const client = yield* HttpClient.HttpClient;
+  const response = yield* client
+    .execute(
+      HttpClientRequest.post(
+        new URL(
+          `/api/organizations/${encodeURIComponent(organization)}/reset_rate_limits`,
+          API_BASE,
+        ),
+      ).pipe(
+        withClaudeHeaders(token, input.version),
+        HttpClientRequest.bodyJsonUnsafe({
+          program: PROGRAM,
+          grant_id: input.grantId,
+          request_id: input.requestId,
+        }),
+      ),
+    )
+    .pipe(
+      Effect.timeout("25 seconds"),
+      Effect.mapError((cause) => new ClaudeResetCreditError({ reason: "requestFailed", cause })),
+    );
+  if (response.status === 429) {
+    return yield* new ClaudeResetCreditError({ reason: "rateLimited" });
+  }
+  if (response.status === 401 || response.status === 403) {
+    return yield* new ClaudeResetCreditError({ reason: "signedOut" });
+  }
+  const body = yield* HttpClientResponse.filterStatusOk(response).pipe(
+    Effect.flatMap(HttpClientResponse.schemaBodyJson(ClaimResponse)),
+    Effect.timeout("25 seconds"),
+    Effect.mapError((cause) => new ClaudeResetCreditError({ reason: "requestFailed", cause })),
+  );
+  if (body.result === "cooldown") {
+    return yield* new ClaudeResetCreditError({ reason: "coolingDown" });
+  }
+  // Claude could not say whether the claim landed, so, like the CLI, keep the
+  // request id and let the retry ask about the same claim.
+  if (body.result === "unavailable") {
+    return yield* new ClaudeResetCreditError({ reason: "unconfirmed" });
+  }
+  return CLAIM_OUTCOMES[body.result];
+});
diff --git a/apps/server/src/provider/Layers/cursorUsageLimits.ts b/apps/server/src/provider/Layers/cursorUsageLimits.ts
index 685378b9d79e..e0611e0c50ab 100644
--- a/apps/server/src/provider/Layers/cursorUsageLimits.ts
+++ b/apps/server/src/provider/Layers/cursorUsageLimits.ts
@@ -1,6 +1,7 @@
 import * as NodeOS from "node:os";
 import type { CursorSettings, ServerProviderUsageWindow } from "@t3tools/contracts";
 import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
+import { CURSOR_USAGE_WINDOWS } from "@t3tools/shared/usageLimits";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
@@ -13,8 +14,10 @@ import {
   makeUnavailableUsageLimits,
   makeUsageLimits,
 } from "../providerUsageLimits.ts";
+import { readMacCursorAccessToken } from "../cursorCredentialStore.ts";
 
 const CursorCredentials = Schema.Struct({ accessToken: Schema.optional(Schema.String) });
+const DEFAULT_CURSOR_API_ENDPOINT = "https://api2.cursor.sh";
 const decodeCredentials = Schema.decodeEffect(Schema.fromJsonString(CursorCredentials));
 const CursorUsageResponse = Schema.Struct({
   billingCycleEnd: Schema.optional(Schema.Union([Schema.String, Schema.Number])),
@@ -39,15 +42,11 @@ export function cursorUsageResponseToLimits(
       : undefined;
   const windows: ServerProviderUsageWindow[] = [];
   if (response.planUsage) {
-    for (const [key, label] of [
-      ["totalPercentUsed", "Monthly"],
-      ["autoPercentUsed", "Monthly · Auto"],
-      ["apiPercentUsed", "Monthly · API"],
-    ] as const) {
-      const usedPercent = response.planUsage[key];
+    for (const { id, label } of CURSOR_USAGE_WINDOWS) {
+      const usedPercent = response.planUsage[id];
       if (usedPercent === undefined || !Number.isFinite(usedPercent)) continue;
       windows.push({
-        id: key,
+        id,
         kind: "monthly",
         label,
         usedPercent: clampPercent(usedPercent),
@@ -63,30 +62,49 @@ export function cursorUsageResponseToLimits(
 export const readCursorUsageLimits = Effect.fn("readCursorUsageLimits")(function* (
   settings: Pick<CursorSettings, "apiEndpoint">,
   environment: NodeJS.ProcessEnv = process.env,
+  allowKeychain = false,
+  keychainToken: () => Promise<string | null> = readMacCursorAccessToken,
 ) {
   const checkedAt = DateTime.formatIso(yield* DateTime.now);
   return yield* Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const platform = yield* HostProcessPlatform;
+    const endpoint = (
+      settings.apiEndpoint.trim() ||
+      environment.CURSOR_API_ENDPOINT?.trim() ||
+      DEFAULT_CURSOR_API_ENDPOINT
+    ).replace(/\/$/, "");
     let token = environment.CURSOR_AUTH_TOKEN?.trim();
     // An explicit API key can name a different account from the stored login.
     if (!token && environment.CURSOR_API_KEY?.trim()) {
       return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" });
     }
     const credentialStore = environment.AGENT_CLI_CREDENTIAL_STORE;
-    if (
-      !token &&
-      (credentialStore === "memory" || (platform === "darwin" && credentialStore !== "file"))
-    ) {
-      // Cursor's default macOS login lives in the keychain; a leftover file may be another account.
+    if (!token && credentialStore === "memory") {
       return makeUnavailableUsageLimits({
         checkedAt,
         reason: "unsupported",
-        message: "Cursor usage requires a file-based login or CURSOR_AUTH_TOKEN.",
+        message: "Cursor usage requires a CLI login or CURSOR_AUTH_TOKEN.",
       });
     }
-    if (!token) {
+    if (!token && platform === "darwin" && credentialStore !== "file") {
+      if (!allowKeychain) {
+        return makeUnavailableUsageLimits({
+          checkedAt,
+          reason: "unsupported",
+          message: "Enable Cursor account usage in T3 Code to read its Keychain login.",
+        });
+      }
+      if (endpoint !== DEFAULT_CURSOR_API_ENDPOINT) {
+        return makeUnavailableUsageLimits({
+          checkedAt,
+          reason: "unsupported",
+          message: "Cursor account usage requires the default Cursor endpoint when using Keychain.",
+        });
+      }
+      token = (yield* Effect.tryPromise(keychainToken))?.trim();
+    } else if (!token) {
       const home =
         (platform === "win32" ? environment.USERPROFILE : environment.HOME) || NodeOS.homedir();
       const directory =
@@ -106,11 +124,6 @@ export const readCursorUsageLimits = Effect.fn("readCursorUsageLimits")(function
     }
     if (!token) return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" });
     const client = yield* HttpClient.HttpClient;
-    const endpoint = (
-      settings.apiEndpoint.trim() ||
-      environment.CURSOR_API_ENDPOINT?.trim() ||
-      "https://api2.cursor.sh"
-    ).replace(/\/$/, "");
     const response = yield* client.execute(
       HttpClientRequest.post(`${endpoint}/aiserver.v1.DashboardService/GetCurrentPeriodUsage`).pipe(
         HttpClientRequest.bearerToken(token),
@@ -127,14 +140,12 @@ export const readCursorUsageLimits = Effect.fn("readCursorUsageLimits")(function
     return cursorUsageResponseToLimits(body, checkedAt);
   }).pipe(
     Effect.timeout("10 seconds"),
-    Effect.catch(() =>
-      Effect.succeed(
-        makeUnavailableUsageLimits({
-          checkedAt,
-          reason: "probeFailed",
-          message: "Cursor could not read usage limits.",
-        }),
-      ),
+    Effect.orElseSucceed(() =>
+      makeUnavailableUsageLimits({
+        checkedAt,
+        reason: "probeFailed",
+        message: "Cursor could not read usage limits.",
+      }),
     ),
   );
 });
diff --git a/apps/server/src/provider/Layers/grokUsageLimits.ts b/apps/server/src/provider/Layers/grokUsageLimits.ts
index 8c3db6bea80b..7dc561d07ec0 100644
--- a/apps/server/src/provider/Layers/grokUsageLimits.ts
+++ b/apps/server/src/provider/Layers/grokUsageLimits.ts
@@ -18,6 +18,7 @@ const GrokCredentials = Schema.Record(
   Schema.Struct({
     key: Schema.optional(Schema.String),
     auth_mode: Schema.optional(Schema.String),
+    email: Schema.optional(Schema.String),
   }),
 );
 const decodeCredentials = Schema.decodeEffect(Schema.fromJsonString(GrokCredentials));
@@ -41,7 +42,15 @@ export function grokUsageResponseToLimits(
 ) {
   const usedPercent = response.config?.creditUsagePercent;
   if (usedPercent === undefined || !Number.isFinite(usedPercent)) {
-    return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" });
+    // A billing read that succeeded but carries no percentage is an account
+    // with nothing metered yet, not one that can never report: xAI omits the
+    // field entirely (rather than sending 0) until usage registers, then fills
+    // it in. Calling that `unsupported` would strand the account — the Limits
+    // view drops unsupported entries and deliberately mutes their notice, so a
+    // freshly signed-in Grok account would vanish with no explanation until it
+    // happened to be used, and `applyUsageLimitsUpdate` would refuse the
+    // mid-turn windows that could have recovered it.
+    return makeUsageLimits({ checkedAt, windows: [] });
   }
   const period = response.config?.currentPeriod;
   const periodType = period?.type?.replace(/^USAGE_PERIOD_TYPE_/, "");
@@ -57,72 +66,97 @@ export function grokUsageResponseToLimits(
   return makeUsageLimits({ checkedAt, windows: [window] });
 }
 
-export const readGrokUsageLimits = Effect.fn("readGrokUsageLimits")(function* (
+/**
+ * The grok.com login the CLI uses by default, or undefined when the CLI is
+ * configured to pick another account, endpoint, or an API key.
+ */
+const readGrokCredential = Effect.fn("readGrokCredential")(function* (
+  environment: NodeJS.ProcessEnv,
+) {
+  // T3's ACP adapter explicitly selects API-key auth when this variable is set.
+  if (environment.XAI_API_KEY?.trim()) return undefined;
+  // Alternate auth deployments can select another scope or account from the same file.
+  if (
+    [
+      "GROK_OIDC_ISSUER",
+      "GROK_OIDC_CLIENT_ID",
+      "GROK_OAUTH2_ISSUER",
+      "GROK_OAUTH2_CLIENT_ID",
+      "GROK_OAUTH2_PRINCIPAL_TYPE",
+      "GROK_OAUTH2_PRINCIPAL_ID",
+      "GROK_AUTH_PROVIDER_COMMAND",
+      "GROK_LOCAL_AUTH",
+      "GROK_CLI_CHAT_PROXY_BASE_URL",
+      "GROK_MODELS_BASE_URL",
+      "GROK_CONFIG",
+      "GROK_CONFIG_PATH",
+    ].some((name) => environment[name]?.trim())
+  ) {
+    return undefined;
+  }
+  const fs = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const home =
+    environment.GROK_HOME?.trim() ||
+    path.join(environment.HOME || environment.USERPROFILE || NodeOS.homedir(), ".grok");
+  for (const configPath of [
+    path.join(home, "config.toml"),
+    path.join(home, "managed_config.toml"),
+    path.join(home, "requirements.toml"),
+    "/etc/grok/managed_config.toml",
+    "/etc/grok/requirements.toml",
+  ]) {
+    const config = yield* fs.readFileString(configPath).pipe(
+      Effect.catchTags({
+        PlatformError: (error) =>
+          error.reason._tag === "NotFound" ? Effect.succeed("") : Effect.fail(error),
+      }),
+    );
+    // These sections can change the selected account or endpoint. Leave custom deployments to the CLI.
+    if (/^\s*(?:\[\[?\s*)?["']?(?:auth|grok_com_config|endpoints)["']?\s*[.\]=]/m.test(config)) {
+      return undefined;
+    }
+  }
+  const contents =
+    environment.GROK_AUTH?.trim() ||
+    (yield* fs.readFileString(path.join(home, "auth.json")).pipe(
+      Effect.catchTags({
+        PlatformError: (error) =>
+          error.reason._tag === "NotFound" ? Effect.succeed("{}") : Effect.fail(error),
+      }),
+    ));
+  const credentials = yield* decodeCredentials(contents);
+  // Never pick an arbitrary account from other deployments stored in the same file.
+  const credential =
+    credentials["https://auth.x.ai::b1a00492-073a-47ea-816f-4c329264a828"] ??
+    credentials["https://accounts.x.ai/sign-in"];
+  return credential?.auth_mode === "api_key" ? undefined : credential;
+});
+
+/**
+ * Reads the default grok.com login once and reports its usage limits along with
+ * its email, so the email always names the account whose quota was read.
+ */
+export const readGrokAccount = Effect.fn("readGrokAccount")(function* (
   environment: NodeJS.ProcessEnv = process.env,
 ) {
   const checkedAt = DateTime.formatIso(yield* DateTime.now);
-  return yield* Effect.gen(function* () {
-    // T3's ACP adapter explicitly selects API-key auth when this variable is set.
-    if (environment.XAI_API_KEY?.trim()) {
-      return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" });
-    }
-    // Alternate auth deployments can select another scope or account from the same file.
-    if (
-      [
-        "GROK_OIDC_ISSUER",
-        "GROK_OIDC_CLIENT_ID",
-        "GROK_OAUTH2_ISSUER",
-        "GROK_OAUTH2_CLIENT_ID",
-        "GROK_OAUTH2_PRINCIPAL_TYPE",
-        "GROK_OAUTH2_PRINCIPAL_ID",
-        "GROK_AUTH_PROVIDER_COMMAND",
-        "GROK_LOCAL_AUTH",
-        "GROK_CLI_CHAT_PROXY_BASE_URL",
-        "GROK_MODELS_BASE_URL",
-        "GROK_CONFIG",
-        "GROK_CONFIG_PATH",
-      ].some((name) => environment[name]?.trim())
-    ) {
-      return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" });
-    }
-    const fs = yield* FileSystem.FileSystem;
-    const path = yield* Path.Path;
-    const home =
-      environment.GROK_HOME?.trim() ||
-      path.join(environment.HOME || environment.USERPROFILE || NodeOS.homedir(), ".grok");
-    for (const configPath of [
-      path.join(home, "config.toml"),
-      path.join(home, "managed_config.toml"),
-      path.join(home, "requirements.toml"),
-      "/etc/grok/managed_config.toml",
-      "/etc/grok/requirements.toml",
-    ]) {
-      const config = yield* fs.readFileString(configPath).pipe(
-        Effect.catchTags({
-          PlatformError: (error) =>
-            error.reason._tag === "NotFound" ? Effect.succeed("") : Effect.fail(error),
-        }),
-      );
-      // These sections can change the selected account or endpoint. Leave custom deployments to the CLI.
-      if (/^\s*(?:\[\[?\s*)?["']?(?:auth|grok_com_config|endpoints)["']?\s*[.\]=]/m.test(config)) {
-        return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" });
-      }
-    }
-    const contents =
-      environment.GROK_AUTH?.trim() ||
-      (yield* fs.readFileString(path.join(home, "auth.json")).pipe(
-        Effect.catchTags({
-          PlatformError: (error) =>
-            error.reason._tag === "NotFound" ? Effect.succeed("{}") : Effect.fail(error),
-        }),
-      ));
-    const credentials = yield* decodeCredentials(contents);
-    // Never pick an arbitrary account from other deployments stored in the same file.
-    const credential =
-      credentials["https://auth.x.ai::b1a00492-073a-47ea-816f-4c329264a828"] ??
-      credentials["https://accounts.x.ai/sign-in"];
-    const token = credential?.auth_mode === "api_key" ? undefined : credential?.key?.trim();
-    if (!token) return makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" });
+  const probeFailed = makeUnavailableUsageLimits({
+    checkedAt,
+    reason: "probeFailed",
+    message: "Grok could not read usage limits.",
+  });
+  const credential = yield* Effect.option(
+    readGrokCredential(environment).pipe(Effect.timeout("10 seconds")),
+  );
+  if (Option.isNone(credential)) return { email: undefined, usageLimits: probeFailed };
+  const email = credential.value?.email?.trim() || undefined;
+  const token = credential.value?.key?.trim();
+  if (!token) {
+    return { email, usageLimits: makeUnavailableUsageLimits({ checkedAt, reason: "unsupported" }) };
+  }
+  // A failed quota request still knows which account it asked about.
+  const usageLimits = yield* Effect.gen(function* () {
     const client = yield* HttpClient.HttpClient;
     const response = yield* client.execute(
       HttpClientRequest.get("https://cli-chat-proxy.grok.com/v1/billing?format=credits").pipe(
@@ -135,14 +169,7 @@ export const readGrokUsageLimits = Effect.fn("readGrokUsageLimits")(function* (
     return grokUsageResponseToLimits(body, checkedAt);
   }).pipe(
     Effect.timeout("10 seconds"),
-    Effect.catch(() =>
-      Effect.succeed(
-        makeUnavailableUsageLimits({
-          checkedAt,
-          reason: "probeFailed",
-          message: "Grok could not read usage limits.",
-        }),
-      ),
-    ),
+    Effect.orElseSucceed(() => probeFailed),
   );
+  return { email, usageLimits };
 });
diff --git a/apps/server/src/provider/Layers/openCodeUsageLimits.ts b/apps/server/src/provider/Layers/openCodeUsageLimits.ts
index 22b542142cc4..74d0bd75b9f8 100644
--- a/apps/server/src/provider/Layers/openCodeUsageLimits.ts
+++ b/apps/server/src/provider/Layers/openCodeUsageLimits.ts
@@ -1,4 +1,5 @@
 import * as NodeOS from "node:os";
+import * as NodeCrypto from "node:crypto";
 
 import type { ServerProviderUsageWindow } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
@@ -95,7 +96,16 @@ export const readOpenCodeGoUsageLimits = Effect.fn("readOpenCodeGoUsageLimits")(
         resetsAt: DateTime.formatIso(body.usage.monthly.resetsAt),
       },
     ];
-    return makeUsageLimits({ checkedAt, windows });
+    return {
+      ...makeUsageLimits({ checkedAt, windows }),
+      // Go's usage response has no account ID. An unkeyed hash matches across
+      // environments without a shared secret. It permits offline guesses, but
+      // Go keys are randomly generated.
+      credentialFingerprint: NodeCrypto.createHash("sha256")
+        .update("opencode-go\0")
+        .update(apiKey)
+        .digest("hex"),
+    };
   }).pipe(
     Effect.timeout("5 seconds"),
     Effect.orElseSucceed(() =>
diff --git a/apps/server/src/provider/Layers/codexResetCredit.test.ts b/apps/server/src/provider/Layers/resetCreditCoordinator.test.ts
similarity index 69%
rename from apps/server/src/provider/Layers/codexResetCredit.test.ts
rename to apps/server/src/provider/Layers/resetCreditCoordinator.test.ts
index f03b29737209..88de498d43dc 100644
--- a/apps/server/src/provider/Layers/codexResetCredit.test.ts
+++ b/apps/server/src/provider/Layers/resetCreditCoordinator.test.ts
@@ -4,12 +4,12 @@ import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Ref from "effect/Ref";
 
-import { CodexResetCreditCoordinator, layerTest } from "./codexResetCredit.ts";
+import * as ResetCreditCoordinator from "./resetCreditCoordinator.ts";
 
-describe("CodexResetCreditCoordinator", () => {
+describe("ResetCreditCoordinator", () => {
   it.effect("re-sends the same idempotency key after a failed attempt, then clears it", () =>
     Effect.gen(function* () {
-      const { redeem } = yield* CodexResetCreditCoordinator;
+      const { redeem } = yield* ResetCreditCoordinator.ResetCreditCoordinator;
       const keys = yield* Ref.make<ReadonlyArray<string>>([]);
       const attempts = yield* Ref.make(0);
       const consume = (key: string) =>
@@ -31,12 +31,31 @@ describe("CodexResetCreditCoordinator", () => {
       assert.strictEqual(seen.length, 3);
       assert.strictEqual(seen[0], seen[1]);
       assert.notStrictEqual(seen[1], seen[2]);
-    }).pipe(Effect.provide(layerTest)),
+    }).pipe(Effect.provide(ResetCreditCoordinator.layerTest)),
+  );
+
+  it.effect("starts a fresh attempt after a settled failure", () =>
+    Effect.gen(function* () {
+      const { redeem } = yield* ResetCreditCoordinator.ResetCreditCoordinator;
+      const keys = yield* Ref.make<ReadonlyArray<string>>([]);
+      const consume = (key: string) =>
+        Ref.update(keys, (seen) => [...seen, key]).pipe(
+          Effect.andThen(Effect.fail("cooldown" as const)),
+        );
+      const isSettled = (error: "cooldown") => error === "cooldown";
+
+      yield* redeem("acct", consume, isSettled).pipe(Effect.result);
+      yield* redeem("acct", consume, isSettled).pipe(Effect.result);
+
+      const seen = yield* Ref.get(keys);
+      assert.strictEqual(seen.length, 2);
+      assert.notStrictEqual(seen[0], seen[1]);
+    }).pipe(Effect.provide(ResetCreditCoordinator.layerTest)),
   );
 
   it.effect("serialises concurrent redemptions on the same account, not per caller", () =>
     Effect.gen(function* () {
-      const { redeem } = yield* CodexResetCreditCoordinator;
+      const { redeem } = yield* ResetCreditCoordinator.ResetCreditCoordinator;
       const release = yield* Deferred.make<void>();
       const inFlight = yield* Ref.make(0);
       const peak = yield* Ref.make(0);
@@ -58,12 +77,12 @@ describe("CodexResetCreditCoordinator", () => {
       yield* Fiber.join(b);
 
       assert.strictEqual(yield* Ref.get(peak), 1);
-    }).pipe(Effect.provide(layerTest)),
+    }).pipe(Effect.provide(ResetCreditCoordinator.layerTest)),
   );
 
   it.effect("keeps different accounts independent", () =>
     Effect.gen(function* () {
-      const { redeem } = yield* CodexResetCreditCoordinator;
+      const { redeem } = yield* ResetCreditCoordinator.ResetCreditCoordinator;
       const release = yield* Deferred.make<void>();
       const peak = yield* Ref.make(0);
       const inFlight = yield* Ref.make(0);
@@ -81,6 +100,6 @@ describe("CodexResetCreditCoordinator", () => {
       yield* Fiber.join(a);
       yield* Fiber.join(b);
       assert.strictEqual(yield* Ref.get(peak), 2);
-    }).pipe(Effect.provide(layerTest)),
+    }).pipe(Effect.provide(ResetCreditCoordinator.layerTest)),
   );
 });
diff --git a/apps/server/src/provider/Layers/codexResetCredit.ts b/apps/server/src/provider/Layers/resetCreditCoordinator.ts
similarity index 70%
rename from apps/server/src/provider/Layers/codexResetCredit.ts
rename to apps/server/src/provider/Layers/resetCreditCoordinator.ts
index 34bd0a77fe27..c481624e7f40 100644
--- a/apps/server/src/provider/Layers/codexResetCredit.ts
+++ b/apps/server/src/provider/Layers/resetCreditCoordinator.ts
@@ -1,49 +1,44 @@
 /**
- * Redeeming a Codex reset credit is an account-level action: instances that
- * share the directory holding `auth.json` share the credit, so their
+ * Redeeming a reset credit is an account-level action: instances that share
+ * the directory holding a provider's login share the credit, so their
  * redemptions must serialise on that directory, not the instance. This
  * service keeps one lock and one pending idempotency key per account key so
  * overlapping confirmations from any instance queue rather than spending two
  * credits, and a retry after a timeout re-sends the same attempt.
  *
- * @module provider/Layers/codexResetCredit
+ * @module provider/Layers/resetCreditCoordinator
  */
 import type { ProviderConsumeResetCreditOutcome } from "@t3tools/contracts";
 import * as Context from "effect/Context";
 import * as Crypto from "effect/Crypto";
-import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import type * as PlatformError from "effect/PlatformError";
 import * as Ref from "effect/Ref";
 import * as Semaphore from "effect/Semaphore";
 
-/**
- * Bounded so a hung app-server cannot hold the account lock forever; the
- * timeout interrupts the scoped request, which kills the process, and the
- * kept idempotency key makes the user's retry safe.
- */
-export const CODEX_RESET_CREDIT_TIMEOUT = Duration.seconds(20);
-
 interface AccountRedemptionState {
   readonly lock: Semaphore.Semaphore;
   readonly pendingKey: Ref.Ref<string | null>;
 }
 
-export class CodexResetCreditCoordinator extends Context.Service<
-  CodexResetCreditCoordinator,
+export class ResetCreditCoordinator extends Context.Service<
+  ResetCreditCoordinator,
   {
     /**
      * Run `consume` under the account's lock with a stable idempotency key.
-     * The key is cleared only when Codex reports an outcome; a failure
-     * (timeout included) keeps it so the next attempt is the same attempt.
+     * The key is cleared when the provider reports an outcome, or when
+     * `isSettled` says a failure was a final answer (such as a cooldown).
+     * Any other failure (timeout included) keeps it so the next attempt is
+     * the same attempt.
      */
     readonly redeem: <E, R>(
       accountKey: string,
       consume: (idempotencyKey: string) => Effect.Effect<ProviderConsumeResetCreditOutcome, E, R>,
+      isSettled?: (error: E) => boolean,
     ) => Effect.Effect<ProviderConsumeResetCreditOutcome, E | PlatformError.PlatformError, R>;
   }
->()("t3/provider/Layers/codexResetCredit/CodexResetCreditCoordinator") {}
+>()("t3/provider/Layers/resetCreditCoordinator") {}
 
 /** @public Service construction is part of the canonical Effect module API. */
 export const make = Effect.gen(function* () {
@@ -52,9 +47,7 @@ export const make = Effect.gen(function* () {
 
   // Get-or-create through one Ref.modify so two first redemptions for the
   // same account cannot each install their own lock.
-  const stateFor = Effect.fn("CodexResetCreditCoordinator.stateFor")(function* (
-    accountKey: string,
-  ) {
+  const stateFor = Effect.fn("ResetCreditCoordinator.stateFor")(function* (accountKey: string) {
     const existing = (yield* Ref.get(statesRef)).get(accountKey);
     if (existing) return existing;
     const candidate = {
@@ -70,7 +63,7 @@ export const make = Effect.gen(function* () {
     });
   });
 
-  const redeem: CodexResetCreditCoordinator["Service"]["redeem"] = (accountKey, consume) =>
+  const redeem: ResetCreditCoordinator["Service"]["redeem"] = (accountKey, consume, isSettled) =>
     Effect.gen(function* () {
       const state = yield* stateFor(accountKey);
       return yield* state.lock.withPermits(1)(
@@ -78,24 +71,28 @@ export const make = Effect.gen(function* () {
           const existing = yield* Ref.get(state.pendingKey);
           const idempotencyKey = existing ?? (yield* crypto.randomUUIDv4);
           yield* Ref.set(state.pendingKey, idempotencyKey);
-          const outcome = yield* consume(idempotencyKey);
+          const outcome = yield* consume(idempotencyKey).pipe(
+            Effect.tapError((error) =>
+              isSettled?.(error) ? Ref.set(state.pendingKey, null) : Effect.void,
+            ),
+          );
           yield* Ref.set(state.pendingKey, null);
           return outcome;
         }),
       );
     });
 
-  return { redeem } satisfies CodexResetCreditCoordinator["Service"];
+  return { redeem } satisfies ResetCreditCoordinator["Service"];
 });
 
-export const layer = Layer.effect(CodexResetCreditCoordinator, make);
+export const layer = Layer.effect(ResetCreditCoordinator, make);
 
 /**
  * Self-contained for tests: a counter-backed Crypto so keys are deterministic
  * and distinct without the platform layer.
  */
 export const layerTest = Layer.effect(
-  CodexResetCreditCoordinator,
+  ResetCreditCoordinator,
   Effect.gen(function* () {
     let counter = 0;
     return yield* make.pipe(
diff --git a/apps/server/src/provider/ModelManifest.test.ts b/apps/server/src/provider/ModelManifest.test.ts
index 0a2ca28feb73..7933f8e2e962 100644
--- a/apps/server/src/provider/ModelManifest.test.ts
+++ b/apps/server/src/provider/ModelManifest.test.ts
@@ -342,6 +342,84 @@ const serviceLayers = (input: {
   );
 
 describe("ModelManifest service", () => {
+  it.live("explicit refresh bypasses fresh memory and disk caches", () => {
+    let fetchCount = 0;
+    const updated: ModelManifestData = {
+      ...REMOTE_MANIFEST,
+      currentModels: { codex: ["gpt-reloaded"] },
+    };
+    return Effect.gen(function* () {
+      const service = yield* make;
+      assert.deepStrictEqual(yield* service.refresh, REMOTE_MANIFEST);
+      assert.deepStrictEqual(yield* service.refresh, REMOTE_MANIFEST);
+      assert.strictEqual(fetchCount, 1);
+
+      const rebooted = yield* make;
+      assert.deepStrictEqual(yield* rebooted.refresh, REMOTE_MANIFEST);
+      assert.strictEqual(fetchCount, 1);
+      assert.deepStrictEqual(yield* rebooted.forceRefresh, updated);
+      assert.strictEqual(fetchCount, 2);
+      assert.deepStrictEqual(yield* rebooted.current, updated);
+      assert.deepStrictEqual(yield* (yield* make).current, updated);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        serviceLayers({
+          prefix: "model-manifest-force-refresh-test",
+          response: () => Response.json(fetchCount++ === 0 ? REMOTE_MANIFEST : updated),
+        }),
+      ),
+    );
+  });
+
+  it.live("explicit refresh retries immediately after failure and preserves last-good data", () => {
+    let fetchCount = 0;
+    return Effect.gen(function* () {
+      const service = yield* make;
+      assert.deepStrictEqual(yield* service.refresh, REMOTE_MANIFEST);
+      assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
+      assert.deepStrictEqual(yield* service.current, REMOTE_MANIFEST);
+      assert.deepStrictEqual(yield* (yield* make).current, REMOTE_MANIFEST);
+      assert.strictEqual(fetchCount, 2);
+      assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
+      assert.strictEqual(fetchCount, 3);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        serviceLayers({
+          prefix: "model-manifest-force-retry-test",
+          response: () =>
+            fetchCount++ === 1
+              ? new Response(null, { status: 503 })
+              : Response.json(REMOTE_MANIFEST),
+        }),
+      ),
+    );
+  });
+
+  it.live("explicit refresh bypasses the retry delay after an initial failure", () => {
+    let fetchCount = 0;
+    return Effect.gen(function* () {
+      const service = yield* make;
+      assert.deepStrictEqual(yield* service.refresh, BUNDLED_MODEL_MANIFEST);
+      assert.deepStrictEqual(yield* service.refresh, BUNDLED_MODEL_MANIFEST);
+      assert.strictEqual(fetchCount, 1);
+      assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
+      assert.strictEqual(fetchCount, 2);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        serviceLayers({
+          prefix: "model-manifest-force-initial-retry-test",
+          response: () =>
+            fetchCount++ === 0
+              ? new Response(null, { status: 503 })
+              : Response.json(REMOTE_MANIFEST),
+        }),
+      ),
+    );
+  });
+
   it.live("prefers a fetched manifest over the bundle and caches it to disk", () =>
     Effect.gen(function* () {
       const service = yield* make;
@@ -363,6 +441,30 @@ describe("ModelManifest service", () => {
     ),
   );
 
+  it.live("ignores older remote edits without replacing the current manifest or disk cache", () => {
+    let remote = { ...REMOTE_MANIFEST, updatedAt: "2000-01-01T00:00:00Z" };
+    return Effect.gen(function* () {
+      const service = yield* make;
+      assert.deepStrictEqual(yield* service.refresh, BUNDLED_MODEL_MANIFEST);
+      assert.deepStrictEqual(yield* service.current, BUNDLED_MODEL_MANIFEST);
+
+      remote = { ...REMOTE_MANIFEST, updatedAt: REMOTE_UPDATED_AT };
+      assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
+      remote = { ...REMOTE_MANIFEST, updatedAt: BUNDLED_MODEL_MANIFEST.updatedAt! };
+      assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
+      const rebooted = yield* make;
+      assert.deepStrictEqual(yield* rebooted.current, REMOTE_MANIFEST);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        serviceLayers({
+          prefix: "model-manifest-stale-fetch-test",
+          response: () => Response.json(remote),
+        }),
+      ),
+    );
+  });
+
   it.live("keeps the bundled manifest when the remote payload is malformed", () =>
     Effect.gen(function* () {
       const service = yield* make;
@@ -457,6 +559,7 @@ describe("ModelManifest service", () => {
         ),
       );
       assert.deepStrictEqual(yield* service.refresh, BUNDLED_MODEL_MANIFEST);
+      assert.deepStrictEqual(yield* service.forceRefresh, BUNDLED_MODEL_MANIFEST);
       assert.strictEqual(fetchCount, 0);
     }).pipe(
       Effect.scoped,
@@ -470,3 +573,43 @@ describe("ModelManifest service", () => {
     ),
   );
 });
+
+it.effect("caches valid compatibility policies and keeps them after a malformed refresh", () => {
+  const remote: ModelManifestData = {
+    ...REMOTE_MANIFEST,
+    compatibility: [
+      {
+        driver: "codex",
+        t3CodeRange: ">=0.0.42",
+        recommendedVersion: "2.0.0",
+        ranges: [{ range: "=2.0.0", status: "supported" }],
+      },
+    ],
+  };
+  let invalid = false;
+  return Effect.gen(function* () {
+    const service = yield* make;
+    assert.deepStrictEqual((yield* service.refresh).compatibility, remote.compatibility);
+    invalid = true;
+    yield* TestClock.adjust("1 hour");
+    assert.deepStrictEqual((yield* service.refresh).compatibility, remote.compatibility);
+    const rebooted = yield* make;
+    assert.deepStrictEqual((yield* rebooted.current).compatibility, remote.compatibility);
+  }).pipe(
+    Effect.scoped,
+    Effect.provide(
+      serviceLayers({
+        prefix: "model-manifest-compatibility-test",
+        response: () =>
+          Response.json(
+            invalid
+              ? {
+                  ...remote,
+                  compatibility: [{ ...remote.compatibility![0], recommendedVersion: "3.0.0" }],
+                }
+              : remote,
+          ),
+      }),
+    ),
+  );
+});
diff --git a/apps/server/src/provider/ModelManifest.ts b/apps/server/src/provider/ModelManifest.ts
index f5ad15dd8586..d1af1086e750 100644
--- a/apps/server/src/provider/ModelManifest.ts
+++ b/apps/server/src/provider/ModelManifest.ts
@@ -34,6 +34,7 @@ import { ServerConfig } from "../config.ts";
 import * as ServerSettings from "../serverSettings.ts";
 import { hasValidClaudeManifestAdapters } from "./ClaudeModelManifest.ts";
 import bundledManifestJson from "./model-manifest.json" with { type: "json" };
+import { ProviderCompatibilityPolicy } from "./providerCompatibility.ts";
 import type { ServerProviderDraft } from "./providerSnapshot.ts";
 
 const MODEL_MANIFEST_URL =
@@ -89,6 +90,7 @@ const ModelManifestEnvelopeSchema = Schema.Struct({
    * files still decode; they count as older than any dated bundle.
    */
   updatedAt: Schema.optional(Schema.String),
+  compatibility: Schema.optional(Schema.Array(ProviderCompatibilityPolicy)),
   currentModels: Schema.Record(Schema.String, Schema.Array(Schema.String)),
   providers: Schema.optional(Schema.Record(Schema.String, ManifestProviderCatalog)),
 });
@@ -315,6 +317,8 @@ export class ModelManifest extends Context.Service<
     readonly current: Effect.Effect<ModelManifestData>;
     /** Manifest after a TTL-gated remote refresh; never fails. */
     readonly refresh: Effect.Effect<ModelManifestData>;
+    /** Explicit refresh bypasses freshness and retry timers, retaining last-good data. */
+    readonly forceRefresh: Effect.Effect<ModelManifestData>;
     /** Forks `refresh` into the service's own scope. Drivers call this from
      * provider checks: the fetch is process-shared state, so it must survive
      * the teardown of whichever instance happened to trigger it. */
@@ -326,6 +330,7 @@ export class ModelManifest extends Context.Service<
 const BundledOnlyModelManifest: ModelManifest["Service"] = {
   current: Effect.succeed(BUNDLED_MODEL_MANIFEST),
   refresh: Effect.succeed(BUNDLED_MODEL_MANIFEST),
+  forceRefresh: Effect.succeed(BUNDLED_MODEL_MANIFEST),
   refreshInBackground: Effect.void,
 };
 
@@ -369,7 +374,7 @@ export const make = Effect.gen(function* () {
     }),
   );
 
-  const refresh = Effect.fn("ModelManifest.refresh")(function* () {
+  const refresh = Effect.fn("ModelManifest.refresh")(function* (force = false) {
     yield* ensureDiskCacheLoaded;
     const now = yield* Clock.currentTimeMillis;
     // A timestamp in the future means the wall clock moved backwards (the
@@ -377,8 +382,8 @@ export const make = Effect.gen(function* () {
     // it as expired: the refetch rewrites both timestamps and self-heals.
     const isWithin = (sinceMs: number | null, windowMs: number) =>
       sinceMs !== null && now >= sinceMs && now - sinceMs < windowMs;
-    if (isWithin(fetchedAtMs, MANIFEST_TTL_MS)) return manifest;
-    if (isWithin(lastAttemptMs, MANIFEST_RETRY_MS)) return manifest;
+    if (!force && isWithin(fetchedAtMs, MANIFEST_TTL_MS)) return manifest;
+    if (!force && isWithin(lastAttemptMs, MANIFEST_RETRY_MS)) return manifest;
 
     // The same switch that gates provider CLI update checks. It stops network
     // fetches only: a manifest already cached on disk from an earlier fetch
@@ -397,13 +402,17 @@ export const make = Effect.gen(function* () {
       Effect.timeout(FETCH_TIMEOUT_MS),
       Effect.catchCause(() => Effect.succeed(null)),
     );
-    if (fetched === null) return manifest;
+    // A CDN can still serve an earlier edit after a release. Apply the same
+    // freshness rule as the disk cache so it cannot undo bundled version gates.
+    if (fetched === null || manifestUpdatedAtMs(fetched) < manifestUpdatedAtMs(manifest)) {
+      return manifest;
+    }
 
     manifest = fetched;
     fetchedAtMs = now;
     yield* encodeManifestCache({ fetchedAtMs: now, manifest: fetched }).pipe(
       Effect.flatMap((serialized) => fileSystem.writeFileString(cachePath, serialized)),
-      Effect.catchCause(() => Effect.void),
+      Effect.ignoreCause,
     );
     return manifest;
   });
@@ -413,6 +422,7 @@ export const make = Effect.gen(function* () {
   return ModelManifest.of({
     current: ensureDiskCacheLoaded.pipe(Effect.map(() => manifest)),
     refresh: guardedRefresh,
+    forceRefresh: refreshSemaphore.withPermits(1)(refresh(true)),
     refreshInBackground: Effect.forkIn(guardedRefresh, serviceScope).pipe(Effect.asVoid),
   });
 });
diff --git a/apps/server/src/provider/ProviderAuthFlow.test.ts b/apps/server/src/provider/ProviderAuthFlow.test.ts
new file mode 100644
index 000000000000..5ea9a0fc2f3b
--- /dev/null
+++ b/apps/server/src/provider/ProviderAuthFlow.test.ts
@@ -0,0 +1,559 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { assert, it } from "@effect/vitest";
+import {
+  ProviderInstanceId,
+  ProviderSetupError,
+  type ProviderAuthInteraction,
+  type ProviderAuthResponse,
+  type ProviderAuthState,
+} from "@t3tools/contracts";
+import * as Fiber from "effect/Fiber";
+import * as Exit from "effect/Exit";
+import * as Scope from "effect/Scope";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
+
+import * as ProviderAuthFlow from "./ProviderAuthFlow.ts";
+
+const instanceId = ProviderInstanceId.make("auth-flow-test");
+const method = { id: "browser", name: "Browser", description: null, type: "agent" as const };
+
+it.effect("distinguishes pending method discovery from an agent with no sign-in methods", () =>
+  Effect.gen(function* () {
+    const discovered = yield* Deferred.make<ReadonlyArray<typeof method>>();
+    const controller = yield* ProviderAuthFlow.make({
+      instanceId,
+      credentialBinding: { owner: "provider", key: "shared-agent" },
+      methods: Deferred.await(discovered),
+      authenticate: () => Effect.void,
+      logout: Effect.void,
+    });
+    const pending = yield* controller
+      .subscribe("owner")
+      .pipe(Stream.runHead, Effect.map(Option.getOrThrow));
+    assert.isUndefined(pending.methods);
+    yield* Deferred.succeed(discovered, []);
+    const ready = yield* controller.subscribe("owner").pipe(
+      Stream.filter((state) => state.methods !== undefined),
+      Stream.runHead,
+      Effect.map(Option.getOrThrow),
+    );
+    assert.deepEqual(ready.methods, []);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+const makeHarness = Effect.gen(function* () {
+  const approved = yield* Deferred.make<void>();
+  const verified = yield* Deferred.make<void>();
+  const started = yield* Deferred.make<void>();
+  let attempts = 0;
+  const controller = yield* ProviderAuthFlow.make({
+    instanceId,
+    credentialBinding: { owner: "provider", key: "shared-agent" },
+    methods: Effect.succeed([method]),
+    authenticate: (_, context) =>
+      Effect.gen(function* () {
+        attempts++;
+        yield* context.setInteraction(
+          {
+            type: "browser",
+            id: "consent",
+            url: "https://example.com/login",
+            requiresConsent: true,
+          },
+          (response) =>
+            response.type === "browser" && response.action === "accept"
+              ? Deferred.succeed(approved, undefined).pipe(Effect.asVoid)
+              : Effect.void,
+        );
+        yield* Deferred.succeed(started, undefined);
+        yield* Deferred.await(approved);
+        yield* context.verifying;
+        yield* Deferred.await(verified);
+      }),
+    logout: Effect.void,
+  });
+  const phase = (phase: ProviderAuthState["phase"], owner = "owner") =>
+    controller.subscribe(owner).pipe(
+      Stream.filter((state) => state.phase === phase),
+      Stream.runHead,
+      Effect.map(Option.getOrThrow),
+    );
+  return { controller, phase, started, verified, attempts: () => attempts };
+});
+
+it.effect("requires owner consent and provider verification before success", () =>
+  Effect.gen(function* () {
+    const { controller, phase, started, verified, attempts } = yield* makeHarness;
+    const state = yield* controller.start("owner");
+    yield* Deferred.await(started);
+    const response = {
+      instanceId,
+      flowId: state.flowId!,
+      interactionId: "consent",
+      response: { type: "browser" as const, action: "accept" as const },
+    };
+    const other = yield* phase("waiting", "other");
+    assert.isNull(other.interaction);
+    assert.isNull(other.flowId);
+    assert.isTrue(
+      (yield* controller.respond!("other", response).pipe(Effect.result))._tag === "Failure",
+    );
+    assert.isTrue(
+      (yield* controller.respond!("owner", { ...response, interactionId: "stale" }).pipe(
+        Effect.result,
+      ))._tag === "Failure",
+    );
+    yield* controller.start("owner");
+    assert.strictEqual(attempts(), 1);
+    yield* controller.respond!("owner", response);
+    yield* phase("verifying");
+    yield* Deferred.succeed(verified, undefined);
+    assert.strictEqual((yield* phase("succeeded")).phase, "succeeded");
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("cancellation rejects late consent and permits another login", () =>
+  Effect.gen(function* () {
+    const { controller, started, phase } = yield* makeHarness;
+    const state = yield* controller.start("owner");
+    yield* Deferred.await(started);
+    yield* controller.cancel("owner", state.flowId!);
+    assert.strictEqual((yield* phase("cancelled")).phase, "cancelled");
+    assert.isTrue(
+      (yield* controller.respond!("owner", {
+        instanceId,
+        flowId: state.flowId!,
+        interactionId: "consent",
+        response: { type: "browser", action: "accept" },
+      }).pipe(Effect.result))._tag === "Failure",
+    );
+    const next = yield* controller.start("other");
+    assert.notStrictEqual(next.flowId, state.flowId);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("expires pending login and rejects its response", () =>
+  Effect.gen(function* () {
+    const { controller, started, phase } = yield* makeHarness;
+    const state = yield* controller.start("owner");
+    yield* Deferred.await(started);
+    yield* TestClock.adjust(300_001);
+    assert.include((yield* phase("failed")).message ?? "", "expired");
+    assert.isTrue(
+      (yield* controller.respond!("owner", {
+        instanceId,
+        flowId: state.flowId!,
+        interactionId: "consent",
+        response: { type: "browser", action: "accept" },
+      }).pipe(Effect.result))._tag === "Failure",
+    );
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("closes admitted provider processes and blocks new ones while login is pending", () =>
+  Effect.gen(function* () {
+    const { controller, started } = yield* makeHarness;
+    let closed = false;
+    yield* controller.withAccess!(
+      Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          closed = true;
+        }),
+      ),
+    );
+    yield* controller.start("owner");
+    yield* Deferred.await(started);
+    assert.isTrue(closed);
+    assert.isTrue(
+      (yield* controller.withAccess!(Effect.void).pipe(Effect.result))._tag === "Failure",
+    );
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("shared credential invalidation closes admitted processes before permitting reuse", () =>
+  Effect.gen(function* () {
+    const { controller } = yield* makeHarness;
+    let closed = false;
+    yield* controller.withAccess!(
+      Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          closed = true;
+        }),
+      ),
+    );
+    yield* controller.invalidate!;
+    assert.isTrue(closed);
+    assert.strictEqual(yield* controller.withAccess!(Effect.succeed("new process")), "new process");
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect.each([
+  {
+    interaction: { type: "terminal", id: "terminal", output: "Log in" },
+    response: { type: "terminal", data: "input", size: { cols: 80, rows: 24 } },
+  },
+  {
+    interaction: {
+      type: "credentials",
+      id: "credentials",
+      fields: [{ name: "token", label: "Token", secret: true }],
+    },
+    response: { type: "credentials", values: { token: "private-token" } },
+  },
+] satisfies ReadonlyArray<{
+  interaction: ProviderAuthInteraction;
+  response: ProviderAuthResponse;
+}>)(
+  "keeps $interaction.type responses private and waits for adapter verification",
+  ({ interaction, response }) =>
+    Effect.gen(function* () {
+      const received = yield* Deferred.make<ProviderAuthResponse>();
+      const controller = yield* ProviderAuthFlow.make({
+        instanceId,
+        credentialBinding: { owner: "t3", key: "binding" },
+        methods: Effect.succeed([method]),
+        authenticate: (_, context) =>
+          Effect.gen(function* () {
+            yield* context.setInteraction(interaction, (response) =>
+              Deferred.succeed(received, response).pipe(Effect.asVoid),
+            );
+            yield* Deferred.await(received);
+            yield* context.verifying;
+            return yield* Effect.never;
+          }),
+        logout: Effect.void,
+      });
+      const state = yield* controller.start("owner");
+      const pending = yield* controller.subscribe("owner").pipe(
+        Stream.filter((state) => state.phase === "waiting"),
+        Stream.runHead,
+        Effect.map(Option.getOrThrow),
+      );
+      assert.deepStrictEqual(pending.interaction, interaction);
+      const hidden = yield* controller
+        .subscribe("other")
+        .pipe(Stream.runHead, Effect.map(Option.getOrThrow));
+      assert.isNull(hidden.interaction);
+      yield* controller.respond!("owner", {
+        instanceId,
+        flowId: state.flowId!,
+        interactionId: interaction.id,
+        response,
+      });
+      assert.deepStrictEqual(yield* Deferred.await(received), response);
+      const verifying = yield* controller.subscribe("owner").pipe(
+        Stream.filter((state) => state.phase === "verifying"),
+        Stream.runHead,
+        Effect.map(Option.getOrThrow),
+      );
+      assert.isNull(verifying.interaction);
+      assert.notInclude(verifying.message ?? "", "private-token");
+      yield* controller.cancel("owner", state.flowId!);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("shows a device code only to its owner without treating it as authenticated", () =>
+  Effect.gen(function* () {
+    const controller = yield* ProviderAuthFlow.make({
+      instanceId,
+      credentialBinding: { owner: "provider", key: "device" },
+      methods: Effect.succeed([method]),
+      authenticate: (_, context) =>
+        context
+          .setInteraction({
+            type: "deviceCode",
+            id: "code",
+            url: "https://example.com/device",
+            userCode: "ABCD-EFGH",
+          })
+          .pipe(Effect.andThen(Effect.never)),
+      logout: Effect.void,
+    });
+    const start = yield* controller.start("owner");
+    const waiting = yield* controller.subscribe("owner").pipe(
+      Stream.filter((state) => state.phase === "waiting"),
+      Stream.runHead,
+      Effect.map(Option.getOrThrow),
+    );
+    assert.strictEqual(waiting.interaction?.type, "deviceCode");
+    assert.strictEqual(waiting.authorizationUrl, "https://example.com/device");
+    const other = yield* controller
+      .subscribe("other")
+      .pipe(Stream.runHead, Effect.map(Option.getOrThrow));
+    assert.isNull(other.interaction);
+    assert.isNull(other.authorizationUrl);
+    yield* controller.cancel("owner", start.flowId!);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect.each([
+  {
+    failure: Effect.fail(
+      new ProviderSetupError({
+        instanceId,
+        operation: "authenticate",
+        detail: "This account cannot sign in. Choose another account.",
+      }),
+    ),
+    message: "This account cannot sign in. Choose another account.",
+  },
+  {
+    failure: Effect.die(new Error("private-token in native diagnostics")),
+    message: "Sign-in failed. Start again.",
+  },
+])("publishes only safe authentication failure text %#", ({ failure, message }) =>
+  Effect.gen(function* () {
+    const controller = yield* ProviderAuthFlow.make({
+      instanceId,
+      credentialBinding: { owner: "t3", key: "failure" },
+      methods: Effect.succeed([method]),
+      authenticate: () => failure,
+      logout: Effect.void,
+    });
+    yield* controller.start("owner");
+    const failed = yield* controller.subscribe("owner").pipe(
+      Stream.filter((state) => state.phase === "failed"),
+      Stream.runHead,
+      Effect.map(Option.getOrThrow),
+    );
+    assert.strictEqual(failed.message, message);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+const makeBlockingResponseHarness = Effect.gen(function* () {
+  const entered = yield* Deferred.make<void>();
+  const cleanupStarted = yield* Deferred.make<void>();
+  const cleanupReleased = yield* Deferred.make<void>();
+  const cleanupFinished = yield* Deferred.make<void>();
+  const authenticationFinished = yield* Deferred.make<void>();
+  let responses = 0;
+  const controller = yield* ProviderAuthFlow.make({
+    instanceId,
+    credentialBinding: { owner: "t3", key: "blocked-response" },
+    methods: Effect.succeed([method]),
+    authenticate: (_, context) =>
+      Effect.gen(function* () {
+        yield* context.setInteraction(
+          {
+            type: "browser",
+            id: "blocked",
+            url: "https://example.com/login",
+            requiresConsent: true,
+          },
+          () =>
+            Effect.gen(function* () {
+              responses++;
+              yield* Deferred.succeed(entered, undefined);
+              return yield* Effect.never;
+            }).pipe(
+              Effect.ensuring(
+                Effect.gen(function* () {
+                  yield* Deferred.succeed(cleanupStarted, undefined);
+                  yield* Deferred.await(cleanupReleased);
+                  yield* Deferred.succeed(cleanupFinished, undefined);
+                }),
+              ),
+            ),
+        );
+        yield* Deferred.await(authenticationFinished);
+      }),
+    logout: Effect.void,
+  });
+  const start = yield* controller.start("owner");
+  yield* controller.subscribe("owner").pipe(
+    Stream.filter((state) => state.phase === "waiting"),
+    Stream.runHead,
+  );
+  const input = {
+    instanceId,
+    flowId: start.flowId!,
+    interactionId: "blocked",
+    response: { type: "browser" as const, action: "accept" as const },
+  };
+  const response = yield* controller.respond!("owner", input).pipe(Effect.exit, Effect.forkChild);
+  yield* Deferred.await(entered);
+  return {
+    controller,
+    input,
+    response,
+    cleanupStarted,
+    cleanupReleased,
+    cleanupFinished,
+    authenticationFinished,
+    responses: () => responses,
+  };
+});
+
+it.effect.each(["cancel", "logout"] as const)(
+  "%s interrupts and awaits a blocked adapter response before admitting another sign-in",
+  (action) =>
+    Effect.gen(function* () {
+      const harness = yield* makeBlockingResponseHarness;
+      const duplicate = yield* Effect.flip(harness.controller.respond!("owner", harness.input));
+      assert.include(duplicate.detail, "already in progress");
+      assert.equal(harness.responses(), 1);
+      const stopping = yield* (
+        action === "cancel"
+          ? harness.controller.cancel("owner", harness.input.flowId)
+          : harness.controller.logout(Effect.void)
+      ).pipe(Effect.forkChild);
+      yield* Deferred.await(harness.cleanupStarted);
+      assert.isTrue(yield* harness.controller.isChangingCredentials!);
+      assert.isUndefined(stopping.pollUnsafe());
+      const premature = yield* Effect.flip(harness.controller.start("other"));
+      assert.include(premature.detail, "in progress");
+      yield* Deferred.succeed(harness.cleanupReleased, undefined);
+      yield* Fiber.join(stopping);
+      assert.isTrue(yield* Deferred.isDone(harness.cleanupFinished));
+      assert.isTrue(Exit.isFailure(yield* Fiber.join(harness.response)));
+      assert.isFalse(yield* harness.controller.isChangingCredentials!);
+      assert.notEqual((yield* harness.controller.start("other")).flowId, harness.input.flowId);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("timeout interrupts and drains a blocked response before publishing failure", () =>
+  Effect.gen(function* () {
+    const harness = yield* makeBlockingResponseHarness;
+    yield* TestClock.adjust(300_001);
+    yield* Deferred.await(harness.cleanupStarted);
+    assert.isTrue(yield* harness.controller.isChangingCredentials!);
+    const duringCleanup = yield* harness.controller
+      .subscribe("owner")
+      .pipe(Stream.runHead, Effect.map(Option.getOrThrow));
+    assert.notEqual(duringCleanup.phase, "failed");
+    yield* Deferred.succeed(harness.cleanupReleased, undefined);
+    const failed = yield* harness.controller.subscribe("owner").pipe(
+      Stream.filter((state) => state.phase === "failed"),
+      Stream.runHead,
+      Effect.map(Option.getOrThrow),
+    );
+    assert.include(failed.message ?? "", "expired");
+    assert.isTrue(yield* Deferred.isDone(harness.cleanupFinished));
+    assert.isTrue(Exit.isFailure(yield* Fiber.join(harness.response)));
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect(
+  "successful authentication drains a still-running response before admitting provider access",
+  () =>
+    Effect.gen(function* () {
+      const harness = yield* makeBlockingResponseHarness;
+      yield* Deferred.succeed(harness.authenticationFinished, undefined);
+      yield* Deferred.await(harness.cleanupStarted);
+      const denied = yield* Effect.flip(harness.controller.withAccess!(Effect.void));
+      assert.include(denied.detail, "changing");
+      yield* Deferred.succeed(harness.cleanupReleased, undefined);
+      const succeeded = yield* harness.controller.subscribe("owner").pipe(
+        Stream.filter((state) => state.phase === "succeeded"),
+        Stream.runHead,
+        Effect.map(Option.getOrThrow),
+      );
+      assert.equal(succeeded.phase, "succeeded");
+      assert.isTrue(yield* Deferred.isDone(harness.cleanupFinished));
+      assert.isTrue(Exit.isFailure(yield* Fiber.join(harness.response)));
+      yield* harness.controller.withAccess!(Effect.void);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("closing the controller scope interrupts and drains its adapter response", () =>
+  Effect.gen(function* () {
+    const scope = yield* Scope.make();
+    const harness = yield* makeBlockingResponseHarness.pipe(
+      Effect.provideService(Scope.Scope, scope),
+    );
+    const closing = yield* Scope.close(scope, Exit.void).pipe(Effect.forkChild);
+    yield* Deferred.await(harness.cleanupStarted);
+    assert.isUndefined(closing.pollUnsafe());
+    yield* Deferred.succeed(harness.cleanupReleased, undefined);
+    yield* Fiber.join(closing);
+    assert.isTrue(yield* Deferred.isDone(harness.cleanupFinished));
+    assert.isTrue(Exit.isFailure(yield* Fiber.join(harness.response)));
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("a failed method refresh keeps the last discovered methods", () =>
+  Effect.gen(function* () {
+    let fail = false;
+    const controller = yield* ProviderAuthFlow.make({
+      instanceId,
+      credentialBinding: { owner: "provider", key: "shared-agent" },
+      methods: Effect.suspend(() =>
+        fail
+          ? Effect.fail(
+              new ProviderSetupError({ instanceId, operation: "status", detail: "interrupted" }),
+            )
+          : Effect.succeed([method]),
+      ),
+      authenticate: () => Effect.void,
+      logout: Effect.void,
+    });
+    yield* controller.refreshMethods!;
+    fail = true;
+    yield* controller.refreshMethods!;
+    const state = yield* controller
+      .subscribe("owner")
+      .pipe(Stream.runHead, Effect.map(Option.getOrThrow));
+    assert.deepEqual(state.methods, [method]);
+    assert.strictEqual(state.message, "interrupted");
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("rebuilding a controller leaves sessions it admitted to their owners", () =>
+  Effect.gen(function* () {
+    const scope = yield* Scope.make();
+    const { controller } = yield* makeHarness.pipe(Effect.provideService(Scope.Scope, scope));
+    let closed = false;
+    yield* controller.withAccess!(
+      Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          closed = true;
+        }),
+      ),
+    );
+    yield* Scope.close(scope, Exit.void);
+    assert.isFalse(closed);
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("profile import stops owned sessions and gates access until credentials are saved", () =>
+  Effect.gen(function* () {
+    const controller = yield* ProviderAuthFlow.make({
+      instanceId,
+      credentialBinding: { owner: "t3", key: "handoff-binding" },
+      methods: Effect.succeed([method]),
+      authenticate: () => Effect.void,
+      logout: Effect.void,
+    });
+    let closed = false;
+    yield* controller.withAccess!(
+      Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          closed = true;
+        }),
+      ),
+    );
+    const writing = yield* Deferred.make<void>();
+    const release = yield* Deferred.make<void>();
+    const imported = yield* controller.adoptCredentials!(
+      Deferred.succeed(writing, undefined).pipe(Effect.andThen(Deferred.await(release))),
+      Effect.sync(() => {
+        assert.isTrue(closed);
+      }),
+    ).pipe(Effect.forkChild);
+    yield* Deferred.await(writing);
+    const denied = yield* controller.withAccess!(Effect.succeed("old credential process")).pipe(
+      Effect.result,
+    );
+    assert.strictEqual(denied._tag, "Failure");
+    yield* Deferred.succeed(release, undefined);
+    assert.strictEqual((yield* Fiber.join(imported)).phase, "succeeded");
+    assert.strictEqual(
+      yield* controller.withAccess!(Effect.succeed("new credential process")),
+      "new credential process",
+    );
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
diff --git a/apps/server/src/provider/ProviderAuthFlow.ts b/apps/server/src/provider/ProviderAuthFlow.ts
new file mode 100644
index 000000000000..f69de4b6bc37
--- /dev/null
+++ b/apps/server/src/provider/ProviderAuthFlow.ts
@@ -0,0 +1,527 @@
+import {
+  ProviderSetupError,
+  type ProviderAuthInteraction,
+  type ProviderAuthMethod,
+  type ProviderAuthResponse,
+  type ProviderAuthState,
+  type ProviderInstanceId,
+} from "@t3tools/contracts";
+import * as Cause from "effect/Cause";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as Clock from "effect/Clock";
+import * as Crypto from "effect/Crypto";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Deferred from "effect/Deferred";
+import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
+import * as Scope from "effect/Scope";
+import * as Semaphore from "effect/Semaphore";
+import * as Stream from "effect/Stream";
+import * as SubscriptionRef from "effect/SubscriptionRef";
+
+import type * as ProviderAuthService from "./Services/ProviderAuthService.ts";
+
+export interface ProviderAuthFlowContext {
+  readonly flowId: string;
+  /** The lifetime timeout interrupts authenticate before publishing its expired result. */
+  readonly expiresAt: number;
+  readonly returnUrl?: string;
+  readonly callbackMode?: "server" | "client";
+  readonly setInteraction: (
+    interaction: ProviderAuthInteraction,
+    respond?: (response: ProviderAuthResponse) => Effect.Effect<void, ProviderSetupError>,
+    complete?: (callbackUrl: string) => Effect.Effect<void, ProviderSetupError>,
+  ) => Effect.Effect<void>;
+  readonly verifying: Effect.Effect<void>;
+}
+
+const isSetupError = Schema.is(ProviderSetupError);
+
+const failureMessage = (cause: Cause.Cause<ProviderSetupError>) => {
+  const error = Cause.findErrorOption(cause);
+  return Option.isSome(error) && isSetupError(error.value)
+    ? error.value.detail
+    : "Sign-in failed. Start again.";
+};
+
+interface Flow {
+  readonly id: string;
+  readonly owner: string;
+  readonly expiresAt: number;
+  complete?: ((callbackUrl: string) => Effect.Effect<void, ProviderSetupError>) | undefined;
+  fiber?: Fiber.Fiber<void>;
+  responseFiber?: Fiber.Fiber<void, ProviderSetupError>;
+  respond:
+    | ((response: ProviderAuthResponse) => Effect.Effect<void, ProviderSetupError>)
+    | undefined;
+}
+
+/** Adapters do login and credential handling; this owns client consent and flow lifetime. */
+export const make = Effect.fn("ProviderAuthFlow.make")(function* (options: {
+  readonly instanceId: ProviderInstanceId;
+  readonly credentialBinding: NonNullable<
+    ProviderAuthService.ProviderAuthController["credentialBinding"]
+  >;
+  readonly methods: Effect.Effect<ReadonlyArray<ProviderAuthMethod>, ProviderSetupError>;
+  readonly defaultMethodId?: string;
+  /** Stored account profiles can change the advertised methods after auth/logout. */
+  readonly refreshMethodsAfterAuth?: boolean;
+  /** Fail with ProviderSetupError containing safe text for the user, never native token data. */
+  readonly authenticate: (
+    methodId: string,
+    context: ProviderAuthFlowContext,
+  ) => Effect.Effect<void, ProviderSetupError, Scope.Scope>;
+  readonly logout: Effect.Effect<void | string, ProviderSetupError>;
+  readonly timeoutMs?: number;
+}) {
+  const scope = yield* Scope.Scope;
+  const crypto = yield* Crypto.Crypto;
+  const lock = yield* Semaphore.make(1);
+  const timeoutMs = options.timeoutMs ?? 300_000;
+  const empty: ProviderAuthState = {
+    instanceId: options.instanceId,
+    phase: "idle",
+    flowId: null,
+    authorizationUrl: null,
+    expiresAt: null,
+    message: null,
+    interaction: null,
+    credentialOwner: options.credentialBinding.owner,
+  };
+  const snapshot = yield* SubscriptionRef.make({ owner: null as string | null, state: empty });
+  let active: Flow | undefined;
+  let operation: "idle" | "auth" | "stopping" | "closed" = "idle";
+  const sessions = new Set<Scope.Closeable>();
+  const stopOwnedSessions = Effect.suspend(() =>
+    Effect.forEach(Array.from(sessions), (session) => Scope.close(session, Exit.void), {
+      discard: true,
+      concurrency: "unbounded",
+    }),
+  );
+  const publish = (flow: Flow, patch: Partial<ProviderAuthState>) =>
+    Effect.suspend(() =>
+      active === flow
+        ? SubscriptionRef.update(snapshot, (current) => ({
+            owner: flow.owner,
+            state: { ...current.state, ...patch },
+          }))
+        : Effect.void,
+    );
+
+  const requireFlow = Effect.fnUntraced(function* (owner: string, id: string) {
+    if (
+      operation !== "auth" ||
+      !active ||
+      active.owner !== owner ||
+      active.id !== id ||
+      (yield* Clock.currentTimeMillis) >= active.expiresAt
+    ) {
+      return yield* new ProviderSetupError({
+        instanceId: options.instanceId,
+        operation: "respond",
+        detail: "This sign-in is no longer active in this client.",
+      });
+    }
+    return active;
+  });
+
+  // Method discovery does not start a sign-in flow.
+  const refreshMethods = options.methods.pipe(
+    Effect.flatMap((methods) =>
+      SubscriptionRef.update(snapshot, (current) => ({
+        ...current,
+        state: { ...current.state, methods },
+      })),
+    ),
+    // Keep the last known methods when a refresh fails or is interrupted.
+    Effect.catch((error) =>
+      SubscriptionRef.update(snapshot, (current) => ({
+        ...current,
+        state: { ...current.state, methods: current.state.methods ?? [], message: error.detail },
+      })),
+    ),
+  );
+  yield* refreshMethods.pipe(Effect.forkIn(scope));
+
+  const controller: ProviderAuthService.ProviderAuthController = {
+    credentialBinding: options.credentialBinding,
+    adoptCredentials: (update, stopSessions) =>
+      Effect.gen(function* () {
+        yield* lock.withPermit(
+          Effect.gen(function* () {
+            if (operation !== "idle")
+              return yield* new ProviderSetupError({
+                instanceId: options.instanceId,
+                operation: "import",
+                detail: "Finish or cancel the existing sign-in first.",
+              });
+            operation = "stopping";
+          }),
+        );
+        const result = yield* Effect.gen(function* () {
+          yield* stopOwnedSessions;
+          yield* stopSessions;
+          yield* update;
+          yield* refreshMethods;
+        }).pipe(Effect.exit);
+        const state: ProviderAuthState = {
+          ...empty,
+          methods: snapshot.value.state.methods ?? [],
+          phase: Exit.isSuccess(result) ? "succeeded" : "failed",
+          message: Exit.isSuccess(result) ? null : failureMessage(result.cause),
+        };
+        yield* lock.withPermit(
+          Effect.gen(function* () {
+            yield* SubscriptionRef.set(snapshot, { owner: null, state });
+            operation = "idle";
+          }),
+        );
+        if (Exit.isFailure(result)) return yield* Effect.failCause(result.cause);
+        return state;
+      }).pipe(Effect.uninterruptible),
+    refreshMethods,
+    invalidate: lock.withPermit(
+      Effect.gen(function* () {
+        if (operation !== "idle") return;
+        yield* stopOwnedSessions;
+        yield* SubscriptionRef.set(snapshot, {
+          owner: null,
+          state: {
+            ...empty,
+            methods: snapshot.value.state.methods ?? [],
+            message: "This provider's shared sign-in changed.",
+          },
+        });
+      }),
+    ),
+    isChangingCredentials: Effect.sync(() => operation !== "idle"),
+    withAccess: (task) =>
+      Effect.uninterruptibleMask((restore) =>
+        Effect.gen(function* () {
+          const parent = yield* Scope.Scope;
+          const child = yield* lock.withPermit(
+            Effect.gen(function* () {
+              if (operation !== "idle")
+                return yield* new ProviderSetupError({
+                  instanceId: options.instanceId,
+                  operation: "session",
+                  detail: "Provider sign-in is changing. Try again after it finishes.",
+                });
+              const child = yield* Scope.make();
+              sessions.add(child);
+              yield* Scope.addFinalizer(
+                child,
+                Effect.sync(() => {
+                  sessions.delete(child);
+                }),
+              );
+              yield* Scope.addFinalizer(parent, Scope.close(child, Exit.void));
+              return child;
+            }),
+          );
+          const fiber = yield* restore(task).pipe(
+            Effect.provideService(Scope.Scope, child),
+            Effect.forkIn(child),
+          );
+          return yield* restore(Fiber.await(fiber)).pipe(
+            Effect.flatMap((result) => result),
+            Effect.onExit((result) =>
+              Exit.isFailure(result) ? Scope.close(child, Exit.void) : Effect.void,
+            ),
+          );
+        }),
+      ),
+    start: (owner, stopSessions = Effect.void, selectedMethodId, returnUrl, callbackMode) =>
+      lock.withPermit(
+        Effect.gen(function* () {
+          if (operation === "auth" && active?.owner === owner) return snapshot.value.state;
+          if (operation !== "idle")
+            return yield* new ProviderSetupError({
+              instanceId: options.instanceId,
+              operation: "start",
+              detail: "Provider setup is already in progress.",
+            });
+          const id = yield* crypto.randomUUIDv4.pipe(
+            Effect.mapError(
+              () =>
+                new ProviderSetupError({
+                  instanceId: options.instanceId,
+                  operation: "start",
+                  detail: "Could not start sign-in. Try again.",
+                }),
+            ),
+          );
+          const flow: Flow = {
+            id,
+            owner,
+            expiresAt: (yield* Clock.currentTimeMillis) + timeoutMs,
+            respond: undefined,
+          };
+          active = flow;
+          operation = "auth";
+          const state: ProviderAuthState = {
+            ...empty,
+            methods: snapshot.value.state.methods ?? [],
+            phase: "starting",
+            flowId: id,
+            expiresAt: DateTime.formatIso(DateTime.makeUnsafe(flow.expiresAt)),
+            message: "Starting sign-in.",
+          };
+          yield* SubscriptionRef.set(snapshot, { owner, state });
+          flow.fiber = yield* Effect.gen(function* () {
+            const methods = yield* options.methods;
+            yield* publish(flow, { methods });
+            const methodId = selectedMethodId ?? options.defaultMethodId ?? methods[0]?.id;
+            if (!methodId || !methods.some((method) => method.id === methodId))
+              return yield* new ProviderSetupError({
+                instanceId: options.instanceId,
+                operation: "start",
+                detail: "The provider did not advertise this sign-in method.",
+              });
+            yield* stopSessions.pipe(Effect.ensuring(stopOwnedSessions));
+            yield* options.authenticate(methodId, {
+              flowId: id,
+              expiresAt: flow.expiresAt,
+              ...(returnUrl ? { returnUrl } : {}),
+              ...(callbackMode ? { callbackMode } : {}),
+              setInteraction: (interaction, respond, complete) =>
+                Effect.gen(function* () {
+                  if (active !== flow) return;
+                  flow.respond = respond;
+                  flow.complete = complete;
+                  yield* publish(flow, {
+                    phase: "waiting",
+                    interaction,
+                    authorizationUrl:
+                      interaction.type === "browser" || interaction.type === "deviceCode"
+                        ? interaction.url
+                        : null,
+                    message: "Complete sign-in to continue.",
+                  });
+                }),
+              verifying: Effect.gen(function* () {
+                flow.respond = undefined;
+                flow.complete = undefined;
+                yield* publish(flow, {
+                  phase: "verifying",
+                  interaction: null,
+                  authorizationUrl: null,
+                  message: "Checking provider sign-in.",
+                });
+              }),
+            });
+          }).pipe(
+            Effect.scoped,
+            Effect.timeoutOrElse({
+              duration: timeoutMs,
+              orElse: () =>
+                Effect.fail(
+                  new ProviderSetupError({
+                    instanceId: options.instanceId,
+                    operation: "start",
+                    detail: "Sign-in expired. Start again.",
+                  }),
+                ),
+            }),
+            Effect.exit,
+            Effect.flatMap((result) =>
+              Effect.gen(function* () {
+                const finishing = yield* lock.withPermit(
+                  Effect.sync(() => {
+                    if (active !== flow) return false;
+                    operation = "stopping";
+                    return true;
+                  }),
+                );
+                if (!finishing) return;
+                if (flow.responseFiber) yield* Fiber.interrupt(flow.responseFiber);
+                yield* lock.withPermit(
+                  Effect.gen(function* () {
+                    if (active !== flow) return;
+                    if (options.refreshMethodsAfterAuth) yield* refreshMethods;
+                    yield* publish(flow, {
+                      phase: Exit.isSuccess(result) ? "succeeded" : "failed",
+                      interaction: null,
+                      authorizationUrl: null,
+                      expiresAt: null,
+                      message: Exit.isSuccess(result)
+                        ? "Sign-in complete."
+                        : failureMessage(result.cause),
+                    });
+                    active = undefined;
+                    operation = "idle";
+                  }),
+                );
+              }),
+            ),
+            Effect.interruptible,
+            Effect.forkIn(scope),
+          );
+          return state;
+        }).pipe(Effect.uninterruptible),
+      ),
+    respond: (owner, input) =>
+      Effect.uninterruptibleMask((restore) =>
+        Effect.gen(function* () {
+          const { flow, fiber, ready } = yield* lock.withPermit(
+            Effect.gen(function* () {
+              const flow = yield* requireFlow(owner, input.flowId);
+              const interaction = snapshot.value.state.interaction;
+              if (
+                !interaction ||
+                interaction.id !== input.interactionId ||
+                interaction.type !== input.response.type ||
+                !flow.respond
+              )
+                return yield* new ProviderSetupError({
+                  instanceId: options.instanceId,
+                  operation: "respond",
+                  detail: "This sign-in interaction is no longer available.",
+                });
+              if (flow.responseFiber)
+                return yield* new ProviderSetupError({
+                  instanceId: options.instanceId,
+                  operation: "respond",
+                  detail: "A sign-in response is already in progress.",
+                });
+              const ready = yield* Deferred.make<void>();
+              const callback = flow.respond;
+              const fiber = yield* Deferred.await(ready).pipe(
+                Effect.andThen(Effect.suspend(() => callback(input.response))),
+                Effect.interruptible,
+                Effect.forkIn(scope),
+              );
+              flow.responseFiber = fiber;
+              return { flow, fiber, ready };
+            }),
+          );
+          yield* Deferred.succeed(ready, undefined);
+          yield* restore(Fiber.join(fiber)).pipe(
+            Effect.onInterrupt(() => Fiber.interrupt(fiber).pipe(Effect.asVoid)),
+            Effect.ensuring(
+              lock.withPermit(
+                Effect.sync(() => {
+                  if (flow.responseFiber === fiber) delete flow.responseFiber;
+                }),
+              ),
+            ),
+          );
+          return snapshot.value.state;
+        }),
+      ),
+    complete: (owner, input) =>
+      lock.withPermit(
+        Effect.gen(function* () {
+          const flow = yield* requireFlow(owner, input.flowId);
+          const interaction = snapshot.value.state.interaction;
+          if (
+            snapshot.value.state.phase !== "waiting" ||
+            interaction?.type !== "browser" ||
+            !interaction.acceptsCallback ||
+            !flow.complete
+          )
+            return yield* new ProviderSetupError({
+              instanceId: options.instanceId,
+              operation: "complete",
+              detail: "This sign-in does not accept a redirect URL.",
+            });
+          yield* flow.complete(input.callbackUrl);
+          return snapshot.value.state;
+        }),
+      ),
+    cancel: (owner, id) =>
+      Effect.gen(function* () {
+        const flow = yield* lock.withPermit(
+          Effect.gen(function* () {
+            const flow = yield* requireFlow(owner, id);
+            yield* publish(flow, {
+              phase: "cancelled",
+              interaction: null,
+              authorizationUrl: null,
+              expiresAt: null,
+              message: "Sign-in cancelled.",
+            });
+            active = undefined;
+            operation = "stopping";
+            return flow;
+          }),
+        );
+        if (flow.responseFiber) yield* Fiber.interrupt(flow.responseFiber);
+        if (flow.fiber) yield* Fiber.interrupt(flow.fiber);
+        operation = "idle";
+        return snapshot.value.state;
+      }).pipe(Effect.uninterruptible),
+    logout: (stopSessions) =>
+      Effect.gen(function* () {
+        const flow = yield* lock.withPermit(
+          Effect.gen(function* () {
+            if (operation !== "idle" && operation !== "auth")
+              return yield* new ProviderSetupError({
+                instanceId: options.instanceId,
+                operation: "logout",
+                detail: "Provider setup is already stopping.",
+              });
+            operation = "stopping";
+            const flow = active;
+            active = undefined;
+            return flow;
+          }),
+        );
+        const result = yield* Effect.gen(function* () {
+          if (flow?.responseFiber) yield* Fiber.interrupt(flow.responseFiber);
+          if (flow?.fiber) yield* Fiber.interrupt(flow.fiber);
+          yield* stopSessions.pipe(Effect.ensuring(stopOwnedSessions));
+          const message = yield* options.logout;
+          if (options.refreshMethodsAfterAuth) yield* refreshMethods;
+          return message;
+        }).pipe(Effect.exit);
+        const state: ProviderAuthState = {
+          ...empty,
+          methods: snapshot.value.state.methods ?? [],
+          phase: Exit.isSuccess(result) ? "idle" : "failed",
+          message: Exit.isSuccess(result)
+            ? (result.value ?? "Signed out.")
+            : "Could not sign out. Try again.",
+        };
+        yield* lock.withPermit(
+          Effect.gen(function* () {
+            yield* SubscriptionRef.set(snapshot, { owner: null, state });
+            operation = "idle";
+          }),
+        );
+        if (Exit.isFailure(result)) return yield* Effect.failCause(result.cause);
+        return state;
+      }).pipe(Effect.uninterruptible),
+    subscribe: (owner) =>
+      SubscriptionRef.changes(snapshot).pipe(
+        Stream.map((current) =>
+          current.owner === null || current.owner === owner
+            ? current.state
+            : {
+                ...current.state,
+                flowId: null,
+                authorizationUrl: null,
+                interaction: null,
+                expiresAt: null,
+                message: active
+                  ? "Sign-in is in progress in another client."
+                  : current.state.message,
+              },
+        ),
+      ),
+  };
+  yield* Effect.addFinalizer(() =>
+    Effect.gen(function* () {
+      operation = "closed";
+      const flow = active;
+      active = undefined;
+      if (flow?.responseFiber) yield* Fiber.interrupt(flow.responseFiber);
+      if (flow?.fiber) yield* Fiber.interrupt(flow.fiber);
+      // Settings edits rebuild instances; admitted sessions (including those of
+      // peers sharing this binding) end with their own scopes, not this one.
+    }),
+  );
+  return controller;
+});
diff --git a/apps/server/src/provider/ProviderCredentialStore.test.ts b/apps/server/src/provider/ProviderCredentialStore.test.ts
new file mode 100644
index 000000000000..0a5ad906e126
--- /dev/null
+++ b/apps/server/src/provider/ProviderCredentialStore.test.ts
@@ -0,0 +1,49 @@
+import { assert, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import { ServerSecretStore } from "../auth/ServerSecretStore.ts";
+import * as ProviderCredentialStore from "./ProviderCredentialStore.ts";
+
+it.effect("isolates provider bindings and preserves opaque credentials", () =>
+  Effect.gen(function* () {
+    const data = new Map<string, Uint8Array>();
+    const secretStore = ServerSecretStore.of({
+      get: (name) => Effect.sync(() => Option.fromUndefinedOr(data.get(name))),
+      set: (name, value) =>
+        Effect.sync(() => {
+          data.set(name, value);
+        }),
+      remove: (name) =>
+        Effect.sync(() => {
+          data.delete(name);
+        }),
+      create: () => Effect.die("unused"),
+      getOrCreateRandom: () => Effect.die("unused"),
+    });
+    const a = yield* ProviderCredentialStore.make("cursor", "../../personal").pipe(
+      Effect.provideService(ServerSecretStore, secretStore),
+    );
+    const b = yield* ProviderCredentialStore.make("cursor", "work").pipe(
+      Effect.provideService(ServerSecretStore, secretStore),
+    );
+    const c = yield* ProviderCredentialStore.make("other", "../../personal").pipe(
+      Effect.provideService(ServerSecretStore, secretStore),
+    );
+    const bytes = Uint8Array.from([0, 255, 128, 1]);
+    yield* a.set(bytes);
+    assert.deepStrictEqual(Option.getOrThrow(yield* a.get), bytes);
+    assert.isTrue(Option.isNone(yield* b.get));
+    assert.isTrue(Option.isNone(yield* c.get));
+    assert.isFalse(a.binding.key.includes("/"));
+    const long = yield* ProviderCredentialStore.make("a".repeat(64), "b".repeat(64)).pipe(
+      Effect.provideService(ServerSecretStore, secretStore),
+    );
+    assert.isBelow(long.binding.key.length, 255);
+    const delimiter = yield* ProviderCredentialStore.make("cur", "sor../../personal").pipe(
+      Effect.provideService(ServerSecretStore, secretStore),
+    );
+    assert.notStrictEqual(delimiter.binding.key, a.binding.key);
+    yield* a.remove;
+    assert.isTrue(Option.isNone(yield* a.get));
+  }),
+);
diff --git a/apps/server/src/provider/ProviderCredentialStore.ts b/apps/server/src/provider/ProviderCredentialStore.ts
new file mode 100644
index 000000000000..259b441654c9
--- /dev/null
+++ b/apps/server/src/provider/ProviderCredentialStore.ts
@@ -0,0 +1,21 @@
+import * as NodeCrypto from "node:crypto";
+import * as Effect from "effect/Effect";
+import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
+
+/** A provider binding stores opaque bytes; only its adapter decodes or refreshes them. */
+export const make = Effect.fn("ProviderCredentialStore.make")(function* (
+  driver: string,
+  bindingId: string,
+) {
+  const secrets = yield* ServerSecretStore.ServerSecretStore;
+  // Hash the tuple so arbitrary bindings cannot escape or exceed a filename.
+  const key = `provider-auth-${NodeCrypto.createHash("sha256")
+    .update(`${driver.length}:${driver}${bindingId}`)
+    .digest("hex")}`;
+  return {
+    binding: { owner: "t3" as const, key },
+    get: secrets.get(key),
+    set: (credentials: Uint8Array) => secrets.set(key, credentials),
+    remove: secrets.remove(key),
+  };
+});
diff --git a/apps/server/src/provider/ProviderDriver.ts b/apps/server/src/provider/ProviderDriver.ts
index a5c092233052..059a2508e40f 100644
--- a/apps/server/src/provider/ProviderDriver.ts
+++ b/apps/server/src/provider/ProviderDriver.ts
@@ -74,6 +74,8 @@ export interface ProviderInstance {
   readonly snapshot: ServerProviderShape;
   readonly snapshotForCwd?: (cwd: string) => Effect.Effect<ServerProvider, ProviderDriverError>;
   readonly refreshModels?: () => Effect.Effect<void, ProviderDriverError>;
+  /** Invalidate T3-owned discovery caches before an explicit provider refresh. */
+  readonly invalidateCaches?: Effect.Effect<void>;
   /**
    * Redeem one banked rate-limit reset credit on the signed-in account, then
    * re-probe so the snapshot reflects the cleared windows. Account-level,
diff --git a/apps/server/src/provider/RuntimeInstructions.test.ts b/apps/server/src/provider/RuntimeInstructions.test.ts
index e73c50adfd6d..10f8413b5a13 100644
--- a/apps/server/src/provider/RuntimeInstructions.test.ts
+++ b/apps/server/src/provider/RuntimeInstructions.test.ts
@@ -20,6 +20,15 @@ describe("buildRuntimeInstructions", () => {
     ).toContain("through the Codex harness, as custom model with high reasoning effort.");
   });
 
+  it("names the model by display name and slug when they differ", () => {
+    expect(
+      buildRuntimeInstructions({ harness: "Codex", model: "gpt-5.4", modelName: "GPT-5.4" }),
+    ).toContain("through the Codex harness, as GPT-5.4 (model slug: gpt-5.4).");
+    expect(
+      buildRuntimeInstructions({ harness: "Codex", model: "my-model", modelName: "my-model" }),
+    ).toContain("through the Codex harness, as my-model.");
+  });
+
   it.each([undefined, "", "auto", "default"])("omits unresolved model %s", (model) => {
     const instructions = buildRuntimeInstructions({ harness: "Cursor", model });
     expect(instructions).toContain("through the Cursor harness.");
diff --git a/apps/server/src/provider/RuntimeInstructions.ts b/apps/server/src/provider/RuntimeInstructions.ts
index ce74d1f48f16..fe649d9ca09e 100644
--- a/apps/server/src/provider/RuntimeInstructions.ts
+++ b/apps/server/src/provider/RuntimeInstructions.ts
@@ -2,16 +2,23 @@ const PULL_REQUEST_LINKING_INSTRUCTIONS = `<pull_request_linking>
 When the t3-code MCP server exposes link_pull_request, you must use it to register every pull request you create or work on for this thread. Call link_pull_request with the full PR URL immediately after creating a PR or starting work on an existing PR. For a stack, call it for every layer, not just the current branch or the top PR. This applies when creating or updating PRs through gh, gh stack, another CLI, or the host API: those operations do not register the PRs with this thread. Linking an already-linked PR is safe. Before finishing PR work, call list_thread_pull_requests and link any PR from your work that is missing. Do not link unrelated PRs mentioned only as background. If a linking call fails, report that failure instead of claiming the PR is linked.
 </pull_request_linking>`;
 
-/** Shared runtime context; omit model and effort when the harness manages them dynamically. */
+/**
+ * Shared runtime context; omit model and effort when the harness manages them dynamically.
+ * `modelName` is the display name users see in the model picker; `model` is the slug.
+ */
 export function buildRuntimeInstructions(runtime: {
   readonly harness: string;
   readonly model?: string | undefined;
+  readonly modelName?: string | undefined;
   readonly reasoningEffort?: string | undefined;
 }): string {
   const harness = toSingleLine(runtime.harness);
   const model = toSingleLine(runtime.model ?? "");
+  const modelName = toSingleLine(runtime.modelName ?? "");
   const effort = toSingleLine(runtime.reasoningEffort ?? "");
-  const modelInfo = model && model !== "auto" && model !== "default" ? `, as ${model}` : "";
+  const modelLabel =
+    modelName && modelName !== model ? `${modelName} (model slug: ${model})` : model;
+  const modelInfo = model && model !== "auto" && model !== "default" ? `, as ${modelLabel}` : "";
   const effortInfo = effort ? ` with ${effort} reasoning effort` : "";
   return `<runtime_info>In case you're asked: you are running in T3 Turbo through the ${harness} harness${modelInfo}${effortInfo}. No need to mention this otherwise. You can embed images and videos in your response using Markdown with absolute file paths.</runtime_info>\n\n${PULL_REQUEST_LINKING_INSTRUCTIONS}`;
 }
diff --git a/apps/server/src/provider/Services/ProviderAuthService.ts b/apps/server/src/provider/Services/ProviderAuthService.ts
index ea89edf78af5..273f1b5337ee 100644
--- a/apps/server/src/provider/Services/ProviderAuthService.ts
+++ b/apps/server/src/provider/Services/ProviderAuthService.ts
@@ -1,12 +1,43 @@
-import type { ProviderAuthState, ProviderInstanceId, ProviderSetupError } from "@t3tools/contracts";
+import type {
+  ChatGptReconnectProfile,
+  ChatGptTransferredProfile,
+  ProviderAuthRespondInput,
+  ProviderAuthStartInput,
+  ProviderAuthState,
+  ProviderInstanceId,
+  ProviderSetupError,
+} from "@t3tools/contracts";
 import * as Context from "effect/Context";
 import type * as Effect from "effect/Effect";
 import type * as Stream from "effect/Stream";
+import type * as Scope from "effect/Scope";
 
 export interface ProviderAuthController {
+  /** Equal keys mean these instances share credentials on this environment. */
+  readonly credentialBinding?: { readonly owner: "provider" | "t3"; readonly key: string };
+  readonly reconnectProfile?: (
+    methodId: string,
+  ) => Effect.Effect<ChatGptReconnectProfile | null, ProviderSetupError>;
+  readonly importProfile?: (
+    profile: ChatGptTransferredProfile,
+    stopSessions: Effect.Effect<void, ProviderSetupError>,
+  ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
+  readonly adoptCredentials?: (
+    update: Effect.Effect<void, ProviderSetupError>,
+    stopSessions: Effect.Effect<void, ProviderSetupError>,
+  ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
+  readonly isChangingCredentials?: Effect.Effect<boolean>;
+  readonly invalidate?: Effect.Effect<void>;
+  readonly refreshMethods?: Effect.Effect<void>;
+  readonly withAccess?: <A, E, R>(
+    task: Effect.Effect<A, E, R>,
+  ) => Effect.Effect<A, E | ProviderSetupError, R | Scope.Scope>;
   readonly start: (
     ownerSessionId: string,
     stopSessions?: Effect.Effect<void, ProviderSetupError>,
+    methodId?: string,
+    returnUrl?: string,
+    callbackMode?: "server" | "client",
   ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
   readonly complete: (
     ownerSessionId: string,
@@ -16,6 +47,10 @@ export interface ProviderAuthController {
     ownerSessionId: string,
     flowId: string,
   ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
+  readonly respond?: (
+    ownerSessionId: string,
+    input: ProviderAuthRespondInput,
+  ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
   /** The controller closes process admission before it stops routed sessions. */
   readonly logout: (
     stopSessions: Effect.Effect<void, ProviderSetupError>,
@@ -29,14 +64,24 @@ interface ProviderAuthTarget {
 }
 
 export interface ProviderAuthServiceShape {
+  readonly reconnectProfile: (
+    input: ProviderAuthTarget & { methodId: string },
+  ) => Effect.Effect<ChatGptReconnectProfile | null, ProviderSetupError>;
+  readonly importProfile: (
+    input: ProviderAuthTarget & { profile: ChatGptTransferredProfile },
+  ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
   readonly start: (
-    input: ProviderAuthTarget,
+    input: ProviderAuthStartInput,
     ownerSessionId: string,
   ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
   readonly complete: (
     input: ProviderAuthTarget & { readonly flowId: string; readonly callbackUrl: string },
     ownerSessionId: string,
   ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
+  readonly respond: (
+    input: ProviderAuthRespondInput,
+    ownerSessionId: string,
+  ) => Effect.Effect<ProviderAuthState, ProviderSetupError>;
   readonly cancel: (
     input: ProviderAuthTarget & { readonly flowId: string },
     ownerSessionId: string,
diff --git a/apps/server/src/provider/Services/ProviderSessionDirectory.ts b/apps/server/src/provider/Services/ProviderSessionDirectory.ts
index 9dbafd3e804e..1b5c47ec1d62 100644
--- a/apps/server/src/provider/Services/ProviderSessionDirectory.ts
+++ b/apps/server/src/provider/Services/ProviderSessionDirectory.ts
@@ -70,7 +70,10 @@ export interface ProviderSessionDirectoryShape {
     ProviderSessionDirectoryPersistenceError
   >;
 
-  readonly listBindings: () => Effect.Effect<
+  /** `excludeStopped` skips stopped rows in the query, not after decoding. */
+  readonly listBindings: (options?: {
+    readonly excludeStopped?: boolean;
+  }) => Effect.Effect<
     ReadonlyArray<ProviderRuntimeBindingWithMetadata>,
     ProviderSessionDirectoryPersistenceError
   >;
diff --git a/apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts b/apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts
index 45a5cadb9a31..dde5979c0f56 100644
--- a/apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts
+++ b/apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts
@@ -824,6 +824,54 @@ describe("AcpSessionRuntime", () => {
     ),
   );
 
+  it.effect("keeps one answer when an earlier tool reports progress mid-stream", () =>
+    Effect.gen(function* () {
+      const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
+      yield* runtime.start();
+      yield* runtime.prompt({ prompt: [{ type: "text", text: "hi" }] });
+
+      const notes = Array.from(yield* Stream.runCollect(Stream.take(runtime.getEvents(), 9)));
+      // The coalesced progress tick emits nothing, and neither the completion
+      // nor a repeated one splits the markdown table across items.
+      expect(notes.map((note) => note._tag)).toEqual([
+        "ToolCallUpdated",
+        "AssistantItemStarted",
+        "ContentDelta",
+        "ContentDelta",
+        "ToolCallUpdated",
+        "ContentDelta",
+        "ToolCallUpdated",
+        "ContentDelta",
+        "AssistantItemCompleted",
+      ]);
+      const itemIds = new Set(
+        notes.flatMap((note) =>
+          note._tag === "ContentDelta" ||
+          note._tag === "AssistantItemStarted" ||
+          note._tag === "AssistantItemCompleted"
+            ? [note.itemId]
+            : [],
+        ),
+      );
+      expect(itemIds.size).toBe(1);
+    }).pipe(
+      Effect.provide(
+        AcpSessionRuntime.layer({
+          spawn: {
+            command: mockAgentCommand,
+            args: mockAgentArgs,
+            env: { T3_ACP_EMIT_BACKGROUND_TOOL_DURING_ANSWER: "1" },
+          },
+          cwd: process.cwd(),
+          clientInfo: { name: "t3-test", version: "0.0.0" },
+          authMethodId: "test",
+        }),
+      ),
+      Effect.scoped,
+      Effect.provide(NodeServices.layer),
+    ),
+  );
+
   it.effect("emits status-only tool updates through completion", () =>
     Effect.gen(function* () {
       const runtime = yield* AcpSessionRuntime.AcpSessionRuntime;
diff --git a/apps/server/src/provider/acp/AcpSessionRuntime.ts b/apps/server/src/provider/acp/AcpSessionRuntime.ts
index 77517c44ea9b..0d0b81e910a3 100644
--- a/apps/server/src/provider/acp/AcpSessionRuntime.ts
+++ b/apps/server/src/provider/acp/AcpSessionRuntime.ts
@@ -40,6 +40,8 @@ import {
   type AcpToolCallState,
 } from "./AcpRuntimeModel.ts";
 
+const MAX_SHOWN_TOOL_CALL_IDS = 256;
+
 interface AcpToolCallTrackedState {
   readonly state: AcpToolCallState;
   readonly lastEmittedDetailLength: number | undefined;
@@ -334,6 +336,9 @@ export const make = (
     const eventQueue = yield* Queue.unbounded<AcpSessionRuntimeEvent>();
     const modeStateRef = yield* Ref.make<AcpSessionModeState | undefined>(undefined);
     const toolCallsRef = yield* Ref.make(new Map<string, AcpToolCallTrackedState>());
+    // Recently shown tool calls. A late update to a finished call is not a new
+    // boundary in the answer, although its progress state is gone.
+    const shownToolCallIds = new Set<string>();
     const assistantItemRuntimeId = yield* crypto.randomUUIDv4.pipe(
       Effect.mapError(
         (cause) =>
@@ -525,6 +530,7 @@ export const make = (
         modeStateRef,
         configOptionsRef,
         toolCallsRef,
+        shownToolCallIds,
         assistantSegmentRef,
         assistantItemRuntimeId,
         params: notification,
@@ -774,17 +780,16 @@ export const make = (
           resumePayload,
           acp.agent.resumeSession(resumePayload).pipe(
             Effect.timeoutOption(options.sessionLoadTimeout ?? defaultSessionLoadTimeout),
-            Effect.flatMap((result) =>
-              Option.isSome(result)
-                ? Effect.succeed(result.value)
-                : Effect.fail(
-                    new EffectAcpErrors.AcpTransportError({
-                      operation: "call-rpc",
-                      method: "session/resume",
-                      detail: "session/resume timed out waiting for the agent response.",
-                      cause: undefined,
-                    }),
-                  ),
+            Effect.flatMap(
+              Effect.fromOption(
+                () =>
+                  new EffectAcpErrors.AcpTransportError({
+                    operation: "call-rpc",
+                    method: "session/resume",
+                    detail: "session/resume timed out waiting for the agent response.",
+                    cause: undefined,
+                  }),
+              ),
             ),
           ),
         );
@@ -828,19 +833,16 @@ export const make = (
           ).pipe(
             Effect.ensuring(Fiber.interrupt(idleFiber).pipe(Effect.ignore)),
             Effect.timeoutOption(sessionLoadTimeout),
-            Effect.flatMap((result) =>
-              Option.match(result, {
-                onNone: () =>
-                  Effect.fail(
-                    new EffectAcpErrors.AcpTransportError({
-                      operation: "call-rpc",
-                      method: "session/load",
-                      detail: "session/load timed out waiting for RPC response or replay idle gap",
-                      cause: undefined,
-                    }),
-                  ),
-                onSome: Effect.succeed,
-              }),
+            Effect.flatMap(
+              Effect.fromOption(
+                () =>
+                  new EffectAcpErrors.AcpTransportError({
+                    operation: "call-rpc",
+                    method: "session/load",
+                    detail: "session/load timed out waiting for RPC response or replay idle gap",
+                    cause: undefined,
+                  }),
+              ),
             ),
             Effect.tap((result) =>
               logRequest({
@@ -1052,12 +1054,13 @@ export const make = (
             ),
             (activePrompt) =>
               Fiber.join(activePrompt.fiber).pipe(
-                Effect.catchCause((cause) =>
-                  options.cancelBehavior !== "wait-for-prompt" && Cause.hasInterruptsOnly(cause)
-                    ? Effect.succeed({
-                        stopReason: "cancelled",
-                      } satisfies EffectAcpSchema.PromptResponse)
-                    : Effect.failCause(cause),
+                Effect.catchCauseIf(
+                  (cause) =>
+                    options.cancelBehavior !== "wait-for-prompt" && Cause.hasInterruptsOnly(cause),
+                  () =>
+                    Effect.succeed({
+                      stopReason: "cancelled",
+                    } satisfies EffectAcpSchema.PromptResponse),
                 ),
                 Effect.tap(() =>
                   closeActiveAssistantSegment({ queue: eventQueue, assistantSegmentRef }),
@@ -1178,6 +1181,7 @@ const handleSessionUpdate = ({
   modeStateRef,
   configOptionsRef,
   toolCallsRef,
+  shownToolCallIds,
   assistantSegmentRef,
   assistantItemRuntimeId,
   params,
@@ -1186,6 +1190,7 @@ const handleSessionUpdate = ({
   readonly modeStateRef: Ref.Ref<AcpSessionModeState | undefined>;
   readonly configOptionsRef: Ref.Ref<ReadonlyArray<EffectAcpSchema.SessionConfigOption>>;
   readonly toolCallsRef: Ref.Ref<Map<string, AcpToolCallTrackedState>>;
+  readonly shownToolCallIds: Set<string>;
   readonly assistantSegmentRef: Ref.Ref<AcpAssistantSegmentState>;
   readonly assistantItemRuntimeId: string;
   readonly params: EffectAcpSchema.SessionNotification;
@@ -1202,11 +1207,7 @@ const handleSessionUpdate = ({
     }
     for (const event of parsed.events) {
       if (event._tag === "ToolCallUpdated") {
-        yield* closeActiveAssistantSegment({
-          queue,
-          assistantSegmentRef,
-        });
-        const { merged, decision } = yield* Ref.modify(toolCallsRef, (current) => {
+        const { merged, decision, active } = yield* Ref.modify(toolCallsRef, (current) => {
           const tracked = current.get(event.toolCall.toolCallId);
           const previous = tracked?.state;
           const nextToolCall = mergeToolCallState(previous, event.toolCall);
@@ -1228,11 +1229,22 @@ const handleSessionUpdate = ({
               skippedSinceEmit: decision.skippedSinceEmit,
             });
           }
-          return [{ merged: nextToolCall, decision }, next] as const;
+          return [{ merged: nextToolCall, decision, active: tracked !== undefined }, next] as const;
         });
         if (!decision.emit) {
           continue;
         }
+        // A new tool call is a boundary in the prose. Progress on a call that
+        // is already shown, such as a background command finishing, is not.
+        if (!shownToolCallIds.has(merged.toolCallId)) {
+          shownToolCallIds.add(merged.toolCallId);
+          // Only recent calls get late updates; keep a long session bounded.
+          if (shownToolCallIds.size > MAX_SHOWN_TOOL_CALL_IDS) {
+            shownToolCallIds.delete(shownToolCallIds.values().next().value!);
+          }
+          // A call still running is already on screen, even if it aged out.
+          if (!active) yield* closeActiveAssistantSegment({ queue, assistantSegmentRef });
+        }
         yield* Queue.offer(queue, {
           _tag: "ToolCallUpdated",
           toolCall: merged,
diff --git a/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts b/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts
index aee10782a613..7d6cfb1e2620 100644
--- a/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts
+++ b/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts
@@ -2,7 +2,6 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, expect, it } from "@effect/vitest";
 import {
   ANTIGRAVITY_DEFAULT_MODEL,
-  PROVIDER_SEND_TURN_MAX_FILE_BYTES,
   PROVIDER_SEND_TURN_MAX_IMAGE_BYTES,
   type ChatAttachment,
   type RuntimeMode,
@@ -15,7 +14,6 @@ import type * as EffectAcpSchema from "effect-acp/schema";
 
 import { resolveAttachmentPath } from "../../attachmentStore.ts";
 import {
-  ANTIGRAVITY_MAX_TEXT_ATTACHMENT_BYTES,
   antigravityPermissionMode,
   applyAntigravityAcpModelSelection,
   buildAntigravityPrompt,
@@ -324,6 +322,41 @@ it.layer(NodeServices.layer)("buildAntigravityPrompt", (it) => {
     }),
   );
 
+  it.effect.each([
+    { name: "archive.zip", mimeType: "application/zip" },
+    { name: "clip.mp4", mimeType: "video/mp4" },
+    { name: "recording.aiff", mimeType: "audio/aiff" },
+    { name: "large.pdf", mimeType: "application/pdf", sizeBytes: 75_000_000 },
+    { name: "large.txt", mimeType: "text/plain", sizeBytes: 1024 * 1024 + 1 },
+    { name: "large.wav", mimeType: "audio/wav", sizeBytes: 20 * 1024 * 1024 + 1 },
+  ])("keeps $name as a file path without reading or spending the native media budget", (file) =>
+    Effect.gen(function* () {
+      const fixture = yield* makeAttachmentFixture();
+      const attachment = { ...textAttachment, sizeBytes: 50 * 1024 * 1024, ...file };
+      const upload = yield* fixture.write(attachment, "");
+      yield* fixture.fs.truncate(upload.filePath, attachment.sizeBytes);
+      const pdf = yield* fixture.write(pdfAttachment, "");
+      yield* fixture.fs.truncate(pdf.filePath, 50 * 1024 * 1024);
+      const input = `Inspect the file at ${upload.filePath}`;
+      const prompt = yield* buildAntigravityPrompt({
+        input,
+        attachments: [attachment, pdfAttachment],
+        attachmentsDir: fixture.attachmentsDir,
+      }).pipe(
+        Effect.provideService(FileSystem.FileSystem, {
+          ...fixture.fs,
+          stream: () => {
+            throw new Error("Path attachments must not be read into the prompt");
+          },
+        }),
+      );
+      expect(prompt).toEqual([
+        { type: "text", text: input },
+        { type: "resource_link", uri: pdf.uri, name: "report.pdf", mimeType: "application/pdf" },
+      ]);
+    }),
+  );
+
   it.effect("sends supported audio files as native audio content", () =>
     Effect.gen(function* () {
       const fixture = yield* makeAttachmentFixture();
@@ -378,8 +411,6 @@ it.layer(NodeServices.layer)("buildAntigravityPrompt", (it) => {
 
   it.effect.each([
     { ...imageAttachment, name: "animation.gif", mimeType: "image/gif" },
-    { ...textAttachment, name: "archive.zip", mimeType: "application/zip" },
-    { ...textAttachment, name: "recording.aiff", mimeType: "audio/aiff" },
   ] satisfies ReadonlyArray<ChatAttachment>)(
     "rejects $name instead of silently dropping it from a valid prompt",
     (attachment) =>
@@ -400,32 +431,25 @@ it.layer(NodeServices.layer)("buildAntigravityPrompt", (it) => {
       }),
   );
 
-  it.effect.each([
-    { attachment: textAttachment, bytes: ANTIGRAVITY_MAX_TEXT_ATTACHMENT_BYTES + 1 },
-    { attachment: imageAttachment, bytes: PROVIDER_SEND_TURN_MAX_IMAGE_BYTES + 1 },
-    { attachment: pdfAttachment, bytes: PROVIDER_SEND_TURN_MAX_FILE_BYTES + 1 },
-  ])(
-    "rejects oversized $attachment.name using file size instead of upload metadata",
-    ({ attachment, bytes }) =>
-      Effect.gen(function* () {
-        const fixture = yield* makeAttachmentFixture();
-        const upload = yield* fixture.write(attachment, "");
-        yield* fixture.fs.truncate(upload.filePath, bytes);
-        const error = yield* buildAntigravityPrompt({
-          input: "Read this attachment.",
-          attachments: [attachment],
-          attachmentsDir: fixture.attachmentsDir,
-        }).pipe(Effect.flip);
-
-        expect(error).toMatchObject({
-          _tag: "AcpRequestError",
-          code: -32602,
-          errorMessage: expect.stringContaining(`'${attachment.name}' is too large`),
-        });
-      }),
+  it.effect("rejects oversized images using file size instead of upload metadata", () =>
+    Effect.gen(function* () {
+      const fixture = yield* makeAttachmentFixture();
+      const upload = yield* fixture.write(imageAttachment, "");
+      yield* fixture.fs.truncate(upload.filePath, PROVIDER_SEND_TURN_MAX_IMAGE_BYTES + 1);
+      const error = yield* buildAntigravityPrompt({
+        input: "Read this attachment.",
+        attachments: [imageAttachment],
+        attachmentsDir: fixture.attachmentsDir,
+      }).pipe(Effect.flip);
+      expect(error).toMatchObject({
+        _tag: "AcpRequestError",
+        code: -32602,
+        errorMessage: expect.stringContaining("'screen.png' is too large"),
+      });
+    }),
   );
 
-  it.effect("accepts 50 MiB in total but rejects one byte more across files", () =>
+  it.effect("keeps PDF overflow on the file-path route", () =>
     Effect.gen(function* () {
       const fixture = yield* makeAttachmentFixture();
       const secondAttachment = {
@@ -435,25 +459,57 @@ it.layer(NodeServices.layer)("buildAntigravityPrompt", (it) => {
       };
       const first = yield* fixture.write(pdfAttachment, "");
       const second = yield* fixture.write(secondAttachment, "");
-      yield* fixture.fs.truncate(first.filePath, PROVIDER_SEND_TURN_MAX_FILE_BYTES / 2);
-      yield* fixture.fs.truncate(second.filePath, PROVIDER_SEND_TURN_MAX_FILE_BYTES / 2);
+      yield* fixture.fs.truncate(first.filePath, (50 * 1024 * 1024) / 2);
+      yield* fixture.fs.truncate(second.filePath, (50 * 1024 * 1024) / 2);
       const input = {
-        input: undefined,
+        input: `Read ${first.filePath} and ${second.filePath}`,
         attachments: [pdfAttachment, secondAttachment],
         attachmentsDir: fixture.attachmentsDir,
       };
       const prompt = yield* buildAntigravityPrompt(input);
       expect(prompt).toEqual([
-        { type: "resource_link", uri: first.uri, name: "report.pdf", mimeType: "application/pdf" },
-        { type: "resource_link", uri: second.uri, name: "second.pdf", mimeType: "application/pdf" },
+        { type: "text", text: input.input },
+        {
+          type: "resource_link",
+          uri: first.uri,
+          name: "report.pdf",
+          mimeType: "application/pdf",
+        },
+        {
+          type: "resource_link",
+          uri: second.uri,
+          name: "second.pdf",
+          mimeType: "application/pdf",
+        },
       ]);
 
-      yield* fixture.fs.truncate(second.filePath, PROVIDER_SEND_TURN_MAX_FILE_BYTES / 2 + 1);
-      const error = yield* buildAntigravityPrompt(input).pipe(Effect.flip);
+      yield* fixture.fs.truncate(second.filePath, (50 * 1024 * 1024) / 2 + 1);
+      expect(yield* buildAntigravityPrompt(input)).toEqual([
+        { type: "text", text: input.input },
+        {
+          type: "resource_link",
+          uri: first.uri,
+          name: "report.pdf",
+          mimeType: "application/pdf",
+        },
+      ]);
+    }),
+  );
+
+  it.effect("still rejects images when the native budget is full", () =>
+    Effect.gen(function* () {
+      const fixture = yield* makeAttachmentFixture();
+      const pdf = yield* fixture.write(pdfAttachment, "");
+      yield* fixture.fs.truncate(pdf.filePath, 50 * 1024 * 1024);
+      yield* fixture.write(imageAttachment, new Uint8Array([1]));
+      const error = yield* buildAntigravityPrompt({
+        input: "Inspect both attachments.",
+        attachments: [pdfAttachment, imageAttachment],
+        attachmentsDir: fixture.attachmentsDir,
+      }).pipe(Effect.flip);
       expect(error).toMatchObject({
         _tag: "AcpRequestError",
-        code: -32602,
-        errorMessage: expect.stringContaining("'second.pdf' is too large"),
+        errorMessage: expect.stringContaining("'screen.png' is too large"),
       });
     }),
   );
@@ -463,7 +519,7 @@ it.layer(NodeServices.layer)("buildAntigravityPrompt", (it) => {
       const fixture = yield* makeAttachmentFixture();
       const pdf = yield* fixture.write(pdfAttachment, "");
       const text = yield* fixture.write(textAttachment, "a");
-      yield* fixture.fs.truncate(pdf.filePath, PROVIDER_SEND_TURN_MAX_FILE_BYTES - 1);
+      yield* fixture.fs.truncate(pdf.filePath, 50 * 1024 * 1024 - 1);
       const error = yield* buildAntigravityPrompt({
         input: undefined,
         attachments: [pdfAttachment, textAttachment],
diff --git a/apps/server/src/provider/acp/AntigravityAcpSupport.ts b/apps/server/src/provider/acp/AntigravityAcpSupport.ts
index f2f370068181..8f2877330bbe 100644
--- a/apps/server/src/provider/acp/AntigravityAcpSupport.ts
+++ b/apps/server/src/provider/acp/AntigravityAcpSupport.ts
@@ -243,10 +243,14 @@ const TEXT_FILE_EXTENSIONS = new Set([
   ".ini",
   ".conf",
 ]);
-export const ANTIGRAVITY_MAX_TEXT_ATTACHMENT_BYTES = 1024 * 1024;
+const ANTIGRAVITY_MAX_TEXT_ATTACHMENT_BYTES = 1024 * 1024;
 const MAX_TOTAL_ATTACHMENT_BYTES = PROVIDER_SEND_TURN_MAX_FILE_BYTES;
 
-/** Sends uploads as native ACP content instead of workspace path hints. */
+/**
+ * Sends supported uploads as native ACP content. Other files, and native
+ * candidates over their limits, reach the agent through the saved path
+ * ProviderService puts in the text block.
+ */
 export const buildAntigravityPrompt = Effect.fn("buildAntigravityPrompt")(function* (input: {
   readonly input: ProviderSendTurnInput["input"];
   readonly attachments: ProviderSendTurnInput["attachments"];
@@ -280,7 +284,9 @@ export const buildAntigravityPrompt = Effect.fn("buildAntigravityPrompt")(functi
       (mimeType.startsWith("text/") ||
         TEXT_MIME_TYPES.has(mimeType) ||
         TEXT_FILE_EXTENSIONS.has(path.extname(attachment.name).toLowerCase()));
-    if (!image && !audio && !pdf && !textFile) {
+    const isPathOnly =
+      attachment.type === "file" && (isPastedText || (!audio && !pdf && !textFile));
+    if (attachment.type === "image" && !image) {
       return yield* EffectAcpErrors.AcpRequestError.invalidParams(
         `Antigravity does not support '${attachment.name}' (${attachment.mimeType}). Attach a BMP, JPEG, PNG, WebP, PDF, audio, or text file.`,
       );
@@ -303,26 +309,30 @@ export const buildAntigravityPrompt = Effect.fn("buildAntigravityPrompt")(functi
           ),
         ),
       );
-    if (isPastedText) {
-      if (info.type !== "File") {
-        return yield* EffectAcpErrors.AcpRequestError.invalidParams(
-          `Could not read attachment '${attachment.name}'.`,
-        );
-      }
-      continue;
+    if (info.type !== "File") {
+      return yield* EffectAcpErrors.AcpRequestError.invalidParams(
+        `Could not read attachment '${attachment.name}'.`,
+      );
     }
+    if (isPathOnly) continue;
     const size = Number(info.size);
     const limit = image
       ? PROVIDER_SEND_TURN_MAX_IMAGE_BYTES
       : audio
         ? ANTIGRAVITY_MAX_AUDIO_ATTACHMENT_BYTES
         : pdf
-          ? PROVIDER_SEND_TURN_MAX_FILE_BYTES
+          ? MAX_TOTAL_ATTACHMENT_BYTES
           : ANTIGRAVITY_MAX_TEXT_ATTACHMENT_BYTES;
+    if (
+      attachment.type === "file" &&
+      (size > limit || totalBytes + size > MAX_TOTAL_ATTACHMENT_BYTES)
+    ) {
+      continue;
+    }
     totalBytes += size;
-    if (info.type !== "File" || size > limit || totalBytes > MAX_TOTAL_ATTACHMENT_BYTES) {
+    if (size > limit || totalBytes > MAX_TOTAL_ATTACHMENT_BYTES) {
       return yield* EffectAcpErrors.AcpRequestError.invalidParams(
-        `Attachment '${attachment.name}' is too large. Antigravity accepts text files up to 1 MiB, images up to 10 MiB, audio up to 20 MiB, and 50 MiB total attachments.`,
+        `Image '${attachment.name}' is too large. Antigravity accepts images up to 10 MiB and 50 MiB of native attachments per message.`,
       );
     }
     const uri = yield* path.toFileUrl(attachmentPath).pipe(
diff --git a/apps/server/src/provider/acp/AntigravitySessionFiles.ts b/apps/server/src/provider/acp/AntigravitySessionFiles.ts
index 07d66065d9ee..f20640bac0a0 100644
--- a/apps/server/src/provider/acp/AntigravitySessionFiles.ts
+++ b/apps/server/src/provider/acp/AntigravitySessionFiles.ts
@@ -43,10 +43,10 @@ export const removeAntigravitySessionFiles = Effect.fn("removeAntigravitySession
 );
 
 /**
- * Removes every per-process runtime temp directory under the profile. Call
- * once when the driver starts, before it launches any process, so a previous
- * server that was killed mid-session cannot leave unpacked runtimes behind.
- * Only the profile-owned directory is touched. The system temp directory
+ * Removes every per-process runtime temp directory under an instance's root.
+ * Call once when the driver starts, before it launches any process, so a
+ * previous server that was killed mid-session cannot leave unpacked runtimes
+ * behind. Only T3-owned directories are touched. The system temp directory
  * belongs to other programs and Windows does not lock data files, so sweeping
  * it could gut a live extraction.
  */
diff --git a/apps/server/src/provider/antigravityAuthSupport.test.ts b/apps/server/src/provider/antigravityAuthSupport.test.ts
index 01fe516454ea..c2402c87c3ca 100644
--- a/apps/server/src/provider/antigravityAuthSupport.test.ts
+++ b/apps/server/src/provider/antigravityAuthSupport.test.ts
@@ -1,6 +1,8 @@
 // @effect-diagnostics-next-line nodeBuiltinImport:off
 import * as NodeChildProcess from "node:child_process";
 
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
+import * as NodePath from "@effect/platform-node/NodePath";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { ProviderInstanceId } from "@t3tools/contracts";
 import {
@@ -11,6 +13,7 @@ import {
 import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
@@ -36,7 +39,7 @@ import {
   makeAntigravityStdoutTransform,
   parseAntigravityAuthorizationUrl,
   prepareAntigravityProfile,
-  resolveAntigravityProfileDirectory,
+  resolveAntigravityInstanceDirectories,
 } from "./antigravityAuthSupport.ts";
 
 const authorizationUrl =
@@ -246,20 +249,44 @@ describe("Antigravity process environment", () => {
     }
   });
 
-  it("keeps accounts separate even when instance IDs differ only by case", () => {
-    const first = resolveAntigravityProfileDirectory(
-      "/userdata",
-      ProviderInstanceId.make("antigravity"),
-    );
-    const second = resolveAntigravityProfileDirectory(
-      "/userdata",
-      ProviderInstanceId.make("Antigravity"),
-    );
-    expect(first.toLowerCase()).not.toBe(second.toLowerCase());
-    expect(
-      resolveAntigravityProfileDirectory("/userdata", ProviderInstanceId.make("antigravity")),
-    ).toBe(first);
-  });
+  it.effect("keeps accounts separate even when instance IDs differ only by case", () =>
+    Effect.gen(function* () {
+      const first = yield* resolveAntigravityInstanceDirectories(
+        "/userdata",
+        ProviderInstanceId.make("antigravity"),
+      );
+      const second = yield* resolveAntigravityInstanceDirectories(
+        "/userdata",
+        ProviderInstanceId.make("Antigravity"),
+      );
+      // Existing sign-ins live at this path; it must not move.
+      expect(first.profile).toBe(
+        "/userdata/providers/antigravity/ac0a3dfd6dddb20962cecff6ee5fe65e19d3923be20e52c5ab52ff877f7e4c32",
+      );
+      expect(first.profile.toLowerCase()).not.toBe(second.profile.toLowerCase());
+      expect(first.runtimeTemp.toLowerCase()).not.toBe(second.runtimeTemp.toLowerCase());
+    }).pipe(Effect.provide(Layer.mergeAll(NodeCrypto.layer, NodePath.layerPosix))),
+  );
+
+  it.effect("keeps the unpacked Windows runtime under MAX_PATH for long user names", () =>
+    Effect.gen(function* () {
+      const path = yield* Path.Path;
+      // Deepest member of the official agy_acp_server_1.1.1 windows-x86_64 bundle.
+      const deepestMember =
+        "google3\\cloud\\developer_experience\\antigravity_extensions\\acp_server\\_private__agy_acp_server_bin.lazy_imports_info.json";
+      const directories = yield* resolveAntigravityInstanceDirectories(
+        "C:\\Users\\a-twenty-char-person\\.t3\\userdata",
+        ProviderInstanceId.make("antigravity"),
+      );
+      const extracted = (tempDirectory: string) =>
+        path.join(tempDirectory, "run-AbC123", "_MEI000012ab2", deepestMember);
+      // MAX_PATH is 260 including the terminating NUL.
+      expect(extracted(directories.runtimeTemp).length).toBeLessThan(260);
+      expect(
+        extracted(path.join(directories.profile, "antigravity-acp", "tmp")).length,
+      ).toBeGreaterThanOrEqual(260);
+    }).pipe(Effect.provide(Layer.mergeAll(NodeCrypto.layer, NodePath.layerWin32))),
+  );
 });
 
 describe("Antigravity authorization URL", () => {
diff --git a/apps/server/src/provider/antigravityAuthSupport.ts b/apps/server/src/provider/antigravityAuthSupport.ts
index b48368ad2a1d..6eaa4ec7a497 100644
--- a/apps/server/src/provider/antigravityAuthSupport.ts
+++ b/apps/server/src/provider/antigravityAuthSupport.ts
@@ -1,13 +1,12 @@
-import * as NodeCrypto from "node:crypto";
 // @effect-diagnostics-next-line nodeBuiltinImport:off - Effect's symlink has no type argument, and Windows needs a junction to link without elevation.
 import * as NodeFSP from "node:fs/promises";
-// @effect-diagnostics-next-line nodeBuiltinImport:off - resolveAntigravityProfileDirectory is a pure sync helper, so it cannot use the Path service.
-import * as NodePath from "node:path";
 
 import type { AntigravityAuthMethod, ProviderInstanceId } from "@t3tools/contracts";
 import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime";
+import * as Crypto from "effect/Crypto";
 import * as Effect from "effect/Effect";
+import * as Encoding from "effect/Encoding";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import type * as PlatformError from "effect/PlatformError";
@@ -185,19 +184,32 @@ export function isAntigravitySignInRequiredError(error: unknown): boolean {
   );
 }
 
-/** Keeps case-sensitive instance IDs separate on case-insensitive filesystems. */
-export function resolveAntigravityProfileDirectory(
-  stateDir: string,
-  instanceId: ProviderInstanceId,
-): string {
-  const directoryName = NodeCrypto.createHash("sha256").update(instanceId).digest("hex");
-  return NodePath.join(stateDir, "providers", "antigravity", directoryName);
+export interface AntigravityInstanceDirectories {
+  /** GEMINI_HOME for the agent. Holds the instance's Google sign-in. */
+  readonly profile: string;
+  /**
+   * Parent of the per-process directories the agent unpacks into. It sits
+   * beside the profile, not inside it: the agent unpacks members up to 120
+   * characters deep, and the profile's longer name would push them past
+   * Windows' 260-character path limit.
+   */
+  readonly runtimeTemp: string;
 }
 
-/** Parent of the per-process runtime temp directories inside a profile. */
-export function resolveAntigravityRuntimeTempDirectory(profileDirectory: string): string {
-  return NodePath.join(profileDirectory, "antigravity-acp", "tmp");
-}
+/** Hashes the instance ID so case-only differences stay separate on case-insensitive filesystems. */
+export const resolveAntigravityInstanceDirectories = Effect.fn(
+  "resolveAntigravityInstanceDirectories",
+)(function* (stateDir: string, instanceId: ProviderInstanceId) {
+  const crypto = yield* Crypto.Crypto;
+  const path = yield* Path.Path;
+  const key = Encoding.encodeHex(
+    yield* crypto.digest("SHA-256", new TextEncoder().encode(instanceId)),
+  );
+  return {
+    profile: path.join(stateDir, "providers", "antigravity", key),
+    runtimeTemp: path.join(stateDir, "antigravity-tmp", key.slice(0, 12)),
+  } satisfies AntigravityInstanceDirectories;
+});
 
 function quoteBrowserArgument(value: string): string {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
@@ -265,9 +277,7 @@ const linkAntigravityUserSkills = Effect.fn("linkAntigravityUserSkills")(functio
     yield* Effect.gen(function* () {
       const existing = yield* fs.readLink(link).pipe(
         Effect.map((value): string | undefined => path.resolve(path.dirname(link), value)),
-        Effect.catch((error) =>
-          error.reason._tag === "NotFound" ? Effect.succeed(undefined) : Effect.fail(error),
-        ),
+        Effect.catchReason("PlatformError", "NotFound", () => Effect.undefined),
       );
       if (existing === target) return;
       if (existing !== undefined) {
@@ -300,6 +310,8 @@ export const prepareAntigravityProfile = Effect.fn("prepareAntigravityProfile")(
   readonly auth?: AntigravityAuthConfig;
   /** Home the agent expands `~` against. Defaults to the launch environment's. */
   readonly userHome?: string;
+  /** Parent of per-process temp directories. Defaults to one inside the profile. */
+  readonly tempDirectory?: string;
 }) {
   const auth = input.auth ?? ANTIGRAVITY_PERSONAL_AUTH;
   const fs = yield* FileSystem.FileSystem;
@@ -337,7 +349,7 @@ export const prepareAntigravityProfile = Effect.fn("prepareAntigravityProfile")(
 
   const geminiHome = path.resolve(input.profileDirectory);
   const acpDirectory = path.join(geminiHome, "antigravity-acp");
-  const tempDirectory = resolveAntigravityRuntimeTempDirectory(geminiHome);
+  const tempDirectory = input.tempDirectory ?? path.join(acpDirectory, "tmp");
   const profile: AntigravityProfile = {
     platform,
     geminiHome,
diff --git a/apps/server/src/provider/cursorCredentialStore.test.ts b/apps/server/src/provider/cursorCredentialStore.test.ts
new file mode 100644
index 000000000000..f212ce110ea6
--- /dev/null
+++ b/apps/server/src/provider/cursorCredentialStore.test.ts
@@ -0,0 +1,46 @@
+import { assert, describe, it } from "@effect/vitest";
+
+import {
+  CursorKeychainTimeoutError,
+  makeCachedCursorAccessTokenReader,
+} from "./cursorCredentialStore.ts";
+
+describe("Cursor Keychain reader", () => {
+  it("shares concurrent reads and rechecks after the cache expires", async () => {
+    let reads = 0;
+    let time = 0;
+    const read = makeCachedCursorAccessTokenReader(
+      async () => {
+        reads++;
+        return `token-${reads}`;
+      },
+      () => time,
+    );
+    assert.deepStrictEqual(await Promise.all([read(), read()]), ["token-1", "token-1"]);
+    assert.strictEqual(await read(), "token-1");
+    assert.strictEqual(reads, 1);
+    time = 5 * 60_000;
+    assert.strictEqual(await read(), "token-2");
+  });
+
+  it("gives up on an unanswered prompt and reuses it on the next read", async () => {
+    let reads = 0;
+    let allow: (token: string) => void = () => {};
+    const read = makeCachedCursorAccessTokenReader(
+      () => {
+        reads++;
+        return new Promise((resolve) => {
+          allow = resolve;
+        });
+      },
+      () => 0,
+      1,
+    );
+    const error = await read().catch((cause: unknown) => cause);
+    assert.instanceOf(error, CursorKeychainTimeoutError);
+    const retry = read();
+    allow("token");
+    assert.strictEqual(await retry, "token");
+    assert.strictEqual(reads, 1);
+  });
+});
diff --git a/apps/server/src/provider/cursorCredentialStore.ts b/apps/server/src/provider/cursorCredentialStore.ts
new file mode 100644
index 000000000000..2857683e4821
--- /dev/null
+++ b/apps/server/src/provider/cursorCredentialStore.ts
@@ -0,0 +1,55 @@
+import * as NodeModule from "node:module";
+
+const CACHE_MS = 5 * 60_000;
+
+const requireForKeyring = NodeModule.createRequire(import.meta.url);
+
+/** Rejected when nobody answers the macOS Keychain prompt in time. */
+export class CursorKeychainTimeoutError extends Error {
+  constructor() {
+    super("Timed out waiting for Keychain access.");
+  }
+}
+
+/**
+ * Share one Keychain request across usage history and limits in this server process.
+ *
+ * macOS shows the access prompt on the server's own screen, which a remote
+ * client cannot answer, so callers give up after `timeoutMs`. The read stays in
+ * flight: the next call reuses it instead of stacking a second prompt, and picks
+ * up the token once someone allows access.
+ */
+export function makeCachedCursorAccessTokenReader(
+  read: () => Promise<string | null>,
+  now: () => number = Date.now,
+  timeoutMs = 30_000,
+): () => Promise<string | null> {
+  let cached: { token: string; until: number } | null = null;
+  let pending: Promise<string | null> | null = null;
+  return () => {
+    if (cached && cached.until > now()) return Promise.resolve(cached.token);
+    pending ??= read()
+      .then((token) => {
+        cached = token ? { token, until: now() + CACHE_MS } : null;
+        return token;
+      })
+      .finally(() => {
+        pending = null;
+      });
+    const deadline = AbortSignal.timeout(timeoutMs);
+    return Promise.race([
+      pending,
+      new Promise<never>((_, reject) => {
+        deadline.addEventListener("abort", () => reject(new CursorKeychainTimeoutError()), {
+          once: true,
+        });
+      }),
+    ]);
+  };
+}
+
+/** Read the Cursor CLI's default macOS credential without invoking the shared security binary. */
+export const readMacCursorAccessToken = makeCachedCursorAccessTokenReader(async () => {
+  const { AsyncEntry } = requireForKeyring("@napi-rs/keyring") as typeof import("@napi-rs/keyring");
+  return (await new AsyncEntry("cursor-access-token", "cursor-user").getPassword()) ?? null;
+});
diff --git a/apps/server/src/provider/makeManagedServerProvider.ts b/apps/server/src/provider/makeManagedServerProvider.ts
index c180412ec42d..119c577474c8 100644
--- a/apps/server/src/provider/makeManagedServerProvider.ts
+++ b/apps/server/src/provider/makeManagedServerProvider.ts
@@ -252,6 +252,7 @@ export const makeManagedServerProvider = Effect.fn("makeManagedServerProvider")(
   yield* Effect.forever(
     getRefreshInterval.pipe(
       Effect.flatMap((refreshInterval) =>
+        // @effect-diagnostics-next-line raceFirstWithSleepToTimeout:off - races the interval against a settings-change signal, not a timeout
         Effect.raceFirst(
           Effect.sleep(
             Duration.toMillis(Duration.fromInputUnsafe(refreshInterval)) <= 0
diff --git a/apps/server/src/provider/model-manifest.json b/apps/server/src/provider/model-manifest.json
index 8befdd86ec52..1c5f900849d4 100644
--- a/apps/server/src/provider/model-manifest.json
+++ b/apps/server/src/provider/model-manifest.json
@@ -1,16 +1,92 @@
 {
   "version": 1,
-  "updatedAt": "2026-09-22T17:51:55Z",
+  "updatedAt": "2026-09-29T20:20:00Z",
+  "compatibility": [
+    {
+      "driver": "codex",
+      "t3CodeRange": ">=0.0.44",
+      "recommendedRange": ">=0.159.0",
+      "ranges": [
+        { "range": ">=0.156.0", "status": "supported" },
+        { "range": ">=0.149.0 <0.156.0", "status": "unsupported" },
+        { "range": "<0.149.0", "status": "broken" }
+      ]
+    },
+    {
+      "driver": "codex",
+      "t3CodeRange": ">=0.0.42 <0.0.44",
+      "recommendedRange": ">=0.156.0",
+      "ranges": [
+        { "range": ">=0.156.0", "status": "supported" },
+        { "range": ">=0.149.0 <0.156.0", "status": "unsupported" },
+        { "range": "<0.149.0", "status": "broken" }
+      ]
+    },
+    {
+      "driver": "claudeAgent",
+      "t3CodeRange": ">=0.0.42",
+      "recommendedRange": ">=2.1.280",
+      "ranges": [
+        { "range": ">=2.1.280", "status": "supported" },
+        { "range": ">=2.1.111 <2.1.280", "status": "graceful" },
+        { "range": "<2.1.111", "status": "unsupported" }
+      ]
+    },
+    {
+      "driver": "openrouter",
+      "t3CodeRange": ">=0.0.42",
+      "recommendedRange": ">=2.1.280",
+      "ranges": [
+        { "range": ">=2.1.280", "status": "supported" },
+        { "range": ">=2.1.111 <2.1.280", "status": "graceful" },
+        { "range": "<2.1.111", "status": "unsupported" }
+      ]
+    },
+    {
+      "driver": "cursor",
+      "t3CodeRange": ">=0.0.42",
+      "recommendedRange": ">=2026.05.09",
+      "ranges": [
+        { "range": ">=2026.05.09", "status": "supported" },
+        { "range": "<2026.05.09", "status": "unknown" }
+      ]
+    },
+    {
+      "driver": "grok",
+      "t3CodeRange": ">=0.0.42",
+      "recommendedRange": ">=1.0.13",
+      "ranges": [
+        { "range": ">=1.0.13", "status": "supported" },
+        { "range": "<1.0.13", "status": "unknown" }
+      ]
+    },
+    {
+      "driver": "opencode",
+      "t3CodeRange": ">=0.0.42",
+      "recommendedRange": ">=1.14.19 <2.0.0",
+      "recommendedVersion": "1.14.19",
+      "ranges": [
+        { "range": ">=2.0.0", "status": "broken" },
+        { "range": ">=1.14.19 <2.0.0", "status": "supported" },
+        { "range": "<1.14.19", "status": "broken" }
+      ]
+    },
+    {
+      "driver": "antigravity",
+      "t3CodeRange": ">=0.0.42",
+      "recommendedRange": "=1.1.1",
+      "ranges": [{ "range": "=1.1.1", "status": "supported" }]
+    }
+  ],
   "currentModels": {
     "codex": [
       "gpt-6-astra",
-      "gpt-5.6-luna",
-      "gpt-5.6-terra",
-      "gpt-5.6-sol",
+      "gpt-6.1-sol",
+      "gpt-6-luna",
       "gpt-daybreak-blue-latest",
       "gpt-daybreak-red-latest"
     ],
-    "claudeAgent": ["claude-fable-5-1", "claude-opus-5-5", "claude-opus-5", "claude-sonnet-5"],
+    "claudeAgent": ["claude-fable-5-1", "claude-opus-5-5", "claude-sonnet-5-5", "claude-sonnet-5"],
     "antigravity": ["gemini-3.8-flash-high", "gemini-3.8-flash-medium", "gemini-3.8-flash-low"]
   },
   "providers": {
@@ -605,6 +681,15 @@
           "profile": "opus-5-5",
           "adapter": { "claudeCode": { "minVersion": "2.1.280" } }
         },
+        {
+          "slug": "claude-sonnet-5-5",
+          "name": "Claude Sonnet 5.5",
+          "aliases": ["sonnet-5.5", "claude-sonnet-5.5"],
+          "status": "current",
+          "badge": "new",
+          "profile": "sonnet-5",
+          "adapter": { "claudeCode": { "minVersion": "2.1.284" } }
+        },
         {
           "slug": "claude-fable-5-1",
           "name": "Claude Fable 5.1",
diff --git a/apps/server/src/provider/opencodeRuntime.ts b/apps/server/src/provider/opencodeRuntime.ts
index e87f758e0e3d..d8319bc44a71 100644
--- a/apps/server/src/provider/opencodeRuntime.ts
+++ b/apps/server/src/provider/opencodeRuntime.ts
@@ -78,7 +78,6 @@ export function resolveOpenCodeServerPassword(
     : input.environment.OPENCODE_SERVER_PASSWORD;
 }
 
-const OPENCODE_SERVER_READY_PREFIX = "opencode server listening";
 const DEFAULT_OPENCODE_SERVER_TIMEOUT_MS = 30_000;
 const DEFAULT_HOSTNAME = "127.0.0.1";
 const OPENCODE_SERVER_STARTUP_MAX_OUTPUT_CHARS = 64 * 1024;
@@ -289,11 +288,8 @@ export interface OpenCodeRuntimeShape {
 
 function parseServerUrlFromOutput(output: string): string | null {
   for (const line of output.split("\n")) {
-    if (!line.startsWith(OPENCODE_SERVER_READY_PREFIX)) {
-      continue;
-    }
-    const match = line.match(/on\s+(https?:\/\/[^\s]+)/);
-    return match?.[1] ?? null;
+    const match = line.match(/server listening on\s+(https?:\/\/[^\s]+)/i);
+    if (match?.[1]) return match[1];
   }
   return null;
 }
diff --git a/apps/server/src/provider/providerCompatibility.test.ts b/apps/server/src/provider/providerCompatibility.test.ts
new file mode 100644
index 000000000000..3a43356d2caf
--- /dev/null
+++ b/apps/server/src/provider/providerCompatibility.test.ts
@@ -0,0 +1,321 @@
+import { assert, describe, it } from "@effect/vitest";
+import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as Deferred from "effect/Deferred";
+import * as Fiber from "effect/Fiber";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as PubSub from "effect/PubSub";
+import * as Ref from "effect/Ref";
+import * as Stream from "effect/Stream";
+import * as ServerConfig from "../config.ts";
+import * as ModelManifest from "./ModelManifest.ts";
+import { ProviderRegistryLive } from "./Layers/ProviderRegistry.ts";
+import { ProviderRegistry } from "./Services/ProviderRegistry.ts";
+import { ProviderInstanceRegistry } from "./Services/ProviderInstanceRegistry.ts";
+import type { ProviderInstance } from "./ProviderDriver.ts";
+import { makeManualOnlyProviderMaintenanceCapabilities } from "./providerMaintenance.ts";
+import { BUILT_IN_DRIVERS } from "./builtInDrivers.ts";
+import * as Schema from "effect/Schema";
+import {
+  applyProviderCompatibility,
+  ProviderCompatibilityPolicy,
+  resolveProviderCompatibility,
+} from "./providerCompatibility.ts";
+
+const driver = ProviderDriverKind.make("codex");
+const policy: ProviderCompatibilityPolicy = {
+  driver,
+  t3CodeRange: ">=0.0.42 <0.1.0",
+  recommendedVersion: "2.0.0",
+  recommendedRange: ">=2.0.0 <3.0.0",
+  ranges: [
+    { range: "<1.0.0", status: "broken" },
+    { range: ">=1.0.0 <1.5.0", status: "unsupported" },
+    { range: ">=1.5.0 <2.0.0", status: "graceful" },
+    { range: ">=2.0.0 <3.0.0", status: "supported" },
+  ],
+};
+const provider: ServerProvider = {
+  driver,
+  instanceId: ProviderInstanceId.make("codex-work"),
+  enabled: true,
+  installed: true,
+  version: "0.9.0",
+  status: "error",
+  message: "Authentication failed",
+  checkedAt: "2026-09-22T00:00:00Z",
+  auth: { status: "unauthenticated" },
+  models: [],
+  skills: [],
+  slashCommands: [],
+};
+
+describe("provider compatibility", () => {
+  it("bundles a compatibility policy for every built-in harness", () => {
+    for (const builtIn of BUILT_IN_DRIVERS) {
+      assert.isDefined(
+        resolveProviderCompatibility(
+          ModelManifest.BUNDLED_MODEL_MANIFEST.compatibility,
+          builtIn.driverKind,
+          null,
+        ),
+        `Missing bundled compatibility policy for ${builtIn.driverKind}`,
+      );
+    }
+  });
+
+  it("compares Cursor build dates without treating semver prereleases as stable", () => {
+    const cursor = ProviderDriverKind.make("cursor");
+    const cursorPolicy: ProviderCompatibilityPolicy = {
+      driver: cursor,
+      t3CodeRange: policy.t3CodeRange,
+      ranges: [
+        { range: "<2026.05.09", status: "unsupported" },
+        { range: ">=2026.05.09", status: "supported" },
+      ],
+    };
+    for (const [version, expected] of [
+      ["2026.05.08-a1b2c3d", "unsupported"],
+      ["2026.05.09-a1b2c3d", "supported"],
+      ["2026.09.22-f2b0fcd", "supported"],
+      ["2026.05.09", "supported"],
+      ["2026.05.09-beta.1", "unknown"],
+    ] as const) {
+      assert.strictEqual(
+        resolveProviderCompatibility([cursorPolicy], cursor, version)?.status,
+        expected,
+      );
+    }
+    assert.strictEqual(
+      resolveProviderCompatibility([policy], driver, "2.0.0-a1b2c3d")?.status,
+      "unknown",
+    );
+  });
+
+  it("recognizes Antigravity semver release tags while keeping dated candidates unknown", () => {
+    const antigravity = ProviderDriverKind.make("antigravity");
+    const taggedPolicy = {
+      ...policy,
+      driver: antigravity,
+      ranges: [{ range: "=2.0.0", status: "supported" as const }],
+    };
+    for (const [version, expected] of [
+      ["agy_acp_server_2.0.0", "supported"],
+      ["2.0.0", "supported"],
+      ["agy_acp_server_2.0.1", "unknown"],
+      ["agy_acp_server_2.0.0-beta.1", "unknown"],
+      ["agy_acp_server_20260818_01_RC01", "unknown"],
+    ] as const) {
+      assert.strictEqual(
+        resolveProviderCompatibility([taggedPolicy], antigravity, version)?.status,
+        expected,
+      );
+    }
+  });
+
+  it("classifies boundaries and treats unlisted versions and release tags as unknown", () => {
+    for (const [version, expected] of [
+      ["0.9.9", "broken"],
+      ["1.0.0", "unsupported"],
+      ["1.5.0", "graceful"],
+      ["2.0.0", "supported"],
+      ["v2.0.0", "supported"],
+      ["3.0.0", "unknown"],
+      ["2.0.0-beta.1", "unknown"],
+      ["agy_acp_server_20260818_01_RC01", "unknown"],
+      [null, "unknown"],
+    ] as const) {
+      assert.strictEqual(resolveProviderCompatibility([policy], driver, version)?.status, expected);
+    }
+    assert.isUndefined(resolveProviderCompatibility([policy], driver, "0.9.0", "0.1.0"));
+  });
+
+  it("supports every driver without inventing policies for uncovered adapters", () => {
+    for (const kind of [
+      "codex",
+      "claudeAgent",
+      "cursor",
+      "grok",
+      "opencode",
+      "antigravity",
+      "customDriver",
+    ]) {
+      const adapter = ProviderDriverKind.make(kind);
+      assert.strictEqual(
+        resolveProviderCompatibility([{ ...policy, driver: adapter }], adapter, "2.0.0")?.status,
+        "supported",
+      );
+      assert.isUndefined(resolveProviderCompatibility([], adapter, "2.0.0"));
+    }
+  });
+
+  it("relaxes remote policy without losing probe errors, and falls back when a policy is omitted", () => {
+    const broken = applyProviderCompatibility(provider, [], [policy]);
+    assert.strictEqual(broken.compatibilityAdvisory?.status, "broken");
+    const relaxed = { ...policy, ranges: [{ range: ">=0.0.0", status: "supported" as const }] };
+    const supported = applyProviderCompatibility(broken, [relaxed], [policy]);
+    assert.strictEqual(supported.compatibilityAdvisory?.status, "supported");
+    assert.strictEqual(supported.status, "error");
+    assert.strictEqual(supported.message, "Authentication failed");
+    assert.strictEqual(
+      applyProviderCompatibility(supported, [{ ...policy, t3CodeRange: ">=9.0.0" }], [policy])
+        .compatibilityAdvisory?.status,
+      "broken",
+    );
+    const removed = applyProviderCompatibility(supported, [], []);
+    assert.isUndefined(removed.compatibilityAdvisory);
+    assert.strictEqual(removed.status, "error");
+    assert.strictEqual(removed.message, "Authentication failed");
+    assert.isUndefined(
+      applyProviderCompatibility({ ...broken, enabled: false }, [], [policy]).compatibilityAdvisory,
+    );
+    assert.isUndefined(
+      applyProviderCompatibility({ ...broken, installed: false }, [], [policy])
+        .compatibilityAdvisory,
+    );
+  });
+
+  it("rejects invalid ranges and recommendations outside the first supported match", () => {
+    const decode = Schema.decodeUnknownSync(ProviderCompatibilityPolicy);
+    assert.doesNotThrow(() => decode(policy));
+    const prefixed = decode({
+      ...policy,
+      t3CodeRange: ">=v0.0.42 <v0.1",
+      recommendedRange: "^v2",
+      ranges: [{ range: ">=v2.0 <v3", status: "supported" }],
+    });
+    assert.strictEqual(
+      resolveProviderCompatibility([prefixed], driver, "2.0.0")?.status,
+      "supported",
+    );
+    assert.strictEqual(
+      resolveProviderCompatibility([prefixed], driver, "3.0.0")?.status,
+      "unknown",
+    );
+    for (const invalid of [
+      { ...policy, t3CodeRange: "*" },
+      { ...policy, recommendedVersion: "3.0.0" },
+      { ...policy, ranges: [{ range: ">=2.0.0 garbage", status: "supported" }] },
+      { ...policy, recommendedVersion: "2.0.0; echo unsafe" },
+      { ...policy, ranges: [{ range: ">=0.0.0", status: "broken" }, ...policy.ranges] },
+    ])
+      assert.throws(() => decode(invalid));
+  });
+});
+
+it.effect("a remote policy refresh preserves a newer health result on the registry stream", () =>
+  Effect.gen(function* () {
+    const started = yield* Deferred.make<void>();
+    const release = yield* Deferred.make<void>();
+    const health = yield* Ref.make<ServerProvider>({
+      ...provider,
+      status: "ready" as ServerProvider["status"],
+      message: "Healthy",
+    });
+    const manifest = yield* Ref.make<ModelManifest.ModelManifestData>({
+      version: 1,
+      currentModels: {},
+      compatibility: [policy],
+    });
+    const instance: ProviderInstance = {
+      instanceId: provider.instanceId,
+      driverKind: driver,
+      enabled: true,
+      displayName: undefined,
+      continuationIdentity: { driverKind: driver, continuationKey: "test-codex" },
+      snapshot: {
+        getSnapshot: Ref.get(health),
+        refresh: Ref.get(health),
+        streamChanges: Stream.empty,
+        applyUsageLimits: () => Effect.void,
+        resolveMaintenance: () =>
+          Effect.succeed(
+            makeManualOnlyProviderMaintenanceCapabilities({ provider: driver, packageName: null }),
+          ),
+      },
+      adapter: {} as ProviderInstance["adapter"],
+      textGeneration: {} as ProviderInstance["textGeneration"],
+    };
+    const refresh = Deferred.succeed(started, undefined).pipe(
+      Effect.andThen(Deferred.await(release)),
+      Effect.andThen(
+        Ref.updateAndGet(manifest, (current) => ({
+          ...current,
+          compatibility: [
+            { ...policy, ranges: [{ range: ">=0.0.0", status: "supported" as const }] },
+          ],
+        })),
+      ),
+    );
+    const dependencies = Layer.mergeAll(
+      Layer.succeed(ModelManifest.ModelManifest, {
+        current: Ref.get(manifest),
+        refresh,
+        forceRefresh: refresh,
+        refreshInBackground: Effect.void,
+      }),
+      Layer.succeed(ProviderInstanceRegistry, {
+        getInstance: (id) => Effect.succeed(id === instance.instanceId ? instance : undefined),
+        listInstances: Effect.succeed([instance]),
+        listUnavailable: Effect.succeed([]),
+        streamChanges: Stream.empty,
+        subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
+      }),
+      ServerConfig.layerTest(process.cwd(), { prefix: "compatibility-registry-test" }).pipe(
+        Layer.provideMerge(NodeServices.layer),
+      ),
+    );
+    yield* Effect.gen(function* () {
+      const registry = yield* ProviderRegistry;
+      yield* Deferred.await(started);
+      assert.strictEqual(
+        (yield* registry.getProviders)[0]?.compatibilityAdvisory?.status,
+        "broken",
+      );
+      yield* Ref.set(health, provider);
+      const latestHealth = yield* registry.refreshInstance(provider.instanceId);
+      assert.strictEqual(latestHealth[0]?.message, "Authentication failed");
+      const supported = yield* Stream.toPull(
+        registry.streamChanges.pipe(
+          Stream.filter((snapshots) => snapshots[0]?.compatibilityAdvisory?.status === "supported"),
+        ),
+      );
+      const subscribed = yield* supported.pipe(Effect.forkScoped({ startImmediately: true }));
+      yield* Deferred.succeed(release, undefined);
+      const updated = (yield* Fiber.join(subscribed))[0]?.[0];
+      assert.strictEqual(updated?.compatibilityAdvisory?.status, "supported");
+      assert.strictEqual(updated?.status, "error");
+      assert.strictEqual(updated?.message, "Authentication failed");
+    }).pipe(Effect.provide(ProviderRegistryLive.pipe(Layer.provide(dependencies))));
+  }).pipe(Effect.scoped),
+);
+
+it("recomputes latest-version compatibility without losing the underlying update advisory", () => {
+  const snapshot: ServerProvider = {
+    ...provider,
+    version: "2.0.0",
+    versionAdvisory: {
+      status: "behind_latest",
+      currentVersion: "2.0.0",
+      latestVersion: "4.0.0",
+      canUpdate: true,
+      updateCommand: "npm install -g fixture@latest",
+      checkedAt: provider.checkedAt,
+      message: null,
+    },
+  };
+  const blockedPolicy: ProviderCompatibilityPolicy = {
+    ...policy,
+    ranges: [...policy.ranges, { range: ">=3.0.0", status: "broken" }],
+  };
+  const blocked = applyProviderCompatibility(snapshot, [blockedPolicy], []);
+  assert.strictEqual(blocked.compatibilityAdvisory?.latestVersionStatus, "broken");
+  const relaxed = applyProviderCompatibility(
+    blocked,
+    [{ ...policy, ranges: [{ range: ">=2.0.0", status: "supported" }] }],
+    [],
+  );
+  assert.strictEqual(relaxed.compatibilityAdvisory?.latestVersionStatus, "supported");
+  assert.deepStrictEqual(relaxed.versionAdvisory, snapshot.versionAdvisory);
+});
diff --git a/apps/server/src/provider/providerCompatibility.ts b/apps/server/src/provider/providerCompatibility.ts
new file mode 100644
index 000000000000..b4ce66f87603
--- /dev/null
+++ b/apps/server/src/provider/providerCompatibility.ts
@@ -0,0 +1,127 @@
+import {
+  TrimmedNonEmptyString,
+  ServerProviderCompatibilityStatus,
+  type ProviderDriverKind,
+  type ServerProvider,
+  type ServerProviderCompatibilityAdvisory,
+} from "@t3tools/contracts";
+import { satisfiesSemverRange } from "@t3tools/shared/semver";
+import * as Schema from "effect/Schema";
+import packageJson from "../../package.json" with { type: "json" };
+
+// Deliberately uses the shared CLI gate syntax: comparator groups joined by ||.
+// Prereleases and unrecognized release tags remain unknown.
+const StableVersion = TrimmedNonEmptyString.pipe(
+  Schema.check(Schema.makeFilter((value) => /^\d+\.\d+\.\d+$/.test(value))),
+);
+const VersionRange = TrimmedNonEmptyString.pipe(
+  Schema.check(
+    Schema.makeFilter((value) =>
+      value.split("||").every((group) => {
+        const tokens = group.trim().split(/\s+/);
+        return tokens.every((token) => /^(?:\^|>=|>|<=|<|=)?v?\d+(?:\.\d+){0,2}$/.test(token));
+      }),
+    ),
+  ),
+);
+const Policy = Schema.Struct({
+  driver: TrimmedNonEmptyString,
+  t3CodeRange: VersionRange,
+  recommendedRange: Schema.optionalKey(VersionRange),
+  recommendedVersion: Schema.optionalKey(StableVersion),
+  ranges: Schema.Array(
+    Schema.Struct({
+      range: VersionRange,
+      status: ServerProviderCompatibilityStatus,
+    }),
+  ),
+});
+
+export const ProviderCompatibilityPolicy = Policy.pipe(
+  Schema.check(
+    Schema.makeFilter(
+      (policy) => {
+        const version = policy.recommendedVersion;
+        if (version === undefined) return true;
+        return (
+          (policy.recommendedRange === undefined ||
+            satisfiesSemverRange(version, policy.recommendedRange)) &&
+          policy.ranges.find((entry) => satisfiesSemverRange(version, entry.range))?.status ===
+            "supported"
+        );
+      },
+      { expected: "a recommended version in a supported range" },
+    ),
+  ),
+);
+export type ProviderCompatibilityPolicy = typeof ProviderCompatibilityPolicy.Type;
+
+export function resolveProviderCompatibility(
+  policies: ReadonlyArray<ProviderCompatibilityPolicy> | undefined,
+  driver: ProviderDriverKind,
+  version: string | null,
+  t3CodeVersion = packageJson.version,
+): ServerProviderCompatibilityAdvisory | undefined {
+  const policy = policies?.find(
+    (entry) => entry.driver === driver && satisfiesSemverRange(t3CodeVersion, entry.t3CodeRange),
+  );
+  if (!policy) return undefined;
+  const unprefixed = version?.replace(/^v/, "");
+  // Cursor appends a build hash to its date; Google's ACP runtime uses a release prefix.
+  // Strip only these driver-specific forms, keeping semver prereleases unknown.
+  const stable =
+    driver === "cursor"
+      ? unprefixed?.replace(/^(\d{4}\.\d{2}\.\d{2})-[a-f0-9]+$/, "$1")
+      : driver === "antigravity"
+        ? unprefixed?.replace(/^agy_acp_server_(\d+\.\d+\.\d+)$/, "$1")
+        : unprefixed;
+  const status =
+    stable && /^\d+\.\d+\.\d+$/.test(stable)
+      ? (policy.ranges.find((entry) => satisfiesSemverRange(stable, entry.range))?.status ??
+        "unknown")
+      : "unknown";
+  const message =
+    status === "broken"
+      ? "This provider version is known to be incompatible with this T3 Code release."
+      : status === "unsupported"
+        ? "This provider version is outside the supported range for this T3 Code release."
+        : status === "graceful"
+          ? "This provider version has limited compatibility with this T3 Code release."
+          : null;
+  const recommendedVersion = policy.recommendedVersion ?? null;
+  const recommendedRange = policy.recommendedRange ?? null;
+  const recommendation = recommendedVersion ?? recommendedRange;
+  return {
+    status,
+    message: message && recommendation ? `${message} Use ${recommendation}.` : message,
+    recommendedVersion,
+    recommendedRange,
+  };
+}
+
+/** A remote policy replaces its matching bundled policy; omission keeps the bundle. */
+export function applyProviderCompatibility(
+  snapshot: ServerProvider,
+  policies: ReadonlyArray<ProviderCompatibilityPolicy> | undefined,
+  fallback: ReadonlyArray<ProviderCompatibilityPolicy> | undefined,
+): ServerProvider {
+  const { compatibilityAdvisory: _previous, ...base } = snapshot;
+  if (!snapshot.enabled || !snapshot.installed) return base;
+  const advisory =
+    resolveProviderCompatibility(policies, snapshot.driver, snapshot.version) ??
+    resolveProviderCompatibility(fallback, snapshot.driver, snapshot.version);
+  const latestVersion = snapshot.versionAdvisory?.latestVersion;
+  const latestAdvisory = latestVersion
+    ? (resolveProviderCompatibility(policies, snapshot.driver, latestVersion) ??
+      resolveProviderCompatibility(fallback, snapshot.driver, latestVersion))
+    : undefined;
+  return advisory
+    ? {
+        ...base,
+        compatibilityAdvisory: {
+          ...advisory,
+          ...(latestAdvisory ? { latestVersionStatus: latestAdvisory.status } : {}),
+        },
+      }
+    : base;
+}
diff --git a/apps/server/src/provider/providerInstallation.test.ts b/apps/server/src/provider/providerInstallation.test.ts
index dba0bafecad7..b1bea19c2df1 100644
--- a/apps/server/src/provider/providerInstallation.test.ts
+++ b/apps/server/src/provider/providerInstallation.test.ts
@@ -13,6 +13,7 @@ import * as Path from "effect/Path";
 import * as Stream from "effect/Stream";
 
 import { layerTest as settingsLayerTest } from "../serverSettings.ts";
+import { CodexInstallation } from "./CodexInstallation.ts";
 import { AntigravityInstallation } from "./AntigravityInstallation.ts";
 import type { ProviderInstance } from "./ProviderDriver.ts";
 import { makeProviderInstallation } from "./providerInstallation.ts";
@@ -33,9 +34,9 @@ const state: ProviderInstallState = {
   message: null,
 };
 
-function instance(kind = driver): ProviderInstance {
+function instance(kind = driver, id = instanceId): ProviderInstance {
   return {
-    instanceId,
+    instanceId: id,
     driverKind: kind,
     enabled: false,
     displayName: undefined,
@@ -77,6 +78,25 @@ const makeHarness = Effect.fn("providerInstallation.test.makeHarness")(function*
               return [];
             }),
         }),
+        Layer.mock(CodexInstallation)({
+          managedDirectory: "/unused-managed-codex",
+          start: Effect.sync(() => {
+            calls.push("codex-start");
+            return { ...state, driver: ProviderDriverKind.make("codex") };
+          }),
+          cancel: () =>
+            Effect.sync(() => {
+              calls.push("codex-cancel");
+              return { ...state, driver: ProviderDriverKind.make("codex") };
+            }),
+          state: Effect.succeed({ ...state, driver: ProviderDriverKind.make("codex") }),
+          changes: Stream.succeed({ ...state, driver: ProviderDriverKind.make("codex") }),
+          remove: (paths) =>
+            Effect.sync(() => {
+              protectedPaths = paths ?? [];
+              calls.push("codex-remove");
+            }),
+        }),
         Layer.mock(AntigravityInstallation)({
           managedDirectory: "/unused-managed-runtime",
           start: Effect.sync(() => {
@@ -139,6 +159,37 @@ describe("provider installation routing", () => {
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
 
+  it.effect("routes a managed Codex instance through its own installer and refreshes removal", () =>
+    Effect.gen(function* () {
+      const codexId = ProviderInstanceId.make("codex");
+      const harness = yield* makeHarness({
+        instance: instance(ProviderDriverKind.make("codex"), codexId),
+        settings: { providers: { codex: { setupMode: "managed" } } },
+      });
+      assert.equal((yield* harness.router.start({ instanceId: codexId })).driver, "codex");
+      yield* harness.router.cancel({ instanceId: codexId, operationId: "operation" });
+      const observed = yield* Stream.runCollect(harness.router.subscribe({ instanceId: codexId }));
+      assert.equal(Array.from(observed)[0]?.driver, "codex");
+      yield* harness.router.remove({ instanceId: codexId });
+      assert.deepEqual(harness.calls, ["codex-start", "codex-cancel", "codex-remove", "refresh"]);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect("keeps native Codex installation outside managed setup", () =>
+    Effect.gen(function* () {
+      const codexId = ProviderInstanceId.make("codex");
+      const harness = yield* makeHarness({
+        instance: instance(ProviderDriverKind.make("codex"), codexId),
+        settings: { providers: { codex: { setupMode: "existing" } } },
+      });
+      assert.include(
+        (yield* Effect.flip(harness.router.start({ instanceId: codexId }))).detail,
+        "Choose managed setup",
+      );
+      assert.deepEqual(harness.calls, []);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+
   it.effect("protects another instance's binary found through its own PATH", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
diff --git a/apps/server/src/provider/providerInstallation.ts b/apps/server/src/provider/providerInstallation.ts
index cdec50fb0bb2..5cf99ce27b95 100644
--- a/apps/server/src/provider/providerInstallation.ts
+++ b/apps/server/src/provider/providerInstallation.ts
@@ -1,5 +1,6 @@
 import {
   AntigravitySettings,
+  CodexSettings,
   ProviderDriverKind,
   type ProviderInstallCancelInput,
   type ProviderInstanceId,
@@ -11,6 +12,7 @@ import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 
+import { CodexInstallation, type CodexInstallationError } from "./CodexInstallation.ts";
 import { ServerSettingsService } from "../serverSettings.ts";
 import {
   AntigravityInstallation,
@@ -23,11 +25,13 @@ import { mergeProviderInstanceEnvironment } from "./ProviderInstanceEnvironment.
 
 const ANTIGRAVITY = ProviderDriverKind.make("antigravity");
 const hasBinaryPath = Schema.is(Schema.Struct({ binaryPath: Schema.String }));
+const decodeCodexSettings = Schema.decodeUnknownEffect(CodexSettings);
 const decodeAntigravitySettings = Schema.decodeUnknownEffect(AntigravitySettings);
 
 /** Route instance setup to the environment-owned installer without owning the download. */
 export const makeProviderInstallation = Effect.fn("makeProviderInstallation")(function* () {
-  const installation = yield* AntigravityInstallation;
+  const antigravityInstallation = yield* AntigravityInstallation;
+  const codexInstallation = yield* CodexInstallation;
   const instances = yield* ProviderInstanceRegistry;
   const providers = yield* ProviderRegistry;
   const settings = yield* ServerSettingsService;
@@ -55,26 +59,37 @@ export const makeProviderInstallation = Effect.fn("makeProviderInstallation")(fu
     managedOnly = false,
   ) {
     const instance = yield* instances.getInstance(instanceId);
-    if (instance?.driverKind !== ANTIGRAVITY) {
+    const isCodex = instance?.driverKind === ProviderDriverKind.make("codex");
+    if (instance?.driverKind !== ANTIGRAVITY && !isCodex) {
       return yield* new ProviderSetupError({
         instanceId,
         operation,
         detail: "Managed installation is not available for this provider instance.",
       });
     }
-    if (!managedOnly) return;
+    const installation = isCodex ? codexInstallation : antigravityInstallation;
     const entries = yield* readEntries(instanceId, operation);
-    const config = yield* decodeAntigravitySettings(entries[instanceId]?.config ?? {}).pipe(
-      Effect.mapError(
-        () =>
-          new ProviderSetupError({
-            instanceId,
-            operation,
-            detail: "The Antigravity instance configuration is invalid.",
-          }),
-      ),
-    );
-    if (config.binaryPath) {
+    const invalidConfig = () =>
+      new ProviderSetupError({
+        instanceId,
+        operation,
+        detail: "The provider instance configuration is invalid.",
+      });
+    const config = isCodex
+      ? yield* decodeCodexSettings(entries[instanceId]?.config ?? {}).pipe(
+          Effect.mapError(invalidConfig),
+        )
+      : yield* decodeAntigravitySettings(entries[instanceId]?.config ?? {}).pipe(
+          Effect.mapError(invalidConfig),
+        );
+    if (isCodex && (!("setupMode" in config) || config.setupMode !== "managed")) {
+      return yield* new ProviderSetupError({
+        instanceId,
+        operation,
+        detail: "Choose managed setup to install Codex in T3 Code.",
+      });
+    }
+    if (managedOnly && config.binaryPath && (!isCodex || config.binaryPath !== "codex")) {
       return yield* new ProviderSetupError({
         instanceId,
         operation,
@@ -82,20 +97,23 @@ export const makeProviderInstallation = Effect.fn("makeProviderInstallation")(fu
           "This instance uses a custom executable. Clear its binary path to manage installation in T3 Code.",
       });
     }
+    return { installation, driver: instance.driverKind };
   });
 
-  const failure = (instanceId: ProviderInstanceId) => (error: AntigravityInstallationError) =>
-    new ProviderSetupError({ instanceId, operation: error.operation, detail: error.detail });
+  const failure =
+    (instanceId: ProviderInstanceId) =>
+    (error: AntigravityInstallationError | CodexInstallationError) =>
+      new ProviderSetupError({ instanceId, operation: error.operation, detail: error.detail });
 
   const start = Effect.fn("ProviderInstallation.start")(function* (input: ProviderSetupInput) {
-    yield* requireInstance(input.instanceId, "install", true);
+    const { installation } = yield* requireInstance(input.instanceId, "install", true);
     return yield* installation.start.pipe(Effect.mapError(failure(input.instanceId)));
   });
 
   const cancel = Effect.fn("ProviderInstallation.cancel")(function* (
     input: ProviderInstallCancelInput,
   ) {
-    yield* requireInstance(input.instanceId, "cancel-install");
+    const { installation } = yield* requireInstance(input.instanceId, "cancel-install");
     return yield* installation
       .cancel(input.operationId)
       .pipe(Effect.mapError(failure(input.instanceId)));
@@ -103,11 +121,17 @@ export const makeProviderInstallation = Effect.fn("makeProviderInstallation")(fu
 
   const subscribe = (input: ProviderSetupInput) =>
     Stream.unwrap(
-      requireInstance(input.instanceId, "observe-install").pipe(Effect.as(installation.changes)),
+      requireInstance(input.instanceId, "observe-install").pipe(
+        Effect.map(({ installation }) => installation.changes),
+      ),
     );
 
   const remove = Effect.fn("ProviderInstallation.remove")(function* (input: ProviderSetupInput) {
-    yield* requireInstance(input.instanceId, "remove-install", true);
+    const { installation, driver } = yield* requireInstance(
+      input.instanceId,
+      "remove-install",
+      true,
+    );
     const entries = yield* readEntries(input.instanceId, "remove-install");
     const protectedPaths = yield* Effect.forEach(Object.values(entries), (entry) => {
       if (!hasBinaryPath(entry.config) || !entry.config.binaryPath.trim()) {
@@ -118,7 +142,7 @@ export const makeProviderInstallation = Effect.fn("makeProviderInstallation")(fu
         env: mergeProviderInstanceEnvironment(entry.environment),
       }).pipe(
         Effect.map((resolved) => [binaryPath, resolved]),
-        Effect.catch(() => Effect.succeed([binaryPath])),
+        Effect.orElseSucceed(() => [binaryPath]),
       );
     });
     yield* installation
@@ -126,7 +150,7 @@ export const makeProviderInstallation = Effect.fn("makeProviderInstallation")(fu
       .pipe(Effect.mapError(failure(input.instanceId)));
     const allInstances = yield* instances.listInstances;
     yield* Effect.forEach(
-      allInstances.filter((instance) => instance.driverKind === ANTIGRAVITY),
+      allInstances.filter((instance) => instance.driverKind === driver),
       (instance) => providers.refreshInstance(instance.instanceId),
       { discard: true },
     );
diff --git a/apps/server/src/provider/providerMaintenance.test.ts b/apps/server/src/provider/providerMaintenance.test.ts
index 3e0810f51b7a..50aee2b08181 100644
--- a/apps/server/src/provider/providerMaintenance.test.ts
+++ b/apps/server/src/provider/providerMaintenance.test.ts
@@ -15,6 +15,7 @@ import { HttpClient } from "effect/unstable/http";
 import { ChildProcessSpawner } from "effect/unstable/process";
 import {
   createProviderVersionAdvisory,
+  makeTargetedProviderUpdateAction,
   enrichProviderSnapshotWithVersionAdvisory,
   homebrewOwnershipFromCommandPath,
   makeCachedProviderMaintenanceResolution,
@@ -786,3 +787,45 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
     }),
   );
 });
+
+it("pins only owned package-manager installs and preserves their execution context", () => {
+  const capabilities = makeProviderMaintenanceCapabilities({
+    provider: driver("codex"),
+    packageName: "@openai/codex",
+    updateExecutable: "npm",
+    updateLockKey: "npm-global:/opt/node",
+    updateArgs: [
+      "install",
+      "-g",
+      "--prefix",
+      "/opt/node",
+      "--allow-scripts=@openai/codex",
+      "@openai/codex@latest",
+    ],
+    env: { PATH: "/opt/node/bin" },
+  });
+  const pinned = makeTargetedProviderUpdateAction(capabilities, "2.0.0");
+  expect(pinned).toMatchObject({
+    executable: "npm",
+    lockKey: capabilities.update?.lockKey,
+    env: capabilities.update?.env,
+    args: [
+      "install",
+      "-g",
+      "--prefix",
+      "/opt/node",
+      "--allow-scripts=@openai/codex",
+      "@openai/codex@2.0.0",
+    ],
+  });
+  expect(pinned?.command).toContain("@openai/codex@2.0.0");
+  for (const lockKey of ["codex-native", "homebrew", "manual"]) {
+    expect(
+      makeTargetedProviderUpdateAction(
+        { ...capabilities, update: { ...capabilities.update!, lockKey } },
+        "2.0.0",
+      ),
+    ).toBeNull();
+  }
+  expect(makeTargetedProviderUpdateAction(capabilities, "2.0.0; rm -rf /")).toBeNull();
+});
diff --git a/apps/server/src/provider/providerMaintenance.ts b/apps/server/src/provider/providerMaintenance.ts
index 6a11b22462ee..ace445b03060 100644
--- a/apps/server/src/provider/providerMaintenance.ts
+++ b/apps/server/src/provider/providerMaintenance.ts
@@ -186,6 +186,33 @@ export function makeProviderMaintenanceCapabilities(input: {
   };
 }
 
+/** Pin only package-manager actions we own, preserving prefix, scripts, env and lock. */
+export function makeTargetedProviderUpdateAction(
+  capabilities: ProviderMaintenanceCapabilities,
+  version: string,
+): ProviderMaintenanceCommandAction | null {
+  if (!/^\d+\.\d+\.\d+$/.test(version)) return null;
+  const update = capabilities.update;
+  const packageName = capabilities.packageName;
+  if (!update || !packageName) return null;
+  if (!/^(?:npm-global:|bun-global$|pnpm-global$|vite-plus-global$)/.test(update.lockKey))
+    return null;
+  const packageIndex = update.args.findIndex(
+    (arg) => arg === `${packageName}@latest` || arg === packageName,
+  );
+  if (packageIndex < 0) return null;
+  const args = update.args.map((arg, index) =>
+    index === packageIndex ? `${packageName}@${version}` : arg,
+  );
+  const previous = update.args[packageIndex]!;
+  const commandIndex = update.command.lastIndexOf(previous);
+  const command =
+    commandIndex < 0
+      ? update.command
+      : `${update.command.slice(0, commandIndex)}${packageName}@${version}${update.command.slice(commandIndex + previous.length)}`;
+  return { ...update, args, command };
+}
+
 export function makeManualOnlyProviderMaintenanceCapabilities(input: {
   readonly provider: ProviderDriverKind;
   readonly packageName: string | null;
@@ -627,6 +654,7 @@ export function createProviderVersionAdvisory(input: {
     latestVersion,
     updateCommand: capabilities.update?.command ?? null,
     canUpdate: capabilities.update !== null,
+    canInstallVersion: makeTargetedProviderUpdateAction(capabilities, "0.0.0") !== null,
     checkedAt: input.checkedAt ?? null,
     message: advisory.message,
   };
diff --git a/apps/server/src/provider/providerMaintenanceRunner.test.ts b/apps/server/src/provider/providerMaintenanceRunner.test.ts
index 19af22c882ae..194dd4fb4ba1 100644
--- a/apps/server/src/provider/providerMaintenanceRunner.test.ts
+++ b/apps/server/src/provider/providerMaintenanceRunner.test.ts
@@ -21,6 +21,7 @@ import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hos
 import { SpawnExecutableResolution } from "@t3tools/shared/shell";
 
 import { ProviderRegistry, type ProviderRegistryShape } from "./Services/ProviderRegistry.ts";
+import * as ModelManifest from "./ModelManifest.ts";
 import * as ProviderMaintenanceRunner from "./providerMaintenanceRunner.ts";
 import {
   makeProviderMaintenanceCapabilities,
@@ -208,13 +209,32 @@ function makeRegistry(
   });
 }
 
-const makeTestRunner = (registry: ProviderRegistryShape) =>
+const makeTestRunner = (
+  registry: ProviderRegistryShape,
+  // Generic updater fixtures use synthetic versions. Keep their compatibility
+  // unknown so real harness minimums do not bypass the command under test.
+  manifest: ModelManifest.ModelManifestData = {
+    version: 1,
+    currentModels: {},
+    compatibility: [CODEX_DRIVER, CURSOR_DRIVER, OPENCODE_DRIVER].map((driver) => ({
+      driver,
+      t3CodeRange: ">=0.0.42",
+      ranges: [],
+    })),
+  },
+) =>
   Effect.service(ProviderMaintenanceRunner.ProviderMaintenanceRunner).pipe(
     Effect.provide(
       ProviderMaintenanceRunner.layer.pipe(
         Layer.provide(
           Layer.mergeAll(
             Layer.succeed(ProviderRegistry, registry),
+            Layer.succeed(ModelManifest.ModelManifest, {
+              current: Effect.succeed(manifest),
+              refresh: Effect.succeed(manifest),
+              forceRefresh: Effect.succeed(manifest),
+              refreshInBackground: Effect.void,
+            }),
             // Fresh per runner so a version cached by one test cannot leak into another.
             Layer.sync(ProviderVersionCache, () => new Map()),
           ),
@@ -743,7 +763,7 @@ describe("providerMaintenanceRunner", () => {
       Effect.provide(
         Layer.mergeAll(
           NonWindowsPlatform,
-          latestVersionHttpClient("0.0.0"),
+          latestVersionHttpClient("2.0.0"),
           mockSpawnerLayer((_command, args) => {
             calls.push(args.join(" "));
             if (calls.length === 1) {
@@ -911,3 +931,92 @@ describe("providerMaintenanceRunner", () => {
     );
   });
 });
+
+it.effect("refuses incompatible latest versions and unapproved or unpinnable targets", () => {
+  const calls: string[] = [];
+  const manifest: ModelManifest.ModelManifestData = {
+    version: 1,
+    currentModels: {},
+    compatibility: [
+      {
+        driver: "codex",
+        t3CodeRange: ">=0.0.42",
+        recommendedVersion: "2.0.0",
+        ranges: [
+          { range: "=2.0.0", status: "supported" },
+          { range: ">2.0.0", status: "broken" },
+        ],
+      },
+    ],
+  };
+  return Effect.gen(function* () {
+    const { registry, providersRef } = yield* makeRegistry();
+    const pinnedCapabilities = makeProviderMaintenanceCapabilities({
+      provider: CODEX_DRIVER,
+      packageName: "@openai/codex",
+      updateExecutable: "npm",
+      updateArgs: ["install", "-g", "@openai/codex@latest"],
+      updateLockKey: "npm-global:/fixture",
+    });
+    const updater = yield* makeTestRunner(
+      {
+        ...registry,
+        getProviderMaintenanceCapabilitiesForInstance: () => Effect.succeed(pinnedCapabilities),
+      },
+      manifest,
+    );
+    for (const targetVersion of [undefined, "", "1.0.0", "2.0.0; echo unsafe"]) {
+      const result = yield* updater.updateProvider({
+        provider: CODEX_DRIVER,
+        ...(targetVersion !== undefined ? { targetVersion } : {}),
+      });
+      assert.strictEqual(result.providers[0]?.updateState?.status, "failed");
+    }
+    assert.deepStrictEqual(calls, []);
+    yield* Ref.update(providersRef, (providers) =>
+      providers.map((entry) => ({ ...entry, version: "2.0.0" })),
+    );
+    const installed = yield* updater.updateProvider({
+      provider: CODEX_DRIVER,
+      targetVersion: "2.0.0",
+    });
+    assert.deepStrictEqual(calls, ["install -g @openai/codex@2.0.0"]);
+    assert.strictEqual(installed.providers[0]?.updateState?.status, "succeeded");
+    yield* Ref.update(providersRef, (providers) =>
+      providers.map((entry) => ({ ...entry, version: "1.0.0" })),
+    );
+    const unchanged = yield* updater.updateProvider({
+      provider: CODEX_DRIVER,
+      targetVersion: "2.0.0",
+    });
+    assert.strictEqual(unchanged.providers[0]?.updateState?.status, "unchanged");
+    const nativeUpdater = yield* makeTestRunner(
+      {
+        ...registry,
+        getProviderMaintenanceCapabilitiesForInstance: () =>
+          Effect.succeed({
+            ...pinnedCapabilities,
+            update: { ...pinnedCapabilities.update!, lockKey: "codex-native" },
+          }),
+      },
+      manifest,
+    );
+    const refused = yield* nativeUpdater.updateProvider({
+      provider: CODEX_DRIVER,
+      targetVersion: "2.0.0",
+    });
+    assert.strictEqual(refused.providers[0]?.updateState?.status, "failed");
+    assert.strictEqual(calls.length, 2);
+  }).pipe(
+    Effect.provide(
+      Layer.mergeAll(
+        NonWindowsPlatform,
+        latestVersionHttpClient("3.0.0"),
+        mockSpawnerLayer((_command, args) => {
+          calls.push(args.join(" "));
+          return { stdout: "installed" };
+        }),
+      ),
+    ),
+  );
+});
diff --git a/apps/server/src/provider/providerMaintenanceRunner.ts b/apps/server/src/provider/providerMaintenanceRunner.ts
index 05566a438a5f..79af02d60c69 100644
--- a/apps/server/src/provider/providerMaintenanceRunner.ts
+++ b/apps/server/src/provider/providerMaintenanceRunner.ts
@@ -21,10 +21,14 @@ import * as Schema from "effect/Schema";
 import { HttpClient } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 
+import * as ModelManifest from "./ModelManifest.ts";
+import { resolveProviderCompatibility } from "./providerCompatibility.ts";
 import { ProviderRegistry } from "./Services/ProviderRegistry.ts";
 import { makeProviderMaintenanceCommandCoordinator } from "./providerMaintenanceCommandCoordinator.ts";
 import {
   enrichProviderSnapshotWithVersionAdvisory,
+  makeTargetedProviderUpdateAction,
+  resolveLatestProviderVersion,
   type ProviderMaintenanceCommandAction,
   ProviderVersionCache,
 } from "./providerMaintenance.ts";
@@ -51,6 +55,7 @@ export interface ProviderMaintenanceRunnerShape {
       | {
           readonly provider: ProviderDriverKind;
           readonly instanceId?: ProviderInstanceId | undefined;
+          readonly targetVersion?: string | undefined;
         },
   ) => Effect.Effect<ServerProviderUpdatedPayload, ServerProviderUpdateError>;
 }
@@ -214,6 +219,7 @@ function makeUpdateState(input: {
 /** @public Service construction is part of the canonical Effect module API. */
 export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
   const providerRegistry = yield* ProviderRegistry;
+  const manifestService = yield* ModelManifest.ModelManifest;
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const httpClient = yield* HttpClient.HttpClient;
   const versionCache = yield* ProviderVersionCache;
@@ -310,6 +316,7 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
       typeof target === "string"
         ? defaultInstanceIdForDriver(provider)
         : (target.instanceId ?? defaultInstanceIdForDriver(provider));
+    const targetVersion = typeof target === "string" ? undefined : target.targetVersion;
     const targetKey = `instance:${instanceId}`;
     const capabilities = yield* providerRegistry.getProviderMaintenanceCapabilitiesForInstance(
       instanceId,
@@ -376,7 +383,44 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
               );
             }
 
-            const result = yield* runMaintenanceCommand(fresh.update);
+            const manifest = yield* manifestService.current;
+            const candidateVersion =
+              targetVersion ??
+              (yield* resolveLatestProviderVersion(fresh).pipe(
+                Effect.provideService(HttpClient.HttpClient, httpClient),
+                Effect.provideService(ProviderVersionCache, versionCache),
+              ));
+            const advisory =
+              resolveProviderCompatibility(manifest.compatibility, provider, candidateVersion) ??
+              resolveProviderCompatibility(
+                ModelManifest.BUNDLED_MODEL_MANIFEST.compatibility,
+                provider,
+                candidateVersion,
+              );
+            const command =
+              targetVersion !== undefined
+                ? makeTargetedProviderUpdateAction(fresh, targetVersion)
+                : fresh.update;
+            const rejected =
+              targetVersion !== undefined
+                ? !command ||
+                  advisory?.recommendedVersion !== targetVersion ||
+                  advisory.status !== "supported"
+                : advisory?.status === "broken" || advisory?.status === "unsupported";
+            if (rejected || !command) {
+              return yield* finish(
+                makeUpdateState({
+                  status: "failed",
+                  startedAt,
+                  finishedAt: yield* nowIso,
+                  message:
+                    targetVersion !== undefined
+                      ? "This version is no longer recommended or this installer cannot install a specific version. Refresh provider settings."
+                      : "The latest provider version is incompatible with this T3 Code release. Review provider settings.",
+                }),
+              );
+            }
+            const result = yield* runMaintenanceCommand(command);
             const finishedAt = yield* nowIso;
             if (result.timedOut || result.exitCode !== 0) {
               return yield* finish(
@@ -407,10 +451,15 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
             // Cursor's `about` probe can fail transiently on a healthy binary.
             const couldNotVerify =
               verifiedProviders.length === 0 ||
-              verifiedProviders.some((verifiedProvider) => !isStillInstalled(verifiedProvider));
-            const stillOutdated = verifiedProviders.some((verifiedProvider) =>
-              isOutdatedProvider(verifiedProvider),
-            );
+              verifiedProviders.some(
+                (verifiedProvider) =>
+                  !isStillInstalled(verifiedProvider) ||
+                  (targetVersion !== undefined &&
+                    verifiedProvider.version?.replace(/^v/, "") !== targetVersion),
+              );
+            const stillOutdated =
+              targetVersion === undefined &&
+              verifiedProviders.some((verifiedProvider) => isOutdatedProvider(verifiedProvider));
             return yield* finish(
               makeUpdateState({
                 status: couldNotVerify || stillOutdated ? "unchanged" : "succeeded",
diff --git a/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs b/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs
index 440f1558a684..5cc18af8b077 100644
--- a/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs
+++ b/apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs
@@ -84,7 +84,18 @@ rl.on("line", (line) => {
     return;
   }
   if (method === "account/read") {
-    write({ id, result: { account: { type: "apiKey" }, requiresOpenaiAuth: false } });
+    write({
+      id,
+      result: { account: script.account ?? { type: "apiKey" }, requiresOpenaiAuth: false },
+    });
+    return;
+  }
+  if (method === "account/rateLimits/read" && script.failRateLimitsRead) {
+    write({ id, error: { code: -32000, message: "usage unavailable" } });
+    return;
+  }
+  if (method === "account/rateLimitResetCredit/consume" && script.resetCreditOutcome) {
+    write({ id, result: { outcome: script.resetCreditOutcome } });
     return;
   }
   if (method === "skills/list" || method === "model/list") {
@@ -95,6 +106,14 @@ rl.on("line", (line) => {
     write({ id, result: fixture.responses.threadStart });
     return;
   }
+  if (method === "thread/inject_items" && script.recordRequests) {
+    NodeFS.appendFileSync(
+      `${process.env.T3_CODEX_COLLAB_SCRIPT}.requests`,
+      `${JSON.stringify({ method, params: message.params })}\n`,
+    );
+    write({ id, result: {} });
+    return;
+  }
   if (method === "thread/resume") {
     if (script.recordRequests) {
       NodeFS.appendFileSync(
diff --git a/apps/server/src/provider/testFixtures/codexMultiAgentWire.json b/apps/server/src/provider/testFixtures/codexMultiAgentWire.json
index 08316d3b6334..0f183635b17e 100644
--- a/apps/server/src/provider/testFixtures/codexMultiAgentWire.json
+++ b/apps/server/src/provider/testFixtures/codexMultiAgentWire.json
@@ -20,6 +20,7 @@
           "forkedFromId": null,
           "parentThreadId": null,
           "preview": "",
+          "projectId": null,
           "ephemeral": false,
           "historyMode": "legacy",
           "modelProvider": "openai",
@@ -389,6 +390,7 @@
         "forkedFromId": null,
         "parentThreadId": null,
         "preview": "",
+        "projectId": null,
         "ephemeral": false,
         "historyMode": "legacy",
         "modelProvider": "openai",
diff --git a/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts b/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts
index fd5ab04e8a81..291105e25cd9 100644
--- a/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts
+++ b/apps/server/src/pullRequest/GitHubPullRequestCli.test.ts
@@ -452,77 +452,137 @@ layer("GitHubPullRequestCli.layer", (it) => {
       }),
   );
 
-  it.effect("reads linked pull request status with the overview fields in one request", () =>
+  it.effect("reads linked pull requests on one host together, filed back by position", () =>
     Effect.gen(function* () {
+      const node = (number: number) => ({
+        number,
+        title: `Pull request ${number}`,
+        url: `https://github.com/acme/web/pull/${number}`,
+        author: { __typename: "User", login: "octocat", name: "Octo Cat", avatarUrl: null },
+        baseRefName: "main",
+        headRefName: `feat/${number}`,
+        state: "OPEN",
+        isDraft: false,
+        mergeable: "MERGEABLE",
+        reviewDecision: null,
+        latestReviews: { nodes: [{ state: "APPROVED", author: { login: "reviewer" } }] },
+        additions: 12,
+        deletions: 3,
+        changedFiles: 2,
+        updatedAt: "2026-08-24T12:34:56.000Z",
+        mergedAt: null,
+        closedAt: null,
+        commits: { nodes: [{ commit: { statusCheckRollup: { state: "SUCCESS" } } }] },
+      });
       mockedExecute.mockReturnValueOnce(
         Effect.succeed(
           output(
             // @effect-diagnostics-next-line preferSchemaOverJson:off
             JSON.stringify({
-              number: 7,
-              title: "Reuse the summary",
-              url: "https://github.com/acme/web/pull/7",
-              author: { login: "octocat", name: "Octo Cat" },
-              baseRefName: "main",
-              headRefName: "feat/summary",
-              state: "OPEN",
-              isDraft: false,
-              mergeable: "MERGEABLE",
-              reviewDecision: "APPROVED",
-              additions: 12,
-              deletions: 3,
-              changedFiles: 2,
-              createdAt: "2026-08-20T00:00:00.000Z",
-              updatedAt: "2026-08-24T12:34:56.000Z",
-              reviewRequests: [],
-              labels: [],
-              statusCheckRollup: [
-                { __typename: "CheckRun", status: "COMPLETED", conclusion: "SUCCESS", name: "ci" },
-              ],
-              body: "",
+              data: { s0: { pullRequest: node(7) }, s1: { pullRequest: node(8) } },
             }),
           ),
         ),
       );
       const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
 
-      const summary = yield* cli.getPullRequestSummary({
-        cwd: "/w",
-        repository: "acme/web",
-        host: "github.com",
-        number: 7,
-      });
+      const reads = yield* Effect.forEach(
+        [7, 8],
+        (number) =>
+          cli.getPullRequestSummary({
+            cwd: "/w",
+            repository: "acme/web",
+            host: "github.com",
+            number,
+          }),
+        { concurrency: "unbounded" },
+      ).pipe(Effect.forkChild);
+      yield* TestClock.adjust("10 millis");
+      const [seven, eight] = yield* Fiber.join(reads);
 
       assert.deepStrictEqual(
         {
-          number: summary.number,
-          state: summary.state,
-          headBranch: summary.headBranch,
-          isDraft: summary.isDraft,
-          author: summary.author?.login,
-          additions: summary.additions,
-          deletions: summary.deletions,
-          changedFiles: summary.changedFiles,
-          reviewDecision: summary.reviewDecision,
-          checksState: summary.checksState,
-          mergeability: summary.mergeability,
+          number: seven?.number,
+          state: seven?.state,
+          headBranch: seven?.headBranch,
+          author: seven?.author?.login,
+          changedFiles: seven?.changedFiles,
+          reviewDecision: seven?.reviewDecision,
+          checksState: seven?.checksState,
+          mergeability: seven?.mergeability,
         },
         {
           number: 7,
           state: "open",
-          headBranch: "feat/summary",
-          isDraft: false,
+          headBranch: "feat/7",
           author: "octocat",
-          additions: 12,
-          deletions: 3,
           changedFiles: 2,
           reviewDecision: "approved",
           checksState: "passing",
           mergeability: "mergeable",
         },
       );
+      assert.strictEqual(eight?.headBranch, "feat/8");
       expect(mockedExecute).toHaveBeenCalledOnce();
-      expect(mockedExecute.mock.calls[0]?.[0]?.args).toEqual([
+      const document = callAt(0).args.at(-1) ?? "";
+      expect(document).toContain(
+        's0: repository(owner: "acme", name: "web") { pullRequest(number: 7)',
+      );
+      expect(document).toContain("pullRequest(number: 8)");
+    }),
+  );
+
+  it.effect("reads a pull request the batch said nothing about on its own", () =>
+    Effect.gen(function* () {
+      mockedExecute
+        .mockReturnValueOnce(Effect.succeed(output('{"data":{"s0":{"pullRequest":null}}}')))
+        .mockReturnValueOnce(
+          Effect.succeed(
+            output(
+              // @effect-diagnostics-next-line preferSchemaOverJson:off
+              JSON.stringify({
+                number: 7,
+                title: "Reuse the summary",
+                url: "https://github.com/acme/web/pull/7",
+                author: { login: "octocat", name: "Octo Cat" },
+                baseRefName: "main",
+                headRefName: "feat/summary",
+                state: "OPEN",
+                isDraft: false,
+                mergeable: "MERGEABLE",
+                reviewDecision: "APPROVED",
+                additions: 12,
+                deletions: 3,
+                changedFiles: 2,
+                createdAt: "2026-08-20T00:00:00.000Z",
+                updatedAt: "2026-08-24T12:34:56.000Z",
+                reviewRequests: [],
+                labels: [],
+                statusCheckRollup: [
+                  {
+                    __typename: "CheckRun",
+                    status: "COMPLETED",
+                    conclusion: "SUCCESS",
+                    name: "ci",
+                  },
+                ],
+                body: "",
+              }),
+            ),
+          ),
+        );
+      const cli = yield* GitHubPullRequestCli.GitHubPullRequestCli;
+
+      const read = yield* cli
+        .getPullRequestSummary({ cwd: "/w", repository: "acme/web", host: "github.com", number: 7 })
+        .pipe(Effect.forkChild);
+      yield* TestClock.adjust("10 millis");
+      const summary = yield* Fiber.join(read);
+
+      assert.strictEqual(summary.headBranch, "feat/summary");
+      assert.strictEqual(summary.checksState, "passing");
+      assert.strictEqual(mockedExecute.mock.calls.length, 2);
+      expect(callAt(1).args).toEqual([
         "pr",
         "view",
         "7",
@@ -531,7 +591,6 @@ layer("GitHubPullRequestCli.layer", (it) => {
         "--json",
         expect.stringContaining("statusCheckRollup"),
       ]);
-      expect(mockedGetPullRequest).not.toHaveBeenCalled();
     }),
   );
 
diff --git a/apps/server/src/pullRequest/GitHubPullRequestCli.ts b/apps/server/src/pullRequest/GitHubPullRequestCli.ts
index 723fcfc4d9b9..a609fd3d097b 100644
--- a/apps/server/src/pullRequest/GitHubPullRequestCli.ts
+++ b/apps/server/src/pullRequest/GitHubPullRequestCli.ts
@@ -1,10 +1,15 @@
 import { runGitHubStackAction, type GitHubStackActionError } from "./githubStackActions.ts";
+import * as Cause from "effect/Cause";
 import * as Context from "effect/Context";
 import * as Clock from "effect/Clock";
 import * as NodeCrypto from "node:crypto";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Exit from "effect/Exit";
+import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
+import * as Request from "effect/Request";
+import * as RequestResolver from "effect/RequestResolver";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import * as Semaphore from "effect/Semaphore";
@@ -48,6 +53,7 @@ import {
   decodePullRequestCoreJson,
   PULL_REQUEST_CORE_GRAPHQL_QUERY,
   type GitHubPullRequestCore,
+  type GitHubPullRequestSummary,
   decodePullRequestPreviewJson,
   PULL_REQUEST_PREVIEW_GRAPHQL_QUERY,
   decodePullRequestFilesJson,
@@ -58,6 +64,7 @@ import {
   decodePullRequestSearchJson,
   decodePullRequestStacksJson,
   decodePullRequestStatsJson,
+  decodePullRequestSummariesJson,
   decodeReactionSubjectScopeJson,
   decodeReviewerCandidatesJson,
   decodeLabelCandidatesJson,
@@ -67,6 +74,7 @@ import {
   decodeReviewThreadCommentsJson,
   decodeReviewThreadsJson,
   buildPullRequestStatsGraphQlQuery,
+  buildPullRequestSummariesGraphQlQuery,
   buildPullRequestStackMembershipsGraphQlQuery,
   decodePullRequestStackMembershipsJson,
   encodeGraphQlRequestJson,
@@ -419,6 +427,23 @@ export interface GitHubPullRequestStat {
  */
 const STAT_ALIASES_PER_REQUEST = 25;
 const STAT_REQUEST_CONCURRENCY = 4;
+/**
+ * How long a summary read waits for company. The background sync asks for every linked pull
+ * request at once, and each read reaches the resolver after its own cache check, so a batch
+ * needs a moment longer than one scheduler tick to gather them.
+ */
+const SUMMARY_BATCH_WINDOW = "10 millis";
+
+class PullRequestSummaryRead extends Request.Class<
+  {
+    readonly cwd: string;
+    readonly repository: string;
+    readonly host: string;
+    readonly number: number;
+  },
+  ProviderChangeRequestSummary,
+  GitHubPullRequestCliError
+> {}
 
 export interface GitHubPullRequestSearchBatch {
   /** Rows across every repository asked for, newest update first, each naming its own. */
@@ -1570,31 +1595,30 @@ export const make = Effect.gen(function* () {
           decode: decodePullRequestCoreJson,
         }),
       ),
-    ).pipe(
-      Effect.flatMap((core) => {
-        if (!core.checksTruncated) return Effect.succeed(core);
-        // gh already pages check contexts. Keep its complete, deduplicated result for
-        // large check suites instead of letting the first 100 checks imply success.
-        return readLegacyDetail(input).pipe(
-          Effect.flatMap((detail) =>
-            detail.headSha !== core.headSha
-              ? Effect.fail(
-                  new GitHubPullRequestReadError({
-                    command: "gh",
-                    cwd: input.cwd,
-                    operation: "getPullRequestDetail",
-                    cause: new Error("Pull request head changed while reading checks."),
-                  }),
-                )
-              : Effect.succeed({
-                  ...core,
-                  checks: detail.checks,
-                  checksState: detail.checksState,
-                  checksTruncated: false,
+      // gh already pages check contexts. Keep its complete, deduplicated result for
+      // large check suites instead of letting the first 100 checks imply success.
+      Effect.filterOrElse(
+        (core) => !core.checksTruncated,
+        (core) =>
+          readLegacyDetail(input).pipe(
+            Effect.filterOrFail(
+              (detail) => detail.headSha === core.headSha,
+              () =>
+                new GitHubPullRequestReadError({
+                  command: "gh",
+                  cwd: input.cwd,
+                  operation: "getPullRequestDetail",
+                  cause: new Error("Pull request head changed while reading checks."),
                 }),
+            ),
+            Effect.map((detail) => ({
+              ...core,
+              checks: detail.checks,
+              checksState: detail.checksState,
+              checksTruncated: false,
+            })),
           ),
-        );
-      }),
+      ),
     );
   };
 
@@ -1727,6 +1751,133 @@ export const make = Effect.gen(function* () {
         { concurrency: 2 },
       ).pipe(Effect.map(([, runs]) => runs));
 
+  // One `gh pr view` either way; asking for the detail fields costs nothing extra and hands
+  // the thread overview its author, diff stat, review decision and checks in the same read.
+  const viewPullRequestSummary = (input: PullRequestSummaryRead) =>
+    github
+      .execute({
+        cwd: input.cwd,
+        args: [
+          "pr",
+          "view",
+          String(input.number),
+          ...repositoryArgs(input),
+          "--json",
+          PULL_REQUEST_DETAIL_JSON_FIELDS,
+        ],
+      })
+      .pipe(
+        Effect.flatMap((result) => {
+          const decoded = decodePullRequestDetailJson(result.stdout.trim());
+          if (!Result.isSuccess(decoded)) {
+            return Effect.fail(
+              new GitHubPullRequestReadError({
+                command: "gh",
+                cwd: input.cwd,
+                operation: "getPullRequestSummary",
+                cause: decoded.failure,
+              }),
+            );
+          }
+          const detail = decoded.success;
+          return Effect.succeed({
+            number: detail.number,
+            title: detail.title,
+            url: detail.url,
+            headBranch: detail.headBranch,
+            baseBranch: detail.baseBranch,
+            state: detail.state,
+            updatedAt: detail.updatedAt,
+            closedAt: detail.closedAt ?? null,
+            mergedAt: detail.mergedAt ?? null,
+            isDraft: detail.isDraft,
+            author: detail.author,
+            additions: detail.additions,
+            deletions: detail.deletions,
+            changedFiles: detail.changedFiles,
+            reviewDecision: detail.reviewDecision,
+            checksState: detail.checksState,
+            mergeability: detail.mergeability,
+          });
+        }),
+      );
+
+  /**
+   * Summaries asked for together, on one host under one credential, share aliased GraphQL reads
+   * of twenty-five: the background sync reads every linked pull request each minute, and one
+   * `gh pr view` apiece is most of what it spends. Whatever the batch cannot answer — a selector
+   * GraphQL cannot address, a pull request GitHub returned nothing for — is read on its own.
+   */
+  const summaryResolver = RequestResolver.makeGrouped<PullRequestSummaryRead, string>({
+    key: ({ request, context }) =>
+      JSON.stringify([
+        request.host.toLowerCase(),
+        Context.getOrElse(context, GitHubCli.PinnedGitHubCredential, () => null)
+          ?.credentialFingerprint ?? null,
+        Context.getOrElse(context, SourceControlRateLimit.CredentialScope, () => ""),
+      ]),
+    resolver: (entries) => {
+      const [first] = entries;
+      const batchable = entries.filter(
+        (entry) => buildPullRequestSummariesGraphQlQuery([entry.request]) !== null,
+      );
+      const query = buildPullRequestSummariesGraphQlQuery(batchable.map((entry) => entry.request));
+      const batched =
+        query === null
+          ? Effect.succeed(new Map<number, GitHubPullRequestSummary>())
+          : graphqlRead({
+              cwd: first.request.cwd,
+              host: first.request.host,
+              operation: "getPullRequestSummary",
+              query,
+              decode: decodePullRequestSummariesJson,
+            });
+      return batched.pipe(
+        // A GraphQL error anywhere fails the whole document — one repository gone or out of
+        // reach — so a batch that could not be read leaves every entry to its own read. A paused
+        // budget is the exception: reading one at a time would only spend what is being saved.
+        Effect.catchCauseIf(
+          (cause) =>
+            !Cause.hasInterruptsOnly(cause) &&
+            !Cause.findErrorOption(cause).pipe(
+              Option.exists((error) => error._tag === "SourceControlRateLimitPausedError"),
+            ),
+          (cause) =>
+            Effect.logDebug("batched pull request summary read failed", { cause }).pipe(
+              Effect.as(new Map<number, GitHubPullRequestSummary>()),
+            ),
+        ),
+        Effect.flatMap((summaries) => {
+          const unanswered = entries.filter((entry) => {
+            const summary = summaries.get(batchable.indexOf(entry));
+            if (summary === undefined) return true;
+            entry.completeUnsafe(Exit.succeed(summary));
+            return false;
+          });
+          return Effect.forEach(
+            unanswered,
+            (entry) =>
+              viewPullRequestSummary(entry.request).pipe(
+                Effect.exit,
+                Effect.map((exit) => entry.completeUnsafe(exit)),
+              ),
+            { concurrency: STAT_REQUEST_CONCURRENCY, discard: true },
+          );
+        }),
+        Effect.catchCause((cause) =>
+          Effect.sync(() => {
+            for (const entry of entries) entry.completeUnsafe(Exit.failCause(cause));
+          }),
+        ),
+      );
+    },
+  }).pipe(
+    RequestResolver.setDelay(SUMMARY_BATCH_WINDOW),
+    RequestResolver.batchN(STAT_ALIASES_PER_REQUEST),
+  );
+  const getPullRequestSummary: GitHubPullRequestCli["Service"]["getPullRequestSummary"] = (input) =>
+    Effect.request(new PullRequestSummaryRead(input), summaryResolver);
+
   return GitHubPullRequestCli.of({
     withVerifiedCredential,
     getRoutingIdentity,
@@ -1815,10 +1966,9 @@ export const make = Effect.gen(function* () {
       // the fallback out: an empty answer under one is already the answer.
       const hasQuery = (input.query?.trim().length ?? 0) > 0;
       return read(true).pipe(
-        Effect.flatMap((batch) =>
-          batch.items.length === 0 && input.cursor === undefined && !hasQuery
-            ? read(false)
-            : Effect.succeed(batch),
+        Effect.filterOrElse(
+          (batch) => batch.items.length > 0 || input.cursor !== undefined || hasQuery,
+          () => read(false),
         ),
         Effect.flatMap((batch) => {
           // Match the search query's host support, and enrich only rows that survived paging.
@@ -1933,56 +2083,7 @@ export const make = Effect.gen(function* () {
       ).pipe(Effect.map((results) => results.flat()));
     },
 
-    // One `gh pr view` either way; asking for the detail fields costs nothing extra and hands
-    // the thread overview its author, diff stat, review decision and checks in the same read.
-    getPullRequestSummary: (input) =>
-      github
-        .execute({
-          cwd: input.cwd,
-          args: [
-            "pr",
-            "view",
-            String(input.number),
-            ...repositoryArgs(input),
-            "--json",
-            PULL_REQUEST_DETAIL_JSON_FIELDS,
-          ],
-        })
-        .pipe(
-          Effect.flatMap((result) => {
-            const decoded = decodePullRequestDetailJson(result.stdout.trim());
-            if (!Result.isSuccess(decoded)) {
-              return Effect.fail(
-                new GitHubPullRequestReadError({
-                  command: "gh",
-                  cwd: input.cwd,
-                  operation: "getPullRequestSummary",
-                  cause: decoded.failure,
-                }),
-              );
-            }
-            const detail = decoded.success;
-            return Effect.succeed({
-              number: detail.number,
-              title: detail.title,
-              url: detail.url,
-              headBranch: detail.headBranch,
-              baseBranch: detail.baseBranch,
-              state: detail.state,
-              updatedAt: detail.updatedAt,
-              closedAt: detail.closedAt ?? null,
-              mergedAt: detail.mergedAt ?? null,
-              isDraft: detail.isDraft,
-              author: detail.author,
-              additions: detail.additions,
-              deletions: detail.deletions,
-              changedFiles: detail.changedFiles,
-              reviewDecision: detail.reviewDecision,
-              checksState: detail.checksState,
-              mergeability: detail.mergeability,
-            });
-          }),
-        ),
+    getPullRequestSummary,
 
     getPullRequestDetail,
     getPullRequestPreview: (input) => {
@@ -2028,6 +2129,7 @@ export const make = Effect.gen(function* () {
                   }),
                 );
           }),
+          // @effect-diagnostics-next-line flatMapConditionalToFilterOrFail:off - the fallback needs a non-null stack, which a predicate that also reads includeDetails cannot refine.
           Effect.flatMap((stack) => {
             if (!input.includeDetails || stack === null) return Effect.succeed(stack);
             return github
diff --git a/apps/server/src/pullRequest/GitLabPullRequestCli.ts b/apps/server/src/pullRequest/GitLabPullRequestCli.ts
index 5a07bb1ae37c..c3b607002497 100644
--- a/apps/server/src/pullRequest/GitLabPullRequestCli.ts
+++ b/apps/server/src/pullRequest/GitLabPullRequestCli.ts
@@ -1250,7 +1250,7 @@ export const make = Effect.gen(function* () {
     getMergeRequestDiffFileContents: (input) =>
       Effect.gen(function* () {
         if (input.commit !== undefined && !isCommitSha(input.commit)) {
-          return yield* Effect.fail(new GitLabDiffCommitError({ command: "glab", cwd: input.cwd }));
+          return yield* new GitLabDiffCommitError({ command: "glab", cwd: input.cwd });
         }
         const refs = yield* input.commit === undefined
           ? getDiffRefs(input)
diff --git a/apps/server/src/pullRequest/PullRequestReadCache.ts b/apps/server/src/pullRequest/PullRequestReadCache.ts
index 1b4ded39b953..724fbe490d7f 100644
--- a/apps/server/src/pullRequest/PullRequestReadCache.ts
+++ b/apps/server/src/pullRequest/PullRequestReadCache.ts
@@ -77,7 +77,7 @@ export const make = Effect.gen(function* () {
     () =>
       backing
         .get("revisions")
-        .pipe(Effect.flatMap((raw) => Schema.decodeUnknownEffect(revisionCodec)(raw ?? "{}"))),
+        .pipe(Effect.flatMap((raw) => Schema.decodeEffect(revisionCodec)(raw ?? "{}"))),
     {
       capacity: 1,
       timeToLive: (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
diff --git a/apps/server/src/pullRequest/PullRequestService.test.ts b/apps/server/src/pullRequest/PullRequestService.test.ts
index a0d111bd710f..4ba438a97da9 100644
--- a/apps/server/src/pullRequest/PullRequestService.test.ts
+++ b/apps/server/src/pullRequest/PullRequestService.test.ts
@@ -3251,13 +3251,13 @@ it.effect("shares one cold viewer lookup across distinct concurrent lists", () =
       ],
     });
 
-    yield* Effect.all(
-      ["all", "authored", "reviewing"].map((involvement) =>
+    yield* Effect.forEach(
+      ["all", "authored", "reviewing"],
+      (involvement) =>
         service.list({
           state: "open",
           involvement: involvement as "all" | "authored" | "reviewing",
         }),
-      ),
       { concurrency: "unbounded" },
     );
 
@@ -4328,6 +4328,7 @@ it.effect("keeps routed reads separate when the GitHub account changes", () =>
         ],
       });
       const readOperation = (input: Parameters<typeof service.diff>[0]) =>
+        // @effect-diagnostics-next-line unnecessaryEffectGen:off - the generator unifies the per-operation union of Effect types, which Effect.asVoid cannot infer through.
         Effect.gen(function* () {
           yield* service[operation](input);
         });
@@ -4391,6 +4392,7 @@ it.effect("isolates routed caches for two credentials belonging to the same acco
         ],
       });
       const readOperation = (input: Parameters<typeof service.diff>[0]) =>
+        // @effect-diagnostics-next-line unnecessaryEffectGen:off - the generator unifies the per-operation union of Effect types, which Effect.asVoid cannot infer through.
         Effect.gen(function* () {
           yield* service[operation](input);
         });
diff --git a/apps/server/src/pullRequest/PullRequestService.ts b/apps/server/src/pullRequest/PullRequestService.ts
index 6b4b2bd8bfd5..866a45e49b09 100644
--- a/apps/server/src/pullRequest/PullRequestService.ts
+++ b/apps/server/src/pullRequest/PullRequestService.ts
@@ -2751,7 +2751,7 @@ export const make = Effect.gen(function* () {
       `project:${input.projectId}`,
       refScope(input),
     ]);
-    const decoded = yield* Schema.decodeUnknownEffect(codec)(payload).pipe(Effect.option);
+    const decoded = yield* Schema.decodeEffect(codec)(payload).pipe(Effect.option);
     return Option.isSome(decoded) ? decoded.value : yield* lookup;
   });
   const summaryCodec = Schema.fromJsonString(PullRequestSummary);
diff --git a/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts b/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts
index 81033e2e0d94..7008ca739150 100644
--- a/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts
+++ b/apps/server/src/pullRequest/gitHubPullRequestJson.test.ts
@@ -2,6 +2,8 @@ import * as Result from "effect/Result";
 import { describe, expect, it } from "vite-plus/test";
 
 import {
+  buildPullRequestSummariesGraphQlQuery,
+  decodePullRequestSummariesJson,
   buildReviewSubmissionJson,
   buildPullRequestStackMembershipsGraphQlQuery,
   decodePullRequestStackMembershipsJson,
@@ -1883,3 +1885,54 @@ describe("pull request stack membership batches", () => {
     );
   });
 });
+
+describe("batched pull request summaries", () => {
+  it("refuses a repository GraphQL cannot address, rather than writing it into the document", () => {
+    expect(
+      buildPullRequestSummariesGraphQlQuery([{ repository: 'acme/web") { x } #', number: 1 }]),
+    ).toBeNull();
+    expect(
+      buildPullRequestSummariesGraphQlQuery([{ repository: "acme/web", number: 0 }]),
+    ).toBeNull();
+    expect(buildPullRequestSummariesGraphQlQuery([])).toBeNull();
+  });
+
+  it("files each answer by its alias and skips what GitHub or the decoder could not give", () => {
+    const decoded = decodePullRequestSummariesJson(
+      JSON.stringify({
+        data: {
+          s0: {
+            pullRequest: {
+              number: 7,
+              title: "Merged",
+              url: "https://github.com/acme/web/pull/7",
+              author: { __typename: "Bot", login: "renovate", avatarUrl: "https://a/r.png" },
+              headRefName: "feat/seven",
+              baseRefName: "main",
+              state: "MERGED",
+              mergedAt: "2026-08-24T00:00:00Z",
+              closedAt: "2026-08-24T00:00:00Z",
+              updatedAt: "2026-08-24T00:00:00Z",
+              commits: { nodes: [{ commit: { statusCheckRollup: { state: "FAILURE" } } }] },
+            },
+          },
+          s1: { pullRequest: null },
+          s2: { pullRequest: { number: 9 } },
+          rateLimit: { cost: 1 },
+        },
+      }),
+    );
+    expect(Result.isSuccess(decoded)).toBe(true);
+    if (!Result.isSuccess(decoded)) return;
+    expect([...decoded.success.keys()]).toEqual([0]);
+    expect(decoded.success.get(0)).toMatchObject({
+      number: 7,
+      state: "merged",
+      mergedAt: "2026-08-24T00:00:00Z",
+      author: { login: "renovate", isBot: true },
+      checksState: "failing",
+      mergeability: "unknown",
+      additions: 0,
+    });
+  });
+});
diff --git a/apps/server/src/pullRequest/gitHubPullRequestJson.ts b/apps/server/src/pullRequest/gitHubPullRequestJson.ts
index eaaa4e34da84..9be1b2a5844b 100644
--- a/apps/server/src/pullRequest/gitHubPullRequestJson.ts
+++ b/apps/server/src/pullRequest/gitHubPullRequestJson.ts
@@ -1847,6 +1847,129 @@ export function decodePullRequestStatsJson(
   return Result.succeed(stats);
 }
 
+/**
+ * The fields a linked thread keeps current, for many pull requests in one aliased read. Same
+ * shape as the search row where the two overlap: the checks arrive as GitHub's one-word rollup
+ * rather than the whole check list `gh pr view` hands back, which is what keeps a batch cheap.
+ */
+const PULL_REQUEST_SUMMARY_SELECTION =
+  "number title url state isDraft mergeable reviewDecision additions deletions changedFiles " +
+  "updatedAt mergedAt closedAt headRefName baseRefName " +
+  "author { __typename login avatarUrl ... on User { name } } " +
+  "latestReviews(first: 20) { nodes { state author { login } } } " +
+  "commits(last: 1) { nodes { commit { statusCheckRollup { state } } } }";
+
+/**
+ * Summaries for pull requests anywhere on one host, one aliased lookup each. Checked and written
+ * into the document the way `buildPullRequestStatsGraphQlQuery` does, so null means "do not send".
+ */
+export function buildPullRequestSummariesGraphQlQuery(
+  changeRequests: ReadonlyArray<{ readonly repository: string; readonly number: number }>,
+): string | null {
+  if (changeRequests.length === 0) return null;
+  const selections: string[] = [];
+  for (const [index, changeRequest] of changeRequests.entries()) {
+    const [owner, name, ...rest] = changeRequest.repository.trim().split("/");
+    if (rest.length > 0 || owner === undefined || name === undefined) return null;
+    if (!REPOSITORY_PART.test(owner) || !REPOSITORY_PART.test(name)) return null;
+    if (!Number.isSafeInteger(changeRequest.number) || changeRequest.number <= 0) return null;
+    selections.push(
+      `  s${index}: repository(owner: "${owner}", name: "${name}") { pullRequest(number: ${changeRequest.number}) { ${PULL_REQUEST_SUMMARY_SELECTION} } }`,
+    );
+  }
+  return `query PullRequestSummaries {\n${selections.join("\n")}\n}`;
+}
+
+const RawSummarySchema = Schema.Struct({
+  ...RawSearchItemSchema.fields,
+  changedFiles: Schema.optional(Schema.NullOr(Schema.Int)),
+  additions: Schema.optional(Schema.NullOr(Schema.Int)),
+  deletions: Schema.optional(Schema.NullOr(Schema.Int)),
+  closedAt: Schema.optional(Schema.NullOr(Schema.String)),
+  createdAt: Schema.optional(Schema.String),
+});
+const decodeSummaries = decodeJsonResult(
+  Schema.Struct({
+    data: Schema.optional(
+      Schema.NullOr(
+        Schema.Record(
+          Schema.String,
+          Schema.NullOr(Schema.Struct({ pullRequest: Schema.optional(Schema.Unknown) })),
+        ),
+      ),
+    ),
+  }),
+);
+const decodeSummaryEntry = Schema.decodeUnknownExit(RawSummarySchema);
+
+export interface GitHubPullRequestSummary {
+  readonly number: number;
+  readonly title: string;
+  readonly url: string;
+  readonly headBranch: string;
+  readonly baseBranch: string;
+  readonly state: PullRequestState;
+  readonly isDraft: boolean;
+  readonly closedAt: string | null;
+  readonly mergedAt: string | null;
+  readonly updatedAt: string;
+  readonly author: PullRequestActor | null;
+  readonly additions: number;
+  readonly deletions: number;
+  readonly changedFiles: number;
+  readonly reviewDecision: PullRequestReviewDecision | null;
+  readonly checksState: PullRequestChecksState | null;
+  readonly mergeability: PullRequestMergeability;
+}
+
+/**
+ * Summaries by the position they were asked in. A pull request GitHub answered nothing for, or
+ * one whose fields no longer decode, is absent rather than failing the rest of the batch.
+ */
+export function decodePullRequestSummariesJson(
+  raw: string,
+): Result.Result<ReadonlyMap<number, GitHubPullRequestSummary>, DecodeFailure> {
+  const decoded = decodeSummaries(raw);
+  if (!Result.isSuccess(decoded)) return Result.fail(decoded.failure);
+  const summaries = new Map<number, GitHubPullRequestSummary>();
+  for (const [alias, value] of Object.entries(decoded.success.data ?? {})) {
+    const index = /^s(\d+)$/.exec(alias)?.[1];
+    if (index === undefined || value?.pullRequest == null) continue;
+    const entry = decodeSummaryEntry(value.pullRequest);
+    if (!Exit.isSuccess(entry)) continue;
+    const pr = entry.value;
+    summaries.set(Number(index), {
+      number: pr.number,
+      title: pr.title,
+      url: pr.url,
+      headBranch: pr.headRefName,
+      baseBranch: pr.baseRefName,
+      state: toState(pr),
+      isDraft: pr.isDraft ?? false,
+      closedAt: trimmed(pr.closedAt),
+      mergedAt: trimmed(pr.mergedAt),
+      updatedAt: pr.updatedAt,
+      author: toActor(pr.author),
+      additions: pr.additions ?? 0,
+      deletions: pr.deletions ?? 0,
+      changedFiles: pr.changedFiles ?? 0,
+      reviewDecision: toReviewDecisionWithReviews(
+        pr.reviewDecision,
+        (pr.latestReviews?.nodes ?? []).flatMap((review) => (review === null ? [] : [review])),
+      ),
+      // One enum for the head commit, dressed as a single check like the search row's.
+      checksState: rollupChecksState(
+        (pr.commits?.nodes ?? []).flatMap((commitNode) => {
+          const state = trimmed(commitNode?.commit?.statusCheckRollup?.state);
+          return state === null ? [] : [{ state }];
+        }),
+      ),
+      mergeability: toMergeability(pr.mergeable),
+    });
+  }
+  return Result.succeed(summaries);
+}
+
 export interface GitHubPullRequestCore extends GitHubPullRequestDetail {
   readonly viewerAccess: GitHubViewerAccess & GitHubRepositoryAccess;
   readonly comparison: GitHubBaseComparison | null;
diff --git a/apps/server/src/relay/AgentAwarenessRelay.test.ts b/apps/server/src/relay/AgentAwarenessRelay.test.ts
index 8d73909cc696..a818124bb86f 100644
--- a/apps/server/src/relay/AgentAwarenessRelay.test.ts
+++ b/apps/server/src/relay/AgentAwarenessRelay.test.ts
@@ -20,6 +20,7 @@ import { CommandId, ProviderInstanceId } from "@t3tools/contracts";
 import { RelayClientTracer } from "@t3tools/shared/relayTracing";
 import { RELAY_ACTIVITY_PUBLISH_TYP, verifyRelayJwt } from "@t3tools/shared/relayJwt";
 import { describe, expect, it } from "@effect/vitest";
+import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
@@ -27,6 +28,7 @@ import * as Option from "effect/Option";
 import * as Queue from "effect/Queue";
 import * as Stream from "effect/Stream";
 import * as Tracer from "effect/Tracer";
+import * as TestClock from "effect/testing/TestClock";
 
 import * as ServerSecretStore from "../auth/ServerSecretStore.ts";
 import * as ServerEnvironment from "../environment/ServerEnvironment.ts";
@@ -325,6 +327,9 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
     const projectId = "project-1" as ProjectId;
     const activeThreadId = "thread-active" as ThreadId;
     const idleThreadId = "thread-idle" as ThreadId;
+    const oldCompletedId = "thread-old-completed" as ThreadId;
+    const newCompletedId = "thread-new-completed" as ThreadId;
+    const freshMessageId = "thread-fresh-message" as ThreadId;
 
     const baseThread = {
       projectId,
@@ -351,6 +356,7 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
     expect(
       AgentAwarenessRelay.resolveAgentAwarenessRelayActiveThreadIds({
         environmentId,
+        startedAt: Date.parse(now),
         projects: [
           {
             id: projectId,
@@ -374,6 +380,44 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
             ...baseThread,
             id: idleThreadId,
           },
+          {
+            ...baseThread,
+            id: oldCompletedId,
+            latestTurn: {
+              turnId: "turn-old" as TurnId,
+              state: "completed",
+              requestedAt: "2026-05-24T00:00:00.000Z",
+              startedAt: "2026-05-24T00:00:00.000Z",
+              completedAt: "2026-05-24T00:01:00.000Z",
+              assistantMessageId: null,
+            },
+          },
+          {
+            ...baseThread,
+            id: newCompletedId,
+            latestTurn: {
+              turnId: "turn-new" as TurnId,
+              state: "completed",
+              requestedAt: "2026-05-25T00:00:01.000Z",
+              startedAt: "2026-05-25T00:00:01.000Z",
+              completedAt: "2026-05-25T00:00:02.000Z",
+              assistantMessageId: null,
+            },
+          },
+          {
+            ...baseThread,
+            id: freshMessageId,
+            latestUserMessageAt: "2026-05-25T00:00:01.000Z",
+            session: {
+              threadId: freshMessageId,
+              status: "ready",
+              providerName: "Codex",
+              runtimeMode: "full-access",
+              activeTurnId: null,
+              lastError: null,
+              updatedAt: "2026-05-25T00:00:02.000Z",
+            },
+          },
           {
             ...baseThread,
             id: "thread-missing-project" as ThreadId,
@@ -389,7 +433,7 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
           },
         ],
       }),
-    ).toEqual([activeThreadId]);
+    ).toEqual([activeThreadId, newCompletedId]);
   });
 
   it.effect("signs the activity publish JWT and rejects tampering", () =>
@@ -533,7 +577,7 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
               yield* Deferred.await(releaseThreadShell);
               return Option.some(thread);
             }),
-          getProjectShellById: () => Effect.succeed(Option.some(project)),
+          getProjectShellById: () => Effect.succeedSome(project),
         } as unknown as ProjectionSnapshotQueryShape;
 
         const descriptor = {
@@ -750,8 +794,8 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
                 threads: [thread],
                 updatedAt: now,
               } satisfies OrchestrationShellSnapshot),
-            getThreadShellById: () => Effect.succeed(Option.some(thread)),
-            getProjectShellById: () => Effect.succeed(Option.some(project)),
+            getThreadShellById: () => Effect.succeedSome(thread),
+            getProjectShellById: () => Effect.succeedSome(project),
           } as unknown as ProjectionSnapshotQueryShape),
         );
 
@@ -797,4 +841,249 @@ describe.sequential("signRelayAgentActivityPublishProof", () => {
       }),
     ),
   );
+
+  it.effect("does not alert for historical completions after startup", () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const secrets = makeMemorySecretStore();
+        const now = yield* DateTime.now;
+        const old = DateTime.formatIso(DateTime.add(now, { days: -7 }));
+        const threadId = "thread-old" as ThreadId;
+        const projectId = "project-1" as ProjectId;
+        const environmentId = "env-1" as EnvironmentId;
+        const project = {
+          id: projectId,
+          title: "T3 Code",
+          workspaceRoot: "/workspace",
+          repositoryIdentity: null,
+          defaultModelSelection: null,
+          scripts: [],
+          createdAt: old,
+          updatedAt: old,
+        } satisfies OrchestrationProjectShell;
+        const completedTurn = {
+          turnId: "turn-1" as TurnId,
+          state: "completed",
+          requestedAt: old,
+          startedAt: old,
+          completedAt: old,
+          assistantMessageId: null,
+        } as const;
+        const completedThread = {
+          id: threadId,
+          projectId,
+          title: "Old task",
+          modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+          pullRequests: [],
+          latestTurn: completedTurn,
+          createdAt: old,
+          updatedAt: old,
+          archivedAt: null,
+          settledOverride: null,
+          settledAt: null,
+          session: null,
+          latestUserMessageAt: old,
+          hasPendingApprovals: false,
+          hasPendingUserInput: false,
+          hasActionableProposedPlan: false,
+        } satisfies OrchestrationThreadShell;
+        let currentThread: OrchestrationThreadShell | null = completedThread;
+        let publishes = 0;
+        const originalFetch = globalThis.fetch;
+        globalThis.fetch = (() => {
+          publishes += 1;
+          return Promise.resolve(Response.json({ ok: true, deliveries: [] }));
+        }) as unknown as typeof fetch;
+        yield* Effect.addFinalizer(() =>
+          Effect.sync(() => {
+            globalThis.fetch = originalFetch;
+          }),
+        );
+        yield* secrets.setString(RELAY_URL_SECRET, "https://relay.example.test");
+        yield* secrets.setString(RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "relay-credential");
+        yield* secrets.setString(PUBLISH_AGENT_ACTIVITY_SECRET, "true");
+
+        const layer = Layer.mergeAll(
+          Layer.succeed(ServerSecretStore.ServerSecretStore, secrets.store),
+          Layer.succeed(ServerEnvironment.ServerEnvironment, {
+            getEnvironmentId: Effect.succeed(environmentId),
+            getDescriptor: Effect.die("unused descriptor"),
+          }),
+          Layer.succeed(OrchestrationEngineService, {} as OrchestrationEngineShape),
+          Layer.succeed(ProjectionSnapshotQuery, {
+            getThreadShellById: () => Effect.sync(() => Option.fromNullishOr(currentThread)),
+            getProjectShellById: () => Effect.succeedSome(project),
+          } as unknown as ProjectionSnapshotQueryShape),
+        );
+
+        yield* Effect.gen(function* () {
+          const relay = yield* AgentAwarenessRelay.AgentAwarenessRelay;
+          yield* relay.publishThread(threadId);
+          expect(publishes).toBe(0);
+
+          currentThread = {
+            ...completedThread,
+            latestTurn: null,
+            latestUserMessageAt: DateTime.formatIso(DateTime.add(now, { seconds: 1 })),
+            session: {
+              threadId,
+              status: "ready",
+              providerName: "Codex",
+              runtimeMode: "full-access",
+              activeTurnId: null,
+              lastError: null,
+              updatedAt: DateTime.formatIso(DateTime.add(now, { seconds: 2 })),
+            },
+          };
+          expect(
+            AgentAwarenessRelay.resolveAgentAwarenessRelayPublishSnapshot({
+              environmentId,
+              threadId,
+              thread: Option.some(currentThread),
+              project: Option.some(project),
+            }).state?.phase,
+          ).toBe("completed");
+          yield* relay.publishThread(threadId);
+          expect(publishes).toBe(0);
+
+          currentThread = {
+            ...completedThread,
+            session: {
+              threadId,
+              status: "error",
+              providerName: "Codex",
+              runtimeMode: "full-access",
+              activeTurnId: null,
+              lastError: "old failure",
+              updatedAt: old,
+            },
+          };
+          yield* relay.publishThread(threadId);
+          expect(publishes).toBe(0);
+        }).pipe(
+          Effect.provide(
+            AgentAwarenessRelay.layer.pipe(
+              Layer.provide(layer),
+              Layer.provideMerge(NodeServices.layer),
+            ),
+          ),
+        );
+      }),
+    ),
+  );
+});
+
+describe.sequential("startup catch-up", () => {
+  // An unlinked relay with publishing off. `link` writes the link secrets and
+  // `enablePublishing` the opt-in. Counts link checks (relay URL reads) and
+  // catch-up publishes (shell snapshot reads).
+  function makeUnlinkedRelay() {
+    const secrets = makeMemorySecretStore();
+    const counts = { linkChecks: 0, catchUpPublishes: 0 };
+    const countingStore = {
+      ...secrets.store,
+      get: (name: string) =>
+        Effect.suspend(() => {
+          if (name === RELAY_URL_SECRET) counts.linkChecks += 1;
+          return secrets.store.get(name);
+        }),
+    } satisfies ServerSecretStore.ServerSecretStore["Service"];
+
+    const layer = AgentAwarenessRelay.layer.pipe(
+      Layer.provide(
+        Layer.mergeAll(
+          Layer.succeed(ServerSecretStore.ServerSecretStore, countingStore),
+          Layer.succeed(ServerEnvironment.ServerEnvironment, {
+            getEnvironmentId: Effect.succeed("env-1" as EnvironmentId),
+            getDescriptor: Effect.die("unused descriptor"),
+          }),
+          Layer.succeed(OrchestrationEngineService, {
+            streamDomainEvents: Stream.never,
+          } as unknown as OrchestrationEngineShape),
+          Layer.succeed(ProjectionSnapshotQuery, {
+            getShellSnapshot: () =>
+              Effect.sync(() => {
+                counts.catchUpPublishes += 1;
+                return {
+                  snapshotSequence: 1,
+                  projects: [],
+                  threads: [],
+                  updatedAt: "2026-05-25T00:00:00.000Z",
+                } satisfies OrchestrationShellSnapshot;
+              }),
+          } as unknown as ProjectionSnapshotQueryShape),
+        ),
+      ),
+      Layer.provideMerge(NodeServices.layer),
+    );
+    const link = Effect.all(
+      [
+        secrets.setString(RELAY_URL_SECRET, "https://relay.example.test"),
+        secrets.setString(RELAY_ENVIRONMENT_CREDENTIAL_SECRET, "relay-credential"),
+      ],
+      { discard: true },
+    );
+    const enablePublishing = secrets.setString(PUBLISH_AGENT_ACTIVITY_SECRET, "true");
+    return { counts, layer, link, enablePublishing };
+  }
+
+  it.effect("checks an unlinked environment once a minute and still catches up once linked", () => {
+    const { counts, layer, link, enablePublishing } = makeUnlinkedRelay();
+    return Effect.gen(function* () {
+      const relay = yield* AgentAwarenessRelay.AgentAwarenessRelay;
+      yield* enablePublishing;
+      yield* relay.start();
+
+      // Get past the backoff ramp, then count checks in a steady window.
+      yield* TestClock.adjust("10 minutes");
+      const checksBeforeWindow = counts.linkChecks;
+      yield* TestClock.adjust("10 minutes");
+      expect(counts.linkChecks - checksBeforeWindow).toBe(10);
+      expect(counts.catchUpPublishes).toBe(0);
+
+      yield* link;
+      yield* TestClock.adjust("1 minute");
+      expect(counts.catchUpPublishes).toBe(1);
+    }).pipe(Effect.provide(layer), Effect.scoped);
+  });
+
+  it.effect("publishes at once when this process links while the check is backed off", () => {
+    const { counts, layer, link, enablePublishing } = makeUnlinkedRelay();
+    return Effect.gen(function* () {
+      const relay = yield* AgentAwarenessRelay.AgentAwarenessRelay;
+      yield* enablePublishing;
+      yield* relay.start();
+
+      // Backed off to 60 s: the next check is still seconds away.
+      yield* TestClock.adjust("10 minutes");
+      yield* link;
+      yield* TestClock.adjust("1 second");
+      expect(counts.catchUpPublishes).toBe(0);
+
+      yield* relay.requestCatchUp();
+      yield* TestClock.adjust("1 second");
+      expect(counts.catchUpPublishes).toBe(1);
+    }).pipe(Effect.provide(layer), Effect.scoped);
+  });
+
+  it.effect("catches up within 5 s when another process enables publishing on a link", () => {
+    const { counts, layer, link, enablePublishing } = makeUnlinkedRelay();
+    return Effect.gen(function* () {
+      const relay = yield* AgentAwarenessRelay.AgentAwarenessRelay;
+      yield* link;
+      yield* relay.start();
+
+      yield* TestClock.adjust("10 minutes");
+      expect(counts.catchUpPublishes).toBe(0);
+
+      // `t3 connect publish` writes the opt-in without waking this process.
+      yield* enablePublishing;
+      yield* TestClock.adjust("5 seconds");
+      expect(counts.catchUpPublishes).toBe(1);
+    }).pipe(Effect.provide(layer), Effect.scoped);
+  });
 });
diff --git a/apps/server/src/relay/AgentAwarenessRelay.ts b/apps/server/src/relay/AgentAwarenessRelay.ts
index 052a67959ad1..c9acf6b510fc 100644
--- a/apps/server/src/relay/AgentAwarenessRelay.ts
+++ b/apps/server/src/relay/AgentAwarenessRelay.ts
@@ -25,6 +25,7 @@ import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
+import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import type * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
@@ -51,6 +52,8 @@ export class AgentAwarenessRelay extends Context.Service<
   AgentAwarenessRelay,
   {
     readonly publishThread: (threadId: ThreadId) => Effect.Effect<void>;
+    /** Retries a pending catch-up publish now. Call after this process links or enables publishing. */
+    readonly requestCatchUp: () => Effect.Effect<void>;
     readonly start: () => Effect.Effect<void, never, Scope.Scope>;
   }
 >()("t3/relay/AgentAwarenessRelay") {}
@@ -267,8 +270,13 @@ export function resolveAgentAwarenessRelayPublishSnapshot(input: {
   };
 }
 
+function terminalWorkSinceStart(thread: OrchestrationThreadShell, startedAt: number): boolean {
+  return Date.parse(thread.latestTurn?.completedAt ?? "") > startedAt;
+}
+
 export function resolveAgentAwarenessRelayActiveThreadIds(input: {
   readonly environmentId: EnvironmentId;
+  readonly startedAt: number;
   readonly projects: ReadonlyArray<Pick<OrchestrationProjectShell, "id" | "title">>;
   readonly threads: ReadonlyArray<OrchestrationThreadShell>;
 }): ReadonlyArray<ThreadId> {
@@ -279,12 +287,16 @@ export function resolveAgentAwarenessRelayActiveThreadIds(input: {
       if (!project) {
         return false;
       }
+      const state = projectThreadAwareness({
+        environmentId: input.environmentId,
+        project,
+        thread,
+      });
       return (
-        projectThreadAwareness({
-          environmentId: input.environmentId,
-          project,
-          thread,
-        }) !== null
+        state !== null &&
+        (state.phase !== "completed" && state.phase !== "failed"
+          ? true
+          : terminalWorkSinceStart(thread, input.startedAt))
       );
     })
     .map((thread) => thread.id);
@@ -298,7 +310,10 @@ export const make = Effect.gen(function* () {
   const orchestrationEngine = yield* OrchestrationEngine.OrchestrationEngineService;
   const crypto = yield* Crypto.Crypto;
   const cloudLinkKeyPair = yield* getOrCreateEnvironmentKeyPairFromSecretStore(secrets);
+  const startedAt = (yield* DateTime.now).epochMilliseconds;
   const activeSnapshotPublishedRef = yield* Ref.make(false);
+  // Holds at most one pending wake, so a burst of requests costs one retry.
+  const catchUpRequests = yield* Queue.dropping<void>(1);
   const publishedStateByThreadRef = yield* Ref.make(new Map<ThreadId, string>());
 
   const readSecretString = (name: string) =>
@@ -417,6 +432,14 @@ export const make = Effect.gen(function* () {
     });
     const publishIdentity = agentAwarenessPublishIdentity(snapshot.state);
     const publishedStateByThread = yield* Ref.get(publishedStateByThreadRef);
+    if (
+      (snapshot.state?.phase === "completed" || snapshot.state?.phase === "failed") &&
+      !publishedStateByThread.has(threadId)
+    ) {
+      // Startup has no publish history. Only work from this server process may
+      // produce an initial terminal alert; historical threads remain quiet.
+      if (Option.isNone(thread) || !terminalWorkSinceStart(thread.value, startedAt)) return;
+    }
     if (publishedStateByThread.get(threadId) === publishIdentity) {
       // The projection is back at (or never left) the last published state, so
       // any pending deferred confirmation is moot. Leaving the deadline in
@@ -495,7 +518,11 @@ export const make = Effect.gen(function* () {
     });
     yield* Ref.update(publishedStateByThreadRef, (publishedStates) => {
       const nextPublishedStates = new Map(publishedStates);
-      nextPublishedStates.set(threadId, publishIdentity);
+      if (snapshot.state === null) {
+        nextPublishedStates.delete(threadId);
+      } else {
+        nextPublishedStates.set(threadId, publishIdentity);
+      }
       return nextPublishedStates;
     });
   });
@@ -512,42 +539,63 @@ export const make = Effect.gen(function* () {
       withRelayClientTracing,
     );
 
+  // Publishes the active threads once. Returns why it did not, so the retry
+  // knows whether it is waiting on a link or on the publish setting.
   const publishActiveThreadsUnsafe = Effect.gen(function* () {
+    // One secret read settles the common never-linked case; the full link
+    // config is read only once publishing is on.
+    const relayUrl = yield* readSecretString(RELAY_URL_SECRET).pipe(
+      Effect.orElseSucceed(() => null),
+    );
+    if (!relayUrl) {
+      yield* Effect.logDebug("agent activity snapshot skipped; relay link credentials unavailable");
+      return "unlinked" as const;
+    }
     const publishAgentActivity = yield* readPublishAgentActivityEnabled.pipe(
       Effect.orElseSucceed(() => false),
     );
     if (!publishAgentActivity) {
       yield* Effect.logDebug("agent activity snapshot skipped; publication disabled");
-      return false;
+      return "disabled" as const;
     }
     const relayConfig = yield* readRelayConfig.pipe(Effect.orElseSucceed(() => null));
     if (!relayConfig) {
       yield* Effect.logDebug("agent activity snapshot skipped; relay link credentials unavailable");
-      return false;
+      return "unlinked" as const;
     }
     const environmentId = yield* serverEnvironment.getEnvironmentId;
     const snapshot = yield* snapshotQuery.getShellSnapshot();
     const activeThreadIds = resolveAgentAwarenessRelayActiveThreadIds({
       environmentId,
+      startedAt,
       projects: snapshot.projects,
       threads: snapshot.threads,
     });
     if (activeThreadIds.length === 0) {
       yield* Effect.logDebug("agent activity snapshot has no publishable threads");
-      return true;
+      return "published" as const;
     }
     yield* Effect.logInfo("publishing active agent activity snapshot", {
       count: activeThreadIds.length,
     });
     yield* Effect.forEach(activeThreadIds, publishThread, { concurrency: 4, discard: true });
-    return true;
+    return "published" as const;
   });
 
+  // Publishes the catch-up snapshot of active threads once the environment is
+  // linked and publishing is enabled. Many environments never link, so while
+  // unlinked the retry backs off from 5 s to 60 s. Only this process writes
+  // the link, and it calls `requestCatchUp`, which ends the wait early. A
+  // linked environment keeps the 5 s retry, because `t3 connect publish` can
+  // turn publishing on from another process.
   const publishActiveThreadsOnceWhenConfigured = (logEnabledWhenReady: boolean) =>
     Effect.gen(function* () {
+      let unlinkedRetryDelayMs = 5_000;
       while (!(yield* Ref.get(activeSnapshotPublishedRef))) {
-        const published = yield* publishActiveThreadsUnsafe.pipe(Effect.orElseSucceed(() => false));
-        if (published) {
+        const result = yield* publishActiveThreadsUnsafe.pipe(
+          Effect.orElseSucceed(() => "failed" as const),
+        );
+        if (result === "published") {
           yield* Ref.set(activeSnapshotPublishedRef, true);
           if (logEnabledWhenReady) {
             const relayConfig = yield* readRelayConfig.pipe(Effect.orElseSucceed(() => null));
@@ -557,7 +605,11 @@ export const make = Effect.gen(function* () {
           }
           return;
         }
-        yield* Effect.sleep("5 seconds");
+        const retryDelayMs = result === "unlinked" ? unlinkedRetryDelayMs : 5_000;
+        yield* Effect.race(Effect.sleep(retryDelayMs), Queue.take(catchUpRequests));
+        if (result === "unlinked") {
+          unlinkedRetryDelayMs = Math.min(unlinkedRetryDelayMs * 2, 60_000);
+        }
       }
     });
 
@@ -634,6 +686,7 @@ export const make = Effect.gen(function* () {
 
   return AgentAwarenessRelay.of({
     publishThread,
+    requestCatchUp: () => Queue.offer(catchUpRequests, undefined).pipe(Effect.asVoid),
     start,
   });
 });
diff --git a/apps/server/src/resourceTelemetry/HostResources.ts b/apps/server/src/resourceTelemetry/HostResources.ts
index 032832dd4869..0f61ac1899b6 100644
--- a/apps/server/src/resourceTelemetry/HostResources.ts
+++ b/apps/server/src/resourceTelemetry/HostResources.ts
@@ -60,7 +60,7 @@ export const make = Effect.fn("makeHostResources")(function* () {
     if (platform === "linux") {
       const meminfo = yield* fs
         .readFileString("/proc/meminfo")
-        .pipe(Effect.catch(() => Effect.succeed("")));
+        .pipe(Effect.orElseSucceed(() => ""));
       const available = /^MemAvailable:\s+(\d+)\s+kB$/m.exec(meminfo)?.[1];
       if (available) availableMemoryBytes = Number(available) * 1024;
     } else if (platform === "darwin") {
@@ -68,7 +68,7 @@ export const make = Effect.fn("makeHostResources")(function* () {
         .string(ChildProcess.make("/usr/bin/vm_stat", [], { stdin: "ignore", stderr: "ignore" }))
         .pipe(
           Effect.timeout("1 second"),
-          Effect.catch(() => Effect.succeed("")),
+          Effect.orElseSucceed(() => ""),
         );
       availableMemoryBytes = darwinAvailableMemory(output) ?? availableMemoryBytes;
     }
diff --git a/apps/server/src/server.test.ts b/apps/server/src/server.test.ts
index 384aaf340067..5daed8b1b418 100644
--- a/apps/server/src/server.test.ts
+++ b/apps/server/src/server.test.ts
@@ -133,6 +133,7 @@ import { OrchestrationEventStoreLive } from "./persistence/Layers/OrchestrationE
 import { OrchestrationEventStore } from "./persistence/Services/OrchestrationEventStore.ts";
 import { PersistenceSqlError } from "./persistence/Errors.ts";
 import * as ProviderRegistry from "./provider/Services/ProviderRegistry.ts";
+import * as ModelManifest from "./provider/ModelManifest.ts";
 import * as ProviderService from "./provider/Services/ProviderService.ts";
 import { ProviderAuthService } from "./provider/Services/ProviderAuthService.ts";
 import { ProviderInstanceRegistry } from "./provider/Services/ProviderInstanceRegistry.ts";
@@ -140,10 +141,14 @@ import {
   AntigravityInstallation,
   AntigravityInstallationError,
 } from "./provider/AntigravityInstallation.ts";
+import { CodexInstallation } from "./provider/CodexInstallation.ts";
 import type { ProviderInstance } from "./provider/ProviderDriver.ts";
 import * as ProviderSessionDirectory from "./provider/Services/ProviderSessionDirectory.ts";
 import { ProviderAdapterRequestError } from "./provider/Errors.ts";
-import { makeManualOnlyProviderMaintenanceCapabilities } from "./provider/providerMaintenance.ts";
+import {
+  makeManualOnlyProviderMaintenanceCapabilities,
+  ProviderVersionCache,
+} from "./provider/providerMaintenance.ts";
 import * as ServerLifecycleEvents from "./serverLifecycleEvents.ts";
 import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";
 import * as ServiceLauncherClient from "./cloud/serviceLauncherClient.ts";
@@ -173,10 +178,12 @@ import * as VcsProcess from "./vcs/VcsProcess.ts";
 import * as GitWorkflowService from "./git/GitWorkflowService.ts";
 import * as ReviewService from "./review/ReviewService.ts";
 import * as SourceControlRepositoryService from "./sourceControl/SourceControlRepositoryService.ts";
+import { REPLAY_MARKER_MAX_AGE } from "./auth/replayMarkers.ts";
 import * as ServerSecretStore from "./auth/ServerSecretStore.ts";
 import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";
 import * as PairingGrantStore from "./auth/PairingGrantStore.ts";
 import * as CloudManagedEndpointRuntime from "./cloud/ManagedEndpointRuntime.ts";
+import * as AgentAwarenessRelay from "./relay/AgentAwarenessRelay.ts";
 import * as CloudCliTokenManager from "./cloud/CliTokenManager.ts";
 import * as ProcessDiagnostics from "./diagnostics/ProcessDiagnostics.ts";
 import * as HostResources from "./resourceTelemetry/HostResources.ts";
@@ -220,6 +227,7 @@ import {
 } from "../integration/TransferBudgetReport.integration.ts";
 import { symlinksSupported } from "@t3tools/shared/testing/symlinks";
 import { DEFAULT_SIGNAL_EXPORT, otlpSerializationLayer } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 
 const defaultProjectId = ProjectId.make("project-default");
 const defaultThreadId = ThreadId.make("thread-default");
@@ -485,7 +493,7 @@ const makeBrowserOtlpPayload = (spanName: string) =>
         url: collector.url,
         exportInterval: "10 millis",
         resource: {
-          serviceName: "t3-web",
+          serviceName: "t3code-web",
           attributes: {
             "service.runtime": "t3-web",
             "service.mode": "browser",
@@ -517,11 +525,13 @@ const buildAppUnderTest = (options?: {
     keybindings?: Partial<Keybindings.Keybindings["Service"]>;
     environmentTheme?: Partial<EnvironmentTheme.EnvironmentThemeService["Service"]>;
     providerRegistry?: Partial<ProviderRegistry.ProviderRegistry["Service"]>;
+    modelManifest?: Partial<ModelManifest.ModelManifest["Service"]>;
     usageLimitSources?: Partial<UsageLimitSources.UsageLimitSources["Service"]>;
     providerService?: Partial<ProviderService.ProviderService["Service"]>;
     providerAuth?: Partial<ProviderAuthService["Service"]>;
     providerInstanceRegistry?: Partial<ProviderInstanceRegistry["Service"]>;
     antigravityInstallation?: Partial<AntigravityInstallation["Service"]>;
+    codexInstallation?: Partial<CodexInstallation["Service"]>;
     serverSettings?: Partial<ServerSettings.ServerSettingsService["Service"]>;
     externalLauncher?: Partial<ExternalLauncher.ExternalLauncher["Service"]>;
     vcsDriver?: Partial<VcsDriver.VcsDriver["Service"]>;
@@ -556,7 +566,9 @@ const buildAppUnderTest = (options?: {
       CloudManagedEndpointRuntime.CloudManagedEndpointRuntime["Service"]
     >;
     relayClient?: Partial<RelayClient.RelayClient["Service"]>;
+    agentAwarenessRelay?: Partial<AgentAwarenessRelay.AgentAwarenessRelay["Service"]>;
     cloudCliTokenManager?: Partial<CloudCliTokenManager.CloudCliTokenManager["Service"]>;
+    httpClient?: HttpClient.HttpClient;
     nativeTelemetryClient?: Partial<NativeTelemetryClient.NativeTelemetryClient["Service"]>;
     desktopTelemetryReceiver?: Partial<
       DesktopTelemetryReceiver.DesktopTelemetryReceiver["Service"]
@@ -582,7 +594,7 @@ const buildAppUnderTest = (options?: {
       otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
       otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
       otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-      otlpServiceName: "t3-server",
+      otelEnvironment: OtelEnvironment.none,
       mode: "desktop",
       port: 0,
       host: "127.0.0.1",
@@ -648,25 +660,25 @@ const buildAppUnderTest = (options?: {
       get: () => Effect.succeed(defaultVcsDriver),
       detect: (input) =>
         defaultVcsDriver.detectRepository(input.cwd).pipe(
-          Effect.flatMap((repository) =>
-            repository
-              ? Effect.succeed(repository)
-              : defaultVcsDriver.isInsideWorkTree(input.cwd).pipe(
-                  Effect.map((isInsideWorkTree) =>
-                    isInsideWorkTree
-                      ? {
-                          kind: "git" as const,
-                          rootPath: input.cwd,
-                          metadataPath: null,
-                          freshness: {
-                            source: "live-local" as const,
-                            observedAt: TEST_EPOCH,
-                            expiresAt: Option.none(),
-                          },
-                        }
-                      : null,
-                  ),
+          Effect.filterOrElse(
+            (repository) => repository !== null,
+            () =>
+              defaultVcsDriver.isInsideWorkTree(input.cwd).pipe(
+                Effect.map((isInsideWorkTree) =>
+                  isInsideWorkTree
+                    ? {
+                        kind: "git" as const,
+                        rootPath: input.cwd,
+                        metadataPath: null,
+                        freshness: {
+                          source: "live-local" as const,
+                          observedAt: TEST_EPOCH,
+                          expiresAt: Option.none(),
+                        },
+                      }
+                    : null,
                 ),
+              ),
           ),
           Effect.map((repository) =>
             repository
@@ -791,6 +803,10 @@ const buildAppUnderTest = (options?: {
       ),
       Layer.provide(
         Layer.mergeAll(
+          Layer.mock(ModelManifest.ModelManifest)({
+            forceRefresh: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
+            ...options?.layers?.modelManifest,
+          }),
           Layer.mock(ProviderRegistry.ProviderRegistry)({
             getProviders: Effect.succeed([]),
             refresh: () => Effect.succeed([]),
@@ -811,17 +827,21 @@ const buildAppUnderTest = (options?: {
             ...options?.layers?.providerAuth,
           }),
           Layer.mock(ProviderInstanceRegistry)({
-            getInstance: () => Effect.succeed(undefined),
+            getInstance: () => Effect.undefined,
             listInstances: Effect.succeed([]),
             ...options?.layers?.providerInstanceRegistry,
           }),
+          Layer.mock(CodexInstallation)({
+            managedDirectory: "unused-test-codex-runtime",
+            ...options?.layers?.codexInstallation,
+          }),
           Layer.mock(AntigravityInstallation)({
             managedDirectory: "unused-test-antigravity-runtime",
             ...options?.layers?.antigravityInstallation,
           }),
           Layer.mock(ProviderSessionDirectory.ProviderSessionDirectory)({
             upsert: () => Effect.void,
-            getBinding: () => Effect.succeed(Option.none()),
+            getBinding: () => Effect.succeedNone,
             listThreadIds: () => Effect.succeed([]),
             listBindings: () => Effect.succeed([]),
             ...options?.layers?.providerSessionDirectory,
@@ -848,7 +868,7 @@ const buildAppUnderTest = (options?: {
           Layer.mock(ExternalLauncher.ExternalLauncher)({
             resolveAvailableEditors: () => Effect.succeed([]),
             availableEditorsSnapshot: () => Effect.succeed([]),
-            resolveFileManagerRevealKind: () => Effect.sync((): undefined => undefined),
+            resolveFileManagerRevealKind: () => Effect.undefined,
             ...options?.layers?.externalLauncher,
           }),
           Layer.mock(RemoteOpenTargets.RemoteOpenTargets)({
@@ -1024,20 +1044,20 @@ const buildAppUnderTest = (options?: {
             }),
           searchThreads: () => Effect.succeed({ matches: [] }),
           getSnapshotSequence: () => Effect.succeed({ snapshotSequence: 0 }),
-          getProjectShellById: () => Effect.succeed(Option.none()),
-          getThreadShellById: () => Effect.succeed(Option.none()),
-          getThreadDetailById: () => Effect.succeed(Option.none()),
-          getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+          getProjectShellById: () => Effect.succeedNone,
+          getThreadShellById: () => Effect.succeedNone,
+          getThreadDetailById: () => Effect.succeedNone,
+          getThreadDetailSnapshot: () => Effect.succeedNone,
           getCounts: () => Effect.succeed({ projectCount: 0, threadCount: 0 }),
           getEventReplayStats: ({ fromSequenceExclusive, toSequenceInclusive }) =>
             Effect.succeed({
               eventCount: Math.max(0, toSequenceInclusive - fromSequenceExclusive),
               payloadBytes: 0,
             }),
-          getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
-          getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+          getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
+          getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
           getImportedAgentSessionSources: () => Effect.succeed([]),
-          getThreadCheckpointContext: () => Effect.succeed(Option.none()),
+          getThreadCheckpointContext: () => Effect.succeedNone,
           ...options?.layers?.projectionSnapshotQuery,
         }),
       ),
@@ -1163,11 +1183,20 @@ const buildAppUnderTest = (options?: {
         }),
       ),
       Layer.provide(
-        Layer.succeed(
-          CloudManagedEndpointRuntime.CloudManagedEndpointRuntime,
-          CloudManagedEndpointRuntime.CloudManagedEndpointRuntime.of({
-            applyConfig: () => Effect.succeed({ status: "disabled" }),
-            ...options?.layers?.cloudManagedEndpointRuntime,
+        Layer.mergeAll(
+          Layer.succeed(
+            CloudManagedEndpointRuntime.CloudManagedEndpointRuntime,
+            CloudManagedEndpointRuntime.CloudManagedEndpointRuntime.of({
+              applyConfig: () => Effect.succeed({ status: "disabled" }),
+              recoveryRequests: Stream.empty,
+              requestRecovery: () => Effect.void,
+              withLinkStateLock: (effect) => effect,
+              ...options?.layers?.cloudManagedEndpointRuntime,
+            }),
+          ),
+          Layer.mock(AgentAwarenessRelay.AgentAwarenessRelay)({
+            requestCatchUp: () => Effect.void,
+            ...options?.layers?.agentAwarenessRelay,
           }),
         ),
       ),
@@ -1188,7 +1217,7 @@ const buildAppUnderTest = (options?: {
       Layer.provide(
         Layer.mock(CloudCliTokenManager.CloudCliTokenManager)({
           get: Effect.die(new Error("Unexpected T3 Connect CLI authorization request.")),
-          getExisting: Effect.succeed(Option.none()),
+          getExisting: Effect.succeedNone,
           hasCredential: Effect.succeed(false),
           clear: Effect.void,
           ...options?.layers?.cloudCliTokenManager,
@@ -1215,7 +1244,11 @@ const buildAppUnderTest = (options?: {
       Layer.provideMerge(makeAuthTestLayer()),
       Layer.provideMerge(ServerSecretStore.layer),
       Layer.provide(workspaceAndProjectServicesLayer),
-      Layer.provideMerge(FetchHttpClient.layer),
+      Layer.provideMerge(
+        options?.layers?.httpClient === undefined
+          ? FetchHttpClient.layer
+          : Layer.succeed(HttpClient.HttpClient, options.layers.httpClient),
+      ),
       Layer.provide(GitHubCli.layer.pipe(Layer.provideMerge(VcsProcess.layer))),
       Layer.provide(layerConfig),
     );
@@ -2627,6 +2660,40 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  it.effect("rejects a DPoP replay by time alone once its marker can be pruned", () =>
+    Effect.gen(function* () {
+      yield* buildAppUnderTest();
+
+      const ownerCookie = yield* getAuthenticatedSessionCookieHeader();
+      const credentialResponse = yield* HttpClient.post("/api/auth/pairing-token", {
+        headers: { cookie: ownerCookie },
+        body: yield* HttpBody.json({}),
+      });
+      const credential = (yield* credentialResponse.json) as { readonly credential: string };
+      const tokenUrl = yield* getHttpServerUrl("/oauth/token");
+      const acceptedAt = yield* DateTime.now;
+      // The longest-lived proof: `iat` at the 5 s future skew the verifier allows.
+      const dpop = makeDpopProof({
+        method: "POST",
+        url: tokenUrl,
+        iat: Math.floor(acceptedAt.epochMilliseconds / 1_000) + 5,
+      });
+      const exchange = exchangeAccessToken(credential.credential, {
+        headers: { dpop: dpop.proof },
+        scope: "orchestration:read orchestration:operate terminal:operate review:write",
+      });
+
+      assert.equal((yield* exchange).response.status, 200);
+      // While the proof is fresh, only the replay marker rejects it.
+      assert.equal((yield* exchange).body.dpopFailureReason, "replay");
+      // Once the marker can be pruned, the time check rejects the proof by itself.
+      yield* TestClock.setTime(
+        acceptedAt.epochMilliseconds + Duration.toMillis(REPLAY_MARKER_MAX_AGE),
+      );
+      assert.equal((yield* exchange).body.dpopFailureReason, "time_window");
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
   it.effect("ignores forwarded host headers when validating token exchange DPoP URLs", () =>
     Effect.gen(function* () {
       yield* buildAppUnderTest();
@@ -3063,6 +3130,55 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  it.effect("wakes the agent awareness relay when this server links or changes publishing", () =>
+    Effect.gen(function* () {
+      let catchUpRequests = 0;
+      yield* buildAppUnderTest({
+        layers: {
+          agentAwarenessRelay: {
+            requestCatchUp: () =>
+              Effect.sync(() => {
+                catchUpRequests += 1;
+              }),
+          },
+        },
+      });
+
+      const cloudKeyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+        privateKeyEncoding: { format: "pem", type: "pkcs8" },
+        publicKeyEncoding: { format: "pem", type: "spki" },
+      });
+      const ownerCookie = yield* getAuthenticatedSessionCookieHeader();
+      const relayConfigResponse = yield* fetchEffect(
+        yield* getHttpServerUrl("/api/connect/relay-config"),
+        {
+          method: "POST",
+          headers: { cookie: ownerCookie, "content-type": "application/json" },
+          body: jsonRequestBody({
+            relayUrl: "https://relay.example.test",
+            cloudUserId: "user_123",
+            environmentCredential: "t3env_test_credential",
+            cloudMintPublicKey: cloudKeyPair.publicKey,
+            endpointRuntime: null,
+          }),
+        },
+      );
+      assert.equal(relayConfigResponse.status, 200);
+      assert.equal(catchUpRequests, 1);
+
+      const preferencesResponse = yield* fetchEffect(
+        yield* getHttpServerUrl("/api/connect/preferences"),
+        {
+          method: "POST",
+          headers: { cookie: ownerCookie, "content-type": "application/json" },
+          body: jsonRequestBody({ publishAgentActivity: true }),
+        },
+      );
+      assert.equal(preferencesResponse.status, 200);
+      assert.equal(catchUpRequests, 2);
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
   it.effect("rejects relay config with an invalid cloud mint public key", () =>
     Effect.gen(function* () {
       yield* buildAppUnderTest();
@@ -3214,6 +3330,68 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  it.effect("rejects a non-Cloudflare managed endpoint runtime without persisting the link", () =>
+    Effect.gen(function* () {
+      const appliedRuntimeConfigs: Array<unknown> = [];
+      yield* buildAppUnderTest({
+        layers: {
+          cloudManagedEndpointRuntime: {
+            applyConfig: (config) =>
+              Effect.sync(() => {
+                appliedRuntimeConfigs.push(config);
+                return config === null
+                  ? ({ status: "disabled" } as const)
+                  : ({ status: "unsupported", providerKind: config.providerKind } as const);
+              }),
+          },
+        },
+      });
+
+      const cloudKeyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+        privateKeyEncoding: { format: "pem", type: "pkcs8" },
+        publicKeyEncoding: { format: "pem", type: "spki" },
+      });
+      const ownerCookie = yield* getAuthenticatedSessionCookieHeader();
+      const relayConfigUrl = yield* getHttpServerUrl("/api/connect/relay-config");
+      const relayConfigResponse = yield* fetchEffect(relayConfigUrl, {
+        method: "POST",
+        headers: {
+          cookie: ownerCookie,
+          "content-type": "application/json",
+        },
+        body: jsonRequestBody({
+          relayUrl: "https://relay.example.test",
+          cloudUserId: "user_123",
+          environmentCredential: "t3env_test_credential",
+          cloudMintPublicKey: cloudKeyPair.publicKey,
+          endpointRuntime: {
+            providerKind: "manual",
+            connectorToken: "manual-token",
+          },
+        }),
+      });
+      const relayConfigBody = yield* responseJsonEffect<{
+        readonly _tag?: string;
+        readonly endpointRuntimeStatus?: { readonly status?: string };
+      }>(relayConfigResponse);
+      const linkStateUrl = yield* getHttpServerUrl("/api/connect/link-state");
+      const linkStateResponse = yield* fetchEffect(linkStateUrl, {
+        headers: { cookie: ownerCookie },
+      });
+      const linkStateBody = yield* responseJsonEffect<{ readonly linked?: boolean }>(
+        linkStateResponse,
+      );
+
+      assert.equal(relayConfigResponse.status, 503);
+      assert.equal(relayConfigBody._tag, "EnvironmentCloudEndpointUnavailableError");
+      assert.equal(relayConfigBody.endpointRuntimeStatus?.status, "unsupported");
+      // The connector is never touched for a rejected runtime.
+      assert.deepEqual(appliedRuntimeConfigs, []);
+      assert.equal(linkStateResponse.status, 200);
+      assert.equal(linkStateBody.linked, false);
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
   it.effect("reports local cloud link state from persisted relay config", () =>
     Effect.gen(function* () {
       yield* buildAppUnderTest();
@@ -3292,6 +3470,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
   it.effect("unlinks local cloud state and disables the managed endpoint runtime", () =>
     Effect.gen(function* () {
       const appliedRuntimeConfigs: Array<unknown> = [];
+      const requestedRecoveryConfigs: Array<unknown> = [];
       yield* buildAppUnderTest({
         layers: {
           cloudManagedEndpointRuntime: {
@@ -3308,7 +3487,14 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
                 ...(config.tunnelName ? { tunnelName: config.tunnelName } : {}),
               });
             },
+            requestRecovery: (config) =>
+              Effect.sync(() => {
+                requestedRecoveryConfigs.push(config);
+              }),
           },
+          httpClient: HttpClient.make((request) =>
+            Effect.succeed(HttpClientResponse.fromWeb(request, Response.json({ status: "ready" }))),
+          ),
         },
       });
 
@@ -3374,6 +3560,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
       assert.equal(linkStateBody.relayUrl, null);
       assert.equal(linkStateBody.relayIssuer, null);
       assert.deepEqual(appliedRuntimeConfigs, [
+        null,
         {
           providerKind: "cloudflare_tunnel",
           connectorToken: "connector-token",
@@ -3382,6 +3569,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
         },
         null,
       ]);
+      assert.deepEqual(requestedRecoveryConfigs, []);
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
@@ -3622,6 +3810,82 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  it.effect("rejects cloud replays by time alone once their markers can be pruned", () =>
+    Effect.gen(function* () {
+      yield* buildAppUnderTest();
+
+      const cloudKeyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+        privateKeyEncoding: { format: "pem", type: "pkcs8" },
+        publicKeyEncoding: { format: "pem", type: "spki" },
+      });
+      const ownerCookie = yield* getAuthenticatedSessionCookieHeader();
+      const relayConfigResponse = yield* fetchEffect(
+        yield* getHttpServerUrl("/api/connect/relay-config"),
+        {
+          method: "POST",
+          headers: { cookie: ownerCookie, "content-type": "application/json" },
+          body: jsonRequestBody({
+            relayUrl: "https://relay.example.test",
+            cloudUserId: "user_123",
+            environmentCredential: "t3env_test_credential",
+            cloudMintPublicKey: cloudKeyPair.publicKey,
+            endpointRuntime: null,
+          }),
+        },
+      );
+      assert.equal(relayConfigResponse.status, 200);
+
+      const acceptedAt = yield* DateTime.now;
+      // The longest-lived proofs: `iat` at the 60 s future skew the handlers
+      // allow, and the 5 minute maximum lifetime.
+      const issuedAt = DateTime.add(acceptedAt, { minutes: 1 });
+      const proofTimes = {
+        issuedAt: DateTime.formatIso(issuedAt),
+        expiresAt: DateTime.formatIso(DateTime.add(issuedAt, { minutes: 5 })),
+      };
+      const requests = [
+        [
+          "/api/t3-connect/health",
+          makeCloudEnvironmentHealthRequest({
+            privateKey: cloudKeyPair.privateKey,
+            environmentId: testEnvironmentDescriptor.environmentId,
+            nonce: "cloud-health-nonce-pruned",
+            ...proofTimes,
+          }),
+        ],
+        [
+          "/api/t3-connect/mint-credential",
+          makeCloudMintCredentialRequest({
+            privateKey: cloudKeyPair.privateKey,
+            environmentId: testEnvironmentDescriptor.environmentId,
+            clientProofKeyThumbprint: "client-proof-key-thumbprint",
+            nonce: "cloud-mint-nonce-pruned",
+            ...proofTimes,
+          }),
+        ],
+      ] as const;
+      const postAll = Effect.forEach(requests, ([pathname, request]) =>
+        Effect.gen(function* () {
+          const response = yield* fetchEffect(yield* getHttpServerUrl(pathname), {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: jsonRequestBody(request),
+          });
+          return response.status;
+        }),
+      );
+
+      assert.deepStrictEqual(yield* postAll, [200, 200]);
+      // While the proofs are fresh, only the replay markers reject them (409).
+      assert.deepStrictEqual(yield* postAll, [409, 409]);
+      // Once the markers can be pruned, the time checks reject the proofs by themselves (401).
+      yield* TestClock.setTime(
+        acceptedAt.epochMilliseconds + Duration.toMillis(REPLAY_MARKER_MAX_AGE),
+      );
+      assert.deepStrictEqual(yield* postAll, [401, 401]);
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
   it.effect(
     "validates cloud proofs against the configured relay issuer, not the transport URL",
     () =>
@@ -3692,19 +3956,169 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
       }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  it.effect("keeps a managed connector stopped when relay registration fails", () =>
+    Effect.gen(function* () {
+      const appliedRuntimeConfigs: Array<unknown> = [];
+      const relayRequests: Array<HttpClientRequest.HttpClientRequest> = [];
+      yield* buildAppUnderTest({
+        layers: {
+          cloudManagedEndpointRuntime: {
+            applyConfig: (config) =>
+              Effect.sync(() => {
+                appliedRuntimeConfigs.push(config);
+                return config === null
+                  ? ({ status: "disabled" } as const)
+                  : ({ status: "running", providerKind: "cloudflare_tunnel", pid: 123 } as const);
+              }),
+          },
+          httpClient: HttpClient.make((request) =>
+            Effect.sync(() => {
+              relayRequests.push(request);
+              return HttpClientResponse.fromWeb(
+                request,
+                Response.json({ message: "relay unavailable" }, { status: 503 }),
+              );
+            }),
+          ),
+        },
+      });
+
+      const cloudKeyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+        privateKeyEncoding: { format: "pem", type: "pkcs8" },
+        publicKeyEncoding: { format: "pem", type: "spki" },
+      });
+      const ownerCookie = yield* getAuthenticatedSessionCookieHeader();
+      const relayConfigUrl = yield* getHttpServerUrl("/api/connect/relay-config");
+      const relayConfigResponse = yield* fetchEffect(relayConfigUrl, {
+        method: "POST",
+        headers: {
+          cookie: ownerCookie,
+          "content-type": "application/json",
+        },
+        body: jsonRequestBody({
+          relayUrl: "https://relay.example.test",
+          cloudUserId: "user_123",
+          environmentCredential: "t3env_test_credential",
+          cloudMintPublicKey: cloudKeyPair.publicKey,
+          endpointRuntime: {
+            providerKind: "cloudflare_tunnel",
+            connectorToken: "connector-token",
+            tunnelId: "tunnel-1",
+          },
+        }),
+      });
+      const relayConfigBody = yield* responseJsonEffect<{ readonly _tag?: string }>(
+        relayConfigResponse,
+      );
+
+      assert.equal(relayConfigResponse.status, 500);
+      assert.equal(relayConfigBody._tag, "EnvironmentHttpInternalServerError");
+      assert.equal(relayRequests.length, 3);
+      assert.deepEqual(appliedRuntimeConfigs, [null]);
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
+  it.effect(
+    "queues recovery without starting a connector when relay registration requires it",
+    () =>
+      Effect.gen(function* () {
+        const appliedRuntimeConfigs: Array<unknown> = [];
+        const requestedRecoveryConfigs: Array<unknown> = [];
+        const relayRequests: Array<HttpClientRequest.HttpClientRequest> = [];
+        yield* buildAppUnderTest({
+          layers: {
+            cloudManagedEndpointRuntime: {
+              applyConfig: (config) =>
+                Effect.sync(() => {
+                  appliedRuntimeConfigs.push(config);
+                  return config === null
+                    ? ({ status: "disabled" } as const)
+                    : ({ status: "running", providerKind: "cloudflare_tunnel", pid: 123 } as const);
+                }),
+              requestRecovery: (config) =>
+                Effect.sync(() => {
+                  requestedRecoveryConfigs.push(config);
+                }),
+            },
+            httpClient: HttpClient.make((request) =>
+              Effect.sync(() => {
+                relayRequests.push(request);
+                return HttpClientResponse.fromWeb(
+                  request,
+                  Response.json({ status: "recovery_required" }),
+                );
+              }),
+            ),
+          },
+        });
+
+        const cloudKeyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+          privateKeyEncoding: { format: "pem", type: "pkcs8" },
+          publicKeyEncoding: { format: "pem", type: "spki" },
+        });
+        const ownerCookie = yield* getAuthenticatedSessionCookieHeader();
+        const relayConfigUrl = yield* getHttpServerUrl("/api/connect/relay-config");
+        const relayConfigResponse = yield* fetchEffect(relayConfigUrl, {
+          method: "POST",
+          headers: {
+            cookie: ownerCookie,
+            "content-type": "application/json",
+          },
+          body: jsonRequestBody({
+            relayUrl: "https://relay.example.test",
+            cloudUserId: "user_123",
+            environmentCredential: "t3env_test_credential",
+            cloudMintPublicKey: cloudKeyPair.publicKey,
+            endpointRuntime: {
+              providerKind: "cloudflare_tunnel",
+              connectorToken: "connector-token",
+              tunnelId: "tunnel-1",
+            },
+          }),
+        });
+        const relayConfigBody = yield* responseJsonEffect<{
+          readonly _tag?: string;
+          readonly endpointRuntimeStatus?: { readonly status?: string };
+        }>(relayConfigResponse);
+
+        assert.equal(relayConfigResponse.status, 503);
+        assert.equal(relayConfigBody._tag, "EnvironmentCloudEndpointUnavailableError");
+        assert.equal(relayConfigBody.endpointRuntimeStatus?.status, "disabled");
+        assert.equal(relayRequests.length, 1);
+        assert.deepEqual(appliedRuntimeConfigs, [null]);
+        assert.deepEqual(requestedRecoveryConfigs, [
+          {
+            providerKind: "cloudflare_tunnel",
+            connectorToken: "connector-token",
+            tunnelId: "tunnel-1",
+          },
+        ]);
+      }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
   it.effect("fails relay config when the managed endpoint connector cannot start", () =>
     Effect.gen(function* () {
+      const appliedRuntimeConfigs: Array<unknown> = [];
       yield* buildAppUnderTest({
         layers: {
           cloudManagedEndpointRuntime: {
-            applyConfig: () =>
-              Effect.succeed({
-                status: "failed",
-                providerKind: "cloudflare_tunnel",
-                reason: "cloudflared missing",
-                tunnelId: "tunnel-1",
+            applyConfig: (config) =>
+              Effect.sync(() => {
+                appliedRuntimeConfigs.push(config);
+                return config === null
+                  ? ({ status: "disabled" } as const)
+                  : ({
+                      status: "failed",
+                      providerKind: "cloudflare_tunnel",
+                      failure: "not-installed",
+                      reason: "cloudflared missing",
+                      tunnelId: "tunnel-1",
+                    } as const);
               }),
           },
+          httpClient: HttpClient.make((request) =>
+            Effect.succeed(HttpClientResponse.fromWeb(request, Response.json({ status: "ready" }))),
+          ),
         },
       });
 
@@ -3743,33 +4157,14 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
       assert.equal(relayConfigBody.message, "Managed endpoint runtime could not be started.");
       assert.equal(relayConfigBody.endpointRuntimeStatus?.status, "failed");
       assert.equal(relayConfigBody.endpointRuntimeStatus?.reason, "cloudflared missing");
-
-      const now = yield* DateTime.now;
-      const healthRequest = makeCloudEnvironmentHealthRequest({
-        privateKey: cloudKeyPair.privateKey,
-        environmentId: testEnvironmentDescriptor.environmentId,
-        nonce: "cloud-health-after-failed-runtime",
-        issuedAt: DateTime.formatIso(now),
-        expiresAt: DateTime.formatIso(DateTime.add(now, { minutes: 5 })),
-      });
-      const healthUrl = yield* getHttpServerUrl("/api/t3-connect/health");
-      const healthResponse = yield* fetchEffect(healthUrl, {
-        method: "POST",
-        headers: {
-          "content-type": "application/json",
+      assert.deepEqual(appliedRuntimeConfigs, [
+        null,
+        {
+          providerKind: "cloudflare_tunnel",
+          connectorToken: "connector-token",
+          tunnelId: "tunnel-1",
         },
-        body: jsonRequestBody(healthRequest),
-      });
-      const healthBody = yield* responseJsonEffect<{
-        _tag?: string;
-        message?: string;
-      }>(healthResponse);
-      assert.equal(healthResponse.status, 500);
-      assert.equal(healthBody._tag, "EnvironmentHttpInternalServerError");
-      assert.equal(
-        healthBody.message,
-        "Cloud mint public key is not installed for this environment.",
-      );
+      ]);
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
@@ -5095,7 +5490,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
               attributes: [
                 {
                   key: "service.name",
-                  value: { stringValue: "t3-web" },
+                  value: { stringValue: "t3code-web" },
                 },
               ],
             },
@@ -5237,7 +5632,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
             "rpc.method": "server.getSettings",
           },
           resourceAttributes: {
-            "service.name": "t3-web",
+            "service.name": "t3code-web",
           },
           scope: {
             name: "effect",
@@ -5368,7 +5763,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
       // the stub's utf8 decode even though the surrounding bytes don't.
       assert.notEqual(forwarded.body[0], "{");
       assert.include(forwarded.body, "client.protobuf.test");
-      assert.include(forwarded.body, "t3-web");
+      assert.include(forwarded.body, "t3code-web");
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
@@ -5469,11 +5864,61 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
         assert.deepEqual(record.links, []);
         assert.equal(record.scope.name, scopeSpan.scope.name);
         assert.deepEqual(record.scope.attributes, {});
-        assert.equal(record.resourceAttributes["service.name"], "t3-web");
+        assert.equal(record.resourceAttributes["service.name"], "t3code-web");
         assert.equal(record.status?.code, String(span.status.code));
       }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  it.effect("does not trace browser OTLP trace exports on the server", () =>
+    Effect.gen(function* () {
+      const spanNames: Array<string> = [];
+      const forwardedUrls: Array<string> = [];
+      yield* buildAppUnderTest({
+        config: { otlpTracesUrl: "http://collector.test/v1/traces" },
+        layers: {
+          httpClient: HttpClient.make((request) =>
+            Effect.sync(() => {
+              forwardedUrls.push(request.url);
+              return HttpClientResponse.fromWeb(request, new Response(null, { status: 204 }));
+            }),
+          ),
+        },
+      }).pipe(
+        Effect.provideService(
+          Tracer.Tracer,
+          Tracer.make({
+            span: (options) => {
+              spanNames.push(options.name);
+              return new Tracer.NativeSpan(options);
+            },
+          }),
+        ),
+      );
+      const cookie = yield* getAuthenticatedSessionCookieHeader();
+      spanNames.length = 0;
+
+      // The query string must not bring back the HTTP server span.
+      for (const url of ["/api/observability/v1/traces", "/api/observability/v1/traces?x=1"]) {
+        const response = yield* HttpClient.post(url, {
+          headers: { cookie, "content-type": "application/json" },
+          body: yield* HttpBody.json({ resourceSpans: [] }),
+        });
+        assert.equal(response.status, 204);
+      }
+
+      assert.deepEqual(forwardedUrls, [
+        "http://collector.test/v1/traces",
+        "http://collector.test/v1/traces",
+      ]);
+      assert.deepEqual(spanNames, []);
+
+      // Other routes keep their HTTP server span.
+      const session = yield* HttpClient.get("/api/auth/session", { headers: { cookie } });
+      assert.equal(session.status, 200);
+      assert.include(spanNames, "http.server GET");
+    }).pipe(Effect.provide(NodeHttpServer.layerTest)),
+  );
+
   it.effect("routes websocket rpc server.upsertKeybinding", () =>
     Effect.gen(function* () {
       const rule: KeybindingRule = {
@@ -6371,6 +6816,99 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
     }).pipe(Effect.provide(NodeHttpServer.layerTest)),
   );
 
+  for (const mode of ["all", "targeted", "background"] as const) {
+    it.effect(`provider refresh invalidates T3 caches before probing (${mode})`, () => {
+      const driver = ProviderDriverKind.make("codex");
+      const instanceIds = [ProviderInstanceId.make("codex"), ProviderInstanceId.make("codex_work")];
+      const packageNames = ["@example/personal", "@example/work"];
+      const versionCache = new Map(
+        packageNames.map((name) => [
+          name,
+          {
+            expiresAt: Number.MAX_SAFE_INTEGER,
+            version: "1.0.0",
+          },
+        ]),
+      );
+      const invalidated: string[] = [];
+      const freshMaintenance: string[] = [];
+      let manifestRefreshed = false;
+      let probed = false;
+      const instances = instanceIds.map(
+        (instanceId, index) =>
+          ({
+            instanceId,
+            driverKind: driver,
+            continuationIdentity: { driverKind: driver, continuationKey: instanceId },
+            displayName: undefined,
+            enabled: true,
+            invalidateCaches: Effect.sync(() => {
+              invalidated.push(instanceId);
+            }),
+            snapshot: {
+              resolveMaintenance: (options) =>
+                Effect.sync(() => {
+                  assert.isTrue(options?.fresh);
+                  freshMaintenance.push(instanceId);
+                  return makeManualOnlyProviderMaintenanceCapabilities({
+                    provider: driver,
+                    packageName: packageNames[index]!,
+                  });
+                }),
+              getSnapshot: Effect.never,
+              refresh: Effect.never,
+              streamChanges: Stream.empty,
+              applyUsageLimits: () => Effect.void,
+            },
+            adapter: {} as ProviderInstance["adapter"],
+            textGeneration: {} as ProviderInstance["textGeneration"],
+          }) satisfies ProviderInstance,
+      );
+      const expected =
+        mode === "background" ? [] : mode === "targeted" ? [instanceIds[1]!] : instanceIds;
+      const probe = Effect.sync(() => {
+        probed = true;
+        assert.equal(manifestRefreshed, mode !== "background");
+        assert.deepEqual(invalidated.toSorted(), expected.toSorted());
+        assert.deepEqual(freshMaintenance.toSorted(), expected.toSorted());
+        for (let index = 0; index < instanceIds.length; index++) {
+          assert.equal(
+            versionCache.has(packageNames[index]!),
+            !expected.includes(instanceIds[index]!),
+          );
+        }
+        return [];
+      });
+      return Effect.gen(function* () {
+        yield* buildAppUnderTest({
+          layers: {
+            modelManifest: {
+              forceRefresh: Effect.sync(() => {
+                manifestRefreshed = true;
+                return ModelManifest.BUNDLED_MODEL_MANIFEST;
+              }),
+            },
+            providerInstanceRegistry: { listInstances: Effect.succeed(instances) },
+            providerRegistry: { refresh: () => probe, refreshInstance: () => probe },
+          },
+        });
+        const wsUrl = yield* getWsServerUrl("/ws");
+        yield* Effect.scoped(
+          withWsRpcClient(wsUrl, (client) =>
+            client[WS_METHODS.serverRefreshProviders]({
+              ...(mode === "targeted" ? { instanceId: instanceIds[1]! } : {}),
+              ...(mode !== "background" ? { refreshModels: true } : {}),
+            }),
+          ),
+        );
+        assert.isTrue(probed);
+      }).pipe(
+        Effect.provideService(ProviderVersionCache, versionCache),
+        Effect.provide(NodeHttpServer.layerTest),
+      );
+    });
+  }
+
   it.effect("serves config on reconnect without starting provider probes", () =>
     Effect.gen(function* () {
       const refresh = vi.fn(() => Effect.never);
@@ -8826,8 +9364,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
       yield* buildAppUnderTest({
         layers: {
           projectionSnapshotQuery: {
-            getThreadDetailSnapshot: () =>
-              Effect.succeed(Option.some({ snapshotSequence: 1, thread })),
+            getThreadDetailSnapshot: () => Effect.succeedSome({ snapshotSequence: 1, thread }),
           },
         },
       });
@@ -9000,16 +9537,13 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
               streamDomainEvents: Stream.concat(Stream.make(event), Stream.never),
             },
             projectionSnapshotQuery: {
-              getThreadDetailSnapshot: () =>
-                Effect.succeed(Option.some({ snapshotSequence: 1, thread })),
+              getThreadDetailSnapshot: () => Effect.succeedSome({ snapshotSequence: 1, thread }),
               getThreadShellById: (threadId) =>
-                Effect.succeed(
-                  Option.some({
-                    ...makeDefaultOrchestrationThreadShell(),
-                    id: threadId,
-                    title: "Build complete",
-                  }),
-                ),
+                Effect.succeedSome({
+                  ...makeDefaultOrchestrationThreadShell(),
+                  id: threadId,
+                  title: "Build complete",
+                }),
             },
           },
         });
@@ -9287,7 +9821,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
             },
             projectionSnapshotQuery: {
               getThreadDetailSnapshot: () =>
-                Effect.succeed(Option.some({ snapshotSequence: 100_000, thread })),
+                Effect.succeedSome({ snapshotSequence: 100_000, thread }),
             },
           },
         });
@@ -9605,8 +10139,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
               }),
           },
           projectionSnapshotQuery: {
-            getThreadDetailSnapshot: () =>
-              Effect.succeed(Option.some({ snapshotSequence: 5, thread })),
+            getThreadDetailSnapshot: () => Effect.succeedSome({ snapshotSequence: 5, thread }),
           },
         },
       });
@@ -9694,7 +10227,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
           projectionSnapshotQuery: {
             getThreadDetailSnapshot: (_threadId, options) => {
               requestedTurnLimit = options?.turnLimit;
-              return Effect.succeed(Option.some({ snapshotSequence: 5, thread }));
+              return Effect.succeedSome({ snapshotSequence: 5, thread });
             },
           },
         },
@@ -9787,7 +10320,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
                 readEvents: store.readFromSequence,
               },
               projectionSnapshotQuery: {
-                getThreadDetailSnapshot: () => Effect.succeed(Option.none()),
+                getThreadDetailSnapshot: () => Effect.succeedNone,
               },
             },
           });
@@ -10017,8 +10550,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
                 replayStatsCalls += 1;
                 return { eventCount: 5, payloadBytes: 8 * 1024 * 1024 + 1 };
               }),
-            getThreadDetailSnapshot: () =>
-              Effect.succeed(Option.some({ snapshotSequence: 5, thread })),
+            getThreadDetailSnapshot: () => Effect.succeedSome({ snapshotSequence: 5, thread }),
             getShellSnapshot: () =>
               Effect.succeed({
                 snapshotSequence: 5,
@@ -10322,7 +10854,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
               ]),
           },
           projectionSnapshotQuery: {
-            getThreadShellById: () => Effect.succeed(Option.none()),
+            getThreadShellById: () => Effect.succeedNone,
           },
         },
       });
@@ -10380,9 +10912,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
                         detail: "transient failure",
                       }),
                     )
-                  : Effect.succeed(
-                      Option.some(makeDefaultOrchestrationThreadShell({ id: threadId })),
-                    );
+                  : Effect.succeedSome(makeDefaultOrchestrationThreadShell({ id: threadId }));
               }),
           },
         },
@@ -10442,7 +10972,7 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
               ]),
           },
           projectionSnapshotQuery: {
-            getProjectShellById: () => Effect.succeed(Option.none()),
+            getProjectShellById: () => Effect.succeedNone,
           },
         },
       });
@@ -10488,22 +11018,20 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
           },
           projectionSnapshotQuery: {
             getThreadShellById: () =>
-              Effect.succeed(
-                Option.some(
-                  makeDefaultOrchestrationThreadShell({
-                    id: threadId,
+              Effect.succeedSome(
+                makeDefaultOrchestrationThreadShell({
+                  id: threadId,
+                  updatedAt: now,
+                  session: {
+                    threadId,
+                    status: "ready",
+                    providerName: "claudeAgent",
+                    runtimeMode: "full-access",
+                    activeTurnId: null,
+                    lastError: null,
                     updatedAt: now,
-                    session: {
-                      threadId,
-                      status: "ready",
-                      providerName: "claudeAgent",
-                      runtimeMode: "full-access",
-                      activeTurnId: null,
-                      lastError: null,
-                      updatedAt: now,
-                    },
-                  }),
-                ),
+                  },
+                }),
               ),
           },
         },
@@ -10636,8 +11164,8 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
           },
           projectionSnapshotQuery: {
             getThreadShellById: () =>
-              Effect.succeed(
-                Option.some(makeDefaultOrchestrationThreadShell({ id: threadId, session: null })),
+              Effect.succeedSome(
+                makeDefaultOrchestrationThreadShell({ id: threadId, session: null }),
               ),
           },
         },
@@ -10690,22 +11218,20 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
             },
             projectionSnapshotQuery: {
               getThreadShellById: () =>
-                Effect.succeed(
-                  Option.some(
-                    makeDefaultOrchestrationThreadShell({
-                      id: threadId,
+                Effect.succeedSome(
+                  makeDefaultOrchestrationThreadShell({
+                    id: threadId,
+                    updatedAt: now,
+                    session: {
+                      threadId,
+                      status: "stopped",
+                      providerName: "claudeAgent",
+                      runtimeMode: "full-access",
+                      activeTurnId: null,
+                      lastError: null,
                       updatedAt: now,
-                      session: {
-                        threadId,
-                        status: "stopped",
-                        providerName: "claudeAgent",
-                        runtimeMode: "full-access",
-                        activeTurnId: null,
-                        lastError: null,
-                        updatedAt: now,
-                      },
-                    }),
-                  ),
+                    },
+                  }),
                 ),
             },
           },
@@ -10756,22 +11282,20 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
           },
           projectionSnapshotQuery: {
             getThreadShellById: () =>
-              Effect.succeed(
-                Option.some(
-                  makeDefaultOrchestrationThreadShell({
-                    id: threadId,
+              Effect.succeedSome(
+                makeDefaultOrchestrationThreadShell({
+                  id: threadId,
+                  updatedAt: now,
+                  session: {
+                    threadId,
+                    status: "ready",
+                    providerName: "claudeAgent",
+                    runtimeMode: "full-access",
+                    activeTurnId: null,
+                    lastError: null,
                     updatedAt: now,
-                    session: {
-                      threadId,
-                      status: "ready",
-                      providerName: "claudeAgent",
-                      runtimeMode: "full-access",
-                      activeTurnId: null,
-                      lastError: null,
-                      updatedAt: now,
-                    },
-                  }),
-                ),
+                  },
+                }),
               ),
           },
         },
@@ -10859,22 +11383,20 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
           },
           projectionSnapshotQuery: {
             getThreadShellById: () =>
-              Effect.succeed(
-                Option.some(
-                  makeDefaultOrchestrationThreadShell({
-                    id: threadId,
+              Effect.succeedSome(
+                makeDefaultOrchestrationThreadShell({
+                  id: threadId,
+                  updatedAt: now,
+                  session: {
+                    threadId,
+                    status: "ready",
+                    providerName: "claudeAgent",
+                    runtimeMode: "full-access",
+                    activeTurnId: null,
+                    lastError: null,
                     updatedAt: now,
-                    session: {
-                      threadId,
-                      status: "ready",
-                      providerName: "claudeAgent",
-                      runtimeMode: "full-access",
-                      activeTurnId: null,
-                      lastError: null,
-                      updatedAt: now,
-                    },
-                  }),
-                ),
+                  },
+                }),
               ),
           },
         },
@@ -10931,22 +11453,20 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
           },
           projectionSnapshotQuery: {
             getThreadShellById: () =>
-              Effect.succeed(
-                Option.some(
-                  makeDefaultOrchestrationThreadShell({
-                    id: threadId,
+              Effect.succeedSome(
+                makeDefaultOrchestrationThreadShell({
+                  id: threadId,
+                  updatedAt: now,
+                  session: {
+                    threadId,
+                    status: "ready",
+                    providerName: "claudeAgent",
+                    runtimeMode: "full-access",
+                    activeTurnId: null,
+                    lastError: null,
                     updatedAt: now,
-                    session: {
-                      threadId,
-                      status: "ready",
-                      providerName: "claudeAgent",
-                      runtimeMode: "full-access",
-                      activeTurnId: null,
-                      lastError: null,
-                      updatedAt: now,
-                    },
-                  }),
-                ),
+                  },
+                }),
               ),
           },
         },
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
index 3fd0bb7274a0..43bba34bd8c5 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -8,12 +8,16 @@ import {
   ProviderDriverKind,
   type RepositoryIdentity,
 } from "@t3tools/contracts";
+import type { RelayManagedEndpointRuntimeConfig } from "@t3tools/contracts/relay";
 import * as Cause from "effect/Cause";
+import * as Clock from "effect/Clock";
 import * as Duration from "effect/Duration";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Random from "effect/Random";
 import * as Schedule from "effect/Schedule";
+import * as Semaphore from "effect/Semaphore";
 import * as Stream from "effect/Stream";
 import { FetchHttpClient, HttpRouter, HttpServer } from "effect/unstable/http";
 import * as HttpApiBuilder from "effect/unstable/httpapi/HttpApiBuilder";
@@ -29,6 +33,7 @@ import {
   staticAndDevRouteLayer,
   browserApiCorsLayer,
   httpCompressionLayer,
+  untracedRequestsLayer,
 } from "./http.ts";
 import { guardHttpResponseWriteErrors } from "./httpResponseErrorGuard.ts";
 import { fixPath } from "./os-jank.ts";
@@ -46,10 +51,11 @@ import { ProviderSessionDirectoryLive } from "./provider/Layers/ProviderSessionD
 import * as ProviderSessionRuntime from "./persistence/ProviderSessionRuntime.ts";
 import { ProviderAdapterRegistryLive } from "./provider/Layers/ProviderAdapterRegistry.ts";
 import * as ModelManifest from "./provider/ModelManifest.ts";
-import * as CodexResetCredit from "./provider/Layers/codexResetCredit.ts";
+import * as ResetCreditCoordinator from "./provider/Layers/resetCreditCoordinator.ts";
 import * as ProviderEventLoggers from "./provider/Layers/ProviderEventLoggers.ts";
 import { ProviderServiceLive } from "./provider/Layers/ProviderService.ts";
 import { ProviderAuthServiceLive } from "./provider/Layers/ProviderAuthService.ts";
+import { CodexInstallation } from "./provider/CodexInstallation.ts";
 import { AntigravityInstallation } from "./provider/AntigravityInstallation.ts";
 import { ProviderInstanceRegistry } from "./provider/Services/ProviderInstanceRegistry.ts";
 import { ProviderRegistry } from "./provider/Services/ProviderRegistry.ts";
@@ -115,20 +121,32 @@ import * as SourceControlRepositoryService from "./sourceControl/SourceControlRe
 import * as ProjectSetupScriptRunner from "./project/ProjectSetupScriptRunner.ts";
 import * as WorktreeSetupTracker from "./project/WorktreeSetupTracker.ts";
 import { ObservabilityLive } from "./observability/Layers/Observability.ts";
+import * as HeapSnapshot from "./observability/HeapSnapshot.ts";
+import * as EventLoopMonitor from "./observability/EventLoopMonitor.ts";
 import * as ServerEnvironment from "./environment/ServerEnvironment.ts";
 import * as RemoteOpenTargets from "./environment/RemoteOpenTargets.ts";
 import { authHttpApiLayer, environmentAuthenticatedAuthLayer } from "./auth/http.ts";
+import * as ReplayMarkers from "./auth/replayMarkers.ts";
 import * as ServerSecretStore from "./auth/ServerSecretStore.ts";
 import * as EnvironmentAuth from "./auth/EnvironmentAuth.ts";
 import {
   connectHttpApiLayer,
   pendingServiceUpdateExists,
-  reconcileDesiredCloudLink,
+  reconcileDesiredCloudLinkIfStillDesired,
+  recoverManagedCloudTunnel,
+  registerManagedCloudTunnelRecovery,
+  startManagedCloudTunnelIfOriginConfirmed,
   releaseManagedTunnelOnShutdown,
 } from "./cloud/http.ts";
 import { serverRelayBrokerTracingLayer } from "./cloud/relayTracing.ts";
 import { shouldRetryCloudLink } from "./cloud/relayResponse.ts";
 import * as CloudManagedEndpointRuntime from "./cloud/ManagedEndpointRuntime.ts";
+import {
+  MANAGED_TUNNEL_FIRST_REGISTRATION_JITTER,
+  MANAGED_TUNNEL_RECOVERY_COOLDOWN,
+  managedTunnelStartupAction,
+  retryManagedTunnelRegistration,
+} from "./cloud/managedTunnelStartup.ts";
 import * as CloudCliTokenManager from "./cloud/CliTokenManager.ts";
 import * as CloudCliState from "./cloud/CliState.ts";
 import * as ServerSelfUpdate from "./cloud/selfUpdate.ts";
@@ -169,7 +187,8 @@ export const HTTP_ROUTER_CONFIG = {
 // those finalizers get a chance to run.
 const HTTP_PREEMPTIVE_SHUTDOWN_GRACE_MS = 0;
 const ResourceAttributionLayerLive = ResourceAttribution.layer;
-const ApplicationObservabilityLive = ObservabilityLive.pipe(
+const ApplicationObservabilityLive = EventLoopMonitor.layer.pipe(
+  Layer.provideMerge(ObservabilityLive),
   Layer.provideMerge(ResourceAttributionLayerLive),
 );
 
@@ -457,22 +476,27 @@ const ProviderRuntimeLayerLive = ProviderSessionReaperLive.pipe(
   Layer.provideMerge(OrchestrationLayerLive),
 );
 
-const AntigravityInstallationRefreshLive = Layer.effectDiscard(
+const ProviderInstallationRefreshLive = Layer.effectDiscard(
   Effect.gen(function* () {
-    const installation = yield* AntigravityInstallation;
+    const antigravity = yield* AntigravityInstallation;
+    const codex = yield* CodexInstallation;
     const instances = yield* ProviderInstanceRegistry;
     const providers = yield* ProviderRegistry;
-    yield* installation.changes.pipe(
-      Stream.map((state) => state.installedVersion),
-      Stream.changes,
-      Stream.drop(1),
-      Stream.runForEach(() =>
+    yield* Stream.merge(
+      antigravity.changes.pipe(
+        Stream.changesWith((a, b) => a.installedVersion === b.installedVersion),
+        Stream.drop(1),
+      ),
+      codex.changes.pipe(
+        Stream.changesWith((a, b) => a.installedVersion === b.installedVersion),
+        Stream.drop(1),
+      ),
+    ).pipe(
+      Stream.runForEach((state) =>
         instances.listInstances.pipe(
           Effect.flatMap((entries) =>
             Effect.forEach(
-              entries.filter(
-                (instance) => instance.driverKind === ProviderDriverKind.make("antigravity"),
-              ),
+              entries.filter((instance) => instance.driverKind === state.driver),
               (instance) => providers.refreshInstance(instance.instanceId),
               { discard: true },
             ),
@@ -485,7 +509,8 @@ const AntigravityInstallationRefreshLive = Layer.effectDiscard(
 );
 
 const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(
-  Layer.provideMerge(AntigravityInstallationRefreshLive),
+  Layer.provideMerge(ProviderInstallationRefreshLive),
+  Layer.provideMerge(ReplayMarkers.layer),
   Layer.provideMerge(ProviderAuthServiceLive),
   // Core Services
   Layer.provideMerge(ServerSettingsLayerLive),
@@ -513,7 +538,7 @@ const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(
   // with explicit `providerInstances` entries on boot.
   Layer.provideMerge(ProviderInstanceRegistryHydrationLive),
 ).pipe(
-  Layer.provideMerge(AntigravityInstallation.layer),
+  Layer.provideMerge(Layer.mergeAll(AntigravityInstallation.layer, CodexInstallation.layer)),
   // Shared native/canonical NDJSON writers used by both the per-instance
   // drivers (native stream, written from inside each `<X>Adapter`) and
   // `ProviderService` (canonical stream, written after event normalization).
@@ -523,7 +548,7 @@ const RuntimeCoreDependenciesLive = ReactorLayerLive.pipe(
   // from the repo's `model-manifest.json` on `main` and applied by the
   // Codex/Claude drivers.
   Layer.provideMerge(
-    Layer.mergeAll(ProviderEventLoggers.layer, ModelManifest.layer, CodexResetCredit.layer),
+    Layer.mergeAll(ProviderEventLoggers.layer, ModelManifest.layer, ResetCreditCoordinator.layer),
   ),
   // `OpenCodeDriver.create()` yields `OpenCodeRuntime`; previously the old
   // `ProviderRegistryLive` pulled `OpenCodeRuntimeLive` in for itself, but
@@ -587,6 +612,8 @@ export const makeRoutesLayer = Layer.mergeAll(
     websocketRpcRouteLayer,
   ),
   McpHttpServer.layer.pipe(Layer.provide(McpSessionRegistry.layer)),
+  // Last, so no route layer can replace the server's one TracerDisabledWhen.
+  untracedRequestsLayer,
 ).pipe(
   // Both transports consume the same service instance, so caches single-flight across clients
   // and mutations observed on WebSocket invalidate patches subsequently read over HTTP.
@@ -708,10 +735,6 @@ const makeServerLayer = Layer.unwrap(
       : Layer.empty;
     const cloudDesiredLinkReconcileLayer = Layer.effectDiscard(
       Effect.gen(function* () {
-        if (!hasCloudPublicConfig) {
-          yield* Deferred.succeed(cloudLinkParked, undefined).pipe(Effect.orDie);
-          return;
-        }
         const releaseManagedTunnel = releaseManagedTunnelOnShutdown().pipe(
           Effect.timeout("10 seconds"),
           Effect.tap((released) =>
@@ -740,33 +763,184 @@ const makeServerLayer = Layer.unwrap(
             if (!cleanupBeforeActivation) {
               yield* Effect.addFinalizer(() => releaseManagedTunnel);
             }
-            if (!(yield* CloudCliState.readCliDesiredCloudLink)) return;
             const server = yield* HttpServer.HttpServer;
             const address = server.address;
             if (typeof address === "string" || !("port" in address)) return;
+            const localOrigin = `http://127.0.0.1:${address.port}`;
+            const endpointRuntime = yield* CloudManagedEndpointRuntime.CloudManagedEndpointRuntime;
+            const recoveryLock = yield* Semaphore.make(1);
+            let lastRecoveryAtMillis = 0;
+            const recoverManagedTunnel = (config: RelayManagedEndpointRuntimeConfig) =>
+              recoveryLock.withPermits(1)(
+                Effect.gen(function* () {
+                  const elapsed = (yield* Clock.currentTimeMillis) - lastRecoveryAtMillis;
+                  const wait = Duration.toMillis(MANAGED_TUNNEL_RECOVERY_COOLDOWN) - elapsed;
+                  if (wait > 0) yield* Effect.sleep(Duration.millis(wait));
+                  lastRecoveryAtMillis = yield* Clock.currentTimeMillis;
+                }).pipe(
+                  Effect.andThen(
+                    recoverManagedCloudTunnel(localOrigin, config, {
+                      retryRuntimeFailures: true,
+                    }),
+                  ),
+                  Effect.retry({
+                    while: (error) =>
+                      shouldRetryCloudLink(error) &&
+                      error._tag !== "EnvironmentCloudEndpointUnavailableError",
+                    schedule: Schedule.exponential("1 second").pipe(
+                      Schedule.modifyDelay(({ duration }) =>
+                        Effect.succeed(Duration.min(duration, Duration.seconds(30))),
+                      ),
+                      Schedule.jittered,
+                    ),
+                  }),
+                  Effect.tap((recovered) =>
+                    recovered ? Effect.logInfo("T3 Connect managed tunnel recovered") : Effect.void,
+                  ),
+                  Effect.catchCause((cause) =>
+                    Cause.hasInterrupts(cause)
+                      ? Effect.interrupt
+                      : Effect.logWarning("Failed to recover the T3 Connect managed tunnel", {
+                          cause,
+                        }),
+                  ),
+                ),
+              );
+            yield* endpointRuntime.recoveryRequests.pipe(
+              Stream.runForEach(recoverManagedTunnel),
+              Effect.forkScoped,
+            );
             // No settling delay before the first attempt: routes are already
             // serving by the time activation opens this gate (the startup
             // sequence awaits routesReady), and the retry schedule below
             // covers anything this sleep used to hedge against. Every
             // millisecond here is dead time on the path to remote
             // reachability after a restart.
-            yield* reconcileDesiredCloudLink(`http://127.0.0.1:${address.port}`).pipe(
-              Effect.retry({
-                while: shouldRetryCloudLink,
-                schedule: Schedule.exponential("1 second").pipe(
-                  Schedule.modifyDelay(({ duration }) =>
-                    Effect.succeed(Duration.min(duration, Duration.seconds(30))),
+            const wantsCliLink = hasCloudPublicConfig
+              ? yield* CloudCliState.readCliDesiredCloudLink.pipe(
+                  Effect.catch((cause) =>
+                    Effect.logWarning("Failed to read the desired T3 Connect link", { cause }).pipe(
+                      Effect.as(false),
+                    ),
                   ),
-                  Schedule.upTo({ duration: "10 minutes" }),
-                ),
-              }),
-              Effect.tap(() => Effect.logInfo("T3 Connect desired link reconciled on startup")),
+                )
+              : false;
+            // A failed read must not end this fiber before it registers
+            // recovery and starts consuming recovery requests. "managed" is
+            // what a missing value means, so it is the safe fallback.
+            const desiredCliLinkMode = wantsCliLink
+              ? yield* CloudCliState.readCliDesiredLinkMode.pipe(
+                  Effect.catch((cause) =>
+                    Effect.logWarning("Failed to read the desired T3 Connect link mode", {
+                      cause,
+                    }).pipe(Effect.as("managed" as const)),
+                  ),
+                )
+              : null;
+            // A publish-only link must not expose the host, even if a managed
+            // config from an earlier link is still stored.
+            const startedConfirmed =
+              desiredCliLinkMode === "publish_only"
+                ? false
+                : yield* startManagedCloudTunnelIfOriginConfirmed(localOrigin).pipe(
+                    Effect.catch((cause) =>
+                      Effect.logWarning("Failed to start the confirmed T3 Connect tunnel", {
+                        cause,
+                      }).pipe(Effect.as(false)),
+                    ),
+                  );
+            const startStoredManagedTunnel = startManagedCloudTunnelIfOriginConfirmed(localOrigin, {
+              requireConfirmedOrigin: false,
+            }).pipe(
+              Effect.tap((started) =>
+                started
+                  ? Effect.logWarning(
+                      "T3 Connect started the stored tunnel without relay confirmation",
+                    )
+                  : Effect.void,
+              ),
               Effect.catch((cause) =>
-                Effect.logWarning("Failed to reconcile T3 Connect desired link on startup", {
-                  message: cause.message,
-                }),
+                Effect.logWarning("Failed to start the stored T3 Connect tunnel", { cause }),
+              ),
+              Effect.asVoid,
+            );
+            const registerManagedTunnel = retryManagedTunnelRegistration(
+              registerManagedCloudTunnelRecovery(localOrigin, {
+                retryRuntimeFailures: true,
+              }),
+              (error) =>
+                shouldRetryCloudLink(error) &&
+                error._tag !== "EnvironmentCloudEndpointUnavailableError",
+              startedConfirmed ? Effect.void : startStoredManagedTunnel,
+            ).pipe(
+              Effect.tap((result) =>
+                result.status === "ready"
+                  ? Effect.logInfo("T3 Connect managed tunnel recovery registered")
+                  : Effect.void,
+              ),
+              Effect.catchCause((cause) =>
+                Cause.hasInterrupts(cause)
+                  ? Effect.interrupt
+                  : Effect.logWarning("Failed to register T3 Connect managed tunnel recovery", {
+                      cause,
+                    }).pipe(Effect.as({ status: "unavailable" as const })),
               ),
             );
+            // A host without a confirmed marker is on its first boot after the
+            // upgrade. Spread those registrations so an auto-update wave does
+            // not hit the relay all at once.
+            if (!startedConfirmed && desiredCliLinkMode !== "publish_only") {
+              const jitter = yield* Random.nextIntBetween(
+                0,
+                Duration.toMillis(MANAGED_TUNNEL_FIRST_REGISTRATION_JITTER),
+              );
+              yield* Effect.sleep(Duration.millis(jitter));
+            }
+            const registration =
+              desiredCliLinkMode === "publish_only"
+                ? { status: "not_linked" as const }
+                : yield* registerManagedTunnel;
+            // A terminal registration failure also allows the stored config
+            // to start. Transient outages use the fallback above and keep
+            // registration retrying in this scoped startup fiber.
+            if (registration.status === "unavailable" && !startedConfirmed) {
+              yield* startStoredManagedTunnel;
+            }
+            const startupAction = managedTunnelStartupAction({ wantsCliLink, registration });
+            if (startupAction.action === "request_recovery") {
+              yield* endpointRuntime.requestRecovery(startupAction.config);
+            }
+            if (startupAction.action === "reconcile_link") {
+              const reconciledMode = yield* reconcileDesiredCloudLinkIfStillDesired(
+                localOrigin,
+              ).pipe(
+                Effect.retry({
+                  while: shouldRetryCloudLink,
+                  schedule: Schedule.exponential("1 second").pipe(
+                    Schedule.modifyDelay(({ duration }) =>
+                      Effect.succeed(Duration.min(duration, Duration.seconds(30))),
+                    ),
+                    Schedule.upTo({ duration: "10 minutes" }),
+                  ),
+                }),
+                Effect.tap((mode) =>
+                  mode === null
+                    ? Effect.void
+                    : Effect.logInfo("T3 Connect desired link reconciled on startup"),
+                ),
+                Effect.catch((cause) =>
+                  Effect.logWarning("Failed to reconcile T3 Connect desired link on startup", {
+                    cause,
+                  }).pipe(Effect.as(null)),
+                ),
+              );
+              if (reconciledMode === "managed") {
+                const afterReconcile = yield* registerManagedTunnel;
+                if (afterReconcile.status === "recovery_required") {
+                  yield* endpointRuntime.requestRecovery(afterReconcile.config);
+                }
+              }
+            }
           }),
         );
         yield* Deferred.succeed(cloudLinkParked, undefined).pipe(Effect.orDie);
@@ -797,6 +971,7 @@ const makeServerLayer = Layer.unwrap(
       runtimeStateLayer.pipe(Layer.provide(launcherLayer)),
       tailscaleServeLayer,
       cloudDesiredLinkReconcileLayer,
+      HeapSnapshot.layer,
     );
 
     return serverApplicationLayer.pipe(
diff --git a/apps/server/src/serverLogger.test.ts b/apps/server/src/serverLogger.test.ts
index cbb5056ed314..43843b249eea 100644
--- a/apps/server/src/serverLogger.test.ts
+++ b/apps/server/src/serverLogger.test.ts
@@ -1,6 +1,7 @@
 import * as NodePath from "@effect/platform-node/NodePath";
 import { assert, describe, it } from "@effect/vitest";
 import * as NodeOS from "node:os";
+import * as ConfigProvider from "effect/ConfigProvider";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
@@ -9,6 +10,7 @@ import * as HttpClient from "effect/unstable/http/HttpClient";
 import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse";
 
 import { DEFAULT_SIGNAL_EXPORT } from "@t3tools/shared/observability";
+import * as OtelEnvironment from "@t3tools/shared/otelEnvironment";
 
 import * as ServerConfig from "./config.ts";
 import { ServerLoggerLive } from "./serverLogger.ts";
@@ -56,7 +58,7 @@ const configLayer = (overrides: Partial<ServerConfig.ServerConfig["Service"]>) =
         otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
         otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
         otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-        otlpServiceName: "t3-server",
+        otelEnvironment: OtelEnvironment.none,
         cwd: baseDir,
         baseDir,
         ...derivedPaths,
@@ -144,11 +146,38 @@ describe("ServerLoggerLive", () => {
       const [request] = requests;
       assert.strictEqual(request?.url, "https://collector.example.com/v1/logs");
       assert.include(request?.body ?? "", "server logger under test");
-      assert.include(request?.body ?? "", "t3-server");
+      assert.include(request?.body ?? "", "t3code-server");
       assert.include(request?.body ?? "", "service.runtime");
     }),
   );
 
+  it.effect("keeps its service name while OTEL resource attributes add dimensions", () =>
+    Effect.gen(function* () {
+      const requests = yield* logThrough({
+        otlpLogsUrl: "https://collector.example.com/v1/logs",
+      }).pipe(
+        Effect.provide(
+          ConfigProvider.layer(
+            ConfigProvider.fromEnv({
+              env: {
+                OTEL_SERVICE_NAME: "renamed",
+                OTEL_RESOURCE_ATTRIBUTES:
+                  "service.name=renamed,service.namespace=renamed,deployment.environment.name=development",
+              },
+            }),
+          ),
+        ),
+      );
+
+      assert.lengthOf(requests, 1);
+      const body = requests[0]?.body ?? "";
+      assert.include(body, '"stringValue":"t3code-server"');
+      assert.include(body, "deployment.environment.name");
+      assert.include(body, '"key":"service.namespace","value":{"stringValue":"t3code"}');
+      assert.notInclude(body, "renamed");
+    }),
+  );
+
   it.effect("stays off the network when no logs endpoint is configured", () =>
     Effect.gen(function* () {
       const requests = yield* logThrough({});
diff --git a/apps/server/src/serverRuntimeStartup.reconcile.test.ts b/apps/server/src/serverRuntimeStartup.reconcile.test.ts
index 37fd210ee6da..050650b11515 100644
--- a/apps/server/src/serverRuntimeStartup.reconcile.test.ts
+++ b/apps/server/src/serverRuntimeStartup.reconcile.test.ts
@@ -399,18 +399,16 @@ it.effect("does not continue archived or deleted marked sessions", () => {
     directory: {
       getBinding: (threadId) => {
         const thread = threadId === archived.id ? archived : deleted;
-        return Effect.succeed(
-          Option.some({
-            threadId,
-            provider: ProviderDriverKind.make("codex"),
-            providerInstanceId,
-            status: "running" as const,
-            resumeCursor: { cursor: threadId },
-            runtimePayload: {
-              continueAfterServerUpdate: thread.session.activeTurnId,
-            },
-          }),
-        );
+        return Effect.succeedSome({
+          threadId,
+          provider: ProviderDriverKind.make("codex"),
+          providerInstanceId,
+          status: "running" as const,
+          resumeCursor: { cursor: threadId },
+          runtimePayload: {
+            continueAfterServerUpdate: thread.session.activeTurnId,
+          },
+        });
       },
       upsert: () => Effect.void,
       recordImportedTranscript: () => Effect.die("unused"),
@@ -456,18 +454,16 @@ it.effect("retries continuation preparation before settling a persistent failure
     threads: [thread],
     directory: {
       getBinding: () =>
-        Effect.succeed(
-          Option.some({
-            threadId: thread.id,
-            provider: ProviderDriverKind.make("codex"),
-            providerInstanceId,
-            status: "running" as const,
-            resumeCursor: { cursor: thread.id },
-            runtimePayload: {
-              continueAfterServerUpdate: thread.session.activeTurnId,
-            },
-          }),
-        ),
+        Effect.succeedSome({
+          threadId: thread.id,
+          provider: ProviderDriverKind.make("codex"),
+          providerInstanceId,
+          status: "running" as const,
+          resumeCursor: { cursor: thread.id },
+          runtimePayload: {
+            continueAfterServerUpdate: thread.session.activeTurnId,
+          },
+        }),
       upsert: () => Effect.void,
       recordImportedTranscript: () => Effect.die("unused"),
       getProvider: () => Effect.die("unused"),
@@ -610,16 +606,14 @@ it.effect(
       directory: {
         getBinding: (candidate) =>
           candidate === absent.id
-            ? Effect.succeed(Option.none())
+            ? Effect.succeedNone
             : candidate === corrupt.id
               ? Effect.fail(corruptFailure)
-              : Effect.succeed(
-                  Option.some({
-                    threadId: candidate,
-                    provider: ProviderDriverKind.make("codex"),
-                    providerInstanceId,
-                  }),
-                ),
+              : Effect.succeedSome({
+                  threadId: candidate,
+                  provider: ProviderDriverKind.make("codex"),
+                  providerInstanceId,
+                }),
         upsert: () => Effect.fail(writeFailure),
         recordImportedTranscript: () => Effect.die("unused"),
         getProvider: () => Effect.die("unused"),
@@ -657,7 +651,7 @@ it.effect("retries failed projections and continues after a persistent failure",
   return runReconciliation({
     threads: [transient, persistent, later],
     directory: {
-      getBinding: () => Effect.succeed(Option.none()),
+      getBinding: () => Effect.succeedNone,
       upsert: () => Effect.void,
       recordImportedTranscript: () => Effect.die("unused"),
       getProvider: () => Effect.die("unused"),
@@ -758,19 +752,17 @@ for (const scenario of [
       continueAfterRestart: scenario !== "disabled",
       directory: {
         getBinding: () =>
-          Effect.succeed(
-            Option.some({
-              threadId: thread.id,
-              provider: ProviderDriverKind.make("codex"),
-              providerInstanceId,
-              status: scenario === "stopped binding" ? "stopped" : "running",
-              ...(scenario.includes("cursor") ? {} : { resumeCursor: { threadId: thread.id } }),
-              runtimePayload: {
-                activeTurnId: scenario === "marked superseded turn" ? "another-turn" : turnId,
-                ...(scenario.startsWith("marked") ? { continueAfterServerUpdate: turnId } : {}),
-              },
-            }),
-          ),
+          Effect.succeedSome({
+            threadId: thread.id,
+            provider: ProviderDriverKind.make("codex"),
+            providerInstanceId,
+            status: scenario === "stopped binding" ? "stopped" : "running",
+            ...(scenario.includes("cursor") ? {} : { resumeCursor: { threadId: thread.id } }),
+            runtimePayload: {
+              activeTurnId: scenario === "marked superseded turn" ? "another-turn" : turnId,
+              ...(scenario.startsWith("marked") ? { continueAfterServerUpdate: turnId } : {}),
+            },
+          }),
         upsert: (binding) =>
           Effect.sync(() => {
             upserts.push(binding);
@@ -944,9 +936,7 @@ it.effect("settles failed opt-in recovery without retrying the provider turn", (
           Effect.gen(function* () {
             sends.push(input);
             preparedPayloads.push(binding.runtimePayload);
-            return yield* Effect.fail(
-              new ProviderSessionNotFoundError({ threadId: input.threadId }),
-            );
+            return yield* new ProviderSessionNotFoundError({ threadId: input.threadId });
           }),
       },
       directory: {
diff --git a/apps/server/src/serverRuntimeStartup.test.ts b/apps/server/src/serverRuntimeStartup.test.ts
index ab654e15c70b..4bbdb2e9c8b5 100644
--- a/apps/server/src/serverRuntimeStartup.test.ts
+++ b/apps/server/src/serverRuntimeStartup.test.ts
@@ -169,32 +169,31 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
         getSnapshot: () => Effect.die("unused"),
         getShellSnapshot: () => Effect.die("unused"),
         getDeletedWorktreeThreads: () => Effect.die("unused"),
+        listThreadsWithPullRequests: () => Effect.die("unused"),
         getArchivedShellSnapshot: () => Effect.die("unused"),
         getSnapshotSequence: () => Effect.die("unused"),
         getCounts: () => Effect.die("unused"),
         getEventReplayStats: () => Effect.die("unused"),
         getActiveProjectByWorkspaceRoot: () =>
-          Effect.succeed(
-            Option.some({
-              id: bootstrapProjectId,
-              title: "Startup Project",
-              workspaceRoot: "/tmp/startup-project",
-              defaultModelSelection: {
-                instanceId: ProviderInstanceId.make("codex"),
-                model: DEFAULT_MODEL,
-              },
-              scripts: [],
-              createdAt: "2026-01-01T00:00:00.000Z",
-              updatedAt: "2026-01-01T00:00:00.000Z",
-              deletedAt: null,
-            }),
-          ),
+          Effect.succeedSome({
+            id: bootstrapProjectId,
+            title: "Startup Project",
+            workspaceRoot: "/tmp/startup-project",
+            defaultModelSelection: {
+              instanceId: ProviderInstanceId.make("codex"),
+              model: DEFAULT_MODEL,
+            },
+            scripts: [],
+            createdAt: "2026-01-01T00:00:00.000Z",
+            updatedAt: "2026-01-01T00:00:00.000Z",
+            deletedAt: null,
+          }),
         getProjectShells: () => Effect.die("unused"),
         getProjectShellById: () => Effect.die("unused"),
-        getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.some(bootstrapThreadId)),
+        getFirstActiveThreadIdByProjectId: () => Effect.succeedSome(bootstrapThreadId),
         getImportedAgentSessionSources: () => Effect.die("unused"),
-        getThreadCheckpointContext: () => Effect.succeed(Option.none()),
-        getFullThreadDiffContext: () => Effect.succeed(Option.none()),
+        getThreadCheckpointContext: () => Effect.succeedNone,
+        getFullThreadDiffContext: () => Effect.succeedNone,
         getThreadRuntimeContext: () => Effect.die("unused"),
         getTurnStartMessage: () => Effect.die("unused"),
         getThreadShellById: () => Effect.die("unused"),
@@ -300,6 +299,7 @@ it.effect.each([
         getSnapshot: () => Effect.die("unused"),
         getShellSnapshot: () => Effect.die("unused"),
         getDeletedWorktreeThreads: () => Effect.die("unused"),
+        listThreadsWithPullRequests: () => Effect.die("unused"),
         getArchivedShellSnapshot: () => Effect.die("unused"),
         getSnapshotSequence: () => Effect.die("unused"),
         getCounts: () => Effect.die("unused"),
@@ -321,10 +321,10 @@ it.effect.each([
           ),
         getProjectShells: () => Effect.die("unused"),
         getProjectShellById: () => Effect.die("unused"),
-        getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+        getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
         getImportedAgentSessionSources: () => Effect.die("unused"),
-        getThreadCheckpointContext: () => Effect.succeed(Option.none()),
-        getFullThreadDiffContext: () => Effect.succeed(Option.none()),
+        getThreadCheckpointContext: () => Effect.succeedNone,
+        getFullThreadDiffContext: () => Effect.succeedNone,
         getThreadRuntimeContext: () => Effect.die("unused"),
         getTurnStartMessage: () => Effect.die("unused"),
         getThreadShellById: () => Effect.die("unused"),
@@ -387,17 +387,18 @@ it.effect(
           getSnapshot: () => Effect.die("unused"),
           getShellSnapshot: () => Effect.die("unused"),
           getDeletedWorktreeThreads: () => Effect.die("unused"),
+          listThreadsWithPullRequests: () => Effect.die("unused"),
           getArchivedShellSnapshot: () => Effect.die("unused"),
           getSnapshotSequence: () => Effect.die("unused"),
           getCounts: () => Effect.die("unused"),
           getEventReplayStats: () => Effect.die("unused"),
-          getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+          getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
           getProjectShells: () => Effect.die("unused"),
           getProjectShellById: () => Effect.die("unused"),
           getFirstActiveThreadIdByProjectId: () => Effect.die("thread lookup failed"),
           getImportedAgentSessionSources: () => Effect.die("unused"),
-          getThreadCheckpointContext: () => Effect.succeed(Option.none()),
-          getFullThreadDiffContext: () => Effect.succeed(Option.none()),
+          getThreadCheckpointContext: () => Effect.succeedNone,
+          getFullThreadDiffContext: () => Effect.succeedNone,
           getThreadRuntimeContext: () => Effect.die("unused"),
           getTurnStartMessage: () => Effect.die("unused"),
           getThreadShellById: () => Effect.die("unused"),
@@ -452,17 +453,18 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
         getSnapshot: () => Effect.die("unused"),
         getShellSnapshot: () => Effect.die("unused"),
         getDeletedWorktreeThreads: () => Effect.die("unused"),
+        listThreadsWithPullRequests: () => Effect.die("unused"),
         getArchivedShellSnapshot: () => Effect.die("unused"),
         getSnapshotSequence: () => Effect.die("unused"),
         getCounts: () => Effect.die("unused"),
         getEventReplayStats: () => Effect.die("unused"),
-        getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+        getActiveProjectByWorkspaceRoot: () => Effect.succeedNone,
         getProjectShells: () => Effect.die("unused"),
         getProjectShellById: () => Effect.die("unused"),
-        getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
+        getFirstActiveThreadIdByProjectId: () => Effect.succeedNone,
         getImportedAgentSessionSources: () => Effect.die("unused"),
-        getThreadCheckpointContext: () => Effect.succeed(Option.none()),
-        getFullThreadDiffContext: () => Effect.succeed(Option.none()),
+        getThreadCheckpointContext: () => Effect.succeedNone,
+        getFullThreadDiffContext: () => Effect.succeedNone,
         getThreadRuntimeContext: () => Effect.die("unused"),
         getTurnStartMessage: () => Effect.die("unused"),
         getThreadShellById: () => Effect.die("unused"),
diff --git a/apps/server/src/serverRuntimeStartup.ts b/apps/server/src/serverRuntimeStartup.ts
index 42a8c4470886..a065ef65dc34 100644
--- a/apps/server/src/serverRuntimeStartup.ts
+++ b/apps/server/src/serverRuntimeStartup.ts
@@ -33,6 +33,7 @@ import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
 
 import * as ServerConfig from "./config.ts";
+import { flushCompileCache } from "./compileCache.ts";
 import * as Keybindings from "./keybindings.ts";
 import * as ExternalLauncher from "./process/externalLauncher.ts";
 import * as OrchestrationEngine from "./orchestration/Services/OrchestrationEngine.ts";
@@ -264,13 +265,13 @@ export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
           bootstrapThreadId = existingThreadId.value;
         }
       }).pipe(
-        Effect.catchCause((cause) =>
-          Cause.hasInterrupts(cause)
-            ? Effect.failCause(cause)
-            : Effect.logWarning("startup thread auto-bootstrap failed", {
-                bootstrapProjectId: nextProjectId,
-                cause,
-              }),
+        Effect.catchCauseIf(
+          (cause) => !Cause.hasInterrupts(cause),
+          (cause) =>
+            Effect.logWarning("startup thread auto-bootstrap failed", {
+              bootstrapProjectId: nextProjectId,
+              cause,
+            }),
         ),
       );
     });
@@ -312,11 +313,9 @@ const resolveStartupBrowserTarget = Effect.gen(function* () {
       ? `http://${formatHostForUrl(serverConfig.host)}:${serverConfig.port}`
       : localUrl;
   const baseTarget = serverConfig.devUrl?.toString() ?? bindUrl;
-  return yield* Effect.succeed(serverConfig.mode === "desktop" ? baseTarget : undefined).pipe(
-    Effect.flatMap((target) =>
-      target ? Effect.succeed(target) : serverAuth.issueStartupPairingUrl(baseTarget),
-    ),
-  );
+  return serverConfig.mode === "desktop"
+    ? baseTarget
+    : yield* serverAuth.issueStartupPairingUrl(baseTarget);
 });
 
 const maybeOpenBrowser = (target: string) =>
@@ -487,7 +486,7 @@ export const reconcileProviderSessions = Effect.gen(function* () {
   const query = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
   const settings = yield* ServerSettings.ServerSettingsService;
   const restartSettings = yield* settings.getSettings.pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catch((cause) =>
       Effect.logWarning("could not read restart continuation preference", { cause }).pipe(
         Effect.as(Option.none()),
@@ -549,13 +548,13 @@ export const reconcileProviderSessions = Effect.gen(function* () {
       continue;
     }
     const binding = yield* directory.getBinding(thread.id).pipe(
-      Effect.catchCause((cause) =>
-        Cause.hasInterrupts(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("failed to read orphaned provider session directory binding", {
-              threadId: thread.id,
-              cause,
-            }).pipe(Effect.as(Option.none())),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterrupts(cause),
+        (cause) =>
+          Effect.logWarning("failed to read orphaned provider session directory binding", {
+            threadId: thread.id,
+            cause,
+          }).pipe(Effect.as(Option.none())),
       ),
     );
     const continuationMarkerPresent =
@@ -606,13 +605,13 @@ export const reconcileProviderSessions = Effect.gen(function* () {
             });
           }
         }).pipe(
-          Effect.catchCause((cause) =>
-            Cause.hasInterrupts(cause)
-              ? Effect.failCause(cause)
-              : Effect.logWarning(
-                  "failed to reconcile orphaned provider session directory binding",
-                  { threadId: thread.id, cause },
-                ),
+          Effect.catchCauseIf(
+            (cause) => !Cause.hasInterrupts(cause),
+            (cause) =>
+              Effect.logWarning("failed to reconcile orphaned provider session directory binding", {
+                threadId: thread.id,
+                cause,
+              }),
           ),
         );
 
@@ -633,13 +632,13 @@ export const reconcileProviderSessions = Effect.gen(function* () {
           });
         }).pipe(
           Effect.retry({ times: 1 }),
-          Effect.catchCause((cause) =>
-            Cause.hasInterrupts(cause)
-              ? Effect.failCause(cause)
-              : Effect.logWarning("failed to settle orphaned provider session projection", {
-                  threadId: thread.id,
-                  cause,
-                }),
+          Effect.catchCauseIf(
+            (cause) => !Cause.hasInterrupts(cause),
+            (cause) =>
+              Effect.logWarning("failed to settle orphaned provider session projection", {
+                threadId: thread.id,
+                cause,
+              }),
           ),
         );
       });
@@ -739,10 +738,9 @@ export const reconcileProviderSessions = Effect.gen(function* () {
     yield* settleAsError(ORPHANED_PROVIDER_SESSION_ERROR);
   }
 }).pipe(
-  Effect.catchCause((cause) =>
-    Cause.hasInterrupts(cause)
-      ? Effect.failCause(cause)
-      : Effect.logWarning("provider session startup reconciliation failed", { cause }),
+  Effect.catchCauseIf(
+    (cause) => !Cause.hasInterrupts(cause),
+    (cause) => Effect.logWarning("provider session startup reconciliation failed", { cause }),
   ),
 );
 
@@ -813,21 +811,20 @@ export const reconcileWorktreeSetups = Effect.gen(function* () {
         createdAt: interruptedAt,
       })
       .pipe(
-        Effect.catchCause((cause) =>
-          Cause.hasInterrupts(cause)
-            ? Effect.failCause(cause)
-            : Effect.logWarning("failed to settle interrupted worktree setup", {
-                threadId,
-                cause,
-              }),
+        Effect.catchCauseIf(
+          (cause) => !Cause.hasInterrupts(cause),
+          (cause) =>
+            Effect.logWarning("failed to settle interrupted worktree setup", {
+              threadId,
+              cause,
+            }),
         ),
       );
   }
 }).pipe(
-  Effect.catchCause((cause) =>
-    Cause.hasInterrupts(cause)
-      ? Effect.failCause(cause)
-      : Effect.logWarning("worktree setup startup reconciliation failed", { cause }),
+  Effect.catchCauseIf(
+    (cause) => !Cause.hasInterrupts(cause),
+    (cause) => Effect.logWarning("worktree setup startup reconciliation failed", { cause }),
   ),
 );
 
@@ -1078,6 +1075,7 @@ export const make = (options?: StartupOptions) =>
         }),
       );
       yield* Effect.logDebug("startup phase: complete");
+      yield* flushCompileCache;
     }).pipe(
       Effect.annotateSpans({
         "server.mode": serverConfig.mode,
diff --git a/apps/server/src/serverRuntimeState.ts b/apps/server/src/serverRuntimeState.ts
index 4afe10bd5b65..26535ae348a2 100644
--- a/apps/server/src/serverRuntimeState.ts
+++ b/apps/server/src/serverRuntimeState.ts
@@ -142,7 +142,7 @@ export const readPersistedServerRuntimeState = (path: string) =>
                   cause,
                 }),
               ),
-        onSuccess: (contents) => Effect.succeed(Option.some(contents)),
+        onSuccess: (contents) => Effect.succeedSome(contents),
       }),
     );
     if (Option.isNone(raw)) {
@@ -155,7 +155,7 @@ export const readPersistedServerRuntimeState = (path: string) =>
     }
 
     return yield* decodePersistedServerRuntimeState(trimmed).pipe(
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.mapError(
         (cause) =>
           new ServerRuntimeStateError({
diff --git a/apps/server/src/serverSettings.test.ts b/apps/server/src/serverSettings.test.ts
index b2caba4a0347..502ae3430e27 100644
--- a/apps/server/src/serverSettings.test.ts
+++ b/apps/server/src/serverSettings.test.ts
@@ -44,6 +44,20 @@ const makeServerSettingsLayer = () =>
     ),
   );
 
+/** Like `makeServerSettingsLayer`, but also exposes the secret store for assertions. */
+const makeServerSettingsLayerWithSecrets = () =>
+  ServerSettingsModule.layer.pipe(
+    Layer.provideMerge(ServerSecretStore.layer),
+    Layer.provideMerge(Layer.fresh(SqlitePersistenceMemory)),
+    Layer.provideMerge(
+      Layer.fresh(
+        ServerConfig.layerTest(process.cwd(), {
+          prefix: "t3code-server-settings-test-",
+        }),
+      ),
+    ),
+  );
+
 const makeFailingSecretStoreLayer = (cause: ServerSecretStore.SecretStoreError) =>
   Layer.succeed(
     ServerSecretStore.ServerSecretStore,
@@ -1278,6 +1292,128 @@ it.layer(NodeServices.layer)("server settings", (it) => {
     }).pipe(Effect.provide(makeServerSettingsLayer())),
   );
 
+  it.effect(
+    "keeps Bitbucket tokens in the secret store and tells clients only that one is set",
+    () =>
+      Effect.gen(function* () {
+        const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
+        const secrets = yield* ServerSecretStore.ServerSecretStore;
+        const serverConfig = yield* ServerConfig.ServerConfig;
+        const fileSystem = yield* FileSystem.FileSystem;
+
+        const saved = yield* serverSettings.updateSettings({
+          bitbucket: { email: "me@example.com", accessToken: "bb-access", apiToken: "bb-api" },
+        });
+        assert.deepEqual(saved.bitbucket, {
+          email: "me@example.com",
+          accessToken: "bb-access",
+          apiToken: "bb-api",
+        });
+
+        const raw = yield* fileSystem.readFileString(serverConfig.settingsPath);
+        assert.notInclude(raw, "bb-access");
+        assert.notInclude(raw, "bb-api");
+        assert.include(raw, "me@example.com");
+
+        const forClient = ServerSettingsModule.redactServerSettingsForClient(saved).bitbucket;
+        assert.equal(forClient.email, "me@example.com");
+        assert.notInclude(forClient.accessToken, "bb-access");
+        assert.notInclude(forClient.apiToken, "bb-api");
+        assert.isAbove(forClient.accessToken.length, 0);
+        assert.isAbove(forClient.apiToken.length, 0);
+
+        // A client echoing the redacted values back, or omitting them, keeps the saved tokens.
+        yield* serverSettings.updateSettings({ bitbucket: forClient });
+        yield* serverSettings.updateSettings({ bitbucket: { email: "other@example.com" } });
+        assert.deepEqual((yield* serverSettings.getSettings).bitbucket, {
+          email: "other@example.com",
+          accessToken: "bb-access",
+          apiToken: "bb-api",
+        });
+
+        const cleared = yield* serverSettings.updateSettings({ bitbucket: { accessToken: "" } });
+        assert.equal(cleared.bitbucket.accessToken, "");
+        assert.equal(cleared.bitbucket.apiToken, "bb-api");
+        assert.isTrue(Option.isNone(yield* secrets.get("bitbucket-access-token")));
+        assert.equal(
+          ServerSettingsModule.redactServerSettingsForClient(cleared).bitbucket.accessToken,
+          "",
+        );
+      }).pipe(Effect.provide(makeServerSettingsLayerWithSecrets())),
+  );
+
+  it.effect("removes a Bitbucket secret once its token is cleared by hand in settings.json", () =>
+    Effect.gen(function* () {
+      const serverConfig = yield* ServerConfig.ServerConfig;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const secrets = yield* ServerSecretStore.ServerSecretStore;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
+      // A token was saved, then the user deleted it from settings.json directly.
+      yield* secrets.set("bitbucket-access-token", new TextEncoder().encode("stale-token"));
+      yield* fileSystem.writeFileString(serverConfig.settingsPath, "{}");
+
+      yield* serverSettings.updateSettings({ cursorKeychainUsageEnabled: true });
+
+      assert.isTrue(Option.isNone(yield* secrets.get("bitbucket-access-token")));
+    }).pipe(Effect.provide(makeServerSettingsLayerWithSecrets())),
+  );
+
+  it.effect("moves a hand-edited Bitbucket token into the secret store when settings load", () =>
+    Effect.gen(function* () {
+      const serverConfig = yield* ServerConfig.ServerConfig;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const secrets = yield* ServerSecretStore.ServerSecretStore;
+      const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
+      yield* fileSystem.writeFileString(
+        serverConfig.settingsPath,
+        '{"bitbucket":{"accessToken":"hand-edited-token"}}',
+      );
+
+      // Loading alone moves it: no settings update is needed.
+      const loaded = yield* serverSettings.getSettings;
+
+      assert.equal(loaded.bitbucket.accessToken, "hand-edited-token");
+      assert.notInclude(
+        yield* fileSystem.readFileString(serverConfig.settingsPath),
+        "hand-edited-token",
+      );
+      const stored = yield* secrets.get("bitbucket-access-token");
+      assert.equal(
+        Option.isSome(stored) ? new TextDecoder().decode(stored.value) : null,
+        "hand-edited-token",
+      );
+    }).pipe(Effect.provide(makeServerSettingsLayerWithSecrets())),
+  );
+
+  it.effect(
+    "moves a hand-edited Bitbucket token into the secret store when a client echoes the marker",
+    () =>
+      Effect.gen(function* () {
+        const serverConfig = yield* ServerConfig.ServerConfig;
+        const fileSystem = yield* FileSystem.FileSystem;
+        const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
+        yield* fileSystem.writeFileString(
+          serverConfig.settingsPath,
+          '{"bitbucket":{"email":"me@example.com","apiToken":"hand-edited-token"}}',
+        );
+
+        // The form resends the redacted token when only the email changes.
+        const forClient = ServerSettingsModule.redactServerSettingsForClient(
+          yield* serverSettings.getSettings,
+        ).bitbucket;
+        const updated = yield* serverSettings.updateSettings({
+          bitbucket: { email: "new@example.com", apiToken: forClient.apiToken },
+        });
+
+        assert.equal(updated.bitbucket.apiToken, "hand-edited-token");
+        assert.equal((yield* serverSettings.getSettings).bitbucket.apiToken, "hand-edited-token");
+        assert.notInclude(
+          yield* fileSystem.readFileString(serverConfig.settingsPath),
+          "hand-edited-token",
+        );
+      }).pipe(Effect.provide(makeServerSettingsLayer())),
+  );
+
   it.effect("materializes provider secrets for terminal environment resolution", () =>
     Effect.gen(function* () {
       const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
diff --git a/apps/server/src/serverSettings.ts b/apps/server/src/serverSettings.ts
index ed52282c0237..6949a66d981b 100644
--- a/apps/server/src/serverSettings.ts
+++ b/apps/server/src/serverSettings.ts
@@ -140,16 +140,24 @@ function providerEnvironmentSecretName(input: {
 }
 
 /**
- * On disk the hub key is replaced by this marker and the real value lives in
- * the secret store, mirroring provider environment secrets. A client that
- * sends the marker back means "keep what you have".
+ * On disk a hub key or Bitbucket token is replaced by this marker and the
+ * real value lives in the secret store, mirroring provider environment
+ * secrets. A client that sends the marker back means "keep what you have".
  */
-const USAGE_LIMIT_SOURCE_KEY_REDACTED = "\u2022\u2022\u2022\u2022\u2022\u2022";
+const SECRET_REDACTED = "\u2022\u2022\u2022\u2022\u2022\u2022";
 
 function usageLimitSourceSecretName(sourceId: string): string {
   return `usage-limit-source-${Buffer.from(sourceId, "utf8").toString("base64url")}`;
 }
 
+const BITBUCKET_SECRET_NAMES = {
+  accessToken: "bitbucket-access-token",
+  apiToken: "bitbucket-api-token",
+} as const;
+const BITBUCKET_SECRET_FIELDS = ["accessToken", "apiToken"] as const;
+
+const redactSecret = (value: string) => (value.length > 0 ? SECRET_REDACTED : "");
+
 function redactProviderEnvironmentVariable(
   variable: ProviderInstanceEnvironmentVariable,
 ): ProviderInstanceEnvironmentVariable {
@@ -182,11 +190,16 @@ export function redactServerSettingsForClient(settings: ServerSettings): ServerS
       id,
       {
         ...source,
-        managementKey: source.managementKey.length > 0 ? USAGE_LIMIT_SOURCE_KEY_REDACTED : "",
+        managementKey: redactSecret(source.managementKey),
       },
     ]),
   );
-  return { ...settings, providerInstances, usageLimitSources };
+  const bitbucket = {
+    ...settings.bitbucket,
+    accessToken: redactSecret(settings.bitbucket.accessToken),
+    apiToken: redactSecret(settings.bitbucket.apiToken),
+  };
+  return { ...settings, providerInstances, usageLimitSources, bitbucket };
 }
 
 export class ServerSettingsService extends Context.Service<
@@ -555,6 +568,35 @@ const make = Effect.gen(function* () {
     ),
   );
 
+  /**
+   * Moves Bitbucket tokens hand-edited into settings.json into the secret store as they load,
+   * so plaintext does not stay on disk. If the store is unavailable, the token keeps working
+   * from the file and the move is retried on the next load.
+   */
+  const moveInlineBitbucketTokens = (settings: ServerSettings) =>
+    Effect.gen(function* () {
+      const bitbucket = { ...settings.bitbucket };
+      let moved = false;
+      for (const field of BITBUCKET_SECRET_FIELDS) {
+        const value = bitbucket[field];
+        if (value.length === 0 || value === SECRET_REDACTED) continue;
+        const stored = yield* secretStore
+          .set(BITBUCKET_SECRET_NAMES[field], textEncoder.encode(value))
+          .pipe(
+            Effect.as(true),
+            Effect.catch(() =>
+              Effect.logWarning("failed to move a Bitbucket token into the secret store", {
+                field,
+              }).pipe(Effect.as(false)),
+            ),
+          );
+        if (!stored) continue;
+        bitbucket[field] = SECRET_REDACTED;
+        moved = true;
+      }
+      return moved ? { ...settings, bitbucket } : settings;
+    });
+
   const loadSettingsFromDisk = Effect.gen(function* () {
     let settings = DEFAULT_SERVER_SETTINGS;
     let persisted: typeof PersistedOptionalProviderSettings.Type = {};
@@ -639,10 +681,12 @@ const make = Effect.gen(function* () {
     const folded = settingsFileTrusted
       ? foldLegacyProjectSettings(loaded, legacyProjectRows)
       : loaded;
-    if (folded !== loaded) {
-      yield* writeSettingsAtomically(folded);
+    // Only rewrite a file that decoded cleanly; an untrusted one stays for the user to repair.
+    const migrated = settingsFileTrusted ? yield* moveInlineBitbucketTokens(folded) : folded;
+    if (migrated !== loaded) {
+      yield* writeSettingsAtomically(migrated);
     }
-    return folded;
+    return migrated;
   });
 
   const settingsCache = yield* Cache.make<typeof cacheKey, ServerSettings, ServerSettingsError>({
@@ -693,7 +737,7 @@ const make = Effect.gen(function* () {
       }
       const usageLimitSources: Record<string, UsageLimitSourceConfig> = {};
       for (const [sourceId, source] of Object.entries(settings.usageLimitSources)) {
-        if (source.managementKey !== USAGE_LIMIT_SOURCE_KEY_REDACTED) {
+        if (source.managementKey !== SECRET_REDACTED) {
           usageLimitSources[sourceId] = source;
           continue;
         }
@@ -709,10 +753,23 @@ const make = Effect.gen(function* () {
           managementKey: Option.isSome(secret) ? textDecoder.decode(secret.value) : "",
         };
       }
+      const bitbucket = { ...settings.bitbucket };
+      for (const field of BITBUCKET_SECRET_FIELDS) {
+        if (bitbucket[field] !== SECRET_REDACTED) continue;
+        const secret = yield* secretStore
+          .get(BITBUCKET_SECRET_NAMES[field])
+          .pipe(
+            Effect.mapError(
+              (cause) => new ServerSettingsError({ settingsPath, operation: "read-secret", cause }),
+            ),
+          );
+        bitbucket[field] = Option.isSome(secret) ? textDecoder.decode(secret.value) : "";
+      }
       return {
         ...settings,
         providerInstances: providerInstances as ServerSettings["providerInstances"],
         usageLimitSources: usageLimitSources as ServerSettings["usageLimitSources"],
+        bitbucket,
       };
     });
 
@@ -829,7 +886,7 @@ const make = Effect.gen(function* () {
       const usageLimitSources: Record<string, UsageLimitSourceConfig> = {};
       for (const [sourceId, source] of Object.entries(next.usageLimitSources)) {
         const secretName = usageLimitSourceSecretName(sourceId);
-        if (source.managementKey === USAGE_LIMIT_SOURCE_KEY_REDACTED) {
+        if (source.managementKey === SECRET_REDACTED) {
           usageLimitSources[sourceId] = source;
           continue;
         }
@@ -843,7 +900,7 @@ const make = Effect.gen(function* () {
           secretName,
           value: textEncoder.encode(source.managementKey),
         });
-        usageLimitSources[sourceId] = { ...source, managementKey: USAGE_LIMIT_SOURCE_KEY_REDACTED };
+        usageLimitSources[sourceId] = { ...source, managementKey: SECRET_REDACTED };
       }
       for (const sourceId of Object.keys(current.usageLimitSources)) {
         if (sourceId in next.usageLimitSources) continue;
@@ -854,11 +911,31 @@ const make = Effect.gen(function* () {
         });
       }
 
+      const bitbucket = { ...next.bitbucket };
+      for (const field of BITBUCKET_SECRET_FIELDS) {
+        let value = bitbucket[field];
+        if (value === SECRET_REDACTED) {
+          // The marker keeps what is saved. A plaintext value hand-edited into settings.json
+          // is not in the secret store yet, so move it there instead of dropping it.
+          const inline = current.bitbucket[field];
+          if (inline === SECRET_REDACTED || inline.length === 0) continue;
+          value = inline;
+        }
+        const secretName = BITBUCKET_SECRET_NAMES[field];
+        if (value.length === 0) {
+          changes.push({ kind: "remove", secretName, operation: "remove-secret" });
+          continue;
+        }
+        changes.push({ kind: "write", secretName, value: textEncoder.encode(value) });
+        bitbucket[field] = SECRET_REDACTED;
+      }
+
       return {
         settings: {
           ...next,
           providerInstances: providerInstances as ServerSettings["providerInstances"],
           usageLimitSources: usageLimitSources as ServerSettings["usageLimitSources"],
+          bitbucket,
         },
         changes,
       };
diff --git a/apps/server/src/sourceControl/BitbucketApi.test.ts b/apps/server/src/sourceControl/BitbucketApi.test.ts
index b27d56bef399..83965a38b21c 100644
--- a/apps/server/src/sourceControl/BitbucketApi.test.ts
+++ b/apps/server/src/sourceControl/BitbucketApi.test.ts
@@ -16,6 +16,7 @@ import {
 
 import { GitCommandError } from "@t3tools/contracts";
 import * as BitbucketApi from "./BitbucketApi.ts";
+import * as ServerSettings from "../serverSettings.ts";
 import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
 import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
 import type * as VcsDriver from "../vcs/VcsDriver.ts";
@@ -64,6 +65,7 @@ function makeLayer(input: {
     request: HttpClientRequest.HttpClientRequest,
   ) => HttpClientError.HttpClientError;
   readonly git?: Partial<GitVcsDriver.GitVcsDriver["Service"]>;
+  readonly env?: Record<string, string>;
 }) {
   const execute = vi.fn((request: HttpClientRequest.HttpClientRequest) =>
     input.requestFailure
@@ -150,7 +152,7 @@ function makeLayer(input: {
     Layer.provide(
       ConfigProvider.layer(
         ConfigProvider.fromEnv({
-          env: {
+          env: input.env ?? {
             T3CODE_BITBUCKET_API_BASE_URL: "https://api.test.local/2.0",
             T3CODE_BITBUCKET_EMAIL: "user@example.com",
             T3CODE_BITBUCKET_API_TOKEN: "token",
@@ -158,6 +160,7 @@ function makeLayer(input: {
         }),
       ),
     ),
+    Layer.provideMerge(ServerSettings.layerTest()),
     Layer.provideMerge(NodeServices.layer),
   );
 
@@ -509,6 +512,78 @@ it.effect("reports auth status through the Bitbucket REST /user endpoint", () =>
   }).pipe(Effect.provide(layer));
 });
 
+it.effect("prefers credentials saved in settings over the environment, without a restart", () => {
+  const { execute, layer } = makeLayer({
+    response: () => Response.json({ username: "bitbucket-user" }),
+  });
+  const lastAuthorization = () => execute.mock.calls.at(-1)?.[0].headers.authorization;
+  const basic = (user: string, password: string) => `Basic ${btoa(`${user}:${password}`)}`;
+
+  return Effect.gen(function* () {
+    const bitbucket = yield* BitbucketApi.BitbucketApi;
+    const settings = yield* ServerSettings.ServerSettingsService;
+
+    yield* bitbucket.probeAuth;
+    assert.strictEqual(lastAuthorization(), basic("user@example.com", "token"));
+
+    yield* settings.updateSettings({
+      bitbucket: { email: "saved@example.com", apiToken: "saved-api-token" },
+    });
+    yield* bitbucket.probeAuth;
+    assert.strictEqual(lastAuthorization(), basic("saved@example.com", "saved-api-token"));
+
+    yield* settings.updateSettings({ bitbucket: { accessToken: "saved-access-token" } });
+    yield* bitbucket.probeAuth;
+    assert.strictEqual(lastAuthorization(), "Bearer saved-access-token");
+
+    yield* settings.updateSettings({ bitbucket: { accessToken: "", apiToken: "" } });
+    yield* bitbucket.probeAuth;
+    assert.strictEqual(lastAuthorization(), basic("user@example.com", "token"));
+  }).pipe(Effect.provide(layer));
+});
+
+it.effect("never puts a saved token that is unsafe for an HTTP header on the wire", () => {
+  const { execute, layer } = makeLayer({
+    response: () => Response.json({ username: "bitbucket-user" }),
+  });
+
+  return Effect.gen(function* () {
+    const bitbucket = yield* BitbucketApi.BitbucketApi;
+    const settings = yield* ServerSettings.ServerSettingsService;
+
+    // Fetch would reject this header with an error quoting the token, and that error reaches
+    // clients. The unusable token is ignored, so the environment credential is used instead.
+    yield* settings.updateSettings({ bitbucket: { accessToken: "saved\ntoken" } });
+    yield* bitbucket.probeAuth;
+    assert.strictEqual(
+      execute.mock.calls.at(-1)?.[0].headers.authorization,
+      `Basic ${btoa("user@example.com:token")}`,
+    );
+  }).pipe(Effect.provide(layer));
+});
+
+it.effect("reports saved credentials as configured when Bitbucket cannot confirm them", () => {
+  const { layer } = makeLayer({
+    response: () => new Response(null, { status: 401 }),
+    env: { T3CODE_BITBUCKET_API_BASE_URL: "https://api.test.local/2.0" },
+  });
+
+  return Effect.gen(function* () {
+    const bitbucket = yield* BitbucketApi.BitbucketApi;
+    const settings = yield* ServerSettings.ServerSettingsService;
+
+    assert.strictEqual((yield* bitbucket.probeAuth).status, "unauthenticated");
+
+    yield* settings.updateSettings({ bitbucket: { accessToken: "saved-access-token" } });
+    assert.deepStrictEqual(yield* bitbucket.probeAuth, {
+      status: "unknown",
+      account: Option.none(),
+      host: Option.some("bitbucket.org"),
+      detail: Option.some("An access token is configured."),
+    });
+  }).pipe(Effect.provide(layer));
+});
+
 it.effect("preserves the HTTP client failure without deriving the domain message from it", () => {
   const transportCause = new Error("socket reset by peer");
   let requestFailure: HttpClientError.HttpClientError | undefined;
diff --git a/apps/server/src/sourceControl/BitbucketApi.ts b/apps/server/src/sourceControl/BitbucketApi.ts
index 202740680be8..2404e6b497e3 100644
--- a/apps/server/src/sourceControl/BitbucketApi.ts
+++ b/apps/server/src/sourceControl/BitbucketApi.ts
@@ -7,8 +7,10 @@ import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import {
+  DEFAULT_SERVER_SETTINGS,
   NonNegativeInt,
   TrimmedNonEmptyString,
+  type BitbucketSettings,
   type SourceControlProviderAuth,
   type SourceControlRepositoryCloneUrls,
   type SourceControlRepositoryVisibility,
@@ -28,6 +30,7 @@ import {
 } from "./bitbucketPullRequests.ts";
 import { collectUint8StreamText } from "../stream/collectUint8StreamText.ts";
 import * as SourceControlProvider from "./SourceControlProvider.ts";
+import * as ServerSettings from "../serverSettings.ts";
 import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
 import * as VcsDriverRegistry from "../vcs/VcsDriverRegistry.ts";
 import { retryAtFromHeader } from "./SourceControlRateLimit.ts";
@@ -537,24 +540,64 @@ function repositoryOwnerName(repositoryName: string): string {
   return repositoryName.split("/")[0]?.trim() || "bitbucket";
 }
 
-function authFromConfig(
-  config: Config.Success<typeof BitbucketApiEnvConfig>,
-): SourceControlProviderAuth {
-  if (Option.isSome(config.accessToken)) {
+type BitbucketCredential =
+  | { readonly kind: "access-token"; readonly accessToken: string }
+  | { readonly kind: "api-token"; readonly email: string; readonly apiToken: string };
+
+/**
+ * Visible ASCII only. A value the HTTP stack rejects makes it throw an error quoting the whole
+ * header, and that error travels to clients as a cause, so an unusable token is treated as unset.
+ */
+const HEADER_SAFE = /^[\x21-\x7e]+$/u;
+
+function credentialFrom(input: {
+  readonly accessToken: string;
+  readonly email: string;
+  readonly apiToken: string;
+}): BitbucketCredential | null {
+  if (HEADER_SAFE.test(input.accessToken)) {
+    return { kind: "access-token", accessToken: input.accessToken };
+  }
+  if (HEADER_SAFE.test(input.email) && HEADER_SAFE.test(input.apiToken)) {
+    return { kind: "api-token", email: input.email, apiToken: input.apiToken };
+  }
+  return null;
+}
+
+/**
+ * Credentials saved in settings win over the `T3CODE_BITBUCKET_*` environment variables, which
+ * stay as a fallback. Within each source the access token wins.
+ */
+function resolveCredential(
+  settings: BitbucketSettings,
+  env: Config.Success<typeof BitbucketApiEnvConfig>,
+): BitbucketCredential | null {
+  return (
+    credentialFrom(settings) ??
+    credentialFrom({
+      accessToken: Option.getOrElse(env.accessToken, () => ""),
+      email: Option.getOrElse(env.email, () => ""),
+      apiToken: Option.getOrElse(env.apiToken, () => ""),
+    })
+  );
+}
+
+function authFromCredential(credential: BitbucketCredential | null): SourceControlProviderAuth {
+  if (credential?.kind === "access-token") {
     return {
       status: "unknown",
       account: Option.none(),
       host: Option.some("bitbucket.org"),
-      detail: Option.some("Bitbucket access token is configured."),
+      detail: Option.some("An access token is configured."),
     };
   }
 
-  if (Option.isSome(config.email) && Option.isSome(config.apiToken)) {
+  if (credential?.kind === "api-token") {
     return {
       status: "unknown",
-      account: config.email,
+      account: Option.some(credential.email),
       host: Option.some("bitbucket.org"),
-      detail: Option.some("Bitbucket API token is configured."),
+      detail: Option.some("An API token is configured."),
     };
   }
 
@@ -563,7 +606,7 @@ function authFromConfig(
     account: Option.none(),
     host: Option.some("bitbucket.org"),
     detail: Option.some(
-      "Set T3CODE_BITBUCKET_EMAIL and T3CODE_BITBUCKET_API_TOKEN, or T3CODE_BITBUCKET_ACCESS_TOKEN.",
+      "Add a Bitbucket token in Settings → Source Control, or set the T3CODE_BITBUCKET_* environment variables on the server.",
     ),
   };
 }
@@ -612,6 +655,7 @@ function responseError(
 /** @public Service construction is part of the canonical Effect module API. */
 export const make = Effect.gen(function* () {
   const config = yield* BitbucketApiEnvConfig;
+  const serverSettings = yield* ServerSettings.ServerSettingsService;
   const httpClient = yield* HttpClient.HttpClient;
   const fileSystem = yield* FileSystem.FileSystem;
   const git = yield* GitVcsDriver.GitVcsDriver;
@@ -619,15 +663,27 @@ export const make = Effect.gen(function* () {
 
   const apiUrl = (path: string) => `${config.baseUrl.replace(/\/+$/u, "")}${path}`;
 
-  const withAuth = (request: HttpClientRequest.HttpClientRequest) => {
-    if (Option.isSome(config.accessToken)) {
-      return request.pipe(HttpClientRequest.bearerToken(config.accessToken.value));
-    }
-    if (Option.isSome(config.email) && Option.isSome(config.apiToken)) {
-      return request.pipe(HttpClientRequest.basicAuth(config.email.value, config.apiToken.value));
-    }
-    return request;
-  };
+  // Read on every request so credentials saved in settings apply without a restart.
+  const currentCredential = serverSettings.getSettings.pipe(
+    Effect.map((settings) => resolveCredential(settings.bitbucket, config)),
+    Effect.catch((error) =>
+      // No cause: a settings decode error can quote a hand-edited token.
+      Effect.logWarning("failed to read Bitbucket credentials from settings", {
+        operation: error.operation,
+      }).pipe(Effect.as(resolveCredential(DEFAULT_SERVER_SETTINGS.bitbucket, config))),
+    ),
+  );
+
+  const withAuth = (request: HttpClientRequest.HttpClientRequest) =>
+    currentCredential.pipe(
+      Effect.map((credential) =>
+        credential === null
+          ? request
+          : credential.kind === "access-token"
+            ? request.pipe(HttpClientRequest.bearerToken(credential.accessToken))
+            : request.pipe(HttpClientRequest.basicAuth(credential.email, credential.apiToken)),
+      ),
+    );
 
   const decodeResponse = <S extends Schema.Top>(
     operation: BitbucketApiOperation,
@@ -654,7 +710,8 @@ export const make = Effect.gen(function* () {
     request: HttpClientRequest.HttpClientRequest,
     schema: S,
   ): Effect.Effect<S["Type"], BitbucketApiError, S["DecodingServices"]> =>
-    httpClient.execute(withAuth(request.pipe(HttpClientRequest.acceptJson))).pipe(
+    withAuth(request.pipe(HttpClientRequest.acceptJson)).pipe(
+      Effect.flatMap(httpClient.execute),
       Effect.mapError(
         (cause) =>
           new BitbucketRequestError({
@@ -847,7 +904,8 @@ export const make = Effect.gen(function* () {
       input.body === undefined
         ? base
         : base.pipe(HttpClientRequest.bodyText(input.body, "application/json"));
-    return httpClient.execute(withAuth(withBody)).pipe(
+    return withAuth(withBody).pipe(
+      Effect.flatMap(httpClient.execute),
       Effect.mapError(
         (cause): BitbucketApiError => new BitbucketRequestError({ operation: "request", cause }),
       ),
@@ -913,7 +971,7 @@ export const make = Effect.gen(function* () {
         host: Option.some("bitbucket.org"),
         detail: Option.none<string>(),
       })),
-      Effect.orElseSucceed(() => authFromConfig(config)),
+      Effect.catch(() => currentCredential.pipe(Effect.map(authFromCredential))),
     ),
     listPullRequests: (input) =>
       resolveRepository(input).pipe(
diff --git a/apps/server/src/sourceControl/BitbucketSourceControlProvider.ts b/apps/server/src/sourceControl/BitbucketSourceControlProvider.ts
index e27aa4c7dc88..f1a01056fbd0 100644
--- a/apps/server/src/sourceControl/BitbucketSourceControlProvider.ts
+++ b/apps/server/src/sourceControl/BitbucketSourceControlProvider.ts
@@ -192,8 +192,7 @@ export const makeDiscovery = Effect.gen(function* () {
     type: "api",
     kind: "bitbucket",
     label: "Bitbucket",
-    installHint:
-      "Set T3CODE_BITBUCKET_EMAIL and T3CODE_BITBUCKET_API_TOKEN on the server (use a Bitbucket API token with pull request, repository, and user read scopes).",
+    installHint: "Add a Bitbucket token in Settings → Source Control.",
     probeAuth: bitbucket.probeAuth,
   } satisfies SourceControlApiDiscoverySpec;
 });
diff --git a/apps/server/src/sourceControl/GitHubCli.test.ts b/apps/server/src/sourceControl/GitHubCli.test.ts
index 5893c21ff772..eb31572de467 100644
--- a/apps/server/src/sourceControl/GitHubCli.test.ts
+++ b/apps/server/src/sourceControl/GitHubCli.test.ts
@@ -155,8 +155,9 @@ describe("GitHubCli.layer", () => {
         capacity: 2,
         timeToLive: "1 minute",
       });
-      const results = yield* Effect.all(
-        ["github.com", "github.example.test"].map((host, index) =>
+      const results = yield* Effect.forEach(
+        ["github.com", "github.example.test"],
+        (host, index) =>
           Cache.get(cache, host).pipe(
             Effect.provideService(GitHubCli.PinnedGitHubCredential, {
               host,
@@ -164,7 +165,6 @@ describe("GitHubCli.layer", () => {
               credentialFingerprint: `fingerprint-${index}`,
             }),
           ),
-        ),
         { concurrency: 2 },
       );
       expect(results.map((result) => result.stdout)).toEqual(["credential-0", "credential-1"]);
diff --git a/apps/server/src/sourceControl/SourceControlDiscovery.test.ts b/apps/server/src/sourceControl/SourceControlDiscovery.test.ts
index 30aa22995b95..820b9a76c9a2 100644
--- a/apps/server/src/sourceControl/SourceControlDiscovery.test.ts
+++ b/apps/server/src/sourceControl/SourceControlDiscovery.test.ts
@@ -423,7 +423,7 @@ it.effect("reports implemented tools separately from locally available executabl
             account: Option.none(),
             host: Option.some("bitbucket.org"),
             detail: Option.some(
-              "Set T3CODE_BITBUCKET_EMAIL and T3CODE_BITBUCKET_API_TOKEN, or T3CODE_BITBUCKET_ACCESS_TOKEN.",
+              "Add a Bitbucket token in Settings → Source Control, or set the T3CODE_BITBUCKET_* environment variables on the server.",
             ),
           }),
         },
diff --git a/apps/server/src/sourceControl/SourceControlProviderRegistry.ts b/apps/server/src/sourceControl/SourceControlProviderRegistry.ts
index d8893b29e089..422b2c991040 100644
--- a/apps/server/src/sourceControl/SourceControlProviderRegistry.ts
+++ b/apps/server/src/sourceControl/SourceControlProviderRegistry.ts
@@ -289,14 +289,14 @@ export const makeWithProviders = Effect.fn("makeSourceControlProviderRegistryWit
       get,
       resolveHandle,
       resolve: (input) => resolveHandle(input).pipe(Effect.map((handle) => handle.provider)),
-      discover: Effect.all(
-        discoverySpecs.map((spec) =>
+      discover: Effect.forEach(
+        discoverySpecs,
+        (spec) =>
           probeSourceControlProvider({
             spec,
             process,
             cwd: config.cwd,
           }),
-        ),
         { concurrency: "unbounded" },
       ),
     });
diff --git a/apps/server/src/storageCleanup.ts b/apps/server/src/storageCleanup.ts
index 72af05dacf22..400ae635018f 100644
--- a/apps/server/src/storageCleanup.ts
+++ b/apps/server/src/storageCleanup.ts
@@ -419,10 +419,9 @@ export const make = Effect.gen(function* () {
   });
   const worker = yield* makeDrainableWorker(() =>
     sweep().pipe(
-      Effect.catchCause((cause) =>
-        Cause.hasInterruptsOnly(cause)
-          ? Effect.failCause(cause)
-          : Effect.logWarning("storage cleanup failed", { cause }),
+      Effect.catchCauseIf(
+        (cause) => !Cause.hasInterruptsOnly(cause),
+        (cause) => Effect.logWarning("storage cleanup failed", { cause }),
       ),
     ),
   );
diff --git a/apps/server/src/telemetry/Identify.ts b/apps/server/src/telemetry/Identify.ts
index c68dfbbcd9ae..d68812c17cc6 100644
--- a/apps/server/src/telemetry/Identify.ts
+++ b/apps/server/src/telemetry/Identify.ts
@@ -132,7 +132,7 @@ const readIdentityFile = (
   filePath: string,
 ) =>
   fileSystem.readFileString(filePath).pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catchTags({
       PlatformError: (cause) =>
         isNotFoundError(cause)
@@ -278,7 +278,7 @@ export const getTelemetryIdentifierForHome = Effect.fn("getTelemetryIdentifierFo
     }
 
     const anonymousId = yield* upsertAnonymousId.pipe(
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.catchTags({
         TelemetryIdentityReadError: (error) =>
           logTelemetryIdentityError(error).pipe(Effect.as(Option.none<string>())),
diff --git a/apps/server/src/terminal/Manager.test.ts b/apps/server/src/terminal/Manager.test.ts
index 80ab2c43e42c..325233bf59d9 100644
--- a/apps/server/src/terminal/Manager.test.ts
+++ b/apps/server/src/terminal/Manager.test.ts
@@ -56,6 +56,7 @@ class FakePtyProcess implements PtyAdapter.PtyProcess {
   private readonly dataListeners = new Set<(data: string) => void>();
   private readonly exitListeners = new Set<(event: PtyAdapter.PtyExitEvent) => void>();
   killed = false;
+  exitOnSubscribe: PtyAdapter.PtyExitEvent | undefined;
 
   constructor(pid: number) {
     this.pid = pid;
@@ -88,6 +89,7 @@ class FakePtyProcess implements PtyAdapter.PtyProcess {
   }
 
   onExit(callback: (event: PtyAdapter.PtyExitEvent) => void): () => void {
+    if (this.exitOnSubscribe) callback(this.exitOnSubscribe);
     this.exitListeners.add(callback);
     return () => {
       this.exitListeners.delete(callback);
@@ -113,6 +115,7 @@ class FakePtyAdapter {
   readonly spawnFailures: Error[] = [];
   private readonly mode: "sync" | "async";
   private nextPid = 9000;
+  exitOnSubscribe: PtyAdapter.PtyExitEvent | undefined;
 
   constructor(mode: "sync" | "async" = "sync") {
     this.mode = mode;
@@ -133,6 +136,7 @@ class FakePtyAdapter {
       );
     }
     const process = new FakePtyProcess(this.nextPid++);
+    process.exitOnSubscribe = this.exitOnSubscribe;
     this.processes.push(process);
     if (this.mode === "async") {
       return Effect.tryPromise({
@@ -628,6 +632,36 @@ it.layer(
     }),
   );
 
+  it.effect("handles an exit replayed during subscription after publishing startup", () =>
+    Effect.gen(function* () {
+      const ptyAdapter = new FakePtyAdapter();
+      ptyAdapter.exitOnSubscribe = { exitCode: 7, signal: null };
+      const { manager, getEvents } = yield* createManager(5, { ptyAdapter });
+      const exited = yield* Deferred.make<void>();
+      const unsubscribe = yield* manager.subscribe((event) =>
+        event.type === "exited"
+          ? Deferred.succeed(exited, undefined).pipe(Effect.asVoid)
+          : Effect.void,
+      );
+      yield* Effect.addFinalizer(() => Effect.sync(unsubscribe));
+      yield* manager.open(openInput());
+      yield* Deferred.await(exited);
+      const events = yield* getEvents;
+      expect(events.map((event) => event.type)).toEqual(["started", "exited"]);
+      expect(events[1]).toMatchObject({ exitCode: 7 });
+      const attached: TerminalAttachStreamEvent[] = [];
+      const stopAttach = yield* manager.attachStream(openInput(), (event) =>
+        Effect.sync(() => {
+          attached.push(event);
+        }),
+      );
+      yield* Effect.addFinalizer(() => Effect.sync(stopAttach));
+      expect(attached.find((event) => event.type === "snapshot")).toMatchObject({
+        snapshot: { status: "exited", exitCode: 7 },
+      });
+    }),
+  );
+
   it.effect("supports asynchronous PTY spawn effects", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter } = yield* createManager(5, {
@@ -1230,6 +1264,73 @@ it.layer(
     }),
   );
 
+  it.effect("closes only a thread's idle shells, ignoring a helper forked from the shell", () =>
+    Effect.gen(function* () {
+      // FakePtyAdapter assigns pids from 9000 in open order.
+      const { manager, ptyAdapter } = yield* createManager(5, {
+        processTable: Effect.succeed([
+          { pid: 9000, ppid: 1, name: "zsh" },
+          // An async prompt worker: a copy of the shell with no children.
+          { pid: 100, ppid: 9000, name: "zsh" },
+          { pid: 9001, ppid: 1, name: "zsh" },
+          { pid: 200, ppid: 9001, name: "node" },
+          { pid: 9002, ppid: 1, name: "zsh" },
+          // A subshell with a child is real work.
+          { pid: 300, ppid: 9002, name: "zsh" },
+          { pid: 301, ppid: 300, name: "sleep" },
+          { pid: 9003, ppid: 1, name: "zsh" },
+        ]),
+      }).pipe(Effect.provide(withHostPlatform("linux")));
+      yield* manager.open(openInput({ terminalId: "idle" }));
+      yield* manager.open(openInput({ terminalId: "dev-server" }));
+      yield* manager.open(openInput({ terminalId: "subshell" }));
+      yield* manager.open(openInput({ threadId: "thread-2" }));
+
+      yield* manager.closeIdle({ threadId: "thread-1" });
+
+      expect(ptyAdapter.processes.map((process) => process.killed)).toEqual([
+        true,
+        false,
+        false,
+        false,
+      ]);
+    }),
+  );
+
+  it.effect("keeps terminals that get input or output while closeIdle checks them", () =>
+    Effect.gen(function* () {
+      const ptyAdapter = new FakePtyAdapter();
+      // The typed command's process misses the snapshot, but its input or echo lands.
+      let duringCheck: (pid: number) => Effect.Effect<void> = () => Effect.void;
+      const { manager, getEvents } = yield* createManager(5, {
+        ptyAdapter,
+        subprocessPollIntervalMs: 60_000,
+        subprocessInspector: (pid) =>
+          duringCheck(pid).pipe(
+            Effect.as({ hasRunningSubprocess: false, childCommand: null, processIds: [] }),
+          ),
+      });
+      yield* manager.open(openInput({ terminalId: "typed" }));
+      yield* manager.open(openInput({ terminalId: "echoed" }));
+      const [typed, echoed] = ptyAdapter.processes;
+      duringCheck = (pid) =>
+        pid === typed!.pid
+          ? manager
+              .write({ threadId: "thread-1", terminalId: "typed", data: "make build\r" })
+              .pipe(Effect.orDie)
+          : Effect.gen(function* () {
+              echoed!.emitData("make build\r\n");
+              yield* waitFor(
+                Effect.map(getEvents, (events) => events.some((event) => event.type === "output")),
+              );
+            }).pipe(Effect.orDie);
+
+      yield* manager.closeIdle({ threadId: "thread-1" });
+
+      expect(ptyAdapter.processes.map((process) => process.killed)).toEqual([false, false]);
+    }),
+  );
+
   it.effect("backs off the spawned fallback when the resource monitor snapshot fails", () =>
     Effect.gen(function* () {
       const fallbackCalls: Array<number> = [];
diff --git a/apps/server/src/terminal/Manager.ts b/apps/server/src/terminal/Manager.ts
index 9e8f98b2309e..43d6a0750e65 100644
--- a/apps/server/src/terminal/Manager.ts
+++ b/apps/server/src/terminal/Manager.ts
@@ -198,6 +198,17 @@ export class TerminalManager extends Context.Service<
      */
     readonly close: (input: TerminalCloseInput) => Effect.Effect<void, TerminalError>;
 
+    /**
+     * Close a thread's terminals that wait at an idle shell prompt. A terminal
+     * that runs a command stays open. When `terminalId` is set, only that
+     * terminal is considered. Used when a thread settles and when a setup
+     * script finishes.
+     */
+    readonly closeIdle: (input: {
+      readonly threadId: string;
+      readonly terminalId?: string;
+    }) => Effect.Effect<void>;
+
     /**
      * Subscribe to terminal runtime events with a direct callback.
      *
@@ -275,6 +286,8 @@ interface TerminalSessionState {
   exitSignal: number | null;
   updatedAt: string;
   eventSequence: number;
+  /** Counts writes, so closeIdle can see input that has not echoed yet. */
+  inputCount: number;
   cols: number;
   rows: number;
   process: PtyAdapter.PtyProcess | null;
@@ -692,7 +705,17 @@ function deriveSubprocessInspectResult(
   terminalPid: number,
   platform: NodeJS.Platform,
 ): TerminalSubprocessInspectResult {
-  const childPid = (snapshot.childrenByParent.get(terminalPid) ?? [])[0];
+  const commandName = (pid: number) =>
+    normalizeChildCommandName(snapshot.commandById.get(pid) ?? "", platform);
+  const shellName = commandName(terminalPid);
+  // Async prompt themes fork the shell into a helper that waits with no
+  // children of its own. That copy is not a command the user started.
+  const childPid = (snapshot.childrenByParent.get(terminalPid) ?? []).find(
+    (pid) =>
+      shellName === null ||
+      commandName(pid) !== shellName ||
+      (snapshot.childrenByParent.get(pid)?.length ?? 0) > 0,
+  );
   if (childPid === undefined) {
     return { hasRunningSubprocess: false, childCommand: null, processIds: [] };
   }
@@ -707,7 +730,7 @@ function deriveSubprocessInspectResult(
       pending.push(pid);
     }
   }
-  const normalized = normalizeChildCommandName(snapshot.commandById.get(childPid) ?? "", platform);
+  const normalized = commandName(childPid);
   return {
     hasRunningSubprocess: true,
     childCommand: normalized ? truncateTerminalWireLabel(normalized) : null,
@@ -1934,16 +1957,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
     terminalId: string,
   ): Effect.fn.Return<TerminalSessionState, TerminalSessionLookupError> {
     return yield* Effect.flatMap(getSession(threadId, terminalId), (session) =>
-      Option.match(session, {
-        onNone: () =>
-          Effect.fail(
-            new TerminalSessionLookupError({
-              threadId,
-              terminalId,
-            }),
-          ),
-        onSome: Effect.succeed,
-      }),
+      Effect.fromOption(session, () => new TerminalSessionLookupError({ threadId, terminalId })),
     );
   });
 
@@ -2229,18 +2243,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
             startedShell = spawnResult.shellLabel;
 
             const processPid = ptyProcess.pid;
-            const unsubscribeData = ptyProcess.onData((data) => {
-              if (!enqueueProcessEvent(session, processPid, { type: "output", data })) {
-                return;
-              }
-              runFork(drainProcessEvents(session, processPid));
-            });
-            const unsubscribeExit = ptyProcess.onExit((event) => {
-              if (!enqueueProcessEvent(session, processPid, { type: "exit", event })) {
-                return;
-              }
-              runFork(drainProcessEvents(session, processPid));
-            });
+            let eventsActivated = false;
 
             let eventStamp: ReturnType<typeof advanceEventSequence> = {
               updatedAt: session.updatedAt,
@@ -2250,8 +2253,19 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
               session.process = ptyProcess;
               session.pid = processPid;
               session.status = "running";
-              session.unsubscribeData = unsubscribeData;
-              session.unsubscribeExit = unsubscribeExit;
+              // onExit may replay an exit immediately; accept it before subscribing.
+              session.unsubscribeData = spawnResult.process.onData((data) => {
+                if (!enqueueProcessEvent(session, processPid, { type: "output", data })) {
+                  return;
+                }
+                if (eventsActivated) runFork(drainProcessEvents(session, processPid));
+              });
+              session.unsubscribeExit = spawnResult.process.onExit((event) => {
+                if (!enqueueProcessEvent(session, processPid, { type: "exit", event })) {
+                  return;
+                }
+                if (eventsActivated) runFork(drainProcessEvents(session, processPid));
+              });
               eventStamp = advanceEventSequence(session);
               return [undefined, state] as const;
             });
@@ -2263,6 +2277,9 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
               sequence: eventStamp.sequence,
               snapshot: snapshot(session),
             });
+            // Publish startup before draining any events replayed during subscription.
+            eventsActivated = true;
+            if (session.processEventDrainRunning) runFork(drainProcessEvents(session, processPid));
           }),
         ),
       ),
@@ -2367,7 +2384,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
     }
 
     const inspectorOption = yield* acquireSubprocessInspector.pipe(
-      Effect.map(Option.some),
+      Effect.asSome,
       Effect.catch((reason) =>
         Effect.logWarning("failed to snapshot processes for terminal subprocess polling", {
           reason,
@@ -2393,7 +2410,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
     ) {
       const terminalPid = session.pid;
       const inspectResult = yield* subprocessInspector(terminalPid).pipe(
-        Effect.map(Option.some),
+        Effect.asSome,
         Effect.catch((reason) =>
           Effect.logWarning("failed to check terminal subprocess activity", {
             threadId: session.threadId,
@@ -2546,6 +2563,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
         exitSignal: null,
         updatedAt: yield* nowIso,
         eventSequence: 0,
+        inputCount: 0,
         cols,
         rows,
         process: null,
@@ -2886,6 +2904,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
         terminalId,
       });
     }
+    session.inputCount += 1;
     yield* Effect.try({
       try: () => process.write(input.data),
       catch: (cause) =>
@@ -2967,6 +2986,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
           exitSignal: null,
           updatedAt: yield* nowIso,
           eventSequence: 0,
+          inputCount: 0,
           cols,
           rows,
           process: null,
@@ -3051,6 +3071,52 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
       }),
     );
 
+  const closeIdle: TerminalManager["Service"]["closeIdle"] = (input) =>
+    withThreadLock(
+      input.threadId,
+      Effect.gen(function* () {
+        const running = (yield* sessionsForThread(input.threadId)).filter(
+          (session): session is TerminalSessionState & { pid: number } =>
+            session.status === "running" &&
+            Number.isInteger(session.pid) &&
+            (input.terminalId === undefined || session.terminalId === input.terminalId),
+        );
+        if (running.length === 0) return;
+        // A command started during the process check can miss the snapshot,
+        // but its input or echo still lands. Both counters only grow, so the
+        // sum changes when either one does.
+        const activityMark = (session: TerminalSessionState) =>
+          session.eventSequence + session.inputCount;
+        const marks = new Map(
+          running.map((session) => [session.terminalId, activityMark(session)]),
+        );
+        // Inspect now instead of trusting the last poll, so a command started
+        // since then keeps its terminal.
+        const { inspector } = yield* acquireSubprocessInspector;
+        yield* Effect.forEach(
+          running,
+          (session) =>
+            inspector(session.pid).pipe(
+              Effect.flatMap((result) =>
+                result.hasRunningSubprocess ||
+                activityMark(session) !== marks.get(session.terminalId)
+                  ? Effect.void
+                  : closeSession(input.threadId, session.terminalId, false),
+              ),
+            ),
+          { discard: true },
+        );
+      }),
+    ).pipe(
+      // The process check failed, so every terminal stays open.
+      Effect.catch((error) =>
+        Effect.logWarning("failed to close idle terminals", {
+          threadId: input.threadId,
+          error: error.message,
+        }),
+      ),
+    );
+
   return TerminalManager.of({
     open,
     attachStream,
@@ -3059,6 +3125,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
     clear,
     restart,
     close,
+    closeIdle,
     subscribe,
     subscribeMetadata,
   });
diff --git a/apps/server/src/terminal/NodePtyAdapter.test.ts b/apps/server/src/terminal/NodePtyAdapter.test.ts
index e6650025f70f..8107e19e6165 100644
--- a/apps/server/src/terminal/NodePtyAdapter.test.ts
+++ b/apps/server/src/terminal/NodePtyAdapter.test.ts
@@ -1,23 +1,63 @@
+import * as NodeEvents from "node:events";
+import * as NodeNet from "node:net";
+
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import { HostProcessArchitecture, HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
-import { vi } from "vite-plus/test";
+import * as Logger from "effect/Logger";
+import * as Scheduler from "effect/Scheduler";
+import { expect, vi } from "vite-plus/test";
 
 import * as NodePtyAdapter from "./NodePtyAdapter.ts";
 import * as PtyAdapter from "./PtyAdapter.ts";
 
-const spawn = vi.fn(() => ({
-  pid: 42,
-  write: vi.fn(),
-  resize: vi.fn(),
-  kill: vi.fn(),
-  onData: vi.fn(() => ({ dispose: vi.fn() })),
-  onExit: vi.fn(() => ({ dispose: vi.fn() })),
-}));
+function makeNativeProcess(pid = 42) {
+  const events = new NodeEvents.EventEmitter();
+  return {
+    pid,
+    _socket: new NodeNet.Socket(),
+    _agent: { kill: vi.fn() },
+    write: vi.fn(),
+    resize: vi.fn(),
+    kill: vi.fn(),
+    onData: vi.fn((callback: (data: string) => void) => {
+      events.on("data", callback);
+      return {
+        dispose: () => {
+          events.off("data", callback);
+        },
+      };
+    }),
+    onExit: vi.fn((callback: (event: { exitCode: number; signal?: number }) => void) => {
+      events.on("exit", callback);
+      return {
+        dispose: () => {
+          events.off("exit", callback);
+        },
+      };
+    }),
+    events,
+  };
+}
+
+const spawn = vi.fn(() => makeNativeProcess());
+
+function preparePendingProcess() {
+  const nativeProcess = makeNativeProcess(0);
+  const subscribed = Promise.withResolvers<void>();
+  nativeProcess._socket.on("newListener", (event) => {
+    if (event === "ready_datapipe") queueMicrotask(() => subscribed.resolve());
+  });
+  spawn.mockReturnValueOnce(nativeProcess);
+  return { nativeProcess, subscribed: Effect.promise(() => subscribed.promise) };
+}
+
+const spawnInput = { shell: "powershell.exe", cwd: ".", cols: 80, rows: 24, env: {} };
 
 const fakeNodePty = { spawn } as unknown as typeof import("node-pty");
 
@@ -35,6 +75,91 @@ const makeTestLayer = (platform: NodeJS.Platform = "win32") =>
 
 const testLayer = makeTestLayer();
 
+it.effect("waits for the Windows PID without requiring output", () =>
+  Effect.gen(function* () {
+    const { nativeProcess, subscribed } = preparePendingProcess();
+    const adapter = yield* PtyAdapter.PtyAdapter;
+    let completed = false;
+    const fiber = yield* adapter.spawn(spawnInput).pipe(
+      Effect.tap(() =>
+        Effect.sync(() => {
+          completed = true;
+        }),
+      ),
+      Effect.forkChild,
+    );
+    yield* subscribed;
+    assert.isFalse(completed);
+    nativeProcess.pid = 12345;
+    nativeProcess._socket.emit("ready_datapipe");
+    const process = yield* Fiber.join(fiber);
+    assert.equal(process.pid, 12345);
+    assert.equal(nativeProcess._socket.listenerCount("ready_datapipe"), 0);
+    assert.equal(nativeProcess.events.listenerCount("exit"), 1);
+
+    const output: string[] = [];
+    const exits: PtyAdapter.PtyExitEvent[] = [];
+    const stopData = process.onData((data) => output.push(data));
+    const stopExit = process.onExit((event) => exits.push(event));
+    nativeProcess.events.emit("data", "first output");
+    nativeProcess.events.emit("exit", { exitCode: 0 });
+    assert.deepEqual(output, ["first output"]);
+    assert.deepEqual(exits, [{ exitCode: 0, signal: null }]);
+    stopData();
+    stopExit();
+  }).pipe(Effect.provide(testLayer)),
+);
+
+for (const failure of ["exit", "close", "error", "invalid-pid"] as const) {
+  it.effect(`fails Windows startup on ${failure} and cleans up`, () =>
+    Effect.gen(function* () {
+      const { nativeProcess, subscribed } = preparePendingProcess();
+      const adapter = yield* PtyAdapter.PtyAdapter;
+      const fiber = yield* adapter.spawn(spawnInput).pipe(Effect.result, Effect.forkChild);
+      yield* subscribed;
+      if (failure === "exit") nativeProcess.events.emit("exit", { exitCode: 1 });
+      else if (failure === "error") nativeProcess._socket.emit("error", new Error("pipe failed"));
+      else nativeProcess._socket.emit(failure === "close" ? "close" : "ready_datapipe");
+      const result = yield* Fiber.join(fiber);
+      assert.equal(result._tag, "Failure");
+      if (result._tag === "Failure") assert.instanceOf(result.failure, PtyAdapter.PtySpawnError);
+      assert.equal(nativeProcess._socket.listenerCount("ready_datapipe"), 0);
+      assert.equal(nativeProcess._socket.listenerCount("error"), 0);
+      assert.equal(nativeProcess._socket.listenerCount("close"), 0);
+      assert.equal(nativeProcess.events.listenerCount("exit"), 0);
+      assert.equal(nativeProcess._agent.kill.mock.calls.length, 1);
+    }).pipe(Effect.provide(testLayer)),
+  );
+}
+
+it.effect("cancels the Windows connection without waiting for output", () =>
+  Effect.gen(function* () {
+    const { nativeProcess, subscribed } = preparePendingProcess();
+    const adapter = yield* PtyAdapter.PtyAdapter;
+    const fiber = yield* adapter.spawn(spawnInput).pipe(Effect.forkChild);
+    yield* subscribed;
+    yield* Fiber.interrupt(fiber);
+    assert.equal(nativeProcess._agent.kill.mock.calls.length, 1);
+    assert.equal(nativeProcess.kill.mock.calls.length, 0);
+    assert.equal(nativeProcess._socket.listenerCount("ready_datapipe"), 0);
+    assert.equal(nativeProcess.events.listenerCount("exit"), 0);
+  }).pipe(Effect.provide(testLayer)),
+);
+
+it.effect("reports an incompatible Windows readiness API instead of hanging", () =>
+  Effect.gen(function* () {
+    const nativeProcess = makeNativeProcess(0);
+    Reflect.deleteProperty(nativeProcess, "_socket");
+    spawn.mockReturnValueOnce(nativeProcess);
+    const adapter = yield* PtyAdapter.PtyAdapter;
+    const error = yield* adapter.spawn(spawnInput).pipe(Effect.flip);
+    assert.instanceOf(error, PtyAdapter.PtySpawnError);
+    assert.instanceOf(error.cause, Error);
+    assert.equal(error.cause.message, "Windows PTY readiness socket is unavailable.");
+    assert.equal(nativeProcess._agent.kill.mock.calls.length, 1);
+  }).pipe(Effect.provide(testLayer)),
+);
+
 for (const platform of ["win32", "linux", "darwin"] as const) {
   it.effect(`terminates through node-pty using ${platform} semantics`, () =>
     Effect.gen(function* () {
@@ -153,3 +278,88 @@ it.effect("reports native module load failures as structured startup defects", (
     ),
   ),
 );
+
+for (const budget of [2048, 8]) {
+  it.effect(`preserves an exit during readiness handoff with scheduler budget ${budget}`, () =>
+    Effect.gen(function* () {
+      const { nativeProcess, subscribed } = preparePendingProcess();
+      const adapter = yield* PtyAdapter.PtyAdapter;
+      const exits: PtyAdapter.PtyExitEvent[] = [];
+      const fiber = yield* Effect.gen(function* () {
+        const process = yield* adapter.spawn(spawnInput);
+        process.onExit((event) => exits.push(event));
+      }).pipe(
+        Effect.provideService(Scheduler.MaxOpsBeforeYield, budget),
+        Effect.provideService(Scheduler.PreventSchedulerYield, false),
+        Effect.forkChild,
+      );
+      yield* subscribed;
+      nativeProcess.pid = 12345;
+      nativeProcess._socket.emit("ready_datapipe");
+      nativeProcess.events.emit("exit", { exitCode: 0 });
+      yield* Fiber.join(fiber);
+      assert.equal(exits.length, 1);
+    }).pipe(Effect.provide(testLayer)),
+  );
+}
+
+it.effect("replays an exit to late subscribers and respects unsubscription", () =>
+  Effect.gen(function* () {
+    const adapter = yield* PtyAdapter.PtyAdapter;
+    const process = yield* adapter.spawn(spawnInput);
+    const nativeProcess = spawn.mock.results.at(-1)!.value;
+    const removed = vi.fn();
+    process.onExit(removed)();
+    nativeProcess.events.emit("exit", { exitCode: 7, signal: 2 });
+    const late = vi.fn();
+    process.onExit(late);
+    nativeProcess.events.emit("exit", { exitCode: 9 });
+    assert.equal(removed.mock.calls.length, 0);
+    assert.deepEqual(late.mock.calls, [[{ exitCode: 7, signal: 2 }]]);
+    assert.equal(nativeProcess.events.listenerCount("exit"), 0);
+  }).pipe(Effect.provide(testLayer)),
+);
+
+for (const failure of ["spawn", "interrupt"] as const) {
+  it.effect(`logs cleanup failures without replacing ${failure}`, () =>
+    Effect.gen(function* () {
+      const { nativeProcess, subscribed } = preparePendingProcess();
+      const killError = new Error("native kill failed");
+      nativeProcess._agent.kill.mockImplementation(() => {
+        throw killError;
+      });
+      const messages: unknown[] = [];
+      const logger = Logger.make(({ message }) => {
+        messages.push(message);
+      });
+      const adapter = yield* PtyAdapter.PtyAdapter;
+      const fiber = yield* adapter
+        .spawn(spawnInput)
+        .pipe(
+          Effect.provide(Logger.layer([logger], { mergeWithExisting: false })),
+          Effect.forkChild,
+        );
+      yield* subscribed;
+      const spawnError = new Error("pipe failed");
+      if (failure === "interrupt") yield* Fiber.interrupt(fiber);
+      else nativeProcess._socket.emit("error", spawnError);
+      const exit = yield* Fiber.await(fiber);
+      assert.isTrue(Exit.isFailure(exit));
+      if (Exit.isFailure(exit)) {
+        if (failure === "interrupt") assert.isTrue(Cause.hasInterrupts(exit.cause));
+        else {
+          const error = Cause.squash(exit.cause);
+          assert.instanceOf(error, PtyAdapter.PtySpawnError);
+          assert.equal(error.cause, spawnError);
+        }
+      }
+      assert.equal(messages.length, 1);
+      expect(messages[0]).toMatchObject([
+        "failed to cancel Windows terminal startup",
+        { terminalPid: 0, cause: { cause: killError } },
+      ]);
+      assert.equal(nativeProcess.events.listenerCount("exit"), 0);
+      assert.equal(nativeProcess._socket.listenerCount("ready_datapipe"), 0);
+    }).pipe(Effect.provide(testLayer)),
+  );
+}
diff --git a/apps/server/src/terminal/NodePtyAdapter.ts b/apps/server/src/terminal/NodePtyAdapter.ts
index 67cdcecdd53a..8ba78ee4d288 100644
--- a/apps/server/src/terminal/NodePtyAdapter.ts
+++ b/apps/server/src/terminal/NodePtyAdapter.ts
@@ -1,4 +1,5 @@
 import * as NodeModule from "node:module";
+import * as NodeNet from "node:net";
 
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
@@ -82,13 +83,112 @@ const ensureNodePtySpawnHelperExecutable = Effect.fn(function* () {
   yield* fs.chmod(helperPath, 0o755).pipe(Effect.orElseSucceed(() => undefined));
 });
 
+/**
+ * Waits for Windows process creation so the manager receives a valid PID.
+ * node-pty defers creation to avoid blocking on named pipes:
+ * https://github.com/microsoft/node-pty/pull/885
+ * T3 adopted that behavior when upgrading from 1.1.0 to 1.2.0-beta.15:
+ * https://github.com/pingdotgg/t3code/pull/13748
+ * Its public API has no readiness event. The private ready_datapipe handler sets
+ * pid before our listener runs.
+ */
+const waitForWindowsPid = (
+  process: import("node-pty").IPty,
+  trackedProcess: NodePtyProcess,
+  shell: string,
+) =>
+  Effect.callback<void, PtyAdapter.PtySpawnError>((resume) => {
+    const hasPid = () => Number.isInteger(process.pid) && process.pid > 0;
+    const failure = (cause: unknown) =>
+      Effect.fail(new PtyAdapter.PtySpawnError({ adapter: "node-pty", shell, cause }));
+
+    if (hasPid()) {
+      resume(Effect.void);
+      return;
+    }
+
+    if (!("_socket" in process) || !(process._socket instanceof NodeNet.Socket)) {
+      resume(failure(new Error("Windows PTY readiness socket is unavailable.")));
+      return;
+    }
+
+    const socket = process._socket;
+    const onReady = () => {
+      cleanup();
+      resume(
+        hasPid()
+          ? Effect.void
+          : failure(new Error("Windows PTY became ready without a valid PID.")),
+      );
+    };
+    const onError = (cause: Error) => {
+      cleanup();
+      resume(failure(cause));
+    };
+    const onClose = () => onError(new Error("Windows PTY closed before its PID was available."));
+    let stopExit = () => {};
+    const cleanup = () => {
+      socket.off("ready_datapipe", onReady);
+      socket.off("error", onError);
+      socket.off("close", onClose);
+      stopExit();
+    };
+    socket.once("ready_datapipe", onReady);
+    socket.once("error", onError);
+    socket.once("close", onClose);
+    stopExit = trackedProcess.onExit(({ exitCode }) =>
+      onError(
+        new Error(`Windows PTY exited before its PID was available (exit code ${exitCode}).`),
+      ),
+    );
+    return Effect.sync(cleanup);
+  });
+
+/**
+ * Cancels Windows startup without waiting for the first output, unlike public kill().
+ * The private agent can cancel the pending connection before a child exists.
+ * Cleanup failures are logged without replacing the startup failure.
+ */
+const killStartingWindowsPty = (process: import("node-pty").IPty) =>
+  Effect.try(() => {
+    if (
+      "_agent" in process &&
+      typeof process._agent === "object" &&
+      process._agent !== null &&
+      "kill" in process._agent &&
+      typeof process._agent.kill === "function"
+    ) {
+      process._agent.kill();
+    } else {
+      process.kill();
+    }
+  }).pipe(
+    Effect.catch((error) =>
+      Effect.logWarning("failed to cancel Windows terminal startup", {
+        terminalPid: process.pid,
+        cause: error,
+      }),
+    ),
+  );
+
 class NodePtyProcess implements PtyAdapter.PtyProcess {
   private readonly process: import("node-pty").IPty;
   private readonly platform: NodeJS.Platform;
+  private exitEvent: PtyAdapter.PtyExitEvent | undefined;
+  private readonly exitListeners = new Set<(event: PtyAdapter.PtyExitEvent) => void>();
+  private readonly exitSubscription: import("node-pty").IDisposable;
 
   constructor(process: import("node-pty").IPty, platform: NodeJS.Platform) {
     this.process = process;
     this.platform = platform;
+    // Retain exits while Windows readiness and the manager hand off the process.
+    this.exitSubscription = process.onExit((event) => {
+      if (this.exitEvent) return;
+      this.exitEvent = { exitCode: event.exitCode, signal: event.signal ?? null };
+      this.exitSubscription.dispose();
+      for (const listener of this.exitListeners) listener(this.exitEvent);
+      this.exitListeners.clear();
+    });
   }
 
   get pid(): number {
@@ -116,16 +216,20 @@ class NodePtyProcess implements PtyAdapter.PtyProcess {
   }
 
   onExit(callback: (event: PtyAdapter.PtyExitEvent) => void): () => void {
-    const disposable = this.process.onExit((event) => {
-      callback({
-        exitCode: event.exitCode,
-        signal: event.signal ?? null,
-      });
-    });
+    if (this.exitEvent) {
+      callback(this.exitEvent);
+      return () => {};
+    }
+    this.exitListeners.add(callback);
     return () => {
-      disposable.dispose();
+      this.exitListeners.delete(callback);
     };
   }
+
+  disposeExitSubscription(): void {
+    this.exitSubscription.dispose();
+    this.exitListeners.clear();
+  }
 }
 
 export const make = Effect.fn("NodePtyAdapter.make")(function* () {
@@ -166,14 +270,16 @@ export const make = Effect.fn("NodePtyAdapter.make")(function* () {
           ? { ...input.env, TERM: "xterm-256color" }
           : input.env;
       const ptyProcess = yield* Effect.try({
-        try: () =>
-          nodePty.spawn(input.shell, input.args ?? [], {
+        try: () => {
+          const nativeProcess = nodePty.spawn(input.shell, input.args ?? [], {
             cwd: input.cwd,
             cols: input.cols,
             rows: input.rows,
             env,
             name: "xterm-256color",
-          }),
+          });
+          return { nativeProcess, process: new NodePtyProcess(nativeProcess, platform) };
+        },
         catch: (cause) =>
           new PtyAdapter.PtySpawnError({
             adapter: "node-pty",
@@ -181,7 +287,16 @@ export const make = Effect.fn("NodePtyAdapter.make")(function* () {
             cause,
           }),
       });
-      return new NodePtyProcess(ptyProcess, platform);
+      if (platform === "win32") {
+        yield* waitForWindowsPid(ptyProcess.nativeProcess, ptyProcess.process, input.shell).pipe(
+          Effect.onError(() =>
+            Effect.sync(() => ptyProcess.process.disposeExitSubscription()).pipe(
+              Effect.andThen(killStartingWindowsPty(ptyProcess.nativeProcess)),
+            ),
+          ),
+        );
+      }
+      return ptyProcess.process;
     }),
   });
 });
diff --git a/apps/server/src/textGeneration/AntigravityTextGeneration.ts b/apps/server/src/textGeneration/AntigravityTextGeneration.ts
index 6fd59041ddb0..dacc50bf383d 100644
--- a/apps/server/src/textGeneration/AntigravityTextGeneration.ts
+++ b/apps/server/src/textGeneration/AntigravityTextGeneration.ts
@@ -238,7 +238,7 @@ export const makeAntigravityTextGeneration = Effect.fn("makeAntigravityTextGener
             yield* applyAntigravityAcpModelSelection({
               runtime,
               model: input.modelSelection.model,
-              defaultModel: yield* options.defaultModel ?? Effect.succeed(undefined),
+              defaultModel: yield* options.defaultModel ?? Effect.undefined,
               mapError: (cause) =>
                 new TextGenerationError({
                   operation,
diff --git a/apps/server/src/textGeneration/CodexTextGeneration.test.ts b/apps/server/src/textGeneration/CodexTextGeneration.test.ts
index 91c9cb94b5d5..161a18abb2b7 100644
--- a/apps/server/src/textGeneration/CodexTextGeneration.test.ts
+++ b/apps/server/src/textGeneration/CodexTextGeneration.test.ts
@@ -135,6 +135,7 @@ function withFakeCodexEnv<A, E, R>(
     launchArgs?: string;
     environment?: NodeJS.ProcessEnv;
     models?: ReadonlyArray<string>;
+    managedRuntime?: boolean;
   },
   effectFn: (textGeneration: TextGeneration.TextGeneration["Service"]) => Effect.Effect<A, E, R>,
 ) {
@@ -154,6 +155,13 @@ function withFakeCodexEnv<A, E, R>(
           capabilities: null,
         })),
       ),
+      input.managedRuntime
+        ? Effect.succeed({
+            config,
+            environment: input.environment ?? process.env,
+            revision: "test",
+          })
+        : undefined,
     );
     return yield* effectFn(textGeneration);
   }).pipe(Effect.scoped);
@@ -236,6 +244,26 @@ it.layer(CodexTextGenerationTestLayer)("CodexTextGeneration", (it) => {
       ),
   );
 
+  it.effect("omits a persisted service tier for managed ChatGPT text generation", () =>
+    withFakeCodexEnv(
+      {
+        output: JSON.stringify({ subject: "Update project", body: "" }),
+        managedRuntime: true,
+        forbidArg: 'service_tier="priority"',
+      },
+      (textGeneration) =>
+        textGeneration.generateCommitMessage({
+          cwd: process.cwd(),
+          branch: "feature/chatgpt",
+          stagedSummary: "M README.md",
+          stagedPatch: "diff --git a/README.md b/README.md",
+          modelSelection: createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.4", [
+            { id: "serviceTier", value: "priority" },
+          ]),
+        }),
+    ),
+  );
+
   it.effect("passes exec-safe launch args into codex exec", () =>
     withFakeCodexEnv(
       {
@@ -556,7 +584,7 @@ it.layer(CodexTextGenerationTestLayer)("CodexTextGeneration", (it) => {
                   }),
                 ),
               ),
-              Effect.ensuring(fs.remove(imagePath).pipe(Effect.catch(() => Effect.void))),
+              Effect.ensuring(fs.remove(imagePath).pipe(Effect.ignore)),
             );
 
           expect(generated.branch).toBe("fix/ui-regression");
@@ -579,7 +607,7 @@ it.layer(CodexTextGenerationTestLayer)("CodexTextGeneration", (it) => {
           const { attachmentsDir } = yield* ServerConfig.ServerConfig;
           const missingAttachmentId = "thread-missing-attachment";
           const missingPath = path.join(attachmentsDir, `${missingAttachmentId}.png`);
-          yield* fs.remove(missingPath).pipe(Effect.catch(() => Effect.void));
+          yield* fs.remove(missingPath).pipe(Effect.ignore);
 
           const result = yield* textGeneration
             .generateBranchName({
diff --git a/apps/server/src/textGeneration/CodexTextGeneration.ts b/apps/server/src/textGeneration/CodexTextGeneration.ts
index 4c9ac59d8422..8384aa6e550c 100644
--- a/apps/server/src/textGeneration/CodexTextGeneration.ts
+++ b/apps/server/src/textGeneration/CodexTextGeneration.ts
@@ -48,6 +48,11 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
   codexConfig: CodexSettings,
   environment?: NodeJS.ProcessEnv,
   getModels: Effect.Effect<ReadonlyArray<ServerProviderModel>> = Effect.succeed([]),
+  resolveRuntime?: Effect.Effect<
+    import("../provider/CodexManagedRuntime.ts").CodexEffectiveRuntime,
+    import("@t3tools/contracts").ProviderSetupError,
+    Scope.Scope
+  >,
 ) {
   const fileSystem = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
@@ -96,7 +101,7 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
       );
 
   const safeUnlink = (filePath: string): Effect.Effect<void, never> =>
-    fileSystem.remove(filePath).pipe(Effect.catch(() => Effect.void));
+    fileSystem.remove(filePath).pipe(Effect.ignore);
 
   const encodeJsonForOperation = (
     operation:
@@ -180,6 +185,15 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
     const outputPath = yield* writeTempFile(operation, "codex-output", "");
 
     const runCodexCommand = Effect.fn("runCodexJson.runCodexCommand")(function* () {
+      const resolved = resolveRuntime
+        ? yield* resolveRuntime.pipe(
+            Effect.mapError(
+              (cause) => new TextGenerationError({ operation, detail: cause.detail }),
+            ),
+          )
+        : undefined;
+      const effectiveConfig = resolved?.config ?? codexConfig;
+      const effectiveEnvironment = resolved?.environment ?? resolvedEnvironment;
       const models = yield* getModels;
       const requestedModel = modelSelection.model;
       const model =
@@ -188,13 +202,13 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
           (candidate) => !candidate.isCustom && codexModelFamily(candidate.slug) === requestedModel,
         )?.slug ??
         requestedModel;
-      const launchArgs = resolveCodexLaunchArgs(codexConfig.launchArgs, resolvedEnvironment);
+      const launchArgs = resolveCodexLaunchArgs(effectiveConfig.launchArgs, effectiveEnvironment);
       const reasoningEffort =
         getModelSelectionStringOptionValue(modelSelection, "reasoningEffort") ??
         DEFAULT_TEXT_GENERATION_REASONING_EFFORT;
-      const serviceTier = getCodexServiceTierOptionValue(modelSelection);
+      const serviceTier = resolved ? undefined : getCodexServiceTierOptionValue(modelSelection);
       const spawnCommand = yield* resolveSpawnCommand(
-        codexConfig.binaryPath || "codex",
+        effectiveConfig.binaryPath || "codex",
         [
           "exec",
           ...codexExecLaunchArgs(launchArgs),
@@ -214,12 +228,14 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
           ...imagePaths.flatMap((imagePath) => ["--image", imagePath]),
           "-",
         ],
-        { env: resolvedEnvironment },
+        { env: effectiveEnvironment },
       );
       const command = ChildProcess.make(spawnCommand.command, spawnCommand.args, {
         env: {
-          ...resolvedEnvironment,
-          ...(codexConfig.homePath ? { CODEX_HOME: expandHomePath(codexConfig.homePath) } : {}),
+          ...effectiveEnvironment,
+          ...(effectiveConfig.homePath
+            ? { CODEX_HOME: expandHomePath(effectiveConfig.homePath) }
+            : {}),
         },
         cwd,
         shell: spawnCommand.shell,
@@ -263,8 +279,9 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
       }
     });
 
-    const cleanup = Effect.all(
-      [schemaPath, outputPath, ...cleanupPaths].map((filePath) => safeUnlink(filePath)),
+    const cleanup = Effect.forEach(
+      [schemaPath, outputPath, ...cleanupPaths],
+      (filePath) => safeUnlink(filePath),
       {
         concurrency: "unbounded",
       },
diff --git a/apps/server/src/textGeneration/ThreadTitleLinks.ts b/apps/server/src/textGeneration/ThreadTitleLinks.ts
index 1b008bb38094..4e22605682f7 100644
--- a/apps/server/src/textGeneration/ThreadTitleLinks.ts
+++ b/apps/server/src/textGeneration/ThreadTitleLinks.ts
@@ -14,12 +14,9 @@ export const resolveThreadTitleLinks = Effect.fn("resolveThreadTitleLinks")(func
   const providers = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
   const links = new Map<string, NonNullable<ReturnType<typeof providers.resolveLink>>>();
   for (const match of input.message.matchAll(/https:\/\/[^\s<>"')\]`]+/g)) {
-    let url: URL;
-    try {
-      url = new URL(match[0].replace(/[.,;!?]+$/, ""));
-    } catch {
-      continue;
-    }
+    const candidate = match[0].replace(/[.,;!?]+$/, "");
+    if (!URL.canParse(candidate)) continue;
+    const url = new URL(candidate);
     url.hash = "";
     url.search = "";
     if (links.has(url.href)) continue;
@@ -40,7 +37,7 @@ export const resolveThreadTitleLinks = Effect.fn("resolveThreadTitleLinks")(func
         ),
         Effect.map((summary) => `${url}\n${summary}`),
         Effect.timeout("3 seconds"),
-        Effect.catch(() => Effect.succeed(`${url}: unavailable`)),
+        Effect.orElseSucceed(() => `${url}: unavailable`),
       ),
     { concurrency: 2 },
   );
diff --git a/apps/server/src/turbo/officialImport/plan.ts b/apps/server/src/turbo/officialImport/plan.ts
index 81b90c158aeb..bb395bae4f86 100644
--- a/apps/server/src/turbo/officialImport/plan.ts
+++ b/apps/server/src/turbo/officialImport/plan.ts
@@ -517,6 +517,12 @@ export const transformOfficialImportEvent = (
         ...base,
         payload: { ...event.payload, threadId: remap(idMap.threadIds, event.payload.threadId) },
       };
+    case "thread.auto-settle-set":
+      return {
+        ...event,
+        ...base,
+        payload: { ...event.payload, threadId: remap(idMap.threadIds, event.payload.threadId) },
+      };
     case "thread.runtime-mode-set":
       return {
         ...event,
@@ -765,6 +771,7 @@ const visitOfficialImportEventIdentities = (
       case "thread.unsettled":
       case "thread.snoozed":
       case "thread.unsnoozed":
+      case "thread.auto-settle-set":
       case "thread.runtime-mode-set":
       case "thread.interaction-mode-set":
       case "thread.checkpoint-revert-requested":
diff --git a/apps/server/src/usage/UsageService.test.ts b/apps/server/src/usage/UsageService.test.ts
index b391e213ab9a..f7286a11b60d 100644
--- a/apps/server/src/usage/UsageService.test.ts
+++ b/apps/server/src/usage/UsageService.test.ts
@@ -3,10 +3,11 @@
 import * as NodeFSP from "node:fs/promises";
 import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
+import * as NodeSqlite from "node:sqlite";
 
 import { assert, describe, it } from "@effect/vitest";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { HostProcessEnvironment } from "@t3tools/shared/hostProcess";
+import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import { mergeUsage } from "@t3tools/shared/usageMerge";
 import {
   EnvironmentId,
@@ -31,6 +32,7 @@ import * as ServerConfig from "../config.ts";
 import * as ServerSettings from "../serverSettings.ts";
 import * as UsageService from "./UsageService.ts";
 
+const encodeUnknownJson = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
 const encodeUnknownJsonString = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
 
 function claudeLine(id: number, outputTokens: number, model = "claude-fable-5"): string {
@@ -82,9 +84,11 @@ const serviceLayers = (input: {
   /** Defaults to an unparsable document so every scan retries the fetch. */
   readonly ratesDocument?: unknown;
   readonly environment?: NodeJS.ProcessEnv;
+  readonly platform?: NodeJS.Platform;
 }) =>
   ServerConfig.layerTest(process.cwd(), { prefix: input.prefix }).pipe(
     Layer.provideMerge(NodeServices.layer),
+    Layer.provideMerge(Layer.succeed(HostProcessPlatform, input.platform ?? "linux")),
     Layer.provideMerge(ServerSettings.layerTest(input.settings)),
     Layer.provideMerge(
       Layer.succeed(
@@ -101,7 +105,12 @@ const serviceLayers = (input: {
     ),
     Layer.provideMerge(
       Layer.succeed(HostProcessEnvironment, {
+        HOME: input.home,
         GROK_HOME: NodePath.join(input.home, "grok"),
+        OPENCODE_DATA_DIR: NodePath.join(input.home, "opencode"),
+        ANTIGRAVITY_DATA_DIR: NodePath.join(input.home, "antigravity"),
+        XDG_CONFIG_HOME: NodePath.join(input.home, "config"),
+        APPDATA: NodePath.join(input.home, "config"),
         ...input.environment,
       }),
     ),
@@ -112,6 +121,315 @@ function totalOutputTokens(summary: { buckets: readonly { totals: { outputTokens
 }
 
 describe("UsageService", () => {
+  for (const explicitDefault of [true, false]) {
+    it.live(
+      `reads shared managed ${explicitDefault ? "explicit" : "legacy"} default and disabled extra account history once`,
+      () =>
+        Effect.gen(function* () {
+          const { home, settings } = yield* setup;
+          const summary = yield* Effect.gen(function* () {
+            for (const [id, output] of [
+              ["codex", 17],
+              ["codex-personal", 23],
+            ] as const) {
+              const sessions = NodePath.join(home, "shared-codex", "sessions");
+              yield* Effect.promise(async () => {
+                await NodeFSP.mkdir(sessions, { recursive: true });
+                await NodeFSP.writeFile(
+                  NodePath.join(sessions, `${id}-rollout.jsonl`),
+                  [
+                    { type: "session_meta", payload: { id } },
+                    { type: "turn_context", payload: { model: "gpt-5.6-sol" } },
+                    {
+                      type: "event_msg",
+                      timestamp: "2026-08-01T10:00:00Z",
+                      payload: {
+                        type: "token_count",
+                        info: { last_token_usage: { input_tokens: 10, output_tokens: output } },
+                      },
+                    },
+                  ]
+                    .map((line) => encodeUnknownJsonString(line))
+                    .join("\n") + "\n",
+                );
+              });
+            }
+            const service = yield* UsageService.make;
+            return yield* service.readSummary(WINDOW);
+          }).pipe(
+            Effect.provide(
+              serviceLayers({
+                prefix: "usage-managed-accounts",
+                home,
+                settings: {
+                  ...settings,
+                  providers: {
+                    ...settings.providers,
+                    codex: { setupMode: "managed", homePath: NodePath.join(home, "shared-codex") },
+                  },
+                  providerInstances: {
+                    ...(explicitDefault
+                      ? {
+                          [ProviderInstanceId.make("codex")]: {
+                            driver: ProviderDriverKind.make("codex"),
+                            config: {
+                              setupMode: "managed",
+                              homePath: NodePath.join(home, "shared-codex"),
+                            },
+                          },
+                        }
+                      : {}),
+                    [ProviderInstanceId.make("codex-personal")]: {
+                      driver: ProviderDriverKind.make("codex"),
+                      enabled: false,
+                      config: {
+                        setupMode: "managed",
+                        homePath: NodePath.join(home, "shared-codex"),
+                        shadowHomePath: NodePath.join(home, "personal-shadow"),
+                      },
+                      environment: [
+                        {
+                          name: "CODEX_HOME",
+                          value: NodePath.join(home, "ignored-environment"),
+                          sensitive: false,
+                        },
+                      ],
+                    },
+                  },
+                },
+              }),
+            ),
+          );
+          assert.strictEqual(totalOutputTokens(summary), 40);
+          assert.strictEqual(
+            summary.sources.filter(
+              (source) => source.fingerprint.provider === "codex" && source.status === "ok",
+            ).length,
+            1,
+          );
+        }).pipe(Effect.scoped),
+    );
+  }
+  it.live("omits Cursor account usage when no file login is saved", () =>
+    Effect.gen(function* () {
+      const { settings, home } = yield* setup;
+      for (const platform of ["linux", "win32", "darwin"] as const) {
+        const service = yield* UsageService.make.pipe(
+          Effect.provide(
+            serviceLayers({
+              prefix: `usage-service-cursor-no-login-${platform}`,
+              home,
+              settings,
+              platform,
+              environment: { AGENT_CLI_CREDENTIAL_STORE: "file" },
+            }),
+          ),
+        );
+        const summary = yield* service.readSummary(WINDOW);
+        assert.isFalse(summary.sources.some((source) => source.fingerprint.provider === "cursor"));
+      }
+    }).pipe(Effect.scoped),
+  );
+
+  it.live("keeps Cursor credential errors visible when a saved login cannot be read", () =>
+    Effect.gen(function* () {
+      const { settings, home } = yield* setup;
+      const authPath = NodePath.join(home, "config", "cursor", "auth.json");
+      yield* Effect.promise(async () => {
+        await NodeFSP.mkdir(NodePath.dirname(authPath), { recursive: true });
+        await NodeFSP.writeFile(authPath, "invalid json");
+      });
+      const service = yield* UsageService.make.pipe(
+        Effect.provide(
+          serviceLayers({ prefix: "usage-service-cursor-invalid-login", home, settings }),
+        ),
+      );
+      const summary = yield* service.readSummary(WINDOW);
+      const cursor = summary.sources.find((source) => source.fingerprint.provider === "cursor");
+      assert.strictEqual(cursor?.message, "Cursor credentials could not be read.");
+    }).pipe(Effect.scoped),
+  );
+
+  it.live("does not read the macOS Cursor Keychain before account usage is enabled", () =>
+    Effect.gen(function* () {
+      const { settings, home } = yield* setup;
+      const service = yield* UsageService.make.pipe(
+        Effect.provide(
+          serviceLayers({
+            prefix: "usage-service-cursor-keychain-disabled",
+            home,
+            settings,
+            platform: "darwin",
+            environment: {},
+          }),
+        ),
+      );
+      const summary = yield* service.readSummary(WINDOW);
+      const cursor = summary.sources.find((source) => source.fingerprint.provider === "cursor");
+      assert.strictEqual(cursor?.status, "missing");
+      assert.strictEqual(cursor?.action, "enableCursorKeychain");
+    }).pipe(Effect.scoped),
+  );
+
+  it.live("ignores stale Cursor file logins when the active credential store differs", () =>
+    Effect.gen(function* () {
+      const { settings, home } = yield* setup;
+      for (const [index, testCase] of [
+        {
+          platform: "darwin" as const,
+          environment: { AGENT_CLI_CREDENTIAL_STORE: "memory" },
+          authPath: [".cursor", "auth.json"],
+        },
+        {
+          platform: "linux" as const,
+          environment: { AGENT_CLI_CREDENTIAL_STORE: "memory" },
+          authPath: ["config", "cursor", "auth.json"],
+        },
+        {
+          platform: "linux" as const,
+          environment: { CURSOR_API_KEY: "different-account" },
+          authPath: ["config", "cursor", "auth.json"],
+        },
+      ].entries()) {
+        const authPath = NodePath.join(home, ...testCase.authPath);
+        yield* Effect.promise(async () => {
+          await NodeFSP.mkdir(NodePath.dirname(authPath), { recursive: true });
+          await NodeFSP.writeFile(
+            authPath,
+            encodeUnknownJsonString({ accessToken: "stale-token" }),
+          );
+        });
+        const service = yield* UsageService.make.pipe(
+          Effect.provide(
+            serviceLayers({
+              prefix: `usage-service-cursor-store-${index}`,
+              home,
+              settings,
+              platform: testCase.platform,
+              environment: testCase.environment,
+            }),
+          ),
+        );
+        const summary = yield* service.readSummary(WINDOW);
+        const cursor = summary.sources.find((source) => source.fingerprint.provider === "cursor");
+        assert.strictEqual(cursor?.status, "missing");
+        assert.include(cursor?.message ?? "", "Cursor CLI login");
+        assert.isFalse(summary.buckets.some((bucket) => bucket.provider === "cursor"));
+      }
+    }).pipe(Effect.scoped),
+  );
+
+  it.live(
+    "includes OpenCode history but does not substitute desktop usage for an unavailable Cursor account",
+    () =>
+      Effect.gen(function* () {
+        const { settings, home } = yield* setup;
+        const root = NodePath.join(home, "opencode");
+        const message = yield* encodeUnknownJson({
+          id: "msg_1",
+          sessionID: "session-1",
+          role: "assistant",
+          modelID: "example-model",
+          time: { created: Date.parse("2026-08-01T10:00:00Z") },
+          tokens: { input: 10, output: 5, reasoning: 2, cache: { read: 20, write: 3 } },
+        });
+        const bubble = yield* encodeUnknownJson({
+          type: 2,
+          createdAt: "2026-08-01T10:00:00Z",
+          modelInfo: { modelName: "example-model" },
+          tokenCount: { inputTokens: 100, outputTokens: 20 },
+        });
+        yield* Effect.promise(async () => {
+          const directory = NodePath.join(root, "storage", "message", "session-1");
+          await NodeFSP.mkdir(directory, { recursive: true });
+          await NodeFSP.writeFile(NodePath.join(directory, "msg_1.json"), message);
+          const desktop = NodePath.join(home, "config", "Cursor", "User", "globalStorage");
+          await NodeFSP.mkdir(desktop, { recursive: true });
+          const db = new NodeSqlite.DatabaseSync(NodePath.join(desktop, "state.vscdb"));
+          try {
+            db.exec("CREATE TABLE cursorDiskKV (key TEXT, value TEXT)");
+            db.prepare("INSERT INTO cursorDiskKV VALUES (?, ?)").run(
+              "bubbleId:session:assistant",
+              bubble,
+            );
+          } finally {
+            db.close();
+          }
+        });
+        const service = yield* UsageService.make.pipe(
+          Effect.provide(serviceLayers({ prefix: "usage-service-opencode", home, settings })),
+        );
+        const summary = yield* service.readSummary(WINDOW);
+        assert.strictEqual(summary.buckets[0]?.provider, "opencode");
+        assert.isFalse(summary.buckets.some((bucket) => bucket.provider === "cursor"));
+        assert.isFalse(summary.sources.some((source) => source.fingerprint.provider === "cursor"));
+        assert.strictEqual(
+          summary.buckets[0]?.sourcePath,
+          yield* Effect.promise(() => NodeFSP.realpath(root)),
+        );
+        assert.strictEqual(summary.buckets[0]?.totals.outputTokens, 7);
+        assert.strictEqual(
+          summary.sources.find((source) => source.fingerprint.provider === "opencode")
+            ?.distinctSessions,
+          1,
+        );
+      }).pipe(Effect.scoped),
+  );
+
+  it.live("counts aliased OpenCode and Antigravity directories once", () =>
+    Effect.gen(function* () {
+      const { settings, home } = yield* setup;
+      const opencode = NodePath.join(home, "opencode-store");
+      const opencodeAlias = NodePath.join(home, "opencode-alias");
+      const conversations = NodePath.join(home, "antigravity-conversations");
+      const antigravityA = NodePath.join(home, "antigravity-a");
+      const antigravityB = NodePath.join(home, "antigravity-b");
+      yield* Effect.promise(async () => {
+        await NodeFSP.mkdir(opencode);
+        await NodeFSP.symlink(opencode, opencodeAlias, "junction");
+        await NodeFSP.mkdir(conversations);
+        await NodeFSP.mkdir(antigravityA);
+        await NodeFSP.mkdir(antigravityB);
+        await NodeFSP.symlink(
+          conversations,
+          NodePath.join(antigravityA, "conversations"),
+          "junction",
+        );
+        await NodeFSP.symlink(
+          conversations,
+          NodePath.join(antigravityB, "conversations"),
+          "junction",
+        );
+      });
+      const service = yield* UsageService.make.pipe(
+        Effect.provide(
+          serviceLayers({
+            prefix: "usage-service-aliased-roots-test",
+            home,
+            settings,
+            environment: {
+              OPENCODE_DATA_DIR: `${opencode},${opencodeAlias}`,
+              ANTIGRAVITY_DATA_DIR: `${antigravityA},${antigravityB}`,
+            },
+          }),
+        ),
+      );
+      const summary = yield* service.readSummary(WINDOW);
+      const sourcesFor = (provider: "opencode" | "antigravity") =>
+        summary.sources.filter((source) => source.fingerprint.provider === provider);
+      assert.strictEqual(sourcesFor("opencode").length, 1);
+      assert.strictEqual(sourcesFor("antigravity").length, 1);
+      assert.strictEqual(
+        sourcesFor("opencode")[0]?.fingerprint.resolvedHomePath,
+        yield* Effect.promise(() => NodeFSP.realpath(opencode)),
+      );
+      assert.strictEqual(
+        sourcesFor("antigravity")[0]?.fingerprint.resolvedHomePath,
+        yield* Effect.promise(() => NodeFSP.realpath(conversations)),
+      );
+    }).pipe(Effect.scoped),
+  );
+
   it.live("reads configured and disabled accounts once across shared and aliased homes", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
@@ -258,9 +576,12 @@ describe("UsageService", () => {
           const service = yield* UsageService.make;
           const first = yield* service.readSummary(WINDOW);
           assert.strictEqual(totalOutputTokens(first), 7);
+          const configuredProjects = yield* Effect.promise(() =>
+            NodeFSP.realpath(NodePath.join(configured, "projects")),
+          );
           assert.include(
             first.sources.map((source) => source.fingerprint.resolvedHomePath),
-            NodePath.join(configured, "projects"),
+            configuredProjects,
           );
           yield* settingsService.updateSettings({
             providerInstances: {
@@ -275,9 +596,12 @@ describe("UsageService", () => {
           });
           const second = yield* service.readSummary(WINDOW);
           assert.strictEqual(totalOutputTokens(second), 8);
+          const environmentProjects = yield* Effect.promise(() =>
+            NodeFSP.realpath(NodePath.join(environmentHome, "projects")),
+          );
           assert.include(
             second.sources.map((source) => source.fingerprint.resolvedHomePath),
-            NodePath.join(environmentHome, "projects"),
+            environmentProjects,
           );
         }).pipe(
           Effect.provide(
@@ -410,6 +734,59 @@ describe("UsageService", () => {
     }).pipe(Effect.scoped),
   );
 
+  it.live(
+    "keeps large-record totals and costs exact through append, dedupe, restart and cleanup",
+    () =>
+      Effect.gen(function* () {
+        const { transcript, settings, home } = yield* setup;
+        const large = claudeLine(1, 9900).replace(
+          '"message":',
+          '"padding":' + encodeUnknownJsonString("x".repeat(9 * 1024 * 1024)) + ',"message":',
+        );
+        yield* Effect.promise(() => NodeFSP.writeFile(transcript, large));
+        yield* Effect.gen(function* () {
+          const service = yield* UsageService.make;
+          const first = yield* service.readSummary(WINDOW);
+          assert.strictEqual(totalOutputTokens(first), 9900);
+          assert.closeTo(
+            first.buckets.reduce((sum, bucket) => sum + bucket.costUsd, 0),
+            0.4951,
+            1e-12,
+          );
+          const warm = yield* service.readSummary(WINDOW);
+          assert.deepStrictEqual(warm.buckets, first.buckets);
+          // The repeated content block has the same message/request identity.
+          yield* Effect.promise(() => NodeFSP.appendFile(transcript, large + claudeLine(2, 100)));
+          const appended = yield* service.readSummary(WINDOW);
+          assert.strictEqual(totalOutputTokens(appended), 10000);
+          assert.strictEqual(
+            appended.buckets.reduce((sum, bucket) => sum + bucket.totals.uncachedInputTokens, 0),
+            20,
+          );
+          const restarted = yield* UsageService.make;
+          const restored = yield* restarted.readSummary(WINDOW);
+          assert.deepStrictEqual(restored.buckets, appended.buckets);
+          yield* Effect.promise(() => NodeFSP.rm(transcript));
+          const afterCleanup = yield* UsageService.make;
+          assert.deepStrictEqual(
+            (yield* afterCleanup.readSummary(WINDOW)).buckets,
+            appended.buckets,
+          );
+        }).pipe(
+          Effect.provide(
+            serviceLayers({
+              prefix: "usage-service-large-record-test",
+              home,
+              settings,
+              ratesDocument: {
+                "claude-fable-5": { input_cost_per_token: 1e-5, output_cost_per_token: 5e-5 },
+              },
+            }),
+          ),
+        );
+      }).pipe(Effect.scoped),
+  );
+
   it.live("preserves saved tokens, costs and sessions after transcript cleanup and restart", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
@@ -505,6 +882,9 @@ describe("UsageService", () => {
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5, "example-model")));
+      const transcriptDir = yield* Effect.promise(() =>
+        NodeFSP.realpath(NodePath.join(home, "claude", "projects")),
+      );
 
       yield* Effect.gen(function* () {
         const settingsService = yield* ServerSettings.ServerSettingsService;
@@ -519,7 +899,7 @@ describe("UsageService", () => {
             exists: (path) =>
               fileSystem.exists(path).pipe(
                 Effect.tap(() => {
-                  if (path !== NodePath.join(home, "claude", "projects")) return Effect.void;
+                  if (path !== transcriptDir) return Effect.void;
                   homeProbes += 1;
                   return Deferred.succeed(
                     homeProbes === 1 ? firstScanStarted : secondScanStarted,
diff --git a/apps/server/src/usage/UsageService.ts b/apps/server/src/usage/UsageService.ts
index 949155c650f2..9e8cda9960ea 100644
--- a/apps/server/src/usage/UsageService.ts
+++ b/apps/server/src/usage/UsageService.ts
@@ -1,14 +1,14 @@
 /**
  * UsageService - scans provider transcripts and returns priced usage buckets.
  *
- * The scan reads the provider CLIs' own session files (Claude Code, Codex, and
- * Grok Build) rather than T3 Code's orchestration projections, so usage covers
- * turns driven outside T3 Code too. This is the approach `ccusage` takes.
+ * The scan reads native session files and databases, including work driven
+ * outside T3 Code. Cursor's local records provide only partial coverage.
  *
- * Transcripts are append-only, so parsed records are memoised per file by
+ * JSONL transcripts are append-only, so parsed records are memoised per file by
  * `(size, mtime)`. A cold 30-day scan of ~1.4 GB lands around 2-3 seconds; warm
  * scans only reparse files that changed, and a file that merely grew resumes
  * from its cached parse position so only the appended bytes are read.
+ * SQLite readers query live databases each scan so WAL writes remain visible.
  *
  * @module UsageService
  */
@@ -18,6 +18,7 @@ import {
   ClaudeSettings,
   CodexSettings,
   type ProviderInstanceConfig,
+  ProviderInstanceId,
   USAGE_CONTRACT_VERSION,
   type ServerSettings as ServerSettingsValue,
   type UsageProviderKind,
@@ -27,10 +28,11 @@ import {
   type UsageSummaryInput,
   UsageReadError,
 } from "@t3tools/contracts";
-import { HostProcessEnvironment } from "@t3tools/shared/hostProcess";
+import { HostProcessEnvironment, HostProcessPlatform } from "@t3tools/shared/hostProcess";
 import * as Cause from "effect/Cause";
 import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
+import * as Crypto from "effect/Crypto";
 import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
@@ -46,7 +48,11 @@ import { ServerConfig } from "../config.ts";
 import { expandHomePath } from "../pathExpansion.ts";
 import * as ServerSettings from "../serverSettings.ts";
 import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
+import { resolveAntigravityInstanceDirectories } from "../provider/antigravityAuthSupport.ts";
 import { mergeProviderInstanceEnvironment } from "../provider/ProviderInstanceEnvironment.ts";
+import { readOpenCodeUsage } from "./opencodeUsageReader.ts";
+import { readAntigravityUsage } from "./antigravityUsageReader.ts";
+import { readCursorAccountUsage } from "./cursorUsageReader.ts";
 import { UsageAggregator } from "./usageAggregation.ts";
 import { createOverrideRateTable, parseRateTable, type RateTable } from "./usagePricing.ts";
 import {
@@ -144,12 +150,14 @@ export const layerTest = Layer.succeed(
 );
 
 export const make = Effect.gen(function* () {
+  const crypto = yield* Crypto.Crypto;
   const fileSystem = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const config = yield* ServerConfig;
   const settingsService = yield* ServerSettings.ServerSettingsService;
   const httpClient = yield* HttpClient.HttpClient;
   const hostEnvironment = yield* HostProcessEnvironment;
+  const platform = yield* HostProcessPlatform;
 
   const fileCache: ScanCache = new Map();
   const sourceCache = new Map<string, typeof CachedSource.Type>();
@@ -225,7 +233,7 @@ export const make = Effect.gen(function* () {
 
     yield* encodeRatesCache({ fetchedAtMs: now, document: fetched }).pipe(
       Effect.flatMap((serialized) => fileSystem.writeFileString(ratesCachePath, serialized)),
-      Effect.catchCause(() => Effect.void),
+      Effect.ignoreCause,
     );
   });
 
@@ -263,10 +271,16 @@ export const make = Effect.gen(function* () {
     for (const driver of ["claudeAgent", "codex", "grok"] as const) {
       // Disabled accounts still have history. Explicit default slots replace
       // the legacy settings, just as they do in the provider registry.
-      const instances: Array<Pick<ProviderInstanceConfig, "config" | "environment">> =
-        Object.values(settings.providerInstances).filter((instance) => instance.driver === driver);
+      const instances: Array<
+        Pick<ProviderInstanceConfig, "config" | "environment"> & { instanceId: ProviderInstanceId }
+      > = Object.entries(settings.providerInstances)
+        .filter(([, instance]) => instance.driver === driver)
+        .map(([id, instance]) => ({ ...instance, instanceId: ProviderInstanceId.make(id) }));
       if (!Object.hasOwn(settings.providerInstances, driver)) {
-        instances.push({ config: settings.providers[driver] });
+        instances.push({
+          config: settings.providers[driver],
+          instanceId: ProviderInstanceId.make(driver),
+        });
       }
       for (const instance of instances) {
         const environment = mergeProviderInstanceEnvironment(instance.environment, hostEnvironment);
@@ -275,12 +289,15 @@ export const make = Effect.gen(function* () {
         if (driver === "codex") {
           const decoded = decodeCodexSettings(instance.config ?? {});
           if (Option.isNone(decoded)) continue;
-          const config = decoded.value;
+          const codexConfig = decoded.value;
           const environmentHome = environment.CODEX_HOME?.trim();
           const layout = yield* resolveCodexHomeLayout(
-            !config.homePath.trim() && !config.shadowHomePath.trim() && environmentHome
-              ? { ...config, homePath: environmentHome }
-              : config,
+            codexConfig.setupMode !== "managed" &&
+              !codexConfig.homePath.trim() &&
+              !codexConfig.shadowHomePath.trim() &&
+              environmentHome
+              ? { ...codexConfig, homePath: environmentHome }
+              : codexConfig,
           );
           home = layout.sharedHomePath;
         } else if (driver === "claudeAgent") {
@@ -372,7 +389,7 @@ export const make = Effect.gen(function* () {
         cacheDirty = false;
       }),
       // A cache we cannot write is a slower next start, not a failed read.
-      Effect.catchCause(() => Effect.void),
+      Effect.ignoreCause,
     );
   });
 
@@ -446,6 +463,10 @@ export const make = Effect.gen(function* () {
     readonly provider: UsageProviderKind;
     readonly dir: string;
     readonly volumeId: string;
+    readonly hostId?: string;
+    readonly status?: UsageSource["status"];
+    readonly message?: string;
+    readonly action?: UsageSource["action"];
     /** Parsed records per file, or `null` when the directory does not exist. */
     readonly files:
       | readonly { readonly path: string; readonly records: readonly UsageRecord[] }[]
@@ -481,6 +502,173 @@ export const make = Effect.gen(function* () {
       }
       scanned.push({ provider, dir, volumeId, files: parsedFiles });
     }
+
+    const home = NodeOS.homedir();
+    const envRoots = Effect.fnUntraced(function* (key: string, defaults: readonly string[]) {
+      const roots = hostEnvironment[key]
+        ?.split(",")
+        .map((value) => value.trim())
+        .filter(Boolean);
+      const canonical = new Set<string>();
+      for (const root of roots?.length ? roots : defaults) {
+        const resolved = path.resolve(expandHomePath(root));
+        canonical.add(
+          yield* fileSystem.realPath(resolved).pipe(Effect.orElseSucceed(() => resolved)),
+        );
+      }
+      return [...canonical];
+    });
+    const dataHome = hostEnvironment["XDG_DATA_HOME"]?.trim();
+    for (const dir of yield* envRoots("OPENCODE_DATA_DIR", [
+      path.join(
+        dataHome && path.isAbsolute(dataHome) ? dataHome : path.join(home, ".local", "share"),
+        "opencode",
+      ),
+    ])) {
+      const result = yield* Effect.promise(() => readOpenCodeUsage(dir, windowStartMs));
+      scanned.push({
+        provider: "opencode",
+        dir,
+        volumeId: yield* Effect.promise(() => readDirectoryVolumeId(dir)),
+        files: result.missing && !result.error ? null : result.files,
+        status: result.error ? "partial" : "ok",
+        ...(result.error ? { message: "Some OpenCode history could not be read." } : {}),
+      });
+    }
+    const antigravityRoots = yield* envRoots("ANTIGRAVITY_DATA_DIR", [
+      ...["antigravity", "antigravity-cli", "antigravity-ide", "antigravity-backup"].map((name) =>
+        path.join(home, ".gemini", name),
+      ),
+      path.join(home, ".config", "antigravity"),
+    ]);
+    for (const [instanceId, instance] of Object.entries(settings.providerInstances)) {
+      if (instance.driver === "antigravity") {
+        const directories = yield* resolveAntigravityInstanceDirectories(
+          config.stateDir,
+          ProviderInstanceId.make(instanceId),
+        ).pipe(
+          Effect.provideService(Crypto.Crypto, crypto),
+          Effect.provideService(Path.Path, path),
+          Effect.mapError(
+            (cause) =>
+              new UsageReadError({
+                reason: "scanFailed",
+                detail: "Antigravity profile directory could not be resolved.",
+                cause,
+              }),
+          ),
+        );
+        antigravityRoots.push(path.join(directories.profile, "antigravity-acp"));
+      }
+    }
+    const antigravityDirs = new Set<string>();
+    for (const root of antigravityRoots) {
+      const resolvedRoot = yield* fileSystem.realPath(root).pipe(Effect.orElseSucceed(() => root));
+      const nested = path.join(resolvedRoot, "conversations");
+      const dir = (yield* fileSystem
+        .exists(nested)
+        .pipe(Effect.catchCause(() => Effect.succeed(false))))
+        ? nested
+        : resolvedRoot;
+      antigravityDirs.add(yield* fileSystem.realPath(dir).pipe(Effect.orElseSucceed(() => dir)));
+    }
+    const antigravity = yield* Effect.promise(() =>
+      readAntigravityUsage([...antigravityDirs], windowStartMs),
+    );
+    for (const dir of antigravityDirs) {
+      const exists = yield* fileSystem
+        .exists(dir)
+        .pipe(Effect.catchCause(() => Effect.succeed(false)));
+      const failed = antigravity.errors.some(
+        (error) => error === dir || error.startsWith(`${dir}${path.sep}`),
+      );
+      scanned.push({
+        provider: "antigravity",
+        dir,
+        volumeId: yield* Effect.promise(() => readDirectoryVolumeId(dir)),
+        files: !exists && !failed ? null : antigravity.files.filter((file) => file.root === dir),
+        status: failed ? "partial" : "ok",
+        ...(failed ? { message: "Some Antigravity history could not be read." } : {}),
+      });
+    }
+    const cursorUserHome =
+      (platform === "win32" ? hostEnvironment["USERPROFILE"] : hostEnvironment["HOME"]) || home;
+    const configHome = hostEnvironment["XDG_CONFIG_HOME"]?.trim();
+    const cursorHome =
+      platform === "darwin"
+        ? path.join(cursorUserHome, "Library", "Application Support")
+        : platform === "win32"
+          ? hostEnvironment["APPDATA"] || path.join(cursorUserHome, "AppData", "Roaming")
+          : configHome && path.isAbsolute(configHome)
+            ? configHome
+            : path.join(cursorUserHome, ".config");
+    const cursorAuthPath =
+      platform === "darwin"
+        ? path.join(cursorUserHome, ".cursor", "auth.json")
+        : path.join(cursorHome, platform === "win32" ? "Cursor" : "cursor", "auth.json");
+    const credentialStore = hostEnvironment["AGENT_CLI_CREDENTIAL_STORE"];
+    const loginUnavailable =
+      Boolean(hostEnvironment["CURSOR_AUTH_TOKEN"]?.trim()) ||
+      Boolean(hostEnvironment["CURSOR_API_KEY"]?.trim()) ||
+      credentialStore === "memory";
+    if (
+      platform === "darwin" &&
+      credentialStore !== "file" &&
+      !loginUnavailable &&
+      !settings.cursorKeychainUsageEnabled
+    ) {
+      scanned.push({
+        provider: "cursor",
+        dir: cursorAuthPath,
+        volumeId: "",
+        files: null,
+        message: "Cursor account usage is off on this environment.",
+        action: "enableCursorKeychain",
+      });
+      return scanned;
+    }
+    const cursorUntilMs = yield* Clock.currentTimeMillis;
+    const account = loginUnavailable
+      ? {
+          accountKey: null,
+          records: [],
+          missing: true,
+          error: "Cursor account history needs a Cursor CLI login on this server.",
+        }
+      : yield* Effect.promise(() =>
+          readCursorAccountUsage(
+            platform === "darwin" && credentialStore !== "file"
+              ? { kind: "keychain" }
+              : cursorAuthPath,
+            windowStartMs,
+            cursorUntilMs,
+          ),
+        );
+    // No saved login means there is no account source to report, not a setup error.
+    if (account.missing && account.error === null) return scanned;
+    if (account.accountKey !== null && account.error === null && !account.missing) {
+      // The same account includes CLI and desktop history from every machine.
+      // A stable remote fingerprint prevents connected environments counting it twice.
+      const source = `cursor-account:${account.accountKey}`;
+      scanned.push({
+        provider: "cursor",
+        dir: source,
+        hostId: "cursor.com",
+        volumeId: account.accountKey,
+        files: [{ path: source, records: account.records }],
+        status: "ok",
+      });
+      return scanned;
+    }
+    scanned.push({
+      provider: "cursor",
+      dir: cursorAuthPath,
+      volumeId: yield* Effect.promise(() => readDirectoryVolumeId(cursorAuthPath)),
+      // Never combine a local fallback with another server's account-wide history.
+      files: null,
+      message:
+        account.error ?? "Cursor account history needs a Cursor CLI login saved on this server.",
+    });
     return scanned;
   });
 
@@ -555,7 +743,16 @@ export const make = Effect.gen(function* () {
 
     const sources: UsageSource[] = [];
 
-    for (const { provider, dir, volumeId, files } of scannedDirs) {
+    for (const {
+      provider,
+      dir,
+      volumeId,
+      files,
+      status,
+      message,
+      action,
+      hostId: sourceHostId,
+    } of scannedDirs) {
       const retainedFiles = [...(files ?? [])];
       const livePaths = new Set(retainedFiles.map((file) => file.path));
       // Cleanup may remove transcripts, but the usage we already saved still
@@ -601,21 +798,23 @@ export const make = Effect.gen(function* () {
           }
           // Only sessions contributing in-window count; the mtime slack can
           // admit boundary files whose records fall outside the range.
-          if (aggregator.add(usageRecord) && record.sessionId.length > 0) {
+          if (aggregator.add(usageRecord, dir) && record.sessionId.length > 0) {
             sessionIds.add(record.sessionId);
           }
         }
       }
 
       sources.push({
-        fingerprint: { hostId, provider, resolvedHomePath: dir, volumeId },
+        fingerprint: { hostId: sourceHostId ?? hostId, provider, resolvedHomePath: dir, volumeId },
         // Clients exclude missing sources, so saved records remain an available source.
-        status: files === null && scannedFiles === 0 ? "missing" : "ok",
+        status: files === null && scannedFiles === 0 ? "missing" : (status ?? "ok"),
         scannedFiles,
         skippedFiles,
         malformedRecords: 0,
         distinctSessions: sessionIds.size,
-        message: files === null ? "No transcript directory on this environment." : null,
+        message:
+          message ?? (files === null ? "No transcript directory on this environment." : null),
+        ...(action ? { action } : {}),
       });
     }
 
@@ -650,6 +849,7 @@ export const make = Effect.gen(function* () {
   const scanKey = (
     input: UsageSummaryInput,
     priceOverrides: ServerSettingsValue["usagePriceOverrides"],
+    cursorKeychainUsageEnabled: boolean,
   ): string =>
     JSON.stringify([
       input.timeZone,
@@ -659,11 +859,12 @@ export const make = Effect.gen(function* () {
       input.sinceTime ?? null,
       input.untilTime ?? null,
       priceOverrides,
+      cursorKeychainUsageEnabled,
     ]);
 
   const readSummary = Effect.fn("UsageService.readSummary")(function* (input: UsageSummaryInput) {
     const settings = yield* readSettings;
-    const key = scanKey(input, settings.usagePriceOverrides);
+    const key = scanKey(input, settings.usagePriceOverrides, settings.cursorKeychainUsageEnabled);
     const deferred = yield* Effect.uninterruptible(
       Effect.gen(function* () {
         const existing = inflightScans.get(key);
diff --git a/apps/server/src/usage/antigravityUsageReader.ts b/apps/server/src/usage/antigravityUsageReader.ts
new file mode 100644
index 000000000000..54c00b804b7a
--- /dev/null
+++ b/apps/server/src/usage/antigravityUsageReader.ts
@@ -0,0 +1,374 @@
+// node:sqlite reads live conversation databases while Node fs discovers them.
+// @effect-diagnostics nodeBuiltinImport:off
+import * as NodeFSP from "node:fs/promises";
+import * as NodePath from "node:path";
+import * as NodeSqlite from "node:sqlite";
+import * as NodeTimersPromises from "node:timers/promises";
+
+import type { UsageRecord } from "./usageTranscripts.ts";
+
+type FieldValue = number | bigint | Uint8Array;
+type Fields = Map<number, FieldValue[]>;
+
+/** Antigravity stores usage metadata as protobuf, independently of conversation text. */
+function fields(bytes: Uint8Array): Fields {
+  let offset = 0;
+  const result: Fields = new Map();
+  const varint = () => {
+    let value = 0n;
+    for (let shift = 0n; shift < 70n; shift += 7n) {
+      const byte = bytes[offset++];
+      if (byte === undefined || (shift === 63n && byte > 1)) {
+        throw new Error("Invalid Antigravity protobuf varint");
+      }
+      value |= BigInt(byte & 127) << shift;
+      if (byte < 128) {
+        return value > BigInt(Number.MAX_SAFE_INTEGER) ? value : Number(value);
+      }
+    }
+    throw new Error("Invalid Antigravity protobuf varint");
+  };
+  while (offset < bytes.length) {
+    const tag = varint();
+    if (typeof tag !== "number") throw new Error("Invalid protobuf field");
+    const number = Math.floor(tag / 8);
+    const wire = tag % 8;
+    if (number === 0) throw new Error("Invalid protobuf field");
+    let value: FieldValue;
+    if (wire === 0) {
+      value = varint();
+    } else if (wire === 1 || wire === 5 || wire === 2) {
+      const length = wire === 2 ? varint() : wire === 1 ? 8 : 4;
+      if (typeof length !== "number") throw new Error("Invalid protobuf field length");
+      if (length > bytes.length - offset) throw new Error("Truncated protobuf field");
+      value = bytes.subarray(offset, offset + length);
+      offset += length;
+      if (wire !== 2) continue;
+    } else {
+      throw new Error("Unsupported protobuf wire type");
+    }
+    const entries = result.get(number) ?? [];
+    entries.push(value);
+    result.set(number, entries);
+  }
+  return result;
+}
+
+const numberAt = (value: Fields, key: number) => {
+  const entry = value.get(key)?.[0];
+  return typeof entry === "number" ? entry : 0;
+};
+const bytesAt = (value: Fields, key: number) => {
+  const entry = value.get(key)?.[0];
+  return entry instanceof Uint8Array ? entry : undefined;
+};
+const nested = (value: Fields, key: number) => {
+  const bytes = bytesAt(value, key);
+  return bytes === undefined ? new Map<number, FieldValue[]>() : fields(bytes);
+};
+const textAt = (value: Fields, key: number) => {
+  const bytes = bytesAt(value, key);
+  return bytes === undefined ? "" : new TextDecoder("utf-8", { fatal: true }).decode(bytes).trim();
+};
+const timestamp = (value: Fields) => {
+  const seconds = numberAt(value, 1);
+  return seconds > 0 ? seconds * 1000 + Math.floor(numberAt(value, 2) / 1_000_000) : null;
+};
+
+const MODEL_IDS: Record<number, string> = {
+  246: "gemini-2.5-pro",
+  312: "gemini-2.5-flash",
+  313: "gemini-2.5-flash-thinking",
+  329: "gemini-2.5-flash-thinking",
+  330: "gemini-2.5-flash-lite",
+  281: "claude-sonnet-4",
+  282: "claude-sonnet-4",
+  290: "claude-opus-4",
+  291: "claude-opus-4",
+  333: "claude-sonnet-4-5",
+  334: "claude-sonnet-4-5",
+  340: "claude-haiku-4-5",
+  341: "claude-haiku-4-5",
+  1026: "claude-opus-4-6",
+  1035: "claude-sonnet-4-6",
+  1016: "gemini-3.1-pro",
+  1036: "gemini-3.1-pro",
+  1037: "gemini-3.1-pro",
+  1018: "gemini-3-flash-preview",
+  1084: "gemini-3-flash-preview",
+  1047: "gemini-3-flash-preview",
+};
+
+function modelName(name: string, id: number): string {
+  if (name) {
+    const normalized = name
+      .toLowerCase()
+      .replace(/\s*\([^)]*\)\s*$/, "")
+      .replaceAll(" ", "-");
+    if (normalized.startsWith("claude-")) {
+      return normalized
+        .replace(/^claude-(4(?:\.\d+)?)-(sonnet|opus|haiku)/, "claude-$2-$1")
+        .replaceAll(".", "-");
+    }
+    return normalized;
+  }
+  return MODEL_IDS[id] ?? (id > 0 ? `antigravity-model-${id}` : "");
+}
+
+interface Metadata {
+  model: string;
+  timestampMs: number | null;
+  usages: Fields[];
+}
+
+function metadata(bytes: Uint8Array, step: boolean): Metadata {
+  const root = fields(bytes);
+  if (!step && bytesAt(root, 1) === undefined) {
+    throw new Error("Missing Antigravity generation metadata");
+  }
+  const data = step ? root : nested(root, 1);
+  const model = step ? nested(data, 24) : data;
+  const usage = bytesAt(data, step ? 9 : 4);
+  const usages = usage === undefined ? [] : [fields(usage)];
+  for (const retry of data.get(step ? 28 : 17) ?? []) {
+    if (!(retry instanceof Uint8Array)) throw new Error("Invalid retry metadata");
+    const retryUsage = bytesAt(fields(retry), 2);
+    if (retryUsage !== undefined) usages.push(fields(retryUsage));
+  }
+  return {
+    model: modelName(
+      textAt(model, step ? 12 : 19) || textAt(model, step ? 8 : 21),
+      numberAt(model, step ? 1 : 3),
+    ),
+    timestampMs: step
+      ? (timestamp(nested(data, 8)) ?? timestamp(nested(data, 1)))
+      : timestamp(nested(nested(data, 9), 4)),
+    usages,
+  };
+}
+
+function blob(value: unknown): Uint8Array {
+  if (!(value instanceof Uint8Array)) throw new Error("Invalid Antigravity metadata blob");
+  return value;
+}
+
+interface UsageCandidate {
+  record: UsageRecord;
+  keys: readonly string[];
+  timestampQuality: number;
+}
+
+async function readDatabase(path: string, fallbackTimestamp: number): Promise<UsageCandidate[]> {
+  const db = new NodeSqlite.DatabaseSync(path, { readOnly: true });
+  try {
+    db.exec("PRAGMA busy_timeout = 100; BEGIN");
+    const tables = new Set(
+      db
+        .prepare("SELECT name FROM sqlite_master WHERE type = 'table'")
+        .all()
+        .map((row) => row.name),
+    );
+    if (!tables.has("gen_metadata") && !tables.has("steps")) {
+      throw new Error("Missing Antigravity usage tables");
+    }
+    const readMetadata = async (query: string, column: string, step: boolean) => {
+      const entries: Array<{ idx: number; entry: Metadata }> = [];
+      for (const row of db.prepare(query).iterate()) {
+        if (typeof row.idx !== "number") throw new Error("Invalid Antigravity metadata index");
+        entries.push({ idx: row.idx, entry: metadata(blob(row[column]), step) });
+        if (entries.length % 256 === 0) await NodeTimersPromises.setImmediate();
+      }
+      return entries;
+    };
+    const generations = tables.has("gen_metadata")
+      ? await readMetadata("SELECT idx, data FROM gen_metadata ORDER BY idx", "data", false)
+      : [];
+    let trajectoryTimestamp: number | null = null;
+    if (tables.has("trajectory_metadata_blob")) {
+      for (const row of db.prepare("SELECT data FROM trajectory_metadata_blob").iterate()) {
+        trajectoryTimestamp ??= timestamp(nested(fields(blob(row.data)), 2));
+      }
+    }
+    const steps = tables.has("steps")
+      ? await readMetadata(
+          "SELECT idx, metadata FROM steps WHERE metadata IS NOT NULL ORDER BY idx",
+          "metadata",
+          true,
+        )
+      : [];
+    const sessionId = NodePath.basename(path, ".db");
+    const records: UsageCandidate[] = [];
+    const generationModels = new Map(generations.map(({ idx, entry }) => [idx, entry.model]));
+    for (const [source, entries] of [
+      ["step", steps],
+      ["generation", generations],
+    ] as const) {
+      for (const [index, { idx, entry }] of entries.entries()) {
+        for (const [usageIndex, usage] of entry.usages.entries()) {
+          const outputTokens = Math.max(
+            numberAt(usage, 3),
+            numberAt(usage, 9) + numberAt(usage, 10),
+          );
+          const totals = {
+            uncachedInputTokens: numberAt(usage, 2),
+            cachedInputTokens: numberAt(usage, 5),
+            cacheCreationTokens: numberAt(usage, 4),
+            outputTokens,
+            reasoningTokens: Math.min(outputTokens, numberAt(usage, 9)),
+          };
+          if (
+            totals.uncachedInputTokens +
+              totals.cachedInputTokens +
+              totals.cacheCreationTokens +
+              outputTokens ===
+            0
+          )
+            continue;
+          const keys = ([11, 12, 7] as const).flatMap((key) => {
+            const id = textAt(usage, key);
+            return id ? [`antigravity:${key}:${id}`] : [];
+          });
+          const record: UsageRecord = {
+            provider: "antigravity",
+            sessionId,
+            timestampMs: entry.timestampMs ?? trajectoryTimestamp ?? fallbackTimestamp,
+            model:
+              MODEL_IDS[numberAt(usage, 1)] ||
+              entry.model ||
+              (source === "step" ? generationModels.get(idx) : "") ||
+              modelName("", numberAt(usage, 1)) ||
+              "antigravity-unknown",
+            totals,
+            reportedCostUsd: null,
+            fast: false,
+            dedupeKey: keys[0] ?? `antigravity:${sessionId}:${source}:${index}:${usageIndex}`,
+          };
+          records.push({
+            record,
+            keys,
+            timestampQuality: entry.timestampMs !== null ? 2 : trajectoryTimestamp !== null ? 1 : 0,
+          });
+        }
+      }
+    }
+    return records;
+  } finally {
+    db.close();
+  }
+}
+
+/** Reads and merges aliases across every configured Antigravity store before date filtering. */
+export async function readAntigravityUsage(
+  conversationsDirectories: string | readonly string[],
+  sinceMs: number,
+) {
+  const roots =
+    typeof conversationsDirectories === "string"
+      ? [conversationsDirectories]
+      : conversationsDirectories;
+  const files: Array<{ root: string; path: string; records: UsageRecord[] }> = [];
+  const errors: string[] = [];
+  const identities = new Map<string, number>();
+  const groups: Array<
+    UsageCandidate & { parent: number; size: number; owner: number; fileIndex: number }
+  > = [];
+  const find = (index: number): number => {
+    let root = index;
+    while (groups[root]!.parent !== root) root = groups[root]!.parent;
+    while (index !== root) {
+      const parent = groups[index]!.parent;
+      groups[index]!.parent = root;
+      index = parent;
+    }
+    return root;
+  };
+  const merge = (left: number, right: number): number => {
+    let a = find(left);
+    let b = find(right);
+    if (a === b) return a;
+    if (groups[a]!.size < groups[b]!.size) [a, b] = [b, a];
+    const target = groups[a]!;
+    const source = groups[b]!;
+    const first = target.owner < source.owner ? target : source;
+    const bestTime =
+      source.timestampQuality > target.timestampQuality ||
+      (source.timestampQuality === target.timestampQuality &&
+        source.record.timestampMs < target.record.timestampMs)
+        ? source
+        : target;
+    const x = target.record.totals;
+    const y = source.record.totals;
+    target.record = {
+      ...first.record,
+      model:
+        first.record.model === "antigravity-unknown"
+          ? first === target
+            ? source.record.model
+            : target.record.model
+          : first.record.model,
+      timestampMs: bestTime.record.timestampMs,
+      totals: {
+        uncachedInputTokens: Math.max(x.uncachedInputTokens, y.uncachedInputTokens),
+        cachedInputTokens: Math.max(x.cachedInputTokens, y.cachedInputTokens),
+        cacheCreationTokens: Math.max(x.cacheCreationTokens, y.cacheCreationTokens),
+        outputTokens: Math.max(x.outputTokens, y.outputTokens),
+        reasoningTokens: Math.max(x.reasoningTokens, y.reasoningTokens),
+      },
+    };
+    target.timestampQuality = bestTime.timestampQuality;
+    target.owner = first.owner;
+    target.fileIndex = first.fileIndex;
+    target.size += source.size;
+    source.parent = a;
+    return a;
+  };
+  const append = (candidate: UsageCandidate, fileIndex: number) => {
+    const index = groups.length;
+    groups.push({ ...candidate, parent: index, size: 1, owner: index, fileIndex });
+    for (const key of candidate.keys) {
+      const existing = identities.get(key);
+      if (existing !== undefined) merge(index, existing);
+      identities.set(key, index);
+    }
+  };
+  const visited = new Set<string>();
+  const walk = async (directory: string, root: string): Promise<void> => {
+    let entries;
+    try {
+      entries = await NodeFSP.readdir(directory, { withFileTypes: true });
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") errors.push(directory);
+      return;
+    }
+    entries.sort((a, b) => a.name.localeCompare(b.name));
+    for (const entry of entries) {
+      const path = NodePath.join(directory, entry.name);
+      if (entry.isDirectory()) {
+        await walk(path, root);
+      } else if (entry.isFile() && entry.name.endsWith(".db")) {
+        try {
+          const canonical = await NodeFSP.realpath(path);
+          if (visited.has(canonical)) continue;
+          visited.add(canonical);
+          const stat = await NodeFSP.stat(path);
+          const candidates = await readDatabase(path, stat.mtimeMs);
+          const fileIndex = files.length;
+          files.push({ root, path, records: [] });
+          for (const [index, candidate] of candidates.entries()) {
+            append(candidate, fileIndex);
+            if (index % 256 === 255) await NodeTimersPromises.setImmediate();
+          }
+        } catch {
+          errors.push(path);
+        }
+      }
+    }
+  };
+  for (const root of roots) await walk(root, root);
+  for (const [index, group] of groups.entries()) {
+    if (group.parent === index && group.record.timestampMs >= sinceMs) {
+      files[group.fileIndex]!.records.push(group.record);
+    }
+  }
+  return { files, errors };
+}
diff --git a/apps/server/src/usage/cursorUsageReader.test.ts b/apps/server/src/usage/cursorUsageReader.test.ts
new file mode 100644
index 000000000000..4bfa647c0aff
--- /dev/null
+++ b/apps/server/src/usage/cursorUsageReader.test.ts
@@ -0,0 +1,22 @@
+import { assert, describe, it } from "@effect/vitest";
+
+import { CursorKeychainTimeoutError } from "../provider/cursorCredentialStore.ts";
+import { readCursorAccountUsage } from "./cursorUsageReader.ts";
+
+describe("readCursorAccountUsage", () => {
+  it("asks for Keychain approval when the prompt goes unanswered", async () => {
+    const result = await readCursorAccountUsage(
+      { kind: "keychain" },
+      0,
+      1,
+      () => Promise.reject(new Error("no network expected")),
+      () => Promise.reject(new CursorKeychainTimeoutError()),
+    );
+    assert.deepStrictEqual(result, {
+      accountKey: null,
+      records: [],
+      missing: false,
+      error: "Allow Keychain access on the Mac running T3 Code, then refresh.",
+    });
+  });
+});
diff --git a/apps/server/src/usage/cursorUsageReader.ts b/apps/server/src/usage/cursorUsageReader.ts
new file mode 100644
index 000000000000..573506d818a1
--- /dev/null
+++ b/apps/server/src/usage/cursorUsageReader.ts
@@ -0,0 +1,272 @@
+// Node fs reads CLI credentials, and crypto hashes account IDs for deduplication.
+// @effect-diagnostics nodeBuiltinImport:off
+import * as NodeFSP from "node:fs/promises";
+import * as NodeCrypto from "node:crypto";
+import * as NodeTimersPromises from "node:timers/promises";
+
+import type { UsageRecord } from "./usageTranscripts.ts";
+import {
+  CursorKeychainTimeoutError,
+  readMacCursorAccessToken,
+} from "../provider/cursorCredentialStore.ts";
+
+function object(value: unknown): Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+}
+
+function tokens(value: unknown): number {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.trunc(value) : 0;
+}
+
+/**
+ * Maps Cursor's tiered names (`cursor-grok-4.6-high-fast`,
+ * `claude-fable-5-1-thinking-high`) to the base model's rate-table key.
+ * Grok resolves through xAI's first-party entry, which has no bare alias.
+ */
+export function cursorRateModel(model: string): string {
+  const base = model
+    .replace(/^cursor-/, "")
+    .replace(/(?:-thinking)?(?:-(?:none|minimal|low|medium|high|xhigh|max))?(?:-fast)?$/, "");
+  return base.startsWith("grok-") ? `xai/${base}` : base;
+}
+
+export interface CursorAccountUsageReadResult {
+  readonly accountKey: string | null;
+  readonly records: readonly UsageRecord[];
+  readonly missing: boolean;
+  readonly error: string | null;
+}
+
+const accountHash = (value: string) => NodeCrypto.createHash("sha256").update(value).digest("hex");
+
+function canonicalJson(value: unknown): string {
+  if (Array.isArray(value)) return `[${value.map(canonicalJson).join(",")}]`;
+  if (value !== null && typeof value === "object") {
+    return `{${Object.entries(value)
+      .sort(([a], [b]) => a.localeCompare(b))
+      .map(([key, entry]) => `${JSON.stringify(key)}:${canonicalJson(entry)}`)
+      .join(",")}}`;
+  }
+  return JSON.stringify(value) ?? "null";
+}
+
+/** Find the longest exact suffix/prefix overlap in linear time. */
+function boundaryOverlap(previous: readonly string[], current: readonly string[]): number {
+  const sequence = [...current, "", ...previous];
+  const lengths = Array.from({ length: sequence.length }, () => 0);
+  for (let index = 1; index < sequence.length; index++) {
+    let length = lengths[index - 1]!;
+    while (length > 0 && sequence[index] !== sequence[length]) length = lengths[length - 1]!;
+    if (sequence[index] === sequence[length]) length++;
+    lengths[index] = length;
+  }
+  return lengths.at(-1) ?? 0;
+}
+
+/** Dashboard usage includes headless agents and reports fresh input separately from cache reads. */
+export async function readCursorAccountUsage(
+  credentialSource: string | { readonly kind: "keychain" },
+  sinceMs: number,
+  endDate: number,
+  request: (url: string, init: RequestInit) => Promise<Response> = globalThis.fetch,
+  keychainToken: () => Promise<string | null> = readMacCursorAccessToken,
+): Promise<CursorAccountUsageReadResult> {
+  let accessToken: unknown;
+  try {
+    accessToken =
+      typeof credentialSource === "string"
+        ? object(JSON.parse(await NodeFSP.readFile(credentialSource, "utf8"))).accessToken
+        : await keychainToken();
+  } catch (cause) {
+    const missing = typeof credentialSource === "string" && object(cause).code === "ENOENT";
+    return {
+      accountKey: null,
+      records: [],
+      missing,
+      error: missing
+        ? null
+        : typeof credentialSource === "string"
+          ? "Cursor credentials could not be read."
+          : cause instanceof CursorKeychainTimeoutError
+            ? "Allow Keychain access on the Mac running T3 Code, then refresh."
+            : "Cursor Keychain credentials could not be read.",
+    };
+  }
+  if (typeof accessToken !== "string" || !accessToken) {
+    return {
+      accountKey: null,
+      records: [],
+      missing: true,
+      error:
+        typeof credentialSource === "string"
+          ? null
+          : "Cursor account history needs a macOS Keychain CLI login on this server.",
+    };
+  }
+  let accountKey: string | null = null;
+  try {
+    const payload = accessToken.split(".")[1];
+    const subject = object(
+      JSON.parse(Buffer.from(payload ?? "", "base64url").toString("utf8")),
+    ).sub;
+    if (typeof subject !== "string" || !subject) throw new Error("Invalid authentication");
+    const userId = subject.split("|").at(-1);
+    if (!userId) throw new Error("Invalid authentication");
+    accountKey = accountHash(subject);
+    if (!Number.isFinite(sinceMs) || !Number.isFinite(endDate) || sinceMs < 0 || sinceMs > endDate)
+      throw new Error("Invalid date window");
+    const deadline = AbortSignal.timeout(60_000);
+    const records: UsageRecord[] = [];
+    const occurrences = new Map<string, number>();
+    const pages: unknown[][] = [];
+    let completed = false;
+    const pageSize = 1000;
+    let total: number | undefined;
+    for (let page = 1; ; page++) {
+      // A count can include overlapping page boundaries. Allow room to
+      // reconcile them without imposing a fixed account-size limit.
+      if (page > (total === undefined ? 1000 : Math.ceil(total / pageSize) * 2 + 1)) {
+        throw new Error("Account usage page limit exceeded");
+      }
+      const response = await request("https://cursor.com/api/dashboard/get-filtered-usage-events", {
+        method: "POST",
+        redirect: "error",
+        signal: AbortSignal.any([deadline, AbortSignal.timeout(10_000)]),
+        headers: {
+          "Content-Type": "application/json",
+          Origin: "https://cursor.com",
+          Cookie: `WorkosCursorSessionToken=${encodeURIComponent(`${userId}::${accessToken}`)}`,
+        },
+        body: JSON.stringify({
+          page,
+          pageSize,
+          startDate: String(sinceMs),
+          endDate: String(endDate),
+        }),
+      });
+      if (response.status === 401 || response.status === 403) {
+        return {
+          accountKey,
+          records: [],
+          missing: false,
+          error: "Sign in to Cursor again to read account usage.",
+        };
+      }
+      if (!response.ok) throw new Error("Account usage request failed");
+      const parsed: unknown = await response.json();
+      if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+        throw new Error("Invalid account usage page");
+      }
+      const body = object(parsed);
+      const keys = Object.keys(body);
+      if ("error" in body || "message" in body || "code" in body)
+        throw new Error("Account usage error response");
+      const count = keys.length === 0 ? 0 : body.totalUsageEventsCount;
+      const events =
+        keys.length === 0 || (keys.length === 1 && keys[0] === "totalUsageEventsCount")
+          ? []
+          : body.usageEventsDisplay;
+      if (
+        (count !== undefined &&
+          (typeof count !== "number" ||
+            !Number.isSafeInteger(count) ||
+            count < 0 ||
+            (total !== undefined && count !== total))) ||
+        !Array.isArray(events) ||
+        events.length > pageSize ||
+        (count === undefined && !Array.isArray(body.usageEventsDisplay))
+      ) {
+        throw new Error("Inconsistent account usage page");
+      }
+      if (typeof count === "number") total = count;
+      pages.push(events);
+      if (events.length < pageSize) {
+        completed = true;
+        break;
+      }
+    }
+    if (!completed) throw new Error("Account usage page limit exceeded");
+    const rawCount = pages.reduce((sum, page) => sum + page.length, 0);
+    if (total !== undefined && rawCount < total) throw new Error("Incomplete account usage pages");
+    let removalsRemaining = total === undefined ? 0 : rawCount - total;
+    let previousKeys: string[] = [];
+    for (const events of pages) {
+      const eventKeys =
+        removalsRemaining > 0 ? events.map((event) => accountHash(canonicalJson(event))) : [];
+      const removalCount = Math.min(removalsRemaining, boundaryOverlap(previousKeys, eventKeys));
+      removalsRemaining -= removalCount;
+      previousKeys = eventKeys;
+      for (const raw of events.slice(removalCount)) {
+        const event = object(raw);
+        const usage = object(event.tokenUsage);
+        if (event.tokenUsage === undefined || event.tokenUsage === null) continue;
+        for (const key of [
+          "inputTokens",
+          "outputTokens",
+          "cacheReadTokens",
+          "cacheWriteTokens",
+          "totalCents",
+        ]) {
+          const value = usage[key];
+          if (
+            value !== undefined &&
+            (typeof value !== "number" || !Number.isFinite(value) || value < 0)
+          ) {
+            throw new Error("Invalid account usage totals");
+          }
+        }
+        const timestampMs =
+          typeof event.timestamp === "string" && event.timestamp.trim() !== ""
+            ? Number(event.timestamp)
+            : event.timestamp;
+        if (
+          typeof timestampMs !== "number" ||
+          !Number.isFinite(timestampMs) ||
+          typeof event.model !== "string" ||
+          !event.model
+        )
+          throw new Error("Invalid account usage event");
+        if (timestampMs < sinceMs || timestampMs > endDate) continue;
+        const totals = {
+          uncachedInputTokens: tokens(usage.inputTokens),
+          cachedInputTokens: tokens(usage.cacheReadTokens),
+          cacheCreationTokens: tokens(usage.cacheWriteTokens),
+          outputTokens: tokens(usage.outputTokens),
+          reasoningTokens: 0,
+        };
+        const reportedCostUsd =
+          typeof usage.totalCents === "number" ? usage.totalCents / 100 : null;
+        const sessionId = typeof event.conversationId === "string" ? event.conversationId : "";
+        // No event ID is provided. Preserve identical billed rows with an occurrence index.
+        const key = accountHash(
+          JSON.stringify([timestampMs, event.model, sessionId, totals, reportedCostUsd]),
+        );
+        const occurrence = occurrences.get(key) ?? 0;
+        occurrences.set(key, occurrence + 1);
+        records.push({
+          provider: "cursor",
+          timestampMs,
+          model: event.model,
+          rateModel: cursorRateModel(event.model),
+          sessionId,
+          totals,
+          reportedCostUsd,
+          fast: false,
+          dedupeKey: `cursor-account:${accountKey}:${key}:${occurrence}`,
+        });
+      }
+      await NodeTimersPromises.setImmediate();
+    }
+    if (removalsRemaining !== 0) throw new Error("Inconsistent account usage boundaries");
+    return { accountKey, records, missing: false, error: null };
+  } catch {
+    return {
+      accountKey,
+      records: [],
+      missing: false,
+      error: "Cursor account usage could not be read.",
+    };
+  }
+}
diff --git a/apps/server/src/usage/opencodeUsageReader.ts b/apps/server/src/usage/opencodeUsageReader.ts
new file mode 100644
index 000000000000..45d6ef33a584
--- /dev/null
+++ b/apps/server/src/usage/opencodeUsageReader.ts
@@ -0,0 +1,188 @@
+// node:sqlite reads live OpenCode databases; Node fs walks legacy JSON history.
+// @effect-diagnostics nodeBuiltinImport:off
+import * as NodeFSP from "node:fs/promises";
+import * as NodePath from "node:path";
+import * as NodeSqlite from "node:sqlite";
+import * as NodeTimersPromises from "node:timers/promises";
+
+import { totalTokens, type UsageRecord } from "./usageTranscripts.ts";
+
+function object(value: unknown): Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
+}
+
+function tokens(value: unknown): number {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.trunc(value) : 0;
+}
+
+function text(value: unknown): string {
+  return typeof value === "string" ? value : "";
+}
+
+/** OpenCode stores uncached input and reasoning separately from input/output. */
+function parseOpenCodeMessage(
+  source: string,
+  fallback: {
+    readonly id?: string;
+    readonly sessionId?: string;
+    readonly timestampMs?: number;
+  } = {},
+): UsageRecord | null {
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(source);
+  } catch {
+    return null;
+  }
+  const message = object(parsed);
+  if (message.role !== undefined && message.role !== "assistant") return null;
+  const usage = object(message.tokens);
+  const cache = object(usage.cache);
+  const modelReference = object(message.model);
+  const model = text(modelReference.id) || text(modelReference.modelID) || text(message.modelID);
+  const timestampMs = object(message.time).created ?? fallback.timestampMs;
+  if (!model || typeof timestampMs !== "number" || !Number.isFinite(timestampMs)) return null;
+  const reasoningTokens = tokens(usage.reasoning);
+  const totals = {
+    uncachedInputTokens: tokens(usage.input),
+    cachedInputTokens: tokens(cache.read),
+    cacheCreationTokens: tokens(cache.write),
+    outputTokens: tokens(usage.output) + reasoningTokens,
+    reasoningTokens,
+  };
+  if (totalTokens(totals) === 0) return null;
+  const id = fallback.id || text(message.id);
+  const cost = message.cost;
+  return {
+    provider: "opencode",
+    timestampMs,
+    model,
+    sessionId: fallback.sessionId || text(message.sessionID),
+    totals,
+    // OpenCode writes zero for models without a known rate, including paid
+    // subscription models. Let the shared price table estimate those records.
+    reportedCostUsd: typeof cost === "number" && Number.isFinite(cost) && cost > 0 ? cost : null,
+    fast: false,
+    dedupeKey: id ? `opencode:${id}` : null,
+  };
+}
+
+export interface OpenCodeUsageReadResult {
+  readonly files: readonly { readonly path: string; readonly records: readonly UsageRecord[] }[];
+  readonly missing: boolean;
+  readonly error: boolean;
+}
+
+/** Reads current SQLite and pre-migration JSON stores without modifying either. */
+export async function readOpenCodeUsage(
+  root: string,
+  sinceMs: number,
+): Promise<OpenCodeUsageReadResult> {
+  const files: { path: string; records: UsageRecord[] }[] = [];
+  const seen = new Set<string>();
+  let found = false;
+  let error = false;
+  const append = (records: UsageRecord[], record: UsageRecord | null) => {
+    if (record === null || record.timestampMs < sinceMs) return;
+    if (record.dedupeKey !== null) {
+      if (seen.has(record.dedupeKey)) return;
+      seen.add(record.dedupeKey);
+    }
+    records.push(record);
+  };
+
+  let databases: string[] = [];
+  try {
+    databases = (await NodeFSP.readdir(root, { withFileTypes: true }))
+      .filter((entry) => entry.isFile() && /^opencode(?:-[a-zA-Z0-9_-]+)?\.db$/.test(entry.name))
+      .map((entry) => entry.name)
+      .sort((a, b) => (a === "opencode.db" ? -1 : b === "opencode.db" ? 1 : a.localeCompare(b)));
+  } catch (cause) {
+    if (object(cause).code !== "ENOENT") error = true;
+  }
+  for (const name of databases) {
+    found = true;
+    const file = { path: NodePath.join(root, name), records: [] as UsageRecord[] };
+    files.push(file);
+    let database: NodeSqlite.DatabaseSync | undefined;
+    try {
+      database = new NodeSqlite.DatabaseSync(NodePath.join(root, name), { readOnly: true });
+      // A busy live provider should fail this source promptly rather than
+      // stalling the server while SQLite waits for its writer.
+      database.exec("PRAGMA busy_timeout = 100");
+      const tables = new Set(
+        database
+          .prepare("SELECT name FROM sqlite_master WHERE type = 'table'")
+          .all()
+          .map((row) => row.name),
+      );
+      if (!tables.has("message") && !tables.has("session_message")) error = true;
+      for (const table of ["message", "session_message"] as const) {
+        if (!tables.has(table)) continue;
+        const columns = new Set(
+          database
+            .prepare(`PRAGMA table_info(${table})`)
+            .all()
+            .map((row) => row.name),
+        );
+        const timestamp = columns.has("time_created") ? "time_created" : "NULL";
+        const predicates = table === "session_message" ? ["type = 'assistant'"] : [];
+        if (timestamp !== "NULL") predicates.push("time_created >= ?");
+        const where = predicates.length > 0 ? ` WHERE ${predicates.join(" AND ")}` : "";
+        const statement = database.prepare(
+          `SELECT id, session_id, data, ${timestamp} AS created FROM ${table}${where}`,
+        );
+        let count = 0;
+        for (const row of statement.iterate(...(timestamp === "NULL" ? [] : [sinceMs]))) {
+          append(
+            file.records,
+            parseOpenCodeMessage(text(row.data), {
+              id: text(row.id),
+              sessionId: text(row.session_id),
+              ...(typeof row.created === "number" ? { timestampMs: row.created } : {}),
+            }),
+          );
+          if (++count % 256 === 0) await NodeTimersPromises.setImmediate();
+        }
+      }
+    } catch {
+      error = true;
+    } finally {
+      database?.close();
+    }
+  }
+
+  // Do not follow symlinks, including cycles. Database records win over their
+  // old JSON copies when OpenCode has migrated a store in place.
+  const directories = [NodePath.join(root, "storage", "message")];
+  while (directories.length > 0) {
+    const directory = directories.pop()!;
+    try {
+      for (const entry of await NodeFSP.readdir(directory, { withFileTypes: true })) {
+        const path = NodePath.join(directory, entry.name);
+        if (entry.isDirectory()) {
+          directories.push(path);
+        } else if (entry.isFile() && entry.name.endsWith(".json")) {
+          found = true;
+          const id = entry.name.slice(0, -5);
+          if (seen.has(`opencode:${id}`)) continue;
+          const file = { path, records: [] as UsageRecord[] };
+          files.push(file);
+          try {
+            append(
+              file.records,
+              parseOpenCodeMessage(await NodeFSP.readFile(path, "utf8"), { id }),
+            );
+          } catch (cause) {
+            if (object(cause).code !== "ENOENT") error = true;
+          }
+        }
+      }
+    } catch (cause) {
+      if (object(cause).code !== "ENOENT") error = true;
+    }
+  }
+  return { files, missing: !found && !error, error };
+}
diff --git a/apps/server/src/usage/usageAggregation.test.ts b/apps/server/src/usage/usageAggregation.test.ts
index 8da4e920ac06..75435de08ff7 100644
--- a/apps/server/src/usage/usageAggregation.test.ts
+++ b/apps/server/src/usage/usageAggregation.test.ts
@@ -12,6 +12,7 @@ const rates: RateTable = new Map([
       outputCostPerToken: 5e-5,
       cacheReadCostPerToken: 1e-6,
       cacheCreationCostPerToken: 1.25e-5,
+      fastMultiplier: 1,
     },
   ],
 ]);
@@ -31,6 +32,7 @@ function record(overrides: Partial<UsageRecord> = {}): UsageRecord {
       reasoningTokens: 0,
     },
     reportedCostUsd: null,
+    fast: false,
     dedupeKey: null,
     ...overrides,
   };
diff --git a/apps/server/src/usage/usageAggregation.ts b/apps/server/src/usage/usageAggregation.ts
index 2ad3893ad4e6..92abfef74108 100644
--- a/apps/server/src/usage/usageAggregation.ts
+++ b/apps/server/src/usage/usageAggregation.ts
@@ -112,7 +112,7 @@ export class UsageAggregator {
    * can derive per-window facts (distinct sessions, for one) from the records
    * that landed rather than everything the mtime prefilter happened to admit.
    */
-  add(record: UsageRecord): boolean {
+  add(record: UsageRecord, sourcePath?: string): boolean {
     if (record.dedupeKey !== null) {
       if (this.#seen.has(record.dedupeKey)) {
         this.#duplicatesDropped += 1;
@@ -146,7 +146,7 @@ export class UsageAggregator {
             this.#hourlyWindow.sinceTimeMs +
               Math.floor((record.timestampMs - this.#hourlyWindow.sinceTimeMs) / HOUR_MS) * HOUR_MS,
           ).toISOString();
-    const key = `${day}\u0000${hourStart}\u0000${record.provider}\u0000${record.model}`;
+    const key = `${day}\u0000${hourStart}\u0000${record.provider}\u0000${record.model}\u0000${sourcePath ?? ""}`;
     let bucket = this.#buckets.get(key);
     if (bucket === undefined) {
       bucket = {
@@ -161,20 +161,13 @@ export class UsageAggregator {
       this.#buckets.set(key, bucket);
     }
 
-    const priced = priceUsage(
-      this.#options.rates,
-      record.model,
-      record.totals,
-      record.reportedCostUsd,
-      this.#options.priceOverrides,
-    );
+    const priced = priceUsage(this.#options.rates, record, this.#options.priceOverrides);
 
     bucket.totals = addTotals(bucket.totals, record.totals);
     bucket.costUsd += priced.costUsd;
     bucket.cacheSavingsUsd += cacheSavingsUsd(
       this.#options.rates,
-      record.model,
-      record.totals,
+      record,
       this.#options.priceOverrides,
     );
     bucket.records += 1;
@@ -187,12 +180,14 @@ export class UsageAggregator {
   finish(): AggregateResult {
     const buckets: UsageBucket[] = [];
     for (const [key, bucket] of this.#buckets) {
-      const [day = "", hourStart = "", provider = "", model = ""] = key.split("\u0000");
+      const [day = "", hourStart = "", provider = "", model = "", sourcePath = ""] =
+        key.split("\u0000");
       buckets.push({
         day: day as UsageDay,
         ...(hourStart === "" ? {} : { hourStart }),
         provider: provider as UsageBucket["provider"],
         model,
+        ...(sourcePath === "" ? {} : { sourcePath }),
         totals: bucket.totals,
         costUsd: bucket.costUsd,
         cacheSavingsUsd: bucket.cacheSavingsUsd,
diff --git a/apps/server/src/usage/usagePricing.test.ts b/apps/server/src/usage/usagePricing.test.ts
index 713d860999cb..db4f68c2cb42 100644
--- a/apps/server/src/usage/usagePricing.test.ts
+++ b/apps/server/src/usage/usagePricing.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "@effect/vitest";
 
+import { cursorRateModel } from "./cursorUsageReader.ts";
 import {
   cacheSavingsUsd,
   createOverrideRateTable,
@@ -22,6 +23,12 @@ describe("usage pricing", () => {
     outputTokens: 1_000_000,
     reasoningTokens: 500_000,
   };
+  const record = (model: string, reportedCostUsd: number | null = null, fast = false) => ({
+    model,
+    totals,
+    reportedCostUsd,
+    fast,
+  });
 
   it("uses custom token rates ahead of public and provider-reported costs", () => {
     const table = parseRateTable({ "example-model": rate(1) });
@@ -35,12 +42,32 @@ describe("usage pricing", () => {
     });
 
     for (const reportedCostUsd of [null, 99]) {
-      expect(priceUsage(table, "example-model", totals, reportedCostUsd, overrides)).toEqual({
+      expect(priceUsage(table, record("example-model", reportedCostUsd), overrides)).toEqual({
         costUsd: 13.5,
         costSource: "modelPriced",
       });
     }
-    expect(cacheSavingsUsd(table, "example-model", totals, overrides)).toBe(1.5);
+    expect(cacheSavingsUsd(table, record("example-model"), overrides)).toBe(1.5);
+  });
+
+  it("prices Cursor cache savings at the base model rate", () => {
+    const table = parseRateTable({
+      "claude-fable-5-1": rate(10e-6, 1e-6),
+      "xai/grok-4.7": rate(2e-6, 0.5e-6),
+      "openrouter/x-ai/grok-4.7": rate(3e-6, 0.5e-6),
+    });
+    const cursorRecord = (model: string) => ({
+      ...record(model, 0.25),
+      rateModel: cursorRateModel(model),
+    });
+
+    expect(cacheSavingsUsd(table, cursorRecord("claude-fable-5-1-thinking-high"))).toBeCloseTo(9);
+    expect(cacheSavingsUsd(table, cursorRecord("cursor-grok-4.7-high-fast"))).toBeCloseTo(1.5);
+    expect(cacheSavingsUsd(table, cursorRecord("default"))).toBe(0);
+    expect(priceUsage(table, cursorRecord("grok-4.7-xhigh-fast"))).toEqual({
+      costUsd: 0.25,
+      costSource: "providerReported",
+    });
   });
 
   it("prices unknown models offline and uses input prices for omitted cache rates", () => {
@@ -49,11 +76,11 @@ describe("usage pricing", () => {
       "example-model": { inputCostPerMillionTokens: 2, outputCostPerMillionTokens: 8 },
     });
 
-    expect(priceUsage(table, "example-model", totals, null, overrides)).toEqual({
+    expect(priceUsage(table, record("example-model"), overrides)).toEqual({
       costUsd: 14,
       costSource: "modelPriced",
     });
-    expect(cacheSavingsUsd(table, "example-model", totals, overrides)).toBe(0);
+    expect(cacheSavingsUsd(table, record("example-model"), overrides)).toBe(0);
   });
 
   it("preserves explicit zero rates and matches only the exact trimmed model ID", () => {
@@ -64,7 +91,7 @@ describe("usage pricing", () => {
         outputCostPerMillionTokens: 0,
       },
     });
-    expect(priceUsage(table, " vendor/example-model[1m] ", totals, 99, overrides)).toEqual({
+    expect(priceUsage(table, record(" vendor/example-model[1m] ", 99), overrides)).toEqual({
       costUsd: 0,
       costSource: "modelPriced",
     });
@@ -74,14 +101,36 @@ describe("usage pricing", () => {
       "vendor/Example-model[1m]",
       "other/example-model[1m]",
     ]) {
-      expect(priceUsage(table, model, totals, null, overrides).costSource).toBe("unpriced");
-      expect(priceUsage(table, model, totals, 99, overrides)).toEqual({
+      expect(priceUsage(table, record(model), overrides).costSource).toBe("unpriced");
+      expect(priceUsage(table, record(model, 99), overrides)).toEqual({
         costUsd: 99,
         costSource: "providerReported",
       });
     }
   });
 
+  it("prices fast-mode requests at the model's published fast multiple", () => {
+    const table = parseRateTable({
+      "claude-opus-5-5": { ...rate(4e-6, 2e-7), provider_specific_entry: { fast: 2, us: 1.1 } },
+      "claude-fable-5-1": { ...rate(1e-5, 2.5e-7), provider_specific_entry: { us: 1.1 } },
+    });
+    const overrides = createOverrideRateTable({
+      "claude-opus-5-5": { inputCostPerMillionTokens: 4, outputCostPerMillionTokens: 20 },
+    });
+    const cost = (model: string, fast: boolean, custom?: typeof overrides) =>
+      priceUsage(table, record(model, null, fast), custom).costUsd;
+
+    expect(cost("claude-opus-5-5", true)).toBeCloseTo(2 * cost("claude-opus-5-5", false));
+    expect(cacheSavingsUsd(table, record("claude-opus-5-5", null, true))).toBeCloseTo(
+      2 * cacheSavingsUsd(table, record("claude-opus-5-5")),
+    );
+    // No published fast tier, and custom prices, both stay at the standard rate.
+    expect(cost("claude-fable-5-1", true)).toBe(cost("claude-fable-5-1", false));
+    expect(cost("claude-opus-5-5", true, overrides)).toBe(
+      cost("claude-opus-5-5", false, overrides),
+    );
+  });
+
   it("keeps the canonical Fable rate separate from DeepInfra in either order", () => {
     const canonical = ["claude-fable-5", rate(1e-5, 1e-6)] as const;
     const deepInfra = ["deepinfra/anthropic/claude-fable-5", rate(1e-5)] as const;
diff --git a/apps/server/src/usage/usagePricing.ts b/apps/server/src/usage/usagePricing.ts
index 6c94be424827..78f6cf2c5cd9 100644
--- a/apps/server/src/usage/usagePricing.ts
+++ b/apps/server/src/usage/usagePricing.ts
@@ -7,11 +7,9 @@
  *
  * @module usagePricing
  */
-import type {
-  UsageCostSource,
-  UsageModelPriceOverride,
-  UsageTokenTotals,
-} from "@t3tools/contracts";
+import type { UsageCostSource, UsageModelPriceOverride } from "@t3tools/contracts";
+
+import type { UsageRecord } from "./usageTranscripts.ts";
 
 /**
  * The subset of a LiteLLM entry we price against. All values are USD per token.
@@ -26,11 +24,19 @@ export interface ModelRate {
   readonly outputCostPerToken: number;
   readonly cacheReadCostPerToken: number;
   readonly cacheCreationCostPerToken: number;
+  /**
+   * Multiple of the rates above billed for a fast-mode request, from LiteLLM's
+   * `provider_specific_entry.fast`. `1` when the model publishes no fast tier.
+   */
+  readonly fastMultiplier: number;
 }
 
 export type RateTable = ReadonlyMap<string, ModelRate>;
 
-/** Custom IDs keep their case, provider prefix, and variant suffix. */
+/**
+ * Custom IDs keep their case, provider prefix, and variant suffix. Custom rates
+ * apply as entered, fast-mode requests included.
+ */
 export function createOverrideRateTable(
   overrides: Readonly<Record<string, UsageModelPriceOverride>>,
 ): RateTable {
@@ -44,6 +50,7 @@ export function createOverrideRateTable(
           (prices.cacheReadCostPerMillionTokens ?? prices.inputCostPerMillionTokens) / 1_000_000,
         cacheCreationCostPerToken:
           (prices.cacheWriteCostPerMillionTokens ?? prices.inputCostPerMillionTokens) / 1_000_000,
+        fastMultiplier: 1,
       },
     ]),
   );
@@ -55,12 +62,21 @@ interface LiteLlmEntry {
   readonly output_cost_per_token?: unknown;
   readonly cache_read_input_token_cost?: unknown;
   readonly cache_creation_input_token_cost?: unknown;
+  readonly provider_specific_entry?: unknown;
 }
 
 function finiteNumber(value: unknown): number | null {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
 
+/** Reads `provider_specific_entry.fast`, e.g. `2` for Claude Opus 5.5. */
+function fastMultiplier(entry: LiteLlmEntry): number {
+  const specific = entry.provider_specific_entry;
+  if (typeof specific !== "object" || specific === null) return 1;
+  const fast = finiteNumber((specific as Record<string, unknown>)["fast"]);
+  return fast !== null && fast > 0 ? fast : 1;
+}
+
 /**
  * Projects the LiteLLM document into a rate table.
  *
@@ -92,6 +108,7 @@ export function parseRateTable(document: unknown): RateTable {
       // input rather than as free.
       cacheReadCostPerToken: finiteNumber(entry.cache_read_input_token_cost) ?? input,
       cacheCreationCostPerToken: finiteNumber(entry.cache_creation_input_token_cost) ?? input,
+      fastMultiplier: fastMultiplier(entry),
     });
   }
 
@@ -119,7 +136,8 @@ function sameRate(a: ModelRate, b: ModelRate): boolean {
     a.inputCostPerToken === b.inputCostPerToken &&
     a.outputCostPerToken === b.outputCostPerToken &&
     a.cacheReadCostPerToken === b.cacheReadCostPerToken &&
-    a.cacheCreationCostPerToken === b.cacheCreationCostPerToken
+    a.cacheCreationCostPerToken === b.cacheCreationCostPerToken &&
+    a.fastMultiplier === b.fastMultiplier
   );
 }
 
@@ -165,39 +183,47 @@ export function lookupRate(table: RateTable, model: string): ModelRate | null {
   return table.get(key) ?? null;
 }
 
+/** The parts of a transcript record that decide its price. */
+export type PricedRecord = Pick<
+  UsageRecord,
+  "model" | "rateModel" | "totals" | "fast" | "reportedCostUsd"
+>;
+
 export interface PricedUsage {
   readonly costUsd: number;
   readonly costSource: UsageCostSource;
 }
 
 /**
- * Prices a bucket's tokens.
+ * Prices one record's tokens.
  *
  * `reasoningTokens` is intentionally not charged separately: it is already
  * counted inside `outputTokens`.
  */
 export function priceUsage(
   table: RateTable,
-  model: string,
-  totals: UsageTokenTotals,
-  reportedCostUsd: number | null,
+  record: PricedRecord,
   overrides?: RateTable,
 ): PricedUsage {
+  const { model, totals, reportedCostUsd } = record;
   const override = overrides?.get(model.trim());
   if (override === undefined && reportedCostUsd !== null && Number.isFinite(reportedCostUsd)) {
     return { costUsd: reportedCostUsd, costSource: "providerReported" };
   }
 
-  const rate = override ?? lookupRate(table, model);
+  const rate = override ?? lookupRate(table, record.rateModel ?? model);
   if (rate === null) return { costUsd: 0, costSource: "unpriced" };
 
-  const costUsd =
+  const standardCostUsd =
     totals.uncachedInputTokens * rate.inputCostPerToken +
     totals.cachedInputTokens * rate.cacheReadCostPerToken +
     totals.cacheCreationTokens * rate.cacheCreationCostPerToken +
     totals.outputTokens * rate.outputCostPerToken;
 
-  return { costUsd, costSource: "modelPriced" };
+  return {
+    costUsd: standardCostUsd * (record.fast ? rate.fastMultiplier : 1),
+    costSource: "modelPriced",
+  };
 }
 
 /**
@@ -206,11 +232,15 @@ export function priceUsage(
  */
 export function cacheSavingsUsd(
   table: RateTable,
-  model: string,
-  totals: UsageTokenTotals,
+  record: PricedRecord,
   overrides?: RateTable,
 ): number {
-  const rate = overrides?.get(model.trim()) ?? lookupRate(table, model);
+  const rate =
+    overrides?.get(record.model.trim()) ?? lookupRate(table, record.rateModel ?? record.model);
   if (rate === null) return 0;
-  return totals.cachedInputTokens * (rate.inputCostPerToken - rate.cacheReadCostPerToken);
+  return (
+    record.totals.cachedInputTokens *
+    (rate.inputCostPerToken - rate.cacheReadCostPerToken) *
+    (record.fast ? rate.fastMultiplier : 1)
+  );
 }
diff --git a/apps/server/src/usage/usageScanCache.test.ts b/apps/server/src/usage/usageScanCache.test.ts
index cc1bdbcc1626..6455b1eb7770 100644
--- a/apps/server/src/usage/usageScanCache.test.ts
+++ b/apps/server/src/usage/usageScanCache.test.ts
@@ -24,6 +24,7 @@ function record(overrides: Partial<UsageRecord> = {}): UsageRecord {
       reasoningTokens: 0,
     },
     reportedCostUsd: null,
+    fast: false,
     dedupeKey: "msg_1:",
     ...overrides,
   };
@@ -57,7 +58,11 @@ function cacheWith(entries: readonly [string, number, readonly UsageRecord[]][])
 describe("scan cache round trip", () => {
   it("restores records unchanged", () => {
     const original = cacheWith([
-      ["/a.jsonl", 100, [record(), record({ dedupeKey: "msg_2:", model: "claude-opus-5" })]],
+      [
+        "/a.jsonl",
+        100,
+        [record(), record({ dedupeKey: "msg_2:", model: "claude-opus-5-5", fast: true })],
+      ],
       ["/b.jsonl", 200, [record({ sessionId: "session-b", reportedCostUsd: 1.5 })]],
     ]);
     original.set("/grok.jsonl", {
@@ -123,9 +128,20 @@ describe("scan cache round trip", () => {
     expect(decodeScanCache(JSON.parse(JSON.stringify(poisoned))).has("/a.jsonl")).toBe(false);
   });
 
+  it("drops an entry whose fast flag is not 0 or 1", () => {
+    const encoded = encodeScanCache(cacheWith([["/a.jsonl", 100, [record({ fast: true })]]]));
+    const row = encoded.files["/a.jsonl"]!.r[0]!;
+    const poisoned = {
+      ...encoded,
+      files: { "/a.jsonl": { ...encoded.files["/a.jsonl"]!, r: [[...row.slice(0, 10), true]] } },
+    };
+
+    expect(decodeScanCache(JSON.parse(JSON.stringify(poisoned))).has("/a.jsonl")).toBe(false);
+  });
+
   it("rejects a document from the previous cache version", () => {
     const encoded = encodeScanCache(cacheWith([["/a.jsonl", 100, [record()]]]));
-    const previous = { ...encoded, version: 2 };
+    const previous = { ...encoded, version: 3 };
 
     expect(decodeScanCache(JSON.parse(JSON.stringify(previous))).size).toBe(0);
   });
diff --git a/apps/server/src/usage/usageScanCache.ts b/apps/server/src/usage/usageScanCache.ts
index 71ef25051eb6..79cca5cff8e2 100644
--- a/apps/server/src/usage/usageScanCache.ts
+++ b/apps/server/src/usage/usageScanCache.ts
@@ -23,7 +23,8 @@ import type { CodexScanState, UsageRecord } from "./usageTranscripts.ts";
 // entries would keep serving double-counted records forever.
 // v3: entries carry the parse position and reducer state so a grown file
 // re-parses only its appended bytes instead of starting over.
-const USAGE_SCAN_CACHE_VERSION = 3 as const;
+// v4: records carry Claude fast mode, which v3 rows never captured.
+const USAGE_SCAN_CACHE_VERSION = 4 as const;
 
 export interface CachedFile {
   readonly size: number;
@@ -58,6 +59,7 @@ type SerializedRecord = readonly [
   reasoningTokens: number,
   dedupeKey: string | null,
   reportedCostUsd: number | null,
+  fast: 0 | 1,
 ];
 
 interface SerializedFile {
@@ -109,6 +111,7 @@ export function encodeScanCache(cache: ScanCache): SerializedCache {
     record.totals.reasoningTokens,
     record.dedupeKey,
     record.reportedCostUsd,
+    record.fast ? 1 : 0,
   ];
 
   const files: Record<string, SerializedFile> = {};
@@ -165,7 +168,7 @@ export function decodeScanCache(document: unknown): ScanCache {
   ): UsageRecord[] | null => {
     const records: UsageRecord[] = [];
     for (const row of rows) {
-      if (!isRecordArray(row) || row.length < 10) return null;
+      if (!isRecordArray(row) || row.length < 11) return null;
       const [
         timestampMs,
         modelIndex,
@@ -177,6 +180,7 @@ export function decodeScanCache(document: unknown): ScanCache {
         reasoning,
         dedupeKey,
         reportedCostUsd,
+        fast,
       ] = row as SerializedRecord;
 
       const model = typeof modelIndex === "number" ? models[modelIndex] : undefined;
@@ -188,7 +192,8 @@ export function decodeScanCache(document: unknown): ScanCache {
         !Number.isFinite(cached) ||
         !Number.isFinite(cacheCreation) ||
         !Number.isFinite(output) ||
-        !Number.isFinite(reasoning)
+        !Number.isFinite(reasoning) ||
+        (fast !== 0 && fast !== 1)
       ) {
         return null;
       }
@@ -206,6 +211,7 @@ export function decodeScanCache(document: unknown): ScanCache {
           reasoningTokens: reasoning,
         },
         reportedCostUsd: typeof reportedCostUsd === "number" ? reportedCostUsd : null,
+        fast: fast === 1,
         dedupeKey: typeof dedupeKey === "string" ? dedupeKey : null,
       });
     }
diff --git a/apps/server/src/usage/usageTranscriptReader.test.ts b/apps/server/src/usage/usageTranscriptReader.test.ts
index 5feb68b2ff58..6c95a36df19b 100644
--- a/apps/server/src/usage/usageTranscriptReader.test.ts
+++ b/apps/server/src/usage/usageTranscriptReader.test.ts
@@ -4,13 +4,40 @@
 import * as NodeFSP from "node:fs/promises";
 import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
+import * as NodeSqlite from "node:sqlite";
 
 import { afterEach, assert, beforeEach, describe, it } from "@effect/vitest";
 
 import { readTranscriptRecords } from "./usageTranscriptReader.ts";
+import { readOpenCodeUsage } from "./opencodeUsageReader.ts";
+import { readCursorAccountUsage } from "./cursorUsageReader.ts";
+import { readAntigravityUsage } from "./antigravityUsageReader.ts";
 
 let dir: string;
 
+function protoNumber(field: number, value: number): number[] {
+  const varint = (number: number) => {
+    const bytes: number[] = [];
+    do {
+      const byte = number % 128;
+      number = Math.floor(number / 128);
+      bytes.push(byte + (number > 0 ? 128 : 0));
+    } while (number > 0);
+    return bytes;
+  };
+  return [...varint(field * 8), ...varint(value)];
+}
+
+function protoBytes(field: number, bytes: readonly number[]): number[] {
+  const encoded = protoNumber(field, bytes.length);
+  encoded[0] = encoded[0]! + 2;
+  return [...encoded, ...bytes];
+}
+
+function protoText(field: number, value: string): number[] {
+  return protoBytes(field, [...Buffer.from(value)]);
+}
+
 beforeEach(async () => {
   dir = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "usage-reader-test-"));
 });
@@ -208,3 +235,530 @@ describe("readTranscriptRecords resume", () => {
     assert.isNull(await readTranscriptRecords(NodePath.join(dir, "missing.jsonl"), "claude"));
   });
 });
+
+describe("SQLite usage readers", () => {
+  it("reads Cursor account history with the default macOS Keychain login", async () => {
+    const accessToken = `header.${Buffer.from(JSON.stringify({ sub: "auth|demo" })).toString("base64url")}.signature`;
+    let keychainReads = 0;
+    const result = await readCursorAccountUsage(
+      { kind: "keychain" },
+      0,
+      1781000000000,
+      async (_url, init) => {
+        assert.include(new Headers(init.headers).get("cookie") ?? "", "demo%3A%3A");
+        return Response.json({ totalUsageEventsCount: 0, usageEventsDisplay: [] });
+      },
+      async () => {
+        keychainReads++;
+        return accessToken;
+      },
+    );
+    assert.strictEqual(keychainReads, 1);
+    assert.isNull(result.error);
+    assert.isFalse(result.missing);
+    assert.isNotNull(result.accountKey);
+  });
+
+  it("reads paginated Cursor account history including headless calls with separate cache tokens", async () => {
+    const authPath = NodePath.join(dir, "auth.json");
+    const accessToken = `header.${Buffer.from(JSON.stringify({ sub: "auth|demo", exp: 4102444800 })).toString("base64url")}.signature`;
+    await NodeFSP.writeFile(authPath, JSON.stringify({ accessToken }));
+    const pages: number[] = [];
+    const signals: AbortSignal[] = [];
+    const request = async (url: string, init: RequestInit) => {
+      assert.strictEqual(String(url), "https://cursor.com/api/dashboard/get-filtered-usage-events");
+      assert.strictEqual(init?.redirect, "error");
+      const headers = new Headers(init?.headers);
+      assert.strictEqual(headers.get("origin"), "https://cursor.com");
+      assert.include(headers.get("cookie") ?? "", "WorkosCursorSessionToken=demo%3A%3A");
+      const body = JSON.parse(String(init?.body));
+      pages.push(body.page);
+      if (init.signal) signals.push(init.signal);
+      return Response.json({
+        totalUsageEventsCount: 1001,
+        usageEventsDisplay: Array.from({ length: body.page === 1 ? 1000 : 1 }, (_, index) => ({
+          timestamp: String(1780000000000 + ((body.page - 1) * 1000 + index) * 1000),
+          model: "claude-sonnet-4-5",
+          conversationId: `conversation-${body.page}`,
+          isHeadless: body.page === 2,
+          chargedCents: 0,
+          tokenUsage: {
+            inputTokens: 10,
+            outputTokens: 5,
+            cacheReadTokens: 30,
+            cacheWriteTokens: 2,
+            totalCents: 25,
+          },
+        })),
+      });
+    };
+    const result = await readCursorAccountUsage(authPath, 0, 1781000000000, request);
+    assert.isNull(result.error);
+    assert.deepStrictEqual(pages, [1, 2]);
+    assert.lengthOf(signals, 2);
+    assert.notStrictEqual(signals[0], signals[1]);
+    assert.strictEqual(result.records.length, 1001);
+    assert.strictEqual(result.records.at(-1)?.sessionId, "conversation-2");
+    assert.deepStrictEqual(result.records[0]?.totals, {
+      uncachedInputTokens: 10,
+      cachedInputTokens: 30,
+      cacheCreationTokens: 2,
+      outputTokens: 5,
+      reasoningTokens: 0,
+    });
+    assert.strictEqual(result.records[0]?.reportedCostUsd, 0.25);
+    assert.isFalse(result.accountKey?.includes("demo") ?? true);
+  });
+
+  it("reads Cursor account history beyond 100 pages", async () => {
+    const authPath = NodePath.join(dir, "auth.json");
+    const accessToken = `header.${Buffer.from(JSON.stringify({ sub: "auth|demo" })).toString("base64url")}.signature`;
+    await NodeFSP.writeFile(authPath, JSON.stringify({ accessToken }));
+    const fullPage = Array.from({ length: 1000 }, () => ({ tokenUsage: null }));
+    let requests = 0;
+    const result = await readCursorAccountUsage(authPath, 0, 1781000000000, async () => {
+      requests += 1;
+      return Response.json({
+        totalUsageEventsCount: 100_001,
+        usageEventsDisplay: requests <= 100 ? fullPage : [{ tokenUsage: null }],
+      });
+    });
+    assert.isNull(result.error);
+    assert.strictEqual(requests, 101);
+    assert.deepStrictEqual(result.records, []);
+  });
+
+  it("accepts confirmed empty Cursor usage but rejects error envelopes", async () => {
+    const authPath = NodePath.join(dir, "auth.json");
+    const accessToken = `header.${Buffer.from(JSON.stringify({ sub: "auth|demo" })).toString("base64url")}.signature`;
+    await NodeFSP.writeFile(authPath, JSON.stringify({ accessToken }));
+    for (const body of [
+      {},
+      { totalUsageEventsCount: 0 },
+      { totalUsageEventsCount: 0, usageEventsDisplay: [] },
+    ]) {
+      const result = await readCursorAccountUsage(authPath, 0, 1781000000000, async () =>
+        Response.json(body),
+      );
+      assert.isNull(result.error);
+      assert.deepStrictEqual(result.records, []);
+      assert.isFalse(result.missing);
+    }
+    for (const body of [
+      { error: "upstream error" },
+      { detail: "unknown error envelope" },
+      { totalUsageEventsCount: 0, error: "upstream error" },
+      null,
+      [],
+      "invalid",
+      0,
+    ]) {
+      const result = await readCursorAccountUsage(authPath, 0, 1781000000000, async () =>
+        Response.json(body),
+      );
+      assert.isNotNull(result.error);
+      assert.deepStrictEqual(result.records, []);
+    }
+  });
+
+  it("requires a terminal Cursor page after a full page reaches the reported count", async () => {
+    const authPath = NodePath.join(dir, "auth.json");
+    const accessToken = `header.${Buffer.from(JSON.stringify({ sub: "auth|demo" })).toString("base64url")}.signature`;
+    await NodeFSP.writeFile(authPath, JSON.stringify({ accessToken }));
+    let requests = 0;
+    const result = await readCursorAccountUsage(authPath, 0, 1781000000000, async () => {
+      requests++;
+      return Response.json(
+        requests === 1
+          ? {
+              totalUsageEventsCount: 1000,
+              usageEventsDisplay: Array.from({ length: 1000 }, (_, index) => ({
+                timestamp: String(1780000000000 + index),
+                model: "gpt-5",
+                tokenUsage: { inputTokens: 10, outputTokens: 5 },
+              })),
+            }
+          : { totalUsageEventsCount: 1000 },
+      );
+    });
+    assert.isNull(result.error);
+    assert.strictEqual(result.records.length, 1000);
+    assert.strictEqual(requests, 2);
+  });
+
+  it("removes only count-proven Cursor boundary copies and preserves identical billed events", async () => {
+    const authPath = NodePath.join(dir, "auth.json");
+    const accessToken = `header.${Buffer.from(JSON.stringify({ sub: "auth|demo" })).toString("base64url")}.signature`;
+    await NodeFSP.writeFile(authPath, JSON.stringify({ accessToken }));
+    const event = (index: number) => ({
+      timestamp: String(1780000000000 + index),
+      model: "gpt-5",
+      tokenUsage: { inputTokens: 10, outputTokens: 5, totalCents: 1 },
+    });
+    for (const total of [2000, 2001]) {
+      let requests = 0;
+      const result = await readCursorAccountUsage(authPath, 0, 1781000000000, async () => {
+        requests++;
+        return Response.json({
+          totalUsageEventsCount: total,
+          usageEventsDisplay:
+            requests === 1
+              ? Array.from({ length: 1000 }, (_, index) => event(index))
+              : requests === 2
+                ? Array.from({ length: 1000 }, (_, index) => event(999 + index))
+                : [event(1999)],
+        });
+      });
+      assert.isNull(result.error);
+      assert.strictEqual(result.records.length, total);
+      assert.strictEqual(requests, 3);
+      assert.strictEqual(result.records.at(-1)?.timestampMs, 1780000001999);
+      assert.strictEqual(
+        result.records.filter((record) => record.timestampMs === 1780000000999).length,
+        total === 2000 ? 1 : 2,
+      );
+      assert.strictEqual(new Set(result.records.map((record) => record.dedupeKey)).size, total);
+    }
+    let requests = 0;
+    const inconsistent = await readCursorAccountUsage(authPath, 0, 1781000000000, async () => {
+      requests++;
+      return Response.json({
+        totalUsageEventsCount: 1001,
+        usageEventsDisplay:
+          requests === 1
+            ? Array.from({ length: 1000 }, (_, index) => event(index))
+            : [event(500), event(1000)],
+      });
+    });
+    assert.isNotNull(inconsistent.error);
+    assert.deepStrictEqual(inconsistent.records, []);
+  });
+
+  it("does not present truncated Cursor account pages or authentication failures as complete history", async () => {
+    const authPath = NodePath.join(dir, "auth.json");
+    const accessToken = `header.${Buffer.from(JSON.stringify({ sub: "auth|demo", exp: 4102444800 })).toString("base64url")}.signature`;
+    await NodeFSP.writeFile(authPath, JSON.stringify({ accessToken }));
+    const truncated = await readCursorAccountUsage(authPath, 0, 1781000000000, async () =>
+      Response.json({ totalUsageEventsCount: 101, usageEventsDisplay: [] }),
+    );
+    assert.isNotNull(truncated.error);
+    assert.deepStrictEqual(truncated.records, []);
+    const denied = await readCursorAccountUsage(
+      authPath,
+      0,
+      1781000000000,
+      async () => new Response(accessToken, { status: 401 }),
+    );
+    assert.isNotNull(denied.error);
+    assert.isFalse(denied.error?.includes(accessToken) ?? true);
+    assert.deepStrictEqual(denied.records, []);
+    let requested = false;
+    const missing = await readCursorAccountUsage(
+      NodePath.join(dir, "missing.json"),
+      0,
+      1781000000000,
+      async () => {
+        requested = true;
+        return Response.json({});
+      },
+    );
+    assert.isTrue(missing.missing);
+    assert.isFalse(requested);
+  });
+
+  it("counts migrated OpenCode messages once and sees subsequent WAL writes", async () => {
+    const db = new NodeSqlite.DatabaseSync(NodePath.join(dir, "opencode.db"));
+    try {
+      db.exec(
+        "PRAGMA journal_mode = WAL; PRAGMA wal_autocheckpoint = 0; CREATE TABLE message (id TEXT, session_id TEXT, data TEXT)",
+      );
+      const message = {
+        id: "msg-1",
+        sessionID: "session-1",
+        role: "assistant",
+        modelID: "claude-sonnet-4-5",
+        time: { created: 1780000000000 },
+        cost: 0.25,
+        tokens: { input: 100, output: 20, reasoning: 5, cache: { read: 30, write: 10 } },
+      };
+      const insert = db.prepare("INSERT INTO message VALUES (?, ?, ?)");
+      insert.run(message.id, message.sessionID, JSON.stringify(message));
+      const legacy = NodePath.join(dir, "storage", "message", message.sessionID);
+      await NodeFSP.mkdir(legacy, { recursive: true });
+      await NodeFSP.writeFile(NodePath.join(legacy, "msg-1.json"), JSON.stringify(message));
+      const first = await readOpenCodeUsage(dir, 0);
+      assert.isFalse(first.error);
+      const records = first.files.flatMap((file) => file.records);
+      assert.strictEqual(records.length, 1);
+      assert.deepStrictEqual(records[0]?.totals, {
+        uncachedInputTokens: 100,
+        cachedInputTokens: 30,
+        cacheCreationTokens: 10,
+        outputTokens: 25,
+        reasoningTokens: 5,
+      });
+      assert.strictEqual(records[0]?.reportedCostUsd, 0.25);
+      insert.run(
+        "msg-2",
+        message.sessionID,
+        JSON.stringify({ ...message, id: "msg-2", time: { created: 1780000001000 } }),
+      );
+      const next = await readOpenCodeUsage(dir, 1780000001000);
+      assert.isFalse(next.error);
+      assert.deepStrictEqual(
+        next.files.flatMap((file) => file.records).map((record) => record.dedupeKey),
+        ["opencode:msg-2"],
+      );
+      assert.isAbove((await NodeFSP.stat(NodePath.join(dir, "opencode.db-wal"))).size, 0);
+    } finally {
+      db.close();
+    }
+  });
+
+  it("deduplicates Antigravity generation and step usage while preserving retry model and token buckets", async () => {
+    const db = new NodeSqlite.DatabaseSync(NodePath.join(dir, "session-1.db"));
+    const stamp = protoNumber(1, 1780000000);
+    const usage = [
+      ...protoNumber(2, 100),
+      ...protoNumber(3, 40),
+      ...protoNumber(4, 5),
+      ...protoNumber(5, 20),
+      ...protoNumber(9, 10),
+      ...protoText(11, "response-1"),
+    ];
+    const retry = [
+      ...protoNumber(1, 1026),
+      ...protoNumber(2, 12),
+      ...protoNumber(3, 3),
+      ...protoText(11, "retry-1"),
+    ];
+    const generation = protoBytes(1, [
+      ...protoBytes(4, usage),
+      ...protoText(19, "Gemini 3 Pro"),
+      ...protoBytes(9, protoBytes(4, stamp)),
+    ]);
+    const step = [
+      ...protoBytes(9, usage),
+      ...protoBytes(8, stamp),
+      ...protoBytes(28, protoBytes(2, retry)),
+    ];
+    try {
+      db.exec(
+        "CREATE TABLE gen_metadata (idx INTEGER, data BLOB); CREATE TABLE steps (idx INTEGER, metadata BLOB)",
+      );
+      db.prepare("INSERT INTO gen_metadata VALUES (?, ?)").run(0, new Uint8Array(generation));
+      db.prepare("INSERT INTO steps VALUES (?, ?)").run(0, new Uint8Array(step));
+    } finally {
+      db.close();
+    }
+    const result = await readAntigravityUsage(dir, 0);
+    assert.deepStrictEqual(result.errors, []);
+    const records = result.files.flatMap((file) => file.records);
+    assert.strictEqual(records.length, 2);
+    const main = records.find((record) => record.model === "gemini-3-pro");
+    assert.isDefined(main);
+    assert.strictEqual(main?.timestampMs, 1780000000000);
+    assert.strictEqual(main?.sessionId, "session-1");
+    assert.deepStrictEqual(main?.totals, {
+      uncachedInputTokens: 100,
+      cachedInputTokens: 20,
+      cacheCreationTokens: 5,
+      outputTokens: 40,
+      reasoningTokens: 10,
+    });
+    assert.strictEqual(
+      records.find((record) => record.model === "claude-opus-4-6")?.totals.uncachedInputTokens,
+      12,
+    );
+    assert.deepStrictEqual(
+      (await readAntigravityUsage(dir, 1780000000001)).files.flatMap((file) => file.records),
+      [],
+    );
+  });
+
+  it("uses the matching Antigravity generation model for each model-less step", async () => {
+    const db = new NodeSqlite.DatabaseSync(NodePath.join(dir, "model-switch.db"));
+    try {
+      db.exec(
+        "CREATE TABLE gen_metadata (idx INTEGER, data BLOB); CREATE TABLE steps (idx INTEGER, metadata BLOB)",
+      );
+      const generation = db.prepare("INSERT INTO gen_metadata VALUES (?, ?)");
+      const step = db.prepare("INSERT INTO steps VALUES (?, ?)");
+      for (const [idx, name] of ["Gemini 3 Pro", "Claude Opus 4.6"].entries()) {
+        generation.run(idx, new Uint8Array(protoBytes(1, protoText(19, name))));
+        step.run(idx, new Uint8Array(protoBytes(9, protoNumber(2, 10 + idx))));
+      }
+    } finally {
+      db.close();
+    }
+    const result = await readAntigravityUsage(dir, 0);
+    assert.deepStrictEqual(result.errors, []);
+    assert.deepStrictEqual(
+      result.files.flatMap((file) => file.records).map((record) => record.model),
+      ["gemini-3-pro", "claude-opus-4-6"],
+    );
+  });
+
+  it("merges Antigravity aliases that bridge previously separate step records", async () => {
+    const db = new NodeSqlite.DatabaseSync(NodePath.join(dir, "bridge.db"));
+    try {
+      db.exec(
+        "CREATE TABLE gen_metadata (idx INTEGER, data BLOB); CREATE TABLE steps (idx INTEGER, metadata BLOB)",
+      );
+      const step = db.prepare("INSERT INTO steps VALUES (?, ?)");
+      step.run(
+        0,
+        new Uint8Array(protoBytes(9, [...protoNumber(2, 100), ...protoText(11, "response")])),
+      );
+      step.run(
+        1,
+        new Uint8Array(protoBytes(9, [...protoNumber(3, 40), ...protoText(12, "provider")])),
+      );
+      db.prepare("INSERT INTO gen_metadata VALUES (?, ?)").run(
+        0,
+        new Uint8Array(
+          protoBytes(1, [
+            ...protoText(19, "Gemini 3 Pro"),
+            ...protoBytes(4, [
+              ...protoNumber(2, 50),
+              ...protoNumber(5, 20),
+              ...protoText(11, "response"),
+              ...protoText(12, "provider"),
+            ]),
+          ]),
+        ),
+      );
+    } finally {
+      db.close();
+    }
+    const result = await readAntigravityUsage(dir, 0);
+    assert.deepStrictEqual(result.errors, []);
+    const records = result.files.flatMap((file) => file.records);
+    assert.strictEqual(records.length, 1);
+    assert.deepStrictEqual(records[0]?.totals, {
+      uncachedInputTokens: 100,
+      cachedInputTokens: 20,
+      cacheCreationTokens: 0,
+      outputTokens: 40,
+      reasoningTokens: 0,
+    });
+  });
+
+  it("merges Antigravity provider and message aliases across configured roots while keeping original ownership", async () => {
+    const roots = [NodePath.join(dir, "first"), NodePath.join(dir, "second")];
+    for (const [index, root] of roots.entries()) {
+      await NodeFSP.mkdir(root);
+      const db = new NodeSqlite.DatabaseSync(NodePath.join(root, `session-${index}.db`));
+      try {
+        db.exec("CREATE TABLE steps (idx INTEGER, metadata BLOB)");
+        for (const identity of [7, 12]) {
+          const usage = [
+            ...protoNumber(1, 246),
+            ...protoNumber(2, index === 0 ? 100 : 150),
+            ...protoText(11, `response-${index}-${identity}`),
+            ...protoText(identity, `shared-${identity}`),
+          ];
+          db.prepare("INSERT INTO steps VALUES (?, ?)").run(
+            identity,
+            new Uint8Array(protoBytes(9, usage)),
+          );
+        }
+      } finally {
+        db.close();
+      }
+    }
+    const result = await readAntigravityUsage(roots, 0);
+    assert.deepStrictEqual(result.errors, []);
+    assert.strictEqual(result.files.length, 2);
+    assert.strictEqual(result.files[0]?.root, roots[0]);
+    assert.strictEqual(result.files[0]?.records.length, 2);
+    assert.strictEqual(result.files[1]?.records.length, 0);
+    assert.deepStrictEqual(
+      result.files[0]?.records.map((record) => record.totals.uncachedInputTokens),
+      [150, 150],
+    );
+    assert.isTrue(result.files[0]?.records.every((record) => record.sessionId === "session-0"));
+  });
+
+  it("upgrades Antigravity fallback timestamps before applying the date window", async () => {
+    for (const fallback of ["mtime", "trajectory"]) {
+      const path = NodePath.join(dir, `${fallback}.db`);
+      const db = new NodeSqlite.DatabaseSync(path);
+      try {
+        db.exec(
+          "CREATE TABLE gen_metadata (idx INTEGER, data BLOB); CREATE TABLE steps (idx INTEGER, metadata BLOB)",
+        );
+        if (fallback === "trajectory") {
+          db.exec("CREATE TABLE trajectory_metadata_blob (data BLOB)");
+          db.prepare("INSERT INTO trajectory_metadata_blob VALUES (?)").run(
+            new Uint8Array(protoBytes(2, protoNumber(1, 1780000200))),
+          );
+        }
+        for (const [index, seconds] of [1780000000, 1780000200].entries()) {
+          const usage = [...protoNumber(2, 10), ...protoText(11, `${fallback}-${index}`)];
+          db.prepare("INSERT INTO steps VALUES (?, ?)").run(
+            index,
+            new Uint8Array(protoBytes(9, usage)),
+          );
+          db.prepare("INSERT INTO gen_metadata VALUES (?, ?)").run(
+            index,
+            new Uint8Array(
+              protoBytes(1, [
+                ...protoBytes(4, usage),
+                ...protoBytes(9, protoBytes(4, protoNumber(1, seconds))),
+              ]),
+            ),
+          );
+        }
+      } finally {
+        db.close();
+      }
+      await NodeFSP.utimes(path, 1780000000, 1780000000);
+    }
+    const result = await readAntigravityUsage(dir, 1780000100000);
+    assert.deepStrictEqual(result.errors, []);
+    const records = result.files.flatMap((file) => file.records);
+    assert.strictEqual(records.length, 2);
+    assert.deepStrictEqual(
+      records.map((record) => record.timestampMs),
+      [1780000200000, 1780000200000],
+    );
+  });
+
+  it("reads Antigravity step-only stores and reports malformed databases", async () => {
+    const db = new NodeSqlite.DatabaseSync(NodePath.join(dir, "steps.db"));
+    try {
+      db.exec("CREATE TABLE steps (idx INTEGER, metadata BLOB)");
+      const usage = [...protoNumber(1, 246), ...protoNumber(2, 10), ...protoNumber(3, 5)];
+      db.prepare("INSERT INTO steps VALUES (?, ?)").run(
+        0,
+        new Uint8Array([...protoBytes(9, usage), ...protoBytes(8, protoNumber(1, 1780000000))]),
+      );
+    } finally {
+      db.close();
+    }
+    await NodeFSP.writeFile(NodePath.join(dir, "broken.db"), "not a sqlite database");
+    const result = await readAntigravityUsage(dir, 0);
+    assert.strictEqual(result.errors.length, 1);
+    assert.strictEqual(result.files.flatMap((file) => file.records)[0]?.model, "gemini-2.5-pro");
+    assert.strictEqual(result.files.flatMap((file) => file.records)[0]?.totals.outputTokens, 5);
+  });
+
+  it("ignores large values in unused Antigravity protobuf fields", async () => {
+    const db = new NodeSqlite.DatabaseSync(NodePath.join(dir, "large-varint.db"));
+    try {
+      db.exec("CREATE TABLE steps (idx INTEGER, metadata BLOB)");
+      const unusedField = [...protoNumber(99, 0).slice(0, -1), ...Array(9).fill(0xff), 0x01];
+      const usage = [...protoNumber(1, 246), ...protoNumber(2, 10), ...unusedField];
+      db.prepare("INSERT INTO steps VALUES (?, ?)").run(0, new Uint8Array(protoBytes(9, usage)));
+    } finally {
+      db.close();
+    }
+    const result = await readAntigravityUsage(dir, 0);
+    assert.deepStrictEqual(result.errors, []);
+    assert.strictEqual(
+      result.files.flatMap((file) => file.records)[0]?.totals.uncachedInputTokens,
+      10,
+    );
+  });
+});
diff --git a/apps/server/src/usage/usageTranscriptReader.ts b/apps/server/src/usage/usageTranscriptReader.ts
index 9e5ab6e0c9e0..faa686990777 100644
--- a/apps/server/src/usage/usageTranscriptReader.ts
+++ b/apps/server/src/usage/usageTranscriptReader.ts
@@ -17,15 +17,21 @@
  */
 import * as NodeFSP from "node:fs/promises";
 import * as NodePath from "node:path";
+import * as NodeStringDecoder from "node:string_decoder";
 
 import type { UsageProviderKind } from "@t3tools/contracts";
 
+import { createTranscriptJsonReader } from "../project/AgentSessionJson.ts";
+
 import {
   initialCodexScanState,
   mightCarryUsage,
   parseClaudeLine,
+  parseClaudeRecord,
   parseCodexLine,
+  parseCodexRecord,
   parseGrokLine,
+  parseGrokRecord,
   type CodexScanState,
   type UsageRecord,
 } from "./usageTranscripts.ts";
@@ -74,9 +80,62 @@ export interface TranscriptParseResult {
 
 /** 64 bytes of JSONL tail is ample to distinguish a replaced file. */
 export const GUARD_LENGTH = 64;
+// Native parsing is faster for common 1–4 MiB context/tool records. Above
+// 8 MiB, project usage without allocating the whole record. This switches
+// readers; it never discards a record because of its size.
+const STREAMING_THRESHOLD_BYTES = 8 * 1024 * 1024;
 const NEWLINE = 0x0a;
 const CARRIAGE_RETURN = 0x0d;
 
+type SelectedFields = { readonly [key: string]: true | SelectedFields };
+
+// Keep the fields consumed by usageTranscripts, including reducer state and
+// dedupe/cost metadata. A selected subtree (usage) keeps future token fields.
+const USAGE_FIELDS: Record<"claude" | "codex" | "grok", SelectedFields> = {
+  claude: {
+    type: true,
+    timestamp: true,
+    requestId: true,
+    sessionId: true,
+    costUSD: true,
+    message: { id: true, model: true, usage: true },
+  },
+  codex: {
+    type: true,
+    timestamp: true,
+    payload: {
+      type: true,
+      id: true,
+      session_id: true,
+      model: true,
+      forked_from_id: true,
+      source: { subagent: { thread_spawn: { parent_thread_id: true } } },
+      info: { last_token_usage: true },
+    },
+  },
+  grok: {
+    timestamp: true,
+    params: {
+      sessionId: true,
+      _meta: { agentTimestampMs: true },
+      update: { sessionUpdate: true, prompt_id: true, usage: true },
+    },
+  },
+};
+
+function selectUsageFields(provider: UsageProviderKind) {
+  const fields = USAGE_FIELDS[provider === "codex" || provider === "grok" ? provider : "claude"];
+  return (path: ReadonlyArray<string | number | null>): boolean => {
+    let selected: true | SelectedFields = fields;
+    for (const key of path) {
+      if (selected === true) return true;
+      if (typeof key !== "string" || !Object.hasOwn(selected, key)) return false;
+      selected = selected[key]!;
+    }
+    return true;
+  };
+}
+
 function fnv1a(buffer: Buffer): number {
   let hash = 0x811c9dc5;
   for (let index = 0; index < buffer.length; index += 1) {
@@ -194,7 +253,9 @@ export async function readTranscriptRecords(
   filePath: string,
   provider: UsageProviderKind,
   resumeFrom?: TranscriptParsePosition,
+  options?: { readonly streamingThresholdBytes?: number },
 ): Promise<TranscriptParseResult | null> {
+  const streamingThresholdBytes = options?.streamingThresholdBytes ?? STREAMING_THRESHOLD_BYTES;
   let handle: NodeFSP.FileHandle;
   try {
     handle = await NodeFSP.open(filePath, "r");
@@ -248,43 +309,87 @@ export async function readTranscriptRecords(
     };
 
     const records: UsageRecord[] = [];
-    // Buffer-level line splitting rather than `readline`, because resuming
-    // needs byte-exact offsets and decoded strings cannot provide them.
-    // Newline-free chunks are collected rather than concatenated as they
-    // arrive, so a single huge line costs one copy instead of one per chunk.
+    // Byte offsets remain independent of UTF-8 decoding. Only complete lines
+    // commit the resume point; an unfinished tail is replayed on the next scan.
     let resumeOffset = start;
+    let scanOffset = start;
     let pendingChunks: Buffer[] = [];
+    let pendingBytes = 0;
+    let streaming: ReturnType<typeof createTranscriptJsonReader> | undefined;
+    let decoder: NodeStringDecoder.StringDecoder | undefined;
+    const selectPath = selectUsageFields(provider);
+
+    const append = (segment: Buffer) => {
+      if (!streaming && pendingBytes + segment.length <= streamingThresholdBytes) {
+        if (segment.length > 0) pendingChunks.push(segment);
+        pendingBytes += segment.length;
+        return;
+      }
+      if (!streaming) {
+        // Usage has no import-history budget: retain all selected usage fields,
+        // regardless of the size of the surrounding unselected tool content.
+        streaming = createTranscriptJsonReader(() => {}, selectPath, { maxDepth: Infinity });
+        decoder = new NodeStringDecoder.StringDecoder("utf8");
+        for (const pending of pendingChunks) streaming.write(decoder.write(pending));
+        pendingChunks = [];
+        pendingBytes = 0;
+      }
+      streaming.write(decoder!.write(segment));
+    };
+    const finish = (state: CodexScanState, out: UsageRecord[]) => {
+      if (streaming) {
+        streaming.write(decoder!.end());
+        const projected = streaming.finish();
+        if (provider === "grok") {
+          out.push(...parseGrokRecord(projected));
+        } else {
+          const record =
+            provider === "codex"
+              ? parseCodexRecord(projected, state)
+              : parseClaudeRecord(projected);
+          if (record !== null) out.push(record);
+        }
+      } else if (pendingBytes > 0) {
+        const line =
+          pendingChunks.length === 1
+            ? pendingChunks[0]!
+            : Buffer.concat(pendingChunks, pendingBytes);
+        parseLine(toLineString(line), state, out);
+      }
+      pendingChunks = [];
+      pendingBytes = 0;
+      streaming = undefined;
+      decoder = undefined;
+    };
     const stream = handle.createReadStream({
       start,
       autoClose: false,
+      highWaterMark: 256 * 1024,
     }) as AsyncIterable<Buffer>;
     for await (const chunk of stream) {
-      if (!chunk.includes(NEWLINE)) {
-        pendingChunks.push(chunk);
-        continue;
-      }
-      const buffer: Buffer =
-        pendingChunks.length === 0 ? chunk : Buffer.concat([...pendingChunks, chunk]);
-      pendingChunks = [];
       let lineStart = 0;
-      for (;;) {
-        const newlineIndex = buffer.indexOf(NEWLINE, lineStart);
-        if (newlineIndex === -1) break;
-        parseLine(toLineString(buffer.subarray(lineStart, newlineIndex)), codexState, records);
+      while (lineStart < chunk.length) {
+        const newlineIndex = chunk.indexOf(NEWLINE, lineStart);
+        if (newlineIndex === -1) {
+          append(chunk.subarray(lineStart));
+          break;
+        }
+        // Most lines fit in the current chunk. Avoid buffering/streaming
+        // machinery on this hot path.
+        if (!streaming && pendingBytes === 0) {
+          parseLine(toLineString(chunk.subarray(lineStart, newlineIndex)), codexState, records);
+        } else {
+          append(chunk.subarray(lineStart, newlineIndex));
+          finish(codexState, records);
+        }
         lineStart = newlineIndex + 1;
+        resumeOffset = scanOffset + lineStart;
       }
-      resumeOffset += lineStart;
-      if (lineStart < buffer.length) pendingChunks.push(buffer.subarray(lineStart));
+      scanOffset += chunk.length;
     }
 
-    // A trailing segment without its newline is parsed for this result but not
-    // consumed: a writer may still be appending to it, and counting a half
-    // record now and its full form later would double count.
     const tailRecords: UsageRecord[] = [];
-    if (pendingChunks.length > 0) {
-      const pending = pendingChunks.length === 1 ? pendingChunks[0]! : Buffer.concat(pendingChunks);
-      if (pending.length > 0) parseLine(toLineString(pending), { ...codexState }, tailRecords);
-    }
+    finish({ ...codexState }, tailRecords);
 
     const guardLength = Math.min(GUARD_LENGTH, resumeOffset);
     let guardHash = 0;
diff --git a/apps/server/src/usage/usageTranscriptStreaming.test.ts b/apps/server/src/usage/usageTranscriptStreaming.test.ts
new file mode 100644
index 000000000000..2187fd4aa431
--- /dev/null
+++ b/apps/server/src/usage/usageTranscriptStreaming.test.ts
@@ -0,0 +1,323 @@
+// @effect-diagnostics nodeBuiltinImport:off - exercise the real byte reader.
+import * as NodeFSP from "node:fs/promises";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+
+import { afterEach, beforeEach, describe, expect, it } from "@effect/vitest";
+
+import {
+  readTranscriptRecords as readWithDefaultThreshold,
+  type TranscriptParsePosition,
+} from "./usageTranscriptReader.ts";
+
+// Exercise the same transition with compact fixtures. UsageService tests and
+// external 65/517 MiB fixtures also exercise the production threshold.
+const readTranscriptRecords = (
+  path: string,
+  provider: "claude" | "codex" | "grok",
+  position?: TranscriptParsePosition,
+) => readWithDefaultThreshold(path, provider, position, { streamingThresholdBytes: 256 * 1024 });
+
+let dir: string;
+beforeEach(async () => {
+  dir = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "usage-stream-"));
+});
+afterEach(async () => {
+  await NodeFSP.rm(dir, { recursive: true, force: true });
+});
+
+const timestamp = "2026-08-01T10:00:00Z";
+const content = '工具 output \\" usage token_count '.repeat(40_000);
+const claude = (id = "m1", output = 99) => ({
+  type: "assistant",
+  timestamp,
+  sessionId: "s1",
+  requestId: `r-${id}`,
+  costUSD: 0.25,
+  message: {
+    content: [{ type: "tool_use", input: { text: content } }],
+    id,
+    model: "claude-fable-5",
+    usage: {
+      input_tokens: 100,
+      output_tokens: output,
+      cache_read_input_tokens: 20,
+      cache_creation_input_tokens: 5,
+      speed: "fast",
+    },
+  },
+});
+const codex = [
+  { type: "session_meta", timestamp, payload: { id: "s1" } },
+  { type: "turn_context", timestamp, payload: { model: "gpt-5.6-sol" } },
+  {
+    type: "event_msg",
+    timestamp,
+    payload: {
+      type: "token_count",
+      info: {
+        last_token_usage: {
+          input_tokens: 100,
+          output_tokens: 99,
+          cached_input_tokens: 20,
+          cache_write_input_tokens: 5,
+          reasoning_output_tokens: 10,
+        },
+      },
+    },
+  },
+];
+const grok = {
+  timestamp: 1785578400,
+  params: {
+    sessionId: "s1",
+    _meta: { agentTimestampMs: 1785578400123 },
+    update: {
+      sessionUpdate: "turn_completed",
+      prompt_id: "p1",
+      usage: {
+        inputTokens: 100,
+        outputTokens: 99,
+        costUsdTicks: 2500000000,
+        modelUsage: {
+          "grok-4.5-build": {
+            inputTokens: 100,
+            outputTokens: 99,
+            cachedReadTokens: 20,
+            cacheCreationTokens: 5,
+            reasoningTokens: 10,
+          },
+        },
+      },
+    },
+  },
+};
+
+async function scan(
+  lines: readonly unknown[],
+  provider: "claude" | "codex" | "grok",
+  name = "history",
+) {
+  const path = NodePath.join(dir, `${name}.jsonl`);
+  await NodeFSP.writeFile(path, lines.map((line) => JSON.stringify(line)).join("\n") + "\n");
+  const result = await readTranscriptRecords(path, provider);
+  expect(result).not.toBeNull();
+  return result!;
+}
+
+describe("large usage records", () => {
+  it("keeps usage after large Claude tool input, including fast-mode cost and dedupe metadata", async () => {
+    const result = await scan([claude()], "claude");
+    expect(result.records).toEqual([
+      {
+        provider: "claude",
+        timestampMs: Date.parse(timestamp),
+        sessionId: "s1",
+        model: "claude-fable-5",
+        totals: {
+          uncachedInputTokens: 100,
+          outputTokens: 99,
+          cachedInputTokens: 20,
+          cacheCreationTokens: 5,
+          reasoningTokens: 0,
+        },
+        reportedCostUsd: 0.25,
+        fast: true,
+        dedupeKey: "m1:r-m1",
+      },
+    ]);
+  });
+
+  it.each(["claude", "codex", "grok"] as const)(
+    "matches ordinary %s records with large irrelevant fields in either order",
+    async (provider) => {
+      const small =
+        provider === "codex"
+          ? codex
+          : provider === "grok"
+            ? [grok]
+            : [{ ...claude(), message: { ...claude().message, content: [] } }];
+      const expected = await scan(small, provider, "small");
+      for (const first of [true, false]) {
+        const large = small.map((record) =>
+          first ? { padding: content, ...record } : { ...record, padding: content },
+        );
+        const actual = await scan(large, provider);
+        expect(actual.records).toEqual(expected.records);
+        expect(actual.position.codexState).toEqual(expected.position.codexState);
+      }
+    },
+  );
+
+  it("preserves Grok model allocation, precise timestamp and prompt identity", async () => {
+    const result = await scan([{ padding: content, ...grok }], "grok");
+    expect(result.records[0]).toMatchObject({
+      timestampMs: 1785578400123,
+      model: "grok-4.5-build",
+      sessionId: "s1",
+      totals: {
+        uncachedInputTokens: 75,
+        cachedInputTokens: 20,
+        cacheCreationTokens: 5,
+        outputTokens: 99,
+        reasoningTokens: 10,
+      },
+      dedupeKey: "s1:p1:grok-4.5-build",
+      reportedCostUsd: 0.25,
+    });
+  });
+
+  it("does not count usage-looking text or nested objects inside tool output", async () => {
+    const result = await scan(
+      [
+        { type: "user", padding: content, toolOutput: claude() },
+        { padding: content, message: { content: JSON.stringify(claude()) } },
+        { type: "assistant", timestamp, message: { model: "claude-fable-5", content: [claude()] } },
+      ],
+      "claude",
+    );
+    expect(result.records).toEqual([]);
+  });
+
+  it("replays partial UTF-8 and JSON tails, commits exact CRLF offsets, and replaces the tail once", async () => {
+    const path = NodePath.join(dir, "tail.jsonl");
+    const first = JSON.stringify(claude("first", 5)) + "\r\n";
+    const second = Buffer.from(JSON.stringify(claude("second", 7)));
+    const split = second.lastIndexOf(Buffer.from("工具")) + 1;
+    await NodeFSP.writeFile(path, Buffer.concat([Buffer.from(first), second.subarray(0, split)]));
+    const partial = await readTranscriptRecords(path, "claude");
+    expect(partial?.records.map((r) => r.totals.outputTokens)).toEqual([5]);
+    expect(partial?.tailRecords).toEqual([]);
+    expect(partial?.position.resumeOffset).toBe(Buffer.byteLength(first));
+    await NodeFSP.appendFile(path, second.subarray(split));
+    const complete = await readTranscriptRecords(path, "claude", partial!.position);
+    expect(complete?.resumed).toBe(true);
+    expect(complete?.records).toEqual([]);
+    expect(complete?.tailRecords.map((r) => r.totals.outputTokens)).toEqual([7]);
+    expect(complete?.position.resumeOffset).toBe(Buffer.byteLength(first));
+    await NodeFSP.appendFile(path, "\r\n" + JSON.stringify(claude("third", 11)) + "\n");
+    const appended = await readTranscriptRecords(path, "claude", complete!.position);
+    expect(appended?.records.map((r) => r.totals.outputTokens)).toEqual([7, 11]);
+    expect(appended?.tailRecords).toEqual([]);
+    expect(appended?.position.resumeOffset).toBe((await NodeFSP.stat(path)).size);
+    const full = await readTranscriptRecords(path, "claude");
+    expect([...partial!.records, ...appended!.records]).toEqual(full?.records);
+  });
+
+  it("preserves Codex model switches and duplicate suppression across streaming resumes", async () => {
+    const path = NodePath.join(dir, "history.jsonl");
+    const first = await scan(
+      codex.map((record) => ({ padding: content, ...record })),
+      "codex",
+    );
+    await NodeFSP.appendFile(
+      path,
+      [
+        { padding: content, ...codex[2] },
+        { type: "turn_context", payload: { padding: content, model: "gpt-6" } },
+        {
+          type: "event_msg",
+          timestamp,
+          payload: {
+            type: "token_count",
+            padding: content,
+            info: { last_token_usage: { input_tokens: 200, output_tokens: 101 } },
+          },
+        },
+      ]
+        .map((line) => JSON.stringify(line))
+        .join("\n") + "\n",
+    );
+    const result = await readTranscriptRecords(path, "codex", first.position);
+    expect(result?.resumed).toBe(true);
+    expect(result?.records).toHaveLength(1);
+    expect(result?.records[0]).toMatchObject({
+      model: "gpt-6",
+      sessionId: "s1",
+      totals: { outputTokens: 101 },
+    });
+    const full = await readTranscriptRecords(path, "codex");
+    expect([...first.records, ...result!.records]).toEqual(full?.records);
+  });
+
+  it.each(["forked_from_id", "source"])(
+    "preserves Codex fork-copy suppression from %s",
+    async (field) => {
+      const fork =
+        field === "source"
+          ? { source: { subagent: { thread_spawn: { parent_thread_id: "parent" } } } }
+          : { forked_from_id: "parent" };
+      const lines = [
+        { type: "session_meta", timestamp, payload: { padding: content, id: "child", ...fork } },
+        codex[1],
+        codex[2],
+        {
+          ...codex[2],
+          timestamp: "2026-08-01T10:00:05Z",
+          payload: {
+            type: "token_count",
+            info: { last_token_usage: { input_tokens: 100, output_tokens: 101 } },
+          },
+        },
+      ];
+      const result = await scan(lines, "codex");
+      expect(result.records).toHaveLength(1);
+      expect(result.records[0]).toMatchObject({
+        sessionId: "child",
+        totals: { outputTokens: 101 },
+      });
+    },
+  );
+
+  it("rejects malformed large lines without accepting partial usage or losing following lines", async () => {
+    const valid = JSON.stringify(claude());
+    const path = NodePath.join(dir, "broken.jsonl");
+    await NodeFSP.writeFile(
+      path,
+      [valid + " junk", valid.slice(0, -1), valid + valid, JSON.stringify(claude("good", 7))].join(
+        "\n",
+      ) + "\n",
+    );
+    const result = await readTranscriptRecords(path, "claude");
+    expect(result?.records.map((r) => r.totals.outputTokens)).toEqual([7]);
+  });
+
+  it("matches JSON.parse for reordered and escaped keys, duplicate fields, arrays and unknown key names", async () => {
+    const path = NodePath.join(dir, "odd.jsonl");
+    const small = JSON.stringify({ ...claude(), message: { ...claude().message, content: [] } });
+    const variants = [
+      small.replace('"message":', '"mess\\u0061ge":'),
+      small.replace('"costUSD":0.25', '"costUSD":5,"costUSD":0.25'),
+      small.replace('"type":"assistant"', '"type":"user","type":"assistant"'),
+      small.replace('"message":', '"__proto__":{"type":"user"},"message":'),
+      small.replace('"message":', '"message.usage":{"output_tokens":1234},"message":'),
+    ];
+    for (const line of variants) {
+      await NodeFSP.writeFile(path, line + "\n");
+      const expected = await readTranscriptRecords(path, "claude");
+      await NodeFSP.writeFile(
+        path,
+        '{"padding":' + JSON.stringify(content) + "," + line.slice(1) + "\n",
+      );
+      const actual = await readTranscriptRecords(path, "claude");
+      expect(actual?.records).toEqual(expected?.records);
+    }
+  });
+  it("reads usage after deeply nested discarded tool content", async () => {
+    const path = NodePath.join(dir, "deep.jsonl");
+    const record = JSON.stringify(claude());
+    const nested = "[".repeat(300) + "0" + "]".repeat(300);
+    await NodeFSP.writeFile(path, '{"toolOutput":' + nested + "," + record.slice(1) + "\n");
+    const result = await readTranscriptRecords(path, "claude");
+    expect(result?.records[0]?.totals.outputTokens).toBe(99);
+  });
+
+  it("keeps JSON number semantics for non-finite values without serializing them into null", async () => {
+    const path = NodePath.join(dir, "numbers.jsonl");
+    const record = JSON.stringify(claude()).replace('"costUSD":0.25', '"costUSD":1e400');
+    await NodeFSP.writeFile(path, record + "\n");
+    const result = await readTranscriptRecords(path, "claude");
+    expect(result?.records[0]?.reportedCostUsd).toBeNull();
+    expect(result?.records[0]?.totals.outputTokens).toBe(99);
+  });
+});
diff --git a/apps/server/src/usage/usageTranscripts.test.ts b/apps/server/src/usage/usageTranscripts.test.ts
index b09db613ed85..ace3b7d18cf7 100644
--- a/apps/server/src/usage/usageTranscripts.test.ts
+++ b/apps/server/src/usage/usageTranscripts.test.ts
@@ -15,6 +15,7 @@ function claudeLine(overrides: {
   contentType: string;
   model?: string;
   outputTokens?: number;
+  speed?: string;
 }): string {
   return JSON.stringify({
     type: "assistant",
@@ -31,6 +32,7 @@ function claudeLine(overrides: {
         cache_creation_input_tokens: 66818,
         cache_read_input_tokens: 1000,
         output_tokens: overrides.outputTokens ?? 286,
+        ...(overrides.speed === undefined ? {} : { speed: overrides.speed }),
       },
     },
   });
@@ -51,6 +53,15 @@ describe("parseClaudeLine", () => {
       reasoningTokens: 0,
     });
     expect(record?.dedupeKey).toBe("msg_1:");
+    expect(record?.fast).toBe(false);
+  });
+
+  it("marks fast-mode requests", () => {
+    const line = (speed: string) =>
+      parseClaudeLine(claudeLine({ messageId: "msg_1", contentType: "text", speed }));
+
+    expect(line("fast")?.fast).toBe(true);
+    expect(line("standard")?.fast).toBe(false);
   });
 
   it("gives every content block of one message the same dedupe key", () => {
diff --git a/apps/server/src/usage/usageTranscripts.ts b/apps/server/src/usage/usageTranscripts.ts
index 5d909379eb10..c3903ef47194 100644
--- a/apps/server/src/usage/usageTranscripts.ts
+++ b/apps/server/src/usage/usageTranscripts.ts
@@ -12,9 +12,19 @@ export interface UsageRecord {
   readonly provider: UsageProviderKind;
   readonly timestampMs: number;
   readonly model: string;
+  /**
+   * Rate-table key when the provider's display name carries tiers the table
+   * does not know, such as Cursor's `claude-opus-5-5-high`. Defaults to `model`.
+   */
+  readonly rateModel?: string;
   readonly sessionId: string;
   readonly totals: UsageTokenTotals;
   readonly reportedCostUsd: number | null;
+  /**
+   * Whether the request ran in fast mode, which bills at a model-specific
+   * multiple of the standard rate. Only Claude Code records this.
+   */
+  readonly fast: boolean;
   /**
    * Key for cross-file de-duplication, or `null` when the record is inherently
    * unique and needs no dedup.
@@ -103,6 +113,10 @@ export function parseClaudeLine(line: string): UsageRecord | null {
   } catch {
     return null;
   }
+  return parseClaudeRecord(parsed);
+}
+
+export function parseClaudeRecord(parsed: unknown): UsageRecord | null {
   if (typeof parsed !== "object" || parsed === null) return null;
 
   const record = parsed as Record<string, unknown>;
@@ -145,6 +159,7 @@ export function parseClaudeLine(line: string): UsageRecord | null {
       reasoningTokens: 0,
     },
     reportedCostUsd: typeof cost === "number" && Number.isFinite(cost) ? cost : null,
+    fast: usageRecord["speed"] === "fast",
     dedupeKey,
   };
 }
@@ -217,6 +232,10 @@ export function parseCodexLine(line: string, state: CodexScanState): UsageRecord
   } catch {
     return null;
   }
+  return parseCodexRecord(parsed, state);
+}
+
+export function parseCodexRecord(parsed: unknown, state: CodexScanState): UsageRecord | null {
   if (typeof parsed !== "object" || parsed === null) return null;
 
   const record = parsed as Record<string, unknown>;
@@ -304,6 +323,7 @@ export function parseCodexLine(line: string, state: CodexScanState): UsageRecord
     totals,
     // Codex does not report cost in the rollout.
     reportedCostUsd: null,
+    fast: false,
     // Events surviving the fork-copy suppression above are unique to this
     // rollout, so they need no global dedup.
     dedupeKey: null,
@@ -373,6 +393,10 @@ export function parseGrokLine(line: string): readonly UsageRecord[] {
   } catch {
     return [];
   }
+  return parseGrokRecord(parsed);
+}
+
+export function parseGrokRecord(parsed: unknown): readonly UsageRecord[] {
   if (typeof parsed !== "object" || parsed === null) return [];
 
   const record = parsed as Record<string, unknown>;
@@ -433,6 +457,7 @@ export function parseGrokLine(line: string): readonly UsageRecord[] {
         sessionId,
         totals: grokTotalsToUsage(topLevel),
         reportedCostUsd: grokCostTicksToUsd(topLevel.costUsdTicks),
+        fast: false,
         // No prompt id means we cannot tell two same-second updates apart.
         dedupeKey: promptId === null ? null : `${sessionId}:${promptId}:grok`,
       },
@@ -479,6 +504,7 @@ export function parseGrokLine(line: string): readonly UsageRecord[] {
       sessionId,
       totals,
       reportedCostUsd,
+      fast: false,
       dedupeKey: promptId === null ? null : `${sessionId}:${promptId}:${entry.model}`,
     });
   }
diff --git a/apps/server/src/vcs/GitVcsDriver.ts b/apps/server/src/vcs/GitVcsDriver.ts
index 247f2827c979..3cea8796f726 100644
--- a/apps/server/src/vcs/GitVcsDriver.ts
+++ b/apps/server/src/vcs/GitVcsDriver.ts
@@ -1101,7 +1101,7 @@ export const makeVcsDriverShape = Effect.fn("makeGitVcsDriverShape")(function* (
           /^warning: failed to remove \.\/: [^\n]+$/.test(cleaned.stderr.trim()) &&
           (yield* fileSystem.readDirectory(input.cwd).pipe(
             Effect.map((entries) => entries.length === 0),
-            Effect.catch(() => Effect.succeed(false)),
+            Effect.orElseSucceed(() => false),
           ));
         if (!emptiedWorkspace)
           return yield* new VcsProcessExitError({
diff --git a/apps/server/src/vcs/GitVcsDriverCore.test.ts b/apps/server/src/vcs/GitVcsDriverCore.test.ts
index 98dec86522de..85c4d1a59d1d 100644
--- a/apps/server/src/vcs/GitVcsDriverCore.test.ts
+++ b/apps/server/src/vcs/GitVcsDriverCore.test.ts
@@ -1449,6 +1449,89 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {
       }),
     );
 
+    for (const splitIndex of [false, true]) {
+      it.effect(`keeps the preceding second cached in review previews (split: ${splitIndex})`, () =>
+        Effect.gen(function* () {
+          const cwd = yield* makeTmpDir();
+          yield* initRepoWithCommit(cwd);
+          const driver = yield* GitVcsDriver.GitVcsDriver;
+          const fs = yield* FileSystem.FileSystem;
+          const path = yield* Path.Path;
+          yield* writeTextFile(cwd, ".gitattributes", "stable.txt filter=probe\n");
+          yield* writeTextFile(cwd, "stable.txt", "unchanged\n");
+          yield* writeTextFile(
+            cwd,
+            ".git/filter.cjs",
+            'require("node:fs").appendFileSync(".git/filter-runs", "read\\n"); process.stdin.pipe(process.stdout);',
+          );
+          yield* git(cwd, ["config", "filter.probe.clean", "node .git/filter.cjs"]);
+          yield* fs.utimes(path.join(cwd, "stable.txt"), 1_699_999_999.5, 1_699_999_999.5);
+          yield* git(cwd, ["add", "."]);
+          yield* git(cwd, ["commit", "-m", "cache stable file"]);
+          if (splitIndex) yield* git(cwd, ["update-index", "--split-index"]);
+          const indexPath = path.join(cwd, ".git", "index");
+          yield* fs.utimes(indexPath, 1_700_000_000, 1_700_000_000);
+          const originalIndex = yield* fs.readFile(indexPath);
+          const originalMtime = (yield* fs.stat(indexPath)).mtime;
+          yield* writeTextFile(cwd, ".git/filter-runs", "");
+          yield* writeTextFile(cwd, "untracked.txt", "new\n");
+          const preview = yield* driver.getReviewDiffPreview({ cwd });
+          assert.deepStrictEqual(
+            preview.sources.find((source) => source.kind === "working-tree")!.files,
+            [{ path: "untracked.txt", previousPath: null, additions: 1, deletions: 0 }],
+          );
+          assert.strictEqual(yield* fs.readFileString(path.join(cwd, ".git/filter-runs")), "");
+          assert.deepStrictEqual(yield* fs.readFile(indexPath), originalIndex);
+          assert.deepStrictEqual((yield* fs.stat(indexPath)).mtime, originalMtime);
+        }),
+      );
+    }
+
+    for (const [timestamp, splitIndex] of [
+      [1_700_000_000, false],
+      [1_700_000_000.9999, false],
+      [1_700_000_000, true],
+      [1_700_000_000.9999, true],
+    ] as const) {
+      it.effect(
+        `preserves same-size edits with a racy review index (${timestamp}, split: ${splitIndex})`,
+        () =>
+          Effect.gen(function* () {
+            const cwd = yield* makeTmpDir();
+            yield* initRepoWithCommit(cwd);
+            const driver = yield* GitVcsDriver.GitVcsDriver;
+            const fileSystem = yield* FileSystem.FileSystem;
+            const path = yield* Path.Path;
+            const filePath = path.join(cwd, "tracked.txt");
+            const indexPath = path.join(cwd, ".git", "index");
+            // Reproduce a same-timestamp edit without relying on filesystem clock resolution.
+            yield* git(cwd, ["config", "core.trustctime", "false"]);
+            yield* writeTextFile(cwd, "tracked.txt", "before\n");
+            yield* fileSystem.utimes(filePath, timestamp, timestamp);
+            yield* git(cwd, ["add", "tracked.txt"]);
+            yield* git(cwd, ["commit", "-m", "record racy file"]);
+            if (splitIndex) yield* git(cwd, ["update-index", "--split-index"]);
+            yield* fileSystem.utimes(indexPath, timestamp, timestamp);
+            const originalIndex = yield* fileSystem.readFile(indexPath);
+            const originalIndexMtime = (yield* fileSystem.stat(indexPath)).mtime;
+            yield* writeTextFile(cwd, "tracked.txt", "after!\n");
+            yield* fileSystem.utimes(filePath, timestamp, timestamp);
+            yield* writeTextFile(cwd, "untracked.txt", "new\n");
+
+            const preview = yield* driver.getReviewDiffPreview({ cwd });
+            const dirty = preview.sources.find((source) => source.kind === "working-tree")!;
+            assert.deepStrictEqual(dirty.files, [
+              { path: "tracked.txt", previousPath: null, additions: 1, deletions: 1 },
+              { path: "untracked.txt", previousPath: null, additions: 1, deletions: 0 },
+            ]);
+            assert.include(dirty.diff, "-before");
+            assert.include(dirty.diff, "+after!");
+            assert.deepStrictEqual(yield* fileSystem.readFile(indexPath), originalIndex);
+            assert.deepStrictEqual((yield* fileSystem.stat(indexPath)).mtime, originalIndexMtime);
+          }),
+      );
+    }
+
     it.effect("keeps complete stats for files beyond the combined patch limit", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
@@ -1835,6 +1918,35 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {
       }),
     );
 
+    it.effect("does not start Git auto-maintenance from background upstream fetches", () =>
+      Effect.gen(function* () {
+        const cwd = yield* makeTmpDir();
+        const remote = yield* makeTmpDir("git-vcs-driver-remote-");
+        const { initialBranch } = yield* initRepoWithCommit(cwd);
+        yield* git(remote, ["init", "--bare"]);
+        yield* git(cwd, ["remote", "add", "origin", remote]);
+        yield* git(cwd, ["push", "-u", "origin", initialBranch]);
+        yield* git(cwd, ["repack", "-d"]);
+        yield* writeTextFile(cwd, "second.txt", "second\n");
+        yield* git(cwd, ["add", "second.txt"]);
+        yield* git(cwd, ["commit", "-m", "second commit"]);
+        yield* git(cwd, ["push"]);
+        yield* git(cwd, ["repack", "-d"]);
+        // Two packs make `git gc --auto` due, and without detaching it would run inside the fetch.
+        yield* git(cwd, ["config", "gc.autoPackLimit", "1"]);
+        yield* git(cwd, ["config", "gc.autoDetach", "false"]);
+        yield* git(cwd, ["config", "maintenance.autoDetach", "false"]);
+        const packCount = git(cwd, ["count-objects", "-v"]).pipe(
+          Effect.map((stdout) => stdout.match(/^packs: (\d+)$/m)?.[1]),
+        );
+        assert.equal(yield* packCount, "2");
+
+        yield* (yield* GitVcsDriver.GitVcsDriver).statusDetailsRemote(cwd);
+
+        assert.equal(yield* packCount, "2");
+      }),
+    );
+
     it.effect("uses origin HEAD for default-branch detection with a non-origin upstream", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.ts
index 9f91264ee623..0dd73af687f9 100644
--- a/apps/server/src/vcs/GitVcsDriverCore.ts
+++ b/apps/server/src/vcs/GitVcsDriverCore.ts
@@ -549,7 +549,9 @@ function trace2ChildKey(record: Record<string, unknown>): string | null {
 const Trace2Record = Schema.Record(Schema.String, Schema.Unknown);
 const decodeTrace2Record = decodeJsonResult(Trace2Record);
 
-const createTrace2Monitor = Effect.fn("createTrace2Monitor")(function* (
+// Untraced because it runs on every git spawn and returns at once without hook
+// callbacks. Its errors fail the runGitCommand span.
+const createTrace2Monitor = Effect.fnUntraced(function* (
   input: Pick<GitVcsDriver.ExecuteGitInput, "operation" | "cwd" | "args">,
   progress: GitVcsDriver.ExecuteGitProgress | undefined,
 ): Effect.fn.Return<
@@ -946,16 +948,14 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       return yield* execution.pipe(
         Effect.timeoutOption(timeoutMs),
         Effect.flatMap((result) =>
-          Option.match(result, {
-            onNone: () =>
-              Effect.fail(
-                new GitCommandError({
-                  ...gitCommandContext(commandInput),
-                  detail: "Git command timed out.",
-                }),
-              ),
-            onSome: Effect.succeed,
-          }),
+          Effect.fromOption(
+            result,
+            () =>
+              new GitCommandError({
+                ...gitCommandContext(commandInput),
+                detail: "Git command timed out.",
+              }),
+          ),
         ),
       );
     },
@@ -1004,11 +1004,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
         : {}),
       ...(options.progress ? { progress: options.progress } : {}),
     }).pipe(
-      Effect.flatMap((result) => {
-        if (options.allowNonZeroExit || result.exitCode === 0) {
-          return Effect.succeed(result);
-        }
-        return Effect.fail(
+      Effect.filterOrFail(
+        (result) => options.allowNonZeroExit || result.exitCode === 0,
+        (result) =>
           new GitCommandError({
             ...gitCommandContext({ operation, cwd, args }),
             detail: options.fallbackErrorDetail ?? "Git command exited with a non-zero status.",
@@ -1016,8 +1014,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
             stdoutLength: result.stdout.length,
             stderrLength: result.stderr.length,
           }),
-        );
-      }),
+      ),
     );
 
   const executeGitWithStableDiagnostics = (
@@ -1130,10 +1127,14 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
   ): Effect.Effect<void, GitCommandError> => {
     const fetchCwd =
       path.basename(gitCommonDir) === ".git" ? path.dirname(gitCommonDir) : gitCommonDir;
+    // `--no-auto-gc` (a synonym of `--no-auto-maintenance` that older Git also knows) keeps
+    // this poll from starting `git gc --auto`. When that gc fails, for example on a repository
+    // with missing objects, Git retries it on every fetch and leaves a full-size `tmp_pack_*`
+    // behind each time, so a background poll could fill the disk.
     return executeGit(
       "GitVcsDriver.fetchRemoteForStatus",
       fetchCwd,
-      ["--git-dir", gitCommonDir, "fetch", "--quiet", "--no-tags", remoteName],
+      ["--git-dir", gitCommonDir, "fetch", "--quiet", "--no-tags", "--no-auto-gc", remoteName],
       {
         env: STATUS_UPSTREAM_REFRESH_ENV,
         fallbackErrorDetail: "Background Git fetch exited with a non-zero status.",
@@ -2285,13 +2286,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
   const readRangeContext: GitVcsDriver.GitVcsDriver["Service"]["readRangeContext"] = Effect.fn(
     "readRangeContext",
   )(function* (cwd, baseRef) {
-    const range = `${baseRef}..HEAD`;
+    const commitRange = `${baseRef}..HEAD`;
+    // PR diffs start at the common ancestor when the base branch has advanced.
+    const diffRange = `${baseRef}...HEAD`;
     const [commitSummary, diffSummary, diffPatch] = yield* Effect.all(
       [
         runGitStdoutWithOptions(
           "GitVcsDriver.readRangeContext.log",
           cwd,
-          ["log", "--oneline", range],
+          ["log", "--oneline", commitRange],
           {
             maxOutputBytes: RANGE_COMMIT_SUMMARY_MAX_OUTPUT_BYTES,
             appendTruncationMarker: true,
@@ -2300,7 +2303,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
         runGitStdoutWithOptions(
           "GitVcsDriver.readRangeContext.diffStat",
           cwd,
-          ["diff", "--stat", range],
+          ["diff", "--stat", diffRange],
           {
             maxOutputBytes: RANGE_DIFF_SUMMARY_MAX_OUTPUT_BYTES,
             appendTruncationMarker: true,
@@ -2309,7 +2312,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
         runGitStdoutWithOptions(
           "GitVcsDriver.readRangeContext.diffPatch",
           cwd,
-          ["diff", "--no-ext-diff", "--patch", "--minimal", range],
+          ["diff", "--no-ext-diff", "--patch", "--minimal", diffRange],
           {
             maxOutputBytes: RANGE_DIFF_PATCH_MAX_OUTPUT_BYTES,
             appendTruncationMarker: true,
@@ -2358,7 +2361,16 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       prefix: `t3code-review-index-${process.pid}-`,
     });
     const indexExists = yield* fileSystem.exists(indexPath);
-    if (indexExists) yield* fileSystem.copyFile(indexPath, tempIndexPath);
+    if (indexExists) {
+      const { mtime } = yield* fileSystem.stat(indexPath);
+      yield* fileSystem.copyFile(indexPath, tempIndexPath);
+      // Node FileSystem.stat truncates bigint timestamps to milliseconds before creating its Date.
+      // Flooring preserves the source second without making preceding-second files racy.
+      const indexTime = Option.isSome(mtime)
+        ? Math.max(0, Math.floor(mtime.value.getTime() / 1000))
+        : 0;
+      yield* fileSystem.utimes(tempIndexPath, indexTime, indexTime);
+    }
     const env = { GIT_INDEX_FILE: tempIndexPath } satisfies NodeJS.ProcessEnv;
     const tempIndexConfig = [
       "-c",
diff --git a/apps/server/src/vcs/VcsStatusBroadcaster.ts b/apps/server/src/vcs/VcsStatusBroadcaster.ts
index f106767da9c8..970de50c12f9 100644
--- a/apps/server/src/vcs/VcsStatusBroadcaster.ts
+++ b/apps/server/src/vcs/VcsStatusBroadcaster.ts
@@ -592,13 +592,13 @@ export const make = Effect.gen(function* () {
         const demandCwds = yield* Ref.get(demandCwdsRef);
         const shouldRun =
           needsInitialRefresh ||
-          (yield* Effect.all(
-            [...demandCwds.keys()].map((demandCwd) =>
+          (yield* Effect.forEach(
+            [...demandCwds.keys()],
+            (demandCwd) =>
               backgroundPolicy.shouldRunScopeWork({
                 type: "vcs-status",
                 cwd: demandCwd,
               }),
-            ),
             { concurrency: REMOTE_STATUS_REFRESH_CONCURRENCY },
           )).some(Boolean);
         if (!shouldRun) {
diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.ts
index 53bdaec5bc6e..7a6e7928d79a 100644
--- a/apps/server/src/ws.ts
+++ b/apps/server/src/ws.ts
@@ -17,6 +17,8 @@ import * as Ref from "effect/Ref";
 import * as Schedule from "effect/Schedule";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
+import { subscribeChatGptHandoff } from "./provider/CodexChatGptHandoff.ts";
+import { subscribeCodexAuthCallback } from "./provider/CodexAuthCallback.ts";
 import {
   DEFAULT_AUTOMATIC_GIT_FETCH_INTERVAL,
   AuthAccessStreamError,
@@ -112,6 +114,8 @@ import {
   observeRpcStreamEffect as instrumentRpcStreamEffect,
 } from "./observability/RpcInstrumentation.ts";
 import * as ProviderRegistry from "./provider/Services/ProviderRegistry.ts";
+import * as ModelManifest from "./provider/ModelManifest.ts";
+import * as ProviderMaintenance from "./provider/providerMaintenance.ts";
 import * as ProviderService from "./provider/Services/ProviderService.ts";
 import * as ProviderSessionDirectory from "./provider/Services/ProviderSessionDirectory.ts";
 import * as ProviderMaintenanceRunner from "./provider/providerMaintenanceRunner.ts";
@@ -566,6 +570,8 @@ const makeWsRpcLayer = (
         yield* Effect.context<Effect.Services<ReturnType<typeof remoteSshDeviceHosts>>>();
       const portDiscovery = yield* PortScanner.PortDiscovery;
       const providerRegistry = yield* ProviderRegistry.ProviderRegistry;
+      const modelManifest = yield* ModelManifest.ModelManifest;
+      const providerVersionCache = yield* ProviderMaintenance.ProviderVersionCache;
       const providerService = yield* ProviderService.ProviderService;
       const providerSessionDirectory = yield* ProviderSessionDirectory.ProviderSessionDirectory;
       const providerMaintenanceRunner = yield* ProviderMaintenanceRunner.ProviderMaintenanceRunner;
@@ -855,27 +861,23 @@ const makeWsRpcLayer = (
           case "project.meta-updated":
             return projectUpsertOrRemove(ProjectId.make(event.aggregateId), event.sequence);
           case "project.deleted":
-            return Effect.succeed(
-              Option.some({
-                kind: "project-removed" as const,
-                sequence: event.sequence,
-                projectId: ProjectId.make(event.aggregateId),
-              }),
-            );
+            return Effect.succeedSome({
+              kind: "project-removed" as const,
+              sequence: event.sequence,
+              projectId: ProjectId.make(event.aggregateId),
+            });
           case "thread.deleted":
           case "thread.archived":
-            return Effect.succeed(
-              Option.some({
-                kind: "thread-removed" as const,
-                sequence: event.sequence,
-                threadId: ThreadId.make(event.aggregateId),
-              }),
-            );
+            return Effect.succeedSome({
+              kind: "thread-removed" as const,
+              sequence: event.sequence,
+              threadId: ThreadId.make(event.aggregateId),
+            });
           case "thread.unarchived":
             return threadUpsertOrRemove(ThreadId.make(event.aggregateId), event.sequence);
           default:
             if (event.aggregateKind !== "thread") {
-              return Effect.succeed(Option.none());
+              return Effect.succeedNone;
             }
             return threadUpsertOrRemove(ThreadId.make(event.aggregateId), event.sequence);
         }
@@ -893,7 +895,7 @@ const makeWsRpcLayer = (
       ): Effect.Effect<Option.Option<A>, never, never> =>
         read.pipe(
           Effect.retry({ times: 1 }),
-          Effect.map(Option.some),
+          Effect.asSome,
           Effect.tapError((error) =>
             Effect.logWarning("orchestration shell projection refetch failed", {
               aggregateKind,
@@ -2368,6 +2370,28 @@ const makeWsRpcLayer = (
           observeRpcEffect(
             WS_METHODS.serverRefreshProviders,
             Effect.gen(function* () {
+              // Only explicit catalog refreshes bypass T3's caches. Workspace
+              // discovery and background status checks retain their timers.
+              if (input.refreshModels) {
+                yield* modelManifest.forceRefresh;
+                const instances = yield* providerInstances.listInstances;
+                yield* Effect.forEach(
+                  instances.filter(
+                    (instance) =>
+                      input.instanceId === undefined || input.instanceId === instance.instanceId,
+                  ),
+                  (instance) =>
+                    Effect.gen(function* () {
+                      yield* instance.invalidateCaches ?? Effect.void;
+                      const maintenance = yield* instance.snapshot.resolveMaintenance({
+                        fresh: true,
+                      });
+                      if (maintenance.packageName)
+                        providerVersionCache.delete(maintenance.packageName);
+                    }),
+                  { concurrency: "unbounded", discard: true },
+                );
+              }
               // An untargeted refresh is "re-read everything's status", which
               // includes quota from configured usage-limit sources. Awaited,
               // not forked: the RPC scope closes on return and would
@@ -2478,12 +2502,33 @@ const makeWsRpcLayer = (
             providerAuth.start(input, currentSessionId),
             { "rpc.aggregate": "provider" },
           ),
+        [WS_METHODS.providerAuthRespond]: (input) =>
+          observeRpcEffect(
+            WS_METHODS.providerAuthRespond,
+            providerAuth.respond(input, currentSessionId),
+            {
+              "rpc.aggregate": "provider",
+              instanceId: input.instanceId,
+            },
+          ),
         [WS_METHODS.providerAuthComplete]: (input) =>
           observeRpcEffect(
             WS_METHODS.providerAuthComplete,
             providerAuth.complete(input, currentSessionId),
             { "rpc.aggregate": "provider" },
           ),
+        [WS_METHODS.chatGptReconnectProfile]: (input) => providerAuth.reconnectProfile(input),
+        [WS_METHODS.chatGptImportProfile]: (input) => providerAuth.importProfile(input),
+        [WS_METHODS.chatGptHandoffSubscribe]: (input) =>
+          subscribeChatGptHandoff(input, currentSessionId),
+        [WS_METHODS.codexAuthCallbackSubscribe]: (input) =>
+          observeRpcStream(
+            WS_METHODS.codexAuthCallbackSubscribe,
+            subscribeCodexAuthCallback(input),
+            {
+              "rpc.aggregate": "provider",
+            },
+          ),
         [WS_METHODS.providerAuthCancel]: (input) =>
           observeRpcEffect(
             WS_METHODS.providerAuthCancel,
@@ -3014,9 +3059,13 @@ const makeWsRpcLayer = (
         [WS_METHODS.sourceControlPublishRepository]: (input) =>
           observeRpcEffect(
             WS_METHODS.sourceControlPublishRepository,
-            sourceControlRepositories
-              .publishRepository(input)
-              .pipe(Effect.tap(() => refreshGitStatus(input.cwd))),
+            sourceControlRepositories.publishRepository(input).pipe(
+              // A new remote can change the cached identity. Only the `cwd` entry
+              // refreshes, so after a publish from a linked worktree the project
+              // root entry waits for its TTL.
+              Effect.tap(() => repositoryIdentityResolver.resolve(input.cwd, { refresh: true })),
+              Effect.tap(() => refreshGitStatus(input.cwd)),
+            ),
             {
               "rpc.aggregate": "source-control",
             },
diff --git a/apps/web/package.json b/apps/web/package.json
index ddd87c6526cf..9adb7e4c828d 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/web",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "private": true,
   "type": "module",
   "scripts": {
@@ -76,6 +76,7 @@
     "@vitejs/plugin-react": "^6.0.0",
     "babel-plugin-react-compiler": "1.0.0",
     "compression": "^1.8.1",
+    "jsdom": "^30.0.1",
     "react-test-renderer": "19.2.6",
     "tailwindcss": "^4.0.0",
     "unified": "^11.0.5",
diff --git a/apps/web/src/browser/BrowserDeviceToolbar.tsx b/apps/web/src/browser/BrowserDeviceToolbar.tsx
index e8ad80b597ba..390c77de4424 100644
--- a/apps/web/src/browser/BrowserDeviceToolbar.tsx
+++ b/apps/web/src/browser/BrowserDeviceToolbar.tsx
@@ -175,7 +175,7 @@ export function BrowserDeviceToolbar({
       }}
     >
       {width >= 560 ? (
-        <span className="mr-0.5 shrink-0 text-[11px] font-medium text-muted-foreground">
+        <span className="mr-0.5 shrink-0 text-2xs font-medium text-muted-foreground">
           Dimensions
         </span>
       ) : null}
@@ -189,15 +189,12 @@ export function BrowserDeviceToolbar({
         <SelectTrigger
           variant="ghost"
           size="xs"
-          className={cn(
-            "shrink-0 justify-between px-1.5 font-medium",
-            width >= 440 ? "w-36" : "w-24",
-          )}
+          className={cn("shrink-0 justify-between", width >= 440 ? "w-36" : "w-24")}
           aria-label="Browser device preset"
         >
           <SelectValue />
         </SelectTrigger>
-        <SelectPopup align="start" alignItemWithTrigger={false} className="min-w-64">
+        <SelectPopup align="start" alignItemWithTrigger={false}>
           <SelectItem value={RESPONSIVE_VALUE}>Responsive</SelectItem>
           <SelectGroup>
             <SelectGroupLabel>Standard</SelectGroupLabel>
@@ -227,7 +224,8 @@ export function BrowserDeviceToolbar({
           nativeInput
           type="number"
           inputMode="numeric"
-          size="sm"
+          size="compact"
+          font="mono"
           min={PREVIEW_VIEWPORT_MIN_DIMENSION}
           max={PREVIEW_VIEWPORT_MAX_DIMENSION}
           value={presentedSize.width}
@@ -244,17 +242,15 @@ export function BrowserDeviceToolbar({
           onChange={(event) => updateCustomDimension("width", event.target.value)}
           aria-label="Viewport width"
           aria-invalid={!customValid}
-          className={cn(
-            "h-6 rounded-md text-center tabular-nums [&_[data-slot=input]]:h-full [&_[data-slot=input]]:px-1 [&_[data-slot=input]]:text-xs [&_[data-slot=input]]:leading-none [&_[data-slot=input]::-webkit-inner-spin-button]:appearance-none [&_[data-slot=input]]:[appearance:textfield]",
-            width >= 360 ? "w-14" : "w-11",
-          )}
+          className={width >= 360 ? "w-14" : "w-13"}
         />
         <span className="text-xs text-muted-foreground">×</span>
         <Input
           nativeInput
           type="number"
           inputMode="numeric"
-          size="sm"
+          size="compact"
+          font="mono"
           min={PREVIEW_VIEWPORT_MIN_DIMENSION}
           max={PREVIEW_VIEWPORT_MAX_DIMENSION}
           value={presentedSize.height}
@@ -271,10 +267,7 @@ export function BrowserDeviceToolbar({
           onChange={(event) => updateCustomDimension("height", event.target.value)}
           aria-label="Viewport height"
           aria-invalid={!customValid}
-          className={cn(
-            "h-6 rounded-md text-center tabular-nums [&_[data-slot=input]]:h-full [&_[data-slot=input]]:px-1 [&_[data-slot=input]]:text-xs [&_[data-slot=input]]:leading-none [&_[data-slot=input]::-webkit-inner-spin-button]:appearance-none [&_[data-slot=input]]:[appearance:textfield]",
-            width >= 360 ? "w-14" : "w-11",
-          )}
+          className={width >= 360 ? "w-14" : "w-13"}
         />
       </form>
 
@@ -282,14 +275,13 @@ export function BrowserDeviceToolbar({
         <TooltipTrigger
           render={
             <Button
-              variant="ghost"
+              variant={aspectRatio === null ? "ghost" : "secondary"}
               size="icon-xs"
               type="button"
               aria-label={
                 aspectRatio === null ? "Lock viewport aspect ratio" : "Unlock viewport aspect ratio"
               }
               aria-pressed={aspectRatio !== null}
-              className={cn(aspectRatio !== null && "bg-accent text-foreground")}
               disabled={pending || !customValid}
               onPointerDown={(event) => event.preventDefault()}
               onClick={toggleAspectRatio}
@@ -316,19 +308,21 @@ export function BrowserDeviceToolbar({
       >
         <ScreenRotationIcon />
       </Button>
-      <Button
-        variant="ghost"
-        size="icon-xs"
-        type="button"
-        aria-label="Close device toolbar"
-        className="sticky right-0 ml-auto bg-background/95"
-        disabled={pending}
-        onClick={() => {
-          apply({ _tag: "fill" }, null);
-        }}
-      >
-        <X />
-      </Button>
+      {/* Sticky backing so scrolled controls do not show through the close action. */}
+      <span className="sticky right-0 ml-auto flex bg-background/95">
+        <Button
+          variant="ghost"
+          size="icon-xs"
+          type="button"
+          aria-label="Close device toolbar"
+          disabled={pending}
+          onClick={() => {
+            apply({ _tag: "fill" }, null);
+          }}
+        >
+          <X />
+        </Button>
+      </span>
     </div>
   );
 }
diff --git a/apps/web/src/browser/HostedBrowserWebview.tsx b/apps/web/src/browser/HostedBrowserWebview.tsx
index 6c303afb27e9..35044cd9c169 100644
--- a/apps/web/src/browser/HostedBrowserWebview.tsx
+++ b/apps/web/src/browser/HostedBrowserWebview.tsx
@@ -352,7 +352,7 @@ export function HostedBrowserWebview(props: {
             />
             {activeDrag ? (
               <div
-                className="pointer-events-none absolute z-40 -translate-x-1/2 rounded-md border border-border/80 bg-background/95 px-2 py-1 text-[11px] font-medium tabular-nums text-foreground shadow-md backdrop-blur-sm"
+                className="pointer-events-none absolute z-40 -translate-x-1/2 rounded-md border border-border/80 bg-background/95 px-2 py-1 text-2xs font-medium tabular-nums text-foreground shadow-md backdrop-blur-sm"
                 style={{
                   left: layout.viewportX + layout.viewportWidth / 2,
                   top: layout.viewportY + 10,
diff --git a/apps/web/src/components/AgentsPanel.tsx b/apps/web/src/components/AgentsPanel.tsx
index 43f1fa123f38..7ca5b730b54e 100644
--- a/apps/web/src/components/AgentsPanel.tsx
+++ b/apps/web/src/components/AgentsPanel.tsx
@@ -162,12 +162,12 @@ function AgentRow({ agent }: { agent: RuntimeSubagent }) {
       <span className="col-start-2 row-start-1 flex min-w-0 items-baseline gap-2">
         <span className="min-w-0 truncate text-sm font-medium">{agent.title}</span>
         {role ? (
-          <span className="max-w-28 shrink-0 truncate rounded-sm border border-border/60 px-1 font-mono text-[.65rem] text-muted-foreground">
+          <span className="max-w-28 shrink-0 truncate rounded-sm border border-border/60 px-1 font-mono text-3xs text-muted-foreground">
             {role}
           </span>
         ) : null}
       </span>
-      <span className="col-start-3 row-start-1 min-w-14 text-right font-mono text-[.7rem] text-muted-foreground/80">
+      <span className="col-start-3 row-start-1 min-w-14 text-right font-mono text-2xs text-muted-foreground/80">
         <span className="inline-flex items-center gap-1">
           <AgentElapsed agent={agent} />
           {agent.status === "completed" ? (
@@ -183,7 +183,7 @@ function AgentRow({ agent }: { agent: RuntimeSubagent }) {
       >
         {activity ?? statusLabel}
       </span>
-      <span className="col-start-2 col-end-4 row-start-3 truncate font-mono text-[.7rem] tabular-nums text-muted-foreground/70">
+      <span className="col-start-2 col-end-4 row-start-3 truncate font-mono text-2xs tabular-nums text-muted-foreground/70">
         {metadata.join(" · ")}
       </span>
       <span className="sr-only">{statusLabel}</span>
@@ -234,7 +234,7 @@ function PhaseRail({ group }: { group: AgentPanelWorkflowGroup }) {
           >
             <span
               className={cn(
-                "font-mono text-[.65rem]",
+                "font-mono text-3xs",
                 phase.state === "running"
                   ? "text-info-foreground"
                   : phase.state === "done"
@@ -247,7 +247,7 @@ function PhaseRail({ group }: { group: AgentPanelWorkflowGroup }) {
             </span>
             <span className="flex items-center gap-0.5">
               {phase.members.length === 0 ? (
-                <span className="font-mono text-[.6rem] text-muted-foreground/50">–</span>
+                <span className="font-mono text-3xs text-muted-foreground/50">–</span>
               ) : (
                 phase.members.map((member) => <StatusDot key={member.id} status={member.status} />)
               )}
@@ -281,7 +281,7 @@ function WorkflowScriptView({
     <div className="mx-1.5 mb-1 rounded-md border border-border/60 bg-background/60">
       <div className="flex items-center gap-2 border-b border-border/50 px-2 py-1">
         <Braces aria-hidden className="size-3 text-muted-foreground" />
-        <span className="truncate font-mono text-[.65rem] text-muted-foreground">
+        <span className="truncate font-mono text-3xs text-muted-foreground">
           {scriptPath.split("/").at(-1)}
         </span>
         <Button
@@ -296,7 +296,7 @@ function WorkflowScriptView({
       </div>
       <div className="max-h-72 overflow-auto p-2">
         {result._tag === "Success" ? (
-          <pre className="whitespace-pre-wrap break-words font-mono text-[.7rem] leading-relaxed text-foreground/90">
+          <pre className="whitespace-pre-wrap break-words font-mono text-2xs leading-relaxed text-foreground/90">
             {result.value.contents}
             {result.value.truncated ? "\n… (truncated)" : ""}
           </pre>
@@ -339,7 +339,7 @@ function PhaseSection({
         onClick={() => setOpen((value) => !value)}
         aria-expanded={open}
         className={cn(
-          "mt-2 flex w-full items-center gap-1.5 rounded-sm px-1.5 text-left text-[.65rem] font-medium uppercase tracking-wider hover:bg-accent/40",
+          "mt-2 flex w-full items-center gap-1.5 rounded-sm px-1.5 text-left text-3xs font-medium uppercase tracking-wider hover:bg-accent/40",
           phase.state === "done"
             ? "text-success-foreground"
             : phase.state === "running"
@@ -399,7 +399,7 @@ function ExpandedWorkflowSection({
   const canShowScript = scriptPath !== undefined && environmentId !== null && threadId !== null;
   return (
     <section className="rounded-lg border border-border/50 bg-card/30 p-1.5">
-      <div className="flex items-center gap-2 px-1.5 pt-0.5 text-[.65rem] font-medium uppercase tracking-wider text-muted-foreground">
+      <div className="flex items-center gap-2 px-1.5 pt-0.5 text-3xs font-medium uppercase tracking-wider text-muted-foreground">
         <StatusDot status={group.workflow.status} />
         <span className="min-w-0 truncate">
           {group.workflow.workflowName ?? group.workflow.title}
@@ -486,7 +486,7 @@ function CollapsedWorkflowSection({
         <span className="truncate text-sm">
           {group.workflow.workflowName ?? group.workflow.title}
         </span>
-        <span className="ml-auto flex items-center gap-1.5 font-mono text-[.7rem] text-muted-foreground/80">
+        <span className="ml-auto flex items-center gap-1.5 font-mono text-2xs text-muted-foreground/80">
           {failed > 0 ? <span className="text-destructive-foreground">{failed} failed</span> : null}
           <span>{members.length} agents</span>
           <span className="tabular-nums">· {formatSubagentTokenCount(totalTokens)} tok</span>
@@ -557,7 +557,7 @@ export function AgentsPanel({
           ))}
           {model.directAgents.length > 0 ? (
             <section>
-              <div className="px-1.5 pt-1 text-[.65rem] font-medium uppercase tracking-wider text-muted-foreground">
+              <div className="px-1.5 pt-1 text-3xs font-medium uppercase tracking-wider text-muted-foreground">
                 Direct spawns
               </div>
               {model.directAgents.map((agent) => (
@@ -567,7 +567,7 @@ export function AgentsPanel({
           ) : null}
         </div>
       </ScrollArea>
-      <footer className="flex items-center justify-between border-t border-border/60 px-3 py-1.5 font-mono text-[.7rem] text-muted-foreground">
+      <footer className="flex items-center justify-between border-t border-border/60 px-3 py-1.5 font-mono text-2xs text-muted-foreground">
         <span className="flex items-center gap-2">
           {model.runningCount + model.waitingCount > 0 ? (
             <span className="text-info-foreground">
diff --git a/apps/web/src/components/AppSidebarLayout.tsx b/apps/web/src/components/AppSidebarLayout.tsx
index 14d871c41804..05d965d95d06 100644
--- a/apps/web/src/components/AppSidebarLayout.tsx
+++ b/apps/web/src/components/AppSidebarLayout.tsx
@@ -7,7 +7,7 @@ import {
   type CSSProperties,
   type ReactNode,
 } from "react";
-import { useLocation, useNavigate } from "@tanstack/react-router";
+import { useLocation, useNavigate, useParams } from "@tanstack/react-router";
 
 import { isElectron } from "../env";
 import { getLocalStorageItem, removeLocalStorageItem } from "../hooks/useLocalStorage";
@@ -16,6 +16,13 @@ import {
   resolveShortcutCommand,
   shortcutLabelForCommand,
 } from "../keybindings";
+import { isEditableFocused } from "../lib/editableFocus";
+import { isPreviewFocused } from "../lib/previewFocus";
+import { isTerminalFocused } from "../lib/terminalFocus";
+import { isModelPickerOpen } from "../modelPickerVisibility";
+import { selectActiveRightPanel, useRightPanelStore } from "../rightPanelStore";
+import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore";
+import { resolveThreadRouteRef } from "../threadRoutes";
 import { cn, isMacPlatform } from "../lib/utils";
 import { primaryServerKeybindingsAtom } from "../state/server";
 import { useEnvironmentIdentificationMode, useLegacySidebarEnabled } from "../hooks/useSettings";
@@ -28,10 +35,8 @@ import LegacyThreadSidebar from "./LegacySidebar";
 import ThreadSidebar from "./Sidebar";
 import { SettingsSidebarNav } from "./settings/SettingsSidebarNav";
 import { SidebarChromeHeader } from "./sidebar/SidebarChrome";
-import {
-  resolveSidebarStageFocusRingOffsetClass,
-  useSidebarStageBackdropVariant,
-} from "./SidebarStageBackdrop";
+import { MainAppLocationTracker } from "./sidebar/mainAppLocation";
+import { useSidebarStageBackdropVariant } from "./SidebarStageBackdrop";
 import { useProjects } from "../state/entities";
 import {
   resolveInitialThreadSidebarWidth,
@@ -74,6 +79,7 @@ function readInitialThreadSidebarWidth(): number {
 }
 
 function SidebarControl() {
+  const usagePageOpen = useLocation({ select: (location) => location.pathname === "/usage" });
   const keybindings = useAtomValue(primaryServerKeybindingsAtom);
   const { toggleSidebar } = useSidebar();
   const isSidebarVisible = useSidebarVisibility();
@@ -81,7 +87,9 @@ function SidebarControl() {
   const stageBackdropVariant = useSidebarStageBackdropVariant(
     environmentIdentificationMode === "artwork",
   );
-  const shortcutLabel = shortcutLabelForCommand(keybindings, "sidebar.toggle");
+  const shortcutLabel = shortcutLabelForCommand(keybindings, "sidebar.toggle", {
+    context: { usagePageOpen },
+  });
 
   useEffect(() => {
     const onKeyDown = (event: KeyboardEvent) => {
@@ -101,7 +109,11 @@ function SidebarControl() {
         // available everywhere else, including the plain-text composer.
         return;
       }
-      if (resolveShortcutCommand(event, keybindings) !== "sidebar.toggle") return;
+      if (
+        resolveShortcutCommand(event, keybindings, { context: { usagePageOpen } }) !==
+        "sidebar.toggle"
+      )
+        return;
 
       event.preventDefault();
       event.stopPropagation();
@@ -111,7 +123,7 @@ function SidebarControl() {
     // Capture before focused editors consume commands such as Mod+B for rich-text formatting.
     window.addEventListener("keydown", onKeyDown, true);
     return () => window.removeEventListener("keydown", onKeyDown, true);
-  }, [keybindings, toggleSidebar]);
+  }, [keybindings, toggleSidebar, usagePageOpen]);
 
   return (
     // The right-side layout controls carry mr-px (border compensation inside
@@ -125,14 +137,12 @@ function SidebarControl() {
         <TooltipTrigger
           render={
             <SidebarTrigger
+              // Over the stage artwork the trigger is a control on imagery, like the media
+              // viewer's arrows; that variant positions itself, so the layout is reset here.
+              variant={isSidebarVisible && stageBackdropVariant ? "media-navigation" : "ghost"}
               className={cn(
                 "pointer-events-auto",
-                isSidebarVisible &&
-                  stageBackdropVariant &&
-                  "focus-visible:ring-white/90 [&_svg]:stroke-white/90! [&_svg]:opacity-100! [&_svg]:hover:stroke-white! [:hover,[data-pressed]]:bg-white/15",
-                isSidebarVisible &&
-                  stageBackdropVariant &&
-                  resolveSidebarStageFocusRingOffsetClass(stageBackdropVariant),
+                isSidebarVisible && stageBackdropVariant && "relative top-auto translate-y-0",
               )}
               aria-label="Toggle main sidebar"
             />
@@ -146,6 +156,56 @@ function SidebarControl() {
   );
 }
 
+// Moves through the app's route history like a browser's back/forward buttons.
+function NavigationHistoryShortcuts() {
+  const keybindings = useAtomValue(primaryServerKeybindingsAtom);
+  const routeThreadRef = useParams({
+    strict: false,
+    select: (params) => resolveThreadRouteRef(params),
+  });
+
+  useEffect(() => {
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.defaultPrevented) return;
+      if (
+        event.target instanceof HTMLElement &&
+        event.target.closest("[data-keybinding-capture]")
+      ) {
+        return;
+      }
+      const command = resolveShortcutCommand(event, keybindings, {
+        context: {
+          terminalFocus: isTerminalFocused(),
+          terminalOpen: routeThreadRef
+            ? selectThreadTerminalUiState(
+                useTerminalUiStateStore.getState().terminalUiStateByThreadKey,
+                routeThreadRef,
+              ).terminalOpen
+            : false,
+          previewFocus: isPreviewFocused(),
+          previewOpen: routeThreadRef
+            ? selectActiveRightPanel(useRightPanelStore.getState().byThreadKey, routeThreadRef) ===
+              "preview"
+            : false,
+          editableFocus: isEditableFocused(event.target),
+          modelPickerOpen: isModelPickerOpen(),
+        },
+      });
+      if (command !== "navigation.back" && command !== "navigation.forward") return;
+
+      event.preventDefault();
+      event.stopPropagation();
+      if (command === "navigation.back") window.history.back();
+      else window.history.forward();
+    };
+
+    window.addEventListener("keydown", onKeyDown);
+    return () => window.removeEventListener("keydown", onKeyDown);
+  }, [keybindings, routeThreadRef]);
+
+  return null;
+}
+
 // Settings swaps the thread sidebar out of the tree. Keep the lightweight
 // project projection subscribed so returning to a draft never renders the
 // zero-project state while the environment snapshot reconnects.
@@ -244,7 +304,8 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
           side="left"
           collapsible="offcanvas"
           data-app-sidebar=""
-          className="border-r border-sidebar-border"
+          role="navigation"
+          aria-label={isOnSettings ? "Settings" : "Threads"}
           resizable={{
             maxWidth: sidebarMaximumWidth,
             minWidth: THREAD_SIDEBAR_MIN_WIDTH,
@@ -269,6 +330,8 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
         </Sidebar>
         {children}
         <SidebarControl />
+        <NavigationHistoryShortcuts />
+        <MainAppLocationTracker />
       </SidebarProvider>
     </PanelAnimationSuppressionProvider>
   );
diff --git a/apps/web/src/components/BranchToolbar.logic.test.ts b/apps/web/src/components/BranchToolbar.logic.test.ts
index ff4bb76bf12a..bd1b11a6cd28 100644
--- a/apps/web/src/components/BranchToolbar.logic.test.ts
+++ b/apps/web/src/components/BranchToolbar.logic.test.ts
@@ -489,6 +489,24 @@ describe("resolveEffectiveEnvMode", () => {
       }),
     ).toBe("worktree");
   });
+
+  it("keeps a server thread in worktree mode while its worktree is still being created", () => {
+    expect(
+      resolveEffectiveEnvMode({
+        activeWorktreePath: null,
+        hasServerThread: true,
+        draftThreadEnvMode: undefined,
+        preparingWorktree: true,
+      }),
+    ).toBe("worktree");
+    expect(
+      resolveEffectiveEnvMode({
+        activeWorktreePath: null,
+        hasServerThread: true,
+        draftThreadEnvMode: undefined,
+      }),
+    ).toBe("local");
+  });
 });
 
 describe("resolveEnvModeLabel", () => {
@@ -510,11 +528,17 @@ describe("resolveCurrentWorkspaceLabel", () => {
 
 describe("resolveLockedWorkspaceLabel", () => {
   it("uses a shorter label for the main repo checkout", () => {
-    expect(resolveLockedWorkspaceLabel(null)).toBe("Local checkout");
+    expect(resolveLockedWorkspaceLabel(null, "local")).toBe("Local checkout");
   });
 
   it("uses a shorter label for an attached worktree", () => {
-    expect(resolveLockedWorkspaceLabel("/repo/.t3/worktrees/feature-a")).toBe("Worktree");
+    expect(resolveLockedWorkspaceLabel("/repo/.t3/worktrees/feature-a", "worktree")).toBe(
+      "Worktree",
+    );
+  });
+
+  it("describes a worktree that is still being created as a new worktree", () => {
+    expect(resolveLockedWorkspaceLabel(null, "worktree")).toBe("New worktree");
   });
 });
 
diff --git a/apps/web/src/components/BranchToolbar.logic.ts b/apps/web/src/components/BranchToolbar.logic.ts
index 5b046ed6a686..cbc887954019 100644
--- a/apps/web/src/components/BranchToolbar.logic.ts
+++ b/apps/web/src/components/BranchToolbar.logic.ts
@@ -6,10 +6,12 @@ import type {
   WorktreeSubmodules,
 } from "@t3tools/contracts";
 import * as Schema from "effect/Schema";
+import { sanitizeNewRefName } from "@t3tools/shared/git";
 import { toSortableTimestamp } from "../lib/threadSort";
 export {
   dedupeRemoteBranchesWithLocalMatches,
   deriveLocalBranchNameFromRemoteRef,
+  sanitizeNewRefName,
 } from "@t3tools/shared/git";
 
 export interface EnvironmentOption {
@@ -102,8 +104,14 @@ export function resolveCurrentWorkspaceLabel(activeWorktreePath: string | null):
   return activeWorktreePath ? "Current worktree" : resolveEnvModeLabel("local");
 }
 
-export function resolveLockedWorkspaceLabel(activeWorktreePath: string | null): string {
-  return activeWorktreePath ? "Worktree" : "Local checkout";
+// A locked thread in worktree mode with no path is still creating its
+// worktree, so it reads as a new worktree rather than the project checkout.
+export function resolveLockedWorkspaceLabel(
+  activeWorktreePath: string | null,
+  effectiveEnvMode: EnvMode,
+): string {
+  if (activeWorktreePath) return "Worktree";
+  return effectiveEnvMode === "worktree" ? resolveEnvModeLabel("worktree") : "Local checkout";
 }
 
 export interface PreviousWorktreeSeed {
@@ -157,15 +165,20 @@ export function resolveEffectiveEnvMode(input: {
   activeWorktreePath: string | null;
   hasServerThread: boolean;
   draftThreadEnvMode: EnvMode | undefined;
+  /**
+   * The server is still creating this thread's worktree. The thread exists
+   * from the start of that setup but gets its worktree path only at the end.
+   */
+  preparingWorktree?: boolean;
 }): EnvMode {
-  const { activeWorktreePath, hasServerThread, draftThreadEnvMode } = input;
+  const { activeWorktreePath, hasServerThread, draftThreadEnvMode, preparingWorktree } = input;
   if (!hasServerThread) {
     if (activeWorktreePath) {
       return "local";
     }
     return draftThreadEnvMode === "worktree" ? "worktree" : "local";
   }
-  return activeWorktreePath ? "worktree" : "local";
+  return activeWorktreePath || preparingWorktree ? "worktree" : "local";
 }
 
 export function resolveDraftEnvModeAfterBranchChange(input: {
@@ -275,19 +288,6 @@ export function resolveBranchSelectionTarget(input: {
   };
 }
 
-// Git rejects ASCII space and the ASCII control characters (tab, newline and
-// friends) in ref names, so the picker's "Create new ref" entry can only fail
-// for a typed name like "new branch". Replacing runs of those with a dash makes
-// the name usable without reimplementing check-ref-format: names invalid for
-// other reasons still surface the git error. Only the whitespace git actually
-// rejects is replaced — git accepts U+00A0 and friends, and rewriting those
-// would silently create a ref the user never asked for. Case and existing
-// dashes are left alone, since ref names are case sensitive and consecutive
-// dashes are valid.
-export function sanitizeNewRefName(rawName: string): string {
-  return rawName.trim().replace(/[ \t\n\r\f\v]+/g, "-");
-}
-
 export function shouldIncludeBranchPickerItem(input: {
   itemValue: string;
   normalizedQuery: string;
diff --git a/apps/web/src/components/BranchToolbar.tsx b/apps/web/src/components/BranchToolbar.tsx
index ffc89c33e794..eca4fab601d0 100644
--- a/apps/web/src/components/BranchToolbar.tsx
+++ b/apps/web/src/components/BranchToolbar.tsx
@@ -5,7 +5,6 @@ import {
   FolderGit2Icon,
   FolderGitIcon,
   FolderIcon,
-  HistoryIcon,
   ScaleIcon,
 } from "lucide-react";
 import {
@@ -29,7 +28,6 @@ import {
   resolveContextStripLabelsCompact,
   resolveCurrentWorkspaceLabel,
   resolveEnvModeLabel,
-  resolveEffectiveEnvMode,
   resolveLockedWorkspaceLabel,
   resolvePreviousWorktreeLabel,
   resolvePreviousWorktreeSeed,
@@ -41,7 +39,8 @@ import {
 } from "./BranchToolbarBranchSelector";
 import { BranchToolbarEnvironmentSelector } from "./BranchToolbarEnvironmentSelector";
 import { BranchToolbarEnvModeSelector } from "./BranchToolbarEnvModeSelector";
-import { Button } from "./ui/button";
+import { PreviousWorktreeItemContent } from "./PreviousWorktreeItemContent";
+import { ComposerControl } from "./chat/ComposerControl";
 import {
   Menu,
   MenuGroup,
@@ -74,7 +73,8 @@ interface BranchToolbarProps {
   showGitControls: boolean;
   draftId?: DraftId;
   onEnvModeChange: (mode: EnvMode) => void;
-  effectiveEnvModeOverride?: EnvMode;
+  /** The thread's env mode as ChatView resolves it. */
+  envMode: EnvMode;
   activeThreadBranchOverride?: string | null;
   onActiveThreadBranchOverrideChange?: (branch: string | null) => void;
   startFromOrigin: boolean;
@@ -105,6 +105,7 @@ interface MobileRunContextSelectorProps {
   activeWorktreePath: string | null;
   onEnvModeChange: (mode: EnvMode) => void;
   previousWorktreeLabel: string | null;
+  previousWorktreeBranch: string | null;
   onUsePreviousWorktree: () => void;
 }
 
@@ -123,6 +124,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
   activeWorktreePath,
   onEnvModeChange,
   previousWorktreeLabel,
+  previousWorktreeBranch,
   onUsePreviousWorktree,
 }: MobileRunContextSelectorProps) {
   const composerFloatingLayerProps = useComposerMenuProps();
@@ -139,7 +141,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
   const workspaceLabel = forceNewWorktree
     ? resolveEnvModeLabel("worktree")
     : envModeLocked
-      ? resolveLockedWorkspaceLabel(activeWorktreePath)
+      ? resolveLockedWorkspaceLabel(activeWorktreePath, effectiveEnvMode)
       : effectiveEnvMode === "worktree"
         ? resolveEnvModeLabel("worktree")
         : resolveCurrentWorkspaceLabel(activeWorktreePath);
@@ -183,7 +185,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
       >
         <span
           data-composer-label-motion
-          className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
+          className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-drawer group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
         >
           {autoEnvironmentLabel ??
             (showEnvironmentIndicator ? (activeEnvironment?.label ?? "Run on") : workspaceLabel)}
@@ -195,7 +197,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
   if (isLocked) {
     return (
       <span
-        className="inline-flex h-7 min-w-0 max-w-[48%] flex-initial items-center justify-start gap-1 rounded-md border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
+        className="inline-flex h-7 min-w-0 max-w-[48%] flex-initial items-center justify-start gap-1 rounded-md border border-transparent px-1.75 font-normal text-muted-foreground/70 text-xs sm:h-6"
         data-composer-context-control
       >
         {triggerContent}
@@ -206,8 +208,8 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
   return (
     <Menu>
       <MenuTrigger
-        render={<Button variant="ghost" size="xs" />}
-        className="min-w-0 max-w-[48%] flex-initial justify-start font-normal text-muted-foreground/70 text-xs! hover:text-foreground/80"
+        render={<ComposerControl size="xs" />}
+        className="min-w-0 max-w-[48%] flex-initial justify-start"
         data-composer-context-control
         data-composer-shortcut={[
           showEnvironmentPicker && !envLocked ? "composer.host" : "",
@@ -217,7 +219,12 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
         {triggerContent}
         <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
       </MenuTrigger>
-      <MenuPopup align="start" side="top" className="w-64" {...composerFloatingLayerProps}>
+      <MenuPopup
+        align="start"
+        side="top"
+        className={previousWorktreeLabel ? "w-[min(21rem,calc(100vw-2rem))]" : undefined}
+        {...composerFloatingLayerProps}
+      >
         {showEnvironmentPicker && availableEnvironments && onEnvironmentChange ? (
           <>
             <MenuGroup>
@@ -295,10 +302,7 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
             </MenuRadioItem>
             {previousWorktreeLabel ? (
               <MenuRadioItem disabled={envModeLocked} value="previous-worktree" closeOnClick>
-                <span className="flex min-w-0 items-center gap-1.5">
-                  <HistoryIcon className="size-3" />
-                  <MiddleTruncate value={previousWorktreeLabel} />
-                </span>
+                <PreviousWorktreeItemContent branch={previousWorktreeBranch} />
               </MenuRadioItem>
             ) : null}
           </MenuRadioGroup>
@@ -308,6 +312,34 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
   );
 });
 
+const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
+const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
+const COMPOSER_CONTEXT_LABEL_SELECTOR = "[data-composer-label]";
+
+/**
+ * The width a label takes when shown, clipped parts included.
+ *
+ * Text keeps its full width when its box clips it, so each text run measures
+ * whole. A label can hold more than one run (MiddleTruncate splits a branch
+ * into a head and a tail), so the runs are added. Reading one element's
+ * scrollWidth drops the tail when the label is hidden or squeezed, and the
+ * strip then flips between labels and icons on every measure.
+ *
+ * A shown label never grows past its motion span's max width, so longer text
+ * reserves only that much.
+ */
+function labelTextWidth(label: HTMLElement, range: Range): number {
+  const walker = document.createTreeWalker(label, NodeFilter.SHOW_TEXT);
+  let width = 0;
+  for (let node = walker.nextNode(); node; node = walker.nextNode()) {
+    range.selectNodeContents(node);
+    width += range.getBoundingClientRect().width;
+  }
+  const motion = label.querySelector<HTMLElement>("[data-composer-label-motion]");
+  const maxWidth = motion ? Number.parseFloat(getComputedStyle(motion).maxWidth) : Number.NaN;
+  return Number.isFinite(maxWidth) ? Math.min(width, maxWidth) : width;
+}
+
 /**
  * Collapse the strip's labels to icons only when the text no longer fits.
  *
@@ -316,10 +348,6 @@ const MobileRunContextSelector = memo(function MobileRunContextSelector({
  * the expanded width without remembered values that could go stale or latch
  * the strip compact. A small hysteresis keeps the boundary from flapping.
  */
-const COMPOSER_CONTEXT_MOTION_DURATION_MS = 180;
-const COMPOSER_CONTEXT_MOTION_EASING = "cubic-bezier(0.32, 0.72, 0, 1)";
-const COMPOSER_CONTEXT_LABEL_SELECTOR = "[data-composer-label]";
-
 function useLabelsOverflow(element: HTMLDivElement | null): boolean {
   const [overflows, setOverflows] = useState(false);
   const pendingLabelRectsRef = useRef<Map<HTMLElement, DOMRect> | null>(null);
@@ -380,17 +408,11 @@ function useLabelsOverflow(element: HTMLDivElement | null): boolean {
       needed += width;
     }
     needed += stripGap * Math.max(0, groups - 1);
+    const range = document.createRange();
     for (const label of current.querySelectorAll<HTMLElement>("[data-composer-label]")) {
-      // The clipping can happen below the marker (SelectValue truncates
-      // internally), where the outer span's scrollWidth matches its clipped
-      // box. The text's real width is the largest scrollWidth in the subtree.
-      let textWidth = label.scrollWidth;
-      for (const inner of label.querySelectorAll<HTMLElement>("*")) {
-        textWidth = Math.max(textWidth, inner.scrollWidth);
-      }
       // Subtract the visible width even during an animation. The content
       // sum already includes it; only the hidden text needs reserving.
-      needed += Math.max(0, textWidth - label.getBoundingClientRect().width);
+      needed += Math.max(0, labelTextWidth(label, range) - label.getBoundingClientRect().width);
     }
     const nextOverflows = resolveContextStripLabelsCompact({
       compact,
@@ -489,7 +511,7 @@ export const BranchToolbar = memo(function BranchToolbar({
   showGitControls,
   draftId,
   onEnvModeChange,
-  effectiveEnvModeOverride,
+  envMode,
   activeThreadBranchOverride,
   onActiveThreadBranchOverrideChange,
   startFromOrigin,
@@ -524,13 +546,7 @@ export const BranchToolbar = memo(function BranchToolbar({
   const activeWorktreePath = forceNewWorktree
     ? null
     : (serverThread?.worktreePath ?? draftThread?.worktreePath ?? null);
-  const effectiveEnvMode =
-    (forceNewWorktree ? "worktree" : effectiveEnvModeOverride) ??
-    resolveEffectiveEnvMode({
-      activeWorktreePath,
-      hasServerThread: serverThread !== null,
-      draftThreadEnvMode: draftThread?.envMode,
-    });
+  const effectiveEnvMode = forceNewWorktree ? "worktree" : envMode;
   const envModeLocked = envLocked || (serverThread !== null && activeWorktreePath !== null);
 
   // "Previous worktree" hops a draft into the most recently active worktree
@@ -630,6 +646,7 @@ export const BranchToolbar = memo(function BranchToolbar({
             activeWorktreePath={activeWorktreePath}
             onEnvModeChange={onEnvModeChange}
             previousWorktreeLabel={previousWorktreeLabel}
+            previousWorktreeBranch={previousWorktreeSeed?.branch ?? null}
             onUsePreviousWorktree={onUsePreviousWorktree}
           />
         </div>
@@ -669,6 +686,7 @@ export const BranchToolbar = memo(function BranchToolbar({
               activeWorktreePath={activeWorktreePath}
               onEnvModeChange={onEnvModeChange}
               previousWorktreeLabel={previousWorktreeLabel}
+              previousWorktreeBranch={previousWorktreeSeed?.branch ?? null}
               onUsePreviousWorktree={onUsePreviousWorktree}
             />
           ) : null}
@@ -696,11 +714,7 @@ export const BranchToolbar = memo(function BranchToolbar({
           threadId={threadId}
           {...(draftId ? { draftId } : {})}
           envLocked={envLocked}
-          {...(forceNewWorktree
-            ? { effectiveEnvModeOverride: "worktree" }
-            : effectiveEnvModeOverride
-              ? { effectiveEnvModeOverride }
-              : {})}
+          effectiveEnvModeOverride={effectiveEnvMode}
           {...(activeThreadBranchOverride !== undefined ? { activeThreadBranchOverride } : {})}
           {...(onActiveThreadBranchOverrideChange ? { onActiveThreadBranchOverrideChange } : {})}
           startFromOrigin={startFromOrigin}
diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index ed8f1cd1f026..c28bb4752811 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -59,6 +59,7 @@ import {
   useLinkedThreadPullRequest,
 } from "./ThreadStatusIndicators";
 import { Button } from "./ui/button";
+import { ComposerControl } from "./chat/ComposerControl";
 import { Switch } from "./ui/switch";
 import { getVirtualizedScrollFadeClassName } from "./ui/scroll-area";
 import {
@@ -703,7 +704,6 @@ export function BranchToolbarBranchSelector({
           key={itemValue}
           index={index}
           value={itemValue}
-          className="pe-2"
           onClick={() => selectPickerItem(itemValue)}
         >
           <div className="flex min-w-0 items-center gap-2 py-1">
@@ -725,7 +725,6 @@ export function BranchToolbarBranchSelector({
           key={itemValue}
           index={index}
           value={itemValue}
-          className="pe-1.5"
           onClick={() => selectPickerItem(itemValue)}
         >
           <span className="truncate">Create new ref &quot;{newRefName}&quot;</span>
@@ -753,13 +752,12 @@ export function BranchToolbarBranchSelector({
         key={itemValue}
         index={index}
         value={itemValue}
-        className="pe-1.5"
         onClick={() => selectPickerItem(itemValue)}
         onContextMenu={(event) => handleBranchContextMenu(event, itemValue)}
       >
         <div className="flex w-full min-w-0 items-center justify-between gap-2">
           <MiddleTruncate value={itemValue} className="flex-1" />
-          {badge && <span className="shrink-0 text-[10px] text-muted-foreground/45">{badge}</span>}
+          {badge && <span className="shrink-0 text-3xs text-muted-foreground/45">{badge}</span>}
         </div>
       </ComboboxItem>
     );
@@ -790,12 +788,12 @@ export function BranchToolbarBranchSelector({
         data-composer-context-control
       >
         <ThreadPullRequestBadgeControl
-          variant="ghost"
+          render={<ComposerControl size="xs" />}
           badge={prBadge}
           number={prNumber}
           url={prUrl}
           status={displayedPrStatus}
-          onOpenStack={() => useRightPanelStore.getState().open(threadRef, "pull-requests")}
+          onOpenList={() => useRightPanelStore.getState().open(threadRef, "pull-requests")}
           onOpenPullRequest={(event) => {
             if (prUrl) openPrLink(event, prUrl);
           }}
@@ -808,10 +806,10 @@ export function BranchToolbarBranchSelector({
           onContextMenu={(event) => handleBranchContextMenu(event, resolvedActiveBranch)}
         >
           <ComboboxTrigger
-            render={<Button variant="ghost" size="xs" />}
+            render={<ComposerControl size="xs" />}
             // No press-scale: the popup aligns live to this trigger, so a
             // momentary 0.97 shrink would drag the open popup ~3px sideways.
-            className="min-w-0 max-w-full font-normal text-muted-foreground/70 text-xs! hover:text-foreground/80 active:scale-100"
+            className="min-w-0 max-w-full active:scale-100"
             disabled={isInitialBranchesLoadPending || isBranchActionPending}
           >
             <GitBranchIcon className="size-3 shrink-0 opacity-70" />
@@ -819,11 +817,12 @@ export function BranchToolbarBranchSelector({
               data-composer-label
               className="min-w-0 max-w-[240px] group-data-[compact]/composer-context:max-w-0"
             >
-              <MiddleTruncate
-                value={triggerLabel}
+              <span
                 data-composer-label-motion
-                className="flex w-full max-w-[240px] transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
-              />
+                className="flex w-full max-w-[240px] transition-opacity duration-180 ease-drawer group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
+              >
+                <MiddleTruncate value={triggerLabel} />
+              </span>
             </span>
             <ChevronDownIcon className="size-3 shrink-0 opacity-50" />
           </ComboboxTrigger>
@@ -918,7 +917,7 @@ export function BranchToolbarBranchSelector({
                   </label>
                 }
               />
-              <TooltipPopup side="top" className="max-w-72 whitespace-normal leading-tight">
+              <TooltipPopup side="top">
                 Creates the worktree from the latest matching branch on origin instead of your local
                 branch.
               </TooltipPopup>
diff --git a/apps/web/src/components/BranchToolbarEnvModeSelector.tsx b/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
index bdb4594d8cbf..7275b57d8a6b 100644
--- a/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
+++ b/apps/web/src/components/BranchToolbarEnvModeSelector.tsx
@@ -1,4 +1,4 @@
-import { FolderGit2Icon, FolderGitIcon, FolderIcon, HistoryIcon } from "lucide-react";
+import { FolderGit2Icon, FolderGitIcon, FolderIcon } from "lucide-react";
 import { memo, useMemo } from "react";
 
 import {
@@ -8,6 +8,7 @@ import {
   type EnvMode,
 } from "./BranchToolbar.logic";
 import { useComposerMenuProps } from "./chat/composerEventScope";
+import { PreviousWorktreeItemContent } from "./PreviousWorktreeItemContent";
 import {
   Select,
   SelectGroup,
@@ -28,6 +29,7 @@ interface BranchToolbarEnvModeSelectorProps {
   activeWorktreePath: string | null;
   onEnvModeChange: (mode: EnvMode) => void;
   previousWorktreeLabel?: string | null;
+  previousWorktreeBranch?: string | null;
   onUsePreviousWorktree?: () => void;
 }
 
@@ -38,6 +40,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
   activeWorktreePath,
   onEnvModeChange,
   previousWorktreeLabel,
+  previousWorktreeBranch = null,
   onUsePreviousWorktree,
 }: BranchToolbarEnvModeSelectorProps) {
   const composerFloatingLayerProps = useComposerMenuProps();
@@ -60,13 +63,13 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
       <Tooltip>
         <TooltipTrigger
           render={<span />}
-          className="inline-flex h-7 min-w-0 items-center gap-1 border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
+          className="inline-flex h-7 min-w-0 items-center gap-1 border border-transparent px-1.75 font-normal text-muted-foreground/70 text-xs sm:h-6"
           data-composer-context-control
         >
-          {forceNewWorktree ? (
-            <FolderGit2Icon className="size-3 shrink-0" />
-          ) : activeWorktreePath ? (
+          {activeWorktreePath ? (
             <FolderGitIcon className="size-3 shrink-0" />
+          ) : effectiveEnvMode === "worktree" ? (
+            <FolderGit2Icon className="size-3 shrink-0" />
           ) : (
             <FolderIcon className="size-3 shrink-0" />
           )}
@@ -76,18 +79,16 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
           >
             <span
               data-composer-label-motion
-              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
+              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-drawer group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
             >
-              {forceNewWorktree
-                ? resolveEnvModeLabel("worktree")
-                : resolveLockedWorkspaceLabel(activeWorktreePath)}
+              {resolveLockedWorkspaceLabel(activeWorktreePath, effectiveEnvMode)}
             </span>
           </span>
         </TooltipTrigger>
         <TooltipPopup>
           {forceNewWorktree
             ? "Each model starts in its own worktree."
-            : resolveLockedWorkspaceLabel(activeWorktreePath)}
+            : resolveLockedWorkspaceLabel(activeWorktreePath, effectiveEnvMode)}
         </TooltipPopup>
       </Tooltip>
     );
@@ -112,7 +113,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
             <SelectTrigger
               variant="ghost"
               size="xs"
-              className="min-w-0 shrink font-normal text-xs!"
+              className="min-w-0 shrink"
               aria-label="Workspace"
               data-composer-shortcut="composer.workspace"
               data-composer-context-control
@@ -132,7 +133,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
           >
             <span
               data-composer-label-motion
-              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
+              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-drawer group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
             >
               <SelectValue />
             </span>
@@ -144,7 +145,11 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
             : resolveCurrentWorkspaceLabel(activeWorktreePath)}
         </TooltipPopup>
       </Tooltip>
-      <SelectPopup alignItemWithTrigger={false} {...composerFloatingLayerProps}>
+      <SelectPopup
+        alignItemWithTrigger={false}
+        className={showPreviousWorktree ? "w-[min(21rem,calc(100vw-2rem))]" : undefined}
+        {...composerFloatingLayerProps}
+      >
         <SelectGroup>
           <SelectGroupLabel>Workspace</SelectGroupLabel>
           <SelectItem value="local">
@@ -165,10 +170,7 @@ export const BranchToolbarEnvModeSelector = memo(function BranchToolbarEnvModeSe
           </SelectItem>
           {showPreviousWorktree && previousWorktreeLabel ? (
             <SelectItem value={PREVIOUS_WORKTREE_SELECT_VALUE}>
-              <span className="inline-flex items-center gap-1.5">
-                <HistoryIcon className="size-3" />
-                {previousWorktreeLabel}
-              </span>
+              <PreviousWorktreeItemContent branch={previousWorktreeBranch} />
             </SelectItem>
           ) : null}
         </SelectGroup>
diff --git a/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx b/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
index a29bb92e83d0..69062323ab3f 100644
--- a/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
+++ b/apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
@@ -63,7 +63,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
       <Tooltip>
         <TooltipTrigger
           render={<span />}
-          className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-[calc(--spacing(2)-1px)] font-normal text-muted-foreground/70 text-xs sm:h-6"
+          className="inline-flex h-7 min-w-0 max-w-full items-center gap-1 border border-transparent px-1.75 font-normal text-muted-foreground/70 text-xs sm:h-6"
           data-composer-context-control
         >
           <EnvironmentMachineIcon
@@ -76,7 +76,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
           >
             <span
               data-composer-label-motion
-              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
+              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-drawer group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
             >
               {activeEnvironment?.label ?? "Run on"}
             </span>
@@ -102,7 +102,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
             <SelectTrigger
               variant="ghost"
               size="xs"
-              className="min-w-0 max-w-full font-normal text-xs!"
+              className="min-w-0 max-w-full"
               aria-label="Run on"
               data-composer-shortcut="composer.host"
               data-composer-context-control
@@ -123,7 +123,7 @@ export const BranchToolbarEnvironmentSelector = memo(function BranchToolbarEnvir
           >
             <span
               data-composer-label-motion
-              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-[cubic-bezier(0.32,0.72,0,1)] group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
+              className="block w-full min-w-0 max-w-[240px] truncate transition-opacity duration-180 ease-drawer group-data-[compact]/composer-context:opacity-0 motion-reduce:transition-none"
             >
               <SelectValue />
             </span>
diff --git a/apps/web/src/components/ChatMarkdown.test.tsx b/apps/web/src/components/ChatMarkdown.test.tsx
index 3e1222e0ebb9..cb25e6938fa7 100644
--- a/apps/web/src/components/ChatMarkdown.test.tsx
+++ b/apps/web/src/components/ChatMarkdown.test.tsx
@@ -179,6 +179,75 @@ describe("ChatMarkdown favicon privacy", () => {
 });
 
 describe("ChatMarkdown streaming", () => {
+  it("runs only a complete single-line shell block after a click", async () => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    const onRunShellCommand = vi.fn();
+    let renderer: ReactTestRenderer | undefined;
+    const message = (text: string, isStreaming = false) => (
+      <ChatMarkdown
+        cwd="/tmp/project"
+        text={text}
+        isStreaming={isStreaming}
+        onRunShellCommand={onRunShellCommand}
+      />
+    );
+    try {
+      await act(async () => {
+        renderer = create(message("```bash\necho hello\n```", true));
+      });
+      const mounted = renderer!;
+      expect(
+        mounted.root
+          .findAllByType(Button)
+          .some((button) => button.props["aria-label"] === "Run in terminal"),
+      ).toBe(false);
+
+      await act(async () => {
+        mounted.update(message("```bash\necho hello\n```"));
+      });
+      await act(async () => {
+        codeButton(mounted, "Run in terminal").onClick?.({} as never);
+      });
+      expect(onRunShellCommand).toHaveBeenCalledExactlyOnceWith("echo hello");
+
+      for (const text of [
+        "~~~bash\necho tilde\n~~~",
+        "> ```bash\n> echo quote\n> ```",
+        "````bash\necho four\n````",
+      ]) {
+        await act(async () => {
+          mounted.update(message(text));
+        });
+        expect(codeButton(mounted, "Run in terminal")).toBeDefined();
+      }
+
+      for (const text of [
+        "```bash\necho one\necho two\n```",
+        "```typescript\necho hello\n```",
+        "```bash\n\n```",
+        "```bash\necho hello\n\n```",
+        "```bash\necho hello\\\n```",
+        "```bash\necho safe \u202e#\n```",
+        "```bash\necho incomplete",
+        "~~~bash\necho incomplete",
+        "````bash\necho incomplete\n```",
+        '<pre><code class="language-bash">echo html</code></pre>',
+      ]) {
+        await act(async () => {
+          mounted.update(message(text));
+        });
+        expect(
+          mounted.root
+            .findAllByType(Button)
+            .some((button) => button.props["aria-label"] === "Run in terminal"),
+        ).toBe(false);
+      }
+    } finally {
+      await act(async () => renderer?.unmount());
+      vi.unstubAllGlobals();
+    }
+  });
+
   it("does not retokenize completed lines when streaming finishes", async () => {
     const highlighter = await getSyntaxHighlighterPromise("typescript");
     const highlight = vi.spyOn(highlighter, "codeToHast");
@@ -639,7 +708,7 @@ describe("ChatMarkdown artifact-template cards", () => {
     );
 
     expect(html).not.toContain("::artifact-template");
-    expect(html).toContain("chat-markdown-artifact-template");
+    expect(html).toContain("data-chat-markdown-artifact-template");
     expect(html).toContain('data-artifact-kind="document"');
     expect(html).toContain('data-markdown-copy="Hello World (Document template)\n\n"');
     expect(html).toContain('data-skill-name="artifact-template-hello-world"');
@@ -654,7 +723,7 @@ describe("ChatMarkdown artifact-template cards", () => {
       <ChatMarkdown cwd="/tmp/project" text={ARTIFACT_TEMPLATE_DIRECTIVE} />,
     );
 
-    expect(html).toContain("chat-markdown-artifact-template");
+    expect(html).toContain("data-chat-markdown-artifact-template");
     expect(html).not.toContain("Use template");
   });
 
@@ -666,7 +735,7 @@ describe("ChatMarkdown artifact-template cards", () => {
     for (const text of [malformed, unfinished]) {
       const html = renderToStaticMarkup(<ChatMarkdown cwd="/tmp/project" text={text} />);
       expect(html).toContain("::artifact-template");
-      expect(html).not.toContain("chat-markdown-artifact-template");
+      expect(html).not.toContain("data-chat-markdown-artifact-template");
     }
   });
 
@@ -678,7 +747,7 @@ describe("ChatMarkdown artifact-template cards", () => {
       const html = renderToStaticMarkup(<ChatMarkdown cwd="/tmp/project" text={text} />);
 
       expect(html).toContain("::artifact-template");
-      expect(html).not.toContain("chat-markdown-artifact-template");
+      expect(html).not.toContain("data-chat-markdown-artifact-template");
     }
   });
 
@@ -691,7 +760,7 @@ describe("ChatMarkdown artifact-template cards", () => {
     );
 
     expect(html.match(/::artifact-template/g)).toHaveLength(2);
-    expect(html).not.toContain("chat-markdown-artifact-template");
+    expect(html).not.toContain("data-chat-markdown-artifact-template");
   });
 });
 
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
index 3227e4abaa1b..0a57fa7cfa26 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -20,6 +20,7 @@ import {
   MessageSquareWarningIcon,
   Minimize2Icon,
   OctagonAlertIcon,
+  PlayIcon,
   PresentationIcon,
   SparklesIcon,
   TriangleAlertIcon,
@@ -105,7 +106,7 @@ import { markdownImageGallery, markdownImageItems } from "./chat/markdownImageGa
 import { MediaVideoPlayer } from "./media/MediaVideoPlayer";
 import { MediaActions, type MediaActionSource } from "./media/MediaActions";
 import { resolveProtocolRelativeMediaUrl } from "./media/mediaContent";
-import { CHAT_FILE_TAG_CHIP_CLASS_NAME, FileTagChipContent } from "./chat/FileTagChip";
+import { FileTagChipContent } from "./chat/FileTagChip";
 import { PierreEntryIcon } from "./chat/PierreEntryIcon";
 import {
   revealInFileExplorerLabelForKind,
@@ -119,6 +120,7 @@ import { resolveMarkdownFileLinkGesture } from "./chat/markdownFileLinkGesture";
 import { hasSpecificPierreIconForFileName, syntheticFileNameForLanguageId } from "../pierre-icons";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
 import { Button } from "./ui/button";
+import { ContextChip } from "./ContextChip";
 import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "./ui/collapsible";
 import { ScrollArea } from "./ui/scroll-area";
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from "./ui/menu";
@@ -215,6 +217,7 @@ interface ChatMarkdownProps {
   parseRawHtml?: boolean;
   /** Append a prompt that invokes a newly created artifact-template skill. */
   onUseArtifactTemplate?: ((template: CodexArtifactTemplate) => void) | undefined;
+  onRunShellCommand?: ((command: string) => void) | undefined;
   /** Directory that anchors relative links and images; defaults to `cwd`. Set
       to the file's own directory when rendering a markdown file. */
   imageBaseDir?: string | undefined;
@@ -299,7 +302,8 @@ function CodexArtifactTemplateCard(props: {
     <div
       role="group"
       aria-label={`${props.template.displayName} template`}
-      className="chat-markdown-artifact-template my-[0.65rem] flex w-full min-w-0 items-center gap-3 rounded-xl border border-border/70 bg-card/60 px-3 py-2.5 text-foreground shadow-xs"
+      data-chat-markdown-artifact-template
+      className="my-[0.65rem] flex w-full min-w-0 items-center gap-3 rounded-xl border border-border/70 bg-card/60 px-3 py-2.5 text-foreground shadow-xs"
       data-artifact-kind={props.template.artifactKind}
       data-markdown-copy={`${props.template.displayName} (${presentationLabel})\n\n`}
       data-skill-name={props.template.skillName}
@@ -307,7 +311,7 @@ function CodexArtifactTemplateCard(props: {
       <div className="flex min-w-0 flex-1 items-center gap-3">
         <span className="relative flex size-9 shrink-0 items-center justify-center rounded-lg border border-border/70 bg-background text-muted-foreground shadow-xs">
           <Icon aria-hidden className="size-5" />
-          <span className="absolute -right-1 -bottom-1 flex size-4 items-center justify-center rounded-full border border-background bg-fuchsia-500 text-white shadow-xs">
+          <span className="absolute -right-1 -bottom-1 flex size-4 items-center justify-center rounded-full border border-background bg-primary text-primary-foreground shadow-xs">
             <SparklesIcon aria-hidden className="size-2.5" />
           </span>
         </span>
@@ -584,6 +588,23 @@ function extractPreCodeMeta(node: unknown): string | undefined {
   return typeof meta === "string" && meta.trim().length > 0 ? meta.trim() : undefined;
 }
 
+function isClosedCodeFence(node: ReactMarkdownExtraProps["node"], text: string): boolean {
+  const start = node?.position?.start.offset;
+  const end = node?.position?.end.offset;
+  if (start === undefined || end === undefined) return false;
+  const source = text.slice(start, end);
+  const opening = /^(?:`{3,}|~{3,})/.exec(source)?.[0];
+  // One class for the blockquote prefix: nested quantifiers here backtrack
+  // exponentially on code lines that start with many `> ` markers.
+  const closing = /(?:^|\n)[ \t>]*(`{3,}|~{3,})[ \t\r]*$/.exec(source)?.[1];
+  return (
+    opening !== undefined &&
+    closing !== undefined &&
+    opening[0] === closing[0] &&
+    closing.length >= opening.length
+  );
+}
+
 type MarkdownAstNode = {
   type?: string;
   meta?: unknown;
@@ -773,7 +794,7 @@ function MarkdownTable({ children, ...props }: React.ComponentProps<"table">) {
       className="chat-markdown-table-container"
       data-expanded={expanded ? "true" : "false"}
     >
-      <ScrollArea chainVerticalScroll scrollFade className="w-full max-w-full rounded-none">
+      <ScrollArea radius="none" chainVerticalScroll scrollFade className="w-full max-w-full">
         <table ref={tableRef} {...props}>
           {children}
         </table>
@@ -784,9 +805,8 @@ function MarkdownTable({ children, ...props }: React.ComponentProps<"table">) {
             render={
               <Button
                 type="button"
-                variant="ghost"
+                variant={expanded ? "secondary" : "ghost-muted"}
                 size="icon-xs"
-                className="chat-markdown-chrome-action"
                 aria-pressed={expanded}
                 onClick={toggleExpanded}
                 aria-label={expandLabel}
@@ -805,9 +825,8 @@ function MarkdownTable({ children, ...props }: React.ComponentProps<"table">) {
                   render={
                     <Button
                       type="button"
-                      variant="ghost"
+                      variant="ghost-muted"
                       size="icon-xs"
-                      className="chat-markdown-chrome-action"
                       aria-label={copyLabel}
                     />
                   }
@@ -845,32 +864,33 @@ function MarkdownDetails({
   const content = childNodes.filter((_, index) => index !== summaryIndex);
 
   return (
-    <Collapsible
-      defaultOpen={open}
-      onOpenChange={setIsOpen}
-      className="chat-markdown-details my-2 border-y border-border/60"
-      data-markdown-details=""
-      data-markdown-details-open={isOpen ? "true" : "false"}
-    >
-      <CollapsibleTrigger
-        className="flex w-full items-center gap-2 py-2 text-left text-sm font-medium text-foreground data-panel-open:[&_svg]:rotate-90"
-        data-markdown-details-summary=""
+    <div className="my-2 border-y border-border/60">
+      <Collapsible
+        defaultOpen={open}
+        onOpenChange={setIsOpen}
+        data-markdown-details=""
+        data-markdown-details-open={isOpen ? "true" : "false"}
       >
-        <ChevronRightIcon
-          className="size-4 shrink-0 text-muted-foreground transition-transform"
-          aria-hidden
-        />
-        <span>{summary}</span>
-      </CollapsibleTrigger>
-      <CollapsiblePanel>
-        <div
-          className="pb-3 ps-6 text-foreground/[calc(80%+var(--appearance-contrast-boost)/5)]"
-          data-markdown-details-content=""
+        <CollapsibleTrigger
+          className="flex w-full items-center gap-2 py-2 text-left text-sm font-medium text-foreground data-panel-open:[&_svg]:rotate-90"
+          data-markdown-details-summary=""
         >
-          {content}
-        </div>
-      </CollapsiblePanel>
-    </Collapsible>
+          <ChevronRightIcon
+            className="size-4 shrink-0 text-muted-foreground transition-transform"
+            aria-hidden
+          />
+          <span>{summary}</span>
+        </CollapsibleTrigger>
+        <CollapsiblePanel>
+          <div
+            className="pb-3 ps-6 text-foreground/[calc(80%+var(--appearance-contrast-boost)/5)]"
+            data-markdown-details-content=""
+          >
+            {content}
+          </div>
+        </CollapsiblePanel>
+      </Collapsible>
+    </div>
   );
 }
 
@@ -920,12 +940,16 @@ function MarkdownCodeBlock({
   language,
   fenceTitle,
   theme,
+  onRunShellCommand,
+  isStreaming,
   children,
 }: {
   code: string;
   language: string;
   fenceTitle: string | null;
   theme: "light" | "dark";
+  onRunShellCommand?: ((command: string) => void) | undefined;
+  isStreaming: boolean;
   children: ReactNode;
 }) {
   const [copied, setCopied] = useState(false);
@@ -933,6 +957,17 @@ function MarkdownCodeBlock({
   const copiedTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const wrapLabel = wrapped ? "Disable line wrap" : "Wrap lines";
   const copyLabel = copied ? "Copied" : "Copy code";
+  const command = code.trim();
+  const canRun =
+    onRunShellCommand !== undefined &&
+    !isStreaming &&
+    /^(?:sh|bash|zsh|fish|shell|powershell|pwsh)$/.test(language) &&
+    code.endsWith("\n") &&
+    command.length > 0 &&
+    !command.endsWith("\\") &&
+    // Control and invisible format characters (bidi overrides, zero-width) can
+    // make the rendered command differ from what the terminal would receive.
+    !/[\p{Cc}\p{Cf}]/u.test(code.slice(0, -1));
 
   const handleCopy = useCallback(() => {
     if (typeof navigator === "undefined" || navigator.clipboard == null) {
@@ -974,12 +1009,12 @@ function MarkdownCodeBlock({
 
   return (
     <div
-      className="chat-markdown-codeblock my-[0.65rem] overflow-hidden rounded-[var(--radius)] border border-border/70 bg-secondary leading-snug dark:border-transparent dark:bg-input/32"
+      className="chat-markdown-codeblock my-[0.65rem] overflow-hidden rounded-lg border border-border/70 bg-secondary leading-snug dark:border-transparent dark:bg-input/32"
       data-language={language}
       data-wrap={wrapped ? "true" : "false"}
     >
       <div className="chat-markdown-codeblock-header flex items-center justify-between gap-2 pt-1.5 pr-1.5 pb-0 pl-3 select-none">
-        <span className="inline-flex min-w-0 items-center gap-[0.4rem] [font-family:var(--font-mono,ui-monospace,SFMono-Regular,monospace)] [font-size:0.6875rem]">
+        <span className="inline-flex min-w-0 items-center gap-1.5 font-mono text-2xs">
           <MarkdownCodeBlockTitleContent
             fenceTitle={fenceTitle}
             language={language}
@@ -992,9 +1027,8 @@ function MarkdownCodeBlock({
               render={
                 <Button
                   type="button"
-                  variant="ghost"
+                  variant={wrapped ? "secondary" : "ghost-muted"}
                   size="icon-xs"
-                  className="chat-markdown-chrome-action"
                   aria-pressed={wrapped}
                   onClick={() => setWrapped((value) => !value)}
                   aria-label={wrapLabel}
@@ -1005,14 +1039,31 @@ function MarkdownCodeBlock({
             </TooltipTrigger>
             <TooltipPopup side="top">{wrapLabel}</TooltipPopup>
           </Tooltip>
+          {canRun ? (
+            <Tooltip>
+              <TooltipTrigger
+                render={
+                  <Button
+                    type="button"
+                    variant="ghost-muted"
+                    size="icon-xs"
+                    onClick={() => onRunShellCommand(command)}
+                    aria-label="Run in terminal"
+                  />
+                }
+              >
+                <PlayIcon className="size-3" />
+              </TooltipTrigger>
+              <TooltipPopup side="top">Run in terminal</TooltipPopup>
+            </Tooltip>
+          ) : null}
           <Tooltip>
             <TooltipTrigger
               render={
                 <Button
                   type="button"
-                  variant="ghost"
+                  variant="ghost-muted"
                   size="icon-xs"
-                  className="chat-markdown-chrome-action"
                   onClick={handleCopy}
                   aria-label={copyLabel}
                 />
@@ -1159,11 +1210,9 @@ interface MarkdownFileLinkProps {
   /** Platform-specific menu label ("Reveal in Finder", ...); required for the
       reveal item to show. */
   revealLabel?: string | undefined;
-  className?: string | undefined;
 }
 
-const MARKDOWN_FILE_CHIP_CLASS_NAME = "chat-markdown-file-link";
-const MARKDOWN_FILE_LINK_CLASS_NAME = `${MARKDOWN_FILE_CHIP_CLASS_NAME} cursor-pointer transition-colors hover:bg-accent/70 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/70`;
+const MARKDOWN_FILE_LINK_CLASS_NAME = "chat-markdown-file-link";
 
 function pathParentSegments(path: string): string[] {
   const normalized = path.replaceAll("\\", "/");
@@ -1899,7 +1948,6 @@ const MarkdownFileLink = memo(function MarkdownFileLink({
   onOpenMedia,
   onReveal,
   revealLabel,
-  className,
 }: MarkdownFileLinkProps) {
   const handleOpenInEditor = useCallback(() => {
     if (!onOpen) {
@@ -2229,13 +2277,10 @@ const MarkdownFileLink = memo(function MarkdownFileLink({
       <TooltipTrigger
         render={
           hasPrimaryAction ? (
-            <a
-              href={href}
-              className={cn(
-                CHAT_FILE_TAG_CHIP_CLASS_NAME,
-                MARKDOWN_FILE_LINK_CLASS_NAME,
-                className,
-              )}
+            <ContextChip
+              kind="mention"
+              render={<a href={href} />}
+              className={MARKDOWN_FILE_LINK_CLASS_NAME}
               data-markdown-copy={copyMarkdown}
               onClick={(event) => {
                 event.preventDefault();
@@ -2252,35 +2297,28 @@ const MarkdownFileLink = memo(function MarkdownFileLink({
               }}
               onContextMenu={handleContextMenu}
             >
-              <FileTagChipContent path={iconPath} label={label} theme={theme} selectable />
-            </a>
+              <FileTagChipContent path={iconPath} label={label} theme={theme} />
+            </ContextChip>
           ) : (
-            <button
-              type="button"
+            <ContextChip
+              kind="mention"
+              render={<button type="button" />}
               aria-label={`File options for ${label}`}
               aria-haspopup="menu"
-              className={cn(
-                CHAT_FILE_TAG_CHIP_CLASS_NAME,
-                MARKDOWN_FILE_LINK_CLASS_NAME,
-                "select-text",
-                className,
-              )}
+              className={cn(MARKDOWN_FILE_LINK_CLASS_NAME, "select-text")}
               data-markdown-copy={copyMarkdown}
               onClick={handleContextMenu}
               onContextMenu={handleContextMenu}
             >
-              <FileTagChipContent path={iconPath} label={label} theme={theme} selectable />
-            </button>
+              <FileTagChipContent path={iconPath} label={label} theme={theme} />
+            </ContextChip>
           )
         }
       />
-      <TooltipPopup
-        side="top"
-        className="max-w-[min(40rem,calc(100vw-2rem))] font-mono text-[11px] leading-tight"
-      >
+      <TooltipPopup side="top" variant="code">
         {/* The full path: the chip already shows the shortened form, and a link
             to the workspace root collapses to a bare label that repeats it. */}
-        <div className="overflow-x-auto whitespace-nowrap [scrollbar-color:color-mix(in_srgb,var(--contrast-border)_78%,transparent)_transparent] [scrollbar-width:thin] [&::-webkit-scrollbar]:h-1.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-[color-mix(in_srgb,var(--contrast-border)_78%,transparent)] [&::-webkit-scrollbar-track]:bg-transparent">
+        <div className="overflow-x-auto whitespace-nowrap scrollbar-thumb-border/78 scrollbar-track-transparent [scrollbar-width:thin] [&::-webkit-scrollbar]:h-1.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-border/78 [&::-webkit-scrollbar-track]:bg-transparent">
           {targetPath}
         </div>
       </TooltipPopup>
@@ -2310,8 +2348,7 @@ function areMarkdownFileLinkPropsEqual(
     previous.onOpenInBrowser === next.onOpenInBrowser &&
     previous.onOpenMedia === next.onOpenMedia &&
     previous.onReveal === next.onReveal &&
-    previous.revealLabel === next.revealLabel &&
-    previous.className === next.className
+    previous.revealLabel === next.revealLabel
   );
 }
 
@@ -2325,6 +2362,7 @@ function useChatMarkdownState({
   isStreaming = false,
   skills = EMPTY_MARKDOWN_SKILLS,
   onUseArtifactTemplate,
+  onRunShellCommand,
   imageBaseDir,
   onImageExpand,
   renderContextReference,
@@ -2660,12 +2698,7 @@ function useChatMarkdownState({
     [cwd, findWorkspaceBasenameMatch, revealFileInFileManager],
   );
   const fileLinkChip = useCallback(
-    (
-      fileLinkMeta: MarkdownFileLinkMeta,
-      copyMarkdown: string,
-      className?: string,
-      mediaSource?: string,
-    ) => {
+    (fileLinkMeta: MarkdownFileLinkMeta, copyMarkdown: string, mediaSource?: string) => {
       const parentSuffix = fileLinkParentSuffixByPath.get(
         fileLinkMeta.filePath.replaceAll("\\", "/"),
       );
@@ -2723,7 +2756,6 @@ function useChatMarkdownState({
               ? () => openMarkdownFileInPreview(fileLinkMeta.filePath)
               : undefined
           }
-          className={className}
         />
       );
     },
@@ -2759,6 +2791,7 @@ function useChatMarkdownState({
       markdownFileLinkMetaByHref,
       onTaskListChange,
       onUseArtifactTemplate,
+      onRunShellCommand,
       openChangeRequestLink,
       openDeferredMarkdownLink,
       openExternalLinkInPreview,
@@ -2789,6 +2822,7 @@ function useChatMarkdownState({
       markdownFileLinkMetaByHref,
       onTaskListChange,
       onUseArtifactTemplate,
+      onRunShellCommand,
       openChangeRequestLink,
       openDeferredMarkdownLink,
       openExternalLinkInPreview,
@@ -3150,12 +3184,7 @@ const CHAT_MARKDOWN_COMPONENTS = {
       return (
         <Tooltip>
           <TooltipTrigger render={link} />
-          <TooltipPopup
-            side="top"
-            className="max-w-[min(36rem,calc(100vw-2rem))] whitespace-normal leading-tight wrap-anywhere"
-          >
-            {href}
-          </TooltipPopup>
+          <TooltipPopup side="top">{href}</TooltipPopup>
         </Tooltip>
       );
     }
@@ -3163,7 +3192,6 @@ const CHAT_MARKDOWN_COMPONENTS = {
     return fileLinkChip(
       fileLinkMeta,
       `[${fileLinkMeta.basename}](${normalizedHref})`,
-      props.className,
       normalizedHref,
     );
   },
@@ -3180,7 +3208,6 @@ const CHAT_MARKDOWN_COMPONENTS = {
         return fileLinkChip(
           fileLinkMeta,
           `\`${codeText}\``,
-          undefined,
           inlineCodeFilePathCandidate(codeText) ?? codeText.trim(),
         );
       }
@@ -3327,7 +3354,9 @@ const CHAT_MARKDOWN_COMPONENTS = {
     return <MarkdownDetails open={detailsOpen}>{children}</MarkdownDetails>;
   },
   pre: function MarkdownPre({ node, children, ...props }) {
-    const { resolvedTheme, diffThemeName, isStreaming } = use(ChatMarkdownRendererContext);
+    const { resolvedTheme, diffThemeName, isStreaming, onRunShellCommand, text } = use(
+      ChatMarkdownRendererContext,
+    );
     const codeBlock = extractCodeBlock(children);
     if (!codeBlock) {
       return <pre {...props}>{children}</pre>;
@@ -3341,6 +3370,12 @@ const CHAT_MARKDOWN_COMPONENTS = {
         language={language}
         fenceTitle={fenceTitle}
         theme={resolvedTheme}
+        onRunShellCommand={
+          onRunShellCommand && !isStreaming && isClosedCodeFence(node, text)
+            ? onRunShellCommand
+            : undefined
+        }
+        isStreaming={isStreaming}
       >
         <RenderErrorBoundary
           resetKeys={[codeBlock.code, language, diffThemeName, isStreaming]}
diff --git a/apps/web/src/components/ChatView.logic.test.ts b/apps/web/src/components/ChatView.logic.test.ts
index a2897ce3ddb0..a2708de8bda3 100644
--- a/apps/web/src/components/ChatView.logic.test.ts
+++ b/apps/web/src/components/ChatView.logic.test.ts
@@ -12,7 +12,7 @@ import {
   TurnId,
   type WorktreeSetupSnapshot,
 } from "@t3tools/contracts";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
+import { afterEach, describe, expect, it, vi } from "vite-plus/test";
 import { Atom, AsyncResult } from "effect/unstable/reactivity";
 import { appAtomRegistry } from "../rpc/atomRegistry";
 import { environmentThreadDetails } from "../state/threads";
@@ -86,7 +86,6 @@ import {
   shouldShowBranchMismatchBanner,
   shouldShowPlanFollowUpPrompt,
   shouldWriteThreadErrorToCurrentServerThread,
-  toolGroupConsumesUpwardNavigation,
   waitForRevertedMessage,
   prepareRevertedMessageAttachments,
 } from "./ChatView.logic";
@@ -446,134 +445,6 @@ describe("proactive panels", () => {
   });
 });
 
-describe("toolGroupConsumesUpwardNavigation", () => {
-  class ScrollElement extends EventTarget {
-    scrollTop = 0;
-    scrollHeight = 100;
-    clientHeight = 100;
-    overflowY = "visible";
-
-    constructor(
-      readonly parentElement: ScrollElement | null = null,
-      readonly isToolGroup = false,
-    ) {
-      super();
-    }
-
-    closest(selector: string): ScrollElement | null {
-      if (selector !== "[data-tool-group-scroll]") return null;
-      return this.isToolGroup ? this : (this.parentElement?.closest(selector) ?? null);
-    }
-  }
-
-  beforeEach(() => {
-    vi.stubGlobal("Element", ScrollElement);
-    vi.stubGlobal("getComputedStyle", (element: ScrollElement) => ({
-      overflowY: element.overflowY,
-    }));
-  });
-  afterEach(() => vi.unstubAllGlobals());
-
-  it("releases upward navigation when an overflowing group is at the top", () => {
-    const group = Object.assign(new ScrollElement(null, true), {
-      overflowY: "auto",
-      scrollHeight: 300,
-    });
-
-    expect(toolGroupConsumesUpwardNavigation(new ScrollElement(group))).toBe(false);
-  });
-
-  it.each([
-    { overflowY: "auto", scrollTop: 1 },
-    { overflowY: "auto", scrollTop: 0.25 },
-    { overflowY: "scroll", scrollTop: 80 },
-  ])("consumes upward navigation within a scrolled group: %j", (scroll) => {
-    const group = Object.assign(new ScrollElement(null, true), {
-      scrollHeight: 300,
-      ...scroll,
-    });
-
-    expect(toolGroupConsumesUpwardNavigation(group)).toBe(true);
-  });
-
-  it.each([100, 300])(
-    "consumes scrolling in a nested result with a group content height of %i",
-    (scrollHeight) => {
-      const group = Object.assign(new ScrollElement(null, true), {
-        overflowY: "auto",
-        scrollHeight,
-      });
-      const result = Object.assign(new ScrollElement(group), {
-        overflowY: "auto",
-        scrollHeight: 300,
-        scrollTop: 0.25,
-      });
-
-      expect(toolGroupConsumesUpwardNavigation(new ScrollElement(result))).toBe(true);
-    },
-  );
-
-  it("releases upward navigation when the group and nested result are both at the top", () => {
-    const group = Object.assign(new ScrollElement(null, true), {
-      overflowY: "auto",
-      scrollHeight: 300,
-    });
-    const result = Object.assign(new ScrollElement(group), {
-      overflowY: "scroll",
-      scrollHeight: 300,
-    });
-
-    expect(toolGroupConsumesUpwardNavigation(new ScrollElement(result))).toBe(false);
-  });
-
-  it("ignores targets outside a tool group and non-element targets", () => {
-    const outside = Object.assign(new ScrollElement(), {
-      overflowY: "auto",
-      scrollHeight: 300,
-      scrollTop: 40,
-    });
-
-    expect(toolGroupConsumesUpwardNavigation(outside)).toBe(false);
-    expect(toolGroupConsumesUpwardNavigation(new EventTarget())).toBe(false);
-    expect(toolGroupConsumesUpwardNavigation(null)).toBe(false);
-  });
-
-  it("does not consume scrolling from an ancestor beyond the tool group", () => {
-    const timeline = Object.assign(new ScrollElement(), {
-      overflowY: "auto",
-      scrollHeight: 300,
-      scrollTop: 40,
-    });
-    const group = new ScrollElement(timeline, true);
-
-    expect(toolGroupConsumesUpwardNavigation(new ScrollElement(group))).toBe(false);
-  });
-
-  it.each(["hidden", "clip", "visible"])(
-    "ignores a non-scrollable child with overflow-y %s",
-    (overflowY) => {
-      const group = new ScrollElement(null, true);
-      const result = Object.assign(new ScrollElement(group), {
-        overflowY,
-        scrollHeight: 300,
-        scrollTop: 40,
-      });
-
-      expect(toolGroupConsumesUpwardNavigation(new ScrollElement(result))).toBe(false);
-    },
-  );
-
-  it("does not consume programmatic scrolling on an overflow-hidden group", () => {
-    const group = Object.assign(new ScrollElement(null, true), {
-      overflowY: "hidden",
-      scrollHeight: 300,
-      scrollTop: 40,
-    });
-
-    expect(toolGroupConsumesUpwardNavigation(group)).toBe(false);
-  });
-});
-
 const environmentId = EnvironmentId.make("environment-local");
 const projectId = ProjectId.make("project-1");
 const threadId = ThreadId.make("thread-1");
diff --git a/apps/web/src/components/ChatView.logic.ts b/apps/web/src/components/ChatView.logic.ts
index 928d99c549a6..528024de4393 100644
--- a/apps/web/src/components/ChatView.logic.ts
+++ b/apps/web/src/components/ChatView.logic.ts
@@ -239,22 +239,6 @@ export function shouldReleaseTimelineAnchorForToolActivity(input: {
   });
 }
 
-export function toolGroupConsumesUpwardNavigation(target: EventTarget | null): boolean {
-  const elementTarget = target instanceof Element ? target : null;
-  const group = elementTarget?.closest<HTMLElement>("[data-tool-group-scroll]");
-  if (!group) return false;
-
-  // A nested result or the group itself can consume an upward scroll.
-  for (let element = elementTarget; element; element = element.parentElement) {
-    if (element.scrollTop > 0) {
-      const overflowY = getComputedStyle(element).overflowY;
-      if (overflowY === "auto" || overflowY === "scroll") return true;
-    }
-    if (element === group) break;
-  }
-  return false;
-}
-
 export {
   findRecordedWorktreeSetup,
   resolveVisibleWorktreeSetup,
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 23fb998f4645..66f2d7f5ab78 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -1,3 +1,4 @@
+import { isChatGptUsageLimitError } from "@t3tools/shared/usageLimits";
 import { useLoadBalancedEnvironment } from "../hooks/useLoadBalancedEnvironment";
 import { visibleThreadPullRequests } from "@t3tools/shared/threadPullRequests";
 import type { UsageLimitSourceSnapshots } from "@t3tools/contracts";
@@ -324,12 +325,13 @@ import {
   terminalContextReference,
 } from "../lib/composerContextRecords";
 import {
-  isQueuedMessageDue,
   latestCompletedToolActivityId,
   type QueuedComposerMessage,
+  type QueuedMessageSendSettings,
   useQueuedMessages,
   useQueuedMessageStore,
 } from "../queuedMessageStore";
+import { sendQueuedMessage } from "./chat/sendQueuedMessage";
 import { type ReviewCommentContext } from "../reviewCommentContext";
 import { environmentCatalog } from "../connection/catalog";
 import { isDesktopLocalConnectionTarget } from "../connection/desktopLocal";
@@ -366,6 +368,7 @@ import {
 import { environmentShell } from "../state/shell";
 import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
 import { createPageScrollController, type PageScrollKey } from "./chat/pageScrollController";
+import { isTimelineScrollTarget } from "./chat/timelineScrollTarget";
 import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
 import { ExpandedImageDialog } from "./chat/ExpandedImageDialog";
 import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
@@ -475,7 +478,6 @@ import {
   shouldWriteThreadErrorToCurrentServerThread,
   startNewThreadForProject,
   codexArtifactTemplatePromptToAppend,
-  toolGroupConsumesUpwardNavigation,
   waitForStartedServerThread,
   shouldRefocusComposerOnWindowFocus,
 } from "./ChatView.logic";
@@ -653,6 +655,8 @@ const TYPE_TO_FOCUS_INTERACTIVE_SELECTOR = [
   '[role="switch"]',
   '[role="tab"]',
 ].join(",");
+// Popups match only while open or closing: some stay mounted when closed,
+// such as the chat header actions menu.
 const TYPE_TO_FOCUS_FLOATING_LAYER_SELECTOR = [
   '[role="dialog"][aria-modal="true"]',
   '[data-slot="alert-dialog-popup"]:is([data-open],[data-ending-style])',
@@ -660,11 +664,11 @@ const TYPE_TO_FOCUS_FLOATING_LAYER_SELECTOR = [
   '[data-slot="dialog-popup"]:is([data-open],[data-ending-style])',
   '[data-slot="sheet-popup"]:is([data-open],[data-ending-style])',
   '[data-slot="sidebar"][data-mobile="true"]:is([data-open],[data-ending-style])',
-  '[data-slot="menu-popup"]',
-  '[data-slot="select-popup"]',
-  '[data-slot="popover-popup"]',
-  '[data-slot="combobox-popup"]',
-  '[data-slot="autocomplete-popup"]',
+  '[data-slot="menu-popup"]:is([data-open],[data-ending-style])',
+  '[data-slot="select-popup"]:is([data-open],[data-ending-style])',
+  '[data-slot="popover-popup"]:is([data-open],[data-ending-style])',
+  '[data-slot="combobox-popup"]:is([data-open],[data-ending-style])',
+  '[data-slot="autocomplete-popup"]:is([data-open],[data-ending-style])',
 ].join(",");
 
 type EnvironmentUnavailableState = {
@@ -930,7 +934,14 @@ const PersistentThreadTerminalDrawer = memo(function PersistentThreadTerminalDra
   const writeTerminal = useAtomCommand(terminalEnvironment.write, "terminal write");
   const closeTerminalMutation = useAtomCommand(terminalEnvironment.close, "terminal close");
   const draftThread = useComposerDraftStore((store) => store.getDraftThreadByRef(threadRef));
-  const serverThread = useThread(threadRef, { waitForShell: draftThread !== null });
+  // Hidden drawers stay mounted (see MAX_HIDDEN_MOUNTED_TERMINAL_THREADS), so they read only
+  // the shell: a detail subscription would keep each hidden thread's history in memory. The
+  // active drawer shares ChatView's detail, which also covers archived threads (no shell).
+  const activeServerThread = useThread(active ? threadRef : null, {
+    waitForShell: draftThread !== null,
+  });
+  const serverThreadShell = useThreadShell(threadRef);
+  const serverThread = activeServerThread ?? serverThreadShell;
   const projectRef = serverThread
     ? scopeProjectRef(serverThread.environmentId, serverThread.projectId)
     : draftThread
@@ -1235,7 +1246,7 @@ const PersistentThreadTerminalDrawer = memo(function PersistentThreadTerminalDra
         "grid shrink-0 overflow-clip",
         active ? (visible ? "grid-rows-[1fr]" : "grid-rows-[0fr]") : "hidden",
         active &&
-          "[[data-panel-animations=true]_&]:transition-[grid-template-rows] [[data-panel-animations=true]_&]:[transition-duration:var(--panel-animation-duration)] [[data-panel-animations=true]_&]:ease-out",
+          "[[data-panel-animations=true]_&]:transition-[grid-template-rows] [[data-panel-animations=true]_&]:duration-(--panel-animation-duration) [[data-panel-animations=true]_&]:ease-out",
         active && visible && "[[data-panel-animations=true]_&]:starting:grid-rows-[0fr]!",
       )}
     >
@@ -2736,68 +2747,40 @@ export function ChatViewContent(props: ChatViewProps) {
       unavailableConnection !== null &&
       (unavailableConnection.phase === "connecting" ||
         unavailableConnection.phase === "reconnecting");
-    // Reconnecting to a version-skewed server with no update in flight
-    // usually means the server is restarting mid-update and a refresh wiped
-    // the in-memory update state. Fold the reconnect and version banners
-    // into one calm line instead of stacking "Failed to connect" on
-    // "versions differ". A failed update never folds: its error and retry
-    // action must stay visible.
-    const reconnectingThroughVersionSkew =
-      serverUpdateState.status === "idle" && environmentReconnecting && versionMismatch !== null;
     // While an update runs, transient connect blips are expected (the server
     // restarts) and the update banner already shows progress. Hard failure
     // phases still surface so the Reconnect action stays reachable.
     const suppressUnavailableBanner =
-      environmentReconnecting &&
-      (updateRunning || (!reconnectingThroughVersionSkew && !reconnectWarningGraceElapsed));
+      environmentReconnecting && (updateRunning || !reconnectWarningGraceElapsed);
     if (activeEnvironmentUnavailableState && unavailableConnection && !suppressUnavailableBanner) {
-      if (reconnectingThroughVersionSkew) {
-        items.push({
-          id: `environment-unavailable:${activeEnvironmentUnavailableState.environmentId}`,
-          variant: "default",
-          // Prioritize live connection progress among the notices.
-          priority: "urgent",
-          icon: (
-            <span
-              className="size-1.5 animate-status-pulse rounded-full bg-foreground"
-              aria-hidden="true"
-            />
-          ),
-          title: `${unavailableConnection.phase === "connecting" ? "Connecting" : "Reconnecting"} to ${activeEnvironmentUnavailableState.label}`,
-          description: "Finishing an update",
-          actions: disconnectAction,
-        });
-      } else {
-        items.push({
-          id: `environment-unavailable:${activeEnvironmentUnavailableState.environmentId}`,
-          variant: unavailableConnection.phase === "error" ? "error" : "warning",
-          icon: <WifiOffIcon />,
-          title: `${activeEnvironmentUnavailableState.label} is ${environmentReconnecting ? "reconnecting" : "offline"}`,
-          actions: (
-            <>
-              {!environmentReconnecting ? (
-                <Button
-                  size="xs"
-                  variant="ghost"
-                  onClick={() =>
-                    void handleReconnectActiveEnvironment(
-                      activeEnvironmentUnavailableState.environmentId,
-                    )
-                  }
-                >
-                  Reconnect
-                </Button>
-              ) : null}
-              {disconnectAction}
-            </>
-          ),
-        });
-      }
+      items.push({
+        id: `environment-unavailable:${activeEnvironmentUnavailableState.environmentId}`,
+        variant: unavailableConnection.phase === "error" ? "error" : "warning",
+        icon: <WifiOffIcon />,
+        title: `${activeEnvironmentUnavailableState.label} is ${environmentReconnecting ? "reconnecting" : "offline"}`,
+        actions: (
+          <>
+            {!environmentReconnecting ? (
+              <Button
+                size="xs"
+                variant="ghost"
+                onClick={() =>
+                  void handleReconnectActiveEnvironment(
+                    activeEnvironmentUnavailableState.environmentId,
+                  )
+                }
+              >
+                Reconnect
+              </Button>
+            ) : null}
+            {disconnectAction}
+          </>
+        ),
+      });
     }
     if (
       !automaticEnvironment &&
       serverUpdateEnvironmentId &&
-      !reconnectingThroughVersionSkew &&
       (serverUpdateState.status === "idle"
         ? showVersionMismatchBanner
         : !serverUpdateFailureDismissed)
@@ -4367,6 +4350,23 @@ export function ChatViewContent(props: ChatViewProps) {
     ],
   );
 
+  const runProjectScriptRef = useRef(runProjectScript);
+  useLayoutEffect(() => {
+    runProjectScriptRef.current = runProjectScript;
+  }, [runProjectScript]);
+  const runShellCommand = useCallback((command: string) => {
+    void runProjectScriptRef.current(
+      {
+        id: "chat-code-block",
+        name: "Chat code block",
+        command,
+        icon: "play",
+        runOnWorktreeCreate: false,
+      },
+      { rememberAsLastInvoked: false },
+    );
+  }, []);
+
   const supportsProjectSettingsOverrides =
     environmentById.get(environmentId)?.serverConfig?.environment.capabilities
       .projectSettingsOverrides === true;
@@ -5521,6 +5521,8 @@ export function ChatViewContent(props: ChatViewProps) {
         // Only an upward wheel is a navigation intent; wheeling down while
         // following either does nothing (at the end) or moves toward it.
         const handleWheel = (event: WheelEvent) => {
+          if (event.ctrlKey || !isTimelineScrollTarget(event.target, scrollNode, event.deltaY))
+            return;
           if (event.deltaY > 0) {
             timelineScrollIntentRef.current = "toward-end";
             if (isAtEndRef.current) {
@@ -5529,11 +5531,7 @@ export function ChatViewContent(props: ChatViewProps) {
           } else if (event.deltaY < 0) {
             timelineScrollIntentRef.current = "away-from-end";
           }
-          if (
-            event.deltaY < 0 &&
-            contentScrollsUp() &&
-            !toolGroupConsumesUpwardNavigation(event.target)
-          ) {
+          if (event.deltaY < 0 && contentScrollsUp()) {
             handleManualNavigation();
           }
         };
@@ -5583,12 +5581,20 @@ export function ChatViewContent(props: ChatViewProps) {
           ) {
             return;
           }
+          if (!["PageUp", "Home", "ArrowUp", "PageDown", "End", "ArrowDown"].includes(event.key))
+            return;
+          const scrollDirection = ["PageUp", "Home", "ArrowUp"].includes(event.key) ? -1 : 1;
+          if (
+            scrollNode.contains(event.target) &&
+            !isTimelineScrollTarget(event.target, scrollNode, scrollDirection)
+          )
+            return;
           switch (event.key) {
             case "PageUp":
             case "Home":
             case "ArrowUp":
               timelineScrollIntentRef.current = "away-from-end";
-              if (contentScrollsUp() && !toolGroupConsumesUpwardNavigation(event.target)) {
+              if (contentScrollsUp()) {
                 handleManualNavigation();
                 composerRef.current?.collapseForTimelineScrollKey(event.key);
               }
@@ -5875,6 +5881,7 @@ export function ChatViewContent(props: ChatViewProps) {
     activeWorktreePath,
     hasServerThread: isServerThread,
     draftThreadEnvMode: isLocalDraftThread ? draftThread?.envMode : undefined,
+    preparingWorktree: isPreparingWorktree,
   });
   const canOverrideServerThreadEnvMode = Boolean(
     isServerThread &&
@@ -6333,6 +6340,9 @@ export function ChatViewContent(props: ChatViewProps) {
     }
     const working = activeBackgroundLiveness === "working";
     const liveCount = agentPanelModel.liveCount;
+    // Hidden once the Agents surface is on screen; the link would point at nothing.
+    const showViewAgents =
+      liveCount > 0 && !(rightPanelOpen && activeRightPanelSurface?.kind === "agents");
     return {
       id: `background-liveness:${activeThread.id}`,
       variant: "default",
@@ -6360,22 +6370,32 @@ export function ChatViewContent(props: ChatViewProps) {
           : "Background work"
         : "Monitoring",
       actions: (
-        <Button
-          size="xs"
-          variant="ghost"
-          disabled={isStoppingBackgroundWork}
-          onClick={() => void handleStopBackgroundWork()}
-        >
-          {isStoppingBackgroundWork ? "Stopping..." : "Stop"}
-        </Button>
+        <>
+          {showViewAgents ? (
+            <Button size="xs" variant="ghost" aria-label="View agents" onClick={addAgentsSurface}>
+              View
+            </Button>
+          ) : null}
+          <Button
+            size="xs"
+            variant="ghost"
+            disabled={isStoppingBackgroundWork}
+            onClick={() => void handleStopBackgroundWork()}
+          >
+            {isStoppingBackgroundWork ? "Stopping..." : "Stop"}
+          </Button>
+        </>
       ),
     };
   }, [
     activeBackgroundLiveness,
+    activeRightPanelSurface?.kind,
     activeThread,
+    addAgentsSurface,
     agentPanelModel.liveCount,
     handleStopBackgroundWork,
     isStoppingBackgroundWork,
+    rightPanelOpen,
   ]);
   // A woken thread announces itself in the open view, not just the sidebar
   // pill. Dismissing marks the wake as seen (same acknowledgment as the
@@ -6603,7 +6623,7 @@ export function ChatViewContent(props: ChatViewProps) {
                   </code>
                 }
               />
-              <TooltipPopup side="top" className="max-w-80">
+              <TooltipPopup side="top">
                 This thread last ran on {localCheckoutBranchMismatch.threadBranch}. Sending will
                 continue on {localCheckoutBranchMismatch.currentBranch}.
               </TooltipPopup>
@@ -7273,10 +7293,27 @@ export function ChatViewContent(props: ChatViewProps) {
   };
 
   const queuedMessages = useQueuedMessages(activeThreadKey ?? "");
-  // Puts queued messages back into the composer, e.g. after Stop or a failed
-  // send. Prompts join with blank lines; attachments and contexts are added.
+  // The composer's model and modes, as a queued message keeps them for its send.
+  const readComposerSendSettings = (
+    sendCtx: ReturnType<ChatComposerHandle["getSendContext"]>,
+  ): QueuedMessageSendSettings => ({
+    modelSelection: sendCtx.selectedModelSelection,
+    runtimeMode,
+    interactionMode: sendCtx.interactionMode,
+    promptEffort: resolvePromptInjectedEffort(
+      getProviderModelCapabilities(
+        sendCtx.selectedProviderModels,
+        sendCtx.selectedModel,
+        sendCtx.selectedProvider,
+      ),
+      sendCtx.selectedPromptEffort,
+    ),
+  });
+  // Puts queued messages back into the composer after Stop or Cancel. Prompts
+  // join with blank lines; attachments and contexts are added.
   const restoreQueuedMessagesToComposer = (messages: ReadonlyArray<QueuedComposerMessage>) => {
-    if (messages.length === 0) return;
+    const [firstMessage] = messages;
+    if (!firstMessage) return;
     const prompts = [promptRef.current, ...messages.map((message) => message.prompt)]
       .map((prompt) => prompt.trim())
       .filter((prompt) => prompt.length > 0);
@@ -7304,6 +7341,8 @@ export function ChatViewContent(props: ChatViewProps) {
     if (restoredImages.length > 0) addComposerDraftImages(composerDraftTarget, restoredImages);
     if (restoredFiles.length > 0) addComposerDraftFiles(composerDraftTarget, restoredFiles);
     if (overflow.length > 0 && activeThreadKey) {
+      // The overflow is the rest of the restored draft, so it follows the composer.
+      const sendCtx = composerRef.current?.getSendContext();
       useQueuedMessageStore.getState().enqueue(activeThreadKey, {
         prompt: "",
         images: overflow.filter((attachment) => attachment.type === "image"),
@@ -7311,7 +7350,7 @@ export function ChatViewContent(props: ChatViewProps) {
         terminalContexts: [],
         previewAnnotations: [],
         reviewComments: [],
-        submissionIntent: "foreground",
+        sendSettings: sendCtx ? readComposerSendSettings(sendCtx) : firstMessage.sendSettings,
         queuedAfterToolActivityId: latestCompletedToolActivityId(threadActivities),
         // Restoration is not a send. The user decides when the overflow goes.
         holdUntilUserAction: true,
@@ -7354,8 +7393,6 @@ export function ChatViewContent(props: ChatViewProps) {
       annotation: PreviewAnnotationPayload;
       image: ComposerImageAttachment | null;
     },
-    /** A queued message being sent now instead of the live composer draft. */
-    queuedMessage?: QueuedComposerMessage,
   ) => {
     e?.preventDefault();
     // Typed out in full rather than picked from the menu. Attachments or contexts
@@ -7364,7 +7401,6 @@ export function ChatViewContent(props: ChatViewProps) {
       usageLimitsOffered &&
       usageLimitsKey !== null &&
       !directAnnotation &&
-      !queuedMessage &&
       !composerHasNonPromptContent &&
       isUsageLimitsCommand(promptRef.current)
     ) {
@@ -7426,9 +7462,7 @@ export function ChatViewContent(props: ChatViewProps) {
       return;
     }
     if (activePendingProgress) {
-      // A queued message waits until the question is answered; it must not
-      // be submitted as the answer.
-      if (directAnnotation || queuedMessage) {
+      if (directAnnotation) {
         notifyDirectAnnotationAttached();
         return;
       }
@@ -7440,7 +7474,7 @@ export function ChatViewContent(props: ChatViewProps) {
       notifyDirectAnnotationAttached();
       return;
     }
-    const multipleModelSelections = queuedMessage ? null : sendCtx.multipleModelSelections;
+    const multipleModelSelections = sendCtx.multipleModelSelections;
     if (
       multipleModelSelections !== null &&
       serverConfig?.environment.capabilities.requiredWorktreeBootstrap !== true
@@ -7471,8 +7505,6 @@ export function ChatViewContent(props: ChatViewProps) {
       terminalContexts: composerTerminalContexts,
       previewAnnotations: sendContextPreviewAnnotations,
       reviewComments: composerReviewComments,
-    } = queuedMessage ?? sendCtx;
-    const {
       selectedProvider: ctxSelectedProvider,
       selectedModel: ctxSelectedModel,
       selectedProviderModels: ctxSelectedProviderModels,
@@ -7515,13 +7547,11 @@ export function ChatViewContent(props: ChatViewProps) {
         : sendContextPreviewAnnotations;
     // A direct "send annotation" writes the draft and sends in the same tick; the reference
     // must be in the text now, not after the next render.
-    const promptForSend = queuedMessage
-      ? queuedMessage.prompt
-      : directAnnotation
-        ? ensureInlineContextReferences(promptRef.current, [
-            previewAnnotationContextReference(directAnnotation.annotation),
-          ])
-        : promptRef.current;
+    const promptForSend = directAnnotation
+      ? ensureInlineContextReferences(promptRef.current, [
+          previewAnnotationContextReference(directAnnotation.annotation),
+        ])
+      : promptRef.current;
     const {
       trimmedPrompt: trimmed,
       sendableTerminalContexts: sendableComposerTerminalContexts,
@@ -7542,7 +7572,7 @@ export function ChatViewContent(props: ChatViewProps) {
       composerReviewComments.length === 0
         ? parseCodexFeedbackCommand(trimmed)
         : null;
-    if (feedbackCommand && !queuedMessage && multipleModelSelections === null) {
+    if (feedbackCommand && multipleModelSelections === null) {
       if (!isServerThread || activeThread.session === null) {
         toastManager.add(
           stackedThreadToast({
@@ -7593,7 +7623,6 @@ export function ChatViewContent(props: ChatViewProps) {
     }
     if (
       !directAnnotation &&
-      !queuedMessage &&
       sendInteractionModeEnabled &&
       showPlanFollowUpPrompt &&
       activeProposedPlan &&
@@ -7665,7 +7694,7 @@ export function ChatViewContent(props: ChatViewProps) {
       composerReviewComments.length === 0
         ? parseStandaloneComposerSlashCommand(trimmed)
         : null;
-    if (standaloneSlashCommand && !queuedMessage && multipleModelSelections === null) {
+    if (standaloneSlashCommand && multipleModelSelections === null) {
       handleInteractionModeChange(standaloneSlashCommand);
       promptRef.current = "";
       clearComposerDraftContent(composerDraftTarget);
@@ -7686,12 +7715,6 @@ export function ChatViewContent(props: ChatViewProps) {
           }),
         );
       }
-      // A queued message whose only content expired would retry on every
-      // boundary and block the rest of the queue. Nothing sendable is left
-      // in it, so drop it and let the queue move on.
-      if (queuedMessage && activeThreadKey) {
-        useQueuedMessageStore.getState().remove(activeThreadKey, queuedMessage.id);
-      }
       return;
     }
     if (!activeProject) {
@@ -7704,14 +7727,26 @@ export function ChatViewContent(props: ChatViewProps) {
       );
       return;
     }
+    // A queued message that will still leave on its own goes first, so a new
+    // send lines up behind it instead of overtaking it.
+    const queueStillSending =
+      activeThreadKey !== null &&
+      (useQueuedMessageStore.getState().queuesByThreadKey[activeThreadKey] ?? []).some(
+        (message) => message.sending !== undefined || !message.holdUntilUserAction,
+      );
     if (
-      !queuedMessage &&
       !directAnnotation &&
-      phase === "running" &&
       activeThreadKey &&
-      (settings.followUpBehavior === "queue") !== (submissionIntent === "alternate")
+      (queueStillSending ||
+        (phase === "running" &&
+          (settings.followUpBehavior === "queue") !== (submissionIntent === "alternate")))
     ) {
-      if (composerRef.current?.validateProviderInput(promptForSend) === false) {
+      const sendSettings = readComposerSendSettings(sendCtx);
+      if (
+        composerRef.current?.validateProviderInput(
+          applyClaudePromptEffortPrefix(promptForSend, sendSettings.promptEffort),
+        ) === false
+      ) {
         return;
       }
       useQueuedMessageStore.getState().enqueue(activeThreadKey, {
@@ -7721,7 +7756,7 @@ export function ChatViewContent(props: ChatViewProps) {
         terminalContexts: [...composerTerminalContexts],
         previewAnnotations: [...composerPreviewAnnotations],
         reviewComments: [...composerReviewComments],
-        submissionIntent,
+        sendSettings,
         queuedAfterToolActivityId: latestCompletedToolActivityId(threadActivities),
         createdAt: new Date().toISOString(),
       });
@@ -7791,11 +7826,6 @@ export function ChatViewContent(props: ChatViewProps) {
       text: messageTextForSend || ATTACHMENT_ONLY_BOOTSTRAP_PROMPT,
     });
     if (composerRef.current?.validateProviderInput(outgoingMessageText) === false) {
-      // A queued message that no longer fits is held at the head for the
-      // user to edit via Cancel, instead of failing on every boundary.
-      if (queuedMessage && activeThreadKey) {
-        useQueuedMessageStore.getState().holdAtFront(activeThreadKey, queuedMessage);
-      }
       return;
     }
 
@@ -7862,41 +7892,10 @@ export function ChatViewContent(props: ChatViewProps) {
 
     sendInFlightRef.current = true;
     const sendGeneration = ++composerSendGenerationRef.current;
-    // Every early return above leaves a queued message in the queue for a
-    // later retry. From here on a failure hands it back to the composer.
-    if (queuedMessage) {
-      const taken = activeThreadKey
-        ? useQueuedMessageStore
-            .getState()
-            .take(
-              activeThreadKey,
-              queuedMessage.id,
-              latestCompletedToolActivityId(threadActivities),
-            )
-        : null;
-      if (!taken) {
-        sendInFlightRef.current = false;
-        return;
-      }
-    }
-    // Stop drains the queue. A queued send whose upload was still running at
-    // that moment must not start a turn afterwards; it checks this before
-    // dispatch and hands the message back to the composer instead.
-    const drainGenerationAtTake = useQueuedMessageStore.getState().drainGeneration;
-    // A queued send that fails goes back to the head of the queue, held. The
-    // messages behind it keep their order and wait; the composer is not
-    // touched, which also keeps a failure after navigation off the new
-    // thread's draft. The user retries with Send now or edits with Cancel.
-    const abortQueuedReplay = () => {
-      if (queuedMessage && activeThreadKey) {
-        useQueuedMessageStore.getState().holdAtFront(activeThreadKey, queuedMessage);
-      }
-    };
     const attachmentCapabilitiesBeforeUpload = readLiveAttachmentCapabilities();
     if (attachmentCapabilitiesBeforeUpload.fileBlockReason !== null) {
       sendInFlightRef.current = false;
       setThreadError(threadIdForSend, attachmentCapabilitiesBeforeUpload.fileBlockReason);
-      abortQueuedReplay();
       return;
     }
     const turnUsesAttachmentUploads =
@@ -7916,26 +7915,15 @@ export function ChatViewContent(props: ChatViewProps) {
       if (attachmentCapabilitiesAfterUpload.fileBlockReason !== null) {
         sendInFlightRef.current = false;
         setThreadError(threadIdForSend, attachmentCapabilitiesAfterUpload.fileBlockReason);
-        abortQueuedReplay();
         return;
       }
       if (getUploadedAttachments({ environmentId, images: composerAttachmentsSnapshot }) === null) {
         sendInFlightRef.current = false;
         setThreadError(threadIdForSend, "Retry or remove failed uploads before sending.");
-        abortQueuedReplay();
         return;
       }
     }
 
-    if (
-      queuedMessage &&
-      useQueuedMessageStore.getState().drainGeneration !== drainGenerationAtTake
-    ) {
-      sendInFlightRef.current = false;
-      restoreQueuedMessagesToComposer([queuedMessage]);
-      return;
-    }
-
     const resolvedSubmissionIntent =
       (multipleModelSelections !== null || submissionIntent === "background") && isLocalDraftThread
         ? "background"
@@ -7976,7 +7964,6 @@ export function ChatViewContent(props: ChatViewProps) {
       setDockedDraftHeroThreadKey((currentThreadKey) =>
         currentThreadKey === activeThreadKey ? null : currentThreadKey,
       );
-      abortQueuedReplay();
       return;
     }
     beginLocalDispatch({
@@ -8338,11 +8325,9 @@ export function ChatViewContent(props: ChatViewProps) {
         }),
       );
     }
-    if (!queuedMessage) {
-      promptRef.current = "";
-      clearComposerDraftContent(composerDraftTarget);
-      composerRef.current?.resetCursorState();
-    }
+    promptRef.current = "";
+    clearComposerDraftContent(composerDraftTarget);
+    composerRef.current?.resetCursorState();
 
     let firstComposerImageName: string | null = null;
     if (composerImagesSnapshot.length > 0) {
@@ -8577,24 +8562,7 @@ export function ChatViewContent(props: ChatViewProps) {
         );
         clearBackgroundDraftSubmissionByRef(scopeThreadRef(environmentId, threadIdForSend));
       }
-      if (queuedMessage) {
-        setOptimisticUserMessages((existing) => {
-          const removed = existing.filter((message) => message.id === messageIdForSend);
-          for (const message of removed) {
-            revokeUserMessagePreviewUrls(message);
-          }
-          const next = existing.filter((message) => message.id !== messageIdForSend);
-          return next.length === existing.length ? existing : next;
-        });
-        // The optimistic row's preview URLs were just revoked, so the images
-        // need fresh ones before the row can show them again.
-        if (activeThreadKey) {
-          useQueuedMessageStore.getState().holdAtFront(activeThreadKey, {
-            ...queuedMessage,
-            images: queuedMessage.images.map(cloneComposerImageForRetry),
-          });
-        }
-      } else if (
+      if (
         backgroundDraftOpened
           ? !composerDraftHasUserContent(
               useComposerDraftStore.getState().getComposerDraft(composerDraftTarget),
@@ -8684,46 +8652,12 @@ export function ChatViewContent(props: ChatViewProps) {
     }
   };
 
-  // Sends the oldest queued message once it is due: a tool call finished
-  // after it was queued, or the turn ended. Only one leaves per boundary; the
-  // take inside onSend re-anchors the rest.
-  const sendQueuedMessage = useEffectEvent((message: QueuedComposerMessage) => {
-    void onSend(undefined, message.submissionIntent, undefined, message);
-  });
-  const nextQueuedMessage = queuedMessages[0] ?? null;
-  const latestToolActivityId = useMemo(
-    () => (nextQueuedMessage ? latestCompletedToolActivityId(threadActivities) : null),
-    [nextQueuedMessage, threadActivities],
-  );
-  // Approvals and questions block the agent; a steer landing on top of them
-  // would answer nothing and confuse the turn, so the queue holds until the
-  // user resolves them.
+  // Queued messages go out from QueuedMessageSender, which also covers
+  // threads that are not on screen. Send now uses the same path but skips the
+  // wait for a boundary. Approvals and questions still hold it: a steer on
+  // top of them would answer nothing and confuse the turn.
   const queueBlockedByPendingRequest =
     activePendingApproval !== null || pendingUserInputs.length > 0;
-  // onSend bails early on transient gates (environment offline, settings not
-  // hydrated, checkpoint rewinding, messages loading, machine not chosen) and
-  // leaves the message queued. Re-run when any of them clear so a due message
-  // does not wait for an unrelated phase change.
-  const queueSendGate =
-    activeEnvironmentUnavailable ||
-    !clientSettingsHydrated ||
-    isRevertingCheckpoint ||
-    threadDetailLoading ||
-    needsLoadBalancing ||
-    activeProviderStatus === null;
-  useEffect(() => {
-    if (!nextQueuedMessage || isSendBusy || queueBlockedByPendingRequest || queueSendGate) return;
-    if (sendInFlightRef.current) return;
-    if (!isQueuedMessageDue({ message: nextQueuedMessage, phase, latestToolActivityId })) return;
-    sendQueuedMessage(nextQueuedMessage);
-  }, [
-    isSendBusy,
-    latestToolActivityId,
-    nextQueuedMessage,
-    phase,
-    queueBlockedByPendingRequest,
-    queueSendGate,
-  ]);
 
   // The row handlers are read from refs at call-time so their identity stays
   // stable and does not bust TimelineRowCtx on every ChatView render.
@@ -8733,9 +8667,8 @@ export function ChatViewContent(props: ChatViewProps) {
   });
   queuedMessageActionsRef.current = {
     steer: (id) => {
-      const message = queuedMessages.find((entry) => entry.id === id);
-      if (!message || sendInFlightRef.current || queueBlockedByPendingRequest) return;
-      void onSend(undefined, message.submissionIntent, undefined, message);
+      if (!activeThreadRef || queueBlockedByPendingRequest) return;
+      void sendQueuedMessage(activeThreadRef, id);
     },
     remove: (id) => {
       if (!activeThreadKey) return;
@@ -9656,7 +9589,7 @@ export function ChatViewContent(props: ChatViewProps) {
           className={cn(
             "flex shrink-0",
             panelAnimationsActive &&
-              "motion-safe:transition-opacity motion-safe:[transition-duration:var(--panel-animation-duration)] motion-safe:ease-out",
+              "motion-safe:transition-opacity motion-safe:duration-(--panel-animation-duration) motion-safe:ease-out",
             rightPanelOpen ? "pointer-events-auto opacity-100" : "pointer-events-none opacity-0",
           )}
           inert={!rightPanelOpen}
@@ -9971,6 +9904,7 @@ export function ChatViewContent(props: ChatViewProps) {
               />
               <ThreadErrorBanner
                 error={visibleThreadError}
+                chatGptUsageLimit={isChatGptUsageLimitError(threadActivities, visibleThreadError)}
                 onDismiss={() => {
                   setThreadError(activeThread.id, null);
                   dismissThreadErrorBannerForSession(threadErrorBannerKey);
@@ -9990,6 +9924,7 @@ export function ChatViewContent(props: ChatViewProps) {
                       agentPanelModel,
                       onOpenAgents: addAgentsSurface,
                       onUseArtifactTemplate: useArtifactTemplate,
+                      ...(activeProject ? { onRunShellCommand: runShellCommand } : {}),
                     }
                   : {})}
                 isWorking={!paintOnlyDisplayedTimeline && isWorking}
@@ -10079,7 +10014,7 @@ export function ChatViewContent(props: ChatViewProps) {
                       composerRef.current?.restoreAfterTimelineReachedEnd();
                       scrollToEnd(true);
                     }}
-                    className="pointer-events-auto gap-1.5 rounded-full px-3 text-muted-foreground hover:text-foreground"
+                    className="pointer-events-auto"
                     size="xs"
                     variant="glass"
                   >
@@ -10103,11 +10038,11 @@ export function ChatViewContent(props: ChatViewProps) {
             >
               <div
                 ref={attachDraftHeroTransitionGroupRef}
-                className="w-full ps-[calc(env(safe-area-inset-left)+0.75rem)] pe-[calc(env(safe-area-inset-right)+0.75rem)] sm:ps-[calc(env(safe-area-inset-left)+1.25rem)] sm:pe-[calc(env(safe-area-inset-right)+1.25rem)]"
+                className="w-full ps-(--workspace-gutter-start) pe-(--workspace-gutter-end)"
               >
                 <div
                   data-chat-composer-stack="true"
-                  className="group/composer-stack pointer-events-auto relative z-10 mx-auto w-full max-w-3xl"
+                  className="group/composer-stack pointer-events-auto relative z-10 mx-auto w-full max-w-(--chat-max-width)"
                 >
                   {isDraftHeroState ? (
                     <div className="absolute inset-x-0 bottom-full z-0">
@@ -10294,9 +10229,7 @@ export function ChatViewContent(props: ChatViewProps) {
                                 onEnvModeChange={onEnvModeChange}
                                 startFromOrigin={startFromOrigin}
                                 onStartFromOriginChange={onStartFromOriginChange}
-                                {...(canOverrideServerThreadEnvMode
-                                  ? { effectiveEnvModeOverride: envMode }
-                                  : {})}
+                                envMode={envMode}
                                 {...(canOverrideServerThreadEnvMode
                                   ? {
                                       activeThreadBranchOverride: activeThreadBranch,
@@ -10468,7 +10401,6 @@ export function ChatViewContent(props: ChatViewProps) {
         <RightPanelSheet
           animationDurationMs={panelAnimationsActive ? panelAnimationDurationMs : 0}
           open={rightPanelOpen}
-          underFloatingPreview={previewMiniPlayerVisible}
           onClose={closePreviewPanel}
         >
           <RightPanelTabs
diff --git a/apps/web/src/components/CommandPalette.logic.test.ts b/apps/web/src/components/CommandPalette.logic.test.ts
index 3734f5da1bab..41855fc5def0 100644
--- a/apps/web/src/components/CommandPalette.logic.test.ts
+++ b/apps/web/src/components/CommandPalette.logic.test.ts
@@ -440,6 +440,54 @@ describe("buildThreadActionItems", () => {
     ]);
   });
 
+  it("orders title matches by recent activity before older prefix matches", () => {
+    const threads = [
+      makeThread({
+        id: ThreadId.make("old-prefix"),
+        title: "Convex InvalidCursor in Convex threads query",
+        createdAt: "2026-01-01T00:00:00.000Z",
+        updatedAt: "2026-01-02T00:00:00.000Z",
+      }),
+      makeThread({
+        id: ThreadId.make("recent-title"),
+        title: "Disable Convex schema validation",
+        createdAt: "2025-12-01T00:00:00.000Z",
+        updatedAt: "2026-03-24T00:00:00.000Z",
+      }),
+      makeThread({
+        id: ThreadId.make("recent-content"),
+        title: "Fix schema validation",
+        createdAt: "2026-03-25T00:00:00.000Z",
+        updatedAt: "2026-03-25T00:00:00.000Z",
+      }),
+    ];
+    const items = buildThreadActionItems({
+      threads,
+      projectTitleById: new Map([[PROJECT_ID, "T3 Code"]]),
+      sortOrder: "created_at",
+      icon: null,
+      getContentMatch: (thread) =>
+        thread.id === ThreadId.make("recent-content")
+          ? { source: "user", snippet: "Please check Convex", query: "convex" }
+          : undefined,
+      runThread: async () => undefined,
+    });
+
+    const groups = filterCommandPaletteGroups({
+      activeGroups: [],
+      query: "convex",
+      isInSubmenu: false,
+      projectSearchItems: [],
+      threadSearchItems: items,
+    });
+
+    expect(groups[0]?.items.map((item) => item.value)).toEqual([
+      "thread:recent-title",
+      "thread:old-prefix",
+      "thread:recent-content",
+    ]);
+  });
+
   it("preserves thread project-name matches when there is no stronger title match", () => {
     const group: CommandPaletteGroup = {
       value: "threads-search",
diff --git a/apps/web/src/components/CommandPalette.logic.ts b/apps/web/src/components/CommandPalette.logic.ts
index e2114079e729..b75ce84d1469 100644
--- a/apps/web/src/components/CommandPalette.logic.ts
+++ b/apps/web/src/components/CommandPalette.logic.ts
@@ -11,7 +11,7 @@ import type { SidebarThreadSortOrder } from "@t3tools/contracts/settings";
 import * as Arr from "effect/Array";
 import * as Result from "effect/Result";
 import { type ReactNode } from "react";
-import { sortThreads } from "../lib/threadSort";
+import { getThreadSortTimestamp, sortThreads } from "../lib/threadSort";
 import { normalizeSearchText } from "../lib/utils";
 import { formatRelativeTimeLabel } from "../timestampFormat";
 import { type Project, type SidebarThreadSummary, type Thread } from "../types";
@@ -135,6 +135,7 @@ export interface CommandPaletteItem {
   readonly description?: ReactNode;
   readonly threadContentMatch?: CommandPaletteThreadContentMatch;
   readonly timestamp?: string;
+  readonly searchRecency?: number;
   readonly icon: ReactNode;
   readonly disabled?: boolean;
   /** Optional content rendered inline before the title text. */
@@ -315,6 +316,7 @@ export function buildThreadActionItems<TThread extends BuildThreadActionItemsThr
         timestamp: formatRelativeTimeLabel(
           thread.latestUserMessageAt ?? thread.updatedAt ?? thread.createdAt,
         ),
+        searchRecency: getThreadSortTimestamp(thread, "updated_at"),
         icon: input.icon,
       },
       leadingContent ? { titleLeadingContent: leadingContent } : {},
@@ -366,6 +368,10 @@ function rankCommandPaletteItemMatch(
   for (const [index, field] of terms.entries()) {
     const fieldRank = rankSearchFieldMatch(field, normalizedQuery, queryTokens);
     if (fieldRank !== Number.NEGATIVE_INFINITY) {
+      if (index === 0 && item.searchRecency !== undefined) {
+        // All non-exact thread title matches share a tier so recency breaks the tie.
+        return 1_000 + Number(fieldRank === 3);
+      }
       return 1_000 - index * 100 + fieldRank;
     }
   }
@@ -442,6 +448,7 @@ export function filterCommandPaletteGroups(input: {
         (left, right) =>
           Number(left.item.secondary ?? false) - Number(right.item.secondary ?? false) ||
           right.rank - left.rank ||
+          (right.item.searchRecency ?? 0) - (left.item.searchRecency ?? 0) ||
           left.index - right.index,
       )
       .map((entry) => entry.item);
diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsx
index 912f294d9538..0825c5cb92cc 100644
--- a/apps/web/src/components/CommandPalette.tsx
+++ b/apps/web/src/components/CommandPalette.tsx
@@ -469,6 +469,7 @@ function overlayModeForCommand(command: string | null): SearchOverlayMode | null
 }
 
 export function CommandPalette({ children }: { children: ReactNode }) {
+  const navigate = useNavigate();
   const [state, dispatch] = useReducer(reduceCommandPaletteUiState, {
     open: false,
     mode: "command",
@@ -561,6 +562,13 @@ export function CommandPalette({ children }: { children: ReactNode }) {
         });
         return;
       }
+      if (command === "usage.open") {
+        event.preventDefault();
+        event.stopPropagation();
+        setOpen(false);
+        void navigate({ to: "/usage" });
+        return;
+      }
       const mode = overlayModeForCommand(command);
       if (mode === null) {
         return;
@@ -574,9 +582,11 @@ export function CommandPalette({ children }: { children: ReactNode }) {
   }, [
     appearanceMode,
     keybindings,
+    navigate,
     previewOpen,
     resolvedTheme,
     setAppearanceMode,
+    setOpen,
     terminalOpen,
     theme,
     themeHalves,
@@ -650,7 +660,7 @@ function CommandPaletteDialog(props: {
             ? "Search project contents"
             : "Command palette"
       }
-      className={cn("overflow-hidden p-0", props.mode === "content" && "h-105")}
+      className={cn("overflow-hidden", props.mode === "content" && "h-105")}
       data-command-palette="true"
       data-palette-mode={props.mode}
       data-testid="command-palette"
@@ -1528,9 +1538,8 @@ function OpenCommandPaletteDialog(props: {
               <TooltipTrigger
                 render={
                   <Button
-                    variant="outline"
-                    size="xs"
-                    className="h-5 rounded-[.25rem] px-1.5 text-[10px] text-warning-foreground"
+                    variant="warning-outline"
+                    size="micro"
                     onClick={() => {
                       openSourceControlSettings();
                     }}
@@ -2024,6 +2033,7 @@ function OpenCommandPaletteDialog(props: {
     searchTerms: ["usage", "use", "tokens", "cost", "spend", "limits", "stats", "analytics"],
     title: "Open usage",
     icon: <ChartNoAxesColumnIcon className={ITEM_ICON_CLASS} />,
+    shortcutCommand: "usage.open",
     run: async () => {
       await navigate({ to: "/usage" });
     },
@@ -2861,7 +2871,7 @@ function OpenCommandPaletteDialog(props: {
               variant="outline"
               size="xs"
               tabIndex={-1}
-              className="absolute inset-e-2.5 top-1/2 gap-1.5 pe-1 ps-2 -translate-y-1/2"
+              className="absolute inset-e-2.5 top-1/2 -translate-y-1/2"
               aria-label={`${remoteProjectButtonLabel ?? "Continue"} (Enter)`}
               disabled={!canSubmitRemoteProjectFlow}
               onMouseDown={(event) => {
@@ -2874,7 +2884,7 @@ function OpenCommandPaletteDialog(props: {
           }
         >
           <span>{isRemoteProjectPending ? "Working" : remoteProjectButtonLabel}</span>
-          <KbdGroup className="pointer-events-none -me-0.5 items-center gap-1">
+          <KbdGroup className="pointer-events-none -me-0.5">
             <Kbd>Enter</Kbd>
           </KbdGroup>
         </TooltipTrigger>
@@ -2888,10 +2898,7 @@ function OpenCommandPaletteDialog(props: {
               variant="outline"
               size="xs"
               tabIndex={-1}
-              className={cn(
-                "absolute inset-e-2.5 top-1/2 pe-1 ps-2 -translate-y-1/2",
-                hasHighlightedBrowseItem ? "gap-1" : "gap-1.5",
-              )}
+              className="absolute inset-e-2.5 top-1/2 -translate-y-1/2"
               aria-label={`${submitActionLabel} (${addShortcutLabel})`}
               disabled={
                 !canCreateProjectInEnvironment(browseEnvironment?.connection.phase) ||
@@ -2917,7 +2924,7 @@ function OpenCommandPaletteDialog(props: {
           <span>
             {isCloneDestinationStep && isRemoteProjectPending ? "Cloning" : submitActionLabel}
           </span>
-          <KbdGroup className="pointer-events-none -me-0.5 items-center gap-1">
+          <KbdGroup className="pointer-events-none -me-0.5">
             <Kbd>{hasHighlightedBrowseItem ? `${submitModifierLabel} Enter` : "Enter"}</Kbd>
           </KbdGroup>
         </TooltipTrigger>
@@ -2966,9 +2973,6 @@ function OpenCommandPaletteDialog(props: {
                 })
               : undefined,
         placeholder: inputPlaceholder,
-        wrapperClassName: isSubmenu
-          ? "[&_[data-slot=autocomplete-start-addon]]:pointer-events-auto"
-          : undefined,
         ...(isSubmenu
           ? {
               startAddon: (
@@ -2992,7 +2996,6 @@ function OpenCommandPaletteDialog(props: {
         setHighlightedItemValue(typeof value === "string" ? value : null);
       }}
       onValueChange={handleQueryChange}
-      panelClassName="max-h-[min(28rem,70vh)]"
       showBackHint={isSubmenu}
       value={query}
     >
diff --git a/apps/web/src/components/CommandPaletteContent.tsx b/apps/web/src/components/CommandPaletteContent.tsx
index 8c1a5b0e3c83..8732c6ef926f 100644
--- a/apps/web/src/components/CommandPaletteContent.tsx
+++ b/apps/web/src/components/CommandPaletteContent.tsx
@@ -11,7 +11,11 @@ type CommandPaletteContentProps = Omit<ComponentProps<typeof Command>, "children
   readonly footerTrailing?: ReactNode;
   readonly inputAccessory?: ReactNode;
   readonly inputProps: ComponentProps<typeof CommandInput>;
-  readonly panelClassName?: string;
+  /**
+   * How tall the results panel may grow: the palette's list, a taller file list, or the whole
+   * dialog body (for modes that lay out their own status and empty states).
+   */
+  readonly panelSize?: "list" | "tall-list" | "fill";
   readonly showBackHint?: boolean;
   readonly testId?: string;
 };
@@ -28,7 +32,7 @@ export function CommandPaletteContent({
   footerTrailing,
   inputAccessory,
   inputProps,
-  panelClassName,
+  panelSize = "list",
   showBackHint,
   testId,
   ...commandProps
@@ -49,10 +53,20 @@ export function CommandPaletteContent({
           <CommandInput {...inputProps} ref={inputRef} />
           {inputAccessory}
         </div>
-        <CommandPanel className={panelClassName}>{children}</CommandPanel>
-        <CommandFooter className="gap-3 max-sm:flex-col max-sm:items-start">
+        <CommandPanel
+          className={
+            panelSize === "fill"
+              ? "flex min-h-0 flex-1 flex-col"
+              : panelSize === "tall-list"
+                ? "max-h-[min(34rem,76vh)]"
+                : "max-h-[min(28rem,70vh)]"
+          }
+        >
+          {children}
+        </CommandPanel>
+        <CommandFooter className="max-sm:flex-col max-sm:items-start">
           <div className="flex items-center gap-3">
-            <KbdGroup className="items-center gap-1.5">
+            <KbdGroup>
               <Kbd>
                 <ArrowUpIcon />
               </Kbd>
@@ -62,18 +76,18 @@ export function CommandPaletteContent({
               <span>Navigate</span>
             </KbdGroup>
             {footerActionLabel !== undefined ? (
-              <KbdGroup className="items-center gap-1.5">
+              <KbdGroup>
                 <Kbd>Enter</Kbd>
                 <span>{footerActionLabel}</span>
               </KbdGroup>
             ) : null}
             {showBackHint ? (
-              <KbdGroup className="items-center gap-1.5">
+              <KbdGroup>
                 <Kbd>Backspace</Kbd>
                 <span>Back</span>
               </KbdGroup>
             ) : null}
-            <KbdGroup className="items-center gap-1.5">
+            <KbdGroup>
               <Kbd>Esc</Kbd>
               <span>{escapeLabel}</span>
             </KbdGroup>
diff --git a/apps/web/src/components/CommandPaletteResults.tsx b/apps/web/src/components/CommandPaletteResults.tsx
index c66ab9a1cf2b..b94707f5eca6 100644
--- a/apps/web/src/components/CommandPaletteResults.tsx
+++ b/apps/web/src/components/CommandPaletteResults.tsx
@@ -15,7 +15,6 @@ import {
   CommandShortcut,
 } from "./ui/command";
 import { ThreadSearchMatchExcerpt } from "./ThreadSearchMatch";
-import { cn } from "~/lib/utils";
 
 interface CommandPaletteResultsProps {
   emptyStateMessage?: string;
@@ -42,7 +41,7 @@ export function CommandPaletteResults(props: CommandPaletteResultsProps) {
     <CommandList>
       {props.groups.map((group) => (
         <CommandGroup items={group.items} key={group.value}>
-          <CommandGroupLabel className="ps-[9px]">{group.label}</CommandGroupLabel>
+          <CommandGroupLabel>{group.label}</CommandGroupLabel>
           <CommandCollection>
             {(item) =>
               item.disabled ? (
@@ -109,10 +108,7 @@ function CommandPaletteResultRow(props: {
   return (
     <CommandItem
       value={props.item.value}
-      className={cn(
-        "cursor-pointer gap-2 hover:bg-transparent hover:text-inherit data-highlighted:bg-transparent data-highlighted:text-inherit data-selected:bg-transparent data-selected:text-inherit [&[data-highlighted][data-selected]]:bg-transparent [&[data-highlighted][data-selected]]:text-inherit",
-        props.isActive && "bg-accent! text-accent-foreground!",
-      )}
+      active={props.isActive}
       onMouseDown={(event) => {
         event.preventDefault();
       }}
diff --git a/apps/web/src/components/ComposerPromptEditorTiptap.tsx b/apps/web/src/components/ComposerPromptEditorTiptap.tsx
index 0e452fd4ac26..2a5fe2ba0588 100644
--- a/apps/web/src/components/ComposerPromptEditorTiptap.tsx
+++ b/apps/web/src/components/ComposerPromptEditorTiptap.tsx
@@ -29,6 +29,7 @@ import {
   useMemo,
   useRef,
   useState,
+  type KeyboardEvent as ReactKeyboardEvent,
 } from "react";
 import { EditorContent, useEditor } from "@tiptap/react";
 
@@ -58,18 +59,13 @@ import {
 import { collectInlineContextIds } from "~/lib/composerContextReferences";
 import { cn, isMacPlatform } from "~/lib/utils";
 import { basenameOfPath } from "~/pierre-icons";
-import {
-  COMPOSER_INLINE_CHIP_DECORATOR_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME,
-  COMPOSER_INLINE_SKILL_CHIP_CLASS_NAME,
-  SKILL_CHIP_ICON_SVG,
-} from "./composerInlineChip";
-import { FILE_TAG_CHIP_CLASS_NAME, FileTagChipContent } from "./chat/FileTagChip";
+import { FileTagChipContent } from "./chat/FileTagChip";
+import { SkillChipIcon } from "./chat/SkillInlineText";
 import { AssistantCitationChip } from "./chat/AssistantCitationChip";
 import { getTimelinePageScrollKey } from "./chat/pageScrollController";
 import { ContextChipPopover } from "./contextChipParts";
 import { Button } from "./ui/button";
+import { ContextChip } from "./ContextChip";
 import {
   ComposerContextActionsContext,
   ComposerContextReferenceChip,
@@ -190,6 +186,13 @@ function resolvedThemeFromDocument(): "light" | "dark" {
 
 // ── Inline atom nodes (chips) ─────────────────────────────────────────────
 
+/**
+ * Wraps an inline chip node view: keeps the caret and text selection out of the chip and
+ * paints the editor's node selection over it.
+ */
+const CHIP_NODE_SELECTION_CLASS_NAME =
+  "relative inline-flex select-none items-center align-middle leading-none data-[composer-chip-selected]:after:pointer-events-none data-[composer-chip-selected]:after:absolute data-[composer-chip-selected]:after:inset-0 data-[composer-chip-selected]:after:rounded-sm data-[composer-chip-selected]:after:bg-[Highlight] data-[composer-chip-selected]:after:opacity-30 data-[composer-chip-selected]:after:content-['']";
+
 const ComposerMentionExtension = Node.create({
   name: "composer-mention",
   group: "inline",
@@ -217,11 +220,11 @@ function ComposerMentionNodeView({ node }: NodeViewProps) {
   const actions = use(ComposerContextActionsContext);
   const path = (node.attrs.path as string) ?? "";
   const chip = (
-    <Button
-      variant="chip"
+    <ContextChip
+      kind="mention"
+      render={<button type="button" />}
       onClick={() => actions.openMention(path)}
       aria-label={`Preview ${path}`}
-      className={`${FILE_TAG_CHIP_CLASS_NAME} cursor-pointer focus-visible:outline-2`}
       contentEditable={false}
       spellCheck={false}
       data-composer-mention-chip="true"
@@ -231,18 +234,13 @@ function ComposerMentionNodeView({ node }: NodeViewProps) {
         label={basenameOfPath(path)}
         theme={resolvedThemeFromDocument()}
       />
-    </Button>
+    </ContextChip>
   );
   return (
-    <NodeViewWrapper as="span" className={COMPOSER_INLINE_CHIP_DECORATOR_CLASS_NAME}>
+    <NodeViewWrapper as="span" className={CHIP_NODE_SELECTION_CLASS_NAME}>
       <Tooltip>
         <TooltipTrigger render={chip} />
-        <TooltipPopup
-          side="top"
-          className="max-w-120 whitespace-normal leading-tight wrap-anywhere"
-        >
-          {path}
-        </TooltipPopup>
+        <TooltipPopup side="top">{path}</TooltipPopup>
       </Tooltip>
     </NodeViewWrapper>
   );
@@ -280,20 +278,12 @@ function ComposerSkillNodeView({ node }: NodeViewProps) {
   const skillDescription = (node.attrs.skillDescription as string | null) ?? null;
   const skill = skills.find((candidate) => candidate.name === skillName);
   return (
-    <NodeViewWrapper as="span" className={COMPOSER_INLINE_CHIP_DECORATOR_CLASS_NAME}>
+    <NodeViewWrapper as="span" className={CHIP_NODE_SELECTION_CLASS_NAME}>
       <ContextChipPopover
+        kind="skill"
+        icon={<SkillChipIcon />}
+        label={skillLabel}
         accessibleLabel={`Skill ${skillLabel}`}
-        triggerClassName={COMPOSER_INLINE_SKILL_CHIP_CLASS_NAME}
-        chip={
-          <>
-            <span
-              aria-hidden="true"
-              className={COMPOSER_INLINE_CHIP_ICON_CLASS_NAME}
-              dangerouslySetInnerHTML={{ __html: SKILL_CHIP_ICON_SVG }}
-            />
-            <span className={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}>{skillLabel}</span>
-          </>
-        }
       >
         <div className="space-y-3 p-2 text-sm">
           <p className="font-medium">{skillLabel}</p>
@@ -382,13 +372,40 @@ function ComposerCitationNodeView({ node, editor, getPos }: NodeViewProps) {
       .run();
   }, [editor, nodePos]);
 
+  // Put the caret right after the chip so Enter sends and typing continues the prompt.
+  const onRestoreFocus = useCallback(() => {
+    if (!editor.isEditable) return;
+    const pos = nodePos();
+    if (pos === null) return;
+    const current = editor.state.doc.nodeAt(pos);
+    if (!current || current.type.name !== "composer-citation") return;
+    editor.commands.focus(pos + current.nodeSize);
+  }, [editor, nodePos]);
+
   return (
     <NodeViewWrapper
       as="span"
-      className="inline-flex min-w-0 max-w-full"
+      className="inline-flex min-w-0 max-w-full select-none"
       contentEditable={false}
       spellCheck={false}
       data-composer-citation-chip="true"
+      onKeyDown={(event: ReactKeyboardEvent<HTMLElement>) => {
+        // Tab from the comment button returns to the caret after the chip.
+        if (
+          !editor.isEditable ||
+          event.key !== "Tab" ||
+          event.shiftKey ||
+          event.altKey ||
+          event.metaKey ||
+          event.ctrlKey ||
+          !(event.target instanceof HTMLElement) ||
+          event.target.dataset.citationCommentTrigger === undefined
+        ) {
+          return;
+        }
+        event.preventDefault();
+        onRestoreFocus();
+      }}
     >
       <AssistantCitationChip
         citation={citation}
@@ -407,6 +424,7 @@ function ComposerCitationNodeView({ node, editor, getPos }: NodeViewProps) {
             commentContext.onSubmitAndSend();
             return true;
           },
+          onRestoreFocus,
         }}
       />
     </NodeViewWrapper>
@@ -440,7 +458,7 @@ const ComposerContextReferenceExtension = Node.create({
 
 function ComposerContextReferenceNodeView({ node }: NodeViewProps) {
   return (
-    <NodeViewWrapper as="span" className={COMPOSER_INLINE_CHIP_DECORATOR_CLASS_NAME}>
+    <NodeViewWrapper as="span" className={CHIP_NODE_SELECTION_CLASS_NAME}>
       <ComposerContextReferenceChip
         kind={(node.attrs.kind as string) ?? ""}
         contextId={(node.attrs.contextId as string) ?? ""}
@@ -729,7 +747,7 @@ function ComposerPromptEditorTiptapInner(props: ComposerPromptEditorProps) {
   const editorAttributes = useMemo(
     () => ({
       class: cn(
-        "composer-tiptap block max-h-50 min-h-17.5 w-full overflow-y-auto whitespace-pre-wrap wrap-break-word bg-transparent leading-relaxed text-foreground focus:outline-none",
+        "composer-tiptap -m-1 block max-h-52 min-h-19.5 overflow-y-auto p-1 whitespace-pre-wrap wrap-break-word bg-transparent leading-relaxed text-foreground focus:outline-none",
         className,
       ),
       "data-testid": "composer-editor",
@@ -867,6 +885,32 @@ function ComposerPromptEditorTiptapInner(props: ComposerPromptEditorProps) {
               return true;
             }
           }
+          // Shift+Tab from just after a citation reaches its comment button, which
+          // native tab order skips because the chip lives inside the editor.
+          if (
+            event.key === "Tab" &&
+            event.shiftKey &&
+            !event.altKey &&
+            !event.metaKey &&
+            !event.ctrlKey &&
+            view.state.selection.empty
+          ) {
+            const { $from } = view.state.selection;
+            const citation = $from.nodeBefore;
+            if (citation?.type.name === "composer-citation") {
+              const chip = view.nodeDOM($from.pos - citation.nodeSize);
+              const commentButton =
+                chip instanceof HTMLElement
+                  ? chip.querySelector<HTMLElement>("[data-citation-comment-trigger]")
+                  : null;
+              if (commentButton) {
+                event.preventDefault();
+                event.stopPropagation();
+                commentButton.focus();
+                return true;
+              }
+            }
+          }
           if (event.key === "Enter" && (event.isComposing || event.keyCode === 229)) {
             event.stopPropagation();
             return true;
@@ -1253,7 +1297,7 @@ function ComposerPromptEditorTiptapInner(props: ComposerPromptEditorProps) {
         <ComposerCitationCommentContext value={citationCommentActions}>
           <div
             className={cn(
-              "relative [font-family:var(--font-composer,var(--font-sans))] [font-size:var(--font-size-prompt,0.875rem)] [@media(max-width:39.999rem)_and_(pointer:coarse)]:[font-size:max(var(--font-size-prompt,1rem),16px)]",
+              "relative flow-root font-(family-name:--font-composer,var(--font-sans)) text-(length:--font-size-prompt,var(--text-sm)) max-sm:pointer-coarse:text-(length:--font-size-prompt-touch)",
               containerClassName,
             )}
           >
diff --git a/apps/web/src/components/ConfirmDialogHost.tsx b/apps/web/src/components/ConfirmDialogHost.tsx
index 3e19606bd4c6..92477801eb72 100644
--- a/apps/web/src/components/ConfirmDialogHost.tsx
+++ b/apps/web/src/components/ConfirmDialogHost.tsx
@@ -77,7 +77,7 @@ export function ConfirmDialogHost() {
     >
       <AlertDialogPopup>
         <AlertDialogHeader>
-          <AlertDialogTitle className="wrap-anywhere">{copy.title}</AlertDialogTitle>
+          <AlertDialogTitle>{copy.title}</AlertDialogTitle>
           {copy.description ? (
             <AlertDialogDescription className="whitespace-pre-line">
               {copy.description}
diff --git a/apps/web/src/components/ConnectionStatusDot.tsx b/apps/web/src/components/ConnectionStatusDot.tsx
index 6a23a0532873..b371b6c1fe97 100644
--- a/apps/web/src/components/ConnectionStatusDot.tsx
+++ b/apps/web/src/components/ConnectionStatusDot.tsx
@@ -69,7 +69,7 @@ export function ConnectionStatusDot({
   return (
     <Tooltip>
       <TooltipTrigger render={dot} />
-      <TooltipPopup side="top" className="max-w-80 whitespace-pre-wrap leading-tight">
+      <TooltipPopup side="top" className="whitespace-pre-wrap">
         {tooltipText}
       </TooltipPopup>
     </Tooltip>
diff --git a/apps/web/src/components/ContextChip.tsx b/apps/web/src/components/ContextChip.tsx
new file mode 100644
index 000000000000..1d2642cb1cce
--- /dev/null
+++ b/apps/web/src/components/ContextChip.tsx
@@ -0,0 +1,131 @@
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+import { cva, type VariantProps } from "class-variance-authority";
+import type * as React from "react";
+
+import { cn } from "~/lib/utils";
+
+/**
+ * The inline pill for one piece of chat context. It lives with the chat components rather than
+ * in components/ui because it is one feature's look, not a generic primitive.
+ *
+ * An inline pill for one piece of context (a file, mention, terminal excerpt, pull request,
+ * skill…) that sits in running text, both in the composer and in sent messages.
+ *
+ * Metrics are in em so the chip scales with the text around it (the composer honors the
+ * prompt font-size preference). Each kind keeps one restrained color identity: every accent
+ * shares a lightness so no kind reads heavier than another, and only hue carries identity.
+ * A consumer may override `--context-chip-accent` through `style` for a color that comes
+ * from content, such as an image's average color.
+ *
+ * Renders a span by default. Render it as a button, link or popover/tooltip trigger to make it
+ * interactive; the hover tint follows from that, not from a prop. Anything focusable (including a
+ * span with tabIndex for a tooltip) gets the focus outline.
+ */
+const contextChipVariants = cva(
+  "inline-flex h-[1.41em] max-w-full items-center gap-[0.33em] rounded-[0.5em] border px-[0.5em] align-middle font-medium text-[0.86em] leading-none [&_svg]:block [&_svg]:size-[1.17em] [&_svg]:shrink-0 [&_svg]:self-center [button&,a&,[data-popup-open]&]:cursor-pointer [button&,a&]:transition-colors [button&,a&]:motion-reduce:transition-none focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-foreground disabled:cursor-default",
+  {
+    defaultVariants: { kind: "neutral" },
+    variants: {
+      kind: {
+        neutral: "border-border/70 bg-accent/40 text-foreground",
+        image: "[--context-chip-accent:oklch(0.62_0.16_16)]",
+        video: "[--context-chip-accent:oklch(0.62_0.16_48)]",
+        file: "[--context-chip-accent:oklch(0.62_0.136_237)]",
+        mention: "[--context-chip-accent:oklch(0.62_0.11_215)]",
+        terminal: "[--context-chip-accent:oklch(0.62_0.134_163)]",
+        element: "[--context-chip-accent:oklch(0.62_0.134_70)]",
+        "preview-annotation": "[--context-chip-accent:oklch(0.62_0.134_70)]",
+        "review-comment": "[--context-chip-accent:oklch(0.62_0.16_292)]",
+        "pull-request": "[--context-chip-accent:oklch(0.62_0.16_277)]",
+        "pr-open": "[--context-chip-accent:oklch(0.62_0.134_163)]",
+        "pr-draft": "[--context-chip-accent:oklch(0.62_0.02_259)]",
+        "pr-merged": "[--context-chip-accent:oklch(0.62_0.16_292)]",
+        "pr-closed": "[--context-chip-accent:oklch(0.62_0.16_16)]",
+        skill: "[--context-chip-accent:oklch(0.62_0.16_322)]",
+        citation: "[--context-chip-accent:oklch(0.62_0.16_259)]",
+      },
+      // Colors live in compoundVariants below so they come after the kind colors.
+      state: {
+        unresolved: "border-dashed",
+        invalid: "",
+      },
+    },
+    compoundVariants: [
+      {
+        kind: [
+          "image",
+          "video",
+          "file",
+          "mention",
+          "terminal",
+          "element",
+          "preview-annotation",
+          "review-comment",
+          "pull-request",
+          "pr-open",
+          "pr-draft",
+          "pr-merged",
+          "pr-closed",
+          "skill",
+          "citation",
+        ],
+        className:
+          "[--context-chip-border:color-mix(in_oklab,var(--context-chip-accent)_34%,var(--contrast-border))] [--context-chip-border-hover:color-mix(in_oklab,var(--context-chip-accent)_48%,var(--contrast-border))] [--context-chip-foreground:color-mix(in_oklab,var(--context-chip-accent)_22%,var(--contrast-foreground))] border-(--context-chip-border) bg-(--context-chip-accent)/11 text-(--context-chip-foreground) [button:enabled&,a&]:hover:border-(--context-chip-border-hover) [button:enabled&,a&]:hover:bg-(--context-chip-accent)/17",
+      },
+      // State colors win over any kind.
+      { state: "unresolved", className: "text-foreground" },
+      { state: "invalid", className: "border-destructive/35 bg-destructive/8 text-destructive" },
+    ],
+  },
+);
+
+type ContextChipKind = NonNullable<VariantProps<typeof contextChipVariants>["kind"]>;
+
+interface ContextChipProps extends useRender.ComponentProps<"span"> {
+  kind?: ContextChipKind;
+  state?: "unresolved" | "invalid";
+}
+
+function ContextChip({ className, kind, state, render, ...props }: ContextChipProps) {
+  const defaultProps = {
+    className: cn(contextChipVariants({ kind, state }), className),
+    "data-slot": "context-chip",
+    "data-state": state,
+  };
+  return useRender({
+    defaultTagName: "span",
+    props: mergeProps<"span">(defaultProps, props),
+    render,
+  });
+}
+
+/** The chip's text. Truncates to the chip's width. */
+function ContextChipLabel({ className, ...props }: React.ComponentProps<"span">) {
+  return (
+    <span
+      className={cn("block min-w-0 self-center truncate leading-tight", className)}
+      data-slot="context-chip-label"
+      {...props}
+    />
+  );
+}
+
+/** An icon action inside a chip, such as editing a citation's comment. Tints with the chip's kind. */
+function ContextChipAction({ className, render, ...props }: useRender.ComponentProps<"button">) {
+  const defaultProps = {
+    className: cn(
+      "ml-[0.17em] inline-flex size-[1.17em] shrink-0 cursor-pointer items-center justify-center rounded-sm text-current transition-colors hover:bg-(--context-chip-accent,var(--color-foreground))/17 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring motion-reduce:transition-none [&_svg]:size-[0.85em]",
+      className,
+    ),
+    "data-slot": "context-chip-action",
+    type: render ? undefined : ("button" as const),
+  };
+  return useRender({
+    defaultTagName: "button",
+    props: mergeProps<"button">(defaultProps, props),
+    render,
+  });
+}
+
+export { ContextChip, ContextChipAction, ContextChipLabel, type ContextChipKind };
diff --git a/apps/web/src/components/CustomSnoozeDialog.tsx b/apps/web/src/components/CustomSnoozeDialog.tsx
index 453efb1cbe53..670df0e3e12e 100644
--- a/apps/web/src/components/CustomSnoozeDialog.tsx
+++ b/apps/web/src/components/CustomSnoozeDialog.tsx
@@ -1,5 +1,4 @@
 import { useEffect, useId, useState } from "react";
-import { Tabs } from "@base-ui/react/tabs";
 import { create } from "zustand";
 import {
   localSnoozeDate,
@@ -14,7 +13,7 @@ import { weekStartsOn } from "../timestampFormat";
 import { Popover, PopoverTrigger, PopoverPopup } from "./ui/popover";
 import { Input } from "./ui/input";
 import { Label } from "./ui/label";
-import { toggleVariants } from "./ui/toggle";
+import { Toggle, ToggleGroup } from "./ui/toggle-group";
 import { Select, SelectTrigger, SelectValue, SelectPopup, SelectItem } from "./ui/select";
 import {
   NumberField,
@@ -94,35 +93,22 @@ function CustomSnoozeDialog() {
             <DialogTitle>Custom snooze</DialogTitle>
             <DialogDescription>Choose when snoozed threads return to your inbox.</DialogDescription>
           </DialogHeader>
-          <DialogPanel className="flex flex-col gap-4 text-base sm:text-sm">
-            <Tabs.Root
-              value={mode}
-              onValueChange={(value) => {
-                if (value === "date" || value === "duration") setMode(value);
-                setError(null);
-              }}
-              className="flex flex-col gap-4"
-            >
-              <Tabs.List
+          <DialogPanel>
+            <div className="flex flex-col gap-4">
+              <ToggleGroup
                 aria-label="Schedule type"
-                className="flex gap-0.5 rounded-lg bg-input/40 p-0.5"
+                className="w-full *:flex-1"
+                value={[mode]}
+                onValueChange={(next) => {
+                  const value = next[0];
+                  if (value === "date" || value === "duration") setMode(value);
+                  setError(null);
+                }}
               >
-                {(["date", "duration"] as const).map((value) => (
-                  <Tabs.Tab
-                    key={value}
-                    value={value}
-                    data-pressed={mode === value ? "" : undefined}
-                    className={toggleVariants({
-                      variant: "segmented",
-                      size: "sm",
-                      className: "flex-1",
-                    })}
-                  >
-                    {value === "date" ? "Date and time" : "Duration"}
-                  </Tabs.Tab>
-                ))}
-              </Tabs.List>
-              <Tabs.Panel value={mode} className="flex flex-col gap-4">
+                <Toggle value="date">Date and time</Toggle>
+                <Toggle value="duration">Duration</Toggle>
+              </ToggleGroup>
+              <div className="flex flex-col gap-4">
                 {mode === "date" ? (
                   <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
                     <div className="flex min-w-0 flex-col gap-1.5">
@@ -133,7 +119,7 @@ function CustomSnoozeDialog() {
                             <Button
                               id={`${id}-date`}
                               variant="outline"
-                              className="w-full justify-between font-normal"
+                              className="w-full justify-between"
                             />
                           }
                         >
@@ -161,10 +147,7 @@ function CustomSnoozeDialog() {
                         </PopoverPopup>
                       </Popover>
                     </div>
-                    <Label
-                      className="flex min-w-0 flex-col items-stretch gap-1.5"
-                      htmlFor={`${id}-time`}
-                    >
+                    <Label className="flex min-w-0 flex-col items-stretch" htmlFor={`${id}-time`}>
                       Time
                       <Input
                         nativeInput
@@ -183,7 +166,6 @@ function CustomSnoozeDialog() {
                 ) : (
                   <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
                     <NumberField
-                      className="gap-1.5"
                       id={`${id}-amount`}
                       min={0}
                       step="any"
@@ -200,10 +182,7 @@ function CustomSnoozeDialog() {
                         <NumberFieldIncrement aria-label="Increase duration" />
                       </NumberFieldGroup>
                     </NumberField>
-                    <Label
-                      className="flex min-w-0 flex-col items-stretch gap-1.5"
-                      htmlFor={`${id}-unit`}
-                    >
+                    <Label className="flex min-w-0 flex-col items-stretch" htmlFor={`${id}-unit`}>
                       Unit
                       <Select
                         value={unit}
@@ -226,8 +205,8 @@ function CustomSnoozeDialog() {
                     </Label>
                   </div>
                 )}
-              </Tabs.Panel>
-            </Tabs.Root>
+              </div>
+            </div>
             {error && (
               <p role="alert" className="text-destructive">
                 {error}
diff --git a/apps/web/src/components/DiffFilePathCopyButton.tsx b/apps/web/src/components/DiffFilePathCopyButton.tsx
index 49b00ed89b74..5e78949336cf 100644
--- a/apps/web/src/components/DiffFilePathCopyButton.tsx
+++ b/apps/web/src/components/DiffFilePathCopyButton.tsx
@@ -24,8 +24,7 @@ export function DiffFilePathCopyButton({ filePath }: { filePath: string }) {
           <Button
             ref={ref}
             size="icon-micro"
-            variant="ghost"
-            className="text-muted-foreground [:hover,[data-pressed]]:bg-transparent"
+            variant="ghost-muted"
             aria-label="Copy file path"
             onClick={() => copyToClipboard(filePath, undefined)}
           />
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
index 21cd54792d11..ea3f38f2fff0 100644
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@ -72,7 +72,8 @@ import {
 import {
   DropdownMenu,
   DropdownMenuContent,
-  DropdownMenuItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
   DropdownMenuSub,
   DropdownMenuSubContent,
   DropdownMenuSubTrigger,
@@ -645,74 +646,76 @@ export default function DiffPanel({
     if (!routeThreadRef) return;
     useDiffPanelStore.getState().selectBranchBaseRef(routeThreadRef, baseRef);
   };
+  // The scope menu has two radio groups: the top-level one treats the latest
+  // turn as "latest", while the turn sub-menu keys every turn by id so the
+  // latest turn is also marked there.
+  const selectedTurnValue = selectedTurn ? `turn:${selectedTurn.turnId}` : "";
+  const selectedScopeValue =
+    selectedTurnId === null
+      ? selectedGitScope
+      : selectedTurn?.turnId === latestTurn?.turnId
+        ? "latest"
+        : selectedTurnValue;
+  const selectScopeValue = (value: string) => {
+    if (value === "unstaged" || value === "branch") {
+      selectGitScope(value);
+    } else if (value === "latest") {
+      if (latestTurn) selectTurn(latestTurn.turnId);
+    } else {
+      const turn = orderedTurnDiffSummaries.find((summary) => `turn:${summary.turnId}` === value);
+      if (turn) selectTurn(turn.turnId);
+    }
+  };
 
   const headerRow = (
     <>
       <div className="flex min-w-0 flex-1 items-center gap-3 [-webkit-app-region:no-drag]">
         <DropdownMenu>
           <DropdownMenuTrigger
-            className="inline-flex h-6 max-w-full items-center gap-1 rounded-md bg-accent px-2 text-xs font-medium text-accent-foreground outline-none transition-colors hover:bg-accent/80 focus-visible:ring-2 focus-visible:ring-ring"
+            render={<Button size="xs" variant="secondary" />}
+            className="max-w-full"
             aria-label={`Diff scope: ${selectedScopeLabel}`}
           >
             <span className="truncate">{selectedScopeLabel}</span>
             <ChevronDownIcon className="size-3.5 shrink-0 opacity-70" />
           </DropdownMenuTrigger>
-          <DropdownMenuContent align="start" className="w-60">
-            <DropdownMenuItem
-              className={
-                selectedTurnId === null && selectedGitScope === "unstaged"
-                  ? "bg-foreground/[0.08]"
-                  : undefined
-              }
-              onClick={() => selectGitScope("unstaged")}
-            >
-              <span>Working tree</span>
-            </DropdownMenuItem>
-            <DropdownMenuItem
-              className={
-                selectedTurnId === null && selectedGitScope === "branch"
-                  ? "bg-foreground/[0.08]"
-                  : undefined
-              }
-              onClick={() => selectGitScope("branch")}
-            >
-              <span>Branch changes</span>
-            </DropdownMenuItem>
-            <DropdownMenuItem
-              className={
-                selectedTurnId !== null && selectedTurn?.turnId === latestTurn?.turnId
-                  ? "bg-foreground/[0.08]"
-                  : undefined
-              }
-              onClick={() => {
-                if (latestTurn) selectTurn(latestTurn.turnId);
-              }}
-            >
-              <span>Latest turn</span>
-            </DropdownMenuItem>
+          <DropdownMenuContent align="start">
+            <DropdownMenuRadioGroup value={selectedScopeValue} onValueChange={selectScopeValue}>
+              <DropdownMenuRadioItem value="unstaged" closeOnClick>
+                <span>Working tree</span>
+              </DropdownMenuRadioItem>
+              <DropdownMenuRadioItem value="branch" closeOnClick>
+                <span>Branch changes</span>
+              </DropdownMenuRadioItem>
+              <DropdownMenuRadioItem value="latest" closeOnClick>
+                <span>Latest turn</span>
+              </DropdownMenuRadioItem>
+            </DropdownMenuRadioGroup>
             <DropdownMenuSub>
               <DropdownMenuSubTrigger>Turn</DropdownMenuSubTrigger>
-              <DropdownMenuSubContent className="w-64">
-                {orderedTurnDiffSummaries.map((summary) => {
-                  const turnCount =
-                    summary.checkpointTurnCount ??
-                    inferredCheckpointTurnCountByTurnId[summary.turnId] ??
-                    "?";
-                  return (
-                    <DropdownMenuItem
-                      key={summary.turnId}
-                      className={
-                        summary.turnId === selectedTurn?.turnId ? "bg-foreground/[0.08]" : undefined
-                      }
-                      onClick={() => selectTurn(summary.turnId)}
-                    >
-                      <span>Turn {turnCount}</span>
-                      <span className="ml-auto text-xs tabular-nums text-muted-foreground">
-                        {formatShortTimestamp(summary.completedAt, settings.timestampFormat)}
-                      </span>
-                    </DropdownMenuItem>
-                  );
-                })}
+              <DropdownMenuSubContent>
+                <DropdownMenuRadioGroup value={selectedTurnValue} onValueChange={selectScopeValue}>
+                  {orderedTurnDiffSummaries.map((summary) => {
+                    const turnCount =
+                      summary.checkpointTurnCount ??
+                      inferredCheckpointTurnCountByTurnId[summary.turnId] ??
+                      "?";
+                    return (
+                      <DropdownMenuRadioItem
+                        key={summary.turnId}
+                        value={`turn:${summary.turnId}`}
+                        closeOnClick
+                      >
+                        <span className="flex items-center gap-2">
+                          <span>Turn {turnCount}</span>
+                          <span className="ml-auto text-xs tabular-nums text-muted-foreground">
+                            {formatShortTimestamp(summary.completedAt, settings.timestampFormat)}
+                          </span>
+                        </span>
+                      </DropdownMenuRadioItem>
+                    );
+                  })}
+                </DropdownMenuRadioGroup>
               </DropdownMenuSubContent>
             </DropdownMenuSub>
           </DropdownMenuContent>
@@ -746,7 +749,8 @@ export default function DiffPanel({
               }}
             >
               <ComboboxTrigger
-                className="inline-flex min-w-0 max-w-48 items-center gap-1 overflow-hidden rounded-md px-1.5 py-1 outline-none transition-colors hover:bg-muted hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"
+                render={<Button variant="ghost-muted" size="xs" />}
+                className="min-w-0 max-w-48"
                 aria-label={`Change comparison target. Currently ${selectedGitSource.baseRef}`}
               >
                 <span className="min-w-0 truncate">{selectedGitSource.baseRef}</span>
@@ -761,7 +765,7 @@ export default function DiffPanel({
                   value={baseRefQuery}
                   onChange={(event) => setBaseRefQuery(event.target.value)}
                 />
-                <div className="grid shrink-0 grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 border-b border-border/70 ps-3 pe-6.5 pt-2 pb-1.5 font-medium text-[10px] text-muted-foreground uppercase tracking-wide">
+                <div className="grid shrink-0 grid-cols-[1rem_minmax(0,1fr)] items-center gap-2 border-b border-border/70 ps-3 pe-6.5 pt-2 pb-1.5 font-medium text-3xs text-muted-foreground uppercase tracking-wide">
                   <span aria-hidden="true" />
                   <div className="grid min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center">
                     <span>Branch</span>
@@ -771,8 +775,7 @@ export default function DiffPanel({
                 <ComboboxEmpty>No matching refs.</ComboboxEmpty>
                 <ComboboxList className="max-h-64 min-w-0 overflow-x-hidden">
                   <ComboboxItem
-                    className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"
-                    contentClassName="w-full min-w-0 overflow-hidden"
+                    className="w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)]"
                     value={AUTOMATIC_BASE_REF}
                   >
                     <span className="block min-w-0 truncate">Automatic</span>
@@ -784,8 +787,7 @@ export default function DiffPanel({
                     return (
                       <ComboboxItem
                         key={choice.id}
-                        className="h-8 w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)] py-0"
-                        contentClassName="w-full min-w-0 overflow-hidden"
+                        className="w-full min-w-0 grid-cols-[1rem_minmax(0,1fr)]"
                         value={item}
                       >
                         <div className="grid w-full min-w-0 grid-cols-[minmax(0,1fr)_2rem] items-center overflow-hidden">
@@ -839,7 +841,7 @@ export default function DiffPanel({
           <DiffStatLabel
             additions={diffLineStat.additions}
             deletions={diffLineStat.deletions}
-            className="mr-1 text-[11px]"
+            className="mr-1 text-2xs"
             layout="inline"
           />
         ) : null}
@@ -990,14 +992,14 @@ export default function DiffPanel({
         <>
           <div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden bg-background">
             {isSelectedPatchTruncated && !lazySource && (
-              <p className="shrink-0 border-b border-border/70 bg-muted/40 px-3 py-1.5 text-[11px] text-muted-foreground">
+              <p className="shrink-0 border-b border-border/70 bg-muted/40 px-3 py-1.5 text-2xs text-muted-foreground">
                 This preview exceeds the size limit. Changes shown are incomplete.
                 {selectedGitSource?.files ? " Totals include all changes." : ""}
               </p>
             )}
             {selectedPatchError && !renderablePatch && (
               <div className="px-3">
-                <p className="mb-2 text-[11px] text-error/80">{selectedPatchError}</p>
+                <p className="mb-2 text-2xs text-error/80">{selectedPatchError}</p>
               </div>
             )}
             {!renderablePatch && !lazySource ? (
@@ -1123,10 +1125,7 @@ export default function DiffPanel({
                               <Button
                                 size="icon-micro"
                                 variant="ghost"
-                                className={cn(
-                                  "-ms-0.5 [--control-icon-color:currentColor] bg-transparent hover:bg-foreground/10",
-                                  getDiffCollapseIconClassName(fileDiff),
-                                )}
+                                className="-ms-0.5"
                                 aria-label={
                                   collapsed ? `Expand ${filePath}` : `Collapse ${filePath}`
                                 }
@@ -1140,9 +1139,13 @@ export default function DiffPanel({
                             }
                           >
                             {collapsed ? (
-                              <ChevronRightIcon className="size-4" />
+                              <ChevronRightIcon
+                                className={cn("size-4", getDiffCollapseIconClassName(fileDiff))}
+                              />
                             ) : (
-                              <ChevronDownIcon className="size-4" />
+                              <ChevronDownIcon
+                                className={cn("size-4", getDiffCollapseIconClassName(fileDiff))}
+                              />
                             )}
                           </TooltipTrigger>
                           <TooltipPopup side="top">
@@ -1178,12 +1181,12 @@ export default function DiffPanel({
             ) : (
               <div className="min-h-0 flex-1 overflow-auto p-2">
                 <div className="space-y-2">
-                  <p className="text-[11px] text-muted-foreground/75">
+                  <p className="text-2xs text-muted-foreground/75">
                     {renderablePatch?.kind === "raw" ? renderablePatch.reason : null}
                   </p>
                   <pre
                     className={cn(
-                      "max-h-[72vh] rounded-md border border-border/70 bg-background/70 p-3 font-mono text-[11px] leading-relaxed text-muted-foreground/90",
+                      "max-h-[72vh] rounded-md border border-border/70 bg-background/70 p-3 font-mono text-2xs leading-relaxed text-muted-foreground/90",
                       wordWrap
                         ? "overflow-auto whitespace-pre-wrap wrap-break-word"
                         : "overflow-auto",
diff --git a/apps/web/src/components/DiffPanelShell.tsx b/apps/web/src/components/DiffPanelShell.tsx
index 7bc4ad7acfb7..6f7f6e5c8f1f 100644
--- a/apps/web/src/components/DiffPanelShell.tsx
+++ b/apps/web/src/components/DiffPanelShell.tsx
@@ -13,7 +13,7 @@ function getDiffPanelHeaderRowClassName(mode: DiffPanelMode) {
     "flex items-center justify-between gap-2",
     mode === "embedded" ? "px-2" : "px-4",
     shouldUseDragRegion
-      ? "drag-region h-[var(--workspace-topbar-height)] border-b border-border wco:h-[env(titlebar-area-height)] wco:pr-[calc(100vw-env(titlebar-area-width)-env(titlebar-area-x)+1em)]"
+      ? "drag-region h-[var(--workspace-topbar-height)] border-b border-border wco:h-[env(titlebar-area-height)] wco:pr-(--workspace-native-controls-inset)"
       : "flex h-10 min-h-10 shrink-0 items-center border-b border-border/60 bg-background in-data-[preview-panel-mode=inline]:mb-3 in-data-[preview-panel-mode=inline]:h-7 in-data-[preview-panel-mode=inline]:min-h-7 in-data-[preview-panel-mode=inline]:border-b-transparent",
   );
 }
@@ -46,27 +46,45 @@ export function DiffPanelShell(props: {
   );
 }
 
-export function DiffFileHeaderSkeleton({ titleClassName }: { titleClassName: string }) {
+export function DiffFileHeaderSkeleton({
+  titleWidth,
+}: {
+  titleWidth: "short" | "medium" | "long";
+}) {
   return (
     <div className="flex h-8 items-center gap-2 px-2 pr-3">
       <div className="flex size-5 shrink-0 items-center justify-center">
-        <Skeleton className="size-2.5 rounded-[2px]" />
+        <Skeleton className="size-2.5" />
       </div>
-      <Skeleton className="size-5 shrink-0 rounded-md" />
-      <Skeleton className={cn("h-3 rounded-full", titleClassName)} />
+      <Skeleton className="size-5 shrink-0" />
+      <Skeleton
+        shape="pill"
+        className={
+          titleWidth === "short"
+            ? "h-3 w-2/5 max-w-52"
+            : titleWidth === "medium"
+              ? "h-3 w-1/2 max-w-64"
+              : "h-3 w-3/5 max-w-72"
+        }
+      />
       <div className="ml-auto flex shrink-0 items-center gap-2">
-        <Skeleton className="h-3 w-5 rounded-full" />
-        <Skeleton className="h-3 w-5 rounded-full" />
+        <Skeleton shape="pill" className="h-3 w-5" />
+        <Skeleton shape="pill" className="h-3 w-5" />
       </div>
     </div>
   );
 }
 
-function DiffCodeLineSkeleton({ contentClassName }: { contentClassName: string }) {
+function DiffCodeLineSkeleton({ width }: { width: "short" | "medium" | "long" }) {
   return (
     <div className="flex items-center gap-3">
-      <Skeleton className="h-2.5 w-5 shrink-0 rounded-full" />
-      <Skeleton className={cn("h-2.5 rounded-full", contentClassName)} />
+      <Skeleton shape="pill" className="h-2.5 w-5 shrink-0" />
+      <Skeleton
+        shape="pill"
+        className={
+          width === "short" ? "h-2.5 w-3/5" : width === "medium" ? "h-2.5 w-2/3" : "h-2.5 w-4/5"
+        }
+      />
     </div>
   );
 }
@@ -79,19 +97,19 @@ export function DiffPanelLoadingState(props: { label: string }) {
       aria-live="polite"
       aria-label={props.label}
     >
-      <DiffFileHeaderSkeleton titleClassName="w-1/2 max-w-64" />
+      <DiffFileHeaderSkeleton titleWidth="medium" />
       <div className="flex h-6 items-center gap-2 px-2 pr-3">
         <div className="h-px flex-1 bg-border/40" />
-        <Skeleton className="h-2.5 w-24 rounded-full" />
+        <Skeleton shape="pill" className="h-2.5 w-24" />
         <div className="h-px flex-1 bg-border/40" />
       </div>
       <div className="space-y-2 px-3 py-2">
-        <DiffCodeLineSkeleton contentClassName="w-2/3" />
-        <DiffCodeLineSkeleton contentClassName="w-4/5" />
-        <DiffCodeLineSkeleton contentClassName="w-3/5" />
+        <DiffCodeLineSkeleton width="medium" />
+        <DiffCodeLineSkeleton width="long" />
+        <DiffCodeLineSkeleton width="short" />
       </div>
-      <DiffFileHeaderSkeleton titleClassName="w-2/5 max-w-52" />
-      <DiffFileHeaderSkeleton titleClassName="w-3/5 max-w-72" />
+      <DiffFileHeaderSkeleton titleWidth="short" />
+      <DiffFileHeaderSkeleton titleWidth="long" />
       <span className="sr-only">{props.label}</span>
     </div>
   );
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index 111da3b73af3..ca31f8c68cc8 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -48,7 +48,7 @@ import {
 } from "~/components/Icons";
 import { RadioGroup } from "~/components/ui/radio-group";
 import { Spinner } from "~/components/ui/spinner";
-import { toggleVariants } from "~/components/ui/toggle";
+import { Toggle, ToggleGroup } from "~/components/ui/toggle-group";
 import { cn } from "~/lib/utils";
 import {
   buildGitActionProgressStages,
@@ -627,7 +627,7 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                 setPublishRepositoryOverride(null);
               }}
               aria-labelledby="publish-provider-cards-label"
-              className="grid grid-cols-2 gap-2.5"
+              className="grid grid-cols-2"
             >
               {sortedPublishProviderOptions.map((option) => {
                 const readiness = publishProviderReadiness[option.value];
@@ -636,7 +636,7 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                   return (
                     <div
                       key={option.value}
-                      className="relative flex cursor-not-allowed items-center gap-3 rounded-lg border border-border bg-background px-3 py-3 text-left opacity-55 dark:border-transparent dark:bg-white/[0.035]"
+                      className="relative flex cursor-not-allowed items-center gap-3 rounded-lg border border-border bg-background px-3 py-3 text-left opacity-64 dark:border-transparent dark:bg-white/[0.035]"
                     >
                       <option.Icon className="size-5 shrink-0 text-muted-foreground" aria-hidden />
                       <span className="min-w-0 flex-1 truncate text-sm font-medium text-foreground">
@@ -646,9 +646,8 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                         <TooltipTrigger
                           render={
                             <Button
-                              variant="outline"
-                              size="xs"
-                              className="h-5 rounded-[.25rem] px-1.5 text-[10px] text-warning-foreground"
+                              variant="warning-outline"
+                              size="micro"
                               onClick={(event) => {
                                 event.preventDefault();
                                 event.stopPropagation();
@@ -659,7 +658,7 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                             </Button>
                           }
                         />
-                        <TooltipPopup side="top" align="end" className="max-w-72">
+                        <TooltipPopup side="top" align="end">
                           {readiness.hint ??
                             "Open Settings -> Source Control to configure this provider."}
                         </TooltipPopup>
@@ -737,7 +736,7 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                 }
                 aria-labelledby="publish-visibility-cards-label"
                 disabled={publishRepositoryAction.isPending}
-                className="grid grid-cols-2 gap-2.5"
+                className="grid grid-cols-2"
               >
                 {[
                   {
@@ -815,10 +814,10 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                     >
                       Protocol
                     </span>
-                    <RadioGroup
-                      className="w-fit flex-row gap-0.5 rounded-lg bg-input/40 p-0.5"
-                      value={publishProtocol}
-                      onValueChange={(protocol) => {
+                    <ToggleGroup
+                      value={[publishProtocol]}
+                      onValueChange={(next) => {
+                        const protocol = next[0];
                         if (protocol === "ssh" || protocol === "https") {
                           setPublishProtocol(protocol);
                         }
@@ -826,20 +825,9 @@ function PublishRepositoryDialog(props: PublishRepositoryDialogProps) {
                       aria-labelledby="publish-protocol-label"
                       disabled={publishRepositoryAction.isPending}
                     >
-                      {(["ssh", "https"] as const).map((protocol) => (
-                        <RadioPrimitive.Root
-                          key={protocol}
-                          value={protocol}
-                          data-pressed={publishProtocol === protocol ? "" : undefined}
-                          className={toggleVariants({
-                            variant: "segmented",
-                            size: "segmented",
-                          })}
-                        >
-                          {protocol.toUpperCase()}
-                        </RadioPrimitive.Root>
-                      ))}
-                    </RadioGroup>
+                      <Toggle value="ssh">SSH</Toggle>
+                      <Toggle value="https">HTTPS</Toggle>
+                    </ToggleGroup>
                   </div>
                 </div>
               ) : null}
@@ -1793,7 +1781,7 @@ export default function GitActionsControl({
                 <SourceControlIcon className="size-4" />
                 <MenuItemLabel>Git actions</MenuItemLabel>
               </MenuSubTrigger>
-              <MenuSubPopup className="min-w-32 max-w-[calc(100vw-2rem)]">{gitItems}</MenuSubPopup>
+              <MenuSubPopup>{gitItems}</MenuSubPopup>
             </MenuSub>
           </>
         )
@@ -1810,14 +1798,7 @@ export default function GitActionsControl({
             <Popover>
               <PopoverTrigger
                 openOnHover
-                render={
-                  <Button
-                    aria-disabled="true"
-                    className="cursor-not-allowed rounded-e-none border-e-0 ps-[8.5px] opacity-64 before:rounded-e-none"
-                    size="xs"
-                    variant="outline"
-                  />
-                }
+                render={<Button aria-disabled="true" size="xs" variant="outline" />}
               >
                 <GitQuickActionIcon
                   quickAction={quickAction}
@@ -1835,7 +1816,6 @@ export default function GitActionsControl({
             <Button
               variant="outline"
               size="xs"
-              className="ps-[8.5px]"
               disabled={isGitActionRunning || quickAction.disabled}
               onClick={runQuickAction}
             >
@@ -1859,9 +1839,7 @@ export default function GitActionsControl({
             >
               <ChevronDownIcon aria-hidden="true" className="size-4" />
             </MenuTrigger>
-            <MenuPopup align="end" className="w-full">
-              {gitItems}
-            </MenuPopup>
+            <MenuPopup align="end">{gitItems}</MenuPopup>
           </Menu>
         </Group>
       )}
@@ -1882,7 +1860,7 @@ export default function GitActionsControl({
             <DialogTitle>{COMMIT_DIALOG_TITLE}</DialogTitle>
             <DialogDescription>{COMMIT_DIALOG_DESCRIPTION}</DialogDescription>
           </DialogHeader>
-          <DialogPanel className="space-y-4">
+          <DialogPanel>
             <div className="space-y-3 rounded-xl bg-zinc-25 p-3 text-sm ring-1 ring-black/5 dark:bg-white/[0.035] dark:ring-white/5">
               <div className="grid grid-cols-[auto_1fr] items-center gap-x-2 gap-y-1">
                 <span className="text-muted-foreground">Branch</span>
@@ -1928,57 +1906,63 @@ export default function GitActionsControl({
                   <p className="font-medium">none</p>
                 ) : (
                   <div className="space-y-2">
-                    <ScrollArea className="h-44 rounded-lg bg-card ring-1 ring-black/5 dark:bg-white/[0.025] dark:ring-white/5">
-                      <div className="space-y-1 p-1">
-                        {allFiles.map((file) => {
-                          const isExcluded = excludedFiles.has(file.path);
-                          return (
-                            <div
-                              key={file.path}
-                              className="flex w-full items-center gap-2 rounded-md px-2 py-1 font-mono hover:bg-accent/50"
-                            >
-                              {isEditingFiles && (
-                                <Checkbox
-                                  checked={!excludedFiles.has(file.path)}
-                                  onCheckedChange={() => {
-                                    setExcludedFiles((prev) => {
-                                      const next = new Set(prev);
-                                      if (next.has(file.path)) {
-                                        next.delete(file.path);
-                                      } else {
-                                        next.add(file.path);
-                                      }
-                                      return next;
-                                    });
-                                  }}
-                                />
-                              )}
-                              <button
-                                type="button"
-                                className="flex min-w-0 flex-1 items-center justify-between gap-3 text-left"
-                                onClick={() => openChangedFileInEditor(file.path)}
+                    <div className="h-44 rounded-lg bg-card ring-1 ring-black/5 dark:bg-white/[0.025] dark:ring-white/5">
+                      <ScrollArea>
+                        <div className="space-y-1 p-1">
+                          {allFiles.map((file) => {
+                            const isExcluded = excludedFiles.has(file.path);
+                            return (
+                              <div
+                                key={file.path}
+                                className="flex w-full items-center gap-2 rounded-md px-2 py-1 font-mono hover:bg-accent/50"
                               >
-                                <StartTruncatedPath
-                                  path={file.path}
-                                  className={`flex-1${isExcluded ? " text-muted-foreground" : ""}`}
-                                />
-                                <span className="shrink-0">
-                                  {isExcluded ? (
-                                    <span className="text-muted-foreground">Excluded</span>
-                                  ) : (
-                                    <>
-                                      <span className="text-diff-addition">+{file.insertions}</span>
-                                      <span className="text-muted-foreground"> / </span>
-                                      <span className="text-diff-deletion">-{file.deletions}</span>
-                                    </>
-                                  )}
-                                </span>
-                              </button>
-                            </div>
-                          );
-                        })}
-                      </div>
-                    </ScrollArea>
+                                {isEditingFiles && (
+                                  <Checkbox
+                                    checked={!excludedFiles.has(file.path)}
+                                    onCheckedChange={() => {
+                                      setExcludedFiles((prev) => {
+                                        const next = new Set(prev);
+                                        if (next.has(file.path)) {
+                                          next.delete(file.path);
+                                        } else {
+                                          next.add(file.path);
+                                        }
+                                        return next;
+                                      });
+                                    }}
+                                  />
+                                )}
+                                <button
+                                  type="button"
+                                  className="flex min-w-0 flex-1 items-center justify-between gap-3 text-left"
+                                  onClick={() => openChangedFileInEditor(file.path)}
+                                >
+                                  <StartTruncatedPath
+                                    path={file.path}
+                                    className={`flex-1${isExcluded ? " text-muted-foreground" : ""}`}
+                                  />
+                                  <span className="shrink-0">
+                                    {isExcluded ? (
+                                      <span className="text-muted-foreground">Excluded</span>
+                                    ) : (
+                                      <>
+                                        <span className="text-diff-addition">
+                                          +{file.insertions}
+                                        </span>
+                                        <span className="text-muted-foreground"> / </span>
+                                        <span className="text-diff-deletion">
+                                          -{file.deletions}
+                                        </span>
+                                      </>
+                                    )}
+                                  </span>
+                                </button>
+                              </div>
+                            );
+                          })}
+                        </div>
+                      </ScrollArea>
+                    </div>
                     <div className="flex justify-end font-mono">
                       <span className="text-diff-addition">
                         +{selectedFiles.reduce((sum, f) => sum + f.insertions, 0)}
@@ -2053,7 +2037,7 @@ export default function GitActionsControl({
             </DialogTitle>
             <DialogDescription>{pendingDefaultBranchActionCopy?.description}</DialogDescription>
           </DialogHeader>
-          <DialogFooter className="dark:border-transparent dark:bg-transparent sm:flex-wrap sm:items-center">
+          <DialogFooter variant="bare" className="sm:flex-wrap sm:items-center">
             <Button
               className="w-full sm:mr-auto sm:w-auto"
               variant="outline"
@@ -2063,16 +2047,16 @@ export default function GitActionsControl({
               Abort
             </Button>
             <Button
-              className="min-h-8 w-full max-w-full whitespace-normal py-1.5 leading-snug sm:min-h-7 sm:w-auto"
+              className="w-full max-w-full sm:w-auto"
               variant="outline"
-              size="sm"
+              size="sm-multiline"
               onClick={continuePendingDefaultBranchAction}
             >
               {pendingDefaultBranchActionCopy?.continueLabel ?? "Continue"}
             </Button>
             <Button
-              className="min-h-8 w-full max-w-full whitespace-normal py-1.5 leading-snug sm:min-h-7 sm:w-auto"
-              size="sm"
+              className="w-full max-w-full sm:w-auto"
+              size="sm-multiline"
               onClick={checkoutFeatureBranchAndContinuePendingAction}
             >
               Check out feature branch & continue
diff --git a/apps/web/src/components/Icons.tsx b/apps/web/src/components/Icons.tsx
index dda68e1dbd74..3a989cb93b8c 100644
--- a/apps/web/src/components/Icons.tsx
+++ b/apps/web/src/components/Icons.tsx
@@ -547,10 +547,14 @@ export const OpenAI: Icon = ({ className, ...props }) => (
   <svg
     {...props}
     preserveAspectRatio="xMidYMid"
-    viewBox="0 0 256 260"
-    className={cn("fill-black dark:fill-white", className)}
+    viewBox="100 100 411 411"
+    className={cn("fill-current", className)}
   >
-    <path d="M239.184 106.203a64.716 64.716 0 0 0-5.576-53.103C219.452 28.459 191 15.784 163.213 21.74A65.586 65.586 0 0 0 52.096 45.22a64.716 64.716 0 0 0-43.23 31.36c-14.31 24.602-11.061 55.634 8.033 76.74a64.665 64.665 0 0 0 5.525 53.102c14.174 24.65 42.644 37.324 70.446 31.36a64.72 64.72 0 0 0 48.754 21.744c28.481.025 53.714-18.361 62.414-45.481a64.767 64.767 0 0 0 43.229-31.36c14.137-24.558 10.875-55.423-8.083-76.483Zm-97.56 136.338a48.397 48.397 0 0 1-31.105-11.255l1.535-.87 51.67-29.825a8.595 8.595 0 0 0 4.247-7.367v-72.85l21.845 12.636c.218.111.37.32.409.563v60.367c-.056 26.818-21.783 48.545-48.601 48.601Zm-104.466-44.61a48.345 48.345 0 0 1-5.781-32.589l1.534.921 51.722 29.826a8.339 8.339 0 0 0 8.441 0l63.181-36.425v25.221a.87.87 0 0 1-.358.665l-52.335 30.184c-23.257 13.398-52.97 5.431-66.404-17.803ZM23.549 85.38a48.499 48.499 0 0 1 25.58-21.333v61.39a8.288 8.288 0 0 0 4.195 7.316l62.874 36.272-21.845 12.636a.819.819 0 0 1-.767 0L41.353 151.53c-23.211-13.454-31.171-43.144-17.804-66.405v.256Zm179.466 41.695-63.08-36.63L161.73 77.86a.819.819 0 0 1 .768 0l52.233 30.184a48.6 48.6 0 0 1-7.316 87.635v-61.391a8.544 8.544 0 0 0-4.4-7.213Zm21.742-32.69-1.535-.922-51.619-30.081a8.39 8.39 0 0 0-8.492 0L99.98 99.808V74.587a.716.716 0 0 1 .307-.665l52.233-30.133a48.652 48.652 0 0 1 72.236 50.391v.205ZM88.061 139.097l-21.845-12.585a.87.87 0 0 1-.41-.614V65.685a48.652 48.652 0 0 1 79.757-37.346l-1.535.87-51.67 29.825a8.595 8.595 0 0 0-4.246 7.367l-.051 72.697Zm11.868-25.58 28.138-16.217 28.188 16.218v32.434l-28.086 16.218-28.188-16.218-.052-32.434Z" />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M252.794 108.802C289.191 99.0484 326.265 110.305 351.148 135.135C385.113 126.072 422.85 134.862 449.492 161.505C476.136 188.149 484.925 225.888 475.862 259.85V259.854C500.696 284.735 511.95 321.81 502.198 358.207C492.447 394.602 464.161 421.084 430.215 430.217C421.083 464.162 394.603 492.448 358.206 502.199C321.812 511.951 284.734 500.693 259.852 475.864C225.887 484.927 188.15 476.137 161.507 449.495C134.864 422.851 126.073 385.111 135.136 351.149C110.304 326.266 99.0496 289.192 108.801 252.795C118.552 216.4 146.84 189.918 180.784 180.785C189.917 146.841 216.396 118.553 252.794 108.802ZM374.292 407.145C374.292 411.271 372.092 415.086 368.517 417.148L283.723 466.102C302.487 480.585 327.555 486.459 352.217 479.852C386.997 470.532 410.068 439.312 410.555 405.006V317.717C410.555 315.08 409.125 312.621 406.843 311.303L374.292 292.509V407.145ZM251.868 415.897C248.296 417.959 243.893 417.959 240.317 415.897L155.526 366.942C152.366 390.436 159.811 415.08 177.866 433.136H177.863C203.325 458.594 241.896 462.962 271.85 446.232L347.449 402.586C349.735 401.268 351.148 398.8 351.148 396.163V358.579L251.868 415.897ZM368.602 220.628C366.319 219.309 363.474 219.318 361.191 220.637L328.641 239.431L427.921 296.749C431.496 298.811 433.697 302.627 433.697 306.752V404.661C455.622 395.654 473.244 376.881 479.851 352.218C489.169 317.442 473.668 281.85 444.201 264.274L368.602 220.628ZM177.303 206.34C155.377 215.348 137.756 234.122 131.148 258.783C121.832 293.561 137.331 329.153 166.799 346.727L242.398 390.373C244.68 391.692 247.525 391.684 249.807 390.366L282.357 371.572L183.078 314.253C179.504 312.189 177.303 308.375 177.303 304.251V206.34ZM259.849 279.145V331.858L305.5 358.213L351.15 331.858V279.145L305.5 252.789L259.849 279.145ZM327.276 144.9C308.512 130.418 283.445 124.543 258.782 131.15C224.002 140.471 200.931 171.691 200.445 205.995V293.286C200.445 295.923 201.875 298.381 204.158 299.7L236.707 318.493V203.856C236.707 199.731 238.909 195.916 242.483 193.853L327.276 144.9ZM433.137 177.867C407.675 152.407 369.103 148.038 339.149 164.769L263.55 208.415C261.265 209.734 259.852 212.202 259.852 214.838V252.423L359.132 195.105C362.703 193.041 367.108 193.041 370.682 195.105L455.473 244.06C458.635 220.567 451.189 195.922 433.135 177.867H433.137Z"
+    />
   </svg>
 );
 
@@ -701,7 +705,7 @@ export const Gemini: Icon = (props) => (
 );
 
 const ANTIGRAVITY_ICON_DATA_URL =
-  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAgKADAAQAAAABAAAAgAAAAABIjgR3AAAjOElEQVR4Ae1dCYxkV3W9tfdW3T0z3bMvPcxge2zGy2BjY0MwxEAWEBACihSCEiMUSFCiRJEsRygIiIKySUlYAkmMQSxJQAKi4AQngDcMAe87nsF4xuPxrJ6ll+rqri3n3Pfv71e/f1XP4u7+Zdeb+XXvu+/9999/57z7lv+rOiVnF1ILnNYuvV3aAsW+JJIbbe6yXRpPWyh9XtFnCsZC+ePS42ysSCv7vEq2MbwQZbQp/rSTzrjhY0puVUacPc7mF7lQepj3TBqwVd44e9QWjbMCcbawYqeR7uftBH0hUOLSo7ZonPcdZ2tnb2qrhUBg5nZ5/DRfj57XLs0qFM1j9herjAMuavPjvs428eO+Hm2vdmltwWVBrUDx7S+U7lfcL9O3d7reCgzf/kLpflv5Zfr2lgAzUxwIUZvFo9I/v12an4+6BTvH4i8WGQeEb4vTzWaSbWF6VFo7md3i/jm+LRZkZogDwLeZfq4y7lpWZlNFX0SRKDh+3PRzlWwuK8Nvunm2uMZeyGbpvjwdnRXx8/nxqM44g+V3sc79nNfwuBXfZno76ae10tlClhbVGWfw0yXrbOFnXIObrZ1kmp++UJwX9PNbBcxmcZOt7JaeVNnU2F4lfbvpcZI2Hrx/01mMxam3Cv55fp6mc/2G9XU7wWxxkjbfbvGoZFmp3t6+wtDwim25XO6KdDp9JUyXpFKpMaT143gph6lGo7EX+D5Ur9d/XKlU7jl18sRT09OlGTQKQWQw8ONkNN3icZI2C1q2D6AlmIym+XHqCx4AOr127YZduXz+9wD2r1nBXblwC4AU36jMzn7m0KED94MYdZwRB34rGy+gAMdIplloGIhmMOmDTZufz3Rfpr08KQK/bv2mX0Rv/wLsL/UejiY4pzAFr/DbB5/b/70YIrQiBi9o5DDdl9Q1GIgWp6SNwZdRnfEm0C2+es26rXD3X0KPv4iFdMML0wLwCI9hWPitI4cPPo0SCW4U/GicF16QBATSwOUJpvsyqvvAm65y46axd2ez2c+yoG5YnBaoVqsfeHb/3q+hdJ8EPvi+zkq0JUEGGXyAeQIDbb7d4gY449T1gMfPbNq89eOZTOajsHXDIrYA2votg0PDxYmJU3fAK/BKhpNdNRpvmyeOACzACjGd0sAPgadNwd809knI63mlblj8FsDwesXg4NAmkOA7AQnsoj5uZjNpaRZXaQSwRF9S949YAqDnf6wLflObLkkEJNhZHBwaOHXqxO1neEEfY4kjgA+66bHgb9y05V2ZTPajZ1iBbvYXqAXoCQaKxafHx089EVOkAR2TNGdiJoLLYGCbbqBbHsbDY3T1mq39/cV7mLkblrcFpqYmrjh65PDTqAUngNHDJoE2OWRlzdYEPhMYokSweCix0M/09Q180WXvfi53CxALYuJhF2IV2FhFs1FnYDwkgBksky/NE4S9f926Da+H+7mQJ3XD8rcAsSAmqEmIEXRiaNj5eJquFbcMGvE+LJNJy4drpTP5fOEmL29XTUALEBNig6rMw8yzRWuaIrAMdpLJOBvzptesWbcLsru9yxZKVugPsFGcUDXD0iRra7rJpiHAbscSfWkeIJ0vFH7XMnZlslogwCbECrXzMTS9qdLM7AdmYrDMviT4Baz53+aydD+T1gLEhhihXkYCHz8f27Dq0YxMiJ4UxoeGVmwLz+wqiWyBAKMQsxg8We8wPc4DMJHBMoUkwUTjlS6p+5nUFggwmoddUF+zh9X3CWDAM9F0O4H50njYc0V4Zgcq3P2o46OGLZEaJHWN0xboHXhbTVUOMFK8kGD4MY9h2qTzncBoJovPk1gD7uTZnRb40IxAF3tExlaKbMexoS8txXRKGpW0jJdSsn+iIXvG6/JMqS4lsAFJTS3WKfccYDQPO9Tft6E13O35L4UygwU/c6ij8M2WoVMkX6ZaMSDyhleIvGmHyAUrUjKMOVJ2Ni2pckZSM+gskNXptJycEnnkeF1uOTQrdxyflcmqI0Kn3CvrGWAUYkaTdzALA20kQexbwUxk8E80vePW/688PyXXvzEluzaK5Kvo8eWUVMtpqYEEqfBISQpdfmUhLW8Yyco1xYLcdawin3m2JI+XKjqldk3SEZ/EyPDyJStvcQWfBvMATPBDXDxq8/MnSufdZdCx33x1Rt73K2lZ3ScAPYVx3kGOHTO4eOjcB1Md8XRa6rDVcGQyKbluVY9sL+Tlr56ZkNtOlbXlEnWT7StjQPu5ovgx3rA5ADPaSZbRj5vuF5hYneP3L12bk+vfnpMBbI7yBWv2d2AbAk/w08ioZIC0eAaZ+KpsA3JLb1o+snlI0s+IfK+zSGB4+TKKsc4DzANEwfRPpM5g0sUS+snJ3tVX5OXd7+iVNLZESrMOfPR1RwLchjp/EIBgZxR82OAB6DUaOEgMOAElwmg+LTduGJaT1RNy7+QMiJLQG2+ultWS0j+acyHGdmGwE6K6xa0QxhMbOOHbsiUr7/z1ouT681Kq56XcwCF5mZaCHmXIciovM6kcDidn03mppLNSSWWlClnFM5UqCFHDQbmukJM/Xjck6/IZfdie2AaYq5jh5ePKVD+uuu8B7CTLGI3PFZ9AjUu93t6U/Orbh2TFuh51++zCKdjTerDnu7Gfj8zoBbLqATAR0h7fgMRyEUcWJzVwkhsKnH7JQI/8zuig/PXBE7pnkMAmiFbJwDYco3G0ytwkMHqyH/dP9O2J0kmAS68akPMuK2IdD/et4IMAwT+6OhIACz/n+nFXdPMkQY6gA/A6QeeRwYGxRHXEuYmQAineivXknRNluWt8Ws9NVAM0V+a0MfMngVaEncy46SYtT6IkwR9elZVXv2mF1LJ5mZ1FdclvDOipOiiAQ8d93A5JwJsm+DkcJEAN4JIAuYAA9XQdZKirjSQQ6CREEUz5zZEheWhqRiYx3iS6UeKxi1YZg158YMZ5meOzJsN68dVDsnLzgExV09r76QGUAPQECrsjgXoAWIwAJEEVBCD4tQB46iRAo+kAERp1uXygD/sEffLfJyeT7AXisIvaFLgoAeIyxdmSgTpqwd4/uDInF75mlcxislcB4A0M5O4g3I4AKXiDNNIyONjrs3ARFdwZ3T8m+iBBzREgVQ+J0EjXQhI4L1CTApjzjlVDcvdEqZO8gI9XE55GABqbEvwzFkiLZF3aKL8Ysf2VwzK0gWM/Zu4NzNQBdkMPTPcgObNLKwE4B4D7BwlyJAF6fh5EqOHOqwC7FoBPT0Dw695Bb5DDikAaNXlF/4Dsgie4/dQEvEC7ZlvatohcrV3FmMZDN4Ii5zVF2xXSlHFZIuj9Pf1Z2X7ViHApNwv3X6uDADgaPAISsPenQAybB2SDeUAu8AIVEKFgHgBA16HX01UlgPMC9AQ8qlpmIZuRN64Ylh9OTIFwqESyQ1sMzQP4t9DqhFZ2/9wl1eto/LUvL8qKrcMyXc1JFSBXSQDwug5dSYA4pvUggPMCpAEHhixw483ncQBqDAHuqCkRHAEIOL2AAg8de8QoCxJe4NLikGztOSa7S9O6u7ikN77wxVphNc8eRwArfl5mS0iKTGM83nL5qNTzPTJbceBX61l4ARAARyMgAR2d8wIAHzYlAO4uhxvB86E58NH7awC6RtefIvjuUCJkKiiPcQ4vVRnExOHVg8NKgKS0R5t6tMSyFQH8E3y9zTWWNoljf3GkV1ZfOCLlWk4q6OnVOrxAQIAavQBJQA8AmYJMYS5AAnA+QA9AAjgSzPV+Hfc98EmCRprgo6kCEmD6CB9Sk1cNr5JvHjsqE7Va2wnU0rZM09V87Hw9zNSKAGGGxCrY9l19/grJrxqUchXbtyRBDRIkUA+AeA06vQAJICBAWsGn5CogpTByHoB+7SaAAJXjP72AAx5SQac3qbihBXEdXuAFNvUPy/a+otw3fiLJk8G2EHYsAdJYv63ZuQbuG+4f4FYANg/1AAC/Dt0Ogu/mAZj+2VwAm0M5EAH9G7DzIAkcAZzrB9AZEADAqwcg8KCMDiuYC9AL9KQysmt4RB6YONm2kZOc2JEEoPvvH+mToW2j6P05EAAPcvDgh16ARw06wVcPwGGAc4DAC3A1kCEJ1Im7/QDuBHIJqO4fE7xGPfAA9TnwG41ZLaeRQXnYccA+IbaHq3Lh0GoZPLhPxqscFjovdCQBgICs3DYimaEhmali8wegV2oggHqAvAJfBwlqsDd4EHydCHIe4OYA3AvgW0EcAgA9/mHvn74AXkAnfXDxbuxnr8ehwNMLgAiYRmLzGEdFRvtXyZb+IXn45FEQovMo0JEESOPB/Yod65z7x7iv4JMAetALYHsHh/MAJACmeuYBgk0h0EBXA5hK6BBQhwdo0AtwAqhDQUAAHSQIugOcPZ86iVDHTnoPHh/vGF6rBOi8/u+WwqdT7+RQG+4/P9wrA2NrZAYgzwJc5/4dAWoEHkedB7wAwacH4KErAbh/Lgk5kbNXwV3vhydg71ciYK2PiaA0uEagB8D50On6HREQB/iN2izeKMvJthUbpe/ZJ2W6lqhh4LQw6zgPAPxlYNMqyQyvxNqf7p9HQcf9qrp99nwHfl3dvyOAbnoCdM4BHAG4JMRzg+Af0MbmKPyBEgDPk7n8094PoINe38Ckj+6fPb8Bz6MS84SR4lq8dzgke8c7bxjoOAJwmB3cvh6Pffvx2JfLP/Z8EMCkjf1KAuf+dQ4AwNxKwBEAT/gBJjZ19B+SMBFs4GkfPYBgI0gwERQMBw24eDpK3QeAVD0FTxCSYFZ6erOyZXg9CHAE6afV8ZAvGaGzCIBOmuktSN/YRpnVnu+7/YKSga5fx35IrgTU/Sv4uFVMAFOcDBJ44FxXD6B9H2gEHoAJGOEFAOswAC/gRkrECToPkILunzo3m1KYMI6t2ip3P/soyuT5nRM6igBc/hXwQkZ2dI1UAvdfC3q/Ss/1O/CdB1D3H+wFcB3PIYAeAM/22PUDH8AIgceBLWEgizj2D9QDkARw/xwCeKAsmwPUmY5VwujKLfjmUVFOlk521GqgowjAXtq3Zb00eoYC188JXwETPjcHcJM/BzoJIOoBnBeg+0fXxUECuLcECD5dNocBGKHbEZBAz5kDX8tQz4Bmg1dREtTx2jG8Ss/AWlkztE5OlE6gxM4ZBjqKACnswPWMjeGpXw8mftjoUXdfQI80InD3j0tAgMNZu5KAOm5TPQAJwN7vXg6xl7roCbgSwBpANZIhRW+gPoJeACRQ4kDHqoC67gVwdQCPwKePPXgcvX5kuzx5MO4X23BaQkPnEADuPzuI173Xb5JKFT0eO4AhAXS8tzEfJODyLRj/2Tv1gZD2ZrcEZK/n+M9nAoSZcbAEn84D0Ko6wOUugQ4WWCJiqxD8oSfB0pBDATeLVLIZa7J69HzJ5/4X9eNP/XdG6BgCcPzPr10jqcFRqVYIPlw/x3yAz00ft9530sDXnq/AEzQCBgAD9083TcgZ1BNwCMA1aKpxIse5AIcMfIGE3x5SPXgjSL0Iy9U5AsrlnAAEGFgxJkMDq+XoiX3uHC092R8dQwBusxY2b4UnL0oNBAg3ehT8ZgLosi90+wSeBAhAJPAggev1BMeRwPV9bguTBG5QcJ4AVGH+gAicQGpZBF9JBRl4g1zfiIyMbJMjJ/YGpSYbfNaucwiQz0tu03Zd83Pp5cZ6fPdLXb0RwI374SPgoNcTKAcagAzBdw4f6ClKJEA9mAhS0CvUAiI4b0ALwFdvwIkk5gWBTk/AnUXBN41G1u6UzFN3gGQsMfmhMwgAl5xZsUrSqzbq2K87fOj5c+AHOsd7r+eHwIe91iNApI86uBwpnBfAAMF5ATwPHxo5SnDGQMJwiKAksbhjyIkldNiHR3dIT8+wlErH9VwYEx06hAB4c2f9mDR6V8H1Y4IXuH28C4bxNxj3FXjcDryDAR91/WHvByQc/wmhAW8a4/yauObQ1QBzOiJU9Qyk6fyAebhzSHJw/QAigKj5oY0yiLlAqXQMdpIi2aEzCIDlX3bzBWjuXl3iEXg73ESPM/1m8I0EoetX8AIXDj3AWK0+RJwFMPBbxkqRYFhwBKFl7p8NDcxJLyBYKeQL+ILKuovl0IH7/GITqyefAHDD6f5Byazd7nq/ru2dy2dv53rfPeq1nu9m+44A7KXsocFRLUl98oDUTu2TRukwVnPTSMPInu/HNdbg/YIxyQ6sx44vfkwIkOpQoDmcR1CvwDjZE8wPOECwDJKBqwyqw+suk2zu3zFcufKRIbGhIwiQWb0Zyz/sANL9KwFMBqCHbt8Dn0go8LDBHVf2fVdmf/4/Ujv+pNTLeIULT/GAmAOGYGZyku5ZKbnRi6Sw7ZelZ/PrJYPezMlcSAQU6eYDPM8NC+ol1GtwOODcoCE9q14ufYMbZPz5PYmfBySfAGj0zKYLsZ8ziNZHdZUABD44FHwAaBM9zsYJPiX28yv7bpXyg/8s1aOP4XyATrDV/yOPSscBptUnD8nMxHMy88ydUl53uQzs+qAUNrwaJLDJIUvGeQq+I4FG+WFlYh6Q7RuVIawGxo/t5gmJDmiNJAf0skK/ZDbu1Mne3AOe6JgPsJuWeojD/ZYf+EeZuu1GqR5+EOnondzF80GP3jrTmAePgmf33y0nv/tHMvXYVzAf4I4fZ/puZ0B/Swg6vUENE70q0qqQFayq9UcmMgUZ2vgqPEfCUJXwkGwPwPEfS78UHrU2agSGHsD1fL7dwzGXL3gQfKeTz4gD/Ol7/l7Kj3wJ+TFG65buGSIBItQxdEz86C8xV5iS4sXvAznYXJwkslvz0JkiJK8bvFkQEKxv7SVSwAOi6VP7wbnk9rPk1gxNypDefLFIYQU6MIAF+G6TB7oCTzL44ON28FZv+aGbHPjQ2/Z4d4nWn+z1mChO3vtpmXry6wq9rvkxJJAGulkEIlTpCZCXB3V+QzmDyeQAhgFUuHX5CUhJMAHQcPk+yWzehTZ0j3RtyacPeJQAbm8/7JEAYPZnt4AAn3c9X3vpObYyejQ9wAQ8ysyBu7FH4IAPhwNcg4+L+BN0KnVYABkyvTK4+Ro4H3qN5IbkEkDd/2ZJj5yHyRt7NhpSvQB7P6vtHbr8wncCj/1Upu/9lDRm8ZOf7cb6M8UDxKpPHZHxH/+tVDFJVBKAn+YF2Mf5+4LcKCIJKPkWQR8mknkMAzr/ONNrLlH+5BIADZDZgh8nh/t3z/Kdu3eun8MBScGDYzE8AUAv3/8ZqZ/aC/AX4bYwj6gcfkgmH/oXLC648xesDIC+9v7QA5hHwIOWwU0ysOEKeDBSJJlhEVrqhbhRNC9er0pvuRKF5TDRI/gEO+j90PXBTAA+CTD71C0yu/f7AB95Fi2kpPTkN2Vm/52BFwAJQk8ATpIEJARqp6+cYzVQ3Pp6zB35NxySGZJJAP4A05oLAvePHk7A6f6VBKwyx35K9n7M1sf3yczDX0DL4/WsxQycD8yckknsK9SmTzQNAdw65mHg61AAQy+GgcKKrag7B4zkhWQSAMut7PbXSipXDJd5oevn2I+ephsySoiazGCtXju+Z3FcfxQzeJjZg/fK9O5vcBHYTALGSYTAA/DXQ9J9a/AllmujpSQmnjwCoKek8I59evNV6PUEmwfdOt0+e3xw0P0DjNrh+2V2938E9iVqV8wBph77qlRPPqUk4DAQzglQBSOBeYSBl70Jr7PjjxQkcC6QPAKgATNbr5F0cQMaDJADfL6Fo2/lkASh7pZnZbj+xvTzIAOJsUQBk8zayb0gwZd1QqirAfZ8EkE9gEcCGHOrdkjfxiuRlrxhIFkEQOul+lZK9rzr0M85+QP4dPnB4UgQeAD0/uq+70kF+/aLMutfkEspKe/+T6kcuiccCugFQjLgfJ0QkhScDJ73Njx1xO/Wa+4FC1+yDMkiAJovs/VqyYxcoI/abdLn3uNnVekRnOtvTOHBzSNf0G1f2pc8wOPUy8dlCruOdSxBreeHQ4F5AlSMP2ZVWH8lJoTc1EqWF0gOAdj7e1dIbsdb0aHxPN5cv3kAAs+DYCPvzE+/LtUjjyK6mMu+BWjFCeH+H0j557do1ZQEBB71jHoCKQxKcce7sCTkuwbJCckhAHv/y16Hv02L/XO0Hl2/ewM36PVoVP7Tid/Rh2X28X8DEZa/N/E7gqWHb5bqqWcc6MAWHABH5zaKlBioas+ma6VnA/Y2+IwiISEZBGDvH1gjuZ3vxFyuJ5josWoBCSgJPr3B7ITMPPhP2Jo9BDIkoPqoQ/X53VJ65PPgI18QDQgAqZ6AHkF1PC0sFKW48734QxZ4tyEhc4EEtCDaAuNp7qK3Y+zfAfAR1aUfQWf1Ag9AAiDf7J5vyuy+26Avo+tHrZoC6lXGDuEs3jriKOWWgUYEDAdGAjChsOEa6cMbRzppaCpkeSKnSwDcwiIFuMMMXqLMXYTejy3fOfDRkmxN7fkEH2v+Iw/j7Z6bML3Gmz2JCnD3s5Mydf+n8b7hM24+gPqx0bT34x7c/ABeAN8hHLjkfZJd/N3B08LsdAmwOM1N148NkvwV79cdM53hc52vPd/r/XCzXOuX7/07qU88CzIsb7VjG4NDwdHHpXT/J/FC0XQwD3A5jQgqcc+Z4e1SvOyD2OnsRYbTwin2ki+EcRlbEjeOt27yl71Hshuvcl3FwNchwFw/qogeX37wc1LBa1qJcv1RBDgU7Pm2lB//ivZ4QsueT8n5gHoB1TEh3P5W6cOqYLnD8hEArZK74C2Sf8VvoMc71689X0lg4HMIwLzvp1/DrP9fobEpkxxQX5C1dP9nZWbvrXNDgZEgGAr08TCHgl2/L4XNr8NtcaBYnrA8BMANZ7HkK1z5IX3gw2erDnxKNKKN/Rj3K09/By95/EP4Dv/yNNMZXBVeoFE+IaUffUIqB38yRwIUQfpyo4gPi7g5lOoZkcGrP4xvPe9CwvIsDZeeAAR/6y9Iz2tv1HGfs6S5no/qeOBX998h0z/8BMb/48kc91vxAvOB2vh+mbzrz/ASyQO8QQ2OAEYEDgt4Wji0VYq/8DHJrca7j8vgCVoRgHW14OtmOzuJG8ysu0R6XnODpAfwsIfg63hv63y2FA5OqPZ9X0p3fQTv6h/U+NldcBnPIgmO75bJO/4Uzwvui/UEOifAR2blDim+9qOYHI690CTwsfP1sGFaEYAZYk8IzzxThS4PD3p6rvwDSQ+O6V6/gm+bPNrzWR38AOueb0npzg/jRY+EzvhP9965dMU3kSZvvwEPre7Qs6xRKTkc6EESjF4ifZe8H49CF+W7BHbZeTWPI0CrzK3s8wqNN+Bv7oxdK9m1l4cPetyIjx5P8PnjS3ioMvPA56T0g4/rS5iJXO7F31xrK0lw8mklwcwTX8VQj5+XQW72fpO2Y5gfuw77A9uQcM6TwlZYzbOj1duGeSe0zd0uES4xg+/dSQYPQ/QPLBjwcP/46RW+0VO+71P4/t6tGBr4Pn8cN9tdIMFpuJd66ahM/fAvpAqP0HvpBzAErlMS6JePrer5QcyLRkGAx3H/Zjxn2RZDIwAztctoaSXk40PtMw+gfO3oE9rLU1m86sU7xMy3Pn0MW6jfl5mHbpbaiacc8JhJv+gCSNColaX86FewYfSI9Fx8PX7z4BrsDQ+D6xgKsF9cPXQvCMLvE54T+YkRg2HmYs2fId5GAEuOOym0Yf26H1+NPt8yn5HETVV2fxvf1D2OYeAy3CR+5mViP276AQD/M7e9e243fkbVWZ7MIDb+V/l6+W03SHblyyWDt4VS+SJWOvgG83M/xtB3GHnOvgMQI+/eQuxa2aIEsHwhQ8wA2ajX649mMpmzIwALwKPTyl68xcPXtxk4EPJmCfyLHnx3y/rJe0VbVPFsg2Rwwdrh7MFnOcQIIgp8HJ56WfqauMya6KVpnlqter8lnLXEpCgEXL+te07u7qyrkYgT2Rb8wqkebJdzA5/35GFkuJpksq9r/HRa305qzJTL+J51NyS5BQKMQswWqqtPAJ7knxiNy/g41jPdkOgW8DBqh6Wl6XNX3lBoiOiWxvRGBQHfi/svGrsheS1AbIgRaqZ4BdKv6DycfQ8QzRgtROPTpdLNfsaunpwWCLAx3Fgx003OqywJwEQGyxQXD9OOHcPUVcTWmnpi9yMRLVAKsAmxQq18nZWcFzcPwAQ/xMX1ZKwz69PTpT/0M3f15W8BYkJsUJMoyFa5OEzDOYCfyTL6BTXpRw4fvAsXw5ZVNyShBYgFMUFdmnCKxFlVS6euwTwAI0y0YBmjUhlGpp06eeJDlrkrl7cFiIXX+6NewMfQKhpijd2H0AvYLgTlQke6XJ6e6O3t25/NZt9opXbl0rcA1v03HDt2+Ce4MoHna0WUcUeUCBo3AkTBRxlKDCMC49TpMcyWmpwc3zNQHCym0+lLmaEblrYFqtXqF5878MxNuGoUcCMCQWaaSVbQiECdP6rXBCptIcCBHmezPOmJiVP/VywOrQcJLmDGbliaFqjVat868Oy+P8fVCLABHiWCgW+gmwwrSQIQTAumG8BRyXxmM28gE+Onbh8YKPan05muJ7CWXERZrVa+SPAx7vvA+7r1+DgCsGZGhOCnN+ZAZWIrEliaEcDy0Y5t4lM/6untxZwgd50auh+L0gKYe9343IH9N6NwAm5Hq54fJQDrRPDDEB0CfFCjQFua2VmI6SonJyf2gJW39PT0vgrvDawKr9JVzrkF0K57Tp44/t7njx2xCZ8Put/7DXSTYW9HJZrAZ6UIHEnA4INp7p0yejC/ESdWB/iZ0dE11/T1D/wN8p7dG0Q4sRu0BUqlqck/OXr08N2ey/d7fivdJ4iRwaSRQkE3sH0CmG7gG1Es7hOAttg4iJBeuXJkJ4jwHrxI8uYuoKffApjk3Qrgv3z8+LFHALyBaT19Icn8zEOg7VwDvUkSWCMA1CYv4KcZ8CYN8DjwfRt1LQf7BXksGbdgeLgY84RLM5n0DvADXw7A34F5aYdp4HugVqs/gcndgxjjH56cGN+HJR5/9NB6rIFowBvAvozqdo6RoAn4oMnDl/EZJ1A8GHzwTTfw46RPCJ8A/rmmU/qHXc+XUZ3xVoFlLWdgw55O8POZ7kvqdhA86lEQfQK0AtzOMRktk3U1m/7dQEbYiJQM1qAWp406C2wXmMc/h/lJBjuXOm0++KbDHF7Xru/bqHdy8NvFdF9Sjx5sK9oofT1KAkuPymh5KEaD2Rnhj/DOC8wQDSzcAIymxcUtv12MoJrNQDfJ8w30qIwr28/fKn257HFt59fF0uOktRUl28ri1O2wNIu3kpbPyvClXx/1ADQwAxvfpNkoLTCNgZIXtsB49LCyLC/JQxvPo4weMKnNl9QtMH8nBt5/NJjNl9TjDrYX7Qa0r8fZ4sowm9WDcQaV7TwAG90y8wRe0LyAD4jpdiFKO9d0O5d2/0B0HvBWHtMYonFn7ZxPvw1Za4vHSdrsYJv5usUpfZ15fJvF7VxKBou7WPDpE4AZ/Mb241YIL0QSMFBnsHNMMi/zUFp+plGnjB4wzSuDNgYr08U699Paz+7A4r6kHnew3cxueivJfJZG3YKv0xbGDQzLSGmN7suozri5dep+vJXd8pm0azFueqCGdbB4K2nntkpfKnvYoAtc0M9nOmVUNxulD6gfb2W3c1mVqG42Sg0+GGajtIb1ZVS3cymjoFtanN3KtzwWp2SgPRribNE8SYwTgGjwbaYbUHFx2qJgW/5Wdl7T8pjuS+oaOAQwY7SBzeZLd0b8JytigPrSzvdtLMHipvuSOgPzvJgC28IPFvdlVGf8bA5exy/Lj1O3oBtBFolrcLPFSdp8u8WjkuX7Nj9uOiWDledi7jPO5qcnXTcg/Hr6NtMpo3pc3PKZZLmm+/nN7kvqFjRvtHGjcWY2WzvJND99oXhcub6Nuh+sbN/WCboBEq2rbzc9TtLm2xeK8zp+fj9O3YLlCUGzBMq4xvZtpvvydHS/bD+/XdtsFvfz+7ZO1MMG9yrv20xvJ/20VjqLt7Sobpf202PBZsaFwLD0c5Vx17IyrcIvNtkEAG7Oj5t+rpJtZmX47TfP9v9tVpxWeBtrbgAAAABJRU5ErkJggg==";
+  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAQAElEQVR4nOx9CbhsVXXmWvucqst7AmpQwDmoDUgQpTtGmcRIBEHhAwxEMRpCjEOa2NoK7/Hw02drGGSUJE3brdGOHe2gaaLSUdMmxAAyPhklpuOswYHG/sLorTp776z/X+vUvQY1DHeoe9/deqnp1Kl6tdZew7/+tU6StbVVryRra6teawqwla81BdjK15oCbOWrla1o3XHB0/doyvCANJanSSc7aLa/WZ2RonfION0hpd7WZLlq3Xk3f162kqWyytftH3rGS+o4H6s5HdaM66M1N9WELzpWSblW7cwIdmq3glvha/7c55siF8/m2T995Adu/aGs0rUqFeDbFz1xXcrbnpyynKgm9JQhUKmJwsWfVgg7Zbsdi5oyVM0azwuVIJmi1M5ew/NFLzYF2rTuw9d8XVbZWnUK8K2Ld3+FlnSmjMvjG+zsYv/EkQkU93P127EdaEqho2LCTRXWwJ6rkhvRXOx4e81ukr1GBSlUIDFXceE9dw/e8dhPXnGXrJK1ahTg6xc/+1F1MP6QjPSl2hXBrtdSadqxwxsTvmQIv9rjVJMJ2IRLq1DHiYphFsEFnU34cBF2jOI8Zi1qp0qlyPLNLOm4R/zpVV+UVbBWRRbwpf+913NnB/XWcUkvzUlrSal2VWquardaXa6pmuBMtqnWJLhfqtrrYqbeVMVsgR1n7zV9MLWxcyiO8cf2vG0V0yB7X9Kn2KMrfvSrz/tdWQVrxSvAl/9y71+sST9rVvqxFGKF8BsTJm7VrDbvFyhDqU0pqSk4JptEcZwpQ8GxJmEKHvscAq/Y7/aaeRC7H3+NiV5wDB+/595f3eetssLXilaAL35u731mVf5PTml9B8Fjl3NXw9qbEMWEbTu92C53wUulkohbBgi6QAlMQUyJTNj4g4WwW2iG/TyVlsPcPxWkVwZ/r0UO75o9et+TZQWvFRsDbLl0n6fX0l1lQdv28NmWv1fuYUbwAj9eG0T+JnVFtD+q0mYEeoz8zcfTvzMWSIgF8NiE3thx6umgIoDEuZRZRKVtaMzUMDuwwxgj2NP2zAkzf3blR2UFrhWpAJddtv+jm9HoWhPCkyEsM+xVEPAVCA9CrQj6LOoXpntQiqaLgNAi+zQriAQ8+jcBtwgORx44th2VRF3wkQZakCjmQ/i44D2wGVACZgtqZqazkOGQ9Rd/4UpZYWtluoCS/8RM+5MzfL2Z67GJo9PWNmYLE17GJt6xNAj8BH5fzPwXuANt49ZkVuEWEPwl3s90DY2dp3FXInGLILKx6A+mP8H02+fDdSQEj/ifWQ+V1l686O4jnruTrLC14qDgSy/f703jXA7CPofttR1p+1AQ2EtmqM5QDs6e8mlgsZHWKQM8gDq1tSwBRqNRyNXeZP9p0sDiAcVOt2OZCZqc6ecR+eEBIwJEgBYrmJrYR9gXwCkSPlZlhySD99uRh8sKWivKBXzm8v1+oSnNVSakgUIWELBJsvSm3cw+c3i7NRNuOT6AHyG6Z767SLgC5Pt0EwCEzJ83hvqlcdam81gCmgQXQB8/TvY6XAFjC7qBhFygII2AWtj7CxWHamCKd/J2n7zsD2SFrBWjABdddEzzyCfcfpXZ6z0Fib35cCJ1kL7taqJ+UIrO9rEFdyGwwrhgTAi4wr+bsIgEQsCtxwUmeNYFCAXDvw8yj3c/DxTRtn0DZYLQsf1z8QAQsQL2vj3fwExQCXSUmvTM9f/rb74jK2CtGBew7on//w2jkvaE4C0flzRCCofVmlCJ2FoiaEJGaKbunBPdQaJLQLAD841UEOm8uQZoh7kBpIqGFpgczU3YYysBKC2+RRHY3gIUEL5GUoIlgVOw+MFOmuw16F8suhL7DsOc63n2+BhZAWtFWIBPXHXQTjk3N0vO23GfM+VTRv72splyz9GJ5xeYeSHub7uyKNI6yM8AgyZbdm8R/QC6M0akb6khYOJCV6F0DWZBWsC+Y1cKaJYJXZsxwkXsfksFgRxg9wNORjqYCRshwoB1EKIE0hy97Scu/axM+VoRWUAng3daVL5ttijf/hDt13FpZFztz/z3yAzxyFI4wLqAb/F4bFH6yKzDSAdlVDxDGCFTaOy5Oqg4VwF4xKi/QdZAFLEmOwZBIm7NBlRFgE8E0Xa9w8yZgBNBJ1gVgk/MEkwd7HXTzwYPzqmbp//3bWTK10evfPHP20b7Lz0ea0ISFOzghYniFaR6cMMNIdxsimF7t5ikYZPtcWsRP1E9Hos/QkZCbBc2AudU5BHiaSNhP7HzwLxofG5x04/sQgj9MD9wqTMXkMgVJXyB6KO77+/yrdO+/PWbZIrX1GuoGel35zwwy9yaNbZdWWzHpkEZ19YUoRXs6nHx3TqbB9V2u3SWuI8t5x/BUrAWgN07b7fbe0ZlILAk3cDSP5xPYDEMO+Bxg9Ilh48DF7DqcbLPN8GnxotGsASIH5QFJk8AEFzgNRaVoHz6tluO2WMoU7ymOgj88OVH7Gau+WhkWURcCoJwpn/YpRBCMT9gwiGzB45XILfioLD5fK/rm00wZ4Bw0DY8gj/4eoSQsAt2v0UWQaDfwf6Ck6OqaAfCmCcgPdnzTooa0WDhYyICNAjVY0+hLSk0KOavnvCk+x7/cpFb/1imdE21Aozb5g0I6iqTvgbYDjEZR/0J1ADhqRUpHP7H2q1IE0dhlyJQbG3H5wyYKKEsZFkAwCCTVG6FypSgRPZjQNoZ+WNLTWgZE9it+RygwQ1PWsy2QNwgmZhC2Hs72+74Gi3BIeQHDdJD5o32nVE2nloFmNos4AOXH7FdTcNv2EZbR8mjnFsc/jHbCv9dkP+j9AfejwE7ntcht8eOBhLYJQi4tID1LEMYVAeGmqwsEiGlaxC1W0bQQsUs8k+jogOTXEsmUNYh3oPIfxwAUM5pyM8EgMTaIWqJ/EMmYOEisgRYKOgGapGmQOng7S/5zFTWCabWAozSzG/Yj7y+0HDb78nd7cGXOVumewzKuDQCr8pdjl3d1ajuQQ9Q5EFcCEEzXEtmOJAHpEovDmNgCjEwcbbI8QpxfwBApIPgUxATJhM4cIaR7ewBviSMPfISdYi4wY7ne0wJ+JI7CTvsdXb0mgI8mGWO9/U5I2GHDBqm/IgBKiP1iF2ZeDUo/gtlVih8h+4h/JpYEqB9DmAIicAAcjGlQJHH/D9/hIYF3hy+38y+CbypiPoh1EJP0eBTEE9o40wCFhISy4O4jwAD9WX6B/KQXB0tRjjizqMO2mH7i//qDpmyNZUKcMHVLz+g6/RpyLWVFTmBItTiPyfZPEy5CNlBGZT7zuJB2418jWrQ0QLgPkAhZXaOoK8wCRSU8Fg8Ml0ATGy727PiglpxB78CX99ZRtjQBBUzA22akMbwOmL/6p9eGUtQ7lACuBcYqswgph3Xdb9up36vTNmaSgWw4Oy3slf0yMrJXod1KID1u8YtAzN9CBSYfMsgfgTsv3poo0jZ7ByG/FE5EApAxDDTMPs4tJhrgN8vqPKZZpj8rNLE8EJBJEXa1yJjQFGZT9AXINZnBRJKNbYPblF4gA40hZYACQo+PCVgDxn68VqZQgWYuiDwvEuPf1QZ1u9x12d1UCfjt2wY++MW1qB2ZH8yzGZRGHEBIoOe2WuvUSVQ6UOJF8d0iOBJ6aiNFXkGxPTs/phBnG1TE34hpCOtKUWL4039TKZqWxjZAFQPloPwL19HjFCcYtpWFokYEDoTEeedCxTti73k8RdfcrlM0Zo6C1Bm0iu7XLlLweQuhYImvCrCTaX0tSBowSubC8CGhJMuUApG3uoJuecHrAUQrwdKn5z+xeKdvb/N7kQgRDcclQEnLYzleXwDrEWidskgFwYcCeXEIBsgjBwQZDDcALloeISWcASSA1gIZJQJbmCqFGDqkEAz1SdksnkQcg3NFRsCyGgbeH9r4dZAkJyNu4F2RAMbMcTP/xL3q0XphvDZcSMZWv6erB7Uyqw5grHF7rN1aFXfGQsf7DXhn6GLhhPYc3zdnh81A3vfoOLPagkVzxk6aFmlfa79jSxWyPa8IZKGOA8Q8wNltOdaoIisExS8374TagrVUUgoylG3HX74epmiNVUW4IzLTnhWZyXfSmgXvhNFPcusgddzbykDLtB3EdYFq9e3M/r5CMsqk/TETAHFXpaGmSOijtAyhENOX7D/EWZ4+tZhxxbAuQJkhx4lJzggU4vqoE4HmkGWIflA8CkoJGvgUs4SSeo0pBbAE2rOGSXnxOfti8+UYTraPvJ/yJSsqVIA2zGvQt6fvXgDYTLZqjT9ZhEsbyueCjLkLplkMGQFCsoXbThDM/zXXQMTNyKAwAK0jODLGdtZ1jAyqAlUcJh3CLj4a0gi2uoMD4QeaCMBhWzA4l82S5MV+f+AfQWZeT/jxMQuBIeTNXnaqE5Wayr1Dsug4TUFuP8CIeey9GvZsmxsJbjazJy/rV7t4561TYl+PcgaX92PQUxQ0BIkvRNHnq7E8Bn6M2mDIwd4jLgxEdVLLC0A3TOBi29ilvghcGaSibUHtAojFCEUaSJuQUgIwSOZLAYlMnOAKUBcYLue6WJ2cgJPQkcBNSz7fe2IV+z01E9+9PsyBWtqFODUv/33B5hwd+x6+q24Jche7gXzB25ArGynMPUoBdtrpG1XYvbI1ZuoCzhNlBgilQGgDvEE27UQLyBblhEMVEjVwzQzNybLBh0j9jm0Oybowm8HcLewmoREEbhAG8hEzZ22pIAAJXSb5TgAmgqql6sT6oaF1ecWNPLh4Eg76ftkCtb0WABNx3Tmz5nmiRDtg39nqZVKgGY9YAJI7iDMvl7vlqGK1/NZIOoIv9kmJYhrcmioJ2DxkOtFfEGiYIOiDoqKJZoAveSE5gJL6hMLPzTmGbGA6UILbFkIP2qYeCsVtsCem8xSI9xFi6JEgiolEFIrPyyjDAm1zEfJmgL8+DLU7mXw6R36sqr7d+xl+H77eenrq3P3oRiK35I7k4qhvvtB9M4EbYHIIiSz7WyRuO1XEjktBrANmyxZILaAmMFwPgVQ1DJM9DDCc0qAQZ3zRHA/9UAwgAQoJtLGzNgBhYJiwh8QCmZJET0HwAXIJbT4tY5RFDLhj5EjaHruLcccv/OeH/vQ92SZ11QowIZL37K/Wd7HeN9eQwYPzD3A+q6jOwiTj7CfUAx3qWcA9qMDc4WCoA6HzQlLALgHNE+D5qAt1dI9cProHNgpCrROuZthGFjWzaR61gxhmqAtyBOPLbP6D+WccWGG0KAcWAvr1Rn0UtaHUTuw7wN3AFyAISi0oXWKMpSE7sQQwkPthB+UZV5ToQBjTYcz1SttAEDI+227Fk/T8GMzDawM3cQqsnbcgGANHDdpXgB+usbLAHYexOCE7akMA8JCVrczM16iuQPoHJs/GfbD2lg6WLsO4SVRR3LKKUAGfcIGA3AIUDRqlTtfhyggmbIOaBFSCNzTwxbWgD1rpoAZ4S0HDCjB7ZIOkzUF8GVAz9GCPmtxfAAAEABJREFU3B+7memep4AkVyL6J06PFLDlLYsCIHmQCI64i3EB+3iQKiLp6wpTQ9v9jTowl3gm0MpglfHOxLrR0MN3Myx5lBMDOpC+GiANRQwRtkegomZ1PjCifwA8EHLmpJGWbUKd2Rj8nJ4hwEmY27FPNPgI57Qc1AJGEXYqw6LkA759zJvXPelj590ny7iWXQFOvPSU3c3kP8Xz/4YKQMYtBI4dTd+bWKWBGLw0nHhrlsGTeNKCkgeCygKQ7TIL3+x1kjjh1HOY/+KkLbKGWBVi0o5GEQsRBshA7QxAAM0NILUDFk1uICBgBH4NTT7VCmchHNTJTJPqLJpKmrEdBkvTsT0ZWMEInYvFaWbOU8J3boa3DfNBdpJLZBnXsiuACe4wMn0h0NoyuifcT/MPc99wlyErgAkvxPLCUiANx17KYF3AFSgzBbKFePKWpF62itAMBD8AFJBSSSNAoYc5XybNUDlOACAE0T4I2sneLWmAEfgpaggljs/8PrMAhuhzCBzUYBiTstTCNSBeAInRUoQWDqKhA3uRbO0KYHj+ITT5kfYBVIOgPc3rKd0tf1gEWuaDmf8jNUMFsOO+bn3yA/Iu7WMCFnGUrd2UfnR2wh4QNhay+RN5A+r4MBBGfBmcovO+IYDRQKII+cDWd5kQkRWKoKVWb3Ba+sB5Q8qhQ96YFAoKAIp1ZUXPAfuOlOgUjM9BssxrWcvBr/3U5vVW/bvDhJ2Y9lWPA5DS0RIUNm/A1BMUQmnX9mIpHXH+ynSxNGwMLWD8FYL5zhIAX5CVwIbMDi/xmZ2AyNnjzzoiWkrB5rEKIUu4hJAGnBjE5BGzB+BMKsjoLQGljKjBbMxIaY9g9l1lLSlAiQhMY7sV0MbMNGWUndC14CWjNqMshBJy57XMkvf95Q9t/rIs01pWC5CH7UFouUEw1wM/gH6rR/oM7HIIWeqw0jWw5As3YQHZuPFdj8dWlfMacSIlLMFXe3aAOMEet0zyWRUGE8SqevAdUIPCHJ2WBQJFfAjQzvYoJkgMCkeJIBJ1N8Ie8zYNyPZhScjOMeOkQWYAg0TwgMWkQYMYwBTCMAVS2QaNp4qC4hYUp8IKbKUKUNMhHvh5DEAXwOAuHpd4XN3Pi+9FloY5xku8TgCwBwQR7Fmmg3wNUJ8pRWai4O16BIdpL8AlVAyVYFwfDKKWsb739rFtWLexbIKE8QqghzMFxIXLn86RP8vtM9oSTPbm7wEuIEZg1pCcIErQOXnqCGvBOTaJMYn5o1+xk/2hLNNaVj6ABXiHw69D2Kzt219nuTXuI8+vqP1XjwcAy1jdXtERBKAVwCwLRVbT93hhEGVi4noWx80QS+BxZcAUEnUBUxJLBWdYuDUjjc/iMfY55r1TypYLdNjd4ACYOMd1KONmoMji8VpNAwsrwC1o+d6x8nXhcw1em5HObpH8gUMAjsLYnAX5BFZDwHF4bZTwPjumndn/U69937JxBJbNArz602ftZf7+cQzyfOdXpE/0srQCyPkTIVgAQYX8GuzggQu8cAoYi0Zk5mXnCCSf7uUFo+xN4SRrFU77sE3LQNBwGbA24SgaFhEBBqDvPAbGRWUxikS4QeIAH5Eq1Q71xQRcgD7J2aAtcQtMnVCHiElj90kTAIicVJqZwbS0KIgGsjmJ8QtlmbKBZVOAcWkOK8H0IcDDXZ/8Fi1dLARZPNAx7ye6h51fOJipCep1cso4WBxsFEVxkHUB99XCEA9Bn3ozZyLxC+3eqOgBmMtkCyMLQI7P8h28takbAk/k7igYoPPMysAmtMyKUSagYK+nAfOI7Px/M1qDTu392XvMIOzqgBFxAGqaio8p5XybmDuXli0dXDYFMFP/YmG5d8Cijfv7SPtC2KwCFgaGQhI3hz22hF7B9gF/W6J0jFyfrdygCKMKyMJew2mPYpkDf3iiRk0NbWDNB8QR5wAPnDVgcUPOrETZJyWSBEgrqhJTIoWl54b5vY8qAD8dCkUNbMQnT/LkyRWR342DioBbYKqJVx1xy47j8iJZprUsaeAxF53xyDLc9gce5Q8C1UsBAg24GZHWYVcDEJI+OyiBACIFzO46MPKlcvc7p5+dH+wCUBL8i7sFniOoolAMzn9Baxd/BOQRJAdQytV7iZOziREUZq8YAhpGOufIQyEshW4hj1RAAyDEK4MYPGuqDWiLqR+dm78OpjDTxpbnG3u3Uir7vfz8V/+dLPFaFgvQzWx3UO2BnhC+m/9hZfcPzLYpAIGUCAALtx4COXVqL0h7QtiYwR2j/uK8AKC3jUS+3zCW4JAn8oLZzS+OKXDIH0sD5B+23ncM6IcugXUIzAeKOZHS2wEUiiFkFIIauiQFSji0+2hjN1BBkVH46AhvNgUA5MUH8/9tdrCRtkdpMqxsgDhg61AA270Hg3HvuD6E1vI2fLeDOg4IcZ95zAXT6ameU7Xt18zBAaieUhXyvhrO8QOkk8ASyi7vktgN4MQ8Yn4eF0QXTyLg61BhRTNH13nlUDkAjFGCOtvcg7sWlUNWdYXdQwOzWuMgrhH9M/yaytaw8ZAwpJ0YfAJS06B0UDEGhcxpul+WZUgHlyUNtLLvwVHZ8wAwtzThUALQuT0e4AAHDwzLwJWFytB4Pw7jhIHE+2KSc+slWVqKBmBSYs2vgx9u1QXNsrLJhpVGteohcf8Kj64tx0cVMoeSBXNNYtsAqvtO69aO3GHla2NL8TqJ1JKpIAEp4AtkEOD1MejoyVLGFlT0GYy7YZppqWJQzc2BtCg+zex/we/+xYws8VpyC3D4xz+4u0XeT6DfZsTfgz3qAmUXBn7kxtvA0IfrHcFUAMVoUMC7tQnuYO8yGoIuvsvRkev1A6cIqqOCGuaf+D3YY4kBISxHk2q4GQL49ONCCqlPkxzYfZSYYbcgvIYnKHyTTxtHUNIScsLn8KsQglJaHwQtjPpBRzIFHrLg3fnEC1irJs8YcrGvfblLZQnXkiuA5f4vikCOplUC6SPPP8rBNdwCyRw5drzTwvjjQfiO+Km7hj4TSG10ELc0/QzZJ0bOewpAAxLPwsQhYuf9es5eWV2E2clJozHd6Xwd1TSRQtaqD4LIHBlevUEV3gPTJxHQQFVZObBikb02QCbpdERPGSs4iChPJ/FUEefEACu6gdWtAMh5+1IvwB4Xdm/W+Ve9+tdG2zcDvxjkNKhe2VPWA7iTE2gfnN4XSqIheJL7fG4AEjzQw4qn5w4S8RmWbJW8nUgMixsMITOwbzysEkMIkC1g9oCiR8ArBc4AZJqqbA0mk6gj8lQYWTgITQuVECXA76PghT6izD6GyiDRNAd1gbfLEq4lTQMP/YsLZro7d/yB/egz/Y73wI+7vRLxo2AHXqyvLVm/tBRe5xcRrx3AfOcoCTt324s/ZO3ApHZuysWxPboDZdYf5H/SyNnU41NipO8qgBMhkMgO4riCgETXQV+qYhjpHYvOSW6qdy96xxEgLG9RQfWQuQ5Zg/aY1UCGspMGOIybGjj3SYb17l3fePpht8sSrSW1AKO7djrA/tkzLIKUNvh4PWs3IGH8dCFsZt7VLYMG7VvC/FvgqMRlgQx657+neTVF1O8wjgRVrLcIXtSrXpL3sf8+MDo6yDT2bXR5E+4tbBpXzoqH54aLIauQMKH6AALGFSj0SBDO2TkszlJHg2vn/eiIIkhZ9ggB/oYKzYjGikplW1iB/ylLtJZUASxeOpjWsrgvF/r3YPcQ2mWqF1F95Pxk5qQ5BnAfN2BfEscJtE+c+FHqnOknV6D65L4giMBN83nvKkjiE2Xo5ZlOak8aDV4PLIGy8p+9dkg2oDAeIG2UkBF7zon3kVVADEEIG7D3EKEkKpPebELGMGZbAKISgEQcQZd5MYqmaVavAlj6dwjbb2Dyq8Zu7hk8jZdxnd/v5hwCyl7/92CRFqD6ENgUbBti+qRz135SkPKqUP6AwI8PdGQIVv2fXHzAmESox6k/Gn2EGhPnSeCOQ5RcRUZ6DhA3ZI4xoOPEMcwQYFcyWMUo89rruPSYKycnWLVUh7jggATf2NJANKEkmiYkmnqw+BT7KkuwliwGOODDf/a4qsOv+URNB30oxD4LIPzeVg/Pm9i9seNZNXOmUK29Kwh3QNJf8t8su/DdoqdoEZMw3/i1w9r3GRo0AFf/ILjoVkPZG+AxQQolYFgJ348tTpAgEaFABTBUl/mJMxOysw5YUNLq1ylDxk/VJZyc+rjBy1ssbieHkmktLOU86NTNz1qSy9ItmQUwgOfw/tIOGuncRIDc7RzVFMFeG1WXcAXeHha5foq0K80Jn4pUSbqgBYi6AE14KISPefSJ4Dyhzw6iNpSYLMbFKmHhsT6GpvpIOG52nKXhlBBgTDGzRH32hNNNcgyRTCwtIV3hcDqUi8g4rkFEZqThDoIwOCcIOMvdLEsFSWRJFGDpkMDUHMLUjoFdIHqIqTO4fG0UdFKfyvUBofQwby/8Gt3AZPlw/Ffy671JBIeoyTorUMn+DQCAxyV/rC4vn+7t9zRmins9iNRv9cwd9kF9GHiWGAfIa8uJP3ZmoKex3rxCQ26KwLi/4zWr8J5obgXyx1sniTjC2DhABBJK4lCJX5ElWkviAva46KLh9vdu/wPzkkOafgoVVb+k3mcV5nziEhgbBP2bHHp3A+KpXNC7+lkAwf1j94Xb+OpBHzd7XN3Dh7z2UYJ7WGdx68TjOmc4oHx/GFbEP0n7FlT1XJKP4/oE3phGLNFTQ566RAhbSUBDMMGqBwvgNS5l6Q0obdx6h0ORdVmfsnnzv7lTFnktiQXYbvaRB5pwhvTzAHq6wO/VIVzi+rmdw/XhGYuXf3vhi84Fir2r4Co+L9bLvb1iUIR+lSBCsn4swVtP/RC932n693cm8WvtGTRperW4tx4ROoR3iPeBUMiZBH3RySfU+sQKn2Zm+EK2vzGtRSN+/WlNY9Yp3BqMoQ6wFA4L06J0pI5xWDXqDnpvIwfLEqwliQGs5H2IB3etC5SlWo8Fau5TuNQHetwLfermibv2Y95dEXqqV/D/PViMrR1TQ0neqN7/bY+vM5l+3p663H76rw0GM9+68j/q/VqynvPu+iQ71RMNr/sle++B5uP3t+Rie4cRa1wkSoJCAulz7geH1wDRa9TTvhSYRPY8loFEEz1HxZ2Fdx0zKElhI0oPK9O6GOQIksjHZZHX0iiADA6D8MnKCwjX/X3crx7xs8GjttGj7QHixO/3wq8hfHGLEPP8e+Mdwici9GWrv7x7dvRPn7l18453P5Dvee3b9Nt2gz+MdeVMv31PHz3HPvNEE+XLNaJGzxG8skxCGMrDSCiaqCeIhxVsOorJo8hSxxgfJ2xaZCicffy1ki9Q+suVZZ9tUGVJWEKLHgPs/Ud/u0fK9Vq/wE4bETqbNXzcW58NAP6NHT0x+TlJlNP4mKhf+SnCL9xN0I2bzKCetmXDI/5cFnDtf1rdtTbjt9t3eZl6hMgYwOMDZ+lxsZYAABAASURBVI4mDyOdoMa00fuOJboAengYVytE9bHx97FrOJGbWGIQLi96i+Lzwe/dtMvVsohr0S2Ahcov8UIPGzcI26I+z/AIJjXAn6BpODpIV8AYXd2Ee3lVadJ9NpAHdr7rPbYj6rJ5y4bhuaIzCw6iXL5J/6/d/PrzThtf2DTpIzWXnZMXCNhEzg4kpyozWggvxSsVNpFxohGRVcrkiaB4HVM7NrM7twWbhOkhz53MdcqiKsCiB4HmNw/jxZu9bi/Ot1Rn9aD4o8MyAXuKY/bOBkoO8RaHWPy6AW0wazn9I2oJUITma/ajHrhlwzbn9Nd5XKx11abBFVruenZq9dM07CViTwaIHseUsAs+nyppf02pjD4FdQVnR1JKkTMklItBMsGQU0W/Iwkl2r5YFnktqgvY879dtZOFSV/xHdzyOjypTgI9YOzVsQGhwP3anG3s7kAC8SVBrYupYGRXcHnqZ/+/dPa+O495oH5+Ide+p49PNSvwDpgAyp4ziD09lKCmBGVF+nkEOkdonyCCUI/AOHlR4qaEY0yca7Ln72/Y4TuySGtRLYD94w8nSIqGjxKesXrJlu3XRSc1gZ4PMFfwmcvxK327RAAoUUVjMPZXd62bOXI5hI/1hVMGv2ew3Vt9Ig1LgN5rSCDJU0dONKGo/WKjEpeeZZTI3ge3ABEekj4Ey9DReyaZVV3US9EuqgJYpH9UhEjOtCFaNmRbfQ3IJJA+maSBceUtQu3SzAWBfkkerT16Z8JPjxoe+ZU36qws47p80/ACC+ffyjqEc048bQ1XkD1cDCCKpQY2r3RRmkZrMvCCsU85pYvA+9ARBQpaTvUoWcS1aC5grwuv2LHI8B8U4xGYyw/ZZF+cxBGRP34xTvUQmWP0EmOlC0hh8kuKkr3DtrbZbrlzm+F+yy38+euAM8Zn2Zf7D7xODBvUYjylOizlpJJ+1hnj35L6xjb1JBjXoW98JFZcuNoRxXY0u9v7T91pUQZLLpoFqDo4UrwdAhx/595UL+M6J4C5fq06ZwEmeX9KnuJltn/HGTUolvrDphkeNU3Cx9r5qe1G+8rX1NITS50GLn5BaXcN4rc1JhSylU3UzT17h4gC8gKYTkZ1VRjNrH+ZLNJaNAWwci7Mfw3z7dF8mVfyDYo3hR6xQB9N1x4fCFg20MMw/s0rr30LAZupWh87VnN7X3OkgULfrUEr4dxBRoe8wqSWYCNzJJH6PGGJ/oRcHQsDkpjFM6BMohlb2hbNDSyKAuzxh7fsbMDO82JWHwexgCAlJHF5TOwJtDjKFzEdaTXRGCrirN4e4ROv375zy4bBpTKl62826/+zTf2KGj6/BBxNcpHb9CgzazAAImicHB/vSa4cJeBjqy0854Qz73m8LMJaHAug3ZGRt9cqPanDTT0Hc8V95/CFb69Nj9tLX82L6wFJ1HSvv+G+bc6UKV9XbtQv2Bc+hzudXlwnlxTCP74kdwMqc26BOsI55M5NwO7IdBsS2YNlA40cKYuwFkUBTLhHscwbNG+mejlas1DpU4dxJfiB3jkhMqkBiF9rzREgoGhltmvKcbJZi6yA9cP70tvt3/L3k05C5xIEiFW1HyuTw/zzouTBaWQmIDEpLadQCF4CcVHcwIIrwK4X3vAEc3y/6DAtTL2PVqrxD3S17rvzJiaeVULt/b5GgZ7CB0DUbrjppHVflxWybt2sI/vH/RpDmAgCWZ2k+U+Eg2tcbxxpohPLJJSkjxP8eboFRQubPueYc+99gizwWnAF0K59pbN32lp6DMAL61Hs8f5cp805PCw6oXA5O4PduX1mINd+ceNwKiZrP5h1xUb9kgnyDOlJySIcLiHEAGjmAzJ25Lo0RJVp4mqUNzwQlGhPY/r8SlngtbAKsBmkKz3eo383+dqbeWF0E+PdA/jhrldn3cz7KtGmhR2DgXC/KSt0PfIR6V22i79BW1YcICrcz31Q60JGuRjjZwozBXH3kLyalNmI6vUQyyxOcOh04daCKsDuO3zpRVbNeqwLM+r6HtayEbTn+M/V7n2pj9yR3k2IRhe/ytlfPGWbr8gKXZ82rKJJ8hrubHXquESKGHKMhkX3+X4hDI5BUY6YTp4hVZ9QjDhh56PO6RaUL7iwFkDbV3lQh9Ko8+F9wPL86F6dPxVB33zBu9vXPiD8xg0bZt4pK3xddrJ+3n6MixwGVI6mJ6PQWexRMyjqRNiekO6egZbBa2EESr2iWo6XBVwLpgBPu/ArOypGnyYf2uzDVlKkeQ6MslJb/Wog6nWwSafvhI7p98DM3SirZNVxOskCgG5Syk49pWQyvyLSG6eiE/XEEIkanU4ZHBI2l6M7/tAjzq87yQKtBVOAdlx/U9hp69fc7i/f6o2bMdgxO6Ln/8AI+ELkXirz+6Yk19ywsf2ErJJ15dv0Hw3kP59ooJIQ5EXiKBREv0qf4/IKBN5a5sc6b8AxFAZQ4+7VskBrYRRgM4efHNdPVK99G1d20rN35gRRIxojwuQHhVvm0ECahZk3yipb3b1yugn7DkcFhTOJavz7Ufj3WQMOHvUkE595G97S/9SnnspvLVQwuCAKsOsOXz2k1sFj4e/9et9+XT8HwXraVlC++scaaJ8QEuPQBiKF2nzk+o16o6yydfVmvTNLeWffllY82/WLHVb3j4QGAgbmBPwIHNmfSC6k+gW1VHY+YoGCwQVRAKts/I7/i7zCx13eB32TOMAVVie7XyetXYwZEnv+7x2m5lRZpevJu6T32c74aq8Enu9LT2H3aWURD7BApE4KqREAFl4pQ6N9TE6UBVgPWwF2+/2v7Gdmfu9Jxy5LvE2AQDEDYF7e72PcNFqpdEKoi6jx7GtP1mW/ktZiLVQM7Wc50eO82PEUfiQ+bglIiSi9QgThmZPukhPIvAlFDnzpGaNnycNcD98CdOlNk6qdekNHb/a9q3ZeRS8i3NRz/ueQANz7zj3r2/Nkla+rTtLP2e9wSV/68DI4X1Lf5VE46mlTIp4e8m5lSkj3ANpY22ySh7kelgLsev5Xn2M7/rn074HvS5j2xES3z+/7GGBO4P7/OeUwv/eWaSN5LNYaV3mLBHc56G/ady0SJOLP5imgX/LIMQIPDOe5ilIPOeRhWoGHpQBJmzdF6daDvuKj1xzta+okq5f+9l8oQdxaGPDXN21sPyVbybruFP2a7fLfm+xwcVPQX7aylH6wiTeRC2eLaQBDGjB5YGbJMIaHsR6yAjz9nG/sbd9g3+RTdb3nD5SvHAhHBIF+mWadQwIdDtK5wFDvs2rf62QrW49+hKWFol/vHxeZ2y3BISG30JFC3/IxuJR60xEyZuh02MFn193lIa6HrABtSm+Mnn0v5ZAI6WkqGz9jx9e4TNuE5DHx/e4TrND5rus36G2ylS3UCczyvabqHGZWexSQ0b+niMXRQfpRWoHqAaLTy3nhcysi5ZPlIa6HpAC7nf/tvey7PV97/+7ovri/nysBT8w+b2JKZ5C6wxrceP2G4QWyla4rrU5gUv8w7vcmvUzaCT0G0B5QrX2yFMVTn0rF1+0tRx10Tt1VHsJ6SApgqvkOXlqz9OZ93g6XueBuTrUZ3ugkE3B6N2ZsvV628lVKeqsJ/PYQbO1BMloG6f9COSI99GmEHiH2DSe1yw+JLvegFWC3c795rH2PZ85H+Nzkp3mnnFgA7S2CM99lbjiLyLtu3jhzs2zl65pNhIePd6vIWeSx3QPwyT2rKMAC6ZXDrUWh9eV8pANfeFb3oLuIHpQC7PaB27czQZ8kfbmHbrzptTac2aSzd+6NgW7MwwNuvOFH7dmytriuPkX/0nbyf58YTHSM+OXQ5jJl8dtc+2JSYAg8zi2CoUxn7nNuXScPYj0oBUh3/ehUU4Dt/CJJGuMRwqeT8ZCc05Q8JtDa7/YeBu7HrbS/sVIInku1BipvtvTu2720kSyVwIJK/7v1WQAPkN49aPYiAoKHnWe68qDAoQesALuf/a1DzNQfrnEJ96B3iX/h3gWEQvS1TvVaQPyL4tj6ppstD5a19WPrig16V0r6KmePz+WE/Xi73nrWcKGTZlNOpXVmkWME8oYD3zM+4IF+7gNSgF3P/vvHaGo2O9IXs/rw4cU5/iHcOh/Z6/2V9rO3XHc/deMpwz+StfUT11Un6xX2u73N+wTCIQRjPk+AoqpBLvXk0GNBJ9nWfnpKunC/M+t2D+QzH5ACpLTte0zoj+jr+hOWTwR7kzBVJKqA4RgmfX38cl9eNzP4bVlbP3Ndc4paNF8/3Y+vqz04EEa1BqhWoz5QQggsE6eAiqvu1NT8Bw/k8/5VBXjGef94sgl174B3g9OvTuvQPv9v+tw+LtGqEcUG5afoPbXJx/2kyVxr6/7rnlk9zn65b/aXK6mBEYE1Ij0M7FDAxLW6BegtAWcnH3rAWflN/9pn/UwFeMbZtx1pn3Is0jz3+OnHzTyDkmZyqn7wemQA6uQwu0362yupsWO5162b9W4r9h1tP999fUjImxQNtDqXGvrlq10eOTqRsmsEWu83Pv/08c+cN/hTFeAXLvj+swynPcXn1nlw57P44pItHoHw2MlQ5j506blM7vfffv3G9tOyth7Uuvokvcl+xldWZ9Pyucrp5U4Zj7JKPC9hbSXSQpYJFHMKS2ouPOC0usdP+5yfqAB7nfW9HevYkKXq19hQ6SP+voffmftzp+gBIR+qKzIZ0f4nFvQ9IF+0tu6/rt2oViHVN0gI2EWs8zZj0INkghjHtQmDgu2zj9fbo4+94Nz69J/0GfdTgKdf8A8z41TOsp2/vQ93SJOALwX0gzyfY9Em5t8HMIv2p2T+99c3zrZvlrX1sJYFhe+3X/S9zhvQCUHUU8QoElZ3A95u5jEA2cR4jaxieVQ3qh9//ln37fIvz38/BRjmbTeacHdRvxyKTzOYTOjsGzxjztv8NE8i8ifNS66/e/3g1Wtgz8KsqzfqSfar/vm8KloUjSZUrAlHAOY/96kCHmKPklhaH5PzzMf2O+PeJ88/948pwO7nfu+1dp4X9P36cyXc8PN9e4rtfA5JdFQiUj6fiGXf7JZG7zp2a2H3LNUqP2fxQK2XTCB1DUKxhP/v/QOvdetTapxvGGUYtxCPLbrNH7/gvPqo/rwTBXjGed99Sar12JTdfysbuuaBPrUHdeOafdmtfp92+ChX+UI7GhyxZePP/ZOsrQVdW16n4+s2pZfZb/0RH0MoPmY5iDUlgkWohiOJdZI8OIeAdDN0mT5lNKof7M9LBdj9vO/+vJn635F50C4vt+bYs6d6gftjaYxCg1ol7aHg+rnxbHvcls16r6ytRVvXbpQT7Mf+ryWQv0m/TfVYoMcI6iRejw3KodRBRy+y1z5nVlLJKNE9zvnuf1Zpd+E4zppav1ZaavyyN7j8cfLh/pxmmxoQ/7y3G3OvWYr6xI2bhquum2ea1787vf4nkzGE6FPxhReviLjPh/JUz8ty9ate+iVL2W4AyKBQBBmKAAABz0lEQVSW0qWD057nfv9gixSePJmEToDHyV2xuwPdE3cJ3t0agQcYSXLamvCXfm05Rd9uEnu5/d3Z22WvCdQJ5wKrBJWoTyMDKBKOpG/Lsdi9L07Fx7NUb1t1dy8e+TulI9yChPl3RbnN1OFlN67A6R2rZV23UT9h2/nfmuAv87qBOJtIHCGMUEDnEwqqxLQ9HpwONMc+eHwP5CT1qfUMAznQMtpXe2BHo0JR9LPjHw0OvX7jcNX18K20BULtlk36Ytu6bKmr4smZz6rsiVg1rrLugWENK15qeVxKRX4g/XV4Yh6v7/ZGYqaJxmQLDLIe2Sk2m8k/EXi1rK2pWYYavtekvI9J97oejO8zAwdjomYvfqFbTx7SDRbqDy7WCYQTbL15/Xq80p7DfFeUlF960ykzH5W1NZXrulP1lus26QtN4q83z30bc7ri81l6BNE7jv3aRqrj8ynoZ5157y8Vya+xgP9pHvmLD/RRvdmcyZaayiU3bVi/aDPr19bCr0MvqDO33yvHm7SfbfnBk+yppxqwvz2ajs0EXG253Xuu2UBrMbeeeXp9dE2jnUvN99y6cf23ZG2t+qWytrbq9fDbw9fWil5rCrCVrzUF2MrXPwMAAP//z9dnYQAAAAZJREFUAwCDZN+FnSK/OAAAAABJRU5ErkJggg==";
 
 export const AntigravityIcon: Icon = (props) => (
   <svg {...props} viewBox="0 0 128 128" fill="none">
@@ -775,6 +779,7 @@ export const OpenRouterIcon: Icon = ({ className, ...props }) => (
     viewBox="0 0 512 512"
     fill="currentColor"
     stroke="currentColor"
+    // oxlint-disable-next-line shadcn/no-arbitrary-values -- OpenRouter brand colours; its stroked paths need currentColor, which the fill-[…] brand allowlist cannot reach.
     className={cn("text-[#0F0F0F] dark:text-[#F5F5F5]", className)}
   >
     <path
@@ -804,3 +809,88 @@ export const ForgejoIcon: Icon = (props) => (
     </g>
   </svg>
 );
+
+// macOS System Settings > Privacy & Security pane marks, so the SnapShot setup
+// step points at the same icon the user is about to look for.
+export const MacScreenRecordingIcon: Icon = (props) => {
+  const gradientId = useId();
+  return (
+    <svg viewBox="0 0 32 32" aria-hidden="true" {...props}>
+      <defs>
+        <linearGradient id={gradientId} x2="0" y2="1">
+          <stop stopColor="#ff6972" />
+          <stop offset="1" stopColor="#ff2938" />
+        </linearGradient>
+      </defs>
+      <rect
+        x="0.5"
+        y="0.5"
+        width="31"
+        height="31"
+        rx="7"
+        fill={`url(#${gradientId})`}
+        stroke="#ffffff40"
+      />
+      <circle cx="16" cy="16" r="10" fill="none" stroke="#fff" strokeWidth="2" />
+      <circle cx="16" cy="16" r="4.5" fill="#fff" />
+    </svg>
+  );
+};
+
+export const MacAccessibilityIcon: Icon = (props) => {
+  const gradientId = useId();
+  return (
+    <svg viewBox="0 0 32 32" aria-hidden="true" {...props}>
+      <defs>
+        <linearGradient id={gradientId} x2="0" y2="1">
+          <stop stopColor="#48b6ff" />
+          <stop offset="1" stopColor="#0085ff" />
+        </linearGradient>
+      </defs>
+      <rect
+        x="0.5"
+        y="0.5"
+        width="31"
+        height="31"
+        rx="7"
+        fill={`url(#${gradientId})`}
+        stroke="#ffffff40"
+      />
+      <circle cx="16" cy="16" r="10" fill="none" stroke="#fff" strokeWidth="1.75" />
+      <circle cx="16" cy="10" r="1.6" fill="#fff" />
+      <path
+        d="m10 13 6 1 6-1M16 14v4m0 0-2.5 6m2.5-6 2.5 6"
+        fill="none"
+        stroke="#fff"
+        strokeWidth="1.6"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
+
+// Codex's Computer Use app mark, shown on computer-use rows in the work log.
+export const ComputerUseAppIcon: Icon = (props) => {
+  const gradientId = `${useId().replaceAll(":", "")}-computer-use-app-gradient`;
+  return (
+    <svg viewBox="0 0 24 24" aria-hidden="true" {...props}>
+      <defs>
+        <linearGradient id={gradientId} x1="2" y1="2" x2="22" y2="22">
+          <stop offset="0" stopColor="#00dff0" />
+          <stop offset="0.42" stopColor="#3b9cff" />
+          <stop offset="0.72" stopColor="#b044f5" />
+          <stop offset="1" stopColor="#ff78b6" />
+        </linearGradient>
+      </defs>
+      <rect x="1" y="1" width="22" height="22" rx="5" fill={`url(#${gradientId})`} />
+      <path
+        d="m7.2 6.2 10.5 4.1-4.2 2.1-2 4.7z"
+        fill="white"
+        stroke="#315cff"
+        strokeWidth="1.1"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+};
diff --git a/apps/web/src/components/LegacySidebar.tsx b/apps/web/src/components/LegacySidebar.tsx
index 7a13f01a4742..1991dc502283 100644
--- a/apps/web/src/components/LegacySidebar.tsx
+++ b/apps/web/src/components/LegacySidebar.tsx
@@ -17,6 +17,7 @@ import {
   prStatusIndicator,
   PrStatusTooltipContent,
   terminalStatusFromRunningIds,
+  synchronizeTerminalPulse,
   ThreadStatusLabel,
   ThreadWorktreeIndicator,
   useLinkedThreadPullRequest,
@@ -26,6 +27,7 @@ import { ProjectFavicon } from "./ProjectFavicon";
 import { useAtomValue } from "@effect/atom-react";
 import { autoAnimate } from "@formkit/auto-animate";
 import React, { useCallback, useEffect, memo, useMemo, useRef, useState } from "react";
+import { cn } from "~/lib/utils";
 import { useShallow } from "zustand/react/shallow";
 import {
   DndContext,
@@ -184,7 +186,6 @@ import {
   isSidebarNestedLinkClick,
   isTrailingDoubleClick,
   resolveProjectStatusIndicator,
-  resolveThreadRowClassName,
   resolveThreadStatusPill,
   orderItemsByPreferredIds,
   shouldClearThreadSelectionOnMouseDown,
@@ -234,7 +235,7 @@ const PROJECT_GROUPING_MODE_LABELS: Record<SidebarProjectGroupingMode, string> =
   separate: "Keep separate",
 };
 const SIDEBAR_ICON_ACTION_BUTTON_CLASS =
-  "inline-flex h-6 min-w-6 cursor-pointer items-center justify-center rounded-md px-[calc(--spacing(1)-1px)] text-icon-muted hover:text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring";
+  "inline-flex h-6 min-w-6 cursor-pointer items-center justify-center rounded-md px-0.75 text-icon-muted hover:text-foreground focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring";
 
 function SidebarThreadDetailPrewarmer({ threadRef }: { readonly threadRef: ScopedThreadRef }) {
   useEnvironmentThread(threadRef.environmentId, threadRef.threadId);
@@ -696,7 +697,6 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
     },
     [attemptArchiveThread, threadRef],
   );
-  const rowButtonRender = useMemo(() => <div role="button" tabIndex={0} />, []);
 
   return (
     <SidebarMenuSubItem
@@ -707,15 +707,25 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
       onMouseLeave={handleMouseLeave}
       onBlurCapture={handleBlurCapture}
     >
-      <SidebarMenuSubButton
-        render={rowButtonRender}
-        size="sm"
-        isActive={isActive}
+      {/* A thread row is the legacy sidebar's own control (a focusable div that hosts nested
+          links and buttons), not a SidebarMenuSubButton, so it owns its look here. */}
+      <div
+        role="button"
+        tabIndex={0}
+        data-active={isActive}
+        data-slot="sidebar-menu-sub-button"
+        data-sidebar="menu-sub-button"
+        data-size="sm"
         data-testid={`thread-row-${thread.id}`}
-        className={`${resolveThreadRowClassName({
-          isActive,
-          isSelected,
-        })} relative isolate${isFileDragOver ? " ring-1 ring-inset ring-primary/70" : ""}`}
+        className={cn(
+          "relative isolate flex h-8 w-full min-w-0 cursor-pointer select-none items-center gap-2 overflow-hidden rounded-md px-2 text-left text-xs outline-hidden focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring group-data-[collapsible=icon]:hidden [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-muted-foreground",
+          isActive
+            ? "bg-sidebar-row-active font-medium text-sidebar-foreground hover:bg-sidebar-row-active"
+            : isSelected
+              ? "bg-sidebar-row-selected text-sidebar-foreground hover:bg-sidebar-row-active"
+              : "text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground",
+          isFileDragOver && "ring-1 ring-inset ring-primary/70",
+        )}
         onClick={handleRowClick}
         onDoubleClick={handleRowDoubleClick}
         onKeyDown={handleRowKeyDown}
@@ -785,9 +795,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
                   </span>
                 }
               />
-              <TooltipPopup side="top" className="max-w-80 whitespace-normal leading-tight">
-                {thread.title}
-              </TooltipPopup>
+              <TooltipPopup side="top">{thread.title}</TooltipPopup>
             </Tooltip>
           )}
         </div>
@@ -799,7 +807,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
                   <button
                     type="button"
                     aria-label={`Open localhost:${discoveredPorts[0]?.port ?? ""}`}
-                    className="inline-flex cursor-pointer items-center justify-center text-emerald-600 outline-hidden focus-visible:ring-1 focus-visible:ring-ring dark:text-emerald-400"
+                    className="inline-flex cursor-pointer items-center justify-center text-success-foreground outline-hidden focus-visible:ring-1 focus-visible:ring-ring"
                     onClick={handleOpenDiscoveredPort}
                   />
                 }
@@ -825,7 +833,8 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
                 }
               >
                 <TerminalIcon
-                  className={`size-3 ${terminalStatus.pulse ? "animate-status-pulse" : ""}`}
+                  className={`size-3 ${terminalStatus.pulse ? "motion-safe:animate-status-pulse" : ""}`}
+                  onAnimationStart={synchronizeTerminalPulse}
                 />
               </TooltipTrigger>
               <TooltipPopup side="top">{terminalStatus.label}</TooltipPopup>
@@ -843,7 +852,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
                 data-thread-selection-safe
                 data-testid={`thread-archive-confirm-${thread.id}`}
                 aria-label={`Confirm archive ${thread.title}`}
-                className="absolute top-1/2 right-1 inline-flex h-5 -translate-y-1/2 cursor-pointer items-center rounded-md bg-destructive/12 px-2 text-[10px] font-medium text-destructive transition-colors hover:bg-destructive/18 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-destructive/40"
+                className="absolute top-1/2 right-1 inline-flex h-5 -translate-y-1/2 cursor-pointer items-center rounded-md bg-destructive/12 px-2 text-3xs font-medium text-destructive transition-colors hover:bg-destructive/18 focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-destructive/40"
                 onPointerDown={stopPropagationOnPointerDown}
                 onClick={handleConfirmArchiveClick}
               >
@@ -913,7 +922,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
                       render={
                         <span
                           aria-label={jumpLabel}
-                          className="inline-flex h-5 items-center rounded-full border border-border/80 bg-background/90 px-1.5 font-mono text-[10px] font-medium tracking-tight text-foreground shadow-sm"
+                          className="inline-flex h-5 items-center rounded-full border border-border/80 bg-background/90 px-1.5 font-mono text-3xs font-medium tracking-tight text-foreground shadow-sm"
                         />
                       }
                     >
@@ -923,7 +932,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
                   </Tooltip>
                 ) : (
                   <span
-                    className={`text-[10px] tabular-nums ${
+                    className={`text-3xs tabular-nums ${
                       isHighlighted ? "text-foreground" : "text-secondary-label"
                     }`}
                   >
@@ -936,7 +945,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: SidebarThreadRowP
             </span>
           </div>
         </div>
-      </SidebarMenuSubButton>
+      </div>
     </SidebarMenuSubItem>
   );
 });
@@ -1040,7 +1049,7 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
   return (
     <SidebarMenuSub
       ref={attachThreadListAutoAnimateRef}
-      className="mx-0.5 my-0 w-full translate-x-0 gap-0.5 overflow-hidden border-l-0 px-1 py-0 sm:mx-1 sm:px-1.5"
+      className="mx-0.5 my-0 w-full translate-x-0 overflow-hidden sm:mx-1"
     >
       {shouldShowThreadPanel && showEmptyThreadState ? (
         <SidebarMenuSubItem className="w-full" data-thread-selection-safe>
@@ -1093,7 +1102,6 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
             render={showMoreButtonRender}
             data-thread-selection-safe
             size="sm"
-            className="h-8 w-full translate-x-0 justify-start px-2 text-left text-xs text-sidebar-muted-foreground/75 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
             onClick={() => {
               expandThreadListForProject(projectKey);
             }}
@@ -1111,7 +1119,6 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
             render={showLessButtonRender}
             data-thread-selection-safe
             size="sm"
-            className="h-8 w-full translate-x-0 justify-start px-2 text-left text-xs text-sidebar-muted-foreground/75 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
             onClick={() => {
               collapseThreadListForProject(projectKey);
             }}
@@ -2361,9 +2368,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
       <div className="group/project-header relative">
         <SidebarMenuButton
           ref={isManualProjectSorting ? dragHandleProps?.setActivatorNodeRef : undefined}
-          className={`pr-8 group-hover/project-header:bg-sidebar-row-hover group-hover/project-header:text-sidebar-foreground max-sm:pr-14 ${
-            isManualProjectSorting ? "cursor-grab active:cursor-grabbing" : ""
-          }`}
+          className={isManualProjectSorting ? "cursor-grab active:cursor-grabbing" : undefined}
           {...(isManualProjectSorting && dragHandleProps ? dragHandleProps.attributes : {})}
           {...(isManualProjectSorting && dragHandleProps ? dragHandleProps.listeners : {})}
           onPointerDownCapture={handleProjectButtonPointerDownCapture}
@@ -2407,11 +2412,14 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
               {project.displayName}
             </span>
             {project.groupedProjectCount > 1 ? (
-              <span className="shrink-0 text-secondary-label text-[10px]">
+              <span className="shrink-0 text-secondary-label text-3xs">
                 {project.groupedProjectCount} projects
               </span>
             ) : null}
           </span>
+          {/* Keeps the name clear of the environment badge and new-thread button overlaid on
+              the row's end (two slots on touch, where both stay visible). */}
+          <span aria-hidden className="w-4 shrink-0 max-sm:w-10" />
         </SidebarMenuButton>
         {/* Environment badge – visible by default, crossfades with the
             "new thread" button on hover using the same pointer-events +
@@ -2516,7 +2524,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
                 : "Update the project title."}
             </DialogDescription>
           </DialogHeader>
-          <DialogPanel className="space-y-4">
+          <DialogPanel>
             <div className="grid gap-1.5">
               <span className="text-xs font-medium text-foreground">Project title</span>
               <Input
@@ -2563,7 +2571,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
                 : "Choose how this project should be grouped in the sidebar."}
             </DialogDescription>
           </DialogHeader>
-          <DialogPanel className="space-y-4">
+          <DialogPanel>
             <div className="grid gap-1.5">
               <span className="text-xs font-medium text-foreground">Grouping rule</span>
               <Select
@@ -2622,7 +2630,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
 
 const SidebarProjectListRow = memo(function SidebarProjectListRow(props: SidebarProjectItemProps) {
   return (
-    <SidebarMenuItem className="rounded-md">
+    <SidebarMenuItem>
       <SidebarProjectItem {...props} />
     </SidebarMenuItem>
   );
@@ -2675,20 +2683,15 @@ function LocalSecondaryStatus() {
   }
 
   return (
-    <SidebarGroup className="px-2 pt-2 pb-0">
+    <SidebarGroup>
       {connecting.length > 0 ? (
-        <Alert
-          variant="default"
-          className="rounded-2xl border-border/40 bg-accent/40 text-muted-foreground"
-        >
+        <Alert variant="sidebar">
           <Spinner />
-          <AlertTitle className="text-xs font-medium text-foreground">
-            Connecting {connecting.join(", ")}
-          </AlertTitle>
+          <AlertTitle>Connecting {connecting.join(", ")}</AlertTitle>
         </Alert>
       ) : null}
       {failed.length > 0 ? (
-        <Alert variant="warning" className="rounded-2xl border-warning/40 bg-warning/8">
+        <Alert variant="warning">
           <TriangleAlertIcon />
           <AlertTitle>Couldn't connect {failed.map((entry) => entry.label).join(", ")}</AlertTitle>
           <AlertDescription>
@@ -2741,15 +2744,13 @@ function ProjectSortMenu({
     <Menu>
       <Tooltip>
         <TooltipTrigger
-          render={
-            <MenuTrigger className="inline-flex h-6 min-w-6 cursor-pointer items-center justify-center rounded-md px-[calc(--spacing(1)-1px)] text-icon-muted transition-colors hover:bg-accent hover:text-foreground" />
-          }
+          render={<MenuTrigger render={<Button size="icon-xs" variant="ghost-muted" />} />}
         >
           <ArrowUpDownIcon className="size-3.5" />
         </TooltipTrigger>
         <TooltipPopup side="right">Sidebar options</TooltipPopup>
       </Tooltip>
-      <MenuPopup align="end" side="bottom" className="min-w-52">
+      <MenuPopup align="end" side="bottom">
         <MenuGroup>
           <div className="px-2 py-1 sm:text-xs font-medium text-muted-foreground">
             Sort projects
@@ -2762,7 +2763,7 @@ function ProjectSortMenu({
           >
             {(Object.entries(SIDEBAR_SORT_LABELS) as Array<[SidebarProjectSortOrder, string]>).map(
               ([value, label]) => (
-                <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
+                <MenuRadioItem key={value} value={value}>
                   {label}
                 </MenuRadioItem>
               ),
@@ -2782,7 +2783,7 @@ function ProjectSortMenu({
             {(
               Object.entries(SIDEBAR_THREAD_SORT_LABELS) as Array<[SidebarThreadSortOrder, string]>
             ).map(([value, label]) => (
-              <MenuRadioItem key={value} value={value} className="min-h-7 py-1 sm:text-xs">
+              <MenuRadioItem key={value} value={value}>
                 {label}
               </MenuRadioItem>
             ))}
@@ -2795,7 +2796,7 @@ function ProjectSortMenu({
           <div className="px-2 py-1">
             <NumberField
               aria-label="Visible thread count"
-              className="w-28 gap-0"
+              className="w-28"
               max={MAX_SIDEBAR_THREAD_PREVIEW_COUNT}
               min={MIN_SIDEBAR_THREAD_PREVIEW_COUNT}
               onValueChange={handleThreadPreviewCountChange}
@@ -2803,14 +2804,13 @@ function ProjectSortMenu({
               step={1}
               value={threadPreviewCount}
             >
-              <NumberFieldGroup className="h-7 rounded-md sm:h-6.5">
+              <NumberFieldGroup>
                 <NumberFieldDecrement
                   aria-label="Decrease visible thread count"
-                  className="px-2 sm:px-2 [&_svg]:size-3.5"
+                  className="[&_svg]:size-3.5"
                 />
                 <NumberFieldInput
                   aria-label="Visible thread count"
-                  className="h-7 w-9 grow-0 px-0 text-xs leading-7 sm:h-6.5 sm:leading-6.5"
                   inputMode="numeric"
                   onKeyDownCapture={(event) => {
                     event.stopPropagation();
@@ -2818,7 +2818,7 @@ function ProjectSortMenu({
                 />
                 <NumberFieldIncrement
                   aria-label="Increase visible thread count"
-                  className="px-2 sm:px-2 [&_svg]:size-3.5"
+                  className="[&_svg]:size-3.5"
                 />
               </NumberFieldGroup>
             </NumberField>
@@ -2968,28 +2968,18 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 
   return (
     <SidebarContent
-      className="gap-0"
       fixedHeader={
         // Lifted above the stage backdrop, whose fade bleeds below the
         // header and would otherwise paint across the search row's outline.
-        <SidebarGroup className="relative z-[1] px-2 pt-2 pb-1">
+        <SidebarGroup className="z-[1]">
           <SidebarMenu>
             <SidebarMenuItem>
               <CommandDialogTrigger
-                render={
-                  <SidebarMenuButton
-                    className="focus-visible:ring-0"
-                    data-testid="command-palette-trigger"
-                  />
-                }
+                render={<SidebarMenuButton data-testid="command-palette-trigger" />}
               >
                 <SearchIcon />
                 <span className="flex-1 truncate">Search</span>
-                {commandPaletteShortcutLabel ? (
-                  <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">
-                    {commandPaletteShortcutLabel}
-                  </Kbd>
-                ) : null}
+                {commandPaletteShortcutLabel ? <Kbd>{commandPaletteShortcutLabel}</Kbd> : null}
               </CommandDialogTrigger>
             </SidebarMenuItem>
           </SidebarMenu>
@@ -2997,8 +2987,8 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
       }
     >
       {showArm64IntelBuildWarning && arm64IntelBuildWarningDescription ? (
-        <SidebarGroup className="px-2 pt-2 pb-0">
-          <Alert variant="warning" className="rounded-2xl border-warning/40 bg-warning/8">
+        <SidebarGroup>
+          <Alert variant="warning">
             <TriangleAlertIcon />
             <AlertTitle>Intel build on Apple Silicon</AlertTitle>
             <AlertDescription>{arm64IntelBuildWarningDescription}</AlertDescription>
@@ -3020,7 +3010,7 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
         </SidebarGroup>
       ) : null}
       <LocalSecondaryStatus />
-      <SidebarGroup className="px-2 py-2">
+      <SidebarGroup>
         <div className="mb-1 flex items-center justify-between pl-2 pr-1.5">
           <span className="text-xs font-medium text-sidebar-muted-foreground/80">Projects</span>
           <div className="flex items-center gap-1">
@@ -3040,7 +3030,6 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
                     variant="ghost-muted"
                     aria-label="Add project"
                     data-testid="sidebar-add-project-trigger"
-                    className="size-6 [--control-icon-color:currentColor] text-icon-muted"
                     onClick={openAddProject}
                   />
                 }
diff --git a/apps/web/src/components/NoActiveThreadState.tsx b/apps/web/src/components/NoActiveThreadState.tsx
index 79da7a0cad19..651c664b6aa8 100644
--- a/apps/web/src/components/NoActiveThreadState.tsx
+++ b/apps/web/src/components/NoActiveThreadState.tsx
@@ -22,8 +22,8 @@ export function NoActiveThreadState() {
         <Empty className="flex-1">
           <div className="w-full max-w-lg px-8 py-12">
             <EmptyHeader className="max-w-none">
-              <EmptyTitle className="text-foreground">Pick a thread to continue</EmptyTitle>
-              <EmptyDescription className="mt-2 text-muted-foreground/78">
+              <EmptyTitle>Pick a thread to continue</EmptyTitle>
+              <EmptyDescription>
                 Select an existing thread or create a new one to get started.
               </EmptyDescription>
             </EmptyHeader>
diff --git a/apps/web/src/components/NoProjectsHero.tsx b/apps/web/src/components/NoProjectsHero.tsx
index 5aa29a729b69..2da1c0aadb8c 100644
--- a/apps/web/src/components/NoProjectsHero.tsx
+++ b/apps/web/src/components/NoProjectsHero.tsx
@@ -2,9 +2,11 @@ import { PlusIcon } from "lucide-react";
 import { useCallback } from "react";
 
 import { openCommandPalette } from "../commandPaletteBus";
+import { isElectron } from "../env";
 import { Button } from "./ui/button";
 import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "./ui/empty";
 import { SidebarInset } from "./ui/sidebar";
+import { WorkspacePageHeader } from "./WorkspacePageHeader";
 
 export function NoProjectsHero() {
   const openAddProject = useCallback(() => openCommandPalette({ open: "add-project" }), []);
@@ -12,15 +14,13 @@ export function NoProjectsHero() {
   return (
     <SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none">
       <div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-x-hidden bg-background">
-        <Empty className="flex-1">
+        {/* The desktop window only moves where CSS opts in, so keep a titlebar strip. */}
+        {isElectron ? <WorkspacePageHeader electron /> : null}
+        <Empty size="hero" className="flex-1">
           <div className="w-full max-w-lg px-8 py-12">
             <EmptyHeader className="max-w-none">
-              <EmptyTitle className="text-foreground text-2xl sm:text-3xl">
-                What should we work on?
-              </EmptyTitle>
-              <EmptyDescription className="mt-2 text-muted-foreground/78">
-                Add a project to start your first thread.
-              </EmptyDescription>
+              <EmptyTitle>What should we work on?</EmptyTitle>
+              <EmptyDescription>Add a project to start your first thread.</EmptyDescription>
               <div className="mt-6 flex justify-center">
                 <Button size="sm" onClick={openAddProject}>
                   <PlusIcon className="size-4" />
diff --git a/apps/web/src/components/PreviousWorktreeItemContent.tsx b/apps/web/src/components/PreviousWorktreeItemContent.tsx
new file mode 100644
index 000000000000..cd25c8c497e2
--- /dev/null
+++ b/apps/web/src/components/PreviousWorktreeItemContent.tsx
@@ -0,0 +1,19 @@
+import { HistoryIcon } from "lucide-react";
+
+import { MiddleTruncate } from "./ui/middle-truncate";
+
+export function PreviousWorktreeItemContent({ branch }: { branch: string | null }) {
+  return (
+    <span className="flex min-w-0 items-start gap-1.5">
+      <HistoryIcon className="mt-1 size-3" />
+      <span className="flex min-w-0 flex-col">
+        <span>Previous worktree</span>
+        {branch ? (
+          <span className="min-w-0 text-xs text-muted-foreground">
+            <MiddleTruncate value={branch} />
+          </span>
+        ) : null}
+      </span>
+    </span>
+  );
+}
diff --git a/apps/web/src/components/ProjectFavicon.tsx b/apps/web/src/components/ProjectFavicon.tsx
index cf88d4965f09..482de3bb9f36 100644
--- a/apps/web/src/components/ProjectFavicon.tsx
+++ b/apps/web/src/components/ProjectFavicon.tsx
@@ -19,7 +19,7 @@ const DynamicIcon = lazy(() =>
 );
 
 function DynamicProjectIconFallback() {
-  return <FolderCodeIcon className="size-full text-[inherit]" />;
+  return <FolderCodeIcon className="size-full text-inherit" />;
 }
 
 // The slice of a project that decides its icon. Every surface must pass the
@@ -176,7 +176,7 @@ function ProjectFaviconImage({
         <img
           src={displayedSrc}
           alt=""
-          className={cn("size-3.5 shrink-0 rounded-[37.5%] object-contain", className)}
+          className={cn("size-3.5 shrink-0 rounded-[25%] object-contain", className)}
           onError={() => handleLoadError(displayedSrc)}
         />
       ) : null}
diff --git a/apps/web/src/components/ProjectScriptsControl.tsx b/apps/web/src/components/ProjectScriptsControl.tsx
index 74bd84918713..0c8dae6c2619 100644
--- a/apps/web/src/components/ProjectScriptsControl.tsx
+++ b/apps/web/src/components/ProjectScriptsControl.tsx
@@ -101,8 +101,6 @@ export default function ProjectScriptsControl({
       ),
     [fileScripts, scripts],
   );
-  const dropdownItemClassName =
-    "data-highlighted:bg-transparent data-highlighted:text-foreground hover:bg-accent hover:text-accent-foreground focus-visible:bg-accent focus-visible:text-accent-foreground data-highlighted:hover:bg-accent data-highlighted:hover:text-accent-foreground data-highlighted:focus-visible:bg-accent data-highlighted:focus-visible:text-accent-foreground";
 
   const openAddDialog = () => {
     setEditorRequest({ scriptId: null, initial: EMPTY_PROJECT_SCRIPT_INPUT });
@@ -153,11 +151,10 @@ export default function ProjectScriptsControl({
           <MenuItem
             density={presentation === "menu" ? "touch" : "default"}
             key={`${fileScript.name} ${fileScript.command}`}
-            className={dropdownItemClassName}
             onClick={() => void importFileScript(fileScript)}
           >
             <ScriptIcon icon={fileScript.icon ?? "play"} className="size-4" />
-            <MenuItemLabel className="truncate">{fileScript.name}</MenuItemLabel>
+            <MenuItemLabel>{fileScript.name}</MenuItemLabel>
             <MenuShortcut>
               <DownloadIcon className="size-3.5" aria-label="Import" />
             </MenuShortcut>
@@ -178,53 +175,51 @@ export default function ProjectScriptsControl({
           <MenuItem
             density={presentation === "menu" ? "touch" : "default"}
             key={script.id}
-            className={`group ${dropdownItemClassName}`}
+            className="group"
             onClick={() => onRunScript(script)}
           >
             <ScriptIcon icon={script.icon} className="size-4" />
-            <MenuItemLabel className="truncate">
+            <MenuItemLabel>
               {script.runOnWorktreeCreate ? `${script.name} (setup)` : script.name}
             </MenuItemLabel>
             <span className="relative ms-auto flex h-6 min-w-6 items-center justify-end">
-              {shortcutLabel && (
-                <MenuShortcut
-                  className={
-                    presentation === "menu"
-                      ? "ms-0 mr-7"
-                      : "ms-0 transition-opacity group-hover:opacity-0 group-focus-visible:opacity-0"
-                  }
-                >
-                  {shortcutLabel}
-                </MenuShortcut>
-              )}
-              <Button
-                type="button"
-                variant="ghost"
-                size="icon-xs"
-                className={`absolute right-0 top-1/2 size-6 -translate-y-1/2 ${presentation === "menu" ? "" : "opacity-0 pointer-events-none transition-opacity group-hover:opacity-100 group-hover:pointer-events-auto group-focus-visible:opacity-100 group-focus-visible:pointer-events-auto"}`}
-                aria-label={`Edit ${script.name}`}
-                onPointerDown={(event) => {
-                  event.preventDefault();
-                  event.stopPropagation();
-                }}
-                onClick={(event) => {
-                  event.preventDefault();
-                  event.stopPropagation();
-                  openEditDialog(script);
-                }}
+              {shortcutLabel &&
+                (presentation === "menu" ? (
+                  <MenuShortcut className="ms-0 mr-7">{shortcutLabel}</MenuShortcut>
+                ) : (
+                  // The shortcut yields its slot to the edit button on hover.
+                  <span className="transition-opacity group-hover:opacity-0 group-focus-visible:opacity-0">
+                    <MenuShortcut className="ms-0">{shortcutLabel}</MenuShortcut>
+                  </span>
+                ))}
+              <span
+                className={`absolute right-0 top-1/2 flex -translate-y-1/2 ${presentation === "menu" ? "" : "opacity-0 pointer-events-none transition-opacity group-hover:opacity-100 group-hover:pointer-events-auto group-focus-visible:opacity-100 group-focus-visible:pointer-events-auto"}`}
               >
-                <SettingsIcon className="size-3.5" />
-              </Button>
+                <Button
+                  type="button"
+                  variant="ghost"
+                  size="icon-xs"
+                  className="size-6"
+                  aria-label={`Edit ${script.name}`}
+                  onPointerDown={(event) => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                  }}
+                  onClick={(event) => {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    openEditDialog(script);
+                  }}
+                >
+                  <SettingsIcon className="size-3.5" />
+                </Button>
+              </span>
             </span>
           </MenuItem>
         );
       })}
       {importMenuItems}
-      <MenuItem
-        density={presentation === "menu" ? "touch" : "default"}
-        className={dropdownItemClassName}
-        onClick={openAddDialog}
-      >
+      <MenuItem density={presentation === "menu" ? "touch" : "default"} onClick={openAddDialog}>
         <PlusIcon className="size-4" />
         <MenuItemLabel>Add action</MenuItemLabel>
       </MenuItem>
@@ -241,7 +236,7 @@ export default function ProjectScriptsControl({
               onClick={() => onRunScript(primaryScript)}
             >
               <ScriptIcon icon={primaryScript.icon} className="size-4" />
-              <MenuItemLabel className="truncate">Run {primaryScript.name}</MenuItemLabel>
+              <MenuItemLabel>Run {primaryScript.name}</MenuItemLabel>
               <MenuShortcut>
                 {shortcutLabelForCommand(keybindings, commandForProjectScript(primaryScript.id))}
               </MenuShortcut>
@@ -258,9 +253,7 @@ export default function ProjectScriptsControl({
                 <ScriptIcon icon="play" className="size-4" />
                 <MenuItemLabel>Project actions</MenuItemLabel>
               </MenuSubTrigger>
-              <MenuSubPopup className="min-w-32 max-w-[calc(100vw-2rem)]">
-                {scriptItems}
-              </MenuSubPopup>
+              <MenuSubPopup>{scriptItems}</MenuSubPopup>
             </MenuSub>
           ) : (
             <MenuItem
@@ -280,7 +273,7 @@ export default function ProjectScriptsControl({
                 <Button
                   size="xs"
                   variant="outline"
-                  className="w-7 px-0 sm:w-6 @3xl/header-actions:w-auto! @3xl/header-actions:px-[calc(--spacing(2)-1px)]"
+                  className="w-7 sm:w-6 @3xl/header-actions:w-auto!"
                   aria-label={`Run ${primaryScript.name}`}
                   // The tooltip wrapper replaces data-slot="button", so themed
                   // toolbar styling needs its own hook.
@@ -298,7 +291,6 @@ export default function ProjectScriptsControl({
           </Tooltip>
           <GroupSeparator className="hidden @3xl/header-actions:block" />
           <Menu
-            highlightItemOnHover={false}
             open={actionsMenuOpen.scripts}
             onOpenChange={(open) =>
               setActionsMenuOpen({ presentation, scripts: open, imports: false })
@@ -314,7 +306,6 @@ export default function ProjectScriptsControl({
         </Group>
       ) : importableScripts.length > 0 ? (
         <Menu
-          highlightItemOnHover={false}
           open={actionsMenuOpen.imports}
           onOpenChange={(open) =>
             setActionsMenuOpen({ presentation, scripts: false, imports: open })
@@ -329,7 +320,7 @@ export default function ProjectScriptsControl({
           </MenuTrigger>
           <MenuPopup align="end">
             {importMenuItems}
-            <MenuItem className={dropdownItemClassName} onClick={openAddDialog}>
+            <MenuItem onClick={openAddDialog}>
               <PlusIcon className="size-4" />
               Add action
             </MenuItem>
@@ -342,7 +333,7 @@ export default function ProjectScriptsControl({
               <Button
                 size="xs"
                 variant="outline"
-                className="w-7 px-0 sm:w-6 @3xl/header-actions:w-auto! @3xl/header-actions:px-[calc(--spacing(2)-1px)]"
+                className="w-7 sm:w-6 @3xl/header-actions:w-auto!"
                 aria-label="Add action"
                 // The tooltip wrapper replaces data-slot="button", so themed
                 // toolbar styling needs its own hook.
diff --git a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts
index 12f63f3e16fd..c55338cd5c46 100644
--- a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts
+++ b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.test.ts
@@ -24,6 +24,7 @@ import {
   getProviderUpdateSidebarPillView,
   hasOneClickUpdateProviderCandidate,
   isProviderUpdateCandidate,
+  isProviderSettingsUpdateCandidate,
   isTerminalProviderUpdatePhase,
   localEnvironmentUpdateNotificationKey,
   providerUpdateNotificationKey,
@@ -1038,3 +1039,22 @@ describe("provider update launch notification logic", () => {
     });
   });
 });
+
+it("does not offer incompatible latest versions and restores suggestions after policy relaxation", () => {
+  const installed = provider({ driver: driver("codex") });
+  for (const latestVersionStatus of ["broken", "unsupported", "supported", "unknown"] as const) {
+    const snapshot: ServerProvider = {
+      ...installed,
+      compatibilityAdvisory: {
+        status: "supported",
+        latestVersionStatus,
+        message: null,
+        recommendedRange: null,
+        recommendedVersion: null,
+      },
+    };
+    const expected = latestVersionStatus === "supported" || latestVersionStatus === "unknown";
+    expect(isProviderUpdateCandidate(snapshot)).toBe(expected);
+    expect(isProviderSettingsUpdateCandidate(snapshot)).toBe(expected);
+  }
+});
diff --git a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts
index 6da4eaac6dde..dd7b25a62cad 100644
--- a/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts
+++ b/apps/web/src/components/ProviderUpdateLaunchNotification.logic.ts
@@ -141,6 +141,8 @@ export function isProviderUpdateCandidate(
 ): provider is ProviderUpdateCandidate {
   return (
     provider.enabled &&
+    provider.compatibilityAdvisory?.latestVersionStatus !== "broken" &&
+    provider.compatibilityAdvisory?.latestVersionStatus !== "unsupported" &&
     provider.versionAdvisory?.status === "behind_latest" &&
     provider.versionAdvisory.latestVersion !== null
   );
@@ -161,6 +163,8 @@ export function isProviderSettingsUpdateCandidate(
 ): provider is ProviderSettingsUpdateCandidate {
   return (
     provider.enabled &&
+    provider.compatibilityAdvisory?.latestVersionStatus !== "broken" &&
+    provider.compatibilityAdvisory?.latestVersionStatus !== "unsupported" &&
     provider.versionAdvisory?.status === "behind_latest" &&
     provider.versionAdvisory.canUpdate === true &&
     provider.versionAdvisory.updateCommand !== null
diff --git a/apps/web/src/components/PullRequestContextDetails.tsx b/apps/web/src/components/PullRequestContextDetails.tsx
index cb2aae9ac52d..6462299c4093 100644
--- a/apps/web/src/components/PullRequestContextDetails.tsx
+++ b/apps/web/src/components/PullRequestContextDetails.tsx
@@ -15,7 +15,7 @@ export function PullRequestContextDetails({ metadata }: { metadata: PullRequestC
         <span className={state.toneClassName}>{state.label}</span>
       </div>
       <div className="wrap-break-word text-foreground">{metadata.title}</div>
-      <div className="flex min-w-0 items-center gap-1 text-secondary-label text-[10px]">
+      <div className="flex min-w-0 items-center gap-1 text-secondary-label text-3xs">
         <code className="truncate">{metadata.headBranch}</code>
         <ArrowRightIcon className="size-3 shrink-0" aria-hidden="true" />
         <code className="truncate">{metadata.baseBranch}</code>
diff --git a/apps/web/src/components/PullRequestThreadDialog.tsx b/apps/web/src/components/PullRequestThreadDialog.tsx
index 0cc1a84d7848..a2adddf296c8 100644
--- a/apps/web/src/components/PullRequestThreadDialog.tsx
+++ b/apps/web/src/components/PullRequestThreadDialog.tsx
@@ -196,8 +196,8 @@ export function PullRequestThreadDialog({
     >
       <DialogPopup className="max-w-xl">
         <DialogHeader>
-          <DialogTitle className="flex items-center gap-2">
-            <SourceControlIcon className="size-4" />
+          <DialogTitle className="flex items-center">
+            <SourceControlIcon className="me-2 size-4" />
             Checkout {terminology.singular}
           </DialogTitle>
           <DialogDescription>
@@ -205,7 +205,7 @@ export function PullRequestThreadDialog({
             the draft thread in the main repo or in a dedicated worktree.
           </DialogDescription>
         </DialogHeader>
-        <DialogPanel className="space-y-4">
+        <DialogPanel>
           <label className="grid gap-1.5">
             <span className="text-xs font-medium text-foreground capitalize">
               {terminology.singular}
diff --git a/apps/web/src/components/QueuedMessageSender.test.tsx b/apps/web/src/components/QueuedMessageSender.test.tsx
new file mode 100644
index 000000000000..dc31694f8b96
--- /dev/null
+++ b/apps/web/src/components/QueuedMessageSender.test.tsx
@@ -0,0 +1,231 @@
+import { scopeThreadRef, scopedThreadKey } from "@t3tools/client-runtime/environment";
+import { EnvironmentId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
+import * as Cause from "effect/Cause";
+import { act, createElement } from "react";
+import { create, type ReactTestRenderer } from "react-test-renderer";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
+
+import { useQueuedMessageStore, type QueuedComposerMessage } from "../queuedMessageStore";
+import { sendQueuedMessage } from "./chat/sendQueuedMessage";
+import { QueuedMessageSender } from "./QueuedMessageSender";
+
+const io = vi.hoisted(() => ({
+  run: vi.fn(),
+  upload: vi.fn(),
+  toast: vi.fn(),
+  thread: null as unknown,
+  shell: { runtimeMode: "full-access", interactionMode: "default" } as Record<string, unknown>,
+}));
+const config = {
+  environment: { capabilities: { attachmentUploads: true, inlineMessageContext: true } },
+};
+vi.mock("@t3tools/client-runtime/state/runtime", async (load) => ({
+  ...(await load<typeof import("@t3tools/client-runtime/state/runtime")>()),
+  runAtomCommand: (...args: unknown[]) => io.run(...args),
+}));
+vi.mock("../rpc/atomRegistry", () => ({
+  appAtomRegistry: { get: () => new Map([["env-a", config]]) },
+}));
+vi.mock("../state/server", () => ({ environmentServerConfigsAtom: {} }));
+vi.mock("../state/threads", () => ({
+  threadEnvironment: {
+    updateMetadata: "metadata",
+    setRuntimeMode: "runtime",
+    setInteractionMode: "interaction",
+    startTurn: "start",
+  },
+}));
+vi.mock("../state/environments", () => ({
+  useEnvironment: () => ({ connection: { phase: "connected" } }),
+}));
+vi.mock("../state/entities", () => ({
+  useThread: () => io.thread,
+  useThreadStatus: () => "live",
+  useServerConfigs: () => new Map([["env-a", config]]),
+  readThreadShell: () => io.shell,
+  readThread: () => io.thread,
+}));
+vi.mock("./ui/toast", () => ({ toastManager: { add: (...args: unknown[]) => io.toast(...args) } }));
+vi.mock("../lib/attachmentUploadQueue", () => ({
+  startAttachmentUpload: vi.fn(),
+  awaitAttachmentUploads: (...args: unknown[]) => io.upload(...args),
+  getUploadedAttachments: () => [
+    { type: "image", id: "uploaded", name: "a.png", mimeType: "image/png", sizeBytes: 4 },
+  ],
+  releaseDraftAttachments: vi.fn(),
+}));
+
+const threadRef = scopeThreadRef(EnvironmentId.make("env-a"), ThreadId.make("thread-a"));
+const threadKey = scopedThreadKey(threadRef);
+const modelSelection = { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" };
+
+function enqueue(overrides: Partial<QueuedComposerMessage> = {}) {
+  return useQueuedMessageStore.getState().enqueue(threadKey, {
+    prompt: "follow up",
+    images: [],
+    files: [],
+    terminalContexts: [],
+    previewAnnotations: [],
+    reviewComments: [],
+    sendSettings: {
+      modelSelection,
+      runtimeMode: "full-access",
+      interactionMode: "default",
+      promptEffort: null,
+    },
+    queuedAfterToolActivityId: null,
+    createdAt: "2026-09-25T00:00:00Z",
+    ...overrides,
+  });
+}
+
+const commandsRun = () => io.run.mock.calls.map((call) => call[1]);
+const queue = () => useQueuedMessageStore.getState().queuesByThreadKey[threadKey];
+
+beforeEach(() => {
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  useQueuedMessageStore.setState({ queuesByThreadKey: {}, lastDispatchByThreadKey: {} });
+  io.thread = null;
+  io.run.mockReset().mockResolvedValue({ _tag: "Success", value: undefined });
+  io.upload.mockReset().mockResolvedValue(undefined);
+  io.toast.mockReset();
+  io.shell = {
+    modelSelection,
+    branch: null,
+    runtimeMode: "full-access",
+    interactionMode: "default",
+  };
+});
+
+afterEach(() => {
+  vi.unstubAllGlobals();
+});
+
+describe("QueuedMessageSender", () => {
+  const thread = (
+    status: string,
+    { toolActivityIds = [] as string[], userMessageIds = [] as string[] } = {},
+  ) => ({
+    session: { status, activeTurnId: null, updatedAt: status },
+    activities: toolActivityIds.map((id, index) => ({
+      id,
+      kind: "tool.completed",
+      sequence: index,
+      createdAt: "2026-09-25T00:00:01Z",
+    })),
+    messages: userMessageIds.map((id) => ({ id, role: "user" })),
+    latestTurn: null,
+  });
+  let root: ReactTestRenderer | null = null;
+  const render = () =>
+    act(() => {
+      if (root) root.update(createElement(QueuedMessageSender));
+      else root = create(createElement(QueuedMessageSender));
+    });
+  afterEach(async () => {
+    await act(() => root?.unmount());
+    root = null;
+  });
+
+  it("sends a queued message when the turn ends, with no chat view open", async () => {
+    enqueue();
+    io.thread = thread("running");
+    await render();
+    expect(commandsRun()).toEqual([]);
+
+    io.thread = thread("ready");
+    await render();
+
+    expect(commandsRun()).toEqual(["start"]);
+    expect(io.run.mock.calls[0]?.[2]).toMatchObject({
+      environmentId: "env-a",
+      input: { threadId: "thread-a", message: { text: "follow up" }, modelSelection },
+    });
+    expect(queue()).toBeUndefined();
+  });
+
+  it("holds the next message until the server picks up the one before it", async () => {
+    enqueue({ prompt: "first" });
+    enqueue({ prompt: "second" });
+    io.thread = thread("ready");
+    await render();
+    await render();
+    expect(commandsRun()).toEqual(["start"]);
+
+    // The first message started a turn; the second waits for its next tool call.
+    io.thread = thread("running", { userMessageIds: ["first"] });
+    await render();
+    expect(commandsRun()).toEqual(["start"]);
+    io.thread = thread("running", { userMessageIds: ["first"], toolActivityIds: ["tool-1"] });
+    await render();
+    expect(commandsRun()).toEqual(["start", "start"]);
+  });
+
+  it("moves on to the next message after a failed one is cancelled", async () => {
+    io.run.mockResolvedValueOnce({ _tag: "Failure", cause: Cause.fail(new Error("offline")) });
+    const first = enqueue({ prompt: "first" });
+    enqueue({ prompt: "second" });
+    io.thread = thread("ready");
+    await render();
+    expect(queue()?.[0]).toMatchObject({ prompt: "first", holdUntilUserAction: true });
+
+    await act(() => {
+      useQueuedMessageStore.getState().remove(threadKey, first.id);
+    });
+    await render();
+
+    expect(commandsRun()).toEqual(["start", "start"]);
+    expect(io.run.mock.calls[1]?.[2]).toMatchObject({ input: { message: { text: "second" } } });
+  });
+});
+
+describe("sendQueuedMessage", () => {
+  it("saves a mode changed before queueing, then starts the turn", async () => {
+    io.shell = { ...io.shell, runtimeMode: "approval-required" };
+    const message = enqueue();
+
+    await sendQueuedMessage(threadRef, message.id);
+
+    expect(commandsRun()).toEqual(["runtime", "start"]);
+    expect(io.run.mock.calls[1]?.[2]).toMatchObject({ input: { runtimeMode: "full-access" } });
+    expect(queue()).toBeUndefined();
+  });
+
+  it("gives a message back to Stop while its upload runs, without starting a turn", async () => {
+    let finishUpload!: () => void;
+    io.upload.mockReturnValue(new Promise<void>((resolve) => (finishUpload = resolve)));
+    const image = {
+      type: "image" as const,
+      id: "image-1",
+      name: "a.png",
+      mimeType: "image/png",
+      sizeBytes: 4,
+      previewUrl: "data:image/png;base64,AAAA",
+      file: new File(["AAAA"], "a.png", { type: "image/png" }),
+    };
+    const message = enqueue({ images: [image] });
+
+    const sending = sendQueuedMessage(threadRef, message.id);
+    expect(useQueuedMessageStore.getState().drain(threadKey)).toHaveLength(1);
+    finishUpload();
+    await sending;
+
+    expect(commandsRun()).toEqual([]);
+    expect(io.toast).not.toHaveBeenCalled();
+    expect(queue()).toBeUndefined();
+  });
+
+  it("holds a message at the head when the turn start fails", async () => {
+    io.run.mockResolvedValue({ _tag: "Failure", cause: Cause.fail(new Error("offline")) });
+    enqueue({ prompt: "first" });
+    const second = enqueue({ prompt: "second" });
+
+    await sendQueuedMessage(threadRef, second.id);
+
+    expect(queue()?.map((entry) => [entry.prompt, entry.holdUntilUserAction])).toEqual([
+      ["second", true],
+      ["first", undefined],
+    ]);
+    expect(io.toast).toHaveBeenCalledWith(expect.objectContaining({ description: "offline" }));
+  });
+});
diff --git a/apps/web/src/components/QueuedMessageSender.tsx b/apps/web/src/components/QueuedMessageSender.tsx
new file mode 100644
index 000000000000..86dfa8a265fe
--- /dev/null
+++ b/apps/web/src/components/QueuedMessageSender.tsx
@@ -0,0 +1,100 @@
+import { parseScopedThreadKey } from "@t3tools/client-runtime/environment";
+import { derivePendingRequests } from "@t3tools/client-runtime/pending-requests";
+import { useEffect, useMemo } from "react";
+import { useShallow } from "zustand/react/shallow";
+
+import { useComposerDraftStore } from "../composerDraftStore";
+import {
+  isQueuedMessageDue,
+  latestCompletedToolActivityId,
+  useQueuedMessageStore,
+  useQueuedMessages,
+} from "../queuedMessageStore";
+import { derivePhase } from "../session-logic";
+import { useServerConfigs, useThread, useThreadStatus } from "../state/entities";
+import { useEnvironment } from "../state/environments";
+import { hasServerAcknowledgedLocalDispatch, latestTurnStartFailureId } from "./ChatView.logic";
+import { sendQueuedMessage } from "./chat/sendQueuedMessage";
+
+/**
+ * Sends queued messages when they are due, for every thread with a queue,
+ * whether or not the thread is on screen. Mounted once at the root.
+ */
+export function QueuedMessageSender() {
+  const threadKeys = useQueuedMessageStore(
+    useShallow((state) => Object.keys(state.queuesByThreadKey)),
+  );
+  return threadKeys.map((threadKey) => <ThreadQueueSender key={threadKey} threadKey={threadKey} />);
+}
+
+/**
+ * Watches one thread while it has queued messages. Reading the thread keeps
+ * its detail subscribed, so tool boundaries and the end of the turn are
+ * visible while the user is elsewhere.
+ */
+function ThreadQueueSender({ threadKey }: { threadKey: string }) {
+  const threadRef = useMemo(() => parseScopedThreadKey(threadKey), [threadKey]);
+  const thread = useThread(threadRef);
+  const threadStatus = useThreadStatus(threadRef);
+  const environmentId = threadRef?.environmentId ?? null;
+  const environment = useEnvironment(environmentId);
+  const serverConfigs = useServerConfigs();
+  const serverConfigLoaded = environmentId !== null && serverConfigs.has(environmentId);
+  const rewinding = useComposerDraftStore((store) => store.rewindingThreadKeys.has(threadKey));
+  const queue = useQueuedMessages(threadKey);
+  const next = queue[0];
+  const sending = queue.some((message) => message.sending);
+  const activities = thread?.activities;
+  const latestToolActivityId = useMemo(
+    () => latestCompletedToolActivityId(activities ?? []),
+    [activities],
+  );
+  const pendingRequests = useMemo(() => derivePendingRequests(activities ?? []), [activities]);
+  const phase = derivePhase(thread?.session ?? null);
+
+  // A send that starts a new turn leaves the thread idle until the server
+  // picks it up. Hold the next message until then, as the composer does for
+  // its own sends.
+  const lastDispatch = useQueuedMessageStore(
+    (state) => state.lastDispatchByThreadKey[threadKey]?.thread ?? null,
+  );
+  const latestUserMessageId = thread?.messages.findLast((m) => m.role === "user")?.id ?? null;
+  const waitingForServer =
+    lastDispatch !== null &&
+    !hasServerAcknowledgedLocalDispatch({
+      localDispatch: lastDispatch,
+      phase,
+      latestTurn: thread?.latestTurn ?? null,
+      latestUserMessageId,
+      session: thread?.session ?? null,
+      hasPendingApproval: pendingRequests.approvals.length > 0,
+      hasPendingUserInput: pendingRequests.userInputs.length > 0,
+      latestTurnStartFailureId: latestTurnStartFailureId(thread ?? undefined, latestUserMessageId),
+      threadError: null,
+    });
+
+  // Approvals and questions block the agent; a steer landing on top of them
+  // would answer nothing and confuse the turn, so the queue holds until the
+  // user resolves them.
+  const blocked =
+    threadRef === null ||
+    thread === null ||
+    threadStatus !== "live" ||
+    (environment !== null && environment.connection.phase !== "connected") ||
+    !serverConfigLoaded ||
+    rewinding ||
+    sending ||
+    waitingForServer ||
+    pendingRequests.approvals.length > 0 ||
+    pendingRequests.userInputs.length > 0;
+  const due =
+    next !== undefined &&
+    !blocked &&
+    isQueuedMessageDue({ message: next, phase, latestToolActivityId });
+  const nextId = next?.id;
+  useEffect(() => {
+    if (!due || !threadRef || nextId === undefined) return;
+    void sendQueuedMessage(threadRef, nextId);
+  }, [due, nextId, threadRef]);
+  return null;
+}
diff --git a/apps/web/src/components/QuitHoldOverlay.tsx b/apps/web/src/components/QuitHoldOverlay.tsx
index 2bca40f5b130..607baad0c4d7 100644
--- a/apps/web/src/components/QuitHoldOverlay.tsx
+++ b/apps/web/src/components/QuitHoldOverlay.tsx
@@ -48,7 +48,7 @@ export function QuitHoldOverlay() {
       role="status"
       className="pointer-events-none fixed inset-x-0 top-[22%] z-100 flex justify-center"
     >
-      <div className="rounded-full bg-neutral-700/95 px-8 py-4 text-2xl font-bold text-white shadow-xl">
+      <div className="rounded-full bg-foreground/95 px-8 py-4 text-2xl font-bold text-background shadow-xl">
         {message}
       </div>
     </div>
diff --git a/apps/web/src/components/RightPanelSheet.tsx b/apps/web/src/components/RightPanelSheet.tsx
index 9f4838f5666a..044369ed0f76 100644
--- a/apps/web/src/components/RightPanelSheet.tsx
+++ b/apps/web/src/components/RightPanelSheet.tsx
@@ -1,16 +1,11 @@
 import { type ReactNode } from "react";
 
-import {
-  RIGHT_PANEL_SHEET_CLASS_NAME,
-  RIGHT_PANEL_SHEET_LAYER_CLASS_NAME,
-} from "../rightPanelLayout";
 import { Sheet, SheetPopup } from "./ui/sheet";
 
 export function RightPanelSheet(props: {
   animationDurationMs: number;
   children: ReactNode;
   open: boolean;
-  underFloatingPreview?: boolean;
   onClose: () => void;
 }) {
   return (
@@ -27,13 +22,7 @@ export function RightPanelSheet(props: {
         side="right"
         showCloseButton={false}
         keepMounted
-        {...(props.underFloatingPreview
-          ? {
-              backdropClassName: RIGHT_PANEL_SHEET_LAYER_CLASS_NAME,
-              viewportClassName: RIGHT_PANEL_SHEET_LAYER_CLASS_NAME,
-            }
-          : {})}
-        className={RIGHT_PANEL_SHEET_CLASS_NAME}
+        className="w-[min(42vw,28rem)] min-w-80 max-w-[28rem] max-[760px]:w-[min(88vw,24rem)] max-[760px]:min-w-0 wco:mt-[env(titlebar-area-height)] wco:h-[calc(100%-env(titlebar-area-height))] wco:max-h-[calc(100%-env(titlebar-area-height))]"
       >
         {props.children}
       </SheetPopup>
diff --git a/apps/web/src/components/RightPanelTabs.tsx b/apps/web/src/components/RightPanelTabs.tsx
index 94adf8af37c2..96d9afce289c 100644
--- a/apps/web/src/components/RightPanelTabs.tsx
+++ b/apps/web/src/components/RightPanelTabs.tsx
@@ -63,6 +63,7 @@ import { ScrollArea } from "~/components/ui/scroll-area";
 import { PanelTabCloseButton } from "~/components/ui/panel-tab-close-button";
 import { faviconUrlForOrigin } from "~/lib/favicon";
 import { useTheme } from "~/hooks/useTheme";
+import { useDeviceState } from "~/state/device";
 import {
   newestPullRequestSummary,
   pullRequestEnvironment,
@@ -487,7 +488,7 @@ function RightPanelEmptyState(props: {
         {action.badgeCount > 0 ? (
           <span
             aria-hidden
-            className="absolute -top-1.5 -right-2 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-1 text-[9px] font-semibold tabular-nums text-white"
+            className="absolute -top-1.5 -right-2 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-1 text-3xs font-semibold tabular-nums text-white"
           >
             {action.badgeCount}
           </span>
@@ -504,13 +505,13 @@ function RightPanelEmptyState(props: {
       aria-label="Open a surface"
       data-surface-launcher-keys={availableActions.map((action) => action.shortcut).join("")}
       className={cn(
-        "flex min-h-0 flex-1 items-center justify-center overflow-y-auto px-6 pt-6 outline-none",
+        "flex min-h-0 flex-1 items-center justify-center overflow-y-auto px-6 outline-none",
         // The panel topbar sits above this container; matching bottom padding
         // keeps the list centered against the full panel, not the leftover.
-        "pb-[calc(var(--workspace-topbar-height)+--spacing(6))]",
+        "pb-(--workspace-topbar-height)",
       )}
     >
-      <div className="w-full max-w-xs">
+      <div className="w-full max-w-xs py-6">
         <h3 className="mb-3 text-center font-medium text-foreground text-sm">Open a surface</h3>
         <div className="flex flex-col gap-0.5">
           {actions.map((action) =>
@@ -533,7 +534,7 @@ function RightPanelEmptyState(props: {
                   type="button"
                   onClick={action.onClick}
                   className={cn(
-                    "flex h-8 w-full cursor-pointer items-center gap-2.5 rounded-[var(--control-radius)] px-2.5 text-left text-sm transition-colors group-hover:bg-accent/60",
+                    "flex h-8 w-full cursor-pointer items-center gap-2.5 rounded-(--control-radius) px-2.5 text-left text-sm transition-colors group-hover:bg-accent/60",
                     isHighlighted(action) && "bg-accent/60",
                   )}
                 >
@@ -559,7 +560,7 @@ function RightPanelEmptyState(props: {
                       render={
                         <Button
                           aria-label="Open browser in a profile"
-                          className="absolute top-1/2 right-8 -translate-y-1/2 [--control-icon-color:currentColor]"
+                          className="absolute top-1/2 right-8 -translate-y-1/2"
                           size="icon-xs"
                           variant="ghost-muted"
                         />
@@ -567,12 +568,7 @@ function RightPanelEmptyState(props: {
                     >
                       <ChevronDown className="size-3.5" />
                     </MenuTrigger>
-                    <MenuPopup
-                      align="end"
-                      side="bottom"
-                      sideOffset={6}
-                      className="min-w-40 max-w-56"
-                    >
+                    <MenuPopup align="end" side="bottom" sideOffset={6} className="max-w-56">
                       {props.browserProfiles.map((profile) => (
                         <MenuItem
                           key={profile.id}
@@ -593,7 +589,7 @@ function RightPanelEmptyState(props: {
                   <div
                     tabIndex={0}
                     aria-disabled="true"
-                    className="flex h-8 w-full cursor-default items-center gap-2.5 rounded-[var(--control-radius)] px-2.5 text-left text-sm opacity-50"
+                    className="flex h-8 w-full cursor-default items-center gap-2.5 rounded-(--control-radius) px-2.5 text-left text-sm opacity-50"
                   >
                     {actionIcon(action, "size-4")}
                     <span className="min-w-0 flex-1 truncate">{action.label}</span>
@@ -1118,19 +1114,17 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
           // controls a few pixels higher and the cluster jumps on open.
           props.mode === "inline" && !props.layoutControls ? "pr-28" : "pr-3",
           ownsDesktopTitleBar && "drag-region",
-          ownsDesktopTitleBar &&
-            (props.layoutControls
-              ? "wco:pr-[var(--workspace-native-controls-inset)]"
-              : "wco:pr-[calc(var(--workspace-native-controls-inset)+6rem)]"),
+          ownsDesktopTitleBar && "wco:pr-(--workspace-native-controls-inset)",
           props.mode === "inline" && props.maximized && COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,
         )}
         data-right-panel-tabbar
       >
         <ScrollArea
+          radius="none"
           ref={tabListRef}
           hideScrollbars
           scrollFade
-          className="min-w-0 flex-1 rounded-none"
+          className="min-w-0 flex-1"
           data-right-panel-tab-list
         >
           <div className="flex h-full w-max min-w-full items-center gap-1">
@@ -1248,7 +1242,17 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
                           </button>
                         }
                       />
-                      <TooltipPopup>{title}</TooltipPopup>
+                      <TooltipPopup>
+                        {surface.kind === "device" ? (
+                          <DeviceTabTooltip
+                            surface={surface}
+                            environmentId={props.environmentId}
+                            title={title}
+                          />
+                        ) : (
+                          title
+                        )}
+                      </TooltipPopup>
                     </Tooltip>
                   )}
                 </div>
@@ -1260,9 +1264,9 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
                   render={
                     <Button
                       aria-label="Add panel surface"
-                      className="size-6 shrink-0 text-muted-foreground hover:text-foreground"
+                      className="shrink-0"
                       size="icon-xs"
-                      variant="ghost"
+                      variant="ghost-muted"
                     />
                   }
                 >
@@ -1272,7 +1276,6 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
                   align="start"
                   side="bottom"
                   sideOffset={6}
-                  className="min-w-44"
                   onKeyDownCapture={handleAddSurfaceMenuKeyDown}
                 >
                   {addSurfaceActions.map((action) => {
@@ -1313,7 +1316,7 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
                             and run to 48 characters, which would otherwise widen
                             the popup to fit-content and wrap.
                           */}
-                          <MenuSubPopup className="min-w-40 max-w-56">
+                          <MenuSubPopup className="max-w-56">
                             {browserProfiles.map((profile) => (
                               <MenuItem
                                 key={profile.id}
@@ -1389,6 +1392,10 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
           </div>
         ) : null}
         {props.layoutControls}
+        {ownsDesktopTitleBar && !props.layoutControls ? (
+          // Keeps the tabs clear of the window controls when the layout toggles live elsewhere.
+          <span aria-hidden className="hidden w-24 shrink-0 wco:block" />
+        ) : null}
         {ownsDesktopTitleBar ? (
           <span
             aria-hidden
@@ -1426,3 +1433,27 @@ export function RightPanelTabs(props: RightPanelTabsProps) {
     </PreviewPanelShell>
   );
 }
+
+function DeviceTabTooltip(props: {
+  surface: Extract<RightPanelSurface, { kind: "device" }>;
+  environmentId: EnvironmentId | null;
+  title: string;
+}) {
+  const target = props.surface.target;
+  const { state } = useDeviceState(target ? props.environmentId : null);
+  const device = target
+    ? state.devices.find((entry) => entry.hostId === target.hostId && entry.id === target.deviceId)
+    : undefined;
+  const host = target ? state.hosts.find((entry) => entry.id === target.hostId) : undefined;
+  return (
+    <div className="flex flex-col gap-0.5">
+      <span>{props.title}</span>
+      {target ? (
+        <span className="text-muted-foreground">
+          {host?.label ?? "Device host"} ·{" "}
+          {device?.version ?? (target.platform === "ios" ? "iOS" : "Android")}
+        </span>
+      ) : null}
+    </div>
+  );
+}
diff --git a/apps/web/src/components/ServerUpdateAction.tsx b/apps/web/src/components/ServerUpdateAction.tsx
index 288078729d5d..fa7ec5e601f1 100644
--- a/apps/web/src/components/ServerUpdateAction.tsx
+++ b/apps/web/src/components/ServerUpdateAction.tsx
@@ -163,9 +163,7 @@ export function ServerUpdateProgress({
         <span className="size-1.5 shrink-0 rounded-full bg-destructive" aria-hidden="true" />
         <Tooltip>
           <TooltipTrigger render={<span className="min-w-0 truncate">{state.message}</span>} />
-          <TooltipPopup side="top" className="max-w-80">
-            {state.message}
-          </TooltipPopup>
+          <TooltipPopup side="top">{state.message}</TooltipPopup>
         </Tooltip>
       </div>
     );
@@ -272,8 +270,8 @@ export function ServerUpdateAction({
           render={
             <Button
               size="icon-xs"
-              variant="ghost"
-              className={className ?? "text-muted-foreground hover:text-foreground"}
+              variant="ghost-muted"
+              className={className}
               aria-label={`${actionLabel} for ${serverLabel}`}
               onClick={onClick}
             />
diff --git a/apps/web/src/components/Sidebar.logic.test.ts b/apps/web/src/components/Sidebar.logic.test.ts
index 76960f3f533b..fede3c183448 100644
--- a/apps/web/src/components/Sidebar.logic.test.ts
+++ b/apps/web/src/components/Sidebar.logic.test.ts
@@ -23,7 +23,7 @@ import {
   isTrailingDoubleClick,
   orderItemsByPreferredIds,
   resolveProjectStatusIndicator,
-  resolveThreadRowClassName,
+  resolveSidebarRowAccessibility,
   resolveSidebarThreadStatus,
   resolveThreadStatusPill,
   resolveWorkingStartedAt,
@@ -32,7 +32,6 @@ import {
   shouldClearThreadSelectionOnMouseDown,
   shouldRecedeSidebarThread,
   sortLogicalProjectsForSidebar,
-  sortSettledThreadsForSidebar,
   resolveSidebarDropTarget,
   pinOrderKeyBetween,
   planPinnedReorder,
@@ -52,6 +51,7 @@ import {
   resolveSidebarDropVerb,
 } from "./Sidebar.logic";
 import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
+import { sortSettledThreads } from "@t3tools/client-runtime/state/thread-sort";
 import {
   EnvironmentId,
   OrchestrationLatestTurn,
@@ -70,6 +70,35 @@ import {
 
 const localEnvironmentId = EnvironmentId.make("environment-local");
 
+describe("resolveSidebarRowAccessibility", () => {
+  it.each([
+    {
+      title: "Can you audit the UI?",
+      statusLabel: "Working",
+      projectDisplayName: "T3 Code",
+      isActive: true,
+      expected: { label: "Can you audit the UI?, Working, T3 Code", current: "page" },
+    },
+    {
+      title: "The audit is done",
+      statusLabel: null,
+      projectDisplayName: "T3 Code",
+      isActive: false,
+      expected: { label: "The audit is done, T3 Code", current: undefined },
+    },
+    {
+      title: "Untitled task",
+      statusLabel: null,
+      projectDisplayName: null,
+      isActive: false,
+      expected: { label: "Untitled task", current: undefined },
+    },
+  ])("leads with the title without folding row actions into its name: %j", (input) => {
+    const { expected, ...state } = input;
+    expect(resolveSidebarRowAccessibility(state)).toEqual(expected);
+  });
+});
+
 describe("animateSidebarLayoutChanges", () => {
   const baseArgs: Parameters<AnimateLayoutChanges>[0] = {
     active: null,
@@ -1691,12 +1720,12 @@ describe("applySidebarThreadDrop", () => {
     };
     const existing = { ...newer, settledOverride: "settled" as const, settledAt: newer.createdAt };
     expect(preview).toEqual({ ...final, settledAt: now });
-    expect(sortSettledThreadsForSidebar([existing, preview]).map((row) => row.id)).toEqual([
+    expect(sortSettledThreads([existing, preview]).map((row) => row.id)).toEqual([
       "dragged",
       "newer",
     ]);
-    expect(sortSettledThreadsForSidebar([existing, preview]).map((row) => row.id)).toEqual(
-      sortSettledThreadsForSidebar([existing, final]).map((row) => row.id),
+    expect(sortSettledThreads([existing, preview]).map((row) => row.id)).toEqual(
+      sortSettledThreads([existing, final]).map((row) => row.id),
     );
   });
 
@@ -1711,7 +1740,7 @@ describe("applySidebarThreadDrop", () => {
     const final = { ...source, snoozedAt: null, snoozedUntil: null };
     const existing = { ...newer, settledOverride: "settled" as const, settledAt: newer.createdAt };
     expect(preview).toEqual(final);
-    expect(sortSettledThreadsForSidebar([existing, preview]).map((row) => row.id)).toEqual([
+    expect(sortSettledThreads([existing, preview]).map((row) => row.id)).toEqual([
       "newer",
       "dragged",
     ]);
@@ -1821,74 +1850,6 @@ describe("sortPinnedThreadsForSidebar", () => {
   });
 });
 
-describe("sortSettledThreadsForSidebar", () => {
-  const settled = (input: {
-    id: string;
-    settledAt?: string | null;
-    latestUserMessageAt?: string | null;
-    latestTurn?: OrchestrationLatestTurn | null;
-    updatedAt?: string;
-  }) => ({
-    id: input.id,
-    settledAt: input.settledAt ?? null,
-    latestUserMessageAt: input.latestUserMessageAt ?? null,
-    latestTurn: input.latestTurn ?? null,
-    updatedAt: input.updatedAt ?? "2026-03-09T09:00:00.000Z",
-  });
-
-  it("orders by settle time, most recently settled first", () => {
-    const sorted = sortSettledThreadsForSidebar([
-      settled({
-        id: "settled-first",
-        settledAt: "2026-03-09T10:00:00.000Z",
-        // Created/active later than the other thread: settle time must win.
-        latestUserMessageAt: "2026-03-09T09:59:00.000Z",
-      }),
-      settled({
-        id: "settled-last",
-        settledAt: "2026-03-09T12:00:00.000Z",
-        latestUserMessageAt: "2026-03-09T08:00:00.000Z",
-      }),
-    ]);
-
-    expect(sorted.map((thread) => thread.id)).toEqual(["settled-last", "settled-first"]);
-  });
-
-  it("falls back to last activity for auto-settled threads without a settledAt stamp", () => {
-    const sorted = sortSettledThreadsForSidebar([
-      settled({ id: "auto-old", latestUserMessageAt: "2026-03-09T08:00:00.000Z" }),
-      settled({ id: "explicit", settledAt: "2026-03-09T10:00:00.000Z" }),
-      settled({ id: "auto-recent", latestUserMessageAt: "2026-03-09T11:00:00.000Z" }),
-    ]);
-
-    expect(sorted.map((thread) => thread.id)).toEqual(["auto-recent", "explicit", "auto-old"]);
-  });
-
-  it("counts a turn completion as activity for auto-settled threads", () => {
-    // The message came in before the other thread's, but its turn finished
-    // after: completion time is the real "work ended" moment.
-    const sorted = sortSettledThreadsForSidebar([
-      settled({ id: "message-only", latestUserMessageAt: "2026-03-09T10:04:00.000Z" }),
-      settled({
-        id: "completed-later",
-        latestUserMessageAt: "2026-03-09T10:00:00.000Z",
-        latestTurn: makeLatestTurn({ completedAt: "2026-03-09T10:30:00.000Z" }),
-      }),
-    ]);
-
-    expect(sorted.map((thread) => thread.id)).toEqual(["completed-later", "message-only"]);
-  });
-
-  it("breaks timestamp ties by id so the order is stable", () => {
-    const sorted = sortSettledThreadsForSidebar([
-      settled({ id: "b", settledAt: "2026-03-09T10:00:00.000Z" }),
-      settled({ id: "a", settledAt: "2026-03-09T10:00:00.000Z" }),
-    ]);
-
-    expect(sorted.map((thread) => thread.id)).toEqual(["a", "b"]);
-  });
-});
-
 describe("resolveWorkingStartedAt", () => {
   const session = {
     threadId: ThreadId.make("thread-1"),
@@ -2059,28 +2020,6 @@ describe("resolveThreadStatusPill", () => {
   });
 });
 
-describe("resolveThreadRowClassName", () => {
-  it("uses the active sidebar surface when a thread is both selected and active", () => {
-    const className = resolveThreadRowClassName({ isActive: true, isSelected: true });
-    expect(className).toContain("bg-sidebar-row-active");
-    expect(className).toContain("text-sidebar-foreground");
-    expect(className).not.toContain("bg-primary");
-  });
-
-  it("uses selected hover colors for selected threads", () => {
-    const className = resolveThreadRowClassName({ isActive: false, isSelected: true });
-    expect(className).toContain("bg-sidebar-row-selected");
-    expect(className).toContain("hover:bg-sidebar-row-active");
-    expect(className).not.toContain("bg-primary");
-  });
-
-  it("uses the active sidebar surface for active-only threads", () => {
-    const className = resolveThreadRowClassName({ isActive: true, isSelected: false });
-    expect(className).toContain("bg-sidebar-row-active");
-    expect(className).toContain("hover:bg-sidebar-row-active");
-  });
-});
-
 describe("resolveProjectStatusIndicator", () => {
   it("returns null when no threads have a notable status", () => {
     expect(resolveProjectStatusIndicator([null, null])).toBeNull();
@@ -2398,6 +2337,49 @@ describe("sortProjectsForSidebar", () => {
     ]);
   });
 
+  it.each(["updated_at", "created_at"] as const)(
+    "matches the per-comparison %s order on a shuffled list with ties",
+    (sortOrder) => {
+      const minute = (value: number) => `2026-03-09T10:0${value}:00.000Z`;
+      // (index * 7) % 24 scrambles the input order. Titles repeat, and
+      // projects 16-23 have no threads, so they use their own stamps.
+      const projects = Array.from({ length: 24 }, (_, index) => {
+        const n = (index * 7) % 24;
+        return makeProject({
+          id: ProjectId.make(`project-${n}`),
+          title: n % 2 === 0 ? "Alpha" : "Beta",
+          createdAt: minute(n % 3),
+          updatedAt: n % 5 === 0 ? "invalid" : minute(n % 2),
+        });
+      });
+      const threads = Array.from({ length: 48 }, (_, n) => ({
+        projectId: ProjectId.make(`project-${n % 16}`),
+        createdAt: minute(n % 6),
+        updatedAt: minute(n % 3),
+        latestUserMessageAt: n % 4 === 0 ? null : minute(n % 5),
+      }));
+      // The comparator this sort replaced: it walked each project's threads
+      // on every call.
+      const timestamp = (project: Project) =>
+        getProjectSortTimestamp(
+          project,
+          threads.filter((thread) => thread.projectId === project.id),
+          sortOrder,
+        );
+      const expected = projects.toSorted((left, right) => {
+        const rightTimestamp = timestamp(right);
+        const leftTimestamp = timestamp(left);
+        const byTimestamp =
+          rightTimestamp === leftTimestamp ? 0 : rightTimestamp > leftTimestamp ? 1 : -1;
+        return (
+          byTimestamp || left.title.localeCompare(right.title) || left.id.localeCompare(right.id)
+        );
+      });
+
+      expect(sortProjectsForSidebar(projects, threads, sortOrder)).toEqual(expected);
+    },
+  );
+
   it("returns the project timestamp when no threads are present", () => {
     const timestamp = getProjectSortTimestamp(
       makeProject({ updatedAt: "2026-03-09T10:10:00.000Z" }),
diff --git a/apps/web/src/components/Sidebar.logic.ts b/apps/web/src/components/Sidebar.logic.ts
index d15f81422cc0..f75f3f2ca97d 100644
--- a/apps/web/src/components/Sidebar.logic.ts
+++ b/apps/web/src/components/Sidebar.logic.ts
@@ -9,17 +9,19 @@ import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-searc
 import type { ContextMenuItem, EnvironmentId, ThreadId } from "@t3tools/contracts";
 import type { SidebarProjectSortOrder, SidebarThreadSortOrder } from "@t3tools/contracts/settings";
 import type { AsyncResult } from "effect/unstable/reactivity";
-import { planPinnedReorder } from "@t3tools/client-runtime/state/thread-sort";
+import {
+  planPinnedReorder,
+  resolveSettledThreadTimestamp,
+  type SettledThreadTimestampInput,
+} from "@t3tools/client-runtime/state/thread-sort";
 import {
   effectiveSnoozed,
   type ThreadSnoozeShell,
 } from "@t3tools/client-runtime/state/thread-settled";
 import {
   getThreadSortTimestamp,
-  resolveSettledThreadTimestamp,
   sortThreads,
   toSortableTimestamp,
-  type SettledThreadTimestampInput,
   type ThreadSortInput,
 } from "../lib/threadSort";
 import type { SidebarThreadSummary, Thread } from "../types";
@@ -44,6 +46,21 @@ export function shouldNavigateAfterThreadPark(input: {
 
 const THREAD_SELECTION_SAFE_SELECTOR = "[data-thread-item], [data-thread-selection-safe]";
 export const THREAD_JUMP_HINT_SHOW_DELAY_MS = 200;
+
+export function resolveSidebarRowAccessibility(input: {
+  readonly title: string;
+  readonly statusLabel: string | null;
+  readonly projectDisplayName: string | null;
+  readonly isActive: boolean;
+}): { readonly label: string; readonly current: "page" | undefined } {
+  return {
+    // The title is the row's identity and must lead when users scan tasks.
+    // Only static context belongs here; nested action labels remain separate controls.
+    label: [input.title, input.statusLabel, input.projectDisplayName].filter(Boolean).join(", "),
+    current: input.isActive ? "page" : undefined,
+  };
+}
+
 // Visible sidebar rows are prewarmed into the thread-detail cache so opening a
 // nearby thread usually reuses an already-hot subscription. Each prewarmed
 // thread holds a live, fully hydrated detail subscription (all messages and
@@ -768,40 +785,6 @@ export function isContextMenuPointerDown(input: {
   return input.isMac && input.button === 0 && input.ctrlKey;
 }
 
-export function resolveThreadRowClassName(input: {
-  isActive: boolean;
-  isSelected: boolean;
-}): string {
-  const baseClassName =
-    "h-8 w-full translate-x-0 cursor-pointer justify-start rounded-md px-2 text-left text-sm select-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring";
-
-  if (input.isSelected && input.isActive) {
-    return cn(
-      baseClassName,
-      "bg-sidebar-row-active text-sidebar-foreground font-medium hover:bg-sidebar-row-active hover:text-sidebar-foreground",
-    );
-  }
-
-  if (input.isSelected) {
-    return cn(
-      baseClassName,
-      "bg-sidebar-row-selected text-sidebar-foreground hover:bg-sidebar-row-active hover:text-sidebar-foreground",
-    );
-  }
-
-  if (input.isActive) {
-    return cn(
-      baseClassName,
-      "bg-sidebar-row-active text-sidebar-foreground font-medium hover:bg-sidebar-row-active hover:text-sidebar-foreground",
-    );
-  }
-
-  return cn(
-    baseClassName,
-    "text-sidebar-muted-foreground/80 hover:bg-sidebar-row-hover hover:text-sidebar-foreground",
-  );
-}
-
 // ── Sidebar thread status model ─────────────────────────────────────
 // Five visual states, three colors: color is reserved for "act now"
 // (approval), "in motion" (working), and "broken" (failed). Ready is the
@@ -996,6 +979,11 @@ export function reduceSidebarProjectScopeMenuState(
 
 // Settled rows are history, so they order by when the work ENDED, not when
 // the thread was created or last touched.
+//
+// Turbo (cheap-timestamp-and-sort-keys): upstream now ships the same
+// decorate-sort as `sortSettledThreads` in client-runtime, which the sidebar
+// renders through. This copy stays only as the pinned reference for
+// turbo/sortOrderEquivalence.test.ts and is a retire candidate.
 export function sortSettledThreadsForSidebar<
   T extends SettledThreadTimestampInput & { readonly id: string },
 >(threads: readonly T[]): T[] {
@@ -1201,13 +1189,19 @@ function sortProjectsByActivity<TProject extends SidebarProject>(
     return [...projects];
   }
 
-  return [...projects].toSorted((left, right) => {
-    const rightTimestamp = getProjectSortTimestamp(right, getProjectThreads(right), sortOrder);
-    const leftTimestamp = getProjectSortTimestamp(left, getProjectThreads(left), sortOrder);
-    const byTimestamp =
-      rightTimestamp === leftTimestamp ? 0 : rightTimestamp > leftTimestamp ? 1 : -1;
-    return byTimestamp || compareTies(left, right);
-  });
+  // Each project's timestamp walks all of its threads, so compute it once
+  // per project instead of once per comparison.
+  return projects
+    .map((project) => ({
+      project,
+      timestamp: getProjectSortTimestamp(project, getProjectThreads(project), sortOrder),
+    }))
+    .sort((left, right) => {
+      const byTimestamp =
+        right.timestamp === left.timestamp ? 0 : right.timestamp > left.timestamp ? 1 : -1;
+      return byTimestamp || compareTies(left.project, right.project);
+    })
+    .map(({ project }) => project);
 }
 
 export function sortProjectsForSidebar<
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index a992ae65b6b3..d30e96a01eda 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -21,7 +21,10 @@ import {
   effectiveSnoozed,
   threadWokeAt,
 } from "@t3tools/client-runtime/state/thread-settled";
-import { resolveSettledThreadTimestamp } from "@t3tools/client-runtime/state/thread-sort";
+import {
+  resolveSettledThreadTimestamp,
+  sortSettledThreads,
+} from "@t3tools/client-runtime/state/thread-sort";
 import {
   threadSearchMatchKey,
   type EnvironmentThreadSearchMatch,
@@ -169,6 +172,7 @@ import {
   resolveAdjacentThreadId,
   resolveSidebarDropTarget,
   resolveSidebarDropVerb,
+  resolveSidebarRowAccessibility,
   type SidebarDropVerb,
   resolveSidebarThreadStatus,
   searchSidebarThreads,
@@ -180,7 +184,6 @@ import {
   sidebarMarkerId,
   sortLogicalProjectsForSidebar,
   sortPinnedThreadsForSidebar,
-  sortSettledThreadsForSidebar,
   sortSnoozedThreadsForSidebar,
   sortThreadsForSidebar,
   useRetainedValue,
@@ -205,6 +208,7 @@ import {
   prStatusIndicator,
   resolveThreadPullRequestBadge,
   terminalStatusFromRunningIds,
+  synchronizeTerminalPulse,
   type TerminalStatusIndicator,
   useLinkedThreadPullRequest,
 } from "./ThreadStatusIndicators";
@@ -221,7 +225,7 @@ import {
 } from "../providerInstances";
 import { useThreadRunningTerminalIds } from "../state/terminalSessions";
 import { stackedThreadToast, toastManager } from "./ui/toast";
-import { Button } from "./ui/button";
+import { Button, InlineButton } from "./ui/button";
 import {
   Combobox,
   ComboboxEmpty,
@@ -235,7 +239,7 @@ import {
 import { SidebarContent, SidebarGroup, useSidebar } from "./ui/sidebar";
 import { SidebarChromeFooter, SidebarChromeHeader } from "./sidebar/SidebarChrome";
 import { SidebarHeaderIconButton, SidebarThreadHeader } from "./sidebar/SidebarThreadHeader";
-import { Popover, PopoverPopup, PopoverTrigger } from "./ui/popover";
+import { Menu, MenuItem, MenuPopup, MenuSeparator, MenuShortcut, MenuTrigger } from "./ui/menu";
 import { Tooltip, TooltipPopup, TooltipProvider, TooltipTrigger } from "./ui/tooltip";
 import { MiddleTruncate } from "./ui/middle-truncate";
 import {
@@ -288,7 +292,7 @@ function JumpHintBadge(props: { label: string }) {
   return (
     <span
       aria-hidden
-      className="pointer-events-none absolute right-1.5 top-1/2 z-10 inline-flex h-5 -translate-y-1/2 items-center rounded-full border border-border/80 bg-background/95 px-1.5 font-mono text-[10px] font-medium tracking-tight text-foreground shadow-sm"
+      className="pointer-events-none absolute right-1.5 top-1/2 z-10 inline-flex h-5 -translate-y-1/2 items-center rounded-full border border-border/80 bg-background/95 px-1.5 font-mono text-3xs font-medium tracking-tight text-foreground shadow-sm"
     >
       {props.label}
     </span>
@@ -350,14 +354,9 @@ function SidebarThreadTooltip({
   const driverKind = providerEntry?.driverKind ?? null;
   const supportsMultiplePullRequests = useSupportsMultiplePullRequests(thread.environmentId);
   return (
-    <TooltipPopup
-      side="right"
-      align="start"
-      sideOffset={4}
-      variant="glass"
-      className="max-w-80 text-left whitespace-normal [&_[data-slot=tooltip-viewport]]:p-0"
-    >
-      <div className="flex min-w-0 max-w-80 flex-col gap-2 p-[var(--floating-content-inset)]">
+    <TooltipPopup side="right" align="start" sideOffset={4} variant="glass">
+      {/* The viewport's own inset (py-1 px-2) plus this one make the floating inset. */}
+      <div className="flex min-w-0 max-w-80 flex-col gap-2 px-1 py-2">
         <div className="min-w-0 truncate text-xs leading-tight font-medium text-foreground">
           {thread.title}
         </div>
@@ -378,9 +377,9 @@ function SidebarThreadTooltip({
             </div>
           ) : null}
           {thread.branch ? (
-            <div className="flex min-w-0 items-center gap-2">
+            <div className="flex min-w-0 items-center gap-2 text-foreground/75">
               <GitBranchIcon className="size-3 shrink-0 stroke-muted-foreground" />
-              <MiddleTruncate value={thread.branch} className="flex text-foreground/75" />
+              <MiddleTruncate value={thread.branch} className="flex" />
             </div>
           ) : null}
           {branchMismatch ? (
@@ -424,7 +423,7 @@ function SidebarThreadTooltip({
             </div>
           ) : null}
           {thread.session?.lastError ? (
-            <div className="flex min-w-0 items-center gap-2 text-red-600 dark:text-red-400">
+            <div className="flex min-w-0 items-center gap-2 text-destructive-foreground">
               <CircleAlertIcon className="size-3 shrink-0 stroke-current" />
               <div className="min-w-0 truncate">Error occurred</div>
             </div>
@@ -445,7 +444,7 @@ function SidebarThreadTooltip({
  * Controlled by the row (which also uses the open state to pin its hover
  * actions while the menu is up).
  */
-function SnoozePopoverButton(props: {
+function SnoozeMenuButton(props: {
   open: boolean;
   onOpenChange: (open: boolean) => void;
   onSnooze: (preset: Pick<SnoozePreset, "snoozedUntil">) => void;
@@ -459,11 +458,11 @@ function SnoozePopoverButton(props: {
     [open, timestampFormat],
   );
   return (
-    <Popover open={open} onOpenChange={onOpenChange}>
+    <Menu open={open} onOpenChange={onOpenChange}>
       <Tooltip>
         <TooltipTrigger
           render={
-            <PopoverTrigger
+            <MenuTrigger
               render={
                 <button
                   type="button"
@@ -480,39 +479,31 @@ function SnoozePopoverButton(props: {
         </TooltipTrigger>
         <TooltipPopup>Snooze thread</TooltipPopup>
       </Tooltip>
-      <PopoverPopup side="bottom" align="end" className="w-56" viewportClassName="p-1">
+      <MenuPopup side="bottom" align="end">
         {presets.map((preset) => (
-          <button
+          <MenuItem
             key={preset.id}
-            type="button"
             onClick={(event) => {
               event.stopPropagation();
-              onOpenChange(false);
               onSnooze(preset);
             }}
-            className="flex w-full cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 text-left text-xs text-foreground/90 hover:bg-accent hover:text-foreground"
           >
-            <span className="flex-1">{preset.label}</span>
-            <span className="font-mono text-[10px] text-muted-foreground/60 tabular-nums">
-              {preset.whenLabel}
-            </span>
-          </button>
+            {preset.label}
+            <MenuShortcut>{preset.whenLabel}</MenuShortcut>
+          </MenuItem>
         ))}
-        <div className="my-1 border-t border-border/60" />
-        <button
-          type="button"
-          className="flex w-full cursor-pointer rounded-md px-2 py-1.5 text-left text-xs text-foreground/90 hover:bg-accent hover:text-foreground"
+        <MenuSeparator />
+        <MenuItem
           onClick={async (event) => {
             event.stopPropagation();
-            onOpenChange(false);
             const choice = await requestCustomSnooze();
             if (choice) onSnooze(choice);
           }}
         >
           Custom…
-        </button>
-      </PopoverPopup>
-    </Popover>
+        </MenuItem>
+      </MenuPopup>
+    </Menu>
   );
 }
 
@@ -547,8 +538,8 @@ function SortableThreadRow(props: {
 
 // Unsent work shares one look: the new-thread draft rows and thread rows
 // with unsent composer text both use this tint and pen so they read alike.
-const draftSurfaceClassName = "bg-amber-400/[0.04] hover:bg-amber-400/[0.08]";
-const draftPenClassName = "size-3 shrink-0 text-amber-600 dark:text-amber-300/80";
+const draftSurfaceClassName = "bg-warning/4 hover:bg-warning/8";
+const draftPenClassName = "size-3 shrink-0 text-warning-foreground";
 
 // Structural list items — the section headers and the
 // empty-section placeholders — take part in the sortable list so they shift
@@ -665,7 +656,7 @@ function SidebarSectionHeader(props: {
   const snoozed = props.marker === "snoozed-header";
   const className = cn(
     "flex h-full w-full items-center gap-2 px-2 text-left text-xs font-medium",
-    snoozed ? "text-blue-600 dark:text-blue-400" : "text-sidebar-muted-foreground/60",
+    snoozed ? "text-info-foreground" : "text-sidebar-muted-foreground/60",
     props.dragging && "text-sidebar-foreground/80",
     props.isDropTarget && "text-primary",
   );
@@ -676,7 +667,7 @@ function SidebarSectionHeader(props: {
         aria-hidden
         className={cn(
           "h-px min-w-2 flex-1",
-          snoozed ? "bg-blue-500/20 dark:bg-blue-400/15" : "bg-sidebar-border/60",
+          snoozed ? "bg-info/20" : "bg-sidebar-border/60",
           props.dragging && "bg-sidebar-foreground/25",
           props.isDropTarget && "bg-primary/50",
         )}
@@ -743,6 +734,12 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
     promptPreview.length > 0
       ? promptPreview
       : `${attachmentCount} attachment${attachmentCount === 1 ? "" : "s"}`;
+  const accessibility = resolveSidebarRowAccessibility({
+    title: preview,
+    statusLabel: "Unsent draft",
+    projectDisplayName: props.projectDisplayName,
+    isActive: props.isActive,
+  });
   const handleActivate = useCallback(() => onNavigate(draftId), [draftId, onNavigate]);
   const handleKeyDown = useCallback(
     (event: ReactKeyboardEvent) => {
@@ -770,15 +767,18 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
       <div
         role="button"
         tabIndex={0}
+        aria-label={accessibility.label}
+        aria-current={accessibility.current}
         data-testid="sidebar-draft-row"
         className={cn(
-          "group/sidebar-row relative w-full cursor-pointer overflow-hidden rounded-md text-left text-sidebar-foreground outline-none select-none",
+          "group/sidebar-row relative w-full cursor-pointer overflow-hidden rounded-md text-left text-sidebar-foreground outline-none select-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring",
           props.isActive ? "bg-sidebar-row-active" : draftSurfaceClassName,
         )}
         onClick={handleActivate}
         onKeyDown={handleKeyDown}
       >
-        <div className="relative z-10 h-[4.875rem] px-[var(--sidebar-row-content-inset)] py-[var(--sidebar-content-inset)]">
+        <span className="sr-only">{preview}</span>
+        <div className="relative z-10 h-[4.875rem] px-(--sidebar-row-content-inset) py-(--sidebar-content-inset)">
           <div className="flex h-5 min-w-0 items-center gap-1.5">
             <SquarePenIcon aria-hidden className={draftPenClassName} />
             {props.project ? (
@@ -805,7 +805,9 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
               </Tooltip>
             </span>
           </div>
-          <div className="mt-0.5 truncate text-sm font-medium text-foreground/90">{preview}</div>
+          <div aria-hidden className="mt-0.5 truncate text-sm font-medium text-foreground/90">
+            {preview}
+          </div>
         </div>
       </div>
     </li>
@@ -1161,7 +1163,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
           ? {
               label: "Approval",
               icon: "approval" as const,
-              className: "text-amber-700 dark:text-amber-300",
+              className: "text-warning-foreground",
             }
           : status === "input"
             ? {
@@ -1179,7 +1181,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
                 ? {
                     label: "Woke",
                     icon: "woke" as const,
-                    className: "text-amber-700 dark:text-amber-300",
+                    className: "text-warning-foreground",
                   }
                 : isUnread
                   ? {
@@ -1379,7 +1381,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
     if (!showSnoozeButton) setSnoozeMenuOpen(false);
   }, [showSnoozeButton]);
   const handlePrClick = useCallback(
-    (event: ReactMouseEvent<HTMLAnchorElement>) => {
+    (event: ReactMouseEvent<HTMLElement>) => {
       const url = pr?.url ?? currentLinkedPr?.url;
       if (!url) return;
       const openedInRightPanel = openPrLink(
@@ -1407,7 +1409,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
   // a useful hierarchy nor a reliable hover cue. Status now lives in the row
   // content; surface is reserved for interaction (hover, multi-select, route).
   const rowSurfaceClassName = cn(
-    "group/sidebar-row relative w-full cursor-pointer overflow-hidden rounded-md text-left outline-none select-none",
+    "group/sidebar-row relative w-full cursor-pointer overflow-hidden rounded-md text-left outline-none select-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring",
     variantAction === "unsettle" && "[&:not(:hover):not(:focus-within)_*]:text-secondary-label/70",
     props.isActive
       ? "bg-sidebar-row-active text-sidebar-foreground"
@@ -1418,6 +1420,11 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
           : shouldRecede
             ? "text-sidebar-muted-foreground/75 hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
             : "bg-transparent text-sidebar-foreground hover:bg-sidebar-row-hover",
+    // Background work fades as a whole row, status label included, so it
+    // takes less attention than rows that need a human (input, approval).
+    shouldRecede &&
+      (status === "working" || status === "monitoring") &&
+      "opacity-70 transition-opacity hover:opacity-100 focus-within:opacity-100 motion-reduce:transition-none",
     isFileDragOver && "ring-1 ring-inset ring-primary/70",
     // The hover tint must not clobber an active/selected row's own surface.
     isFileDragOver && !props.isActive && !isSelected && "bg-sidebar-row-hover",
@@ -1426,7 +1433,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
     // keeps the hover color applied, so both the tint and the solid sidebar
     // color are stacked as background images.
     props.sortable?.isDragging &&
-      "bg-[linear-gradient(var(--sidebar-row-active),var(--sidebar-row-active)),linear-gradient(var(--sidebar),var(--sidebar))] text-sidebar-foreground opacity-100 shadow-lg",
+      "bg-sidebar bg-linear-to-b from-sidebar-row-active to-sidebar-row-active text-sidebar-foreground opacity-100 shadow-lg",
   );
   // dnd-kit props for the row root. Same bag on both variants: every row in
   // the list translates around the gap as the drag passes it.
@@ -1451,12 +1458,19 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
     sortable?.isDragging && props.dropVerb !== null ? (
       <span
         role="status"
-        className="pointer-events-none ml-auto inline-flex h-5 shrink-0 items-center gap-1 rounded-sm border border-primary/40 bg-primary/10 px-1.5 text-[11px] font-medium text-primary"
+        className="pointer-events-none ml-auto inline-flex h-5 shrink-0 items-center gap-1 rounded-sm border border-primary/40 bg-primary/10 px-1.5 text-2xs font-medium text-primary"
       >
         {dropVerbBadge[props.dropVerb]}
       </span>
     ) : null;
 
+  const accessibility = resolveSidebarRowAccessibility({
+    title: thread.title,
+    statusLabel: topStatus?.label ?? null,
+    projectDisplayName: props.projectDisplayName,
+    isActive: props.isActive,
+  });
+
   const title = isRenaming ? (
     <input
       autoFocus
@@ -1472,6 +1486,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
     />
   ) : (
     <span
+      aria-hidden
       className={cn(
         "min-w-0 flex-1 text-sm transition-opacity motion-reduce:transition-none",
         shouldRecede ? "font-normal" : "font-medium",
@@ -1496,31 +1511,33 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
                     ? "text-muted-foreground"
                     : "text-secondary-label/70",
             ),
-        isRegeneratingTitle && "opacity-[0.55]",
+        isRegeneratingTitle && "opacity-55",
       )}
     >
       {thread.title}
     </span>
   );
+  const accessibleTitle = isRenaming ? null : <span className="sr-only">{thread.title}</span>;
 
   // Stacks show their layer count; multiple unrelated links show their total count.
-  // Plain clicks open T3; individual PR links also support opening the host in a new tab.
+  // Either opens the thread's pull requests tab; a single PR link opens that PR and still
+  // supports opening the host in a new tab.
   const prBadgeShape = supportsMultiplePullRequests
     ? resolveThreadPullRequestBadge(thread.pullRequests)
     : null;
-  const handlePrStackClick = useCallback(() => {
+  const handlePrListClick = useCallback(() => {
     useRightPanelStore.getState().open(threadRef, "pull-requests");
     if (!props.isActive) onThreadActivate(threadRef);
   }, [onThreadActivate, props.isActive, threadRef]);
   const prBadge =
     prBadgeShape?.kind === "stack" || pr || currentLinkedPr ? (
       <ThreadPullRequestBadgeControl
-        variant="underline"
+        render={<InlineButton />}
         badge={prBadgeShape}
         number={pr?.number ?? currentLinkedPr?.number}
         url={pr?.url ?? currentLinkedPr?.url}
         status={prStatus}
-        onOpenStack={handlePrStackClick}
+        onOpenList={handlePrListClick}
         onOpenPullRequest={handlePrClick}
       />
     ) : null;
@@ -1531,7 +1548,10 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
       data-testid={`sidebar-terminal-status-${thread.id}`}
       className={cn("inline-flex shrink-0 items-center justify-center", terminalStatus.colorClass)}
     >
-      <TerminalIcon className={cn("size-3.5", terminalStatus.pulse && "animate-status-pulse")} />
+      <TerminalIcon
+        className={cn("size-3.5", terminalStatus.pulse && "motion-safe:animate-status-pulse")}
+        onAnimationStart={synchronizeTerminalPulse}
+      />
     </span>
   ) : null;
   // Same pen the new-thread draft rows lead with, so both kinds of unsent
@@ -1600,6 +1620,8 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
                 ref={rowRef}
                 role="button"
                 tabIndex={0}
+                aria-label={accessibility.label}
+                aria-current={accessibility.current}
                 data-testid="sidebar-row-slim"
                 aria-busy={isRegeneratingTitle || undefined}
                 className={cn(rowSurfaceClassName, "flex h-9 items-center gap-2.5 px-2.5")}
@@ -1610,6 +1632,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
               />
             }
           >
+            {accessibleTitle}
             {/* Settled history recedes: dimmed favicon at rest, restored on
               hover so the tail stays scannable when you're hunting. */}
             <span
@@ -1647,7 +1670,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
                   {variantAction === "unsnooze" && props.snoozeWakeLabelText !== null ? (
                     // Snoozed rows show when they come BACK, not when they were
                     // last touched — the return ticket is the row's whole story.
-                    <span className="text-xs text-blue-600 tabular-nums dark:text-blue-400">
+                    <span className="text-xs text-info-foreground tabular-nums">
                       {props.snoozeWakeLabelText}
                     </span>
                   ) : isWoke ? (
@@ -1660,7 +1683,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
                             type="button"
                             aria-label="Dismiss Woke notification"
                             onClick={handleAcknowledgeWokeClick}
-                            className="inline-flex cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-amber-700 outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring dark:text-amber-300"
+                            className="inline-flex cursor-pointer items-center gap-1 rounded-sm text-xs font-medium text-warning-foreground outline-none hover:underline focus-visible:ring-2 focus-visible:ring-ring"
                           >
                             <AlarmClockIcon aria-hidden className="size-3" />
                             <span role="status">Woke</span>
@@ -1753,6 +1776,8 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
               ref={rowRef}
               role="button"
               tabIndex={0}
+              aria-label={accessibility.label}
+              aria-current={accessibility.current}
               data-testid="sidebar-row-card"
               data-sidebar-card=""
               aria-busy={isRegeneratingTitle || undefined}
@@ -1764,7 +1789,8 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
             />
           }
         >
-          <div className="relative z-10 h-[4.875rem] px-[var(--sidebar-row-content-inset)] py-[var(--sidebar-content-inset)]">
+          {accessibleTitle}
+          <div className="relative z-10 h-[4.875rem] px-(--sidebar-row-content-inset) py-(--sidebar-content-inset)">
             <div className="flex h-5 min-w-0 items-center gap-1.5">
               {draftIndicator}
               {props.project ? (
@@ -1890,7 +1916,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
                         </Tooltip>
                       ) : null}
                       {showSnoozeButton ? (
-                        <SnoozePopoverButton
+                        <SnoozeMenuButton
                           open={snoozeMenuOpen}
                           onOpenChange={setSnoozeMenuOpen}
                           onSnooze={handleSnoozePreset}
@@ -1935,11 +1961,9 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
               {thread.branch ? (
                 <>
                   <ThreadWorktreeIndicator thread={thread} />
-                  <MiddleTruncate
-                    value={thread.branch}
-                    showTitle={false}
-                    className="flex-1 text-muted-foreground/40"
-                  />
+                  <span className="flex min-w-0 flex-1 text-muted-foreground/40">
+                    <MiddleTruncate value={thread.branch} showTitle={false} />
+                  </span>
                 </>
               ) : (
                 <span className="flex-1" />
@@ -1978,7 +2002,7 @@ const SidebarThreadRow = memo(function SidebarThreadRow(props: {
                       showBadge={showInstanceBadge}
                       // Glyph dims, badge stays saturated; offset matches the composer trigger.
                       iconClassName="size-3.5 opacity-60"
-                      badgeClassName="right-[-0.1875rem] bottom-[-0.1875rem] h-3 min-w-3 px-0.5 text-[7px]"
+                      badgeClassName="right-[-0.1875rem] bottom-[-0.1875rem] h-3 min-w-3 px-0.5 text-5xs"
                     />
                   </span>
                 ) : null}
@@ -2019,6 +2043,12 @@ const SidebarSearchResultRow = memo(function SidebarSearchResultRow(props: {
   onFileDropThreads: (threadRef: ScopedThreadRef, files: File[]) => void;
 }) {
   const { thread } = props;
+  const accessibility = resolveSidebarRowAccessibility({
+    title: thread.title,
+    statusLabel: null,
+    projectDisplayName: props.projectDisplayName,
+    isActive: props.isRouteActive,
+  });
   const threadRef = useMemo(
     () => scopeThreadRef(thread.environmentId, thread.id),
     [thread.environmentId, thread.id],
@@ -2095,12 +2125,8 @@ const SidebarSearchResultRow = memo(function SidebarSearchResultRow(props: {
               // which owns all keyboard interaction for the listbox.
               tabIndex={-1}
               aria-selected={props.isHighlighted}
-              aria-current={props.isRouteActive ? "page" : undefined}
-              aria-label={
-                props.projectDisplayName
-                  ? `${thread.title}, ${props.projectDisplayName}`
-                  : thread.title
-              }
+              aria-current={accessibility.current}
+              aria-label={accessibility.label}
               onMouseMove={props.onHighlight}
               onClick={props.onSelect}
               className={cn(
@@ -2176,6 +2202,7 @@ export default function Sidebar() {
     confirmAndUnpinThread,
     reorderPinnedThread,
     reorderActiveThread,
+    setThreadAutoSettle,
     archiveThread,
     deleteThread,
   } = useThreadActions();
@@ -2634,7 +2661,7 @@ export default function Sidebar() {
             }),
       // Soonest wake first: "what comes back next" is the shelf's question.
       snoozedThreads: sortSnoozedThreadsForSidebar(snoozed),
-      settledThreads: sortSettledThreadsForSidebar(settled),
+      settledThreads: sortSettledThreads(settled),
       snoozeNow: preciseNow,
     };
   }, [nowMinute, optimisticDrop, scopedProjectKeys, serverConfigs, snoozeWakeTick, threads]);
@@ -3460,7 +3487,7 @@ export default function Sidebar() {
     if (dragState === null || thread === undefined) return [];
     const key = (candidate: EnvironmentThreadShell) =>
       scopedThreadKey(scopeThreadRef(candidate.environmentId, candidate.id));
-    return sortSettledThreadsForSidebar([
+    return sortSettledThreads([
       ...settledThreads.filter((candidate) => key(candidate) !== dragState.activeKey),
       applySidebarThreadDrop(thread, "settled", dragState.occurredAt),
     ]).map(key);
@@ -4038,6 +4065,9 @@ export default function Sidebar() {
           serverConfigs.get(thread.environmentId)?.environment.capabilities.threadSnooze === true;
         const supportsPinning =
           serverConfigs.get(thread.environmentId)?.environment.capabilities.threadPinning === true;
+        const supportsAutoSettleOptOut =
+          serverConfigs.get(thread.environmentId)?.environment.capabilities
+            .threadAutoSettleOptOut === true;
         const supportsTitleRegeneration =
           serverConfigs.get(thread.environmentId)?.environment.capabilities
             .threadTitleRegeneration === true;
@@ -4070,6 +4100,7 @@ export default function Sidebar() {
                   : null,
                 isPinned,
                 isSettled,
+                autoSettleEnabled: thread.autoSettleDisabledAt == null,
                 isSnoozed,
                 canSnoozeNow: canSnooze(thread, { now: new Date().toISOString() }),
                 isRegeneratingTitle,
@@ -4077,6 +4108,7 @@ export default function Sidebar() {
                   thread.session?.status === "running" && thread.session.activeTurnId != null,
                 supports: {
                   settlement: supportsSettlement,
+                  autoSettleOptOut: supportsAutoSettleOptOut,
                   snooze: supportsSnooze,
                   pinning: supportsPinning,
                   titleRegeneration: supportsTitleRegeneration,
@@ -4154,6 +4186,24 @@ export default function Sidebar() {
           case "unpin":
             attemptUnpin(threadRef);
             return;
+          case "auto-settle:enabled":
+          case "auto-settle:disabled": {
+            const result = await setThreadAutoSettle(
+              threadRef,
+              clicked.value === "auto-settle:enabled",
+            );
+            if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
+              const error = squashAtomCommandFailure(result);
+              toastManager.add(
+                stackedThreadToast({
+                  type: "error",
+                  title: "Failed to update auto-settle",
+                  description: error instanceof Error ? error.message : "An error occurred.",
+                }),
+              );
+            }
+            return;
+          }
           case "rename":
             startThreadRename(threadRef, thread.title);
             return;
@@ -4280,6 +4330,7 @@ export default function Sidebar() {
       projectByKey,
       serverConfigs,
       setProjectScopeKey,
+      setThreadAutoSettle,
       startThreadRename,
       updateThreadMetadata,
       timestampFormat,
@@ -4403,11 +4454,11 @@ export default function Sidebar() {
     <>
       <SidebarChromeHeader isElectron={isElectron} />
       <SidebarContent
-        className="gap-0 min-h-full"
+        className="min-h-full"
         fixedHeader={
           // Lifted above the stage backdrop, whose fade bleeds below the
           // header and would otherwise paint across the search row's outline.
-          <SidebarGroup className="relative z-[1] p-[var(--sidebar-content-inset)] pt-1">
+          <SidebarGroup className="z-[1]">
             <SidebarThreadHeader
               searchFieldRef={headerSearchRef}
               hasProjects={projectGroups.length > 0}
@@ -4503,8 +4554,6 @@ export default function Sidebar() {
                             key={item.value}
                             hideIndicator
                             value={item}
-                            className="h-8 min-h-8 py-0 font-medium"
-                            contentClassName="flex min-w-0 items-center gap-2"
                             onContextMenu={(event) => {
                               if (project) handleProjectSettings(event, project);
                             }}
@@ -4529,7 +4578,7 @@ export default function Sidebar() {
                                 tabIndex={-1}
                                 aria-hidden="true"
                                 title={`Project settings for ${project.displayName}`}
-                                className="ml-auto size-6 [--control-icon-color:currentColor] text-icon-muted focus-visible:bg-accent focus-visible:text-foreground"
+                                className="ml-auto"
                                 onPointerDown={(event) => event.stopPropagation()}
                                 onClick={(event) => {
                                   void handleProjectSettings(event, project);
@@ -4566,7 +4615,7 @@ export default function Sidebar() {
           </SidebarGroup>
         }
       >
-        <SidebarGroup className="ps-[calc(var(--sidebar-content-inset)+1px)] pe-[var(--sidebar-content-inset)] pb-1 pt-0 flex-1">
+        <SidebarGroup className="flex-1" role="presentation">
           {isSearchingThreads ? (
             threadSearchResults.length > 0 ? (
               <TooltipProvider
@@ -4657,7 +4706,11 @@ export default function Sidebar() {
                 <SortableContext items={sortableIds} strategy={sidebarSortingStrategy}>
                   <ul
                     ref={attachListMotionRef}
-                    role="list"
+                    // VoiceOver treats an exposed list as an interaction boundary,
+                    // which hides its rows from ordinary linear navigation. A
+                    // presentational list also makes its implicit listitems
+                    // presentational while preserving every descendant control.
+                    role="presentation"
                     className={cn(
                       "relative flex flex-col gap-px",
                       sidebarListItems.length > 0 && "flex-1",
@@ -4941,7 +4994,7 @@ export default function Sidebar() {
                   <button
                     type="button"
                     onClick={openAddProjectCommandPalette}
-                    className="inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-sidebar-border px-2.5 py-1 text-[11px] font-medium text-sidebar-muted-foreground transition-colors hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
+                    className="inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-sidebar-border px-2.5 py-1 text-2xs font-medium text-sidebar-muted-foreground transition-colors hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
                   >
                     <PlusIcon className="-mx-0.5 size-3" />
                     Add project
diff --git a/apps/web/src/components/SidebarStageBackdrop.tsx b/apps/web/src/components/SidebarStageBackdrop.tsx
index 9f77d7298c39..c1e020906492 100644
--- a/apps/web/src/components/SidebarStageBackdrop.tsx
+++ b/apps/web/src/components/SidebarStageBackdrop.tsx
@@ -23,14 +23,6 @@ export function resolveSidebarStageBackdropVariant(
   return null;
 }
 
-export function resolveSidebarStageFocusRingOffsetClass(
-  variant: SidebarStageBackdropVariant,
-): string {
-  return variant === "nightly"
-    ? "focus-visible:ring-offset-(--stage-night-bottom)"
-    : "focus-visible:ring-offset-(--stage-art-bottom)";
-}
-
 export function resolveEnvironmentIdentificationPillLabel(
   stageLabel: string,
 ): EnvironmentIdentificationPillLabel | null {
@@ -116,7 +108,8 @@ function NightlySkyArt({ compact = false }: { compact?: boolean }) {
 
   return (
     <svg
-      className="stage-art stage-nightly h-full w-full"
+      data-stage-art="nightly"
+      className="h-full w-full"
       fill="none"
       preserveAspectRatio="xMinYMin slice"
       viewBox={compact ? "96 0 8192 96" : STAGE_BACKDROP_VIEW_BOX}
@@ -230,7 +223,8 @@ function DevBlueprintArt({ compact = false }: { compact?: boolean }) {
 
   return (
     <svg
-      className="stage-art stage-blueprint h-full w-full"
+      data-stage-art="blueprint"
+      className="h-full w-full"
       fill="none"
       preserveAspectRatio="xMinYMin slice"
       viewBox={compact ? "64 0 8192 96" : STAGE_BACKDROP_VIEW_BOX}
diff --git a/apps/web/src/components/SlowRpcRequestToastCoordinator.tsx b/apps/web/src/components/SlowRpcRequestToastCoordinator.tsx
index f5391c13abaf..5144b6f93a14 100644
--- a/apps/web/src/components/SlowRpcRequestToastCoordinator.tsx
+++ b/apps/web/src/components/SlowRpcRequestToastCoordinator.tsx
@@ -22,7 +22,7 @@ function SlowRequestDetails({ requests }: { requests: ReadonlyArray<SlowRpcAckRe
           key={request.requestId}
         >
           <div className="wrap-break-word font-medium text-foreground">{request.tag}</div>
-          <div className="mt-0.5 text-[10px] opacity-75">
+          <div className="mt-0.5 text-3xs opacity-75">
             Started {new Date(request.startedAt).toLocaleTimeString()}
           </div>
         </li>
diff --git a/apps/web/src/components/StartTruncatedPath.tsx b/apps/web/src/components/StartTruncatedPath.tsx
index b467d141a8ca..60cb6cdc740d 100644
--- a/apps/web/src/components/StartTruncatedPath.tsx
+++ b/apps/web/src/components/StartTruncatedPath.tsx
@@ -17,7 +17,7 @@ export function StartTruncatedPath({ path, className }: { path: string; classNam
       >
         <bdi>{path}</bdi>
       </TooltipTrigger>
-      <TooltipPopup side="top" className="max-w-sm break-all font-mono">
+      <TooltipPopup side="top" variant="code">
         {path}
       </TooltipPopup>
     </Tooltip>
diff --git a/apps/web/src/components/ThreadNotificationCoordinator.tsx b/apps/web/src/components/ThreadNotificationCoordinator.tsx
index 1401965e90c7..c4494f866ccb 100644
--- a/apps/web/src/components/ThreadNotificationCoordinator.tsx
+++ b/apps/web/src/components/ThreadNotificationCoordinator.tsx
@@ -164,22 +164,13 @@ function EnvironmentNotifications({
             hideCopyButton: true,
             leadingIcon:
               kind === "completion" ? (
-                <CircleCheckIcon
-                  aria-hidden
-                  className="size-4 text-emerald-700 dark:text-emerald-300"
-                />
+                <CircleCheckIcon aria-hidden className="size-4 text-success-foreground" />
               ) : status === "approval" ? (
-                <ShieldQuestionIcon
-                  aria-hidden
-                  className="size-4 text-amber-700 dark:text-amber-300"
-                />
+                <ShieldQuestionIcon aria-hidden className="size-4 text-warning-foreground" />
               ) : status === "failed" ? (
-                <CircleAlertIcon aria-hidden className="size-4 text-red-700 dark:text-red-300" />
+                <CircleAlertIcon aria-hidden className="size-4 text-destructive-foreground" />
               ) : (
-                <MessageCircleQuestionIcon
-                  aria-hidden
-                  className="size-4 text-indigo-600 dark:text-indigo-300"
-                />
+                <MessageCircleQuestionIcon aria-hidden className="size-4 text-info-foreground" />
               ),
           },
           actionProps: {
diff --git a/apps/web/src/components/ThreadSearchMatch.tsx b/apps/web/src/components/ThreadSearchMatch.tsx
index db2e286ae28d..a79ab8543987 100644
--- a/apps/web/src/components/ThreadSearchMatch.tsx
+++ b/apps/web/src/components/ThreadSearchMatch.tsx
@@ -57,7 +57,7 @@ export function ThreadSearchMatchExcerpt(props: {
   const isUser = props.match.source === "user";
   return (
     <span className="truncate text-xs text-muted-foreground/85">
-      <span className={isUser ? "text-blue-400" : "text-emerald-400"}>
+      <span className={isUser ? "text-info-foreground" : "text-success-foreground"}>
         {isUser ? "You:" : "Agent:"}
       </span>{" "}
       <HighlightedSearchText text={props.match.snippet} query={props.match.query} />
diff --git a/apps/web/src/components/ThreadStatusIndicators.test.ts b/apps/web/src/components/ThreadStatusIndicators.test.ts
index 60b17b19aa6b..5406cba08c0d 100644
--- a/apps/web/src/components/ThreadStatusIndicators.test.ts
+++ b/apps/web/src/components/ThreadStatusIndicators.test.ts
@@ -1,14 +1,31 @@
 import { ProjectId, type PullRequestSummary, type VcsStatusResult } from "@t3tools/contracts";
 import { describe, expect, it } from "@effect/vitest";
+import type { AnimationEvent } from "react";
 
 import {
   ChangeRequestStatusIcon,
   prStatusIndicator,
   resolveThreadPullRequestBadgePresentation,
+  synchronizeTerminalPulse,
 } from "./ThreadStatusIndicators";
 import { newestPullRequestSummary } from "../state/pullRequests";
 import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
 
+describe("synchronizeTerminalPulse", () => {
+  it("pins only the status pulse to the document clock", () => {
+    const pulse = { animationName: "status-pulse", startTime: 975 } as CSSAnimation;
+    const otherCss = { animationName: "other-animation", startTime: 125 } as CSSAnimation;
+    const otherAnimation = { startTime: 250 } as Animation;
+
+    synchronizeTerminalPulse({
+      animationName: "status-pulse",
+      currentTarget: { getAnimations: () => [pulse, otherCss, otherAnimation] },
+    } as AnimationEvent<SVGSVGElement>);
+
+    expect([pulse.startTime, otherCss.startTime, otherAnimation.startTime]).toEqual([0, 125, 250]);
+  });
+});
+
 describe("ChangeRequestStatusIcon", () => {
   it.each([
     ["open", "open", false, PullRequestGlyph.pullRequest],
diff --git a/apps/web/src/components/ThreadStatusIndicators.tsx b/apps/web/src/components/ThreadStatusIndicators.tsx
index 5b2945042ac2..6ca601653f30 100644
--- a/apps/web/src/components/ThreadStatusIndicators.tsx
+++ b/apps/web/src/components/ThreadStatusIndicators.tsx
@@ -15,8 +15,8 @@ import {
   type ThreadPullRequestBadge,
 } from "@t3tools/shared/threadPullRequests";
 import { FolderGit2Icon, TerminalIcon } from "lucide-react";
-import { useMemo, type MouseEvent } from "react";
-import { buttonVariants, InlineButton } from "./ui/button";
+import { useRender } from "@base-ui/react/use-render";
+import { useMemo, type AnimationEvent, type MouseEvent, type ReactElement } from "react";
 import { cn } from "../lib/utils";
 import { useEnvironment, usePrimaryEnvironmentId } from "../state/environments";
 import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
@@ -191,71 +191,93 @@ export function resolveThreadPullRequestBadgePresentation({
   };
 }
 
-/** The complete linked-PR control shared by the sidebar and composer footer. */
+/**
+ * The linked-PR badge shared by the sidebar and composer footer. The badge owns what it shows:
+ * the state glyph and number at the meta size, in the state's color. The caller owns the control
+ * it sits in through `render` (an inline link in a sidebar row, a toolbar control in the
+ * composer), and the badge fills in the behavior: a single PR is a link to it, while a stack or
+ * several linked PRs is a button that opens the thread's pull requests tab.
+ */
 export function ThreadPullRequestBadgeControl({
-  variant,
+  render,
   badge,
   number,
   url,
   status,
-  onOpenStack,
+  onOpenList,
   onOpenPullRequest,
 }: {
-  variant: "underline" | "ghost";
+  render: ReactElement<{ render?: useRender.RenderProp }>;
   badge: ThreadPullRequestBadge | null;
   number?: number | undefined;
   url?: string | undefined;
   status: PrStatusIndicator | null;
-  onOpenStack: () => void;
-  onOpenPullRequest: (event: MouseEvent<HTMLAnchorElement>) => void;
+  onOpenList: () => void;
+  onOpenPullRequest: (event: MouseEvent<HTMLElement>) => void;
 }) {
   const presentation = resolveThreadPullRequestBadgePresentation({ badge, number, url, status });
   if (presentation === null) return null;
-  const isStack = badge?.kind === "stack";
-  const className = cn(
-    variant === "ghost"
-      ? buttonVariants({ variant: "ghost", size: "xs" })
-      : "inline-flex shrink-0 cursor-pointer items-center gap-0.5 whitespace-nowrap border-b border-transparent hover:border-current focus-visible:outline-2 focus-visible:outline-ring",
-    "text-xs tabular-nums",
-    variant === "ghost" &&
-      "font-normal text-xs! active:scale-100 [--control-icon-color:currentColor]",
-    presentation.toneClassName,
+  return (
+    <PullRequestBadge
+      render={render}
+      presentation={presentation}
+      opensList={badge !== null && (badge.kind === "stack" || badge.others > 0)}
+      url={url}
+      onOpenList={onOpenList}
+      onOpenPullRequest={onOpenPullRequest}
+    />
   );
-  const content = (
-    <>
-      <presentation.Icon aria-hidden className="size-3 shrink-0" />
-      {presentation.text}
-    </>
+}
+
+function PullRequestBadge({
+  render,
+  presentation,
+  opensList,
+  url,
+  onOpenList,
+  onOpenPullRequest,
+}: {
+  render: ReactElement<{ render?: useRender.RenderProp }>;
+  presentation: NonNullable<ReturnType<typeof resolveThreadPullRequestBadgePresentation>>;
+  opensList: boolean;
+  url: string | undefined;
+  onOpenList: () => void;
+  onOpenPullRequest: (event: MouseEvent<HTMLElement>) => void;
+}) {
+  const onClick = opensList
+    ? (event: MouseEvent<HTMLElement>) => {
+        event.preventDefault();
+        event.stopPropagation();
+        onOpenList();
+      }
+    : onOpenPullRequest;
+  const element = opensList ? (
+    <button type="button" />
+  ) : (
+    <a href={url} target="_blank" rel="noopener noreferrer" />
   );
+  // The caller's control (InlineButton, ComposerControl) renders as the link or stack button
+  // through its own render prop; useRender merges the badge's behavior into it.
+  const control = useRender({
+    render,
+    props: {
+      render: element,
+      "aria-label": presentation.label,
+      onPointerDown: (event: MouseEvent<HTMLElement>) => event.stopPropagation(),
+      onClick,
+    },
+  });
   return (
     <Tooltip>
-      <TooltipTrigger
-        render={
-          isStack ? (
-            <InlineButton
-              className={className}
-              aria-label={presentation.label}
-              onPointerDown={(event) => event.stopPropagation()}
-              onClick={(event) => {
-                event.preventDefault();
-                event.stopPropagation();
-                onOpenStack();
-              }}
-            />
-          ) : (
-            <a
-              href={url}
-              target="_blank"
-              rel="noopener noreferrer"
-              className={className}
-              aria-label={presentation.label}
-              onPointerDown={(event) => event.stopPropagation()}
-              onClick={onOpenPullRequest}
-            />
-          )
-        }
-      >
-        {content}
+      <TooltipTrigger render={control}>
+        <span
+          className={cn("contents font-normal text-xs tabular-nums", presentation.toneClassName)}
+        >
+          <presentation.Icon aria-hidden className="size-3 shrink-0" />
+          {/* An element, not bare text: bare text takes its line box from the control, which
+              inherits the row's size, so beside a text-sm title it sat below the other meta. */}
+          <span>{presentation.text}</span>
+        </span>
       </TooltipTrigger>
       <TooltipPopup side="top">{presentation.label}</TooltipPopup>
     </Tooltip>
@@ -309,7 +331,7 @@ export function ThreadPullRequestsMiniList({
               {snapshot?.title ?? line.link.repository}
             </span>
             {line.stack ? (
-              <span className="ml-auto shrink-0 pl-1 text-[10px]">
+              <span className="ml-auto shrink-0 pl-1 text-3xs">
                 {line.stack.kind === "native" ? "stack" : "chain"} · {line.stack.size}
               </span>
             ) : null}
@@ -375,6 +397,17 @@ export function terminalStatusFromRunningIds(
   };
 }
 
+/** Align newly started pulses with the document clock without a timer or frame loop. */
+export function synchronizeTerminalPulse(event: AnimationEvent<SVGSVGElement>) {
+  if (event.animationName !== "status-pulse") return;
+
+  for (const animation of event.currentTarget.getAnimations()) {
+    if ("animationName" in animation && animation.animationName === "status-pulse") {
+      animation.startTime = 0;
+    }
+  }
+}
+
 export function ThreadWorktreeIndicator({
   thread,
 }: {
@@ -444,7 +477,7 @@ export function ThreadStatusLabel({
         render={
           <span
             aria-label={status.label}
-            className={`inline-flex items-center gap-1 text-[10px] ${status.colorClass}`}
+            className={`inline-flex items-center gap-1 text-3xs ${status.colorClass}`}
           />
         }
       >
@@ -563,7 +596,8 @@ export function ThreadRowTrailingStatus({ thread }: { thread: SidebarThreadSumma
             }
           >
             <TerminalIcon
-              className={`size-3 ${terminalStatus.pulse ? "animate-status-pulse" : ""}`}
+              className={`size-3 ${terminalStatus.pulse ? "motion-safe:animate-status-pulse" : ""}`}
+              onAnimationStart={synchronizeTerminalPulse}
             />
           </TooltipTrigger>
           <TooltipPopup side="top">{terminalStatus.label}</TooltipPopup>
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
index 2305a5fd10f3..f8e889fbceac 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx
@@ -175,8 +175,8 @@ function terminalFontOptions(family: string, size: number): { family?: string; s
 
 export function terminalThemeFromApp(mountElement?: HTMLElement | null): GhosttyTheme {
   const drawerSurface =
-    mountElement?.closest(".thread-terminal-drawer") ??
-    document.querySelector(".thread-terminal-drawer") ??
+    mountElement?.closest("[data-thread-terminal-drawer]") ??
+    document.querySelector("[data-thread-terminal-drawer]") ??
     document.body;
   const drawerStyles = getComputedStyle(drawerSurface);
   const themeStyles = mountElement ? getComputedStyle(mountElement) : drawerStyles;
@@ -981,7 +981,7 @@ export function TerminalViewport({
     <div
       ref={containerRef}
       tabIndex={-1}
-      className="relative h-full w-full overflow-hidden bg-[var(--terminal-background)]"
+      className="relative h-full w-full overflow-hidden bg-(--terminal-background)"
     />
   );
 }
@@ -1394,9 +1394,10 @@ export default function ThreadTerminalDrawer({
   if (normalizedTerminalIds.length === 0) {
     return (
       <aside
+        data-thread-terminal-drawer
         data-terminal-owner={isPanel ? "right-panel" : "drawer"}
         className={cn(
-          "thread-terminal-drawer relative flex min-w-0 flex-col overflow-hidden bg-background",
+          "relative flex min-w-0 flex-col overflow-hidden bg-background",
           isPanel ? "h-full flex-1" : "shrink-0 border-t border-border/80",
         )}
         style={isPanel ? undefined : { height: `${drawerHeight}px` }}
@@ -1424,9 +1425,10 @@ export default function ThreadTerminalDrawer({
 
   return (
     <aside
+      data-thread-terminal-drawer
       data-terminal-owner={isPanel ? "right-panel" : "drawer"}
       className={cn(
-        "thread-terminal-drawer relative flex min-w-0 flex-col overflow-hidden bg-background",
+        "relative flex min-w-0 flex-col overflow-hidden bg-background",
         isPanel ? "h-full flex-1" : "shrink-0 border-t border-border/80",
       )}
       style={isPanel ? undefined : { height: `${drawerHeight}px` }}
@@ -1447,7 +1449,7 @@ export default function ThreadTerminalDrawer({
             <TerminalActionButton
               className={`p-1 text-foreground/90 transition-colors ${
                 hasReachedSplitLimit
-                  ? "cursor-not-allowed opacity-45 hover:bg-transparent"
+                  ? "cursor-not-allowed opacity-64 hover:bg-transparent"
                   : "hover:bg-accent"
               }`}
               onClick={onSplitTerminalAction}
@@ -1459,7 +1461,7 @@ export default function ThreadTerminalDrawer({
             <TerminalActionButton
               className={`p-1 text-foreground/90 transition-colors ${
                 hasReachedSplitLimit
-                  ? "cursor-not-allowed opacity-45 hover:bg-transparent"
+                  ? "cursor-not-allowed opacity-64 hover:bg-transparent"
                   : "hover:bg-accent"
               }`}
               onClick={onSplitTerminalVerticalAction}
@@ -1490,7 +1492,7 @@ export default function ThreadTerminalDrawer({
       <div className="min-h-0 w-full flex-1">
         <div
           className={cn(
-            "flex h-full min-h-0 bg-[var(--terminal-background)]",
+            "flex h-full min-h-0 bg-(--terminal-background)",
             hasTerminalSidebar && "gap-1.5",
           )}
         >
@@ -1592,7 +1594,7 @@ export default function ThreadTerminalDrawer({
                   <TerminalActionButton
                     className={`inline-flex h-full items-center px-1 text-foreground/90 transition-colors ${
                       hasReachedSplitLimit
-                        ? "cursor-not-allowed opacity-45 hover:bg-transparent"
+                        ? "cursor-not-allowed opacity-64 hover:bg-transparent"
                         : "hover:bg-accent/70"
                     }`}
                     onClick={onSplitTerminalAction}
@@ -1603,7 +1605,7 @@ export default function ThreadTerminalDrawer({
                   <TerminalActionButton
                     className={`inline-flex h-full items-center border-l border-border/70 px-1 text-foreground/90 transition-colors ${
                       hasReachedSplitLimit
-                        ? "cursor-not-allowed opacity-45 hover:bg-transparent"
+                        ? "cursor-not-allowed opacity-64 hover:bg-transparent"
                         : "hover:bg-accent/70"
                     }`}
                     onClick={onSplitTerminalVerticalAction}
@@ -1653,7 +1655,7 @@ export default function ThreadTerminalDrawer({
                       {showGroupHeaders && (
                         <button
                           type="button"
-                          className={`flex h-[22px] w-full cursor-pointer items-center gap-1 rounded px-1.5 text-[11px] ${
+                          className={`flex h-[22px] w-full cursor-pointer items-center gap-1 rounded px-1.5 text-2xs ${
                             isGroupActive
                               ? "bg-accent/50 text-foreground"
                               : "text-muted-foreground hover:bg-accent/40 hover:text-foreground"
@@ -1662,7 +1664,7 @@ export default function ThreadTerminalDrawer({
                         >
                           <GroupIcon className="size-3 shrink-0" />
                           <span className="min-w-0 flex-1 truncate text-left">{groupLabel}</span>
-                          <span className="text-muted-foreground/70 text-[10px] tabular-nums">
+                          <span className="text-muted-foreground/70 text-3xs tabular-nums">
                             {terminalCount}
                           </span>
                         </button>
diff --git a/apps/web/src/components/WorkspaceBreadcrumb.tsx b/apps/web/src/components/WorkspaceBreadcrumb.tsx
index 015e381aa251..2d5729cb7d15 100644
--- a/apps/web/src/components/WorkspaceBreadcrumb.tsx
+++ b/apps/web/src/components/WorkspaceBreadcrumb.tsx
@@ -33,7 +33,7 @@ export function WorkspaceBreadcrumbText({ children, className, ...props }: Compo
       // Center the capital letters with adjacent icons, not the font's leading.
       // Padding preserves accents and descenders when a label is truncated.
       className={cn(
-        "block min-w-0 truncate [text-box:trim-both_cap_alphabetic] supports-[text-box:trim-both_cap_alphabetic]:py-[0.5em]",
+        "block min-w-0 truncate [text-box:trim-both_cap_alphabetic] supports-[text-box:trim-both_cap_alphabetic]:py-1.5",
         className,
       )}
       {...props}
diff --git a/apps/web/src/components/WorkspacePageHeader.tsx b/apps/web/src/components/WorkspacePageHeader.tsx
index 5d98b80760ac..a484b4497539 100644
--- a/apps/web/src/components/WorkspacePageHeader.tsx
+++ b/apps/web/src/components/WorkspacePageHeader.tsx
@@ -16,9 +16,9 @@ export function WorkspacePageHeader({
   return (
     <header
       className={cn(
-        "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center gap-3 pl-[calc(env(safe-area-inset-left)+0.75rem)] pr-[calc(env(safe-area-inset-right)+0.75rem)] [[data-panel-animations=true]_&]:motion-safe:transition-[padding-left,padding-right] [[data-panel-animations=true]_&]:motion-safe:[transition-duration:var(--panel-animation-duration)] [[data-panel-animations=true]_&]:motion-safe:ease-out sm:pl-[calc(env(safe-area-inset-left)+1.25rem)] sm:pr-[calc(env(safe-area-inset-right)+1.25rem)]",
+        "flex h-[var(--workspace-topbar-height)] min-h-[var(--workspace-topbar-height)] shrink-0 items-center gap-3 pl-(--workspace-gutter-start) pr-(--workspace-gutter-end) [[data-panel-animations=true]_&]:motion-safe:transition-[padding-left,padding-right] [[data-panel-animations=true]_&]:motion-safe:duration-(--panel-animation-duration) [[data-panel-animations=true]_&]:motion-safe:ease-out",
         electron && "drag-region",
-        reserveNativeControls && "wco:pr-[var(--workspace-native-controls-inset)]",
+        reserveNativeControls && "wco:pr-(--workspace-native-controls-inset)",
         COLLAPSED_SIDEBAR_TITLEBAR_INSET_CLASS,
         className,
       )}
diff --git a/apps/web/src/components/auth/AuthSurfaceShell.tsx b/apps/web/src/components/auth/AuthSurfaceShell.tsx
index ed27bd482a5d..de8939dce372 100644
--- a/apps/web/src/components/auth/AuthSurfaceShell.tsx
+++ b/apps/web/src/components/auth/AuthSurfaceShell.tsx
@@ -27,7 +27,7 @@ export function AuthSurfaceShell({ children }: { readonly children: ReactNode })
           )}
           <div className="absolute inset-0 bg-[linear-gradient(to_bottom,transparent_20%,rgba(7,18,55,0.46)_100%)]" />
           <div className="relative h-full p-5 sm:p-6">
-            <p className="text-[10px] font-semibold tracking-[0.2em] text-white/80 uppercase">
+            <p className="text-3xs font-semibold tracking-widest text-white/80 uppercase">
               {APP_DISPLAY_NAME}
             </p>
           </div>
diff --git a/apps/web/src/components/chat/AssistantCitationChip.tsx b/apps/web/src/components/chat/AssistantCitationChip.tsx
index a207aad42453..e03872553a88 100644
--- a/apps/web/src/components/chat/AssistantCitationChip.tsx
+++ b/apps/web/src/components/chat/AssistantCitationChip.tsx
@@ -13,19 +13,11 @@ import {
   findAssistantCitationSourceAnchor,
   type AssistantCitationSourceAnchor,
 } from "~/lib/assistantTextSelection";
-import { cn } from "~/lib/utils";
 import {
   assistantCitationHash,
   assistantCitationNavigation,
 } from "../../lib/assistantCitationNavigation";
-import {
-  CHAT_INLINE_CHIP_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_DISMISS_BUTTON_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES,
-} from "../composerInlineChip";
+import { ContextChip, ContextChipAction, ContextChipLabel } from "../ContextChip";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import { AssistantCitationCommentEditor } from "./AssistantCitationCommentEditor";
@@ -33,11 +25,6 @@ import { resolveAssistantCitationCommentDismissal } from "./assistantCitationCom
 import { observeAssistantCitationCommentSource } from "./AssistantCitationSource";
 import { composerFloatingLayerProps } from "./composerEventScope";
 
-const CITATION_ACTION_BUTTON_CLASS_NAME = cn(
-  COMPOSER_INLINE_CHIP_DISMISS_BUTTON_CLASS_NAME,
-  "text-current hover:bg-[color-mix(in_oklab,var(--context-chip-accent)_17%,transparent)] hover:text-current",
-);
-
 export function AssistantCitationChip({
   citation,
   composer = false,
@@ -52,10 +39,13 @@ export function AssistantCitationChip({
     onCancel?: () => void;
     onSave: (comment: string) => boolean;
     onSaveAndSend?: (comment: string) => boolean;
+    /** Returns focus to the host editor when the popover closes instead of to the pencil trigger. */
+    onRestoreFocus?: () => void;
   };
 }) {
   const navigate = useNavigate();
   const commentInputRef = useRef<HTMLTextAreaElement>(null);
+  const commentPopupRef = useRef<HTMLDivElement>(null);
   const draftCommentRef = useRef<string | null>(null);
   const [unavailableSourceAnchor, setUnavailableSourceAnchor] =
     useState<AssistantCitationSourceAnchor | null>(null);
@@ -123,29 +113,26 @@ export function AssistantCitationChip({
   const composerSourceLink = (
     <Link
       {...sourceLinkProps}
-      className="inline-flex h-full min-w-0 items-center gap-[0.33em] rounded-sm text-inherit no-underline focus-visible:outline-2 focus-visible:outline-[var(--contrast-foreground)]"
+      className="inline-flex h-full min-w-0 items-center gap-[0.33em] rounded-sm text-inherit no-underline focus-visible:outline-2 focus-visible:outline-foreground"
       aria-label={`View cited assistant text: ${label}`}
     >
-      <QuoteIcon aria-hidden="true" className={COMPOSER_INLINE_CHIP_ICON_CLASS_NAME} />
-      <span className={cn(COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME, "max-w-[16em]")}>{label}</span>
+      <QuoteIcon aria-hidden="true" />
+      <ContextChipLabel className="max-w-[16em]">{label}</ContextChipLabel>
     </Link>
   );
   const chatSourceLink = (
     <Link
       {...sourceLinkProps}
-      className="inline-flex h-full min-w-0 items-center gap-[0.33em] rounded-sm text-inherit no-underline hover:bg-[color-mix(in_oklab,var(--context-chip-accent)_17%,transparent)] focus-visible:outline-2 focus-visible:outline-[var(--contrast-foreground)]"
+      className="inline-flex h-full min-w-0 items-center gap-[0.33em] rounded-sm text-inherit no-underline hover:bg-(--context-chip-accent)/17 focus-visible:outline-2 focus-visible:outline-foreground"
       aria-label={`View cited assistant text: ${label}`}
     >
-      <QuoteIcon aria-hidden="true" className={COMPOSER_INLINE_CHIP_ICON_CLASS_NAME} />
-      <span className={cn(COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME, "max-w-[16em]")}>{label}</span>
+      <QuoteIcon aria-hidden="true" />
+      <ContextChipLabel className="max-w-[16em]">{label}</ContextChipLabel>
     </Link>
   );
   return (
-    <span
-      className={cn(
-        composer ? COMPOSER_INLINE_CHIP_CLASS_NAME : CHAT_INLINE_CHIP_CLASS_NAME,
-        CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.citation,
-      )}
+    <ContextChip
+      kind="citation"
       contentEditable={false}
       data-assistant-citation-chip="true"
       data-markdown-copy={serializeAssistantCitation(citation)}
@@ -171,9 +158,10 @@ export function AssistantCitationChip({
         >
           <PopoverTrigger
             aria-label={citation.comment ? "Edit citation comment" : "Add comment to citation"}
-            className={CITATION_ACTION_BUTTON_CLASS_NAME}
+            data-citation-comment-trigger="true"
+            render={<ContextChipAction />}
           >
-            <PencilIcon aria-hidden="true" className="size-[0.85em]" />
+            <PencilIcon aria-hidden="true" />
           </PopoverTrigger>
           {commentEditor.open ? (
             <PopoverPopup
@@ -185,9 +173,25 @@ export function AssistantCitationChip({
                 commentInputRef.current?.focus({ preventScroll: true });
                 return false;
               }}
+              finalFocus={
+                commentEditor.onRestoreFocus
+                  ? () => {
+                      // Leave focus alone when the user closed the popover by moving to another control.
+                      const activeElement = document.activeElement;
+                      if (
+                        activeElement === document.body ||
+                        (activeElement !== null && commentPopupRef.current?.contains(activeElement))
+                      ) {
+                        commentEditor.onRestoreFocus?.();
+                      }
+                      return false;
+                    }
+                  : undefined
+              }
+              ref={commentPopupRef}
               aria-label="Edit citation comment"
-              className="w-72 max-w-[calc(100vw-1rem)]"
-              viewportClassName="p-3"
+              width="md"
+              padding="compact"
               onPointerDown={(event) => event.stopPropagation()}
             >
               <AssistantCitationCommentEditor
@@ -223,6 +227,6 @@ export function AssistantCitationChip({
           ) : null}
         </Popover>
       ) : null}
-    </span>
+    </ContextChip>
   );
 }
diff --git a/apps/web/src/components/chat/AssistantSelectionToolbar.tsx b/apps/web/src/components/chat/AssistantSelectionToolbar.tsx
index a7c622ade17a..ff03524cfef2 100644
--- a/apps/web/src/components/chat/AssistantSelectionToolbar.tsx
+++ b/apps/web/src/components/chat/AssistantSelectionToolbar.tsx
@@ -134,7 +134,7 @@ export function AssistantSelectionToolbar({
       variant="glass"
       disabled={tooLong}
       aria-label={tooLong ? "Selection is too long to cite" : "Cite selection in composer"}
-      className="fixed z-50 max-w-[calc(100vw-1rem)] rounded-full px-2.5"
+      className="fixed z-50 max-w-[calc(100vw-1rem)]"
       style={{ left: selection.position.x, top: selection.position.y }}
       onPointerDown={(event) => event.preventDefault()}
       onClick={cite}
diff --git a/apps/web/src/components/chat/ChangedFilesTree.tsx b/apps/web/src/components/chat/ChangedFilesTree.tsx
index 02155ac7c72c..e65e5c7c6fe5 100644
--- a/apps/web/src/components/chat/ChangedFilesTree.tsx
+++ b/apps/web/src/components/chat/ChangedFilesTree.tsx
@@ -54,7 +54,7 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {
     >
       <div
         data-changed-files-header=""
-        className="sticky top-2 z-10 flex items-center justify-between gap-2 rounded-t-lg bg-secondary px-3 py-2 dark:bg-[color-mix(in_srgb,var(--input)_20%,var(--background))]"
+        className="sticky top-2 z-10 flex items-center justify-between gap-2 rounded-t-lg bg-secondary px-3 py-2 dark:bg-background dark:bg-linear-to-b dark:from-input/20 dark:to-input/20"
       >
         <div className="flex min-w-0 flex-wrap items-center gap-x-3 gap-y-1 text-xs font-medium text-foreground">
           <span>
@@ -206,11 +206,11 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
             ) : (
               <FolderClosedIcon className="size-3.5 shrink-0 text-muted-foreground/75" />
             )}
-            <span className="truncate font-mono text-[11px] text-muted-foreground/90 group-hover:text-foreground/90">
+            <span className="truncate font-mono text-2xs text-muted-foreground/90 group-hover:text-foreground/90">
               {node.name}
             </span>
             {hasNonZeroStat(node.stat) && (
-              <span className="ml-auto shrink-0 font-mono text-[10px] tabular-nums">
+              <span className="ml-auto shrink-0 font-mono text-3xs tabular-nums">
                 <DiffStatLabel additions={node.stat.additions} deletions={node.stat.deletions} />
               </span>
             )}
@@ -247,12 +247,11 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
           theme={resolvedTheme}
           className="size-3.5 text-muted-foreground/70"
         />
-        <MiddleTruncate
-          value={node.name}
-          className="font-mono text-xs text-foreground/85 group-hover:text-foreground"
-        />
+        <span className="flex min-w-0 font-mono text-xs text-foreground/85 group-hover:text-foreground">
+          <MiddleTruncate value={node.name} />
+        </span>
         {node.stat && (
-          <span className="ml-auto shrink-0 font-mono text-[10px] tabular-nums">
+          <span className="ml-auto shrink-0 font-mono text-3xs tabular-nums">
             <DiffStatLabel additions={node.stat.additions} deletions={node.stat.deletions} />
           </span>
         )}
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index 7f52ca16f896..4e78a7f876ed 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -312,6 +312,7 @@ import {
 import { ComposerPromptLengthValidation } from "./ComposerPromptLengthValidation";
 import { PierreEntryIcon } from "./PierreEntryIcon";
 import { pendingDraftWork } from "./pendingDraftWork";
+import { isTimelineScrollTarget } from "./timelineScrollTarget";
 import {
   createComposerScrollGestureState,
   recordComposerScrollGestureEvent,
@@ -382,7 +383,7 @@ function SnapShotAttachmentFrame({
       className={cn(
         animateArrival &&
           !animationId &&
-          "origin-center transition-[opacity,scale] duration-300 ease-[cubic-bezier(.2,.8,.2,1)] starting:scale-95 starting:opacity-0 motion-reduce:transition-none motion-reduce:starting:scale-100 motion-reduce:starting:opacity-100",
+          "origin-center transition-[opacity,scale] duration-300 ease-drawer starting:scale-95 starting:opacity-0 motion-reduce:transition-none motion-reduce:starting:scale-100 motion-reduce:starting:opacity-100",
         className,
       )}
       {...props}
@@ -978,6 +979,7 @@ import {
   resolveProviderSlashCommandsForCwd,
 } from "@t3tools/client-runtime/providerSkills";
 import { searchProviderSkills } from "../../providerSkillSearch";
+import { useDelayedStatus } from "../../hooks/useDelayedStatus";
 import { useMediaQuery } from "../../hooks/useMediaQuery";
 import { usePanelAnimationSettings } from "../../panelAnimations";
 import type { ReviewCommentContext } from "../../reviewCommentContext";
@@ -1099,14 +1101,8 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
           render={
             <ComposerControl
               size={size}
-              className={cn(
-                "shrink-0 whitespace-nowrap",
-                props.interactionMode === "plan"
-                  ? "bg-accent text-accent-foreground hover:bg-accent/80"
-                  : size === "xs"
-                    ? undefined
-                    : "text-secondary-label hover:text-foreground",
-              )}
+              className="shrink-0 whitespace-nowrap"
+              aria-pressed={props.interactionMode === "plan"}
               type="button"
               onClick={props.onToggleInteractionMode}
               aria-label={interactionModeTooltip}
@@ -1151,7 +1147,6 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
               <ComposerSelectControl
                 data-composer-shortcut="composer.mode"
                 size={size}
-                className={size === "xs" ? undefined : "font-medium"}
                 aria-label="Runtime mode"
               />
             }
@@ -1164,7 +1159,7 @@ const ComposerFooterModeControls = memo(function ComposerFooterModeControls(prop
               const option = runtimeModeConfig[mode];
               const OptionIcon = option.icon;
               return (
-                <SelectItem key={mode} value={mode} hideIndicator className="min-w-64 py-2">
+                <SelectItem key={mode} value={mode} hideIndicator className="min-w-64">
                   <div className="flex min-w-0 items-center gap-3">
                     <div className="grid min-w-0 flex-1 gap-0.5">
                       <span className="inline-flex items-center gap-1.5 font-medium text-foreground">
@@ -1589,8 +1584,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     onFileOpen,
   } = props;
   const primaryEnvironmentId = usePrimaryEnvironmentId();
-  const activeTasksProgress = props.threadSyncPhase === null ? props.activeTasksProgress : null;
-  const activeTaskSteps = props.threadSyncPhase === null ? props.activeTaskSteps : null;
+  const composerDraftTargetKey = composerTargetKey(composerDraftTarget);
+  // Opening a running thread resyncs for a few frames. Show the sync row, and
+  // hide the tasks row for it, only when the sync lasts. Logic that depends on
+  // the real phase keeps reading `props.threadSyncPhase`.
+  const shownSyncPhase = useDelayedStatus(composerDraftTargetKey, props.threadSyncPhase);
+  const activeTasksProgress = shownSyncPhase === null ? props.activeTasksProgress : null;
+  const activeTaskSteps = shownSyncPhase === null ? props.activeTaskSteps : null;
   // ------------------------------------------------------------------
   // Store subscriptions (prompt / images / terminal contexts)
   // ------------------------------------------------------------------
@@ -1598,7 +1598,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
   // Live target key, for async flows that must notice a thread switch that
   // happened while they awaited.
   const composerDraftTargetKeyRef = useRef("");
-  composerDraftTargetKeyRef.current = composerTargetKey(composerDraftTarget);
+  composerDraftTargetKeyRef.current = composerDraftTargetKey;
   const questionAttachmentTarget =
     pendingUserInputs[0] && activePendingProgress?.activeQuestion
       ? questionAttachmentDraftId(
@@ -4899,8 +4899,12 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 
       const scrollNode = getTimelineScrollableNode();
       if (!scrollNode) return;
-      const targetsTimeline = scrollNode.contains(event.target);
-      if (!targetsTimeline && !composerScrollGestureRef.current.collapseSuppressed) return;
+      const targetsTimeline = isTimelineScrollTarget(event.target, scrollNode, event.deltaY);
+      if (
+        !scrollNode.contains(event.target) &&
+        !composerScrollGestureRef.current.collapseSuppressed
+      )
+        return;
 
       if (composerScrollCollapseTimeoutRef.current !== null) {
         window.clearTimeout(composerScrollCollapseTimeoutRef.current);
@@ -4994,10 +4998,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     .slice(restingBlockDefs.length - restingHiddenBlockCount)
     .map((def) => def.id);
   const composerControls = showProviderUnavailable ? (
-    <Button
+    <ComposerControl
       type="button"
-      size="sm"
-      variant="ghost"
       disabled={!providerSetupInstanceId}
       onClick={() => {
         if (providerSetupInstanceId) {
@@ -5005,11 +5007,11 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         }
       }}
       data-chat-provider-unavailable="true"
-      className="shrink-0 gap-2 px-2 text-secondary-label sm:px-3"
+      className="shrink-0"
     >
       <CircleAlertIcon className="size-4" />
       {providerSetupInstanceId ? "Open provider settings" : "No provider available"}
-    </Button>
+    </ComposerControl>
   ) : (
     <>
       {composerControlsInStrip && restingControlsHaveLeadingContext ? (
@@ -5160,8 +5162,8 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     activeTaskSteps !== null &&
     activeTasksProgress.totalSteps > 0;
   const activityStackContent = hasBannerItems ? (
-    props.threadSyncPhase ? (
-      <ComposerActivityRow phase={props.threadSyncPhase} />
+    shownSyncPhase ? (
+      <ComposerActivityRow phase={shownSyncPhase} />
     ) : !hasBlockingComposerTopDrawer && activeTasksProgress && activeTaskSteps ? (
       <ComposerTasksContent
         expanded={isTasksDrawerOpen}
@@ -6168,7 +6170,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
         if (isInsideRestingComposerControlScope(event.target)) return;
         composerMentionDragHandlers.onDrop(event);
       }}
-      className="mx-auto w-full min-w-0 max-w-3xl"
+      className="mx-auto w-full min-w-0 max-w-(--chat-max-width)"
       data-chat-composer-form="true"
     >
       {composerControlsInStrip && restingControlsHost
@@ -6195,14 +6197,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
             className="relative z-0"
             items={bannerStackItems}
           />
-          {!activityStackItem && (props.threadSyncPhase || inlineTasksBadge) ? (
+          {!activityStackItem && (shownSyncPhase || inlineTasksBadge) ? (
             <ComposerBanner.Attachment>
               <ComposerBanner.Root data-chat-composer-activity-strip="true">
-                {props.threadSyncPhase ? (
-                  <ComposerActivityRow phase={props.threadSyncPhase} />
-                ) : (
-                  inlineTasksBadge
-                )}
+                {shownSyncPhase ? <ComposerActivityRow phase={shownSyncPhase} /> : inlineTasksBadge}
               </ComposerBanner.Root>
             </ComposerBanner.Attachment>
           ) : null}
@@ -6374,7 +6372,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
             data-chat-composer-surface="true"
             data-chat-composer-mobile-collapsed={isComposerCollapsedMobile ? "true" : "false"}
             className={cn(
-              "rounded-[20px] transition-[background-color] duration-200",
+              "rounded-3xl transition-[background-color] duration-200",
               isDragOverComposer ? "bg-accent/45 ring-1 ring-primary/70" : null,
               projectSelectionRequired ? "opacity-75" : null,
               composerProviderState.composerSurfaceClassName,
@@ -6386,7 +6384,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                   type="button"
                   data-chat-composer-transition-prompt="true"
                   className={cn(
-                    "min-w-0 flex-1 truncate bg-transparent p-0 text-left text-[14px] focus:outline-none",
+                    "min-w-0 flex-1 truncate bg-transparent p-0 text-left text-sm focus:outline-none",
                     (activePendingProgress ? activePendingProgress.customAnswer : prompt.trim())
                       ? "text-foreground"
                       : "text-placeholder",
@@ -6410,7 +6408,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                 <button
                   type="button"
                   data-chat-composer-transition-actions="true"
-                  className="flex size-8 shrink-0 items-center justify-center rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover disabled:opacity-30"
+                  className="flex size-8 shrink-0 items-center justify-center rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover disabled:opacity-64"
                   disabled={collapsedComposerPrimaryActionDisabled}
                   aria-label={collapsedComposerPrimaryActionLabel}
                   onPointerDown={(event) => event.preventDefault()}
@@ -6486,7 +6484,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                       "mb-3 flex max-w-full gap-2",
                       pendingSnapShotIds.length > 0 ||
                         expandedComposerImages.some((image) => image.source?.kind === "snap-shot")
-                        ? "snap-x snap-proximity overflow-x-auto overscroll-x-contain pb-1 [scrollbar-color:color-mix(in_srgb,var(--contrast-foreground)_18%,transparent)_transparent] [scrollbar-width:thin] [&::-webkit-scrollbar]:h-2.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-3 [&::-webkit-scrollbar-thumb]:border-transparent [&::-webkit-scrollbar-thumb]:bg-[color-mix(in_srgb,var(--contrast-foreground)_18%,transparent)] [&::-webkit-scrollbar-thumb]:bg-clip-content [&::-webkit-scrollbar-thumb:hover]:bg-[color-mix(in_srgb,var(--contrast-foreground)_28%,transparent)] [&::-webkit-scrollbar-track]:mx-1 [&::-webkit-scrollbar-track]:bg-transparent"
+                        ? "snap-x snap-proximity overflow-x-auto overscroll-x-contain pb-1 scrollbar-thumb-foreground/18 scrollbar-track-transparent [scrollbar-width:thin] [&::-webkit-scrollbar]:h-2.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:border-3 [&::-webkit-scrollbar-thumb]:border-transparent [&::-webkit-scrollbar-thumb]:bg-foreground/18 [&::-webkit-scrollbar-thumb]:bg-clip-content [&::-webkit-scrollbar-thumb:hover]:bg-foreground/28 [&::-webkit-scrollbar-track]:mx-1 [&::-webkit-scrollbar-track]:bg-transparent"
                         : "flex-wrap",
                     )}
                   >
@@ -6541,14 +6539,14 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                                   alt={image.name}
                                   className="h-full w-full object-cover"
                                   fallback={
-                                    <span className="flex h-full items-center justify-center px-1 text-[10px] text-secondary-label">
+                                    <span className="flex h-full items-center justify-center px-1 text-3xs text-secondary-label">
                                       {image.name}
                                     </span>
                                   }
                                 />
                               </button>
                             ) : (
-                              <div className="flex h-full w-full items-center justify-center px-1 text-center text-[10px] text-secondary-label">
+                              <div className="flex h-full w-full items-center justify-center px-1 text-center text-3xs text-secondary-label">
                                 {image.name}
                               </div>
                             )}
@@ -6568,23 +6566,20 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                                     <span
                                       role="img"
                                       aria-label="Draft attachment may not persist"
-                                      className="absolute left-1 top-1 inline-flex items-center justify-center rounded bg-background/85 p-0.5 text-amber-600"
+                                      className="absolute left-1 top-1 inline-flex items-center justify-center rounded bg-background/85 p-0.5 text-warning-foreground"
                                     >
                                       <CircleAlertIcon className="size-3" />
                                     </span>
                                   }
                                 />
-                                <TooltipPopup
-                                  side="top"
-                                  className="max-w-64 whitespace-normal leading-tight"
-                                >
+                                <TooltipPopup side="top">
                                   Draft attachment could not be saved locally and may be lost on
                                   navigation.
                                 </TooltipPopup>
                               </Tooltip>
                             )}
                             {upload?.status === "uploading" && (
-                              <span className="pointer-events-none absolute inset-x-0 bottom-0 bg-background/85 px-1 text-center text-[10px] text-foreground">
+                              <span className="pointer-events-none absolute inset-x-0 bottom-0 bg-background/85 px-1 text-center text-3xs text-foreground">
                                 {formatAttachmentUploadProgress(upload.progress)}
                               </span>
                             )}
@@ -6593,9 +6588,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                                 <TooltipTrigger
                                   render={
                                     <Button
-                                      variant="ghost"
+                                      variant="overlay"
                                       size="icon-xs"
-                                      className="absolute bottom-1 left-1 bg-background/85 hover:bg-background/95"
+                                      className="absolute bottom-1 left-1"
                                       onClick={() =>
                                         retryAttachmentUpload({
                                           environmentId,
@@ -6609,27 +6604,26 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                                 >
                                   <RefreshIcon />
                                 </TooltipTrigger>
-                                <TooltipPopup
-                                  side="top"
-                                  className="max-w-64 whitespace-normal leading-tight"
-                                >
-                                  {upload.reason}
-                                </TooltipPopup>
+                                <TooltipPopup side="top">{upload.reason}</TooltipPopup>
                               </Tooltip>
                             )}
-                            <Button
-                              variant="ghost"
-                              size="icon-xs"
+                            {/* Snap-shot frames reveal their remove button on hover or focus. */}
+                            <span
                               className={cn(
-                                "absolute right-1 top-1 bg-background/80 hover:bg-background/90",
+                                "absolute right-1 top-1 flex",
                                 image.source?.kind === "snap-shot" &&
-                                  "opacity-0 transition-opacity pointer-coarse:opacity-100 focus-visible:opacity-100 group-hover/attachment:opacity-100 group-focus-within/attachment:opacity-100",
+                                  "opacity-0 transition-opacity pointer-coarse:opacity-100 group-hover/attachment:opacity-100 group-focus-within/attachment:opacity-100",
                               )}
-                              onClick={() => removeComposerImage(image.id)}
-                              aria-label={`Remove ${image.name}`}
                             >
-                              <XIcon />
-                            </Button>
+                              <Button
+                                variant="media-close"
+                                size="icon-xs"
+                                onClick={() => removeComposerImage(image.id)}
+                                aria-label={`Remove ${image.name}`}
+                              >
+                                <XIcon />
+                              </Button>
+                            </span>
                           </SnapShotAttachmentFrame>
                         );
                       })
@@ -6684,7 +6678,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                             <PlayIcon className="relative z-10 size-4 fill-current drop-shadow-md" />
                           </button>
                           {upload?.status === "uploading" && (
-                            <span className="pointer-events-none absolute inset-x-0 bottom-0 bg-background/85 px-1 text-center text-[10px] text-foreground">
+                            <span className="pointer-events-none absolute inset-x-0 bottom-0 bg-background/85 px-1 text-center text-3xs text-foreground">
                               {formatAttachmentUploadProgress(upload.progress)}
                             </span>
                           )}
@@ -6693,9 +6687,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                               <TooltipTrigger
                                 render={
                                   <Button
-                                    variant="ghost"
+                                    variant="overlay"
                                     size="icon-xs"
-                                    className="absolute bottom-1 left-1 bg-background/85 hover:bg-background/95"
+                                    className="absolute bottom-1 left-1"
                                     onClick={() =>
                                       retryAttachmentUpload({
                                         environmentId,
@@ -6709,18 +6703,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                               >
                                 <RefreshIcon />
                               </TooltipTrigger>
-                              <TooltipPopup
-                                side="top"
-                                className="max-w-64 whitespace-normal leading-tight"
-                              >
-                                {upload.reason}
-                              </TooltipPopup>
+                              <TooltipPopup side="top">{upload.reason}</TooltipPopup>
                             </Tooltip>
                           )}
                           <Button
-                            variant="ghost"
+                            variant="media-close"
                             size="icon-xs"
-                            className="absolute right-1 top-1 bg-background/80 hover:bg-background/90"
+                            className="absolute right-1 top-1"
                             onClick={() => removeComposerFileFromDraft(file.id)}
                             aria-label={`Remove ${file.name}`}
                           >
@@ -6792,12 +6781,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                               >
                                 <RefreshIcon />
                               </TooltipTrigger>
-                              <TooltipPopup
-                                side="top"
-                                className="max-w-64 whitespace-normal leading-tight"
-                              >
-                                {upload.reason}
-                              </TooltipPopup>
+                              <TooltipPopup side="top">{upload.reason}</TooltipPopup>
                             </Tooltip>
                           ) : null}
                           <Button
@@ -6882,10 +6866,10 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                     skills={selectedProviderSkills}
                     containerClassName={cn(isComposerResting && "min-w-0 flex-1")}
                     className={cn(
-                      showMobilePendingAnswerActions && "max-sm:pb-11",
+                      showMobilePendingAnswerActions && "max-sm:pb-12",
                       isComposerResting &&
-                        "max-h-8 min-h-8 overflow-hidden whitespace-pre! leading-8",
-                      isComposerApprovalState && "min-h-8",
+                        "my-0 max-h-8 min-h-8 overflow-hidden py-0 whitespace-pre! leading-8",
+                      isComposerApprovalState && "min-h-10",
                     )}
                     placeholderClassName={cn(
                       isComposerResting &&
diff --git a/apps/web/src/components/chat/ChatGptSharingControl.tsx b/apps/web/src/components/chat/ChatGptSharingControl.tsx
new file mode 100644
index 000000000000..905e74ce1cc3
--- /dev/null
+++ b/apps/web/src/components/chat/ChatGptSharingControl.tsx
@@ -0,0 +1,17 @@
+import { usesChatGptSharing } from "@t3tools/shared/usageLimits";
+import type { ServerProvider } from "@t3tools/contracts";
+import { OpenAI } from "../Icons";
+import { ChatGptUsageButton } from "../settings/ChatGptUsageButton";
+
+export function ChatGptSharingControl({ provider }: { provider: ServerProvider | null }) {
+  if (!usesChatGptSharing(provider)) return null;
+  return (
+    <div className="flex items-center justify-between gap-4 border-t px-3 py-2">
+      <span className="flex items-center gap-2 text-xs text-muted-foreground">
+        <OpenAI className="size-3.5" aria-hidden="true" />
+        Using ChatGPT plan
+      </span>
+      <ChatGptUsageButton size="xs" />
+    </div>
+  );
+}
diff --git a/apps/web/src/components/chat/ChatHeader.tsx b/apps/web/src/components/chat/ChatHeader.tsx
index e79461a9157e..6be819fed773 100644
--- a/apps/web/src/components/chat/ChatHeader.tsx
+++ b/apps/web/src/components/chat/ChatHeader.tsx
@@ -495,8 +495,8 @@ export const ChatHeader = memo(function ChatHeader({
           "flex shrink-0 items-center justify-end gap-2 @3xl/header-actions:gap-3",
           // Reserve two panel toggles plus their 4px gaps and 1px edge inset.
           // The page header adds 8px more right padding at sm.
-          rightPanelOpen ? "pr-0" : "pr-[calc(--spacing(18)+1px)] sm:pr-[calc(--spacing(14)+1px)]",
-          "[[data-panel-animations=true]_&]:motion-safe:transition-[padding-right] [[data-panel-animations=true]_&]:motion-safe:[transition-duration:var(--panel-animation-duration)] [[data-panel-animations=true]_&]:motion-safe:ease-out",
+          rightPanelOpen ? "pr-0" : "pr-18.25 sm:pr-14.25",
+          "[[data-panel-animations=true]_&]:motion-safe:transition-[padding-right] [[data-panel-animations=true]_&]:motion-safe:duration-(--panel-animation-duration) [[data-panel-animations=true]_&]:motion-safe:ease-out",
         )}
       >
         <ChatPaneControl />
@@ -518,7 +518,6 @@ export const ChatHeader = memo(function ChatHeader({
             keepMounted
             aria-label="Header actions"
             align="end"
-            className="min-w-56 max-w-[calc(100vw-2rem)]"
             finalFocus={actionsCollapsed ? undefined : false}
           >
             <div ref={mountMenuActions} className="contents" />
diff --git a/apps/web/src/components/chat/CompactComposerControlsMenu.tsx b/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
index 1969e2e9de36..80be669a84a8 100644
--- a/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
+++ b/apps/web/src/components/chat/CompactComposerControlsMenu.tsx
@@ -38,8 +38,7 @@ export const CompactComposerControlsMenu = memo(function CompactComposerControls
         render={
           <ComposerControl
             size={size}
-            variant="ghost"
-            className={size === "xs" ? "shrink-0" : "shrink-0 px-2"}
+            className="shrink-0"
             aria-label="More composer controls"
             data-composer-shortcut={
               props.traitsMenuContent ? "composer.mode composer.effort" : "composer.mode"
diff --git a/apps/web/src/components/chat/ComposerBanner.tsx b/apps/web/src/components/chat/ComposerBanner.tsx
index cd1d4bd6be42..78753c36097b 100644
--- a/apps/web/src/components/chat/ComposerBanner.tsx
+++ b/apps/web/src/components/chat/ComposerBanner.tsx
@@ -4,7 +4,7 @@ import { ChevronDownIcon, XIcon } from "lucide-react";
 import type { ComponentProps } from "react";
 
 import { cn } from "~/lib/utils";
-import { Button, buttonVariants } from "../ui/button";
+import { Button } from "../ui/button";
 import { ScrollArea } from "../ui/scroll-area";
 
 export type ComposerBannerVariant = "default" | "error" | "info" | "success" | "warning";
@@ -51,17 +51,17 @@ function Surface({
         surfaceColors,
         "relative isolate border-0 bg-transparent shadow-none [--chat-composer-attached-tint:transparent]",
         variantColors[variant],
+        // The mask cut-off (1rem) bleeds one pixel past the seam (1rem + 1px): Chromium
+        // drops the last device-pixel row of a filtered backdrop when the cut-off lands
+        // off the device-pixel grid, and the composer's surface starts exactly there.
+        // The composer's own glass covers the extra row, so the overlap never shows.
         placement === "attached"
-          ? "[--chat-composer-attachment-overlap:calc(1rem+1px)] before:rounded-t-[16px]"
-          : "[--chat-composer-attachment-overlap:0px] before:rounded-[1rem]",
+          ? "[--chat-composer-attachment-overlap:calc(1rem+1px)] before:rounded-t-2xl before:mask-t-from-transparent before:mask-t-from-4 before:mask-t-to-black before:mask-t-to-4"
+          : "[--chat-composer-attachment-overlap:0px] before:rounded-2xl",
         "before:pointer-events-none before:absolute before:inset-0 before:-z-1 before:border before:border-(--chat-composer-attached-outline)",
-        "before:bg-[color-mix(in_srgb,var(--chat-composer-attached-surface)_var(--glass-opacity),transparent)] before:bg-[linear-gradient(var(--chat-composer-attached-tint),var(--chat-composer-attached-tint))] before:backdrop-blur-(--glass-blur) before:backdrop-saturate-(--glass-saturation)",
-        // The mask cut-off bleeds one pixel past the seam: Chromium drops the last
-        // device-pixel row of a filtered backdrop when the cut-off lands off the
-        // device-pixel grid, and the composer's surface starts exactly there. The
-        // composer's own glass covers the extra row, so the overlap never shows.
-        "before:mask-[linear-gradient(to_top,transparent_0_calc(var(--chat-composer-attachment-overlap)-1px),black_calc(var(--chat-composer-attachment-overlap)-1px))] before:shadow-[0_12px_28px_-18px_rgb(0_0_0/40%)] dark:before:shadow-[0_14px_32px_-18px_rgb(0_0_0/75%)]",
-        "dark:supports-[(backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px))]:before:bg-[linear-gradient(var(--chat-composer-attached-tint),var(--chat-composer-attached-tint)),linear-gradient(to_top,transparent_0_var(--chat-composer-attachment-overlap),rgb(0_0_0/18%)_var(--chat-composer-attachment-overlap),transparent_calc(var(--chat-composer-attachment-overlap)+10px))]",
+        "before:bg-(--chat-composer-attached-surface)/(--glass-opacity) before:bg-linear-to-b before:from-(--chat-composer-attached-tint) before:to-(--chat-composer-attached-tint) before:backdrop-blur-(--glass-blur) before:backdrop-saturate-(--glass-saturation)",
+        "before:shadow-composer dark:before:shadow-composer-dark",
+        "dark:supports-[(backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px))]:before:bg-composer-seam-above",
         "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:before:bg-(--chat-composer-attached-surface)",
         className,
       )}
@@ -91,8 +91,8 @@ function Peek({
       className={cn(
         surfaceColors,
         neutralOutline,
-        "absolute inset-x-0 bottom-0 z-0 mx-auto h-3 w-[96%] cursor-pointer rounded-t-2xl border border-b-0 shadow-[0_6px_18px_rgb(0_0_0/6%)]",
-        "bg-[color-mix(in_srgb,var(--chat-composer-attached-surface)_var(--glass-opacity),transparent)] backdrop-blur-(--glass-blur) backdrop-saturate-(--glass-saturation)",
+        "absolute inset-x-0 bottom-0 z-0 mx-auto h-3 w-[96%] cursor-pointer rounded-t-2xl border border-b-0 shadow-md",
+        "bg-(--chat-composer-attached-surface)/(--glass-opacity) backdrop-blur-(--glass-blur) backdrop-saturate-(--glass-saturation)",
         "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:bg-(--chat-composer-attached-surface)",
         "transition-opacity duration-150 ease-out focus-visible:outline-2 focus-visible:outline-ring",
         peekBorder[variant],
@@ -161,7 +161,7 @@ function Root({
   return (
     <Surface
       className={cn(
-        "min-w-0 px-1 pt-(--composer-banner-padding-block) pb-[calc(var(--chat-composer-attachment-overlap)+var(--composer-banner-padding-block))] text-xs/4 [--composer-banner-icon-column:--spacing(7)] [--composer-banner-padding-block:--spacing(1)] sm:[--composer-banner-icon-column:--spacing(6)]",
+        "min-w-0 px-1 py-(--composer-banner-padding-block) after:block after:h-(--chat-composer-attachment-overlap) text-xs/4 [--composer-banner-icon-column:--spacing(7)] [--composer-banner-padding-block:--spacing(1)] sm:[--composer-banner-icon-column:--spacing(6)]",
         density === "comfortable" && "[--composer-banner-padding-block:--spacing(1.25)]",
         density === "spacious" && "px-3 [--composer-banner-padding-block:--spacing(3)]",
         width === "content" ? "w-fit max-w-full flex-none" : "@container",
@@ -189,7 +189,7 @@ function Row({
     className: cn(
       "group/banner-row grid min-h-(--composer-banner-icon-column) w-full min-w-0 grid-cols-[var(--composer-banner-icon-column)_minmax(0,1fr)_auto] items-center gap-x-1 text-start",
       "not-has-[>[data-slot=composer-banner-actions]]:grid-cols-[var(--composer-banner-icon-column)_minmax(0,1fr)]",
-      "[&:is(button)]:cursor-pointer [&:is(button)]:rounded-[0.5rem] [&:is(button)]:focus-visible:outline-2 [&:is(button)]:focus-visible:-outline-offset-2 [&:is(button)]:focus-visible:outline-ring",
+      "[&:is(button)]:cursor-pointer [&:is(button)]:rounded-md [&:is(button)]:focus-visible:outline-2 [&:is(button)]:focus-visible:-outline-offset-2 [&:is(button)]:focus-visible:outline-ring",
       layout === "wrap-actions" &&
         "@max-[400px]:*:data-[slot=composer-banner-content]:min-h-(--composer-banner-icon-column)",
       layout === "wrap-actions-narrow" &&
@@ -279,16 +279,17 @@ function Children({ className, render, ...props }: useRender.ComponentProps<"div
 }
 
 /** Bounded banner content uses the app's scroll area and fades only overflowing edges. */
-function Scroll({ className, ...props }: ComponentProps<typeof ScrollArea>) {
+function Scroll({ className, children, ...props }: ComponentProps<typeof ScrollArea>) {
   return (
     <ScrollArea
+      radius="none"
       scrollFade
-      className={cn(
-        "h-auto max-h-[min(24rem,40dvh)] rounded-none [&>[data-slot=scroll-area-viewport][data-has-overflow-y]]:pe-2",
-        className,
-      )}
+      className={cn("h-auto max-h-[min(24rem,40dvh)]", className)}
       {...props}
-    />
+    >
+      {/* Clears the overlay scrollbar only once there is something to scroll. */}
+      <div className="[[data-has-overflow-y]>&]:pe-2">{children}</div>
+    </ScrollArea>
   );
 }
 
@@ -305,15 +306,7 @@ function Count({ className, ...props }: ComponentProps<"span">) {
 }
 
 function Body({ className, ...props }: ComponentProps<"div">) {
-  return (
-    <div
-      className={cn(
-        "min-w-0 ps-[calc(var(--composer-banner-icon-column)+(--spacing(1)))]",
-        className,
-      )}
-      {...props}
-    />
-  );
+  return <div className={cn("min-w-0 ps-8 sm:ps-7", className)} {...props} />;
 }
 
 function Dot({ className, ...props }: ComponentProps<"span">) {
@@ -322,18 +315,18 @@ function Dot({ className, ...props }: ComponentProps<"span">) {
   );
 }
 
-function ToggleIcon({ expanded, className }: { expanded: boolean; className?: string }) {
+// Decorative: the row itself is the control, so this only matches Dismiss's box.
+function ToggleIcon({ expanded }: { expanded: boolean }) {
   return (
-    <span
-      aria-hidden
-      className={cn(
-        buttonVariants({ size: "icon-xs", variant: "ghost" }),
-        "pointer-events-none",
-        className,
-      )}
+    <Button
+      render={<span aria-hidden />}
+      size="icon-xs"
+      variant="ghost"
+      tabIndex={-1}
+      className="pointer-events-none"
     >
       <ChevronDownIcon className={cn("size-3.5", !expanded && "rotate-180")} />
-    </span>
+    </Button>
   );
 }
 
diff --git a/apps/web/src/components/chat/ComposerBannerStack.tsx b/apps/web/src/components/chat/ComposerBannerStack.tsx
index ec4b44259321..77db010cf696 100644
--- a/apps/web/src/components/chat/ComposerBannerStack.tsx
+++ b/apps/web/src/components/chat/ComposerBannerStack.tsx
@@ -123,7 +123,7 @@ export function ComposerBannerStack({ className, items }: ComposerBannerStackPro
         <div
           key={frontItem.id}
           className={cn(
-            "relative z-10 transition-[translate,opacity] duration-220 ease-in",
+            "relative z-10 transition-[opacity,translate] duration-220 ease-in",
             exitingItemId === frontItem.id
               ? "pointer-events-none translate-y-16 opacity-0"
               : "opacity-100",
@@ -218,7 +218,7 @@ export function ComposerBannerStack({ className, items }: ComposerBannerStackPro
                     <div
                       key={item.id}
                       className={cn(
-                        "transition-[translate,opacity] duration-220 ease-in",
+                        "transition-[opacity,translate] duration-220 ease-in",
                         exitingItemId === item.id
                           ? "pointer-events-none translate-y-28 opacity-0"
                           : "opacity-100",
@@ -306,7 +306,7 @@ function NoticeDescription({ children, compact }: { children: ReactNode; compact
             aria-label="Notice details"
             tooltipStyle
             side="top"
-            className="max-w-80 whitespace-normal text-pretty wrap-anywhere"
+            className="max-w-80 whitespace-normal wrap-anywhere"
           >
             <ComposerBanner.Scroll className="max-h-[min(var(--available-height),24rem,40dvh)]">
               {children}
diff --git a/apps/web/src/components/chat/ComposerCommandMenu.tsx b/apps/web/src/components/chat/ComposerCommandMenu.tsx
index 9cdfc37a329f..739a09fecf13 100644
--- a/apps/web/src/components/chat/ComposerCommandMenu.tsx
+++ b/apps/web/src/components/chat/ComposerCommandMenu.tsx
@@ -161,10 +161,7 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
     <CommandItem
       value={props.item.id}
       data-composer-item-id={props.item.id}
-      className={cn(
-        "cursor-pointer select-none gap-3 rounded-lg px-3 py-2! hover:bg-transparent hover:text-inherit data-highlighted:bg-transparent data-highlighted:text-inherit",
-        props.isActive && "bg-accent! text-accent-foreground!",
-      )}
+      active={props.isActive}
       onMouseMove={() => {
         if (!props.isActive) props.onHighlight(props.item.id);
       }}
@@ -200,7 +197,7 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
             props.item.label
           )}
         </span>
-        <span className="min-w-0 max-w-[48ch] flex-1 truncate text-left text-secondary-label text-xs">
+        <span className="min-w-0 flex-1 truncate text-left text-secondary-label text-xs">
           {props.item.description}
         </span>
         {skillSourceKind ? (
diff --git a/apps/web/src/components/chat/ComposerControl.tsx b/apps/web/src/components/chat/ComposerControl.tsx
index 7b233a68ba8d..e079106d5ee3 100644
--- a/apps/web/src/components/chat/ComposerControl.tsx
+++ b/apps/web/src/components/chat/ComposerControl.tsx
@@ -1,45 +1,49 @@
+import { mergeProps } from "@base-ui/react/merge-props";
+import { Select as SelectPrimitive } from "@base-ui/react/select";
+import { useRender } from "@base-ui/react/use-render";
 import type { ComponentProps } from "react";
 import { ChevronDownIcon, type LucideIcon } from "lucide-react";
 
 import { cn } from "~/lib/utils";
-import { Button } from "../ui/button";
-import { SelectTrigger } from "../ui/select";
 import { Separator } from "../ui/separator";
 
 export type ComposerControlSize = "sm" | "xs";
 
-type ComposerControlProps = Omit<ComponentProps<typeof Button>, "size"> & {
-  size?: ComposerControlSize;
-};
+/**
+ * The composer toolbar's control look. `sm` is the expanded toolbar; `xs` is the dimmer resting
+ * strip. `aria-pressed` marks a toggle that is on (plan mode). This is an app control, not a
+ * restyled Button, so it owns its classes.
+ */
+function composerControlClassName(size: ComposerControlSize, className?: string) {
+  return cn(
+    "relative inline-flex shrink-0 cursor-pointer items-center justify-center whitespace-nowrap rounded-(--control-radius) border border-transparent text-base outline-none hover:bg-accent data-pressed:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 data-disabled:pointer-events-none data-disabled:opacity-64 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 [&:active:not([aria-haspopup])]:scale-[0.97] [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg]:-mx-0.5 [&_svg[data-composer-control-icon]]:mx-0",
+    size === "xs"
+      ? "h-7 gap-1 px-1.75 font-normal text-muted-foreground/70 text-sm hover:text-foreground/80 sm:h-6 sm:text-xs [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5 [&_svg[data-composer-control-chevron]]:ms-0 [&_svg[data-composer-control-chevron]]:-me-1"
+      : "h-7 gap-1.5 px-2.5 font-medium text-secondary-label [&_svg:not([class*='text-'])]:text-muted-foreground hover:text-foreground sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4",
+    "aria-pressed:bg-accent aria-pressed:text-accent-foreground aria-pressed:hover:bg-accent/80",
+    className,
+  );
+}
 
-type ComposerSelectControlProps = Omit<ComponentProps<typeof SelectTrigger>, "size"> & {
+type ComposerControlProps = useRender.ComponentProps<"button"> & {
   size?: ComposerControlSize;
 };
 
-const composerControlClassName =
-  "rounded-[var(--control-radius)] text-secondary-label transition-none hover:text-foreground [&_svg[data-composer-control-chevron]]:-mx-0.5 [&_svg[data-composer-control-icon]]:mx-0";
-const expandedComposerControlClassName = "h-7 min-h-7 gap-1.5 px-2.5";
-const restingComposerControlClassName =
-  "[--control-icon-color:currentColor] font-normal text-muted-foreground/70 hover:text-foreground/80 [&_svg[data-composer-control-chevron]]:-me-1 [&_svg[data-composer-control-chevron]]:ms-0";
-
 export function ComposerControl({
   className,
   size = "sm",
-  variant = "ghost",
+  render,
   ...props
 }: ComposerControlProps) {
-  return (
-    <Button
-      className={cn(
-        composerControlClassName,
-        size === "xs" ? restingComposerControlClassName : expandedComposerControlClassName,
-        className,
-      )}
-      size={size}
-      variant={variant}
-      {...props}
-    />
-  );
+  const defaultProps = {
+    className: composerControlClassName(size, className),
+    type: render ? undefined : ("button" as const),
+  };
+  return useRender({
+    defaultTagName: "button",
+    props: mergeProps<"button">(defaultProps, props),
+    render,
+  });
 }
 
 export function ComposerControlIcon({
@@ -105,21 +109,19 @@ export function ComposerControlSeparator({
 
 export function ComposerSelectControl({
   className,
+  children,
   size = "sm",
-  variant = "ghost",
   ...props
-}: ComposerSelectControlProps) {
+}: Omit<SelectPrimitive.Trigger.Props, "className"> & {
+  className?: string | undefined;
+  size?: ComposerControlSize;
+}) {
   return (
-    <SelectTrigger
-      className={cn(
-        composerControlClassName,
-        size === "xs" ? restingComposerControlClassName : expandedComposerControlClassName,
-        className,
-      )}
-      icon={<ComposerControlChevron size={size} />}
-      size={size}
-      variant={variant}
-      {...props}
-    />
+    <SelectPrimitive.Trigger className={composerControlClassName(size, className)} {...props}>
+      {children}
+      <SelectPrimitive.Icon>
+        <ComposerControlChevron size={size} />
+      </SelectPrimitive.Icon>
+    </SelectPrimitive.Trigger>
   );
 }
diff --git a/apps/web/src/components/chat/ComposerPendingApprovalActions.tsx b/apps/web/src/components/chat/ComposerPendingApprovalActions.tsx
index 743d846dc5e2..385e6aaf42b0 100644
--- a/apps/web/src/components/chat/ComposerPendingApprovalActions.tsx
+++ b/apps/web/src/components/chat/ComposerPendingApprovalActions.tsx
@@ -59,9 +59,7 @@ export const ComposerPendingApprovalActions = memo(function ComposerPendingAppro
         return option.warning ? (
           <Tooltip key={option.decision}>
             <TooltipTrigger render={button} />
-            <TooltipPopup side="top" className="max-w-72 text-xs leading-snug">
-              {option.warning}
-            </TooltipPopup>
+            <TooltipPopup side="top">{option.warning}</TooltipPopup>
           </Tooltip>
         ) : (
           button
@@ -75,12 +73,7 @@ export const ComposerPendingApprovalActions = memo(function ComposerPendingAppro
           >
             <EllipsisIcon />
           </MenuTrigger>
-          <MenuPopup
-            {...composerFloatingLayerProps}
-            side="top"
-            align="end"
-            className="w-56 max-w-[calc(100vw-2rem)]"
-          >
+          <MenuPopup {...composerFloatingLayerProps} side="top" align="end">
             {moreOptions.map((option) => {
               const item = (
                 <MenuItem
@@ -98,9 +91,7 @@ export const ComposerPendingApprovalActions = memo(function ComposerPendingAppro
               return option.warning ? (
                 <Tooltip key={option.decision}>
                   <TooltipTrigger render={item} />
-                  <TooltipPopup side="top" className="max-w-64 text-xs leading-snug">
-                    {option.warning}
-                  </TooltipPopup>
+                  <TooltipPopup side="top">{option.warning}</TooltipPopup>
                 </Tooltip>
               ) : (
                 item
diff --git a/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx b/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
index 5f181e71783d..2cebb98b4664 100644
--- a/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
@@ -41,7 +41,7 @@ export const ComposerPendingApprovalPanel = memo(function ComposerPendingApprova
       className={cn("flex min-w-0 flex-1 flex-col items-start gap-1", className)}
       role="group"
     >
-      <span className="flex w-full min-w-0 items-center gap-2 text-[11px] text-muted-foreground">
+      <span className="flex w-full min-w-0 items-center gap-2 text-2xs text-muted-foreground">
         <span className="shrink-0 font-medium text-warning">{fallbackLabel}</span>
         {approval.appName ? <span className="min-w-0 truncate">{approval.appName}</span> : null}
         {pendingCount > 1 ? (
diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
index 7462068afefb..a2052c0c73fd 100644
--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
@@ -198,7 +198,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
         </ComposerBanner.Content>
         <ComposerBanner.Actions>
           {prompt.questions.length > 1 ? (
-            <span className="text-[10px] font-medium text-muted-foreground tabular-nums">
+            <span className="text-3xs font-medium text-muted-foreground tabular-nums">
               {questionIndex + 1}/{prompt.questions.length}
             </span>
           ) : null}
@@ -257,9 +257,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
                     <div className="min-w-0 flex-1 flex flex-col gap-0.5">
                       <span className="text-sm font-medium">{option.label}</span>
                       {option.description && option.description !== option.label ? (
-                        <span className="text-secondary-label text-[11px]">
-                          {option.description}
-                        </span>
+                        <span className="text-secondary-label text-2xs">{option.description}</span>
                       ) : null}
                     </div>
                     {isSelected ? (
@@ -267,7 +265,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
                     ) : shortcutKey !== null ? (
                       <kbd
                         className={cn(
-                          "flex size-5 shrink-0 items-center justify-center text-[10px] font-medium text-muted-foreground tabular-nums",
+                          "flex size-5 shrink-0 items-center justify-center text-3xs font-medium text-muted-foreground tabular-nums",
                         )}
                       >
                         {shortcutKey}
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
index a6e33b4d464d..ab78c53c0f12 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -58,6 +58,11 @@ const formatPendingPrimaryActionLabel = (input: {
   return input.questionIndex > 0 ? "Submit answers" : "Submit answer";
 };
 
+// The composer's labeled primary actions (Submit, Refine, Implement) share the send button's
+// message-action pill, so they are composer-owned buttons rather than restyled Buttons.
+const messageActionPillClassName =
+  "inline-flex shrink-0 cursor-pointer items-center justify-center gap-1.5 whitespace-nowrap rounded-full bg-message-action font-medium text-base text-message-action-foreground shadow-xs shadow-message-action/24 outline-none hover:bg-message-action-hover focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 disabled:shadow-none sm:text-sm";
+
 const preventPointerFocus: PointerEventHandler<HTMLElement> = (event) => {
   event.preventDefault();
 };
@@ -117,7 +122,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
     <button
       type="button"
       className={cn(
-        "relative flex cursor-pointer items-center justify-center rounded-full bg-destructive/90 text-white shadow-xs shadow-destructive/24 inset-shadow-[0_1px_--theme(--color-white/16%)] transition-all duration-150 hover:bg-destructive hover:scale-105 active:inset-shadow-[0_1px_--theme(--color-black/8%)] active:shadow-none",
+        "relative flex cursor-pointer items-center justify-center rounded-full bg-destructive/90 text-white shadow-xs shadow-destructive/24 inset-shadow-2xs inset-shadow-white/16 transition-all duration-150 hover:bg-destructive hover:scale-105 active:inset-shadow-black/8 active:shadow-none",
         // Inside the fixed slot the button fills it, so send and stop are
         // the same box and neither moves at a turn boundary. The pending
         // row is its own layout and keeps its own smaller size.
@@ -142,7 +147,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
             <Button
               size="icon-sm"
               variant="outline"
-              className="rounded-full"
               {...pointerFocusProps}
               onClick={onPreviousPendingQuestion}
               disabled={pendingAction.isResponding}
@@ -154,7 +158,6 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
             <Button
               size="sm"
               variant="outline"
-              className="rounded-full"
               {...pointerFocusProps}
               onClick={onPreviousPendingQuestion}
               disabled={pendingAction.isResponding}
@@ -163,13 +166,9 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
             </Button>
           )
         ) : null}
-        <Button
+        <button
           type="submit"
-          size="sm"
-          className={cn(
-            "rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover",
-            compact ? "px-3" : "px-4",
-          )}
+          className={cn(messageActionPillClassName, "h-8 sm:h-7", compact ? "px-3" : "px-4")}
           {...pointerFocusProps}
           disabled={
             isEnvironmentUnavailable ||
@@ -183,7 +182,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
             isResponding: pendingAction.isResponding,
             questionIndex: pendingAction.questionIndex,
           })}
-        </Button>
+        </button>
       </div>
     );
   }
@@ -191,39 +190,36 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
   if (showPlanFollowUpPrompt) {
     if (promptHasText) {
       return (
-        <Button
+        <button
           type="submit"
-          size="sm"
-          className={cn(
-            "rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover",
-            compact ? "h-9 px-3 sm:h-8" : "h-9 px-4 sm:h-8",
-          )}
+          className={cn(messageActionPillClassName, "h-9 sm:h-8", compact ? "px-3" : "px-4")}
           {...pointerFocusProps}
           disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}
         >
           {isConnecting || isSendBusy ? "Sending..." : "Refine"}
-        </Button>
+        </button>
       );
     }
 
     return (
       <div data-chat-composer-implement-actions="true" className="flex items-center justify-end">
-        <Button
+        <button
           type="submit"
-          size="sm"
-          className="h-9 rounded-l-full rounded-r-none bg-message-action px-4 text-message-action-foreground hover:bg-message-action-hover sm:h-8"
+          className={cn(messageActionPillClassName, "h-9 rounded-r-none px-4 sm:h-8")}
           {...pointerFocusProps}
           disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}
         >
           {isConnecting || isSendBusy ? "Sending..." : "Implement"}
-        </Button>
+        </button>
         <Menu>
           <MenuTrigger
             render={
-              <Button
-                size="sm"
-                variant="default"
-                className="h-9 rounded-l-none rounded-r-full border-l-message-action-foreground/20 bg-message-action px-2 text-message-action-foreground hover:bg-message-action-hover sm:h-8"
+              <button
+                type="button"
+                className={cn(
+                  messageActionPillClassName,
+                  "h-9 rounded-l-none border-l border-message-action-foreground/20 px-2 sm:h-8",
+                )}
                 aria-label="Implementation actions"
                 {...pointerFocusProps}
                 disabled={isSendBusy || isSendDisabled || isConnecting || isEnvironmentUnavailable}
@@ -249,7 +245,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
     <button
       type="submit"
       className={cn(
-        "relative isolate flex h-9 w-9 items-center justify-center overflow-hidden rounded-full shadow-xs transition-all duration-150 enabled:cursor-pointer enabled:inset-shadow-[0_1px_--theme(--color-white/16%)] hover:scale-105 active:inset-shadow-[0_1px_--theme(--color-black/8%)] active:shadow-none disabled:pointer-events-none disabled:opacity-30 disabled:shadow-none disabled:hover:scale-100 sm:h-8 sm:w-8",
+        "relative isolate flex h-9 w-9 items-center justify-center overflow-hidden rounded-full shadow-xs transition-all duration-150 enabled:cursor-pointer enabled:inset-shadow-2xs enabled:inset-shadow-white/16 hover:scale-105 active:inset-shadow-black/8 active:shadow-none disabled:pointer-events-none disabled:opacity-64 disabled:shadow-none disabled:hover:scale-100 sm:h-8 sm:w-8",
         stageBackdropVariant
           ? "bg-transparent text-white enabled:shadow-black/24 enabled:hover:brightness-110"
           : "bg-message-action text-message-action-foreground enabled:shadow-message-action/24 hover:bg-message-action-hover",
diff --git a/apps/web/src/components/chat/ComposerServerUpdateStatus.tsx b/apps/web/src/components/chat/ComposerServerUpdateStatus.tsx
index 7431932ce9a9..f871a5aab19e 100644
--- a/apps/web/src/components/chat/ComposerServerUpdateStatus.tsx
+++ b/apps/web/src/components/chat/ComposerServerUpdateStatus.tsx
@@ -56,7 +56,7 @@ export function ComposerServerUpdateStatus({
             </button>
           }
         />
-        <TooltipPopup side="top" className="max-w-80">
+        <TooltipPopup side="top">
           {title}: {detail}
         </TooltipPopup>
       </Tooltip>
diff --git a/apps/web/src/components/chat/ComposerStashBadge.tsx b/apps/web/src/components/chat/ComposerStashBadge.tsx
index 9a70094669fa..378289728e4f 100644
--- a/apps/web/src/components/chat/ComposerStashBadge.tsx
+++ b/apps/web/src/components/chat/ComposerStashBadge.tsx
@@ -25,7 +25,7 @@ export const ComposerStashBadge = memo(function ComposerStashBadge(props: {
       key={props.pulseKey}
       className={cn(
         props.pulsing
-          ? "animate-[prompt-stash-count-enter_180ms_ease-out_both] text-primary motion-reduce:animate-none"
+          ? "text-primary transition-[opacity,translate] duration-180 ease-out starting:translate-y-0.5 starting:opacity-0 motion-reduce:transition-none"
           : "text-muted-foreground",
       )}
     >
diff --git a/apps/web/src/components/chat/ComposerSurface.tsx b/apps/web/src/components/chat/ComposerSurface.tsx
index b7c134c29925..83e94895eddc 100644
--- a/apps/web/src/components/chat/ComposerSurface.tsx
+++ b/apps/web/src/components/chat/ComposerSurface.tsx
@@ -13,13 +13,13 @@ function Shell({
       data-slot="composer-shell"
       data-with-context={contextStrip || undefined}
       className={cn(
-        "@container/composer-surface group/composer-surface relative isolate mx-auto w-full max-w-3xl",
+        "@container/composer-surface group/composer-surface relative isolate mx-auto w-full max-w-(--chat-max-width)",
         "[--chat-composer-drawer-inset:1.375rem] [--chat-composer-glass-surface:var(--card)] [--chat-composer-outline:rgb(0_0_0/8%)]",
         "dark:[--chat-composer-glass-surface:var(--surface-raised)] dark:[--chat-composer-highlight:rgb(255_255_255/3%)] dark:[--chat-composer-outline:color-mix(in_srgb,var(--color-white)_5%,transparent)]",
         "[html[data-theme-id]_&]:[--chat-composer-glass-surface:var(--app-theme-surface-raised)] [html[data-theme-id]_&]:[--chat-composer-outline:var(--app-theme-toolbar-border)]",
         "dark:[html[data-theme-id]:not([data-theme-id=t3-chat])_&]:[--chat-composer-highlight:color-mix(in_srgb,var(--app-theme-input)_12%,transparent)] dark:[html[data-theme-id]:not([data-theme-id=t3-chat])_&]:[--chat-composer-outline:color-mix(in_srgb,var(--app-theme-input)_30%,var(--background))]",
         "dark:[html[data-theme-id=t3-chat]_&]:[--chat-composer-highlight:color-mix(in_srgb,#432d48_12%,transparent)] dark:[html[data-theme-id=t3-chat]_&]:[--chat-composer-outline:#241e28]",
-        "before:pointer-events-none before:absolute before:inset-0 before:z-0 before:rounded-[22px] before:bg-[color-mix(in_srgb,var(--chat-composer-glass-surface)_var(--glass-opacity),transparent)] before:backdrop-blur-(--glass-blur) before:backdrop-saturate-(--glass-saturation)",
+        "before:pointer-events-none before:absolute before:inset-0 before:z-0 before:rounded-3xl before:bg-(--chat-composer-glass-surface)/(--glass-opacity) before:backdrop-blur-(--glass-blur) before:backdrop-saturate-(--glass-saturation)",
         "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:before:bg-(--chat-composer-glass-surface)",
         "has-data-[composer-banner-surface=attached]:before:hidden",
         contextStrip && [
@@ -37,7 +37,7 @@ function Shell({
 }
 
 const outlineClasses =
-  "after:pointer-events-none after:absolute after:inset-0 after:rounded-[inherit] after:border after:border-(--chat-composer-outline) dark:after:shadow-[inset_0_1px_var(--chat-composer-highlight)]";
+  "after:pointer-events-none after:absolute after:inset-0 after:rounded-[inherit] after:border after:border-(--chat-composer-outline) dark:after:inset-shadow-2xs dark:after:inset-shadow-(color:--chat-composer-highlight)";
 
 // The bottom strip continues the outline, so leave the seam between its corners open.
 const contextSeamClasses =
@@ -48,7 +48,7 @@ function Host({ className, ...props }: ComponentProps<"div">) {
     <div
       data-slot="composer-host"
       className={cn(
-        "relative z-10 w-full rounded-[22px] shadow-[0_12px_28px_-18px_rgb(0_0_0/40%)] after:z-1 dark:shadow-none",
+        "relative z-10 w-full rounded-3xl shadow-composer after:z-1 dark:shadow-none",
         outlineClasses,
         contextSeamClasses,
         "group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-none group-has-data-[composer-banner-surface=attached]/composer-surface:after:hidden",
@@ -64,12 +64,12 @@ function Main({ className, ...props }: ComponentProps<"div">) {
     <div
       data-chat-composer-main-surface="true"
       className={cn(
-        "group relative z-10 rounded-[22px] p-px transition-colors duration-200",
+        "group relative z-10 rounded-3xl p-px transition-colors duration-200",
         outlineClasses,
         contextSeamClasses,
         "after:z-20 after:hidden group-has-data-[composer-banner-surface=attached]/composer-surface:after:block",
-        "group-has-data-[composer-banner-surface=attached]/composer-surface:bg-[color-mix(in_srgb,var(--chat-composer-glass-surface)_var(--glass-opacity),transparent)] group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-saturate-(--glass-saturation)",
-        "group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-[0_12px_28px_-18px_rgb(0_0_0/40%)] dark:group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-none",
+        "group-has-data-[composer-banner-surface=attached]/composer-surface:bg-(--chat-composer-glass-surface)/(--glass-opacity) group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:backdrop-saturate-(--glass-saturation)",
+        "group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-composer dark:group-has-data-[composer-banner-surface=attached]/composer-surface:shadow-none",
         "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:group-has-data-[composer-banner-surface=attached]/composer-surface:bg-(--chat-composer-glass-surface)",
         "group-has-data-[composer-banner-surface=attached]/composer-surface:**:data-[chat-composer-mobile-collapsed=true]:min-h-[calc(1rem+1px)]",
         className,
@@ -85,10 +85,10 @@ function ContextStrip({ className, ...props }: ComponentProps<"div">) {
       data-slot="composer-context-strip"
       className={cn(
         "group/composer-context relative isolate mx-auto -mt-4 flex w-[calc(100%-2*var(--chat-composer-drawer-inset))] items-center gap-2 overflow-x-clip overflow-y-visible ps-1 pe-2 pt-5 pb-1",
-        "before:absolute before:inset-0 before:-z-1 before:rounded-b-[16px] before:border before:border-(--chat-composer-outline) before:mask-[linear-gradient(to_bottom,transparent_0_1rem,black_1rem)] before:shadow-[0_12px_28px_-18px_rgb(0_0_0/40%)]",
-        "dark:before:border-white/7 dark:before:bg-[linear-gradient(to_bottom,transparent_0_1rem,rgb(0_0_0/18%)_1rem,transparent_calc(1rem+10px)),linear-gradient(rgb(255_255_255/1%),rgb(255_255_255/1%))] dark:before:shadow-[0_14px_32px_-18px_rgb(0_0_0/75%)]",
-        "group-has-data-[composer-banner-surface=attached]/composer-surface:before:bg-[color-mix(in_srgb,var(--chat-composer-glass-surface)_var(--glass-opacity),transparent)] group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-saturate-(--glass-saturation)",
-        "not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:bg-[color-mix(in_srgb,var(--chat-composer-glass-surface)_var(--glass-opacity),transparent)] not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-blur-(--glass-blur) not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-saturate-(--glass-saturation)",
+        "before:absolute before:inset-0 before:-z-1 before:rounded-b-2xl before:border before:border-(--chat-composer-outline) before:mask-b-from-transparent before:mask-b-from-4 before:mask-b-to-black before:mask-b-to-4 before:shadow-composer",
+        "dark:before:border-white/7 dark:before:bg-composer-seam-below dark:before:shadow-composer-dark",
+        "group-has-data-[composer-banner-surface=attached]/composer-surface:before:bg-(--chat-composer-glass-surface)/(--glass-opacity) group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-blur-(--glass-blur) group-has-data-[composer-banner-surface=attached]/composer-surface:before:backdrop-saturate-(--glass-saturation)",
+        "not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:bg-(--chat-composer-glass-surface)/(--glass-opacity) not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-blur-(--glass-blur) not-supports-[clip-path:shape(from_0_0,line_to_1px_1px)]:before:backdrop-saturate-(--glass-saturation)",
         className,
       )}
       {...props}
diff --git a/apps/web/src/components/chat/ComposerTasksBadge.tsx b/apps/web/src/components/chat/ComposerTasksBadge.tsx
index 6da402d5311d..3031924e44e3 100644
--- a/apps/web/src/components/chat/ComposerTasksBadge.tsx
+++ b/apps/web/src/components/chat/ComposerTasksBadge.tsx
@@ -200,7 +200,7 @@ export const ComposerTasksContent = memo(function ComposerTasksContent({
                 </ComposerBanner.Content>
                 <ComposerBanner.Actions>
                   <span
-                    className="w-12 text-right text-[10px]/4 text-muted-foreground/45 tabular-nums"
+                    className="w-12 text-right text-3xs/4 text-muted-foreground/45 tabular-nums"
                     data-composer-task-duration="true"
                   >
                     {step.durationMs !== undefined
diff --git a/apps/web/src/components/chat/ComposerUsageLimits.tsx b/apps/web/src/components/chat/ComposerUsageLimits.tsx
index bfc554c56e25..04d32f610855 100644
--- a/apps/web/src/components/chat/ComposerUsageLimits.tsx
+++ b/apps/web/src/components/chat/ComposerUsageLimits.tsx
@@ -2,6 +2,8 @@ import type { EnvironmentId, UsageLimitsReport } from "@t3tools/contracts";
 import { limitsNotice } from "@t3tools/shared/usageLimits";
 import { GaugeIcon } from "lucide-react";
 
+import { ensureLocalApi } from "../../localApi";
+import { Button } from "../ui/button";
 import { getDriverOption } from "../settings/providerDriverMeta";
 import { RedactedSensitiveText } from "../settings/RedactedSensitiveText";
 import { LimitWindows, ResetCredits } from "../usage/UsageLimits";
@@ -85,6 +87,7 @@ function UsageLimitsBannerBody({
             account.resetCreditInput ??
             (account.instanceId ? { instanceId: account.instanceId } : undefined);
           const notice = limitsNotice(account.limits);
+          const externalUsage = account.limits.externalUsage;
           return (
             <div key={account.id} className="flex min-w-0 flex-col gap-1">
               {report.accounts.length > 1 ? (
@@ -102,6 +105,16 @@ function UsageLimitsBannerBody({
                   now={now}
                 />
               )}
+              {externalUsage ? (
+                <Button
+                  size="sm"
+                  variant="link"
+                  className="self-start"
+                  onClick={() => void ensureLocalApi().shell.openExternal(externalUsage.url)}
+                >
+                  Manage usage
+                </Button>
+              ) : null}
               {resetCreditInput && account.limits.resetCredits ? (
                 <ResetCredits
                   environmentId={environmentId}
diff --git a/apps/web/src/components/chat/ContextWindowMeter.tsx b/apps/web/src/components/chat/ContextWindowMeter.tsx
index 3e52f6e2d86d..5eedeb97c94a 100644
--- a/apps/web/src/components/chat/ContextWindowMeter.tsx
+++ b/apps/web/src/components/chat/ContextWindowMeter.tsx
@@ -45,7 +45,7 @@ export function ContextWindowMeter(props: {
           <Button
             size="icon-sm"
             variant="ghost-muted"
-            className="size-7 rounded-full hover:text-muted-foreground data-pressed:text-muted-foreground"
+            className="size-7"
             aria-label={
               usage.maxTokens !== null && usedPercentage
                 ? `Context window ${usedPercentage} used`
@@ -63,7 +63,7 @@ export function ContextWindowMeter(props: {
                   cy="12"
                   r={radius}
                   fill="none"
-                  stroke="color-mix(in oklab, var(--color-muted-foreground) 24%, transparent)"
+                  className="stroke-muted-foreground/24"
                   strokeWidth="3"
                 />
                 <circle
@@ -88,14 +88,15 @@ export function ContextWindowMeter(props: {
         tooltipStyle
         side="top"
         align="end"
-        viewportClassName="p-0"
-        className="w-64 max-w-none text-left whitespace-normal"
+        padding="none"
+        width="sm"
+        className="text-left whitespace-normal"
       >
-        <div className="flex flex-col gap-2 p-[var(--floating-content-inset)]">
+        <div className="flex flex-col gap-2 p-(--floating-content-inset)">
           <div className="flex items-center justify-between gap-3">
             <div className="font-medium text-muted-foreground text-xs">Context Window</div>
             {usage.maxTokens !== null && usedPercentage ? (
-              <div className="text-secondary-label text-[11px] tabular-nums">
+              <div className="text-secondary-label text-2xs tabular-nums">
                 <span>{usedPercentage}</span>
                 <span className="mx-1">·</span>
                 <span>
@@ -104,7 +105,7 @@ export function ContextWindowMeter(props: {
                 </span>
               </div>
             ) : (
-              <div className="text-secondary-label text-[11px] tabular-nums">
+              <div className="text-secondary-label text-2xs tabular-nums">
                 {formatContextWindowTokens(usage.usedTokens)}
               </div>
             )}
@@ -125,7 +126,7 @@ export function ContextWindowMeter(props: {
             </div>
           ) : null}
           {showTotalProcessed ? (
-            <div className="flex items-center justify-between gap-3 text-[11px] leading-4">
+            <div className="flex items-center justify-between gap-3 text-2xs leading-4">
               <span className="text-secondary-label">Total processed</span>
               <span className="font-medium tabular-nums text-secondary-label">
                 {formatContextWindowTokens(totalProcessedTokens)}
@@ -133,7 +134,7 @@ export function ContextWindowMeter(props: {
             </div>
           ) : null}
           {usage.compactsAutomatically ? (
-            <div className="mt-1 text-pretty text-secondary-label text-[11px] font-medium">
+            <div className="mt-1 text-pretty text-secondary-label text-2xs font-medium">
               {formatContextWindowCompactionMessage(modelDisplayName, usage.autoCompactThreshold)}
             </div>
           ) : null}
@@ -150,7 +151,7 @@ export function ContextWindowMeter(props: {
                 Compact context
               </Button>
               {compactDisabled && compactDisabledReason ? (
-                <div className="text-pretty text-secondary-label text-[11px]">
+                <div className="text-pretty text-secondary-label text-2xs">
                   {compactDisabledReason}
                 </div>
               ) : null}
diff --git a/apps/web/src/components/chat/DraftHeroHeadline.tsx b/apps/web/src/components/chat/DraftHeroHeadline.tsx
index d542cd6a8a9f..ea4741b80664 100644
--- a/apps/web/src/components/chat/DraftHeroHeadline.tsx
+++ b/apps/web/src/components/chat/DraftHeroHeadline.tsx
@@ -29,6 +29,7 @@ import {
   MenuTrigger,
 } from "../ui/menu";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import { InlineButton } from "../ui/button";
 import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
 
 interface DraftHeroHeadlineProps {
@@ -140,18 +141,19 @@ export function DraftHeroHeadline({
             // project title) so the hero sentence reads naturally: an
             // aria-label here would replace the title with an action phrase
             // mid-sentence and baffle screen-reader users.
-            <MenuTrigger className="pointer-events-auto inline-block max-w-64 truncate border-foreground/60 border-b border-dotted align-baseline text-foreground transition-colors hover:border-foreground/80 focus-visible:rounded-sm focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring" />
+            <MenuTrigger
+              render={<InlineButton tone="picker" />}
+              className="pointer-events-auto max-w-64 align-baseline"
+            />
           }
         >
-          {activeProjectDisplayName ?? "Choose a project"}
+          <span className="min-w-0 truncate">{activeProjectDisplayName ?? "Choose a project"}</span>
         </TooltipTrigger>
         {activeProjectDisplayName ? (
-          <TooltipPopup side="top" className="max-w-80">
-            {activeProjectDisplayName}
-          </TooltipPopup>
+          <TooltipPopup side="top">{activeProjectDisplayName}</TooltipPopup>
         ) : null}
       </Tooltip>
-      <MenuPopup align="center" className="max-h-80 min-w-40! w-max max-w-64 overflow-y-auto">
+      <MenuPopup align="center" className="max-h-80 overflow-y-auto">
         <MenuRadioGroup
           value={activeProjectKey}
           onValueChange={(value) => {
@@ -191,28 +193,23 @@ export function DraftHeroHeadline({
         >
           {projectPickerEntries.map(({ group }) => {
             return (
-              <MenuRadioItem
-                key={group.projectKey}
-                value={group.projectKey}
-                closeOnClick
-                className="[&>span:last-child]:flex [&>span:last-child]:min-w-0 [&>span:last-child]:items-center [&>span:last-child]:gap-2"
-              >
-                <ProjectFavicon project={group} className="size-4 shrink-0" />
-                <Tooltip>
-                  <TooltipTrigger render={<span className="block min-w-0 truncate" />}>
-                    {group.displayName}
-                  </TooltipTrigger>
-                  <TooltipPopup side="top" className="max-w-80">
-                    {group.displayName}
-                  </TooltipPopup>
-                </Tooltip>
-                {showProjectEnvironments ? (
-                  <ProjectEnvironmentBadge
-                    group={group}
-                    primaryEnvironmentId={primaryEnvironmentId}
-                    machineByEnvironmentId={environmentMachineById}
-                  />
-                ) : null}
+              <MenuRadioItem key={group.projectKey} value={group.projectKey} closeOnClick>
+                <span className="flex min-w-0 items-center gap-2">
+                  <ProjectFavicon project={group} className="size-4 shrink-0" />
+                  <Tooltip>
+                    <TooltipTrigger render={<span className="block min-w-0 truncate" />}>
+                      {group.displayName}
+                    </TooltipTrigger>
+                    <TooltipPopup side="top">{group.displayName}</TooltipPopup>
+                  </Tooltip>
+                  {showProjectEnvironments ? (
+                    <ProjectEnvironmentBadge
+                      group={group}
+                      primaryEnvironmentId={primaryEnvironmentId}
+                      machineByEnvironmentId={environmentMachineById}
+                    />
+                  ) : null}
+                </span>
               </MenuRadioItem>
             );
           })}
diff --git a/apps/web/src/components/chat/ExpandedImageDialog.tsx b/apps/web/src/components/chat/ExpandedImageDialog.tsx
index 3c4f521b7ccc..f750693b6494 100644
--- a/apps/web/src/components/chat/ExpandedImageDialog.tsx
+++ b/apps/web/src/components/chat/ExpandedImageDialog.tsx
@@ -179,8 +179,6 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
         variant="media"
         showCloseButton={false}
         bottomStickOnMobile={false}
-        backdropClassName="z-[60]"
-        viewportClassName="z-[60] grid-rows-1 place-items-center px-4 py-6 [-webkit-app-region:no-drag]"
         className="row-start-1 max-h-[92vh] w-[92vw] max-w-[92vw] items-center overflow-visible [--media-width:92vw] [--media-height:min(86vh,calc(100vh-160px))] sm:[--media-width:calc(92vw-96px)]"
         onKeyDown={onKeyDown}
         initialFocus={closeButtonRef}
@@ -195,7 +193,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
             type="button"
             size="icon"
             variant="media-navigation"
-            className="left-0 top-auto -bottom-12 translate-y-0 rounded-full bg-white/10 sm:top-1/2 sm:bottom-auto sm:-translate-y-1/2"
+            className="left-0 top-auto -bottom-12 translate-y-0 sm:top-1/2 sm:bottom-auto sm:-translate-y-1/2"
             aria-label="Previous media"
             onClick={() => navigateImage(-1)}
           >
@@ -221,7 +219,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
               accessibilityDetails ? (
                 <SnapShotAccessibilityData
                   details={accessibilityDetails}
-                  className="h-[min(var(--media-height),40rem)] w-[min(var(--media-width),42rem)] animate-[snap-shot-contents-enter_140ms_ease-out] rounded-lg border border-border/70 bg-background p-4 text-xs leading-5 shadow-2xl motion-reduce:animate-none"
+                  className="h-[min(var(--media-height),40rem)] w-[min(var(--media-width),42rem)] transition-opacity duration-140 ease-out starting:opacity-0 rounded-lg border border-border/70 bg-background p-4 text-xs leading-5 shadow-2xl motion-reduce:transition-none"
                 />
               ) : null
             ) : item.src === null || failedImageSrc === item.src ? (
@@ -254,12 +252,11 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
                       <Button
                         aria-label={contentsLabel}
                         aria-pressed={showingAccessibilityDetails}
-                        className="[--control-icon-color:currentColor] hover:bg-white/10 hover:text-white"
                         onClick={() =>
                           setAccessibilityDetailsSrc(showingAccessibilityDetails ? null : item.src)
                         }
                         size="icon-micro"
-                        variant="ghost-muted"
+                        variant="overlay"
                       />
                     }
                   >
@@ -268,11 +265,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
                   <TooltipPopup side="top">{contentsLabel}</TooltipPopup>
                 </Tooltip>
               ) : item.source ? (
-                <SnapShotContentsButton
-                  source={item.source}
-                  side="top"
-                  className="hover:bg-white/10 hover:text-white"
-                />
+                <SnapShotContentsButton source={item.source} side="top" />
               ) : null}
             </div>
           </div>
@@ -282,7 +275,7 @@ export const ExpandedImageDialog = memo(function ExpandedImageDialog({
             type="button"
             size="icon"
             variant="media-navigation"
-            className="right-0 top-auto -bottom-12 translate-y-0 rounded-full bg-white/10 sm:top-1/2 sm:bottom-auto sm:-translate-y-1/2"
+            className="right-0 top-auto -bottom-12 translate-y-0 sm:top-1/2 sm:bottom-auto sm:-translate-y-1/2"
             aria-label="Next media"
             onClick={() => navigateImage(1)}
           >
diff --git a/apps/web/src/components/chat/FileTagChip.tsx b/apps/web/src/components/chat/FileTagChip.tsx
index 11d12bb941c2..5dbfde8affe4 100644
--- a/apps/web/src/components/chat/FileTagChip.tsx
+++ b/apps/web/src/components/chat/FileTagChip.tsx
@@ -1,22 +1,12 @@
 import { inferEntryKindFromPath } from "../../pierre-icons";
-import {
-  CHAT_INLINE_CHIP_CLASS_NAME,
-  CHAT_INLINE_CHIP_LABEL_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES,
-} from "../composerInlineChip";
+import { ContextChipLabel } from "../ContextChip";
 import { PierreEntryIcon } from "./PierreEntryIcon";
 
-export const FILE_TAG_CHIP_CLASS_NAME = `${COMPOSER_INLINE_CHIP_CLASS_NAME} ${CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.mention}`;
-export const CHAT_FILE_TAG_CHIP_CLASS_NAME = `${CHAT_INLINE_CHIP_CLASS_NAME} ${CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.mention}`;
-
+/** Icon and label for a file mention; render inside `<ContextChip kind="mention">`. */
 export function FileTagChipContent(props: {
   path: string;
   label: string;
   theme: "light" | "dark";
-  selectable?: boolean;
 }) {
   return (
     <>
@@ -24,17 +14,8 @@ export function FileTagChipContent(props: {
         pathValue={props.path}
         kind={inferEntryKindFromPath(props.path)}
         theme={props.theme}
-        className={COMPOSER_INLINE_CHIP_ICON_CLASS_NAME}
       />
-      <span
-        className={
-          props.selectable
-            ? CHAT_INLINE_CHIP_LABEL_CLASS_NAME
-            : COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME
-        }
-      >
-        {props.label}
-      </span>
+      <ContextChipLabel>{props.label}</ContextChipLabel>
     </>
   );
 }
diff --git a/apps/web/src/components/chat/MessageCopyButton.tsx b/apps/web/src/components/chat/MessageCopyButton.tsx
index aaaa171f10de..3a647857bae9 100644
--- a/apps/web/src/components/chat/MessageCopyButton.tsx
+++ b/apps/web/src/components/chat/MessageCopyButton.tsx
@@ -2,7 +2,6 @@ import { memo, useRef } from "react";
 import { CopyIcon, CheckIcon } from "lucide-react";
 import { Button } from "../ui/button";
 import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
-import { cn } from "~/lib/utils";
 import {
   ANCHORED_COPY_TOAST_TIMEOUT_MS,
   showAnchoredCopyErrorToast,
@@ -43,8 +42,8 @@ export const MessageCopyButton = memo(function MessageCopyButton({
             ref={ref}
             type="button"
             size={size}
-            variant={variant}
-            className={cn("text-muted-foreground hover:text-foreground", className)}
+            variant={variant === "ghost" ? "ghost-muted" : variant}
+            className={className}
           />
         }
       >
diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
index b2b46302dd25..d95e22517630 100644
--- a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
+++ b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
@@ -1100,7 +1100,12 @@ describe("deriveMessagesTimelineRows", () => {
     terminalContexts: [],
     previewAnnotations: [],
     reviewComments: [],
-    submissionIntent: "foreground" as const,
+    sendSettings: {
+      modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
+      runtimeMode: "full-access" as const,
+      interactionMode: "default" as const,
+      promptEffort: null,
+    },
     queuedAfterToolActivityId: null,
     createdAt: "2026-01-01T00:00:01Z",
   });
diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.ts b/apps/web/src/components/chat/MessagesTimeline.logic.ts
index 57ed45a89d1d..21508a9663ae 100644
--- a/apps/web/src/components/chat/MessagesTimeline.logic.ts
+++ b/apps/web/src/components/chat/MessagesTimeline.logic.ts
@@ -42,7 +42,6 @@ import { formatWorkspaceRelativePath } from "../../filePathDisplay";
 const TIMELINE_MINIMAP_ITEM_SPACING = 8;
 export const TIMELINE_MINIMAP_MIN_ITEMS = 2;
 const TIMELINE_MINIMAP_MAX_HEIGHT_CSS = "calc(100vh - 18rem)";
-const TIMELINE_CONTENT_MAX_WIDTH = 768;
 const TIMELINE_MINIMAP_PERSISTENT_GUTTER = 48;
 
 function singleToolCallLabel(entry: WorkLogEntry): string {
@@ -233,14 +232,25 @@ export function resolveTimelineMinimapCurrentIndex(input: {
   return precedingIndex;
 }
 
-export function resolveTimelineMinimapHasPersistentGutter(viewportWidth: number): boolean {
-  if (!Number.isFinite(viewportWidth) || viewportWidth <= 0) {
-    return false;
+/**
+ * Side gutter between the viewport edge and the centered content column.
+ * `contentWidth` is the rendered column width, which follows the Chat width
+ * setting, so callers measure it rather than assume a fixed maximum.
+ */
+function resolveTimelineSideGutter(viewportWidth: number, contentWidth: number): number {
+  if (!Number.isFinite(viewportWidth) || viewportWidth <= 0 || !Number.isFinite(contentWidth)) {
+    return 0;
   }
+  return Math.max(0, (viewportWidth - Math.min(viewportWidth, contentWidth)) / 2);
+}
 
-  const contentWidth = Math.min(viewportWidth, TIMELINE_CONTENT_MAX_WIDTH);
-  const sideGutter = Math.max(0, (viewportWidth - contentWidth) / 2);
-  return sideGutter >= TIMELINE_MINIMAP_PERSISTENT_GUTTER;
+export function resolveTimelineMinimapHasPersistentGutter(
+  viewportWidth: number,
+  contentWidth: number,
+): boolean {
+  return (
+    resolveTimelineSideGutter(viewportWidth, contentWidth) >= TIMELINE_MINIMAP_PERSISTENT_GUTTER
+  );
 }
 
 const TIMELINE_MINIMAP_HIT_STRIP_LEFT = 12;
@@ -249,18 +259,16 @@ const TIMELINE_MINIMAP_EXPANDED_HIT_STRIP_WIDTH = "22rem";
 
 /**
  * The minimap overlays the viewport's left edge while the content column is
- * centered, so the side gutter between them shrinks under browser zoom or a
- * narrow pane. A fixed-width hover strip would then sit on top of the message
+ * centered, so the side gutter between them shrinks under browser zoom, a
+ * narrow pane, or a wider Chat width setting. A fixed-width hover strip would then sit on top of the message
  * text and swallow its pointer events. Cap the strip's width so it never
  * extends past the gutter into the content column; 0 disables the strip.
  */
-export function resolveTimelineMinimapHitStripWidth(viewportWidth: number): number {
-  if (!Number.isFinite(viewportWidth) || viewportWidth <= 0) {
-    return 0;
-  }
-
-  const contentWidth = Math.min(viewportWidth, TIMELINE_CONTENT_MAX_WIDTH);
-  const sideGutter = Math.max(0, (viewportWidth - contentWidth) / 2);
+export function resolveTimelineMinimapHitStripWidth(
+  viewportWidth: number,
+  contentWidth: number,
+): number {
+  const sideGutter = resolveTimelineSideGutter(viewportWidth, contentWidth);
   return Math.max(
     0,
     Math.min(
@@ -270,6 +278,19 @@ export function resolveTimelineMinimapHitStripWidth(viewportWidth: number): numb
   );
 }
 
+// The prev/next buttons are centered 4px into the strip and 20px wide, so
+// their hitbox reaches 14px past the strip's left edge.
+const TIMELINE_MINIMAP_NAVIGATION_REACH = 14;
+
+/**
+ * The prev/next buttons hang outside the strip's height, so the strip's own
+ * width cap does not cover them. Keep them inert to the pointer unless the
+ * gutter can hold them; keyboard focus still reaches them.
+ */
+export function resolveTimelineMinimapNavigationInteractive(collapsedWidth: number): boolean {
+  return collapsedWidth >= TIMELINE_MINIMAP_NAVIGATION_REACH;
+}
+
 /**
  * Once the preview is open, keep the full preview and the space leading to it
  * interactive. The collapsed strip remains gutter-capped so it cannot block
diff --git a/apps/web/src/components/chat/MessagesTimeline.test.tsx b/apps/web/src/components/chat/MessagesTimeline.test.tsx
index 016e621be1dd..b6e5f2a2927e 100644
--- a/apps/web/src/components/chat/MessagesTimeline.test.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.test.tsx
@@ -361,28 +361,79 @@ describe("MessagesTimeline", () => {
         });
         const questionToggle = renderer!.root.find(
           (node) =>
-            node.props["aria-label"]?.startsWith("Question answer submitted:") &&
+            node.props["aria-label"]?.startsWith("Provide a spec") &&
             node.props["aria-expanded"] === false,
         );
         expect(questionToggle.props["aria-label"]).toContain(
           Object.values(answers)[0] ?? "spec.txt",
         );
-        expect(JSON.stringify(renderer!.toJSON())).not.toContain("Provide a spec");
+        // The question leads the collapsed row so the exchange reads as a
+        // question and answer without expanding (heading + accessible label).
+        expect(JSON.stringify(renderer!.toJSON()).match(/Provide a spec/g)).toHaveLength(2);
         await act(() => questionToggle.props.onClick());
         const markup = JSON.stringify(renderer!.toJSON());
-        expect(markup.match(/Provide a spec/g)).toHaveLength(1);
+        // Expanded, the question also appears in the history: label, heading, history.
+        expect(markup.match(/Provide a spec/g)).toHaveLength(3);
         expect(markup).toContain("spec.txt");
         expect(markup).toContain("Provide a screenshot");
         expect(markup).toContain("shot.png");
         for (const answer of Object.values(answers)) expect(markup).toContain(answer);
         await act(() => questionToggle.props.onClick());
-        expect(JSON.stringify(renderer!.toJSON())).not.toContain("Provide a spec");
+        // Collapsing hides the history but keeps the question heading.
+        expect(JSON.stringify(renderer!.toJSON())).toContain("Provide a spec");
       } finally {
         await act(() => renderer?.unmount());
       }
     },
   );
 
+  it("leads an unanswered question row with the question text", async () => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    vi.stubGlobal("requestAnimationFrame", () => 0);
+    vi.stubGlobal("cancelAnimationFrame", () => {});
+    let renderer: ReactTestRenderer | undefined;
+    try {
+      await act(() => {
+        renderer = create(
+          <MessagesTimeline
+            {...buildProps()}
+            timelineEntries={[
+              {
+                id: "question-entry",
+                kind: "work",
+                createdAt: MESSAGE_CREATED_AT,
+                entry: {
+                  id: "question-work",
+                  createdAt: MESSAGE_CREATED_AT,
+                  label: "User input requested",
+                  tone: "tool",
+                  questionAnswer: {
+                    requestId: ApprovalRequestId.make("question-request"),
+                    answers: {},
+                    questionTextById: { scope: "Which repository?" },
+                    attachmentsByQuestionId: {},
+                  },
+                },
+              },
+            ]}
+          />,
+        );
+      });
+      const questionToggle = renderer!.root.find(
+        (node) =>
+          node.props["aria-label"] === "Which repository?" && node.props["aria-expanded"] === false,
+      );
+      const markup = JSON.stringify(renderer!.toJSON());
+      // Heading + accessible label.
+      expect(markup.match(/Which repository\?/g)).toHaveLength(2);
+      await act(() => questionToggle.props.onClick());
+      // Expanded history adds a third occurrence alongside heading and label.
+      expect(JSON.stringify(renderer!.toJSON()).match(/Which repository\?/g)).toHaveLength(3);
+    } finally {
+      await act(() => renderer?.unmount());
+    }
+  });
+
   it.each([
     { toolLifecycleStatus: "inProgress", isAtEnd: true },
     { toolLifecycleStatus: "inProgress", isAtEnd: false },
@@ -571,6 +622,7 @@ describe("MessagesTimeline", () => {
       resolveTimelineMinimapHitStripWidth,
       resolveTimelineMinimapIndexFromPointer,
       resolveTimelineMinimapInteractiveWidth,
+      resolveTimelineMinimapNavigationInteractive,
       resolveTimelineMinimapTopPercent,
     } = await import("./MessagesTimeline.logic");
 
@@ -655,22 +707,39 @@ describe("MessagesTimeline", () => {
         itemBounds: [{ top: 80, height: 20 }],
       }),
     ).toBeNull();
-    expect(resolveTimelineMinimapHasPersistentGutter(832)).toBe(false);
-    expect(resolveTimelineMinimapHasPersistentGutter(863)).toBe(false);
-    expect(resolveTimelineMinimapHasPersistentGutter(864)).toBe(true);
+    // Comfortable width: the column is capped at 768px.
+    expect(resolveTimelineMinimapHasPersistentGutter(832, 768)).toBe(false);
+    expect(resolveTimelineMinimapHasPersistentGutter(863, 768)).toBe(false);
+    expect(resolveTimelineMinimapHasPersistentGutter(864, 768)).toBe(true);
+    // Wider Chat width settings consume the gutter the minimap relies on.
+    expect(resolveTimelineMinimapHasPersistentGutter(1400, 1152)).toBe(true);
+    expect(resolveTimelineMinimapHasPersistentGutter(1200, 1152)).toBe(false);
+    expect(resolveTimelineMinimapHasPersistentGutter(2560, 2560)).toBe(false);
 
     // No usable gutter (zoomed in / narrow pane): the strip must go inert
     // instead of overlaying the centered content column.
-    expect(resolveTimelineMinimapHitStripWidth(768)).toBe(0);
-    expect(resolveTimelineMinimapHitStripWidth(792)).toBe(0);
+    expect(resolveTimelineMinimapHitStripWidth(768, 768)).toBe(0);
+    expect(resolveTimelineMinimapHitStripWidth(792, 768)).toBe(0);
     // Partial gutter: strip shrinks to what fits between the viewport edge
     // and the content column.
-    expect(resolveTimelineMinimapHitStripWidth(820)).toBe(14);
+    expect(resolveTimelineMinimapHitStripWidth(820, 768)).toBe(14);
     // Full gutter: unchanged 40px-wide strip.
-    expect(resolveTimelineMinimapHitStripWidth(872)).toBe(40);
-    expect(resolveTimelineMinimapHitStripWidth(1400)).toBe(40);
-    expect(resolveTimelineMinimapHitStripWidth(0)).toBe(0);
-    expect(resolveTimelineMinimapHitStripWidth(Number.NaN)).toBe(0);
+    expect(resolveTimelineMinimapHitStripWidth(872, 768)).toBe(40);
+    expect(resolveTimelineMinimapHitStripWidth(1400, 768)).toBe(40);
+    // Full Chat width: the column spans the viewport, so the strip is inert
+    // however wide the window gets.
+    expect(resolveTimelineMinimapHitStripWidth(2560, 2560)).toBe(0);
+    // Wide Chat width on a window just wider than the column: partial strip.
+    expect(resolveTimelineMinimapHitStripWidth(1204, 1152)).toBe(14);
+    expect(resolveTimelineMinimapHitStripWidth(0, 0)).toBe(0);
+    expect(resolveTimelineMinimapHitStripWidth(Number.NaN, 768)).toBe(0);
+
+    // Prev/next buttons reach 14px past the strip's left edge; a narrower
+    // strip means they would sit on the content column.
+    expect(resolveTimelineMinimapNavigationInteractive(40)).toBe(true);
+    expect(resolveTimelineMinimapNavigationInteractive(14)).toBe(true);
+    expect(resolveTimelineMinimapNavigationInteractive(8)).toBe(false);
+    expect(resolveTimelineMinimapNavigationInteractive(0)).toBe(false);
 
     // The collapsed target stays narrow, but an open preview keeps its full
     // 20rem width plus the 2rem offset from the minimap rail interactive.
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index 4570e07ceb16..8ac769f33e7f 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -4,6 +4,7 @@ import { useRightPanelStore } from "~/rightPanelStore";
 import {
   getQuestionAnswerPreview,
   getQuestionAnswerText,
+  getQuestionTextPreview,
   hasQuestionAnswer,
 } from "@t3tools/client-runtime/work-log/user-input";
 import {
@@ -63,7 +64,6 @@ import {
   use,
   useCallback,
   useEffect,
-  useId,
   useLayoutEffect,
   useMemo,
   useRef,
@@ -190,6 +190,7 @@ import {
   resolveTimelineMinimapHitStripWidth,
   resolveTimelineMinimapIndexFromPointer,
   resolveTimelineMinimapInteractiveWidth,
+  resolveTimelineMinimapNavigationInteractive,
   resolveTimelineMinimapTopPercent,
   resolveWorkGroupScrollIndex,
   shouldFollowWorkGroupAppend,
@@ -214,6 +215,7 @@ import {
   ContextChipShell,
   FileChip,
   ImageChipButton,
+  PULL_REQUEST_CHIP_KINDS,
   PullRequestChip,
   UnresolvedChip,
 } from "../contextChipParts";
@@ -236,17 +238,10 @@ import {
   encodeComposerContextFragment,
 } from "@t3tools/shared/composerContextClipboard";
 import { chatMarkdownClipboardPayload } from "../../markdown-clipboard";
-import {
-  CHAT_INLINE_CHIP_CLASS_NAME,
-  CHAT_INLINE_CHIP_LABEL_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  SKILL_CHIP_ICON_SVG,
-  CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES,
-  CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES,
-  PULL_REQUEST_INLINE_CHIP_TONE_CLASS_NAMES,
-} from "../composerInlineChip";
+import { ContextChip, ContextChipLabel, type ContextChipKind } from "../ContextChip";
 import { createContextPresentationRegistry } from "../contextPresentationRegistry";
 import { useOpenPrLink } from "~/lib/openPullRequestLink";
+import { useClientSettings } from "~/hooks/useSettings";
 import type { ChatMarkdownContextReference } from "../ChatMarkdown";
 import { useMediaQuery } from "~/hooks/useMediaQuery";
 import { cn } from "~/lib/utils";
@@ -254,7 +249,7 @@ import { useUiStateStore } from "~/uiStateStore";
 import { type TimestampFormat } from "@t3tools/contracts/settings";
 import { formatChatTimestampTooltip, formatDayAwareTimestamp } from "../../timestampFormat";
 
-import { SkillInlineText } from "./SkillInlineText";
+import { SkillChipIcon, SkillInlineText } from "./SkillInlineText";
 import { deriveAgentSpawnSummary } from "./agentSpawnSummary";
 import { formatWorkspaceRelativePath } from "../../filePathDisplay";
 import {
@@ -263,6 +258,7 @@ import {
   type ReviewCommentContext,
 } from "../../reviewCommentContext";
 import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
+import { ComputerUseAppIcon } from "~/components/Icons";
 
 // ---------------------------------------------------------------------------
 // Context — shared state consumed by every row component via Context.
@@ -284,6 +280,7 @@ interface TimelineRowSharedState {
   activeThreadEnvironmentId: EnvironmentId;
   onRevertToTurnCount: (targetTurnCount: number, messageId: MessageId) => void;
   onUseArtifactTemplate: (template: CodexArtifactTemplate) => void;
+  onRunShellCommand: ((command: string) => void) | undefined;
   onImageExpand: (preview: ExpandedImagePreview) => void;
   onFileOpen: (attachment: ChatFileAttachment) => void;
   onFileDownload: (attachment: ChatFileAttachment) => void;
@@ -351,8 +348,8 @@ function TimelineLoadEarlierHeader({
   fade: boolean;
 }) {
   return (
-    <div className={fade ? "pt-[var(--workspace-titlebar-scroll-fade-height)]" : "pt-3 sm:pt-4"}>
-      <div className="mx-auto w-full max-w-3xl pb-2">
+    <div className={fade ? "pt-(--workspace-titlebar-scroll-fade-height)" : "pt-3 sm:pt-4"}>
+      <div className="mx-auto w-full max-w-(--chat-max-width) pb-2">
         <button
           type="button"
           onClick={onLoadEarlier}
@@ -432,6 +429,7 @@ interface MessagesTimelineProps {
   supportsConversationRollback: boolean;
   onRevertToTurnCount: (targetTurnCount: number, messageId: MessageId) => void;
   onUseArtifactTemplate?: (template: CodexArtifactTemplate) => void;
+  onRunShellCommand?: (command: string) => void;
   isRevertingCheckpoint: boolean;
   onImageExpand: (preview: ExpandedImagePreview) => void;
   onFileOpen?: (attachment: ChatFileAttachment) => void;
@@ -501,6 +499,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
   supportsConversationRollback,
   onRevertToTurnCount,
   onUseArtifactTemplate = NOOP_USE_ARTIFACT_TEMPLATE,
+  onRunShellCommand,
   isRevertingCheckpoint,
   onImageExpand,
   onFileOpen = NOOP_OPEN_ATTACHMENT,
@@ -940,6 +939,8 @@ export const MessagesTimeline = memo(function MessagesTimeline({
   const [timelineViewportElement, setTimelineViewportElement] = useState<HTMLDivElement | null>(
     null,
   );
+  // Re-measure the minimap gutter when the chat column changes width without a viewport resize.
+  const chatWidth = useClientSettings((settings) => settings.chatWidth);
   const {
     target: readyCitationRequest,
     positioning: citationPositioning,
@@ -1111,11 +1112,19 @@ export const MessagesTimeline = memo(function MessagesTimeline({
 
     const measure = () => {
       const viewportWidth = timelineViewportElement.getBoundingClientRect().width;
-      const nextHasPersistentGutter = resolveTimelineMinimapHasPersistentGutter(viewportWidth);
+      // Without a mounted row, treat the column as full width so the strip stays inert.
+      const contentWidth =
+        timelineViewportElement
+          .querySelector<HTMLElement>("[data-timeline-root]")
+          ?.getBoundingClientRect().width ?? viewportWidth;
+      const nextHasPersistentGutter = resolveTimelineMinimapHasPersistentGutter(
+        viewportWidth,
+        contentWidth,
+      );
       setMinimapHasPersistentGutter((current) =>
         current === nextHasPersistentGutter ? current : nextHasPersistentGutter,
       );
-      setMinimapHitStripWidth(resolveTimelineMinimapHitStripWidth(viewportWidth));
+      setMinimapHitStripWidth(resolveTimelineMinimapHitStripWidth(viewportWidth, contentWidth));
       reportContentOverflow();
     };
 
@@ -1128,7 +1137,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
       cancelAnimationFrame(frame);
       observer.disconnect();
     };
-  }, [timelineViewportElement, rows.length, reportContentOverflow]);
+  }, [timelineViewportElement, rows.length, reportContentOverflow, chatWidth]);
 
   const sharedState = useMemo<TimelineRowSharedState>(
     () => ({
@@ -1145,6 +1154,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
       activeThreadEnvironmentId,
       onRevertToTurnCount,
       onUseArtifactTemplate,
+      onRunShellCommand,
       onImageExpand,
       onFileOpen,
       onFileDownload,
@@ -1180,6 +1190,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
       activeThreadEnvironmentId,
       onRevertToTurnCount,
       onUseArtifactTemplate,
+      onRunShellCommand,
       onImageExpand,
       onFileOpen,
       onFileDownload,
@@ -1241,7 +1252,10 @@ export const MessagesTimeline = memo(function MessagesTimeline({
   // from TimelineRowCtx, which propagates through LegendList's memo.
   const renderItem = useCallback(
     ({ item }: { item: MessagesTimelineRow }) => (
-      <div className="mx-auto w-full min-w-0 max-w-3xl overflow-x-clip" data-timeline-root="true">
+      <div
+        className="mx-auto w-full min-w-0 max-w-(--chat-max-width) overflow-x-clip"
+        data-timeline-root="true"
+      >
         <TimelineRowContent row={item} />
       </div>
     ),
@@ -1407,6 +1421,7 @@ function TimelineMinimap({
       ),
     [items, resolvedActiveIndex],
   );
+  const navigationInteractive = resolveTimelineMinimapNavigationInteractive(hitStripWidth);
   const activeTopPercent =
     resolvedActiveIndex === null
       ? 0
@@ -1487,6 +1502,7 @@ function TimelineMinimap({
           <TimelineMinimapNavigationButton
             direction="previous"
             disabled={previousItem === null}
+            interactive={navigationInteractive}
             onClick={() => {
               if (previousItem) onSelect(previousItem);
             }}
@@ -1546,7 +1562,7 @@ function TimelineMinimap({
                 <span
                   aria-hidden="true"
                   className={cn(
-                    "pointer-events-none absolute left-0 h-0.5 -translate-y-1/2 rounded-full bg-muted-foreground/35 transition-[background-color,width] duration-150 data-[in-view=true]:bg-foreground/90",
+                    "pointer-events-none absolute left-0 h-0.5 -translate-y-1/2 rounded-full bg-muted-foreground/35 transition-[width,background-color] duration-150 data-[in-view=true]:bg-foreground/90",
                     activeDistance === 0
                       ? "w-6 bg-muted-foreground/75"
                       : activeDistance === 1
@@ -1602,6 +1618,7 @@ function TimelineMinimap({
           <TimelineMinimapNavigationButton
             direction="next"
             disabled={nextItem === null}
+            interactive={navigationInteractive}
             onClick={() => {
               if (nextItem) onSelect(nextItem);
             }}
@@ -1615,10 +1632,12 @@ function TimelineMinimap({
 function TimelineMinimapNavigationButton({
   direction,
   disabled,
+  interactive,
   onClick,
 }: {
   direction: "previous" | "next";
   disabled: boolean;
+  interactive: boolean;
   onClick: () => void;
 }) {
   const previous = direction === "previous";
@@ -1631,7 +1650,8 @@ function TimelineMinimapNavigationButton({
         render={
           <span
             className={cn(
-              "absolute left-1 z-10 inline-flex -translate-x-1/2 opacity-0 pointer-events-auto transition-opacity duration-150 hover:opacity-100 focus-within:opacity-100",
+              "absolute left-1 z-10 inline-flex -translate-x-1/2 opacity-0 transition-opacity duration-150 hover:opacity-100 focus-within:opacity-100",
+              interactive ? "pointer-events-auto" : "pointer-events-none",
               previous ? "bottom-[calc(100%+2px)]" : "top-[calc(100%+2px)]",
             )}
           />
@@ -1769,11 +1789,14 @@ function QueuedMessageTimelineRow({
     queuedMessage.previewAnnotations.length +
     queuedMessage.reviewComments.length;
   const text = queuedMessage.prompt.trim();
-  const statusLabel = queuedMessage.holdUntilUserAction
-    ? "Waits for Send now"
-    : row.isNext
-      ? "Sends after the next tool call or when the turn ends"
-      : "Sends after the messages above it";
+  const sending = queuedMessage.sending !== undefined;
+  const statusLabel = sending
+    ? "Sending to the agent"
+    : queuedMessage.holdUntilUserAction
+      ? "Waits for Send now"
+      : row.isNext
+        ? "Sends after the next tool call or when the turn ends"
+        : "Sends after the messages above it";
   return (
     <div className="flex flex-col items-end" data-queued-message-id={queuedMessage.id}>
       <div className="max-w-[80%] rounded-2xl border border-dashed border-border p-3 text-message-foreground/80">
@@ -1801,22 +1824,21 @@ function QueuedMessageTimelineRow({
           <Tooltip>
             <TooltipTrigger
               render={<span className="inline-flex h-6 items-center gap-1" />}
-              aria-label={`Queued. ${statusLabel}.`}
+              aria-label={`${sending ? "Sending" : "Queued"}. ${statusLabel}.`}
             >
               <ClockIcon className="size-3.5" aria-hidden />
-              Queued
+              {sending ? "Sending" : "Queued"}
             </TooltipTrigger>
             <TooltipPopup side="bottom">{statusLabel}</TooltipPopup>
           </Tooltip>
-          <div className="ml-auto flex items-center gap-0.5">
+          <div className={cn("ml-auto flex items-center gap-0.5", sending && "invisible")}>
             <Tooltip>
               <TooltipTrigger
                 render={
                   <Button
                     type="button"
-                    size="icon-micro"
+                    size="icon-xs"
                     variant="ghost-muted"
-                    className="size-6"
                     onPointerDown={(event) => event.preventDefault()}
                     onClick={() => ctx.onSteerQueuedMessage(queuedMessage.id)}
                     aria-label="Send now"
@@ -1837,9 +1859,8 @@ function QueuedMessageTimelineRow({
                 render={
                   <Button
                     type="button"
-                    size="icon-micro"
+                    size="icon-xs"
                     variant="ghost-muted"
-                    className="size-6"
                     onPointerDown={(event) => event.preventDefault()}
                     onClick={() => ctx.onRemoveQueuedMessage(queuedMessage.id)}
                     aria-label="Cancel and return to the composer"
@@ -1866,7 +1887,7 @@ function ContextCompactionTimelineRow({
     <div
       role="separator"
       aria-label={row.label}
-      className="mx-auto flex w-full max-w-3xl items-center gap-3 py-1 text-muted-foreground text-xs"
+      className="mx-auto flex w-full max-w-(--chat-max-width) items-center gap-3 py-1 text-muted-foreground text-xs"
     >
       <span className="h-px flex-1 bg-border/70" />
       <span className="flex shrink-0 items-center gap-1.5">
@@ -1894,7 +1915,7 @@ function UserVideoAttachment({ file }: { readonly file: ChatFileAttachment }) {
 
   if (asset === null && src === null) {
     return (
-      <div className="flex aspect-[4/3] w-full items-center justify-center rounded-lg border border-border/80 bg-black px-2 py-3 text-center text-[11px] text-white/70">
+      <div className="flex aspect-[4/3] w-full items-center justify-center rounded-lg border border-border/80 bg-black px-2 py-3 text-center text-2xs text-white/70">
         {file.name}
       </div>
     );
@@ -2121,7 +2142,7 @@ function UserTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "message"
                     />
                   </button>
                 ) : (
-                  <div className="flex min-h-[72px] items-center justify-center px-2 py-3 text-center text-secondary-label text-[11px]">
+                  <div className="flex min-h-[72px] items-center justify-center px-2 py-3 text-center text-secondary-label text-2xs">
                     {image.name}
                   </div>
                 )}
@@ -2381,6 +2402,7 @@ function AssistantTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "mess
             skills={ctx.skills}
             headingLevelOffset={MESSAGE_HEADING_LEVEL}
             onUseArtifactTemplate={ctx.onUseArtifactTemplate}
+            onRunShellCommand={ctx.onRunShellCommand}
             onImageExpand={ctx.onImageExpand}
           />
         </AssistantCitationSource>
@@ -2561,8 +2583,9 @@ function BackgroundWorktreeSetupChip({ snapshot }: { snapshot: WorktreeSetupSnap
       <PopoverTrigger
         render={
           <Button
-            variant="chip"
-            className="ml-auto inline-flex h-5 min-w-0 shrink-0 items-center gap-1 rounded-full border border-border/70 px-2 text-xs text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
+            variant="ghost-muted"
+            size="micro"
+            className="ml-auto min-w-0 shrink-0"
             aria-label={`${scriptName} is still running. Show setup progress.`}
           />
         }
@@ -2570,12 +2593,7 @@ function BackgroundWorktreeSetupChip({ snapshot }: { snapshot: WorktreeSetupSnap
         <Spinner size="xs" className="shrink-0" />
         <span className="truncate">{scriptName}</span>
       </PopoverTrigger>
-      <PopoverPopup
-        side="bottom"
-        align="end"
-        className="surface-glass! w-[28rem] max-w-[calc(100vw-2rem)]"
-        viewportClassName="py-3 [--viewport-inline-padding:--spacing(3)]"
-      >
+      <PopoverPopup side="bottom" align="end" width="lg" padding="compact">
         <WorktreeSetupCard
           snapshot={snapshot}
           embedded
@@ -2766,10 +2784,10 @@ function ReasoningTraceBlock({
           type="button"
           aria-expanded={expanded}
           onClick={() => ctx.onToggleReasoning(first.id, !expanded, anchorKey)}
-          className="flex min-h-6 cursor-pointer select-none items-center gap-1.5 rounded-md px-0.5 text-start text-sm leading-relaxed transition-colors hover:bg-accent/20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"
+          className="flex min-h-6 cursor-pointer select-none items-center gap-1.5 rounded-md ps-0.5 pe-2 text-start text-sm leading-relaxed transition-colors hover:bg-accent/20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"
         >
           <span className="flex size-6 shrink-0 items-center justify-center text-icon-muted">
-            <BrainIcon aria-hidden className="block size-4 shrink-0 stroke-[1.8] opacity-70" />
+            <BrainIcon aria-hidden className="block size-4 shrink-0 stroke-2 opacity-70" />
           </span>
           <span
             ref={streaming ? observeVisibleAnimation : undefined}
@@ -2842,7 +2860,7 @@ const ReasoningTimelineRow = memo(function ReasoningTimelineRow({
         className="flex cursor-pointer select-none items-center gap-1.5 rounded-md px-0.5 py-0.5 text-start transition-colors hover:bg-accent/20 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring/70"
       >
         <span className="flex size-6 shrink-0 items-center justify-center text-icon-muted">
-          <BrainIcon aria-hidden className="block size-4 shrink-0 stroke-[1.8] opacity-70" />
+          <BrainIcon aria-hidden className="block size-4 shrink-0 stroke-2 opacity-70" />
         </span>
         <span className="flex min-w-0 flex-1 items-center gap-1.5">
           <span className="relative min-w-0 flex-1 truncate text-secondary-label text-sm leading-relaxed">
@@ -3221,7 +3239,7 @@ function LiveActivityContent({
           <ToolActivityIconView
             icon={toolIcon}
             fallbackName={iconName}
-            className="block size-4 shrink-0 stroke-[1.8]"
+            className="block size-4 shrink-0 stroke-2"
             muted={!highlighted}
           />
         </span>
@@ -3245,7 +3263,10 @@ function LiveWorkEntryTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "
       />
     );
   }
-  const label = liveWorkEntryLabel(row.entry, ctx.workspaceRoot, row.active);
+  const questionHeading = row.entry.questionAnswer
+    ? getQuestionTextPreview(row.entry.questionAnswer)
+    : "";
+  const label = questionHeading || liveWorkEntryLabel(row.entry, ctx.workspaceRoot, row.active);
   const failed = workEntryDisplayIndicatesToolFailure(row.entry);
 
   return (
@@ -3258,17 +3279,10 @@ function LiveWorkEntryTimelineRow({ row }: { row: Extract<TimelineRow, { kind: "
     >
       <LiveActivityRow
         label={
-          row.entry.questionAnswer ? (
+          row.entry.questionAnswer && hasQuestionAnswer(row.entry.questionAnswer) ? (
             <span className="flex min-w-0 gap-1.5">
-              <span className="shrink-0">{label}</span>
-              <span
-                className={cn(
-                  "truncate",
-                  !row.expanded && hasQuestionAnswer(row.entry.questionAnswer)
-                    ? "text-foreground"
-                    : "text-muted-foreground",
-                )}
-              >
+              <span className="min-w-0 truncate">{label}</span>
+              <span className="min-w-0 truncate text-foreground">
                 {getQuestionAnswerPreview(row.entry.questionAnswer)}
               </span>
             </span>
@@ -3342,7 +3356,7 @@ function WorkGroupToggleTimelineRow({
           fallbackName={
             row.summaryToolIcon ?? row.toolSurface ?? toolGroupSummaryIconName(row.summaryKind)
           }
-          className="size-4 shrink-0 stroke-[1.8]"
+          className="size-4 shrink-0 stroke-2"
           muted
         />
       </span>
@@ -3454,14 +3468,10 @@ function UserMessageMentionChip(props: {
     <Tooltip>
       <TooltipTrigger
         render={
-          <button
-            type="button"
+          <ContextChip
+            kind="mention"
+            render={<button type="button" />}
             aria-label={`Preview ${props.record.path}`}
-            className={cn(
-              CHAT_INLINE_CHIP_CLASS_NAME,
-              CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.mention,
-              "cursor-pointer focus-visible:outline-2",
-            )}
             data-markdown-copy={props.copyMarkdown}
             onClick={() => {
               if (ctx.threadRef)
@@ -3472,10 +3482,9 @@ function UserMessageMentionChip(props: {
               pathValue={props.record.path}
               kind={inferEntryKindFromPath(props.record.path)}
               theme={ctx.resolvedTheme}
-              className={COMPOSER_INLINE_CHIP_ICON_CLASS_NAME}
             />
-            <span className={CHAT_INLINE_CHIP_LABEL_CLASS_NAME}>{props.record.label}</span>
-          </button>
+            <ContextChipLabel>{props.record.label}</ContextChipLabel>
+          </ContextChip>
         }
       />
       <TooltipPopup>{props.record.path}</TooltipPopup>
@@ -3489,21 +3498,16 @@ function UserMessageContextChip(props: {
   kindLabel?: string;
   copyMarkdown: string;
   tooltip?: string;
-  toneClassName?: string;
-  interactive?: boolean;
-  unresolved?: boolean;
+  kind: ContextChipKind;
 }) {
   return (
     <ContextChipShell
+      kind={props.kind}
       icon={props.icon}
       label={props.label}
-      className={cn(CHAT_INLINE_CHIP_CLASS_NAME, props.toneClassName)}
-      labelClassName={CHAT_INLINE_CHIP_LABEL_CLASS_NAME}
       aria-label={props.kindLabel ? `${props.kindLabel}, ${props.label}` : undefined}
       data-markdown-copy={props.copyMarkdown}
       tooltip={props.tooltip}
-      interactive={props.interactive === true}
-      unresolved={props.unresolved === true}
     />
   );
 }
@@ -3511,7 +3515,7 @@ function UserMessageContextChip(props: {
 function UserMessagePullRequestContextChip(props: {
   record: Extract<KnownComposerContextRecord, { kind: "review-comment" }>;
   copyMarkdown: string;
-  toneClassName: string;
+  kind: ContextChipKind;
 }) {
   const { activeThreadEnvironmentId, openPullRequest } = use(TimelineRowCtx);
   const metadata = props.record.pullRequest;
@@ -3522,8 +3526,7 @@ function UserMessagePullRequestContextChip(props: {
       environmentId={activeThreadEnvironmentId}
       label={reviewCommentContextLabel(props.record)}
       kindLabel={pullRequestContextKindLabel(props.record)}
-      className={cn(CHAT_INLINE_CHIP_CLASS_NAME, props.toneClassName)}
-      labelClassName={CHAT_INLINE_CHIP_LABEL_CLASS_NAME}
+      kind={props.kind}
       copyMarkdown={props.copyMarkdown}
       onOpen={openPullRequest}
     />
@@ -3569,7 +3572,7 @@ function UserMessagePreviewAnnotationDetails(props: {
             {props.record.comment}
           </div>
         ) : null}
-        <div className="mt-1 flex items-center gap-2 text-secondary-label text-[10px]">
+        <div className="mt-1 flex items-center gap-2 text-secondary-label text-3xs">
           {props.record.targetSummary ? (
             <span className="truncate">{props.record.targetSummary}</span>
           ) : null}
@@ -3601,7 +3604,7 @@ function UserMessagePreviewAnnotationDetails(props: {
                     ) : null}
                   </div>
                   {element.htmlPreview?.trim() ? (
-                    <pre className="mt-1 max-h-24 overflow-auto whitespace-pre-wrap rounded bg-muted/60 px-2 py-1.5 text-[10px] leading-relaxed">
+                    <pre className="mt-1 max-h-24 overflow-auto whitespace-pre-wrap rounded bg-muted/60 px-2 py-1.5 text-3xs leading-relaxed">
                       {element.htmlPreview.trim()}
                     </pre>
                   ) : null}
@@ -3609,7 +3612,7 @@ function UserMessagePreviewAnnotationDetails(props: {
               );
             })}
             {(props.record.elements?.length ?? 0) > visibleElements.length ? (
-              <div className="text-secondary-label text-[10px]">
+              <div className="text-secondary-label text-3xs">
                 {(props.record.elements?.length ?? 0) - visibleElements.length} more selected
                 elements
               </div>
@@ -3635,7 +3638,7 @@ function UserMessageElementDetails({
         <div className="truncate text-message-foreground text-xs font-medium">
           {record.pageTitle?.trim() || record.pageUrl}
         </div>
-        <div className="mt-0.5 truncate text-secondary-label text-[10px]">{record.pageUrl}</div>
+        <div className="mt-0.5 truncate text-secondary-label text-3xs">{record.pageUrl}</div>
       </div>
       <div className="space-y-2 px-3 py-2.5">
         <div className="flex min-w-0 items-center gap-2 text-xs">
@@ -3676,11 +3679,8 @@ function UnavailableUserMessageContextChip(props: UserMessageContextRenderContex
   return (
     <UnresolvedChip
       label={props.reference.label}
-      className={CHAT_INLINE_CHIP_CLASS_NAME}
-      labelClassName={CHAT_INLINE_CHIP_LABEL_CLASS_NAME}
       copyMarkdown={props.copyMarkdown}
       tooltip="This context is no longer available."
-      tooltipClassName="max-w-96 whitespace-pre-wrap leading-tight"
     />
   );
 }
@@ -3708,18 +3708,12 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
       render: (record, context) =>
         record.kind === "skill" ? (
           <UserMessageContextChip
-            icon={
-              <span
-                aria-hidden="true"
-                className={COMPOSER_INLINE_CHIP_ICON_CLASS_NAME}
-                dangerouslySetInnerHTML={{ __html: SKILL_CHIP_ICON_SVG }}
-              />
-            }
+            icon={<SkillChipIcon />}
             label={record.label || record.name}
             kindLabel="Skill"
             tooltip={`$${record.name}`}
             copyMarkdown={context.copyMarkdown}
-            toneClassName={CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.skill}
+            kind="skill"
           />
         ) : (
           <UnavailableUserMessageContextChip {...context} />
@@ -3744,8 +3738,6 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
           <ImageChipButton
             name={record.name}
             previewUrl={attachment.previewUrl}
-            className={CHAT_INLINE_CHIP_CLASS_NAME}
-            labelClassName={CHAT_INLINE_CHIP_LABEL_CLASS_NAME}
             size={formatAttachmentSize(record.sizeBytes)}
             data-markdown-copy={context.copyMarkdown}
             onClick={() => context.onExpandImage(attachment)}
@@ -3778,8 +3770,6 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
             size={size}
             isVideo={isVideo}
             theme={context.resolvedTheme}
-            className={CHAT_INLINE_CHIP_CLASS_NAME}
-            labelClassName={CHAT_INLINE_CHIP_LABEL_CLASS_NAME}
             disabled={disabled}
             accessibleLabel={`${isVideo ? "Video" : "File"} attachment, ${record.name}, ${size}`}
             copyMarkdown={context.copyMarkdown}
@@ -3798,7 +3788,6 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
         record.kind === "terminal" ? (
           <span data-markdown-copy={context.copyMarkdown}>
             <TerminalContextInlineChip
-              surface="transcript"
               label={record.label}
               terminalLabel={record.terminalLabel}
               lineStart={record.lineStart}
@@ -3819,24 +3808,9 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
           <UserMessageContextPopover
             copyMarkdown={context.copyMarkdown}
             accessibleLabel={`Browser element, ${record.label}`}
-            chip={
-              <UserMessageContextChip
-                icon={
-                  <MousePointerClickIcon
-                    className={cn(
-                      COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                      CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES.element,
-                      "size-3.5",
-                    )}
-                  />
-                }
-                label={record.label}
-                kindLabel="Browser element"
-                copyMarkdown={context.copyMarkdown}
-                interactive
-                toneClassName={CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.element}
-              />
-            }
+            kind="element"
+            icon={<MousePointerClickIcon />}
+            label={record.label}
           >
             <UserMessageElementDetails record={record} />
           </UserMessageContextPopover>
@@ -3860,7 +3834,7 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
             <UserMessagePullRequestContextChip
               record={record}
               copyMarkdown={context.copyMarkdown}
-              toneClassName={PULL_REQUEST_INLINE_CHIP_TONE_CLASS_NAMES[pullRequestState]}
+              kind={PULL_REQUEST_CHIP_KINDS[pullRequestState]}
             />
           );
         }
@@ -3868,38 +3842,9 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
           <UserMessageContextPopover
             copyMarkdown={context.copyMarkdown}
             accessibleLabel={`${kindLabel}, ${label}${record.pullRequest ? `, ${record.pullRequest.title}` : ""}`}
-            chip={
-              <UserMessageContextChip
-                icon={
-                  isPullRequest ? (
-                    <PullRequestGlyph.pullRequest
-                      className={cn(
-                        COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                        CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES["pull-request"],
-                        "size-3.5",
-                      )}
-                    />
-                  ) : (
-                    <MessageCircleIcon
-                      className={cn(
-                        COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                        CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES["review-comment"],
-                        "size-3.5",
-                      )}
-                    />
-                  )
-                }
-                label={label}
-                kindLabel={kindLabel}
-                copyMarkdown={context.copyMarkdown}
-                interactive
-                toneClassName={
-                  isPullRequest
-                    ? PULL_REQUEST_INLINE_CHIP_TONE_CLASS_NAMES[pullRequestState]
-                    : CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES["review-comment"]
-                }
-              />
-            }
+            kind={isPullRequest ? PULL_REQUEST_CHIP_KINDS[pullRequestState] : "review-comment"}
+            icon={isPullRequest ? <PullRequestGlyph.pullRequest /> : <MessageCircleIcon />}
+            label={label}
           >
             <UserMessageReviewCommentCard
               comment={{
@@ -3930,24 +3875,9 @@ const userMessageContextPresentationRegistry = createContextPresentationRegistry
           <UserMessageContextPopover
             copyMarkdown={context.copyMarkdown}
             accessibleLabel={`Preview annotation, ${record.label}`}
-            chip={
-              <UserMessageContextChip
-                icon={
-                  <MousePointerClickIcon
-                    className={cn(
-                      COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                      CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES["preview-annotation"],
-                      "size-3.5",
-                    )}
-                  />
-                }
-                label={record.label}
-                kindLabel="Preview annotation"
-                copyMarkdown={context.copyMarkdown}
-                interactive
-                toneClassName={CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES["preview-annotation"]}
-              />
-            }
+            kind="preview-annotation"
+            icon={<MousePointerClickIcon />}
+            label={record.label}
           >
             <UserMessagePreviewAnnotationDetails record={record} image={context.annotationImage} />
           </UserMessageContextPopover>
@@ -4053,11 +3983,11 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop
             <Button
               type="button"
               size="xs"
-              variant="ghost"
+              variant="ghost-muted"
               aria-expanded={expanded}
               data-scroll-anchor-ignore
               onClick={() => setExpanded((value) => !value)}
-              className="-ml-1 h-6 rounded-md px-1.5 text-secondary-label text-xs hover:bg-muted/55 hover:text-message-foreground"
+              className="-ml-1"
             >
               {expanded ? "Show less" : "Show full message"}
             </Button>
@@ -4110,7 +4040,7 @@ function UserMessageReviewCommentCard({ comment }: { comment: ReviewCommentConte
         <div className="text-message-foreground text-xs font-medium">
           {formatWorkspaceRelativePath(comment.filePath, ctx.workspaceRoot)}
         </div>
-        <div className="text-secondary-label text-[11px]">
+        <div className="text-secondary-label text-2xs">
           {comment.sectionTitle} · {comment.rangeLabel}
         </div>
       </div>
@@ -4243,30 +4173,6 @@ function BrowserAppIcon({ className }: { className: string }) {
   );
 }
 
-function ComputerUseAppIcon({ className }: { className: string }) {
-  const gradientId = `${useId().replaceAll(":", "")}-computer-use-app-gradient`;
-  return (
-    <svg viewBox="0 0 24 24" className={className} aria-hidden>
-      <defs>
-        <linearGradient id={gradientId} x1="2" y1="2" x2="22" y2="22">
-          <stop offset="0" stopColor="#00dff0" />
-          <stop offset="0.42" stopColor="#3b9cff" />
-          <stop offset="0.72" stopColor="#b044f5" />
-          <stop offset="1" stopColor="#ff78b6" />
-        </linearGradient>
-      </defs>
-      <rect x="1" y="1" width="22" height="22" rx="5" fill={`url(#${gradientId})`} />
-      <path
-        d="m7.2 6.2 10.5 4.1-4.2 2.1-2 4.7z"
-        fill="white"
-        stroke="#315cff"
-        strokeWidth="1.1"
-        strokeLinejoin="round"
-      />
-    </svg>
-  );
-}
-
 function ToolActivityIconView(props: {
   icon: ToolActivityIcon | undefined;
   fallbackName: WorkEntryIconName;
@@ -4274,7 +4180,7 @@ function ToolActivityIconView(props: {
   muted: boolean;
 }) {
   const { resolvedTheme } = use(TimelineRowCtx);
-  const fallbackClassName = cn(props.className, props.muted && "opacity-70 light:brightness-[.6]");
+  const fallbackClassName = cn(props.className, props.muted && "opacity-70 light:brightness-60");
   if (!props.icon) {
     return <WorkEntryIcon name={props.fallbackName} className={fallbackClassName} />;
   }
@@ -4334,7 +4240,7 @@ function NativeAppToolActivityIcon(props: {
     return (
       <WorkEntryIcon
         name={props.fallbackName}
-        className={cn(props.className, props.muted && "opacity-70 light:brightness-[.6]")}
+        className={cn(props.className, props.muted && "opacity-70 light:brightness-60")}
       />
     );
   }
@@ -4379,14 +4285,14 @@ function ToolActivityImageIcon(props: {
       {displayedSrc === null ? (
         <WorkEntryIcon
           name={props.fallbackName}
-          className={cn(props.className, props.muted && "opacity-70 light:brightness-[.6]")}
+          className={cn(props.className, props.muted && "opacity-70 light:brightness-60")}
         />
       ) : null}
       {displayedSrc ? (
         <span
           className={cn(
             props.className,
-            "inline-block overflow-hidden rounded-[3px] bg-background",
+            "inline-block overflow-hidden rounded-xs bg-background",
             props.muted && "opacity-70",
           )}
         >
@@ -4396,7 +4302,7 @@ function ToolActivityImageIcon(props: {
             aria-hidden
             decoding="async"
             referrerPolicy="no-referrer"
-            className={cn("block size-full object-contain", props.muted && "light:brightness-[.6]")}
+            className={cn("block size-full object-contain", props.muted && "light:brightness-60")}
             onError={() => handleLoadError(displayedSrc)}
           />
         </span>
@@ -4476,7 +4382,7 @@ function workToneIcon(tone: TimelineWorkEntry["tone"]): {
   if (tone === "thinking") {
     return {
       iconName: "brain",
-      className: "text-foreground",
+      className: "text-icon-muted",
     };
   }
   if (tone === "info") {
@@ -4550,7 +4456,7 @@ function buildToolCallExpandedBody(
 }
 
 const toolCallExpandedBodyClassName =
-  "max-h-64 cursor-text overflow-auto whitespace-pre-wrap break-words font-mono text-secondary-label text-[length:var(--font-size-code,0.6875rem)] leading-relaxed select-text";
+  "max-h-64 cursor-text overflow-auto whitespace-pre-wrap break-words font-mono text-secondary-label text-(length:--font-size-code,var(--text-2xs)) leading-relaxed select-text";
 
 function workEntryIconName(workEntry: TimelineWorkEntry): WorkEntryIconName {
   if (
@@ -4761,12 +4667,12 @@ function AgentSpawnMemberRow({
             {agent.title}
           </span>
           {role ? (
-            <span className="max-w-28 shrink-0 truncate rounded-sm border border-border/60 px-1 font-mono text-[.65rem] text-muted-foreground">
+            <span className="max-w-28 shrink-0 truncate rounded-sm border border-border/60 px-1 font-mono text-3xs text-muted-foreground">
               {role}
             </span>
           ) : null}
         </p>
-        <span className="shrink-0 font-mono text-[.7rem] tabular-nums text-muted-foreground">
+        <span className="shrink-0 font-mono text-2xs tabular-nums text-muted-foreground">
           {statusLabel}
         </span>
       </div>
@@ -4851,10 +4757,18 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
     showWarningIndicator || showDestructiveRowStyle
       ? undefined
       : (workEntry.toolIcon ?? workEntry.toolSource?.icon);
-  const previewText = displayLabel ?? workEntryDisplayLabel(workEntry, workspaceRoot);
-  const answerPreview = workEntry.questionAnswer
-    ? getQuestionAnswerPreview(workEntry.questionAnswer)
-    : null;
+  // The question is the row's identity: a generic "User input submitted"
+  // label buries what was asked, so lead with the question text and keep the
+  // answer as the trailing preview.
+  const questionHeading = workEntry.questionAnswer
+    ? getQuestionTextPreview(workEntry.questionAnswer)
+    : "";
+  const previewText =
+    displayLabel ?? (questionHeading || workEntryDisplayLabel(workEntry, workspaceRoot));
+  const answerPreview =
+    workEntry.questionAnswer && hasQuestionAnswer(workEntry.questionAnswer)
+      ? getQuestionAnswerPreview(workEntry.questionAnswer)
+      : null;
   const viewedImagePath = workEntryViewedImagePath(workEntry);
   const viewedImage =
     viewedImagePath && threadRef
@@ -4942,7 +4856,7 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
           <ToolActivityIconView
             icon={entryToolIcon}
             fallbackName={entryIconName}
-            className="block size-4 shrink-0 stroke-[1.8]"
+            className="block size-4 shrink-0 stroke-2"
             muted
           />
         </span>
@@ -4951,7 +4865,7 @@ const PlainWorkEntryRow = memo(function PlainWorkEntryRow(props: {
             <p className="flex min-w-0 w-full items-baseline gap-1.5 text-sm leading-relaxed">
               <span
                 className={cn(
-                  answerPreview ? "shrink-0" : "min-w-0 flex-1",
+                  answerPreview ? "min-w-0" : "min-w-0 flex-1",
                   expanded ? "whitespace-pre-wrap break-words select-text" : "truncate",
                   headingClass,
                 )}
diff --git a/apps/web/src/components/chat/ModelListRow.tsx b/apps/web/src/components/chat/ModelListRow.tsx
index 5917b4e2ca24..36de2e0362fe 100644
--- a/apps/web/src/components/chat/ModelListRow.tsx
+++ b/apps/web/src/components/chat/ModelListRow.tsx
@@ -52,12 +52,10 @@ export const ModelListRow = memo(function ModelListRow(props: {
       index={props.index}
       value={modelPickerModelKey(props.instanceId, props.model.slug)}
       disabled={Boolean(props.disabledReason)}
-      contentClassName="flex w-full items-center gap-3"
       className={cn(
-        "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2 transition-[background-color,box-shadow,color]",
-        "hover:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] data-highlighted:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] data-selected:bg-foreground/[0.08] data-selected:text-foreground data-selected:ring-0 [&[data-highlighted][data-selected]]:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))]",
+        "group relative w-full !min-w-0 max-w-full cursor-pointer",
         props.disabledReason &&
-          "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
+          "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed",
       )}
     >
       <div className="min-w-0 flex-1 text-left">
@@ -72,7 +70,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
           </div>
           {props.showNewBadge ? (
             <span
-              className="shrink-0 rounded border border-update/35 bg-update/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-update-foreground"
+              className="shrink-0 rounded border border-update/35 bg-update/15 px-0.5 py-px text-3xs font-bold uppercase leading-none tracking-wide text-update-foreground"
               aria-label="New model"
             >
               New
@@ -98,19 +96,14 @@ export const ModelListRow = memo(function ModelListRow(props: {
         {props.showSelection && props.isSelected ? (
           <CheckIcon className="size-3.5" aria-hidden="true" />
         ) : null}
-        {props.jumpLabel ? (
-          <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
-        ) : null}
+        {props.jumpLabel ? <Kbd>{props.jumpLabel}</Kbd> : null}
         <Tooltip>
           <TooltipTrigger
             render={
               <Button
                 size="icon-xs"
-                variant="ghost"
-                className={cn(
-                  "-mr-1 shrink-0 text-muted-foreground/70 opacity-64 transition-[color,opacity] hover:text-foreground hover:opacity-100 group-hover:opacity-100",
-                  props.isFavorite && "text-foreground opacity-100",
-                )}
+                variant="ghost-muted"
+                className="-mr-1 shrink-0"
                 onClick={(event) => {
                   event.stopPropagation();
                   props.onToggleFavorite();
@@ -124,7 +117,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
                 <StarIcon
                   className={cn(
                     "size-3.5 sm:size-3",
-                    props.isFavorite && "fill-current text-yellow-500",
+                    props.isFavorite && "fill-current text-warning",
                   )}
                 />
               </Button>
@@ -145,7 +138,7 @@ export const ModelListRow = memo(function ModelListRow(props: {
   return (
     <Tooltip>
       <TooltipTrigger render={row} />
-      <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
+      <TooltipPopup side="left" align="center">
         {props.disabledReason}
       </TooltipPopup>
     </Tooltip>
diff --git a/apps/web/src/components/chat/ModelPickerContent.tsx b/apps/web/src/components/chat/ModelPickerContent.tsx
index d66065b0e572..57a04b1a2f24 100644
--- a/apps/web/src/components/chat/ModelPickerContent.tsx
+++ b/apps/web/src/components/chat/ModelPickerContent.tsx
@@ -8,7 +8,7 @@ import { resolveSelectableModel } from "@t3tools/shared/model";
 import { useAtomValue } from "@effect/atom-react";
 import { LegendList, type LegendListRef } from "@legendapp/list/react";
 import { memo, useMemo, useState, useCallback, useEffect, useLayoutEffect, useRef } from "react";
-import { ChevronRightIcon, SearchIcon } from "lucide-react";
+import { ChevronRightIcon } from "lucide-react";
 import { ModelListRow } from "./ModelListRow";
 import { ModelPickerSidebar } from "./ModelPickerSidebar";
 import { getProviderStatusMessage, hasProviderSetup } from "./ProviderStatusBanner";
@@ -22,7 +22,7 @@ import { buildModelPickerSearchText, scoreModelPickerSearch } from "./modelPicke
 import {
   Combobox,
   ComboboxEmpty,
-  ComboboxInput,
+  ComboboxSearchInput,
   ComboboxItem,
   ComboboxListVirtualized,
 } from "../ui/combobox";
@@ -39,7 +39,7 @@ import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings"
 import { cn } from "~/lib/utils";
 import { getVirtualizedScrollFadeClassName } from "../ui/scroll-area";
 import { TooltipProvider } from "../ui/tooltip";
-import { Button } from "../ui/button";
+import { InlineButton } from "../ui/button";
 import {
   isProviderInstancePickerReady,
   isProviderInstancePickerVisible,
@@ -882,81 +882,66 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
               showSidebar && "border-l border-border/70",
             )}
           >
-            {/* Search bar */}
-            <div className="px-2 pt-2">
-              <div className="border-b border-border/70 pb-2.5 transition-colors focus-within:border-ring">
-                <ComboboxInput
-                  ref={searchInputRef}
-                  className="[&_input]:h-6.5 [&_input]:font-sans [&_input]:leading-6.5"
-                  inputClassName="rounded-none bg-transparent text-sm"
-                  placeholder="Search models..."
-                  showTrigger={false}
-                  startAddon={
-                    <SearchIcon className="-translate-x-0.5 size-4 shrink-0 text-muted-foreground opacity-70" />
-                  }
-                  value={searchQuery}
-                  onChange={(e) => setSearchQuery(e.target.value)}
-                  onKeyDown={(e) => {
-                    if (
-                      showSidebar &&
-                      !e.altKey &&
-                      !e.ctrlKey &&
-                      !e.metaKey &&
-                      ((e.key === "ArrowLeft" && !e.shiftKey && searchQuery.length === 0) ||
-                        (e.key === "Tab" && e.shiftKey))
-                    ) {
-                      const sidebar = e.currentTarget
-                        .closest("[data-model-picker-content]")
-                        ?.querySelector("[data-model-picker-sidebar]");
-                      const button =
-                        sidebar?.querySelector<HTMLButtonElement>(
-                          'button[aria-pressed="true"]:not(:disabled)',
-                        ) ?? sidebar?.querySelector<HTMLButtonElement>("button:not(:disabled)");
-                      if (button) {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        button.focus();
-                        return;
-                      }
-                    }
-                    if (e.key === "Escape") {
-                      e.preventDefault();
-                      e.stopPropagation();
-                      props.onRequestClose?.();
-                      return;
-                    }
-                    if (e.key === "Enter" && highlightedModelKeyRef.current) {
-                      (
-                        e as typeof e & { preventBaseUIHandler?: () => void }
-                      ).preventBaseUIHandler?.();
-                      e.preventDefault();
-                      e.stopPropagation();
-                      const legacyInstanceId = parseModelPickerLegacySectionKey(
-                        highlightedModelKeyRef.current,
-                      );
-                      if (legacyInstanceId) {
-                        toggleLegacySection(legacyInstanceId);
-                        return;
-                      }
-                      const model = parseModelPickerModelKey(highlightedModelKeyRef.current);
-                      if (model) {
-                        handleModelSelect(model.slug, model.instanceId, e.shiftKey);
-                      }
-                      return;
-                    }
+            <ComboboxSearchInput
+              ref={searchInputRef}
+              placeholder="Search models..."
+              value={searchQuery}
+              onChange={(e) => setSearchQuery(e.target.value)}
+              onKeyDown={(e) => {
+                if (
+                  showSidebar &&
+                  !e.altKey &&
+                  !e.ctrlKey &&
+                  !e.metaKey &&
+                  ((e.key === "ArrowLeft" && !e.shiftKey && searchQuery.length === 0) ||
+                    (e.key === "Tab" && e.shiftKey))
+                ) {
+                  const sidebar = e.currentTarget
+                    .closest("[data-model-picker-content]")
+                    ?.querySelector("[data-model-picker-sidebar]");
+                  const button =
+                    sidebar?.querySelector<HTMLButtonElement>(
+                      'button[aria-pressed="true"]:not(:disabled)',
+                    ) ?? sidebar?.querySelector<HTMLButtonElement>("button:not(:disabled)");
+                  if (button) {
+                    e.preventDefault();
                     e.stopPropagation();
-                  }}
-                  onMouseDown={(e) => e.stopPropagation()}
-                  onTouchStart={(e) => e.stopPropagation()}
-                  size="sm"
-                  unstyled
-                />
-              </div>
-            </div>
+                    button.focus();
+                    return;
+                  }
+                }
+                if (e.key === "Escape") {
+                  e.preventDefault();
+                  e.stopPropagation();
+                  props.onRequestClose?.();
+                  return;
+                }
+                if (e.key === "Enter" && highlightedModelKeyRef.current) {
+                  (e as typeof e & { preventBaseUIHandler?: () => void }).preventBaseUIHandler?.();
+                  e.preventDefault();
+                  e.stopPropagation();
+                  const legacyInstanceId = parseModelPickerLegacySectionKey(
+                    highlightedModelKeyRef.current,
+                  );
+                  if (legacyInstanceId) {
+                    toggleLegacySection(legacyInstanceId);
+                    return;
+                  }
+                  const model = parseModelPickerModelKey(highlightedModelKeyRef.current);
+                  if (model) {
+                    handleModelSelect(model.slug, model.instanceId, e.shiftKey);
+                  }
+                  return;
+                }
+                e.stopPropagation();
+              }}
+              onMouseDown={(e) => e.stopPropagation()}
+              onTouchStart={(e) => e.stopPropagation()}
+            />
 
             {/* Model list */}
             <div className="relative min-h-0 flex-1 overflow-hidden pr-px">
-              <ComboboxListVirtualized className="not-empty:p-0">
+              <ComboboxListVirtualized>
                 <LegendList<string>
                   ref={modelListRef}
                   data={filteredItemKeys}
@@ -970,8 +955,7 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
                           index={index}
                           value={modelKey}
                           aria-expanded={legacySection.isExpanded}
-                          className="group w-full cursor-pointer rounded-md px-2 py-2"
-                          contentClassName="flex w-full items-center gap-3"
+                          className="group w-full cursor-pointer"
                         >
                           <div className="min-w-0 flex-1 text-left">
                             <div className="text-xs font-medium leading-snug">Legacy models</div>
@@ -1047,26 +1031,22 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
                     <p className="line-clamp-3 text-muted-foreground">
                       {getProviderStatusMessage(entry.snapshot)}
                     </p>
-                    <Button
-                      className="mt-1 px-0 text-foreground"
+                    <InlineButton
+                      className="mt-1"
                       onClick={() => {
                         props.onRequestClose?.();
                         props.onOpenProviderSetup?.(entry.instanceId);
                       }}
-                      size="xs"
-                      variant="link"
                     >
                       {providerSetupEntries.length > 1
                         ? `Set up ${entry.displayName}`
                         : "Open provider setup"}
-                    </Button>
+                    </InlineButton>
                   </div>
                 ))}
               </div>
             ) : (
-              <ComboboxEmpty className="not-empty:py-6 empty:h-0 text-xs font-normal leading-snug">
-                No models found
-              </ComboboxEmpty>
+              <ComboboxEmpty className="empty:h-0">No models found</ComboboxEmpty>
             )}
           </div>
         </Combobox>
diff --git a/apps/web/src/components/chat/ModelPickerSidebar.tsx b/apps/web/src/components/chat/ModelPickerSidebar.tsx
index 19a542d2aa2f..d043c053a073 100644
--- a/apps/web/src/components/chat/ModelPickerSidebar.tsx
+++ b/apps/web/src/components/chat/ModelPickerSidebar.tsx
@@ -39,7 +39,6 @@ const NEW_BADGE_CLASS = `${BADGE_BASE_CLASS} text-update-foreground `;
 /** Opens toward the rail so the list stays readable (not over the model names). */
 const PICKER_TOOLTIP_SIDE = "left" as const;
 const PICKER_TOOLTIP_SIDE_OFFSET = 8;
-const PICKER_TOOLTIP_CLASS = "max-w-64 text-balance font-normal leading-snug";
 
 export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
   selectedInstanceId: ProviderInstanceId | "favorites";
@@ -124,7 +123,7 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
                     render={
                       <Toolbar.Button
                         className={cn(
-                          "relative isolate flex w-full cursor-pointer aspect-square items-center justify-center rounded-md transition-colors hover:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] focus-visible:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] focus-visible:outline-none",
+                          "relative isolate flex w-full cursor-pointer aspect-square items-center justify-center rounded-md transition-colors hover:bg-foreground/10 focus-visible:bg-foreground/10 focus-visible:outline-none",
                         )}
                         onClick={() => handleSelect("favorites")}
                         type="button"
@@ -139,7 +138,6 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
                     side={PICKER_TOOLTIP_SIDE}
                     sideOffset={PICKER_TOOLTIP_SIDE_OFFSET}
                     align="center"
-                    className={PICKER_TOOLTIP_CLASS}
                   >
                     Favorites
                   </TooltipPopup>
@@ -173,7 +171,7 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
             const button = (
               <Toolbar.Button
                 className={cn(
-                  "relative isolate flex w-full cursor-pointer aspect-square items-center justify-center rounded-md transition-colors hover:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] focus-visible:bg-[color-mix(in_srgb,var(--popover)_90%,var(--contrast-foreground))] focus-visible:outline-none",
+                  "relative isolate flex w-full cursor-pointer aspect-square items-center justify-center rounded-md transition-colors hover:bg-foreground/10 focus-visible:bg-foreground/10 focus-visible:outline-none",
                   isDisabled && "opacity-50 cursor-not-allowed hover:bg-transparent",
                 )}
                 data-provider-accent-color={entry.accentColor}
@@ -212,9 +210,7 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
                         ? "var(--background)"
                         : "color-mix(in oklab, var(--muted) 30%, transparent)"
                   }
-                  {...(entry.accentColor
-                    ? { badgeClassName: "h-3 min-w-3 px-0.5 text-[7px]" }
-                    : {})}
+                  {...(entry.accentColor ? { badgeClassName: "h-3 min-w-3 px-0.5 text-5xs" } : {})}
                 />
                 {showNewBadge ? (
                   <span className={NEW_BADGE_CLASS} aria-hidden>
@@ -242,7 +238,6 @@ export const ModelPickerSidebar = memo(function ModelPickerSidebar(props: {
                     side={PICKER_TOOLTIP_SIDE}
                     sideOffset={PICKER_TOOLTIP_SIDE_OFFSET}
                     align="center"
-                    className={PICKER_TOOLTIP_CLASS}
                   >
                     {tooltip}
                   </TooltipPopup>
diff --git a/apps/web/src/components/chat/OpenInPicker.tsx b/apps/web/src/components/chat/OpenInPicker.tsx
index 0f8f8cbc45c3..3c0b2cd118ed 100644
--- a/apps/web/src/components/chat/OpenInPicker.tsx
+++ b/apps/web/src/components/chat/OpenInPicker.tsx
@@ -332,7 +332,7 @@ export const OpenInPicker = memo(function OpenInPicker({
             onClick={() => openInEditor(preferredEditor)}
           >
             <primaryOption.Icon className={cn("size-4", getOpenInIconClass(primaryOption.kind))} />
-            <MenuItemLabel className="truncate">Open in {primaryOption.label}</MenuItemLabel>
+            <MenuItemLabel>Open in {primaryOption.label}</MenuItemLabel>
             {openFavoriteEditorShortcutLabel && (
               <MenuShortcut>{openFavoriteEditorShortcutLabel}</MenuShortcut>
             )}
@@ -343,7 +343,7 @@ export const OpenInPicker = memo(function OpenInPicker({
             <SquareArrowOutUpRightIcon className="size-4" />
             <MenuItemLabel>Open in…</MenuItemLabel>
           </MenuSubTrigger>
-          <MenuSubPopup className="min-w-32 max-w-[calc(100vw-2rem)]">{editorItems}</MenuSubPopup>
+          <MenuSubPopup>{editorItems}</MenuSubPopup>
         </MenuSub>
       </>
     );
@@ -353,7 +353,6 @@ export const OpenInPicker = memo(function OpenInPicker({
     <Group aria-label="Open in editor">
       <Button
         aria-label={compact ? "Open file in preferred editor" : undefined}
-        className="ps-[8.5px]"
         size="xs"
         variant="outline"
         disabled={!preferredEditor || !openInCwd || remote.mode === "remote-unavailable"}
diff --git a/apps/web/src/components/chat/PanelLayoutControls.tsx b/apps/web/src/components/chat/PanelLayoutControls.tsx
index 8e8e640ee83e..950183addca9 100644
--- a/apps/web/src/components/chat/PanelLayoutControls.tsx
+++ b/apps/web/src/components/chat/PanelLayoutControls.tsx
@@ -78,7 +78,7 @@ export const PanelLayoutControls = memo(function PanelLayoutControls({
             {liveAgentCount > 0 ? (
               <span
                 aria-hidden
-                className="absolute -top-1 -right-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-1 text-[9px] font-semibold tabular-nums text-white"
+                className="absolute -top-1 -right-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-1 text-3xs font-semibold tabular-nums text-white"
               >
                 {liveAgentCount}
               </span>
diff --git a/apps/web/src/components/chat/ProposedPlanCard.tsx b/apps/web/src/components/chat/ProposedPlanCard.tsx
index 9fcfaf4d1744..63dfa7dd134f 100644
--- a/apps/web/src/components/chat/ProposedPlanCard.tsx
+++ b/apps/web/src/components/chat/ProposedPlanCard.tsx
@@ -146,7 +146,7 @@ export const ProposedPlanCard = memo(function ProposedPlanCard({
   };
 
   return (
-    <div className="rounded-[24px] border border-border/80 bg-card/70 p-4 sm:p-5">
+    <div className="rounded-3xl border border-border/80 bg-card/70 p-4 sm:p-5">
       <div className="flex flex-wrap items-center justify-between gap-3">
         <div className="flex min-w-0 items-center gap-2">
           <Badge variant="secondary">Plan</Badge>
@@ -223,7 +223,7 @@ export const ProposedPlanCard = memo(function ProposedPlanCard({
               Enter a path relative to <code>{workspaceRoot ?? "the workspace"}</code>.
             </DialogDescription>
           </DialogHeader>
-          <DialogPanel className="space-y-3">
+          <DialogPanel>
             <label htmlFor={savePathInputId} className="grid gap-1.5">
               <span className="text-xs font-medium text-foreground">Workspace path</span>
               <Input
diff --git a/apps/web/src/components/chat/ProviderInstanceIcon.tsx b/apps/web/src/components/chat/ProviderInstanceIcon.tsx
index b9f7853cd8ec..6c36087a1e29 100644
--- a/apps/web/src/components/chat/ProviderInstanceIcon.tsx
+++ b/apps/web/src/components/chat/ProviderInstanceIcon.tsx
@@ -38,7 +38,7 @@ export const ProviderInstanceIcon = memo(function ProviderInstanceIcon(props: {
       {Icon ? (
         <Icon className={cn("size-5 shrink-0", props.iconClassName)} aria-hidden />
       ) : (
-        <span className={cn("text-[10px] font-semibold leading-none", props.iconClassName)}>
+        <span className={cn("text-3xs font-semibold leading-none", props.iconClassName)}>
           {providerInstanceInitials(props.displayName)}
         </span>
       )}
@@ -55,9 +55,9 @@ export const ProviderInstanceIcon = memo(function ProviderInstanceIcon(props: {
       {props.showBadge ? (
         <span
           className={cn(
-            "pointer-events-none absolute right-0 bottom-0 z-10 flex h-3.5 min-w-3.5 items-center justify-center rounded-full border px-0.5 text-[8px] font-semibold leading-none shadow-sm",
+            "pointer-events-none absolute right-0 bottom-0 z-10 flex h-3.5 min-w-3.5 items-center justify-center rounded-full border px-0.5 text-4xs font-semibold leading-none shadow-sm",
             props.accentColor
-              ? "bg-[var(--provider-accent)] text-white"
+              ? "bg-(--provider-accent) text-white"
               : "bg-card text-muted-foreground",
             props.badgeClassName,
           )}
diff --git a/apps/web/src/components/chat/ProviderModelPicker.test.tsx b/apps/web/src/components/chat/ProviderModelPicker.test.tsx
index 41e86f841ee4..54aa051aa639 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.test.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.test.tsx
@@ -172,8 +172,5 @@ describe("ProviderModelPicker", () => {
     );
 
     expect(markup).toContain(">CP</span>");
-    expect(markup).toContain("size-4");
-    expect(markup).toContain("h-3");
-    expect(markup).toContain("text-[7px]");
   });
 });
diff --git a/apps/web/src/components/chat/ProviderModelPicker.tsx b/apps/web/src/components/chat/ProviderModelPicker.tsx
index 2d1b147fd9bd..05ace6d80b38 100644
--- a/apps/web/src/components/chat/ProviderModelPicker.tsx
+++ b/apps/web/src/components/chat/ProviderModelPicker.tsx
@@ -5,13 +5,12 @@ import {
   type ResolvedKeybindingsConfig,
 } from "@t3tools/contracts";
 import { memo, useEffect, useMemo, useState } from "react";
-import type { VariantProps } from "class-variance-authority";
 import { Badge } from "../ui/badge";
-import { buttonVariants } from "../ui/button";
 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { cn } from "~/lib/utils";
 import { ModelPickerContent, resolveModelPickerSelectedModel } from "./ModelPickerContent";
+import { ChatGptSharingControl } from "./ChatGptSharingControl";
 import { ProviderInstanceIcon } from "./ProviderInstanceIcon";
 import {
   ModelEsque,
@@ -49,7 +48,6 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
   disabled?: boolean;
   terminalOpen?: boolean;
   open?: boolean;
-  triggerVariant?: VariantProps<typeof buttonVariants>["variant"];
   triggerClassName?: string;
   /** Aggregate settings can show a neutral value without claiming one provider is selected. */
   triggerLabel?: string;
@@ -207,7 +205,6 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
         render={
           <ComposerControl
             aria-label={props.triggerAriaLabel ?? allModelNames}
-            variant={props.triggerVariant ?? "ghost"}
             size={size}
             data-chat-provider-model-picker="true"
             className={cn(
@@ -233,13 +230,13 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
                       driverKind={selection.entry.driverKind}
                       displayName={selection.entry.displayName}
                       accentColor={selection.entry.accentColor}
-                      className="size-4 rounded-full bg-[var(--chat-composer-glass-surface,var(--background))] ring-2 ring-[var(--chat-composer-glass-surface,var(--background))]"
+                      className="size-4 rounded-full bg-(--chat-composer-glass-surface,var(--background)) ring-2 ring-(--chat-composer-glass-surface,var(--background))"
                       iconClassName="size-4"
                     />
                   ) : null,
                 )}
               {selectedEntries.length > 3 ? (
-                <span className="relative z-30 flex size-4 items-center justify-center rounded-full bg-[var(--chat-composer-glass-surface,var(--background))] text-[9px] ring-2 ring-[var(--chat-composer-glass-surface,var(--background))]">
+                <span className="relative z-30 flex size-4 items-center justify-center rounded-full bg-(--chat-composer-glass-surface,var(--background)) text-3xs ring-2 ring-(--chat-composer-glass-surface,var(--background))">
                   +{selectedEntries.length - 3}
                 </span>
               ) : null}
@@ -254,7 +251,7 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
               iconClassName={cn("size-4", props.activeProviderIconClassName)}
               indicatorBackground={props.instanceIndicatorBackground ?? "var(--contrast-input)"}
               badgeClassName={cn(
-                "right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-[7px]",
+                "right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-5xs",
                 size === "xs" && "shadow-none",
               )}
             />
@@ -285,8 +282,8 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
       <PopoverPopup
         {...(props.isComposerOwned ? composerFloatingLayerProps : {})}
         align="start"
-        className="before:hidden [--viewport-inline-padding:0]"
-        viewportClassName="overflow-hidden! rounded-[calc(var(--radius-lg)-1px)] p-0 [clip-path:inset(0_round_calc(var(--radius-lg)-1px))]"
+        className="before:hidden"
+        padding="none"
       >
         <ModelPickerContent
           activeInstanceId={activeInstanceId}
@@ -312,6 +309,9 @@ export const ProviderModelPicker = memo(function ProviderModelPicker(props: {
             : {})}
           onInstanceModelChange={handleInstanceModelChange}
         />
+        {props.selectedModels === undefined ? (
+          <ChatGptSharingControl provider={activeEntry?.snapshot ?? null} />
+        ) : null}
       </PopoverPopup>
     </Popover>
   );
diff --git a/apps/web/src/components/chat/ProviderStatusBanner.test.ts b/apps/web/src/components/chat/ProviderStatusBanner.test.ts
new file mode 100644
index 000000000000..a500549e7f7d
--- /dev/null
+++ b/apps/web/src/components/chat/ProviderStatusBanner.test.ts
@@ -0,0 +1,126 @@
+import { describe, expect, it } from "vite-plus/test";
+import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
+import {
+  getProviderStatusBannerKey,
+  getProviderStatusMessage,
+  shouldShowProviderStatusBanner,
+} from "./ProviderStatusBanner";
+
+const provider: ServerProvider = {
+  instanceId: ProviderInstanceId.make("codex-work"),
+  driver: ProviderDriverKind.make("codex"),
+  enabled: true,
+  installed: true,
+  version: "1.0.0",
+  status: "ready",
+  auth: { status: "authenticated" },
+  checkedAt: "2026-09-22T00:00:00Z",
+  models: [],
+  skills: [],
+  slashCommands: [],
+  compatibilityAdvisory: {
+    status: "unsupported",
+    message: "Unsupported version. Use 2.0.0.",
+    recommendedVersion: "2.0.0",
+    recommendedRange: null,
+  },
+};
+
+describe("compatibility banners", () => {
+  it("shows and dismisses a warning on a healthy provider, then clears it after policy relaxation", () => {
+    expect(shouldShowProviderStatusBanner(provider, null)).toBe(true);
+    expect(shouldShowProviderStatusBanner(provider, getProviderStatusBannerKey(provider))).toBe(
+      false,
+    );
+    expect(
+      shouldShowProviderStatusBanner(
+        { ...provider, version: "1.0.1" },
+        getProviderStatusBannerKey(provider),
+      ),
+    ).toBe(true);
+    const relaxed: ServerProvider = {
+      ...provider,
+      compatibilityAdvisory: {
+        ...provider.compatibilityAdvisory!,
+        status: "supported",
+        message: null,
+      },
+    };
+    expect(getProviderStatusBannerKey(relaxed)).toBeNull();
+    expect(getProviderStatusBannerKey({ ...provider, status: "disabled" })).toBeNull();
+    expect(
+      getProviderStatusBannerKey({
+        ...provider,
+        compatibilityAdvisory: { ...provider.compatibilityAdvisory!, status: "graceful" },
+      }),
+    ).toBeNull();
+  });
+
+  it("shows downgrade guidance instead of a broken OpenCode inventory timeout", () => {
+    const message = "This provider version is known to be incompatible. Use 1.14.19.";
+    const broken: ServerProvider = {
+      ...provider,
+      driver: ProviderDriverKind.make("opencode"),
+      version: "2.0.3",
+      status: "error",
+      auth: { status: "unknown" },
+      message: "Failed to load OpenCode provider inventory: Timed out waiting for server start.",
+      compatibilityAdvisory: {
+        status: "broken",
+        message,
+        recommendedVersion: "1.14.19",
+        recommendedRange: ">=1.14.19 <2.0.0",
+      },
+    };
+    expect(shouldShowProviderStatusBanner(broken, null)).toBe(true);
+    const timeoutOnly: ServerProvider = {
+      ...broken,
+      compatibilityAdvisory: {
+        ...broken.compatibilityAdvisory!,
+        status: "supported",
+        message: null,
+      },
+    };
+    expect(shouldShowProviderStatusBanner(broken, getProviderStatusBannerKey(timeoutOnly))).toBe(
+      true,
+    );
+    expect(shouldShowProviderStatusBanner(broken, getProviderStatusBannerKey(broken))).toBe(false);
+    expect(
+      shouldShowProviderStatusBanner(
+        {
+          ...broken,
+          compatibilityAdvisory: { ...broken.compatibilityAdvisory!, message: "Use 1.14.20." },
+        },
+        getProviderStatusBannerKey(broken),
+      ),
+    ).toBe(true);
+    expect(getProviderStatusMessage(broken)).toBe(message);
+    expect(
+      getProviderStatusMessage({
+        ...broken,
+        compatibilityAdvisory: {
+          ...broken.compatibilityAdvisory!,
+          status: "supported",
+          message: null,
+        },
+      }),
+    ).toBe(broken.message);
+    expect(getProviderStatusMessage({ ...broken, auth: { status: "unauthenticated" } })).toBe(
+      broken.message,
+    );
+  });
+
+  it("keeps authentication failures ahead of compatibility warnings even without a probe message", () => {
+    const unauthenticated: ServerProvider = {
+      ...provider,
+      status: "error",
+      auth: { status: "unauthenticated" },
+    };
+    expect(getProviderStatusMessage(unauthenticated)).toBe(
+      "Sign in via the CLI to authenticate again.",
+    );
+    expect(getProviderStatusMessage({ ...unauthenticated, message: "Credentials expired" })).toBe(
+      "Credentials expired",
+    );
+  });
+});
diff --git a/apps/web/src/components/chat/ProviderStatusBanner.tsx b/apps/web/src/components/chat/ProviderStatusBanner.tsx
index 12f9dc04f26a..c83aef7caf51 100644
--- a/apps/web/src/components/chat/ProviderStatusBanner.tsx
+++ b/apps/web/src/components/chat/ProviderStatusBanner.tsx
@@ -1,13 +1,33 @@
 import { type ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
 import { memo } from "react";
 import { InfoIcon, XIcon } from "lucide-react";
-import { cn } from "~/lib/utils";
-import { Button } from "../ui/button";
+import { Alert, AlertAction, AlertDescription, AlertTitle } from "../ui/alert";
+import { Button, InlineButton } from "../ui/button";
 import { formatProviderDriverKindLabel } from "../../providerModels";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 
+/** Unsupported and broken versions fail mid-turn, so they warn even when ready. */
+function getIncompatibleVersion(status: ServerProvider) {
+  const compatibility = status.compatibilityAdvisory;
+  if (status.status === "error" && status.auth.status === "unauthenticated") return null;
+  return compatibility?.status === "broken" ||
+    (status.status === "ready" && compatibility?.status === "unsupported")
+    ? compatibility
+    : null;
+}
+
 export function getProviderStatusBannerKey(status: ServerProvider | null): string | null {
-  if (!status || status.status === "ready" || status.status === "disabled") return null;
+  if (!status || status.status === "disabled") return null;
+  const incompatible = getIncompatibleVersion(status);
+  if (incompatible) {
+    return [
+      status.instanceId,
+      incompatible.status,
+      status.version ?? "",
+      incompatible.message ?? "",
+    ].join("\u0000");
+  }
+  if (status.status === "ready") return null;
   // Antigravity checks saved credentials when a session starts. Its local
   // health check leaves auth unknown after a restart, which is not a failure.
   if (
@@ -39,8 +59,15 @@ export function hasProviderSetup(status: ServerProvider): boolean {
   );
 }
 
-/** Keep the environment's error intact in both the banner and model picker. */
+/** Broken-version guidance takes precedence over startup failures it can cause. */
 export function getProviderStatusMessage(status: ServerProvider): string {
+  if (
+    status.auth.status !== "unauthenticated" &&
+    status.compatibilityAdvisory?.status === "broken" &&
+    status.compatibilityAdvisory.message
+  ) {
+    return status.compatibilityAdvisory.message;
+  }
   if (status.message) return status.message;
   const providerName = status.displayName?.trim() || formatProviderDriverKindLabel(status.driver);
   if (!status.installed && hasProviderSetup(status)) {
@@ -76,55 +103,50 @@ export const ProviderStatusBanner = memo(function ProviderStatusBanner({
 
   const providerName = status.displayName?.trim() || formatProviderDriverKindLabel(status.driver);
   const isUnauthenticated = status.status === "error" && status.auth.status === "unauthenticated";
+  const incompatible = getIncompatibleVersion(status);
   const title = isUnauthenticated
     ? `${providerName} is unauthenticated`
-    : `${providerName} provider status`;
-  const message = getProviderStatusMessage(status);
+    : incompatible
+      ? `${providerName} ${status.version ?? ""} is ${incompatible.status === "broken" ? "known to be broken" : "unsupported"}`
+      : `${providerName} provider status`;
+  const message = incompatible?.message ?? getProviderStatusMessage(status);
+  const isWarning =
+    incompatible?.status !== "broken" && (status.status === "warning" || incompatible !== null);
 
   return (
     <div className="pointer-events-auto mx-auto w-fit max-w-[calc(100%-2rem)] pt-3">
-      <div
-        className={cn(
-          "alert-glass relative inline-flex items-center gap-3 rounded-xl border py-3 ps-3.5 pe-10 text-card-foreground text-sm",
-          status.status === "warning"
-            ? "border-warning/32 [&_svg]:text-warning"
-            : "border-destructive/32 text-destructive-foreground [&_svg]:text-destructive",
-        )}
-        data-variant={status.status === "warning" ? "warning" : "error"}
-        role="alert"
+      <Alert
+        variant={isWarning ? "warning" : "error"}
+        role={incompatible && incompatible.status !== "broken" ? "status" : "alert"}
+        surface="glass"
+        controlAlignment="first-line"
       >
-        <InfoIcon className="size-4 shrink-0" aria-hidden />
-        <div className="flex min-w-0 flex-col gap-1">
-          <div className="font-medium">{title}</div>
+        <InfoIcon />
+        <AlertTitle>{title}</AlertTitle>
+        <AlertDescription>
           <Tooltip>
-            <TooltipTrigger
-              render={<div className="line-clamp-3 text-muted-foreground">{message}</div>}
-            />
-            <TooltipPopup side="top" className="max-w-96 whitespace-pre-wrap">
+            <TooltipTrigger render={<div className="line-clamp-3" />}>{message}</TooltipTrigger>
+            <TooltipPopup side="top" className="whitespace-pre-wrap">
               {message}
             </TooltipPopup>
           </Tooltip>
           {onOpenProviderSetup && hasProviderSetup(status) ? (
-            <Button
-              className="self-start px-0 text-foreground"
-              onClick={() => onOpenProviderSetup(status.instanceId)}
-              size="xs"
-              variant="link"
-            >
+            <InlineButton onClick={() => onOpenProviderSetup(status.instanceId)}>
               Open provider setup
-            </Button>
+            </InlineButton>
           ) : null}
-        </div>
-        <Button
-          aria-label={`Dismiss ${providerName} provider ${status.status}`}
-          className="absolute top-2 right-2 size-6 text-muted-foreground hover:text-foreground"
-          onClick={onDismiss}
-          size="icon-xs"
-          variant="ghost"
-        >
-          <XIcon aria-hidden className="size-3.5" />
-        </Button>
-      </div>
+        </AlertDescription>
+        <AlertAction>
+          <Button
+            aria-label={`Dismiss ${providerName} provider ${status.status}`}
+            onClick={onDismiss}
+            size="icon-xs"
+            variant="ghost-muted"
+          >
+            <XIcon />
+          </Button>
+        </AlertAction>
+      </Alert>
     </div>
   );
 });
diff --git a/apps/web/src/components/chat/SkillInlineText.tsx b/apps/web/src/components/chat/SkillInlineText.tsx
index 83930ea2d600..2327577b3a80 100644
--- a/apps/web/src/components/chat/SkillInlineText.tsx
+++ b/apps/web/src/components/chat/SkillInlineText.tsx
@@ -2,14 +2,8 @@ import { Children, cloneElement, isValidElement, type ReactNode } from "react";
 import type { ServerProviderSkill } from "@t3tools/contracts";
 import { formatProviderSkillDisplayName } from "@t3tools/client-runtime/providerSkills";
 
-import {
-  CHAT_INLINE_CHIP_CLASS_NAME,
-  CHAT_INLINE_CHIP_LABEL_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES,
-  SKILL_CHIP_ICON_SVG,
-} from "../composerInlineChip";
-import { cn } from "~/lib/utils";
+import { SKILL_CHIP_ICON_SVG } from "../composerInlineChip";
+import { ContextChip, ContextChipLabel } from "../ContextChip";
 
 const SKILL_TOKEN_REGEX =
   /(^|\s)\p{Sc}(?![0-9][0-9_]*(?:[kKmMbBtT]|[eE][0-9]+)?(?:\s|$))(?=[a-zA-Z0-9:_-]*[a-zA-Z])([a-zA-Z0-9][a-zA-Z0-9:_-]*)(?=\s|$)/gu;
@@ -76,17 +70,20 @@ export function renderSkillInlineMarkdownChildren(
 
 function SkillChip(props: { skill: InlineSkill; rawText: string }) {
   return (
-    <span className="inline-flex align-middle leading-none" data-markdown-copy={props.rawText}>
-      <span className={cn(CHAT_INLINE_CHIP_CLASS_NAME, CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.skill)}>
-        <span
-          aria-hidden="true"
-          className={COMPOSER_INLINE_CHIP_ICON_CLASS_NAME}
-          dangerouslySetInnerHTML={{ __html: SKILL_CHIP_ICON_SVG }}
-        />
-        <span className={CHAT_INLINE_CHIP_LABEL_CLASS_NAME}>
-          {formatProviderSkillDisplayName(props.skill)}
-        </span>
-      </span>
-    </span>
+    <ContextChip kind="skill" data-markdown-copy={props.rawText}>
+      <SkillChipIcon />
+      <ContextChipLabel>{formatProviderSkillDisplayName(props.skill)}</ContextChipLabel>
+    </ContextChip>
+  );
+}
+
+/** The skill glyph; the surrounding chip sizes its svg. */
+export function SkillChipIcon() {
+  return (
+    <span
+      aria-hidden="true"
+      className="contents"
+      dangerouslySetInnerHTML={{ __html: SKILL_CHIP_ICON_SVG }}
+    />
   );
 }
diff --git a/apps/web/src/components/chat/SnapShotAttachmentDetails.tsx b/apps/web/src/components/chat/SnapShotAttachmentDetails.tsx
index da1b82032772..793da952c6ef 100644
--- a/apps/web/src/components/chat/SnapShotAttachmentDetails.tsx
+++ b/apps/web/src/components/chat/SnapShotAttachmentDetails.tsx
@@ -150,10 +150,10 @@ export function SnapShotContentsButton({
                   aria-label={
                     includesAccessibility ? "View accessibility data" : "No accessibility data"
                   }
-                  className={cn("[--control-icon-color:currentColor]", className)}
+                  className={className}
                   onClick={(event) => event.stopPropagation()}
                   size="icon-micro"
-                  variant="ghost-muted"
+                  variant="overlay"
                 />
               }
             />
@@ -163,18 +163,13 @@ export function SnapShotContentsButton({
         </TooltipTrigger>
         <TooltipPopup side={side}>{tooltip}</TooltipPopup>
       </Tooltip>
-      <PopoverPopup
-        side={side}
-        align="center"
-        className="w-[min(24rem,calc(100vw-2rem))]"
-        viewportClassName="max-h-[min(28rem,70vh)]"
-      >
-        <div className="space-y-2">
-          <PopoverTitle className="text-sm leading-5">Accessibility data</PopoverTitle>
+      <PopoverPopup side={side} align="center" width="md">
+        <div className="max-h-[min(28rem,70vh)] space-y-2 overflow-y-auto">
+          <PopoverTitle>Accessibility data</PopoverTitle>
           {accessibilityDetails ? (
             <SnapShotAccessibilityData
               details={accessibilityDetails}
-              className="max-h-64 rounded-md border border-border/70 bg-muted/45 p-2.5 text-[11px] leading-4"
+              className="max-h-64 rounded-md border border-border/70 bg-muted/45 p-2.5 text-2xs leading-4"
             />
           ) : includesAccessibility ? (
             <div className="rounded-md border border-border/70 bg-muted/45 p-2.5 text-muted-foreground text-xs leading-4">
@@ -209,19 +204,16 @@ export function SnapShotAttachmentDetails({
       {source.appIconDataUrl ? (
         <img src={source.appIconDataUrl} alt="" className="size-7 shrink-0 rounded-md" />
       ) : (
-        <div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-white/20 text-[10px] font-medium text-white uppercase">
+        <div className="flex size-7 shrink-0 items-center justify-center rounded-md bg-white/20 text-3xs font-medium text-white uppercase">
           {source.appName.slice(0, 1)}
         </div>
       )}
       <div className="min-w-0 flex-1">
-        <div className="flex min-w-0 items-center gap-1.5 text-[11px] font-medium leading-3.5 text-white">
+        <div className="flex min-w-0 items-center gap-1.5 text-2xs font-medium leading-3.5 text-white">
           <span className="truncate">{source.appName}</span>
-          <SnapShotContentsButton
-            source={source}
-            className="pointer-events-auto text-white/60 hover:bg-white/10 hover:text-white focus-visible:ring-white/70"
-          />
+          <SnapShotContentsButton source={source} className="pointer-events-auto" />
         </div>
-        <div className="truncate text-[9px] leading-3.5 text-white/70">
+        <div className="truncate text-3xs leading-3.5 text-white/70">
           {source.windowTitle || "Captured window"}
         </div>
       </div>
diff --git a/apps/web/src/components/chat/TerminalContextInlineChip.tsx b/apps/web/src/components/chat/TerminalContextInlineChip.tsx
index 48abba338683..faf5ae3dccbc 100644
--- a/apps/web/src/components/chat/TerminalContextInlineChip.tsx
+++ b/apps/web/src/components/chat/TerminalContextInlineChip.tsx
@@ -1,16 +1,6 @@
 import { TerminalIcon } from "lucide-react";
 
-import { cn } from "~/lib/utils";
 import type { ContextPresentationCapability } from "../contextPresentationRegistry";
-import {
-  CHAT_INLINE_CHIP_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES,
-  CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES,
-} from "../composerInlineChip";
 import { ContextChipPopover, ContextChipShell } from "../contextChipParts";
 
 interface TerminalContextInlineChipProps {
@@ -21,47 +11,22 @@ interface TerminalContextInlineChipProps {
   text: string;
   detailsMode: ContextPresentationCapability["details"];
   expired?: boolean;
-  surface?: "composer" | "transcript";
 }
 
 export function TerminalContextInlineChip(props: TerminalContextInlineChipProps) {
   const { label, terminalLabel, lineStart, lineEnd, text, detailsMode, expired = false } = props;
-  const chipClassName =
-    props.surface === "transcript" ? CHAT_INLINE_CHIP_CLASS_NAME : COMPOSER_INLINE_CHIP_CLASS_NAME;
-
-  const icon = (
-    <TerminalIcon
-      className={cn(
-        COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-        CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES.terminal,
-        "size-3.5",
-        expired && "opacity-100",
-      )}
-    />
-  );
 
   if (!expired && text.length > 0 && detailsMode === "popover") {
     return (
       <ContextChipPopover
+        kind="terminal"
+        icon={<TerminalIcon />}
+        label={label}
         accessibleLabel={`Terminal excerpt, ${label}`}
-        chip={
-          <>
-            {icon}
-            <span className={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}>{label}</span>
-          </>
-        }
-        triggerClassName={cn(
-          chipClassName,
-          CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.terminal,
-          CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME,
-          "cursor-pointer",
-        )}
-        popupClassName="w-[min(40rem,calc(100vw-2rem))]"
-        viewportClassName="overflow-hidden p-2"
       >
         <div className="overflow-hidden rounded-md border border-border/70 bg-background/80">
           <div className="flex items-center gap-2 border-b border-border/70 px-3 py-2">
-            <TerminalIcon className="size-4 shrink-0 text-emerald-500" aria-hidden />
+            <TerminalIcon className="size-4 shrink-0 text-success" aria-hidden />
             <span className="min-w-0 truncate text-sm font-medium text-foreground">
               {terminalLabel}
             </span>
@@ -83,17 +48,12 @@ export function TerminalContextInlineChip(props: TerminalContextInlineChipProps)
 
   return (
     <ContextChipShell
-      icon={icon}
+      kind="terminal"
+      {...(expired ? { state: "invalid" as const } : {})}
+      icon={<TerminalIcon />}
       label={label}
-      className={cn(
-        chipClassName,
-        CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.terminal,
-        expired && "border-destructive/35 bg-destructive/8 text-destructive",
-      )}
-      labelClassName={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}
       aria-label={`Terminal excerpt, ${label}${expired ? ", expired" : ""}`}
       data-terminal-context-expired={expired ? "true" : undefined}
-      tooltipClassName="max-w-80 whitespace-pre-wrap leading-tight"
       tooltip={
         expired
           ? `Terminal context expired. Remove and re-add ${label} to include it in your message.`
diff --git a/apps/web/src/components/chat/ThreadErrorBanner.tsx b/apps/web/src/components/chat/ThreadErrorBanner.tsx
index 29a6a6db1846..69d5336f8078 100644
--- a/apps/web/src/components/chat/ThreadErrorBanner.tsx
+++ b/apps/web/src/components/chat/ThreadErrorBanner.tsx
@@ -3,6 +3,8 @@ import { Alert, AlertAction, AlertDescription } from "../ui/alert";
 import { Button } from "../ui/button";
 import { CircleAlertIcon, XIcon } from "lucide-react";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import { OpenAI } from "../Icons";
+import { ChatGptUsageButton } from "../settings/ChatGptUsageButton";
 
 export function getThreadErrorBannerKey(threadKey: string, error: string | null): string | null {
   return error === null ? null : `${threadKey}\u0000${error}`;
@@ -36,33 +38,44 @@ export function isThreadErrorBannerDismissedForSession(bannerKey: string | null)
 export const ThreadErrorBanner = memo(function ThreadErrorBanner({
   error,
   onDismiss,
+  chatGptUsageLimit = false,
 }: {
   error: string | null;
   onDismiss?: () => void;
+  chatGptUsageLimit?: boolean;
 }) {
   if (!error) return null;
   return (
     <div className="pointer-events-auto mx-auto w-fit max-w-[min(48rem,calc(100%-2rem))] pt-3">
-      <Alert
-        variant="error"
-        controlAlignment="first-line"
-        className="alert-glass"
-        data-variant="error"
-      >
-        <CircleAlertIcon />
+      <Alert variant="error" surface="glass" controlAlignment="first-line">
+        {chatGptUsageLimit ? (
+          <OpenAI className="size-4 text-foreground!" aria-hidden="true" />
+        ) : (
+          <CircleAlertIcon />
+        )}
         <AlertDescription>
-          <Tooltip>
-            <TooltipTrigger render={<div className="line-clamp-3" />}>{error}</TooltipTrigger>
-            <TooltipPopup side="top" className="max-w-96 whitespace-pre-wrap">
-              {error}
-            </TooltipPopup>
-          </Tooltip>
+          {chatGptUsageLimit ? (
+            <div className="space-y-1">
+              <p className="font-medium">ChatGPT usage limit reached</p>
+              <p>Review your usage settings in ChatGPT to continue.</p>
+            </div>
+          ) : (
+            <Tooltip>
+              <TooltipTrigger render={<div className="line-clamp-3" />}>{error}</TooltipTrigger>
+              <TooltipPopup side="top" className="whitespace-pre-wrap">
+                {error}
+              </TooltipPopup>
+            </Tooltip>
+          )}
         </AlertDescription>
-        {onDismiss && (
+        {(chatGptUsageLimit || onDismiss) && (
           <AlertAction>
-            <Button variant="ghost" size="icon-xs" aria-label="Dismiss error" onClick={onDismiss}>
-              <XIcon className="text-destructive" />
-            </Button>
+            {chatGptUsageLimit ? <ChatGptUsageButton variant="default" size="sm" /> : null}
+            {onDismiss ? (
+              <Button variant="ghost" size="icon-xs" aria-label="Dismiss error" onClick={onDismiss}>
+                <XIcon className="text-destructive" />
+              </Button>
+            ) : null}
           </AlertAction>
         )}
       </Alert>
diff --git a/apps/web/src/components/chat/TraitsPicker.tsx b/apps/web/src/components/chat/TraitsPicker.tsx
index 13606e75c870..78c70152710d 100644
--- a/apps/web/src/components/chat/TraitsPicker.tsx
+++ b/apps/web/src/components/chat/TraitsPicker.tsx
@@ -16,9 +16,7 @@ import {
   normalizeModelSlug,
 } from "@t3tools/shared/model";
 import { memo, useCallback } from "react";
-import type { VariantProps } from "class-variance-authority";
-import { GaugeIcon, ZapIcon } from "lucide-react";
-import { buttonVariants } from "../ui/button";
+import { BrainIcon, ZapIcon } from "lucide-react";
 import {
   Menu,
   MenuGroup,
@@ -95,10 +93,7 @@ const ULTRATHINK_PROMPT_PREFIX = "Ultrathink:\n";
 
 function DefaultBadge() {
   return (
-    <Badge
-      variant="outline"
-      className="inline-flex h-4 w-fit min-w-0 items-center justify-center gap-0 border-border/70 bg-muted/60 px-1.5 py-0 font-semibold text-[10px] text-muted-foreground leading-none sm:h-4"
-    >
+    <Badge variant="outline" size="sm" className="min-w-0">
       Default
     </Badge>
   );
@@ -280,7 +275,6 @@ export interface TraitsMenuContentProps {
   modelOptions?: ProviderOptions | null | undefined;
   allowPromptInjectedEffort?: boolean;
   planModeEnabled: boolean;
-  triggerVariant?: VariantProps<typeof buttonVariants>["variant"];
   triggerClassName?: string;
   isComposerOwned?: boolean;
 }
@@ -547,7 +541,6 @@ export const TraitsPicker = memo(function TraitsPicker({
   modelOptions,
   allowPromptInjectedEffort = true,
   planModeEnabled,
-  triggerVariant,
   triggerClassName,
   isComposerOwned,
   size = "sm",
@@ -626,7 +619,6 @@ export const TraitsPicker = memo(function TraitsPicker({
                 <ComposerControl
                   aria-label={accessibleLabel}
                   data-composer-shortcut={isComposerOwned ? "composer.effort" : undefined}
-                  variant={triggerVariant ?? "ghost"}
                   size={size}
                   className={cn(
                     isCodexStyle
@@ -653,7 +645,7 @@ export const TraitsPicker = memo(function TraitsPicker({
                   data-composer-control-compact-icon
                   className="pointer-events-none invisible absolute"
                 >
-                  <ComposerControlIcon icon={GaugeIcon} size={size} />
+                  <ComposerControlIcon icon={BrainIcon} size={size} />
                 </span>
               )}
               <span data-composer-control-label className="min-w-0 truncate">
@@ -668,7 +660,7 @@ export const TraitsPicker = memo(function TraitsPicker({
                   data-composer-control-compact-icon
                   className="pointer-events-none invisible absolute"
                 >
-                  <ComposerControlIcon icon={GaugeIcon} size={size} />
+                  <ComposerControlIcon icon={BrainIcon} size={size} />
                 </span>
               )}
               <span data-composer-control-label>{triggerLabel}</span>
diff --git a/apps/web/src/components/chat/WorktreeSetupCard.tsx b/apps/web/src/components/chat/WorktreeSetupCard.tsx
index 03c7d4be8518..07e520315810 100644
--- a/apps/web/src/components/chat/WorktreeSetupCard.tsx
+++ b/apps/web/src/components/chat/WorktreeSetupCard.tsx
@@ -56,7 +56,7 @@ function useNowWhile(active: boolean): number {
 }
 
 function StageIcon({ status }: { status: WorktreeSetupStage["status"] }) {
-  const className = "size-4 shrink-0 stroke-[1.8]";
+  const className = "size-4 shrink-0 stroke-2";
   switch (status) {
     case "done":
       return <CheckIcon aria-hidden className={className} />;
@@ -240,7 +240,7 @@ function OutputTail({ lines, failed }: { lines: ReadonlyArray<string>; failed: b
   return (
     <pre
       className={cn(
-        "mb-1 ml-8 overflow-hidden rounded-md border px-2.5 py-1.5 font-mono text-[11px] leading-relaxed select-text",
+        "mb-1 ml-8 overflow-hidden rounded-md border px-2.5 py-1.5 font-mono text-2xs leading-relaxed select-text",
         failed
           ? "border-destructive/20 bg-error-surface text-destructive-foreground"
           : "border-border bg-code text-muted-foreground",
diff --git a/apps/web/src/components/chat/composerProviderState.tsx b/apps/web/src/components/chat/composerProviderState.tsx
index c6837700cdfa..1d53d498dbd8 100644
--- a/apps/web/src/components/chat/composerProviderState.tsx
+++ b/apps/web/src/components/chat/composerProviderState.tsx
@@ -13,10 +13,8 @@ import {
   isClaudeUltrathinkPrompt,
   normalizeModelSlug,
 } from "@t3tools/shared/model";
-import type { VariantProps } from "class-variance-authority";
 import type { ReactNode } from "react";
 
-import type { buttonVariants } from "../ui/button";
 import type { DraftId } from "../../composerDraftStore";
 import { getProviderModelCapabilities } from "../../providerModels";
 import type { ComposerControlSize } from "./ComposerControl";
@@ -55,7 +53,6 @@ type TraitsRenderInput = {
   planModeEnabled: boolean;
   size?: ComposerControlSize;
   hidden?: boolean;
-  triggerVariant?: VariantProps<typeof buttonVariants>["variant"];
   triggerClassName?: string;
   isComposerOwned?: boolean;
 };
@@ -178,7 +175,6 @@ function renderTraitsControl(
     planModeEnabled,
     size,
     hidden,
-    triggerVariant,
     triggerClassName,
     isComposerOwned,
   } = input;
@@ -217,7 +213,6 @@ function renderTraitsControl(
       planModeEnabled={planModeEnabled}
       {...(size !== undefined ? { size } : {})}
       {...(hidden !== undefined ? { hidden } : {})}
-      {...(triggerVariant !== undefined ? { triggerVariant } : {})}
       {...(triggerClassName !== undefined ? { triggerClassName } : {})}
       {...(isComposerOwned ? { isComposerOwned } : {})}
     />
diff --git a/apps/web/src/components/chat/sendQueuedMessage.ts b/apps/web/src/components/chat/sendQueuedMessage.ts
new file mode 100644
index 000000000000..ac10dfef48c8
--- /dev/null
+++ b/apps/web/src/components/chat/sendQueuedMessage.ts
@@ -0,0 +1,211 @@
+import { scopedThreadKey } from "@t3tools/client-runtime/environment";
+import {
+  runAtomCommand,
+  squashAtomCommandFailure,
+  type AtomCommand,
+} from "@t3tools/client-runtime/state/runtime";
+import type { ScopedThreadRef } from "@t3tools/contracts";
+import { serializeLegacyContextMessage } from "@t3tools/shared/composerContextLegacySend";
+import { applyClaudePromptEffortPrefix } from "@t3tools/shared/model";
+
+import { buildMessageContext, terminalContextReference } from "../../lib/composerContextRecords";
+import { removeInlineContextReference } from "../../lib/composerContextReferences";
+import {
+  awaitAttachmentUploads,
+  getUploadedAttachments,
+  releaseDraftAttachments,
+  startAttachmentUpload,
+} from "../../lib/attachmentUploadQueue";
+import { newMessageId } from "../../lib/utils";
+import { latestCompletedToolActivityId, useQueuedMessageStore } from "../../queuedMessageStore";
+import { appAtomRegistry } from "../../rpc/atomRegistry";
+import { readThread, readThreadShell } from "../../state/entities";
+import { environmentServerConfigsAtom } from "../../state/server";
+import { threadEnvironment } from "../../state/threads";
+import {
+  createLocalDispatchSnapshot,
+  deriveComposerSendState,
+  readFileAsDataUrl,
+  resolveThreadMetadataUpdateForNextTurn,
+  revokeBlobPreviewUrl,
+} from "../ChatView.logic";
+import { toastManager } from "../ui/toast";
+import { fileAttachmentCapabilityBlockReason } from "./composerAttachmentFiles";
+import { ATTACHMENT_ONLY_BOOTSTRAP_PROMPT } from "./composerPromptHistory";
+
+async function run<W, A, E>(command: AtomCommand<W, A, E>, input: W): Promise<A> {
+  const result = await runAtomCommand(appAtomRegistry, command, input, { reportFailure: false });
+  if (result._tag === "Failure") throw squashAtomCommandFailure(result);
+  return result.value;
+}
+
+/**
+ * Sends one queued message as a turn on its thread. `QueuedMessageSender`
+ * calls it when the head message is due, and Send now calls it directly. It
+ * reads nothing from the composer, so it works for threads that are not on
+ * screen. A failed send stays at the head of the queue, held for Send now.
+ */
+export async function sendQueuedMessage(
+  threadRef: ScopedThreadRef,
+  messageId: string,
+): Promise<void> {
+  const { environmentId, threadId } = threadRef;
+  const threadKey = scopedThreadKey(threadRef);
+  const queue = useQueuedMessageStore.getState();
+  const message = queue.beginSend(
+    threadKey,
+    messageId,
+    latestCompletedToolActivityId(readThread(threadRef)?.activities ?? []),
+  );
+  if (!message) return;
+  const { sendSettings } = message;
+  const attachments = [...message.images, ...message.files];
+  const readConfig = () => appAtomRegistry.get(environmentServerConfigsAtom).get(environmentId);
+  const assertFilesAllowed = () => {
+    const config = readConfig();
+    const reason = fileAttachmentCapabilityBlockReason({
+      files: message.files,
+      attachmentUploadsCapabilityKnown: config !== undefined,
+      supportsAttachmentUploads: config?.environment.capabilities.attachmentUploads === true,
+      maxFileAttachmentBytes:
+        config?.environment.capabilities.fileAttachments?.maxUploadBytes ?? null,
+    });
+    if (reason !== null) throw new Error(reason);
+  };
+  try {
+    const { sendableTerminalContexts, hasSendableContent } = deriveComposerSendState({
+      prompt: message.prompt,
+      imageCount: attachments.length,
+      terminalContexts: message.terminalContexts,
+      elementContextCount: message.previewAnnotations.length + message.reviewComments.length,
+    });
+    // Only expired terminal context was left. Retrying would block the queue
+    // on every boundary, so drop it and let the queue move on.
+    if (!hasSendableContent) {
+      queue.finishSend(threadKey, message.id);
+      return;
+    }
+    // Expired terminal excerpts are not sent; their chips leave the text with them.
+    const prompt = message.terminalContexts
+      .filter((context) => !sendableTerminalContexts.includes(context))
+      .reduce(
+        (text, context) =>
+          removeInlineContextReference(text, terminalContextReference(context).contextId).prompt,
+        message.prompt,
+      )
+      .trim();
+    const text = applyClaudePromptEffortPrefix(
+      prompt || ATTACHMENT_ONLY_BOOTSTRAP_PROMPT,
+      sendSettings.promptEffort,
+    );
+
+    assertFilesAllowed();
+    const useUploads = readConfig()?.environment.capabilities.attachmentUploads === true;
+    if (useUploads && attachments.length > 0) {
+      for (const attachment of attachments) {
+        startAttachmentUpload({ environmentId, image: attachment, draftTarget: threadRef });
+      }
+      await awaitAttachmentUploads(attachments.map((attachment) => attachment.id));
+    }
+    const wireAttachments = await Promise.all(
+      attachments.map(async (attachment) => {
+        if (useUploads) {
+          const uploaded = getUploadedAttachments({ environmentId, images: [attachment] })?.[0];
+          if (!uploaded) throw new Error(`Attachment '${attachment.name}' did not upload.`);
+          return uploaded;
+        }
+        if (attachment.type !== "image") {
+          throw new Error("This server does not support file attachments.");
+        }
+        return {
+          type: "image" as const,
+          id: attachment.id,
+          name: attachment.name,
+          mimeType: attachment.mimeType,
+          sizeBytes: attachment.sizeBytes,
+          dataUrl: await readFileAsDataUrl(attachment.file),
+          ...(attachment.source ? { source: attachment.source } : {}),
+        };
+      }),
+    );
+    assertFilesAllowed();
+
+    // The server starts the turn with the thread's stored modes, so a change
+    // made in the composer before queueing is saved first.
+    const createdAt = new Date().toISOString();
+    const shell = readThreadShell(threadRef);
+    const metadataUpdate = shell
+      ? resolveThreadMetadataUpdateForNextTurn({
+          currentModelSelection: shell.modelSelection,
+          nextModelSelection: sendSettings.modelSelection,
+          currentBranch: shell.branch,
+        })
+      : null;
+    if (metadataUpdate) {
+      await run(threadEnvironment.updateMetadata, {
+        environmentId,
+        input: { threadId, ...metadataUpdate },
+      });
+    }
+    if (shell && shell.runtimeMode !== sendSettings.runtimeMode) {
+      await run(threadEnvironment.setRuntimeMode, {
+        environmentId,
+        input: { threadId, runtimeMode: sendSettings.runtimeMode, createdAt },
+      });
+    }
+    if (shell && shell.interactionMode !== sendSettings.interactionMode) {
+      await run(threadEnvironment.setInteractionMode, {
+        environmentId,
+        input: { threadId, interactionMode: sendSettings.interactionMode, createdAt },
+      });
+    }
+
+    // Stop hands a preparing message back to the composer. Past this point
+    // the send can no longer be taken back.
+    const thread = readThread(threadRef) ?? undefined;
+    if (!queue.markDispatching(threadKey, message.id, createLocalDispatchSnapshot(thread))) return;
+    const context = buildMessageContext({
+      terminalContexts: sendableTerminalContexts,
+      reviewComments: message.reviewComments,
+      previewAnnotations: message.previewAnnotations,
+      attachments: attachments.map((attachment, index) => ({
+        attachment,
+        attachmentId: wireAttachments[index]?.id ?? attachment.id,
+      })),
+    });
+    // Servers from before inline context drop the records, so their turns
+    // carry the payload in the text instead.
+    const inlineContext = readConfig()?.environment.capabilities.inlineMessageContext === true;
+    await run(threadEnvironment.startTurn, {
+      environmentId,
+      input: {
+        threadId,
+        message: {
+          messageId: newMessageId(),
+          role: "user",
+          text:
+            context !== undefined && !inlineContext
+              ? serializeLegacyContextMessage({ text, records: context.records })
+              : text,
+          attachments: wireAttachments,
+          ...(context !== undefined && inlineContext ? { context } : {}),
+        },
+        modelSelection: sendSettings.modelSelection,
+        runtimeMode: sendSettings.runtimeMode,
+        interactionMode: sendSettings.interactionMode,
+        createdAt,
+      },
+    });
+    queue.finishSend(threadKey, message.id);
+    if (useUploads) releaseDraftAttachments(attachments);
+    for (const image of message.images) revokeBlobPreviewUrl(image.previewUrl);
+  } catch (error) {
+    if (!queue.failSend(threadKey, message.id)) return;
+    const title = readThreadShell(threadRef)?.title;
+    toastManager.add({
+      type: "error",
+      title: title ? `Queued message not sent in "${title}"` : "Queued message not sent",
+      description: error instanceof Error ? error.message : "Use Send now to try again.",
+    });
+  }
+}
diff --git a/apps/web/src/components/chat/timelineScrollTarget.test.ts b/apps/web/src/components/chat/timelineScrollTarget.test.ts
new file mode 100644
index 000000000000..051f7785f5a3
--- /dev/null
+++ b/apps/web/src/components/chat/timelineScrollTarget.test.ts
@@ -0,0 +1,142 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
+
+import {
+  createComposerScrollGestureState,
+  recordComposerScrollGestureEvent,
+} from "./composerScrollGesture";
+import { isTimelineScrollTarget } from "./timelineScrollTarget";
+
+class ScrollElement extends EventTarget {
+  scrollTop = 0;
+  scrollHeight = 100;
+  clientHeight = 100;
+  overflowY = "visible";
+  overscrollBehaviorY = "auto";
+
+  constructor(readonly parentElement: ScrollElement | null = null) {
+    super();
+  }
+
+  contains(target: ScrollElement): boolean {
+    return (
+      target === this || (target.parentElement !== null && this.contains(target.parentElement))
+    );
+  }
+}
+
+function targetsTimeline(target: EventTarget | null, timeline: ScrollElement, deltaY: number) {
+  return isTimelineScrollTarget(target, timeline as unknown as HTMLElement, deltaY);
+}
+
+function setup() {
+  const timeline = Object.assign(new ScrollElement(), {
+    overflowY: "auto",
+    scrollHeight: 1500,
+    clientHeight: 500,
+    scrollTop: 1000,
+  });
+  const group = Object.assign(new ScrollElement(timeline), {
+    overflowY: "auto",
+    scrollHeight: 300,
+    scrollTop: 80,
+  });
+  return { timeline, group, content: new ScrollElement(group) };
+}
+
+beforeEach(() => {
+  vi.stubGlobal("Element", ScrollElement);
+  vi.stubGlobal("getComputedStyle", (element: ScrollElement) => element);
+});
+afterEach(() => vi.unstubAllGlobals());
+
+describe("timeline scroll targets", () => {
+  it.each([-30, 30])("keeps a nested tool group's scroll out of the timeline: %i", (deltaY) => {
+    const { timeline, group, content } = setup();
+    expect(targetsTimeline(content, timeline, deltaY)).toBe(false);
+    expect(targetsTimeline(group, timeline, deltaY)).toBe(false);
+  });
+
+  it.each([
+    { scrollTop: 0, deltaY: -30 },
+    { scrollTop: 200, deltaY: 30 },
+  ])("allows chaining only past the matching edge: %j", ({ scrollTop, deltaY }) => {
+    const { timeline, group, content } = setup();
+    group.scrollTop = scrollTop;
+    expect(targetsTimeline(content, timeline, deltaY)).toBe(true);
+    expect(targetsTimeline(content, timeline, -deltaY)).toBe(false);
+  });
+
+  it.each(["contain", "none"])("respects overscroll-y %s at either edge", (overscrollBehaviorY) => {
+    const { timeline, group, content } = setup();
+    group.overscrollBehaviorY = overscrollBehaviorY;
+    group.scrollTop = 0;
+    expect(targetsTimeline(content, timeline, -30)).toBe(false);
+    group.scrollTop = 200;
+    expect(targetsTimeline(content, timeline, 30)).toBe(false);
+    group.scrollTop = 0;
+    group.scrollHeight = group.clientHeight;
+    expect(targetsTimeline(content, timeline, 30)).toBe(false);
+  });
+
+  it("checks nested results even when the tool group cannot scroll", () => {
+    const { timeline, group } = setup();
+    group.scrollTop = 0;
+    group.scrollHeight = group.clientHeight;
+    const result = Object.assign(new ScrollElement(group), {
+      overflowY: "scroll",
+      scrollHeight: 300,
+      scrollTop: 0.25,
+    });
+    expect(targetsTimeline(new ScrollElement(result), timeline, -30)).toBe(false);
+    result.scrollTop = 0;
+    expect(targetsTimeline(result, timeline, -30)).toBe(true);
+  });
+
+  it("checks an outer group when an inner result reaches its edge", () => {
+    const { timeline, group } = setup();
+    const result = Object.assign(new ScrollElement(group), { overflowY: "auto" });
+    expect(targetsTimeline(result, timeline, -30)).toBe(false);
+    group.scrollTop = 0;
+    expect(targetsTimeline(result, timeline, -30)).toBe(true);
+  });
+
+  it.each(["visible", "hidden", "clip"])("ignores overflow-y %s", (overflowY) => {
+    const { timeline, group, content } = setup();
+    group.overflowY = overflowY;
+    expect(targetsTimeline(content, timeline, -30)).toBe(true);
+  });
+
+  it("allows ordinary message content and the outer viewport", () => {
+    const { timeline } = setup();
+    expect(targetsTimeline(new ScrollElement(timeline), timeline, -30)).toBe(true);
+    expect(targetsTimeline(timeline, timeline, 30)).toBe(true);
+  });
+
+  it("rejects outside targets, non-elements, and horizontal-only scrolling", () => {
+    const { timeline, content } = setup();
+    expect(targetsTimeline(new ScrollElement(), timeline, -30)).toBe(false);
+    expect(targetsTimeline(new EventTarget(), timeline, -30)).toBe(false);
+    expect(targetsTimeline(null, timeline, -30)).toBe(false);
+    expect(targetsTimeline(content, timeline, 0)).toBe(false);
+  });
+
+  it("does not accumulate nested scrolling toward composer collapse", () => {
+    const { timeline, group, content } = setup();
+    const state = createComposerScrollGestureState();
+    const record = (target: ScrollElement, now: number, deltaPx: number) =>
+      recordComposerScrollGestureEvent(state, {
+        now,
+        deltaPx,
+        collapseThresholdPx: 24,
+        collapseEligible: targetsTimeline(target, timeline, -deltaPx),
+        canScrollInGestureDirection: timeline.scrollTop > 0,
+        scrollsTowardLogicalEnd: false,
+      });
+
+    expect(record(timeline, 0, 20)).toBe(false);
+    expect(record(content, 20, 30)).toBe(false);
+    group.scrollTop = 0;
+    expect(record(content, 40, 10)).toBe(false);
+    expect(record(content, 60, 14)).toBe(true);
+  });
+});
diff --git a/apps/web/src/components/chat/timelineScrollTarget.ts b/apps/web/src/components/chat/timelineScrollTarget.ts
new file mode 100644
index 000000000000..da87e9a7036d
--- /dev/null
+++ b/apps/web/src/components/chat/timelineScrollTarget.ts
@@ -0,0 +1,31 @@
+// A gesture inside the timeline may belong to a nested tool result or code
+// block. Only treat it as timeline navigation if it can chain to the outer list.
+export function isTimelineScrollTarget(
+  target: EventTarget | null,
+  timeline: HTMLElement,
+  deltaY: number,
+): boolean {
+  if (!(target instanceof Element) || !timeline.contains(target) || deltaY === 0) return false;
+
+  for (
+    let element: Element | null = target;
+    element && element !== timeline;
+    element = element.parentElement
+  ) {
+    const style = getComputedStyle(element);
+    if (style.overflowY !== "auto" && style.overflowY !== "scroll") continue;
+
+    const canScroll =
+      deltaY < 0
+        ? element.scrollTop > 0
+        : element.scrollTop < element.scrollHeight - element.clientHeight;
+    if (
+      canScroll ||
+      style.overscrollBehaviorY === "contain" ||
+      style.overscrollBehaviorY === "none"
+    ) {
+      return false;
+    }
+  }
+  return true;
+}
diff --git a/apps/web/src/components/chat/useAutoBalanceUpdateBanner.tsx b/apps/web/src/components/chat/useAutoBalanceUpdateBanner.tsx
index 0d4584533980..9784f22b7801 100644
--- a/apps/web/src/components/chat/useAutoBalanceUpdateBanner.tsx
+++ b/apps/web/src/components/chat/useAutoBalanceUpdateBanner.tsx
@@ -21,6 +21,7 @@ import {
   ServerUpdateProgress,
   ServerUpdatesAction,
 } from "../ServerUpdateAction";
+import { InlineButton } from "../ui/button";
 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import type { ComposerBannerStackItem } from "./ComposerBannerStack";
 import { ComposerServerUpdateIcon } from "./ComposerServerUpdateStatus";
@@ -95,12 +96,13 @@ export function useAutoBalanceUpdateBanner(
     title: (
       <Popover>
         <PopoverTrigger
-          className="block max-w-full truncate rounded-sm text-left outline-none focus-visible:ring-2 focus-visible:ring-ring"
+          render={<InlineButton />}
+          className="max-w-full"
           aria-label={`${title}. View machines`}
         >
-          {title}
+          <span className="min-w-0 truncate">{title}</span>
         </PopoverTrigger>
-        <PopoverPopup side="top" align="start" className="w-80 max-w-[calc(100vw-2rem)]">
+        <PopoverPopup side="top" align="start" width="md">
           <div className="space-y-3 text-xs">
             {machines.map((machine) => (
               <div key={machine.environmentId} className="space-y-1">
diff --git a/apps/web/src/components/clerk/ClerkUserProfilePage.tsx b/apps/web/src/components/clerk/ClerkUserProfilePage.tsx
index 4b70f8008823..f0fedc8d740e 100644
--- a/apps/web/src/components/clerk/ClerkUserProfilePage.tsx
+++ b/apps/web/src/components/clerk/ClerkUserProfilePage.tsx
@@ -22,9 +22,9 @@ export function ClerkUserProfilePage({
     <div className={cn("w-full min-w-0 text-foreground", className)}>
       <header className="flex flex-col gap-3 pb-4 sm:flex-row sm:items-start sm:justify-between sm:gap-4 sm:pr-8">
         <div className="min-w-0">
-          <h2 className="text-[1.0625rem] leading-6 font-semibold">{title}</h2>
+          <h2 className="text-base leading-6 font-semibold">{title}</h2>
           {description ? (
-            <p className="mt-1 max-w-[34rem] text-[0.8125rem] leading-[1.125rem] text-muted-foreground sm:min-h-9">
+            <p className="mt-1 max-w-[34rem] text-xs leading-4.5 text-muted-foreground sm:min-h-9">
               {description}
             </p>
           ) : null}
@@ -52,7 +52,7 @@ export function ClerkUserProfileRefreshButton({
     <Button
       size="sm"
       variant="outline"
-      className={cn("text-[0.8125rem]", className)}
+      className={className}
       disabled={disabled || isPending}
       onClick={onClick}
     >
diff --git a/apps/web/src/components/clerk/MobileClientsUserProfilePage.tsx b/apps/web/src/components/clerk/MobileClientsUserProfilePage.tsx
index db36a8091de5..ef4eb30fe262 100644
--- a/apps/web/src/components/clerk/MobileClientsUserProfilePage.tsx
+++ b/apps/web/src/components/clerk/MobileClientsUserProfilePage.tsx
@@ -38,14 +38,14 @@ function MobileClientRow({ device }: { readonly device: RelayClientDeviceRecord
     <ClerkUserProfileRow icon={<SmartphoneIcon className="size-4" />}>
       <div className="flex flex-col gap-0.5 sm:flex-row sm:items-start sm:justify-between sm:gap-3">
         <div className="min-w-0">
-          <h3 className="truncate text-[0.8125rem] leading-[1.125rem] font-medium text-foreground">
+          <h3 className="truncate text-sm leading-4.5 font-medium text-foreground">
             {device.label}
           </h3>
-          <p className="text-xs leading-[1.125rem] text-muted-foreground">
+          <p className="text-xs leading-4.5 text-muted-foreground">
             {mobileClientPlatformLabel(device)}
           </p>
         </div>
-        <p className="shrink-0 text-[0.6875rem] leading-4 text-muted-foreground/75">
+        <p className="shrink-0 text-2xs leading-4 text-muted-foreground/75">
           {mobileClientUpdatedAtLabel(device.updatedAt)}
         </p>
       </div>
@@ -56,7 +56,7 @@ function MobileClientRow({ device }: { readonly device: RelayClientDeviceRecord
         />
         <MobileClientStatusBadge enabled={device.liveActivities.enabled} label="Live Activities" />
       </div>
-      <p className="mt-1.5 text-xs leading-[1.125rem] text-muted-foreground/80">
+      <p className="mt-1.5 text-xs leading-4.5 text-muted-foreground/80">
         {mobileClientNotificationDetail(device)}
       </p>
     </ClerkUserProfileRow>
@@ -69,7 +69,7 @@ function MobileClientsSkeleton() {
       {MOBILE_CLIENT_SKELETON_ROWS.map((row) => (
         <div key={row} className="py-4">
           <div className="flex gap-3">
-            <Skeleton className="size-8 shrink-0 rounded-lg" />
+            <Skeleton shape="card" className="size-8 shrink-0" />
             <div className="flex-1 space-y-2">
               <Skeleton className="h-3.5 w-36" />
               <Skeleton className="h-3 w-28" />
@@ -87,13 +87,13 @@ function MobileClientsSkeleton() {
 
 function EmptyMobileClients() {
   return (
-    <Empty className="min-h-64 gap-4 border-t px-6 py-10 md:p-10">
-      <EmptyMedia className="mb-0" variant="icon">
+    <Empty size="compact">
+      <EmptyMedia variant="icon">
         <SmartphoneIcon />
       </EmptyMedia>
       <EmptyHeader>
-        <EmptyTitle className="text-[1.0625rem] leading-6">No mobile clients</EmptyTitle>
-        <EmptyDescription className="text-[0.8125rem] leading-[1.125rem]">
+        <EmptyTitle>No mobile clients</EmptyTitle>
+        <EmptyDescription>
           Sign in to T3 Turbo on your iPhone to register it for push notifications and Live
           Activities.
         </EmptyDescription>
@@ -123,7 +123,7 @@ export function MobileClientsUserProfilePage() {
       <div>
         {devicesState.error ? (
           <div
-            className="mb-4 flex flex-col gap-3 border-t border-destructive/35 py-3 text-[0.8125rem] sm:flex-row sm:items-center sm:justify-between"
+            className="mb-4 flex flex-col gap-3 border-t border-destructive/35 py-3 text-xs sm:flex-row sm:items-center sm:justify-between"
             role="alert"
           >
             <div>
@@ -147,7 +147,9 @@ export function MobileClientsUserProfilePage() {
             ))}
           </ul>
         ) : (
-          <EmptyMobileClients />
+          <div className="border-t">
+            <EmptyMobileClients />
+          </div>
         )}
       </div>
     </ClerkUserProfilePage>
diff --git a/apps/web/src/components/clerk/RemoveT3ConnectEnvironmentDialog.tsx b/apps/web/src/components/clerk/RemoveT3ConnectEnvironmentDialog.tsx
new file mode 100644
index 000000000000..5e6d6e00cba7
--- /dev/null
+++ b/apps/web/src/components/clerk/RemoveT3ConnectEnvironmentDialog.tsx
@@ -0,0 +1,78 @@
+import { useState } from "react";
+
+import {
+  AlertDialog,
+  AlertDialogClose,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogPopup,
+  AlertDialogTitle,
+} from "../ui/alert-dialog";
+import { Button, InlineButton } from "../ui/button";
+import { useT3ConnectAccountPage } from "./T3ConnectAccountPages";
+
+/**
+ * Confirms removing a T3 Connect environment from this device. Removal here
+ * leaves the account registration (and its host space) in place, so the dialog
+ * says so and links to the account page where it can be deregistered.
+ */
+export function RemoveT3ConnectEnvironmentDialog({
+  environmentLabel,
+  onCancel,
+  onConfirm,
+}: {
+  /** The environment awaiting confirmation; null keeps the dialog closed. */
+  readonly environmentLabel: string | null;
+  readonly onCancel: () => void;
+  readonly onConfirm: () => void;
+}) {
+  const accountPage = useT3ConnectAccountPage();
+  // Keep the label through the close animation.
+  const [shownLabel, setShownLabel] = useState(environmentLabel);
+  if (environmentLabel !== null && environmentLabel !== shownLabel) setShownLabel(environmentLabel);
+  const openAccountPage = accountPage.open;
+
+  return (
+    <>
+      <AlertDialog
+        open={environmentLabel !== null}
+        onOpenChange={(open) => {
+          if (!open) onCancel();
+        }}
+      >
+        <AlertDialogPopup>
+          <AlertDialogHeader>
+            <AlertDialogTitle>Remove {shownLabel} from this device?</AlertDialogTitle>
+            <AlertDialogDescription>
+              This forgets its pairing, credentials, and cached threads here.
+            </AlertDialogDescription>
+            <AlertDialogDescription>
+              It stays on your T3 Connect account and keeps its host space. Deregister it in{" "}
+              {openAccountPage ? (
+                <InlineButton
+                  onClick={() => {
+                    onCancel();
+                    openAccountPage();
+                  }}
+                >
+                  T3 Connect settings
+                </InlineButton>
+              ) : (
+                "T3 Connect settings"
+              )}{" "}
+              to free it.
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose>
+            <Button variant="destructive" onClick={onConfirm}>
+              Remove from this device
+            </Button>
+          </AlertDialogFooter>
+        </AlertDialogPopup>
+      </AlertDialog>
+      {accountPage.portals}
+    </>
+  );
+}
diff --git a/apps/web/src/components/clerk/T3ConnectAccountPages.tsx b/apps/web/src/components/clerk/T3ConnectAccountPages.tsx
new file mode 100644
index 000000000000..44b423493a18
--- /dev/null
+++ b/apps/web/src/components/clerk/T3ConnectAccountPages.tsx
@@ -0,0 +1,66 @@
+import { useAuth, useClerk } from "@clerk/react";
+import { ServerIcon, SmartphoneIcon } from "lucide-react";
+import { type ReactNode, useCallback, useState } from "react";
+import { createPortal } from "react-dom";
+
+import { MobileClientsUserProfilePage } from "./MobileClientsUserProfilePage";
+import { T3ConnectUserProfilePage } from "./T3ConnectUserProfilePage";
+
+/** Custom pages in the Clerk account modal, in menu order. */
+export const T3_CONNECT_ACCOUNT_PAGES = [
+  {
+    label: "Mobile clients",
+    url: "mobile-clients",
+    icon: <SmartphoneIcon className="size-4" />,
+    content: <MobileClientsUserProfilePage />,
+  },
+  {
+    label: "T3 Connect",
+    url: "t3-connect",
+    icon: <ServerIcon className="size-4" />,
+    content: <T3ConnectUserProfilePage />,
+  },
+] as const;
+
+type PortalTargets = Readonly<Record<string, HTMLDivElement | undefined>>;
+
+/**
+ * Opens the Clerk account modal on the T3 Connect page from outside the
+ * UserButton. Clerk mounts custom pages into DOM nodes it owns, so the caller
+ * must keep `portals` rendered for as long as the modal can be open.
+ */
+export function useT3ConnectAccountPage(): {
+  readonly open: (() => void) | null;
+  readonly portals: ReactNode;
+} {
+  const clerk = useClerk();
+  const { isSignedIn } = useAuth();
+  const [targets, setTargets] = useState<PortalTargets>({});
+
+  const open = useCallback(() => {
+    const setTarget = (key: string, element: HTMLDivElement | undefined) =>
+      setTargets((current) => ({ ...current, [key]: element }));
+    clerk.openUserProfile({
+      __experimental_startPath: "/t3-connect",
+      customPages: T3_CONNECT_ACCOUNT_PAGES.map((page) => ({
+        label: page.label,
+        url: page.url,
+        mount: (element: HTMLDivElement) => setTarget(`content:${page.url}`, element),
+        unmount: () => setTarget(`content:${page.url}`, undefined),
+        mountIcon: (element: HTMLDivElement) => setTarget(`icon:${page.url}`, element),
+        unmountIcon: () => setTarget(`icon:${page.url}`, undefined),
+      })),
+    });
+  }, [clerk]);
+
+  const portals = T3_CONNECT_ACCOUNT_PAGES.flatMap((page) => {
+    const content = targets[`content:${page.url}`];
+    const icon = targets[`icon:${page.url}`];
+    return [
+      content ? createPortal(page.content, content, `content:${page.url}`) : null,
+      icon ? createPortal(page.icon, icon, `icon:${page.url}`) : null,
+    ];
+  });
+
+  return { open: isSignedIn ? open : null, portals };
+}
diff --git a/apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx b/apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx
index 9dfd8dce13b1..e75ce33ceaf3 100644
--- a/apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx
+++ b/apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx
@@ -1,10 +1,9 @@
 import { UserButton, useAuth } from "@clerk/react";
-import { LogInIcon, ServerIcon, SmartphoneIcon } from "lucide-react";
+import { LogInIcon } from "lucide-react";
 
 import { hasCloudPublicConfig } from "../../cloud/publicConfig";
 import { SidebarMenu, SidebarMenuButton, SidebarMenuItem } from "../ui/sidebar";
-import { MobileClientsUserProfilePage } from "./MobileClientsUserProfilePage";
-import { T3ConnectUserProfilePage } from "./T3ConnectUserProfilePage";
+import { T3_CONNECT_ACCOUNT_PAGES } from "./T3ConnectAccountPages";
 import { useT3ConnectAuthPrompt } from "./useT3ConnectAuthPrompt";
 
 export function T3ConnectSidebarSignIn() {
@@ -33,20 +32,16 @@ function ConfiguredT3ConnectSidebarAvatar() {
         },
       }}
     >
-      <UserButton.UserProfilePage
-        label="Mobile clients"
-        labelIcon={<SmartphoneIcon className="size-4" />}
-        url="mobile-clients"
-      >
-        <MobileClientsUserProfilePage />
-      </UserButton.UserProfilePage>
-      <UserButton.UserProfilePage
-        label="T3 Connect"
-        labelIcon={<ServerIcon className="size-4" />}
-        url="t3-connect"
-      >
-        <T3ConnectUserProfilePage />
-      </UserButton.UserProfilePage>
+      {T3_CONNECT_ACCOUNT_PAGES.map((page) => (
+        <UserButton.UserProfilePage
+          key={page.url}
+          label={page.label}
+          labelIcon={page.icon}
+          url={page.url}
+        >
+          {page.content}
+        </UserButton.UserProfilePage>
+      ))}
     </UserButton>
   );
 }
diff --git a/apps/web/src/components/clerk/T3ConnectUserProfilePage.tsx b/apps/web/src/components/clerk/T3ConnectUserProfilePage.tsx
index 15ed569052be..284655babbb8 100644
--- a/apps/web/src/components/clerk/T3ConnectUserProfilePage.tsx
+++ b/apps/web/src/components/clerk/T3ConnectUserProfilePage.tsx
@@ -51,21 +51,16 @@ export function T3ConnectEnvironmentRow(props: {
       <Collapsible open={props.confirmationOpen} onOpenChange={props.onConfirmationChange}>
         <div className="flex items-start gap-4">
           <div className="min-w-0 flex-1">
-            <h3 className="truncate text-[0.8125rem] leading-[1.125rem] font-medium text-foreground">
+            <h3 className="truncate text-sm leading-4.5 font-medium text-foreground">
               {environment.label}
             </h3>
-            <p className="mt-1 text-xs leading-[1.125rem] text-muted-foreground">
+            <p className="mt-1 text-xs leading-4.5 text-muted-foreground">
               {linkedAtLabel(environment.linkedAt)} · {endpointLabel(environment)}
             </p>
           </div>
           <CollapsibleTrigger
             render={
-              <Button
-                size="sm"
-                variant="destructive-outline"
-                className="text-[0.8125rem]"
-                disabled={props.mutationPending}
-              >
+              <Button size="sm" variant="destructive-outline" disabled={props.mutationPending}>
                 Deregister
               </Button>
             }
@@ -79,13 +74,13 @@ export function T3ConnectEnvironmentRow(props: {
               role="group"
               aria-label={`Confirm deregistration of ${environment.label}`}
             >
-              <h4 className="text-[0.8125rem] leading-[1.125rem] font-semibold text-foreground">
+              <h4 className="text-sm leading-4.5 font-semibold text-foreground">
                 Deregister server
               </h4>
-              <p className="mt-1 text-[0.8125rem] leading-[1.125rem] text-muted-foreground">
+              <p className="mt-1 text-xs leading-4.5 text-muted-foreground">
                 “{environment.label}” will be removed from this account.
               </p>
-              <p className="mt-4 max-w-xl text-[0.8125rem] leading-[1.125rem] text-muted-foreground">
+              <p className="mt-4 max-w-xl text-xs leading-4.5 text-muted-foreground">
                 T3 Connect access will be revoked, any managed tunnel will be removed, and a host
                 space will become available. Local connections on your devices are not changed.
               </p>
@@ -93,7 +88,6 @@ export function T3ConnectEnvironmentRow(props: {
                 <Button
                   size="sm"
                   variant="ghost"
-                  className="text-[0.8125rem]"
                   disabled={props.mutationPending}
                   onClick={() => props.onConfirmationChange(false)}
                 >
@@ -102,7 +96,6 @@ export function T3ConnectEnvironmentRow(props: {
                 <Button
                   size="sm"
                   variant="destructive"
-                  className="text-[0.8125rem]"
                   disabled={props.mutationPending}
                   onClick={() => props.onDeregister(environment)}
                 >
@@ -212,7 +205,7 @@ export function T3ConnectUserProfilePage() {
     >
       <div>
         {environmentsState.error ? (
-          <div className="mb-4 border-t border-destructive/35 py-3 text-[0.8125rem]" role="alert">
+          <div className="mb-4 border-t border-destructive/35 py-3 text-xs" role="alert">
             <p className="font-medium text-destructive-foreground">
               Could not load T3 Connect environments
             </p>
@@ -221,7 +214,7 @@ export function T3ConnectUserProfilePage() {
         ) : null}
 
         {isInitialLoad ? (
-          <p className="border-t py-4 text-[0.8125rem] text-muted-foreground" role="status">
+          <p className="border-t py-4 text-xs text-muted-foreground" role="status">
             Loading environments…
           </p>
         ) : environments.length > 0 ? (
@@ -240,19 +233,20 @@ export function T3ConnectUserProfilePage() {
             ))}
           </ul>
         ) : environmentsState.error ? null : (
-          <Empty className="min-h-64 gap-4 border-t px-6 py-10 md:p-10">
-            <EmptyMedia className="mb-0" variant="icon">
-              <ServerIcon />
-            </EmptyMedia>
-            <EmptyHeader>
-              <EmptyTitle className="text-[1.0625rem] leading-6">
-                No T3 Connect environments
-              </EmptyTitle>
-              <EmptyDescription className="text-[0.8125rem] leading-[1.125rem]">
-                Link an environment from its local Settings to make it available through T3 Connect.
-              </EmptyDescription>
-            </EmptyHeader>
-          </Empty>
+          <div className="border-t">
+            <Empty size="compact">
+              <EmptyMedia variant="icon">
+                <ServerIcon />
+              </EmptyMedia>
+              <EmptyHeader>
+                <EmptyTitle>No T3 Connect environments</EmptyTitle>
+                <EmptyDescription>
+                  Link an environment from its local Settings to make it available through T3
+                  Connect.
+                </EmptyDescription>
+              </EmptyHeader>
+            </Empty>
+          </div>
         )}
       </div>
     </ClerkUserProfilePage>
diff --git a/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx b/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
index 5d4e002cf865..5022031e98e6 100644
--- a/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
+++ b/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
@@ -57,10 +57,10 @@ function RemoteEnvironmentRowsSkeleton() {
     <div className={ITEM_ROW_CLASSNAME}>
       <div className={ITEM_ROW_INNER_CLASSNAME}>
         <div className="min-w-0 flex-1 space-y-2">
-          <Skeleton className="h-4 w-32 rounded-full" />
-          <Skeleton className="h-3 w-20 rounded-full" />
+          <Skeleton shape="pill" className="h-4 w-32" />
+          <Skeleton shape="pill" className="h-3 w-20" />
         </div>
-        <Skeleton className="h-7 w-16 rounded-md" />
+        <Skeleton className="h-7 w-16" />
       </div>
     </div>
   );
@@ -393,9 +393,7 @@ export function CloudEnvironmentConnectRows({
                         ? "Unavailable"
                         : "Checking…"))}
             </TooltipTrigger>
-            <TooltipPopup className="max-w-80 break-words">
-              {unsupportedDetail ?? statusText}
-            </TooltipPopup>
+            <TooltipPopup>{unsupportedDetail ?? statusText}</TooltipPopup>
           </Tooltip>
         </label>
       );
@@ -454,9 +452,7 @@ export function CloudEnvironmentConnectRows({
                   Add
                 </Button>
               </TooltipTrigger>
-              <TooltipPopup className="max-w-80 break-words">
-                {unsupportedDetail ?? "Client not supported"}
-              </TooltipPopup>
+              <TooltipPopup>{unsupportedDetail ?? "Client not supported"}</TooltipPopup>
             </Tooltip>
           ) : savedConnection ? (
             <Button size="sm" variant="outline" disabled>
diff --git a/apps/web/src/components/cloud/ConnectCliAuthSurface.tsx b/apps/web/src/components/cloud/ConnectCliAuthSurface.tsx
index afe0dbc31c5e..4bae618a81e0 100644
--- a/apps/web/src/components/cloud/ConnectCliAuthSurface.tsx
+++ b/apps/web/src/components/cloud/ConnectCliAuthSurface.tsx
@@ -23,9 +23,7 @@ function ConnectCliAuthMessage({
   return (
     <>
       {eyebrow ? (
-        <p className="text-[10px] font-semibold tracking-[0.18em] text-blue-600 uppercase dark:text-blue-400">
-          {eyebrow}
-        </p>
+        <p className="text-3xs font-semibold tracking-widest text-primary uppercase">{eyebrow}</p>
       ) : null}
       <h1 className="mt-2 text-2xl font-semibold tracking-tight sm:text-3xl">{title}</h1>
       <p className="mt-2 text-sm leading-relaxed text-muted-foreground">{description}</p>
diff --git a/apps/web/src/components/composerContextPresentation.tsx b/apps/web/src/components/composerContextPresentation.tsx
index 9e5c775161cb..15a75a1d4f65 100644
--- a/apps/web/src/components/composerContextPresentation.tsx
+++ b/apps/web/src/components/composerContextPresentation.tsx
@@ -14,7 +14,6 @@ import {
   formatAttachmentUploadProgress,
   type AttachmentUploadState,
 } from "~/lib/attachmentUploadState";
-import { cn } from "~/lib/utils";
 import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
 import {
   fileContextReference,
@@ -36,20 +35,14 @@ import {
   createContextPresentationRegistry,
   type ContextPresentationCapability,
 } from "./contextPresentationRegistry";
-import {
-  COMPOSER_INLINE_CHIP_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES,
-  CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES,
-  PULL_REQUEST_INLINE_CHIP_TONE_CLASS_NAMES,
-} from "./composerInlineChip";
+import type { ContextChipKind } from "./ContextChip";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
 import {
   ContextChipPopover,
   ContextChipShell,
   FileChip,
   ImageChipButton,
+  PULL_REQUEST_CHIP_KINDS,
   PullRequestChip,
   UnresolvedChip,
 } from "./contextChipParts";
@@ -138,30 +131,31 @@ function ContextChip(props: {
   kindLabel: string;
   details: ReactNode;
   detailsMode: ContextPresentationCapability["details"];
-  toneClassName: string;
+  kind: ContextChipKind;
 }) {
-  const content = (
+  if (props.detailsMode === "popover") {
+    return (
+      <ContextChipPopover
+        kind={props.kind}
+        icon={props.icon}
+        label={props.label}
+        accessibleLabel={props.kindLabel + ", " + props.label}
+      >
+        {props.details}
+      </ContextChipPopover>
+    );
+  }
+  return (
     <ContextChipShell
+      kind={props.kind}
       icon={props.icon}
       label={props.label}
-      className={cn(COMPOSER_INLINE_CHIP_CLASS_NAME, props.toneClassName)}
-      labelClassName={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}
-      interactive={props.detailsMode === "popover"}
-      aria-hidden={props.detailsMode === "popover" ? true : undefined}
       aria-label={
         props.detailsMode === "tooltip" ? `${props.kindLabel}, ${props.label}` : undefined
       }
       tooltip={props.detailsMode === "tooltip" ? props.details : undefined}
     />
   );
-  if (props.detailsMode === "popover") {
-    return (
-      <ContextChipPopover accessibleLabel={props.kindLabel + ", " + props.label} chip={content}>
-        {props.details}
-      </ContextChipPopover>
-    );
-  }
-  return content;
 }
 
 function uploadStatusSuffix(upload: AttachmentUploadState | undefined): string | null {
@@ -191,15 +185,13 @@ function ImageContextChip(props: {
           <ImageChipButton
             name={props.record.name}
             previewUrl={props.record.previewUrl}
-            className={COMPOSER_INLINE_CHIP_CLASS_NAME}
-            labelClassName={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}
             size={formatAttachmentSize(props.record.sizeBytes)}
             suffix={uploadStatusSuffix(props.upload)}
             onClick={() => actions.expandImage(props.record.id)}
           />
         }
       />
-      <TooltipPopup side="top" className="max-w-80 whitespace-pre-wrap leading-tight">
+      <TooltipPopup side="top" className="whitespace-pre-wrap">
         {attachmentTooltip(props.record, props.upload)}
       </TooltipPopup>
     </Tooltip>
@@ -222,8 +214,6 @@ function FileContextChip(props: {
       size={size}
       isVideo={isVideo}
       theme={resolvedTheme}
-      className={COMPOSER_INLINE_CHIP_CLASS_NAME}
-      labelClassName={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}
       error={props.upload?.status === "failed"}
       unresolved={needsReattach}
       suffix={suffix}
@@ -243,7 +233,7 @@ function FileContextChip(props: {
   );
 }
 
-function PullRequestContextChip(props: { record: ReviewCommentContext; toneClassName: string }) {
+function PullRequestContextChip(props: { record: ReviewCommentContext; kind: ContextChipKind }) {
   const actions = use(ComposerContextActionsContext);
   const metadata = props.record.pullRequest;
   if (metadata === undefined) return null;
@@ -253,8 +243,7 @@ function PullRequestContextChip(props: { record: ReviewCommentContext; toneClass
       environmentId={actions.environmentId}
       label={reviewCommentContextLabel(props.record)}
       kindLabel={pullRequestContextKindLabel(props.record)}
-      className={cn(COMPOSER_INLINE_CHIP_CLASS_NAME, props.toneClassName)}
-      labelClassName={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}
+      kind={props.kind}
       onOpen={actions.openPullRequest}
     />
   );
@@ -280,7 +269,7 @@ function ComposerReviewCommentDetails({ comment }: { comment: ReviewCommentConte
     <div className="space-y-2 overflow-hidden rounded-lg border border-border/70 bg-background/70 p-3">
       <div className="space-y-1">
         <div className="truncate text-xs font-medium text-foreground">{comment.filePath}</div>
-        <div className="text-secondary-label text-[11px]">
+        <div className="text-secondary-label text-2xs">
           {comment.sectionTitle} · {comment.rangeLabel}
         </div>
       </div>
@@ -324,10 +313,7 @@ function UnresolvedContextChip(props: { label: string }) {
   return (
     <UnresolvedChip
       label={props.label}
-      className={COMPOSER_INLINE_CHIP_CLASS_NAME}
-      labelClassName={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}
       tooltip="This context is no longer available. Remove it or attach it again."
-      tooltipClassName="max-w-80 leading-tight"
     />
   );
 }
@@ -389,40 +375,18 @@ const composerContextPresentationRegistry = createContextPresentationRegistry<
           return (
             <PullRequestContextChip
               record={entry.record}
-              toneClassName={PULL_REQUEST_INLINE_CHIP_TONE_CLASS_NAMES[pullRequestState]}
+              kind={PULL_REQUEST_CHIP_KINDS[pullRequestState]}
             />
           );
         }
         return (
           <ContextChip
-            icon={
-              isPullRequest ? (
-                <PullRequestGlyph.pullRequest
-                  className={cn(
-                    COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                    CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES["pull-request"],
-                    "size-3.5",
-                  )}
-                />
-              ) : (
-                <MessageCircleIcon
-                  className={cn(
-                    COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                    CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES["review-comment"],
-                    "size-3.5",
-                  )}
-                />
-              )
-            }
+            icon={isPullRequest ? <PullRequestGlyph.pullRequest /> : <MessageCircleIcon />}
             label={reviewCommentContextLabel(entry.record)}
             kindLabel={isPullRequest ? pullRequestContextKindLabel(entry.record) : "Review comment"}
             details={<ComposerReviewCommentDetails comment={entry.record} />}
             detailsMode={definition.capabilities.details}
-            toneClassName={
-              isPullRequest
-                ? PULL_REQUEST_INLINE_CHIP_TONE_CLASS_NAMES[pullRequestState]
-                : CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES["review-comment"]
-            }
+            kind={isPullRequest ? PULL_REQUEST_CHIP_KINDS[pullRequestState] : "review-comment"}
           />
         );
       },
@@ -433,20 +397,12 @@ const composerContextPresentationRegistry = createContextPresentationRegistry<
       render: (entry, context, definition) =>
         entry.kind === "preview-annotation" ? (
           <ContextChip
-            icon={
-              <MousePointerClickIcon
-                className={cn(
-                  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                  CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES["preview-annotation"],
-                  "size-3.5",
-                )}
-              />
-            }
+            icon={<MousePointerClickIcon />}
             label={previewAnnotationContextLabel(entry.record)}
             kindLabel="Preview annotation"
             details={<ComposerPreviewAnnotationDetails annotation={entry.record} />}
             detailsMode={definition.capabilities.details}
-            toneClassName={CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES["preview-annotation"]}
+            kind="preview-annotation"
           />
         ) : (
           <UnresolvedContextChip label={context.label} />
diff --git a/apps/web/src/components/composerInlineChip.ts b/apps/web/src/components/composerInlineChip.ts
index e313830a3ba4..5897f33293b5 100644
--- a/apps/web/src/components/composerInlineChip.ts
+++ b/apps/web/src/components/composerInlineChip.ts
@@ -1,83 +1,5 @@
-// Chip metrics are in em so the pills scale with the text they sit in (the
-// composer honors the prompt font-size preference). The chat variant pins the
-// original 12px, where every em value resolves to the same pixels as before.
-const INLINE_CHIP_GEOMETRY_CLASS_NAME =
-  "inline-flex h-[1.41em] max-w-full items-center gap-[0.33em] rounded-[0.5em] px-[0.5em] font-medium leading-none align-middle";
-
-const INLINE_CHIP_CLASS_NAME = `${INLINE_CHIP_GEOMETRY_CLASS_NAME} border border-border/70 bg-accent/40 text-foreground`;
-
-const CONTEXT_INLINE_CHIP_TONE_CLASS_NAME =
-  "border-[color-mix(in_oklab,var(--context-chip-accent)_34%,var(--contrast-border))] bg-[color-mix(in_oklab,var(--context-chip-accent)_11%,transparent)] text-[color-mix(in_oklab,var(--context-chip-accent)_22%,var(--contrast-foreground))]";
-
-export const CHAT_INLINE_CHIP_CLASS_NAME = `${INLINE_CHIP_CLASS_NAME} text-[12px]`;
-
-export const COMPOSER_INLINE_CHIP_CLASS_NAME = `${INLINE_CHIP_CLASS_NAME} text-[0.86em] select-none`;
-
-export const COMPOSER_INLINE_CHIP_DECORATOR_CLASS_NAME =
-  "relative inline-flex items-center align-middle leading-none data-[composer-chip-selected]:after:pointer-events-none data-[composer-chip-selected]:after:absolute data-[composer-chip-selected]:after:inset-0 data-[composer-chip-selected]:after:rounded-[6px] data-[composer-chip-selected]:after:bg-[Highlight] data-[composer-chip-selected]:after:opacity-30 data-[composer-chip-selected]:after:content-['']";
-
-export const COMPOSER_INLINE_CHIP_ICON_CLASS_NAME =
-  "block size-[1.17em] shrink-0 self-center [&>svg]:block";
-
-export const CONTEXT_INLINE_CHIP_FOCUS_CLASS_NAME =
-  "focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[var(--contrast-foreground)]";
-
-export const CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME = `transition-colors hover:border-[color-mix(in_oklab,var(--context-chip-accent)_48%,var(--contrast-border))] hover:bg-[color-mix(in_oklab,var(--context-chip-accent)_17%,transparent)] motion-reduce:transition-none ${CONTEXT_INLINE_CHIP_FOCUS_CLASS_NAME}`;
-
-export const CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES = {
-  image: "text-current",
-  video: "text-current",
-  file: "text-current",
-  mention: "text-current",
-  terminal: "text-current",
-  element: "text-current",
-  "preview-annotation": "text-current",
-  "review-comment": "text-current",
-  "pull-request": "text-current",
-  skill: "text-current",
-  citation: "text-current",
-} as const;
-
-/**
- * Context kinds keep one restrained color identity in both composer and sent messages.
- * Every accent shares a lightness so no kind reads heavier than another; only hue carries
- * identity. Chroma is capped, then clamped to what each hue can hold in sRGB, which keeps
- * the set inside the range the themes use for their own accents rather than above it.
- */
-export const CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES = {
-  image: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_16)]`,
-  video: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_48)]`,
-  file: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.136_237)]`,
-  mention: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.11_215)]`,
-  terminal: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.134_163)]`,
-  element: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.134_70)]`,
-  "preview-annotation": `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.134_70)]`,
-  "review-comment": `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_292)]`,
-  "pull-request": `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_277)]`,
-  skill: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_322)]`,
-  citation: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_259)]`,
-} as const;
-
-export const PULL_REQUEST_INLINE_CHIP_TONE_CLASS_NAMES = {
-  open: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.134_163)]`,
-  draft: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.02_259)]`,
-  merged: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_292)]`,
-  closed: `${CONTEXT_INLINE_CHIP_TONE_CLASS_NAME} [--context-chip-accent:oklch(0.62_0.16_16)]`,
-  unknown: CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES["pull-request"],
-} as const;
-
-export const CHAT_INLINE_CHIP_LABEL_CLASS_NAME = "truncate leading-tight";
-
-export const COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME =
-  "block self-center truncate leading-tight select-none";
-
-export const COMPOSER_INLINE_SKILL_CHIP_CLASS_NAME = `${INLINE_CHIP_GEOMETRY_CLASS_NAME} select-none border text-[0.86em] ${CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.skill}`;
-
 export const SKILL_CHIP_ICON_SVG = `<svg width="100%" height="100%" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.85" stroke-linecap="round" stroke-linejoin="round"><path d="M21 8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16Z"/><path d="m3.3 7 8.7 5 8.7-5"/><path d="M12 22V12"/></svg>`;
 
-export const COMPOSER_INLINE_CHIP_DISMISS_BUTTON_CLASS_NAME =
-  "ml-[0.17em] inline-flex size-[1.17em] shrink-0 cursor-pointer items-center justify-center rounded-sm text-muted-foreground/72 transition-colors hover:bg-foreground/6 hover:text-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring";
-
 /** Keeps both the recognizable beginning and the extension/end of a long attachment name. */
 export function middleTruncateAttachmentName(name: string, maxCharacters = 36): string {
   const characters = Array.from(name);
diff --git a/apps/web/src/components/contextChipParts.tsx b/apps/web/src/components/contextChipParts.tsx
index f0a47b22e3c3..cf45749351f3 100644
--- a/apps/web/src/components/contextChipParts.tsx
+++ b/apps/web/src/components/contextChipParts.tsx
@@ -8,103 +8,84 @@ import {
   type ReactNode,
 } from "react";
 
-import { cn } from "~/lib/utils";
 import { PULL_REQUEST_STATE_PRESENTATION } from "~/components/pullRequest/pullRequestIcons";
+import type { PullRequestContextDisplayState } from "~/lib/composerContextRecords";
 import { PierreEntryIcon } from "./chat/PierreEntryIcon";
-import {
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_FOCUS_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES,
-  CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME,
-  CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES,
-  middleTruncateAttachmentName,
-} from "./composerInlineChip";
+import { middleTruncateAttachmentName } from "./composerInlineChip";
 import { PullRequestContextDetails } from "./PullRequestContextDetails";
-import { Button } from "./ui/button";
+import { ContextChip, ContextChipLabel, type ContextChipKind } from "./ContextChip";
 import { Popover, PopoverPopup, PopoverTitle, PopoverTrigger } from "./ui/popover";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
 import { PullRequestLinkPreview } from "./pullRequest/PullRequestLinkPreview";
 import { usePullRequestPreviewTarget } from "~/lib/openPullRequestLink";
 
-/** Shared visual slots; each surface keeps ownership of payload lookup and actions. */
+/** ContextChip kind for a pull request context in each display state. */
+export const PULL_REQUEST_CHIP_KINDS = {
+  open: "pr-open",
+  draft: "pr-draft",
+  merged: "pr-merged",
+  closed: "pr-closed",
+  unknown: "pull-request",
+} as const satisfies Record<PullRequestContextDisplayState | "unknown", ContextChipKind>;
+
+/** A static chip with an optional tooltip; each surface keeps ownership of payload lookup. */
 export function ContextChipShell({
   icon,
   label,
-  labelClassName,
   tooltip,
-  tooltipClassName = "max-w-96 whitespace-pre-wrap leading-tight",
-  interactive,
-  unresolved,
-  className,
   ...props
-}: ComponentProps<"span"> & {
+}: Omit<ComponentProps<typeof ContextChip>, "className" | "render"> & {
   icon: ReactNode;
   label: string;
-  labelClassName: string;
+  /** Newlines in the tooltip are kept. */
   tooltip?: ReactNode;
-  tooltipClassName?: string;
-  interactive?: boolean;
-  unresolved?: boolean;
 }) {
   const chip = (
-    <span
-      className={cn(
-        className,
-        interactive && CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME,
-        tooltip && CONTEXT_INLINE_CHIP_FOCUS_CLASS_NAME,
-        unresolved && "border-dashed text-foreground",
-      )}
-      data-context-unresolved={unresolved ? "true" : undefined}
+    <ContextChip
+      data-context-unresolved={props.state === "unresolved" ? "true" : undefined}
       tabIndex={tooltip ? 0 : undefined}
       {...props}
     >
       {icon}
-      <span className={labelClassName}>{label}</span>
-    </span>
+      <ContextChipLabel>{label}</ContextChipLabel>
+    </ContextChip>
   );
   if (!tooltip) return chip;
   return (
     <Tooltip>
       <TooltipTrigger render={chip} />
-      <TooltipPopup side="top" className={tooltipClassName}>
+      <TooltipPopup side="top" className="whitespace-pre-wrap">
         {tooltip}
       </TooltipPopup>
     </Tooltip>
   );
 }
 
+/** A chip that opens its details in a popover; the chip itself is the trigger. */
 export function ContextChipPopover(props: {
+  kind: ContextChipKind;
+  icon: ReactNode;
+  label: string;
   copyMarkdown?: string;
   accessibleLabel: string;
-  chip: ReactNode;
   children: ReactNode;
-  triggerClassName?: string;
-  popupClassName?: string;
-  viewportClassName?: string;
 }) {
   return (
     <Popover>
       <PopoverTrigger
         render={
-          <Button
-            variant="chip"
-            className={cn(
-              "inline-flex max-w-full cursor-pointer items-center rounded-[0.5em] align-middle",
-              CONTEXT_INLINE_CHIP_FOCUS_CLASS_NAME,
-              props.triggerClassName,
-            )}
+          <ContextChip
+            kind={props.kind}
+            render={<button type="button" />}
             aria-label={`${props.accessibleLabel}. Show details`}
             data-markdown-copy={props.copyMarkdown}
           />
         }
       >
-        {props.chip}
+        {props.icon}
+        <ContextChipLabel>{props.label}</ContextChipLabel>
       </PopoverTrigger>
-      <PopoverPopup
-        side="top"
-        className={cn("w-[min(36rem,calc(100vw-2rem))]", props.popupClassName)}
-        viewportClassName={cn("overflow-x-auto p-2", props.viewportClassName)}
-      >
+      <PopoverPopup side="top" width="lg" padding="compact">
         <PopoverTitle className="sr-only">{props.accessibleLabel}</PopoverTitle>
         {props.children}
       </PopoverPopup>
@@ -117,8 +98,7 @@ export function PullRequestChip(props: {
   environmentId: EnvironmentId | null;
   label: string;
   kindLabel: string;
-  className: string;
-  labelClassName: string;
+  kind: ContextChipKind;
   copyMarkdown?: string;
   onOpen: (event: MouseEvent<HTMLElement>, url: string) => void;
 }) {
@@ -127,21 +107,16 @@ export function PullRequestChip(props: {
     props.metadata.state === "open" && props.metadata.isDraft ? "draft" : props.metadata.state;
   const StateIcon = PULL_REQUEST_STATE_PRESENTATION[displayState].Icon;
   const button = (
-    <Button
-      variant="chip"
-      className={cn(
-        props.className,
-        CONTEXT_INLINE_CHIP_FOCUS_CLASS_NAME,
-        CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME,
-        "cursor-pointer",
-      )}
+    <ContextChip
+      kind={props.kind}
+      render={<button type="button" />}
       aria-label={`Open ${props.kindLabel} ${props.label}: ${props.metadata.title}`}
       data-markdown-copy={props.copyMarkdown}
       onClick={(event) => props.onOpen(event, props.metadata.url)}
     >
-      <StateIcon className={cn(COMPOSER_INLINE_CHIP_ICON_CLASS_NAME, "size-3.5")} />
-      <span className={props.labelClassName}>{props.label}</span>
-    </Button>
+      <StateIcon />
+      <ContextChipLabel>{props.label}</ContextChipLabel>
+    </ContextChip>
   );
   if (previewTarget !== null) {
     return (
@@ -195,16 +170,13 @@ function averageImageColor(image: HTMLImageElement): string | undefined {
 export function ImageChipButton({
   name,
   previewUrl,
-  className,
-  labelClassName,
   size,
   suffix,
   style,
   ...props
-}: ComponentProps<"button"> & {
+}: Omit<ComponentProps<typeof ContextChip>, "kind" | "render"> & {
   name: string;
   previewUrl: string | undefined;
-  labelClassName: string;
   /** Every attachment chip reports its size; images are no exception. */
   size: string;
   suffix?: string | null;
@@ -213,14 +185,9 @@ export function ImageChipButton({
   const [corsFailedUrl, setCorsFailedUrl] = useState<string>();
   const accent = sample?.url === previewUrl ? sample?.color : undefined;
   return (
-    <Button
-      variant="chip"
-      className={cn(
-        className,
-        CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.image,
-        CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME,
-        "cursor-zoom-in",
-      )}
+    <ContextChip
+      kind="image"
+      render={<button type="button" />}
       aria-label={`Image attachment, ${name}, ${size}`}
       style={{ ...style, ...(accent ? { "--context-chip-accent": accent } : {}) } as CSSProperties}
       {...props}
@@ -231,25 +198,19 @@ export function ImageChipButton({
           crossOrigin={corsFailedUrl === previewUrl ? undefined : "anonymous"}
           src={previewUrl}
           alt=""
-          className="size-3.5 shrink-0 rounded-sm object-cover"
+          className="size-[1.17em] shrink-0 rounded-sm object-cover"
           onError={() => setCorsFailedUrl(previewUrl)}
           onLoad={(event) =>
             setSample({ url: previewUrl, color: averageImageColor(event.currentTarget) })
           }
         />
       ) : (
-        <ImageIcon
-          className={cn(
-            COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-            CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES.image,
-            "size-3.5",
-          )}
-        />
+        <ImageIcon />
       )}
-      <span className={cn(labelClassName, "max-w-72")}>{middleTruncateAttachmentName(name)}</span>
-      <span className="shrink-0 text-[10px] text-current">{size}</span>
-      {suffix ? <span className="text-[10px] text-current">{suffix}</span> : null}
-    </Button>
+      <ContextChipLabel className="max-w-72">{middleTruncateAttachmentName(name)}</ContextChipLabel>
+      <span className="shrink-0 text-3xs text-current">{size}</span>
+      {suffix ? <span className="text-3xs text-current">{suffix}</span> : null}
+    </ContextChip>
   );
 }
 
@@ -258,8 +219,6 @@ export function FileChip(props: {
   size: string;
   isVideo: boolean;
   theme: "light" | "dark";
-  className: string;
-  labelClassName: string;
   accessibleLabel: string;
   tooltip: string;
   suffix?: string | null;
@@ -269,39 +228,39 @@ export function FileChip(props: {
   unresolved?: boolean;
   onOpen?: (() => void) | undefined;
 }) {
-  const className = cn(
-    props.className,
-    props.isVideo
-      ? CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.video
-      : CONTEXT_INLINE_CHIP_TONE_CLASS_NAMES.file,
-    props.onOpen && !props.disabled && CONTEXT_INLINE_CHIP_INTERACTIVE_CLASS_NAME,
-    props.onOpen && !props.disabled && (props.isVideo ? "cursor-zoom-in" : "cursor-pointer"),
-    props.unresolved && "border-dashed text-foreground",
-    props.error && "border-destructive/35 bg-destructive/8 text-destructive",
-  );
   const content = <FileChipContent {...props} />;
+  const state = props.unresolved
+    ? ("unresolved" as const)
+    : props.error
+      ? ("invalid" as const)
+      : null;
   const attributes = {
-    className,
+    kind: props.isVideo ? "video" : "file",
+    ...(state ? { state } : {}),
     "aria-label": [props.accessibleLabel, props.suffix].filter(Boolean).join(", "),
     "data-markdown-copy": props.copyMarkdown,
     "data-context-unresolved": props.unresolved ? "true" : undefined,
-  };
+  } as const;
   return (
     <Tooltip>
       <TooltipTrigger
         render={
           props.onOpen ? (
-            <Button variant="chip" disabled={props.disabled} onClick={props.onOpen} {...attributes}>
+            <ContextChip
+              render={<button type="button" disabled={props.disabled} />}
+              onClick={props.onOpen}
+              {...attributes}
+            >
               {content}
-            </Button>
+            </ContextChip>
           ) : (
-            <span tabIndex={0} {...attributes}>
+            <ContextChip tabIndex={0} {...attributes}>
               {content}
-            </span>
+            </ContextChip>
           )
         }
       />
-      <TooltipPopup side="top" className="max-w-80 whitespace-pre-wrap leading-tight">
+      <TooltipPopup side="top" className="whitespace-pre-wrap">
         {props.tooltip}
       </TooltipPopup>
     </Tooltip>
@@ -313,55 +272,33 @@ function FileChipContent(props: {
   size: string;
   isVideo: boolean;
   theme: "light" | "dark";
-  labelClassName: string;
   suffix?: string | null;
 }) {
   return (
     <>
       {props.isVideo ? (
-        <FilmIcon
-          className={cn(
-            COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-            CONTEXT_INLINE_CHIP_ICON_TONE_CLASS_NAMES.video,
-            "size-3.5",
-          )}
-        />
+        <FilmIcon />
       ) : (
-        <PierreEntryIcon
-          pathValue={props.name}
-          kind="file"
-          theme={props.theme}
-          className="size-3.5"
-        />
+        <PierreEntryIcon pathValue={props.name} kind="file" theme={props.theme} />
       )}
-      <span className={cn(props.labelClassName, "max-w-72")}>
+      <ContextChipLabel className="max-w-72">
         {middleTruncateAttachmentName(props.name)}
-      </span>
-      <span className="shrink-0 text-[10px] text-current">{props.size}</span>
-      {props.suffix ? <span className="text-[10px] text-current">{props.suffix}</span> : null}
+      </ContextChipLabel>
+      <span className="shrink-0 text-3xs text-current">{props.size}</span>
+      {props.suffix ? <span className="text-3xs text-current">{props.suffix}</span> : null}
     </>
   );
 }
 
-export function UnresolvedChip(props: {
-  label: string;
-  className: string;
-  labelClassName: string;
-  tooltip: string;
-  tooltipClassName: string;
-  copyMarkdown?: string;
-}) {
+export function UnresolvedChip(props: { label: string; tooltip: string; copyMarkdown?: string }) {
   return (
     <ContextChipShell
-      icon={<CircleDashedIcon className={cn(COMPOSER_INLINE_CHIP_ICON_CLASS_NAME, "size-3.5")} />}
+      icon={<CircleDashedIcon />}
       label={props.label}
-      className={props.className}
-      labelClassName={props.labelClassName}
+      state="unresolved"
       aria-label={`Unavailable context, ${props.label}`}
       data-markdown-copy={props.copyMarkdown}
       tooltip={props.tooltip}
-      tooltipClassName={props.tooltipClassName}
-      unresolved
     />
   );
 }
diff --git a/apps/web/src/components/desktop/DesktopEnvironmentSwitcher.tsx b/apps/web/src/components/desktop/DesktopEnvironmentSwitcher.tsx
index 53efa3bb699a..dc482a7d7d7b 100644
--- a/apps/web/src/components/desktop/DesktopEnvironmentSwitcher.tsx
+++ b/apps/web/src/components/desktop/DesktopEnvironmentSwitcher.tsx
@@ -176,15 +176,14 @@ export const DesktopEnvironmentSwitcher = memo(function DesktopEnvironmentSwitch
         onValueChange={handleValueChange}
         items={options.map((option) => ({ value: option.environmentId, label: option.label }))}
       >
-        <SelectTrigger
-          variant="ghost"
-          size="xs"
-          className="max-w-36 font-medium"
-          aria-label="Environment"
-        >
-          <EnvironmentIcon kind={selected.kind} />
-          <SelectValue />
-        </SelectTrigger>
+        {/* The trigger owns its typography; the medium label weight inherits from this
+            layout-neutral wrapper. */}
+        <span className="contents font-medium">
+          <SelectTrigger variant="ghost" size="xs" className="max-w-36" aria-label="Environment">
+            <EnvironmentIcon kind={selected.kind} />
+            <SelectValue />
+          </SelectTrigger>
+        </span>
         <SelectPopup>
           <SelectGroup>
             <SelectGroupLabel>Environment</SelectGroupLabel>
@@ -226,7 +225,7 @@ export const DesktopEnvironmentSwitcher = memo(function DesktopEnvironmentSwitch
               again. It never connects to or runs a second T3 instance.
             </DialogDescription>
           </DialogHeader>
-          <DialogPanel className="space-y-4">
+          <DialogPanel>
             {result?.status === "needs-collision-choices" ? (
               <div className="space-y-3">
                 <p className="text-sm text-muted-foreground">{result.message}</p>
@@ -269,7 +268,7 @@ export const DesktopEnvironmentSwitcher = memo(function DesktopEnvironmentSwitch
                 </div>
               </div>
             ) : result?.status === "imported" ? (
-              <div className="space-y-2 rounded-md border border-emerald-500/30 bg-emerald-500/5 p-3 text-sm">
+              <div className="space-y-2 rounded-md border border-success/30 bg-success/5 p-3 text-sm">
                 <p>
                   Imported {result.importedEventCount} events and {result.copiedAttachmentCount}{" "}
                   attachments. Turbo has restarted with the merged database.
diff --git a/apps/web/src/components/desktop/RunningThreadKeepAlive.tsx b/apps/web/src/components/desktop/RunningThreadKeepAlive.tsx
new file mode 100644
index 000000000000..68c2c0cf609a
--- /dev/null
+++ b/apps/web/src/components/desktop/RunningThreadKeepAlive.tsx
@@ -0,0 +1,14 @@
+import { useAtomMount } from "@effect/atom-react";
+
+import { runningThreadKeepAliveAtom } from "../../state/threads";
+
+/**
+ * Desktop only. Keeps each running thread subscribed in every enabled
+ * environment, so opening one shows live state without a replay or a sync
+ * status flash. It mounts the atom without reading it, so thread updates
+ * never re-render.
+ */
+export function RunningThreadKeepAlive() {
+  useAtomMount(runningThreadKeepAliveAtom);
+  return null;
+}
diff --git a/apps/web/src/components/desktop/SnapShotShortcutKeys.tsx b/apps/web/src/components/desktop/SnapShotShortcutKeys.tsx
index 2d233461c59f..0a49e4068e85 100644
--- a/apps/web/src/components/desktop/SnapShotShortcutKeys.tsx
+++ b/apps/web/src/components/desktop/SnapShotShortcutKeys.tsx
@@ -16,7 +16,7 @@ export function SnapShotShortcutKeys({
         const seen = seenLabels.get(label) ?? 0;
         seenLabels.set(label, seen + 1);
         return (
-          <Kbd aria-hidden className="min-w-6 justify-center px-1.5" key={`${label}-${seen}`}>
+          <Kbd aria-hidden key={`${label}-${seen}`}>
             {label}
           </Kbd>
         );
diff --git a/apps/web/src/components/desktop/SshPasswordPromptDialog.tsx b/apps/web/src/components/desktop/SshPasswordPromptDialog.tsx
index 81385f4b7802..86b77a1c9b98 100644
--- a/apps/web/src/components/desktop/SshPasswordPromptDialog.tsx
+++ b/apps/web/src/components/desktop/SshPasswordPromptDialog.tsx
@@ -164,7 +164,7 @@ function ActiveSshPasswordPrompt({
             to the local SSH process for this connection attempt and is not saved by T3 Turbo.
           </DialogDescription>
         </DialogHeader>
-        <DialogPanel className="space-y-3" scrollFade={false}>
+        <DialogPanel scrollFade={false}>
           <form
             className="space-y-3"
             id={formId}
diff --git a/apps/web/src/components/device/DeviceAndroidFoldControls.tsx b/apps/web/src/components/device/DeviceAndroidFoldControls.tsx
new file mode 100644
index 000000000000..098f07ae512e
--- /dev/null
+++ b/apps/web/src/components/device/DeviceAndroidFoldControls.tsx
@@ -0,0 +1,155 @@
+import type { DeviceHubAccess } from "@t3tools/client-runtime/state/deviceHubAccess";
+import { useEffect, useRef, useState } from "react";
+import { Button } from "~/components/ui/button";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
+import {
+  readAndroidFold,
+  setAndroidFold,
+  type AndroidFoldPosture,
+  type AndroidFoldState,
+} from "./deviceFold";
+import { DeviceDuoGlyph } from "./DeviceDuoGlyph";
+
+/** Capability comes from the emulator, not its AVD name or screen dimensions. */
+export function DeviceAndroidFoldControls(props: {
+  readonly access: DeviceHubAccess;
+  readonly deviceId: string;
+  readonly visible: boolean;
+  readonly enabled: boolean;
+  readonly screenWidth: number | undefined;
+  readonly screenHeight: number | undefined;
+  readonly onFoldAngle: (angle: number | null) => void;
+}) {
+  const [fold, setFold] = useState<AndroidFoldState | null>(null);
+  const [pending, setPending] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const busy = useRef(false);
+  const mounted = useRef(true);
+  const { access, deviceId, visible, enabled, screenWidth, screenHeight, onFoldAngle } = props;
+
+  useEffect(() => {
+    mounted.current = true;
+    return () => {
+      mounted.current = false;
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!visible || !enabled || pending || !screenWidth || !screenHeight) return;
+    const controller = new AbortController();
+    let retry: number | undefined;
+    const read = () => {
+      void readAndroidFold(access, deviceId, controller.signal)
+        .then((next) => {
+          if (!controller.signal.aborted) {
+            setFold(next);
+            onFoldAngle(
+              next.supported ? (next.hingeAngle ?? (next.posture === "closed" ? 0 : 180)) : null,
+            );
+          }
+        })
+        .catch(() => {
+          if (!controller.signal.aborted) retry = window.setTimeout(read, 3_000);
+        });
+    };
+    read();
+    return () => {
+      controller.abort();
+      window.clearTimeout(retry);
+    };
+  }, [access, deviceId, visible, enabled, screenWidth, screenHeight, pending, onFoldAngle]);
+
+  if (!fold?.supported || !props.visible) return null;
+
+  const change = (posture: AndroidFoldPosture) => {
+    if (busy.current || !props.enabled) return;
+    busy.current = true;
+    setPending(true);
+    setError(null);
+    props.onFoldAngle(posture === "closed" ? 0 : 180);
+    const controller = new AbortController();
+    const timeout = window.setTimeout(() => controller.abort(), 12_000);
+    void setAndroidFold(props.access, props.deviceId, posture, controller.signal)
+      .then((next) => {
+        if (mounted.current) {
+          setFold(next);
+          props.onFoldAngle(next.hingeAngle ?? (next.posture === "closed" ? 0 : 180));
+        }
+      })
+      .catch((cause: unknown) => {
+        if (mounted.current) {
+          props.onFoldAngle(fold.hingeAngle ?? (fold.posture === "closed" ? 0 : 180));
+          setError(
+            controller.signal.aborted
+              ? "Fold command timed out."
+              : cause instanceof Error
+                ? cause.message
+                : "Could not change fold posture.",
+          );
+        }
+      })
+      .finally(() => {
+        window.clearTimeout(timeout);
+        busy.current = false;
+        if (mounted.current) setPending(false);
+      });
+  };
+
+  return (
+    <div aria-label="Android fold controls" className="flex flex-col items-center gap-2">
+      <div className="pointer-events-auto flex shrink-0 flex-col items-center gap-1 rounded-full border border-border/50 bg-background/80 p-1 shadow-sm">
+        <Tooltip>
+          <TooltipTrigger
+            render={
+              <Button
+                size="icon"
+                variant={fold.posture === "closed" ? "secondary" : "ghost"}
+                aria-label="Fold device"
+                aria-pressed={fold.posture === "closed"}
+                disabled={pending || !props.enabled}
+                onClick={() => change("closed")}
+              />
+            }
+          >
+            <DeviceDuoGlyph pose="closed" />
+          </TooltipTrigger>
+          <TooltipPopup side="left">Fold device</TooltipPopup>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={
+              <Button
+                size="icon"
+                variant={fold.posture === "opened" ? "secondary" : "ghost"}
+                aria-label="Unfold device"
+                aria-pressed={fold.posture === "opened"}
+                disabled={pending || !props.enabled}
+                onClick={() => change("opened")}
+              />
+            }
+          >
+            <DeviceDuoGlyph pose="open" />
+          </TooltipTrigger>
+          <TooltipPopup side="left">Unfold device</TooltipPopup>
+        </Tooltip>
+      </div>
+      {error ? (
+        <Tooltip>
+          <TooltipTrigger
+            render={
+              <span
+                tabIndex={0}
+                role="alert"
+                aria-label={error}
+                className="pointer-events-auto text-xs text-destructive"
+              >
+                !
+              </span>
+            }
+          />
+          <TooltipPopup side="left">{error}</TooltipPopup>
+        </Tooltip>
+      ) : null}
+    </div>
+  );
+}
diff --git a/apps/web/src/components/device/DeviceControlsRail.tsx b/apps/web/src/components/device/DeviceControlsRail.tsx
new file mode 100644
index 000000000000..3b9e8bf96c36
--- /dev/null
+++ b/apps/web/src/components/device/DeviceControlsRail.tsx
@@ -0,0 +1,309 @@
+import type { DevicePlatform } from "@t3tools/contracts";
+import {
+  Camera,
+  ChevronLeft,
+  Home,
+  Keyboard,
+  Box,
+  Maximize,
+  Moon,
+  MoreHorizontal,
+  PictureInPicture2,
+  Power,
+  RotateCcw,
+  SlidersHorizontal,
+  Smartphone,
+  Square,
+  Sun,
+  Type,
+  X,
+} from "lucide-react";
+import type { ReactNode } from "react";
+import { Button } from "~/components/ui/button";
+import {
+  Menu,
+  MenuItem,
+  MenuPopup,
+  MenuSeparator,
+  MenuTrigger,
+  MenuRadioGroup,
+  MenuRadioItem,
+  MenuRadioItemIndicator,
+} from "~/components/ui/menu";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
+import type { DeviceStreamHandle, DeviceViewControls } from "./DeviceStreamView";
+import type { DeviceControls } from "./useDeviceControls";
+
+/** Stable floating controls for both presentations, regardless of panel width. */
+export function DeviceControlsRail(props: {
+  platform: DevicePlatform;
+  handle: DeviceStreamHandle | null;
+  view: DeviceViewControls;
+  controls: DeviceControls;
+  screenshotPending: boolean;
+  onScreenshot: () => void;
+  toolsOpen: boolean;
+  onTools: () => void;
+  onFloat: () => void;
+  onClose: () => void;
+  onPowerOff: () => void;
+}) {
+  const { view, handle, controls } = props;
+  const popupSide = "left";
+  const settings = controls.detail?.settings;
+  const inputDisabled = !handle?.inputConnected;
+  const nextAppearance = settings?.appearance === "dark" ? "light" : "dark";
+  return (
+    <aside
+      aria-label="Device controls"
+      data-layout="rail"
+      className="pointer-events-none absolute inset-y-0 right-0 z-10 flex w-14 flex-col items-center gap-2 overflow-y-auto [justify-content:safe_center] py-3 pr-2 [scrollbar-width:none]"
+    >
+      <div className="pointer-events-auto flex shrink-0 flex-col items-center gap-1 overflow-y-auto rounded-full border border-border/50 bg-background/80 p-2 shadow-sm [scrollbar-width:none]">
+        <RailButton
+          tooltipSide={popupSide}
+          label="Home"
+          disabled={inputDisabled}
+          onClick={() => handle?.pressButton("home")}
+        >
+          <Home />
+        </RailButton>
+        {props.platform === "android" ? (
+          <>
+            <RailButton
+              tooltipSide={popupSide}
+              label="Back"
+              disabled={inputDisabled}
+              onClick={() => handle?.pressButton("back")}
+            >
+              <ChevronLeft />
+            </RailButton>
+            <RailButton
+              tooltipSide={popupSide}
+              label="Recents"
+              disabled={inputDisabled}
+              onClick={() => handle?.pressButton("recents")}
+            >
+              <Square />
+            </RailButton>
+            <Menu>
+              <MenuTrigger
+                render={
+                  <Button
+                    size="icon-sm"
+                    variant="ghost"
+                    aria-label="Rotate device"
+                    disabled={controls.disabled}
+                  />
+                }
+              >
+                <RotateCcw />
+              </MenuTrigger>
+              <MenuPopup side={popupSide}>
+                <MenuItem
+                  onClick={() => void controls.act({ type: "setOrientation", value: "portrait" })}
+                >
+                  Portrait
+                </MenuItem>
+                <MenuItem
+                  onClick={() =>
+                    void controls.act({ type: "setOrientation", value: "landscape_left" })
+                  }
+                >
+                  Landscape
+                </MenuItem>
+              </MenuPopup>
+            </Menu>
+          </>
+        ) : (
+          <RailButton
+            tooltipSide={popupSide}
+            label="Rotate device"
+            disabled={inputDisabled || !!view.keyboard?.attached}
+            onClick={() => handle?.rotate()}
+          >
+            <RotateCcw />
+          </RailButton>
+        )}
+        <RailDivider />
+        <RailButton
+          tooltipSide={popupSide}
+          label={`Switch device to ${nextAppearance} mode`}
+          disabled={controls.disabled || !settings?.appearance}
+          onClick={() => void controls.act({ type: "setAppearance", value: nextAppearance })}
+        >
+          {settings?.appearance === "dark" ? <Sun /> : <Moon />}
+        </RailButton>
+        <Menu>
+          <MenuTrigger
+            render={
+              <Button
+                size="icon-sm"
+                variant="ghost"
+                aria-label="Device text size"
+                title="Device text size"
+                disabled={controls.disabled || !settings?.textSize}
+              />
+            }
+          >
+            <Type />
+          </MenuTrigger>
+          <MenuPopup side={popupSide} className="min-w-40">
+            <MenuRadioGroup
+              value={settings?.textSize ?? ""}
+              onValueChange={(value) => {
+                if (
+                  value === "small" ||
+                  value === "default" ||
+                  value === "large" ||
+                  value === "extra-large"
+                )
+                  void controls.act({ type: "setTextSize", value });
+              }}
+            >
+              {(
+                [
+                  ["small", "Small"],
+                  ["default", "Default"],
+                  ["large", "Large"],
+                  ["extra-large", "Extra large"],
+                ] as const
+              ).map(([value, label]) => (
+                <MenuRadioItem key={value} value={value}>
+                  <span className="flex items-center gap-2">
+                    <span className="flex-1">{label}</span>
+                    <MenuRadioItemIndicator />
+                  </span>
+                </MenuRadioItem>
+              ))}
+            </MenuRadioGroup>
+          </MenuPopup>
+        </Menu>
+        <RailButton
+          tooltipSide={popupSide}
+          label="Device tools"
+          pressed={props.toolsOpen}
+          onClick={props.onTools}
+        >
+          <SlidersHorizontal />
+        </RailButton>
+        <RailButton
+          tooltipSide={popupSide}
+          label={props.screenshotPending ? "Capturing screenshot" : "Save screenshot"}
+          disabled={!view.streaming || props.screenshotPending}
+          onClick={props.onScreenshot}
+        >
+          <Camera />
+        </RailButton>
+        <Menu>
+          <MenuTrigger
+            render={
+              <Button
+                size="icon-sm"
+                variant="ghost"
+                aria-label="More device actions"
+                title="More device actions"
+              />
+            }
+          >
+            <MoreHorizontal />
+          </MenuTrigger>
+          <MenuPopup side={popupSide} align="end">
+            <MenuItem onClick={props.onFloat}>
+              <PictureInPicture2 />
+              Float device over chat
+            </MenuItem>
+            <MenuItem onClick={props.onClose}>
+              <X />
+              Close device panel
+            </MenuItem>
+            <MenuSeparator />
+            <MenuItem variant="destructive" onClick={props.onPowerOff}>
+              <Power />
+              Power off device
+            </MenuItem>
+          </MenuPopup>
+        </Menu>
+        <RailDivider />
+        <RailButton
+          tooltipSide={popupSide}
+          label="3D view"
+          pressed={view.phone}
+          disabled={!view.streaming || !!view.phoneUnavailableReason}
+          description={view.phoneUnavailableReason ?? undefined}
+          onClick={view.showPhone}
+        >
+          <Box />
+        </RailButton>
+        <RailButton
+          tooltipSide={popupSide}
+          label="Flat view"
+          pressed={!view.phone}
+          disabled={!view.streaming}
+          onClick={view.showFlat}
+        >
+          <Smartphone />
+        </RailButton>
+        {view.keyboard ? (
+          <RailButton
+            tooltipSide={popupSide}
+            label={view.keyboard.attached ? "Detach Magic Keyboard" : "Attach Magic Keyboard"}
+            pressed={view.keyboard.attached}
+            onClick={view.keyboard.toggle}
+          >
+            <Keyboard />
+          </RailButton>
+        ) : null}
+        {view.phone ? (
+          <RailButton tooltipSide={popupSide} label="Restore 3D view" onClick={view.resetView}>
+            <Maximize />
+          </RailButton>
+        ) : null}
+      </div>
+      {view.foldingControls}
+    </aside>
+  );
+}
+
+function RailDivider() {
+  return <div aria-hidden className="my-1 h-px w-5 shrink-0 bg-border/70" />;
+}
+
+function RailButton(props: {
+  tooltipSide: "left" | "bottom";
+  label: string;
+  description?: string | undefined;
+  disabled?: boolean;
+  pressed?: boolean;
+  onClick: () => void;
+  children: ReactNode;
+}) {
+  const button = (
+    <Button
+      size="icon-sm"
+      variant={props.pressed ? "secondary" : "ghost"}
+      aria-label={props.label}
+      aria-pressed={props.pressed}
+      disabled={props.disabled}
+      onClick={props.onClick}
+    >
+      {props.children}
+    </Button>
+  );
+  return (
+    <Tooltip>
+      {props.disabled && props.description ? (
+        <TooltipTrigger
+          render={
+            <span className="inline-flex" tabIndex={0} role="group" aria-label={props.label} />
+          }
+        >
+          {button}
+        </TooltipTrigger>
+      ) : (
+        <TooltipTrigger render={button} />
+      )}
+      <TooltipPopup side={props.tooltipSide}>{props.description ?? props.label}</TooltipPopup>
+    </Tooltip>
+  );
+}
diff --git a/apps/web/src/components/device/DeviceDuoControls.tsx b/apps/web/src/components/device/DeviceDuoControls.tsx
new file mode 100644
index 000000000000..1759ab07123b
--- /dev/null
+++ b/apps/web/src/components/device/DeviceDuoControls.tsx
@@ -0,0 +1,75 @@
+import {
+  DUO_POSES,
+  type DuoCommand,
+  type DuoControlState,
+} from "@t3tools/client-runtime/device/duo-control";
+import type { DeviceScreenSize } from "@t3tools/client-runtime/device/stream";
+import { DeviceDuoGlyph } from "./DeviceDuoGlyph";
+import { Button } from "~/components/ui/button";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
+
+/** Physical presets live beside the device. Pinching supplies continuous hinge control. */
+export function DeviceDuoControls(props: {
+  screen: DeviceScreenSize;
+  state: DuoControlState;
+  enabled: boolean;
+  onCommand: (command: DuoCommand) => void;
+}) {
+  const angle = props.screen.hingeAngle;
+  const fold = angle == null ? null : angle === 0 ? "closed" : angle === 180 ? "open" : "book";
+  const selected = (id: (typeof DUO_POSES)[number]["id"]) =>
+    id === "laptop" || id === "tent" ? props.screen.hingePose === id : fold === id;
+  return (
+    <div aria-label="iPhone Duo stands" className="flex flex-col items-center gap-2">
+      {([DUO_POSES.slice(0, 3), DUO_POSES.slice(3)] as const).map((poses, index) => (
+        <div
+          key={poses[0]?.id}
+          role="group"
+          aria-label={index === 0 ? "Fold shape" : "Device stance"}
+          className="pointer-events-auto flex shrink-0 flex-col items-center gap-1 rounded-full border border-border/50 bg-background/80 p-1 shadow-sm"
+        >
+          {poses.map((pose) => (
+            <Tooltip key={pose.id}>
+              <TooltipTrigger
+                render={
+                  <Button
+                    size="icon"
+                    variant={selected(pose.id) ? "secondary" : "ghost"}
+                    disabled={!props.enabled}
+                    aria-label={`${pose.label} stand`}
+                    aria-pressed={selected(pose.id)}
+                    data-pressed={selected(pose.id) ? "" : undefined}
+                    onClick={() => props.onCommand({ control: "pose", value: pose.id })}
+                  />
+                }
+              >
+                <DeviceDuoGlyph pose={pose.id} />
+              </TooltipTrigger>
+              <TooltipPopup side="left">
+                {pose.label}
+                {pose.id === "book" ? " / bookshelf" : ""}
+              </TooltipPopup>
+            </Tooltip>
+          ))}
+        </div>
+      ))}
+      {props.state.error ? (
+        <Tooltip>
+          <TooltipTrigger
+            render={
+              <span
+                tabIndex={0}
+                role="alert"
+                aria-label={props.state.error}
+                className="pointer-events-auto text-xs text-destructive"
+              >
+                !
+              </span>
+            }
+          />
+          <TooltipPopup side="left">{props.state.error}</TooltipPopup>
+        </Tooltip>
+      ) : null}
+    </div>
+  );
+}
diff --git a/apps/web/src/components/device/DeviceDuoGlyph.tsx b/apps/web/src/components/device/DeviceDuoGlyph.tsx
new file mode 100644
index 000000000000..a179e3afe260
--- /dev/null
+++ b/apps/web/src/components/device/DeviceDuoGlyph.tsx
@@ -0,0 +1,43 @@
+import type { DuoPose } from "@t3tools/client-runtime/device/duo-control";
+
+// Bitrig 0.25's toolbar glyphs. The fold outlines follow the native toolbar;
+// the rounded stance contours are ported from SimulatorFoldingPoseGlyph's SwiftUI paths.
+const stancePaths = {
+  laptop:
+    "M2.7351 12.9857 L15.8128 11.4159 L14.4114 3.3787 C14.1943 2.134 13.1275 1.2319 12.0283 1.3639 L2.9308 2.4559 C1.8317 2.5879 1.1167 3.7038 1.3337 4.9485 L2.7351 12.9857 Z M2.7351 12.9857 L15.8128 11.4159 L19.9103 12.8914 C20.5449 13.1199 20.1683 13.4121 19.0692 13.5441 L9.9717 14.6361 C8.8725 14.7681 7.4672 14.6898 6.8326 14.4612 L2.7351 12.9857 Z",
+  tent: "M3.2522 2.7267 L18.7478 1.4816 L16.696 9.7017 C16.3782 10.9748 15.0649 12.0915 13.7626 12.1962 L2.983 13.0623 C1.6807 13.167 0.8826 12.2199 1.2004 10.9468 L3.2522 2.7267 Z M3.2522 2.7267 L18.7478 1.4816 L20.7996 10.6909 C21.1174 12.1172 20.3193 13.3581 19.017 13.4628 L8.2374 14.3289 C6.9351 14.4336 5.6218 13.3623 5.304 11.936 L3.2522 2.7267 Z",
+} as const;
+
+export function DeviceDuoGlyph({ pose }: { pose: DuoPose }) {
+  const stance = pose === "laptop" || pose === "tent";
+  return (
+    <svg
+      viewBox={stance ? "0 0 22 16" : "0 0 24 32"}
+      fill="none"
+      stroke="currentColor"
+      strokeWidth={stance ? 1.25 : 1.8}
+      strokeLinecap="round"
+      strokeLinejoin="round"
+      className="size-7 shrink-0"
+      aria-hidden
+    >
+      {stance ? <path d={stancePaths[pose]} /> : null}
+      {pose === "closed" ? (
+        <>
+          <rect x="2" y="9" width="20" height="13" rx="2.2" />
+          <path d="M19.3 12.5v6" />
+          <circle cx="5" cy="12" r=".5" fill="currentColor" stroke="none" />
+        </>
+      ) : null}
+      {pose === "book" ? (
+        <path d="M4.2 6.5h15.6c1 0 1.6.8 1.2 1.7L17.7 16l3.3 7.8c.4.9-.2 1.7-1.2 1.7H4.2c-1 0-1.6-.8-1.2-1.7L6.3 16 3 8.2c-.4-.9.2-1.7 1.2-1.7Z" />
+      ) : null}
+      {pose === "open" ? (
+        <>
+          <rect x="2" y="2" width="20" height="28" rx="2.4" />
+          <path d="M10 27h4" />
+        </>
+      ) : null}
+    </svg>
+  );
+}
diff --git a/apps/web/src/components/device/DeviceDuoViewport.tsx b/apps/web/src/components/device/DeviceDuoViewport.tsx
new file mode 100644
index 000000000000..f168ceccc30d
--- /dev/null
+++ b/apps/web/src/components/device/DeviceDuoViewport.tsx
@@ -0,0 +1,205 @@
+import { useEffect, useRef, type RefObject } from "react";
+import type { DuoViewer } from "@t3tools/client-runtime/device/duo-viewer";
+import type { DeviceModelSource } from "@t3tools/client-runtime/device/model";
+import { createPhoneInteraction } from "@t3tools/client-runtime/device/phone-interaction";
+import { createCanvasFrameSink } from "@t3tools/client-runtime/device/frame";
+import type { DeviceScreenSize, DeviceStreamClient } from "@t3tools/client-runtime/device/stream";
+import { createDuoPinch } from "@t3tools/client-runtime/device/duo-control";
+import { bindPhoneTrackpad } from "./phoneTrackpad";
+
+const loadDuoViewer = () => import("@t3tools/client-runtime/device/duo-viewer");
+
+/** Web shell for the framework-independent viewer. The decoded screen and input connection remain owned by DeviceStreamView. */
+export function DeviceDuoViewport(props: {
+  readonly model: DeviceModelSource;
+  readonly source: RefObject<HTMLCanvasElement | null>;
+  readonly onFrameListener: (listener: (() => void) | null) => void;
+  readonly onResetReady: (reset: (() => void) | null) => void;
+  readonly onInputCancel: (cancel: (() => void) | null) => void;
+  readonly client: RefObject<DeviceStreamClient | null>;
+  readonly screen: DeviceScreenSize | null;
+  readonly hingePreview: number | null;
+  readonly controlError: string | null;
+  readonly onUnavailable: () => void;
+}) {
+  const hostRef = useRef<HTMLDivElement | null>(null);
+  const canvasRef = useRef<HTMLCanvasElement | null>(null);
+  const viewerRef = useRef<DuoViewer | null>(null);
+  const interactionRef = useRef<ReturnType<typeof createPhoneInteraction> | null>(null);
+  const pinchRef = useRef<ReturnType<typeof createDuoPinch> | null>(null);
+  const trackpadRef = useRef<ReturnType<typeof bindPhoneTrackpad> | null>(null);
+  const screenRef = useRef(props.screen);
+  const modelRef = useRef(props.model);
+  const previewRef = useRef(props.hingePreview);
+  const { source, client, onInputCancel, onResetReady, onUnavailable, onFrameListener } = props;
+
+  useEffect(() => {
+    screenRef.current = props.screen;
+    modelRef.current = props.model;
+    interactionRef.current?.end();
+    viewerRef.current?.setScreen(props.screen);
+  }, [props.screen, props.model]);
+
+  useEffect(() => {
+    if (props.controlError || !props.screen) {
+      trackpadRef.current?.cancel();
+      viewerRef.current?.rejectOrientation();
+    }
+  }, [props.controlError, props.screen]);
+
+  useEffect(() => {
+    previewRef.current = props.hingePreview;
+    if (!pinchRef.current?.active) viewerRef.current?.setHingePreview(props.hingePreview);
+  }, [props.hingePreview]);
+
+  useEffect(() => {
+    const host = hostRef.current;
+    const canvas = canvasRef.current;
+    const decoded = source.current;
+    if (!host || !canvas || !decoded) return;
+    let disposed = false;
+    let trackpad: ReturnType<typeof bindPhoneTrackpad> | null = null;
+    let stopTrackpadEnd: (() => void) | undefined;
+    const resize = () => {
+      const { width, height } = host.getBoundingClientRect();
+      viewerRef.current?.resize(width, height, window.devicePixelRatio);
+    };
+    const observer = new ResizeObserver(resize);
+    observer.observe(host);
+    const blur = () => {
+      interactionRef.current?.end();
+      trackpad?.cancel();
+      viewerRef.current?.cancelInput();
+    };
+    onInputCancel(blur);
+    window.addEventListener("blur", blur);
+    void loadDuoViewer()
+      .then(({ createDuoViewer }) => {
+        if (disposed) return;
+        const sources = {
+          1: document.createElement("canvas"),
+          3: document.createElement("canvas"),
+        };
+        const viewer = createDuoViewer({
+          canvas,
+          sources,
+          onUnavailable,
+          onPanelRequested: (panel) =>
+            client.current?.controlDuo({
+              control: "physical",
+              value: panel === 1 ? "facedown" : "faceup",
+            }),
+          onOrientationRequested: (value) =>
+            client.current?.controlDuo({ control: "orientation", value }),
+          onModelError: (cause) => console.warn("Device 3D asset could not load", cause),
+          model: modelRef.current,
+        });
+        viewerRef.current = viewer;
+        onResetReady(viewer.resetPose);
+        viewer.setScreen(screenRef.current);
+        const primaryFrame = () => {
+          const panel = screenRef.current?.screenId;
+          if (panel === 1 || panel === 3) viewer.frameUpdated(panel, decoded);
+        };
+        onFrameListener(primaryFrame);
+        primaryFrame();
+        viewer.setHingePreview(previewRef.current);
+        client.current?.setDuoPanels({
+          onScreen(next) {
+            screenRef.current = next;
+            interactionRef.current?.end();
+            viewer.setScreen(next);
+          },
+          cover: createCanvasFrameSink(sources[1], () => viewer.frameUpdated(1)),
+          inner: createCanvasFrameSink(sources[3], () => viewer.frameUpdated(3)),
+        });
+        interactionRef.current = createPhoneInteraction({
+          screenPoint: (point, captured) => viewer.screenPoint(point.x, point.y, captured),
+          touch: (phase, point) => client.current?.sendRawTouch(phase, point.x, point.y),
+          orbit: viewer.orbit,
+          zoomBy: () => {},
+          onInteractionActive: viewer.setInteractionActive,
+        });
+        const pinch = createDuoPinch({
+          angle: () =>
+            previewRef.current ??
+            screenRef.current?.hingeAngle ??
+            (screenRef.current?.screenId === 1 ? 0 : 180),
+          contains: (x, y) => !!screenRef.current && viewer.beginHinge(x, y),
+          change: (angle) => {
+            viewer.setHingePreview(angle ?? previewRef.current);
+            if (angle !== null) client.current?.controlDuo({ control: "angle", value: angle });
+          },
+        });
+        pinchRef.current = pinch;
+        trackpad = bindPhoneTrackpad(canvas, interactionRef.current, {
+          begin(x, y) {
+            interactionRef.current?.end();
+            return pinch.begin(x, y);
+          },
+          move: pinch.move,
+          end: pinch.end,
+        });
+        trackpadRef.current = trackpad;
+        stopTrackpadEnd = window.desktopBridge?.onTrackpadScrollEnd?.(() => trackpad?.endOrbit());
+        resize();
+      })
+      .catch(() => {
+        if (!disposed) onUnavailable();
+      });
+    return () => {
+      disposed = true;
+      stopTrackpadEnd?.();
+      trackpad?.dispose();
+      trackpadRef.current = null;
+      pinchRef.current = null;
+      interactionRef.current?.end();
+      interactionRef.current = null;
+      onInputCancel(null);
+      onResetReady(null);
+      onFrameListener(null);
+      client.current?.setDuoPanels(null);
+      observer.disconnect();
+      window.removeEventListener("blur", blur);
+      viewerRef.current?.dispose();
+      viewerRef.current = null;
+    };
+  }, [onInputCancel, onResetReady, client, onUnavailable, source, onFrameListener]);
+
+  const point = (event: React.PointerEvent<HTMLCanvasElement>) => {
+    const rect = event.currentTarget.getBoundingClientRect();
+    return {
+      x: (event.clientX - rect.left) / rect.width,
+      y: (event.clientY - rect.top) / rect.height,
+    };
+  };
+  return (
+    <div className="absolute inset-0">
+      <div ref={hostRef} className="absolute inset-0">
+        <div
+          aria-hidden
+          className="pointer-events-none absolute bottom-[6%] left-1/2 h-5 w-2/5 -translate-x-1/2 rounded-full bg-foreground/10 blur-xl"
+        />
+        <canvas
+          ref={canvasRef}
+          aria-label="Interactive 3D iPhone Duo. Drag the screen to interact. Drag outside it or swipe with two fingers to turn. Pinch over the device to open or close its hinge."
+          className="size-full touch-none"
+          onPointerDown={(event) => {
+            if (event.button !== 0) return;
+            if (!interactionRef.current?.begin(event.pointerId, point(event), event.altKey)) return;
+            event.preventDefault();
+            event.currentTarget.setPointerCapture(event.pointerId);
+            (event.currentTarget.closest('[role="application"]') as HTMLElement | null)?.focus();
+          }}
+          onPointerMove={(event) => interactionRef.current?.move(event.pointerId, point(event))}
+          onPointerUp={(event) => {
+            interactionRef.current?.move(event.pointerId, point(event));
+            interactionRef.current?.end(event.pointerId);
+          }}
+          onPointerCancel={(event) => interactionRef.current?.end(event.pointerId)}
+          onLostPointerCapture={(event) => interactionRef.current?.end(event.pointerId)}
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/device/DevicePanel.tsx b/apps/web/src/components/device/DevicePanel.tsx
index f46a9fbf8ed7..c6fdaad6f78d 100644
--- a/apps/web/src/components/device/DevicePanel.tsx
+++ b/apps/web/src/components/device/DevicePanel.tsx
@@ -5,17 +5,7 @@ import type {
   DeviceSummary,
   ScopedThreadRef,
 } from "@t3tools/contracts";
-import {
-  ChevronLeft,
-  Home,
-  PictureInPicture2,
-  Power,
-  RotateCcw,
-  SlidersHorizontal,
-  Smartphone,
-  Square,
-  X,
-} from "lucide-react";
+import { Smartphone, X } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
 
 import { usePreviewMiniPlayerStore } from "~/previewMiniPlayerStore";
@@ -25,16 +15,13 @@ import { DiscoveryList, DiscoveryListRow } from "~/components/ui/discovery-list"
 import { Dialog } from "~/components/ui/dialog";
 import { WizardPopup } from "~/components/ui/wizard";
 import { Spinner } from "~/components/ui/spinner";
-import { Toggle } from "~/components/ui/toggle";
-import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
 import { cn } from "~/lib/utils";
-import { deviceEnvironment, useDeviceHubAccess, useDeviceState } from "~/state/device";
+import { deviceEnvironment, useDeviceState } from "~/state/device";
 import { formatEnvironmentQueryError } from "~/state/query";
 import { useAtomCommand } from "~/state/use-atom-command";
-import { DeviceStreamView, type DeviceStreamHandle } from "./DeviceStreamView";
 import { DeviceLoadingView } from "./DeviceLoadingView";
 import { DeviceSetup } from "./DeviceSetup";
-import { DeviceToolsPanel } from "./DeviceToolsPanel";
+import { DeviceWorkspace } from "./DeviceWorkspace";
 import { PreviewPanelShell, type PreviewPanelMode } from "../preview/PreviewPanelShell";
 
 const platformLabel = (platform: DevicePlatform) =>
@@ -59,10 +46,6 @@ export function DevicePanel(props: {
   const [operationError, setOperationError] = useState<string | null>(null);
   const [pendingDevice, setPendingDevice] = useState<DeviceSummary | null>(null);
   const pendingDeviceKey = pendingDevice ? deviceKey(pendingDevice) : null;
-  const [handle, setHandle] = useState<DeviceStreamHandle | null>(null);
-  const [toolsOpen, setToolsOpen] = useState(false);
-  const [axOverlay, setAxOverlay] = useState(false);
-  const access = useDeviceHubAccess(environmentId);
 
   const hostDisabled = state.hostStatus === "disabled";
 
@@ -184,69 +167,7 @@ export function DevicePanel(props: {
 
   return (
     <PreviewPanelShell mode={props.mode}>
-      <div className="flex h-9 shrink-0 items-center gap-1.5 border-b px-2">
-        <span className="min-w-0 flex-1 truncate text-xs text-muted-foreground">
-          {props.surface.target
-            ? `${state.hosts.find((host) => host.id === props.surface.target?.hostId)?.label ?? "Device host"} · ${activeDevice?.version ?? props.surface.target.platform}`
-            : (pendingDevice?.name ?? "Choose a device")}
-        </span>
-        {activeDevice ? (
-          <>
-            <DeviceButton
-              label="Home"
-              onClick={() => handle?.pressButton("home")}
-              disabled={!handle?.inputConnected}
-            >
-              <Home />
-            </DeviceButton>
-            {activeDevice.platform === "android" ? (
-              <>
-                <DeviceButton
-                  label="Back"
-                  onClick={() => handle?.pressButton("back")}
-                  disabled={!handle?.inputConnected}
-                >
-                  <ChevronLeft />
-                </DeviceButton>
-                <DeviceButton
-                  label="Recents"
-                  onClick={() => handle?.pressButton("recents")}
-                  disabled={!handle?.inputConnected}
-                >
-                  <Square />
-                </DeviceButton>
-              </>
-            ) : (
-              <DeviceButton
-                label="Rotate"
-                onClick={() => handle?.rotate()}
-                disabled={!handle?.inputConnected}
-              >
-                <RotateCcw />
-              </DeviceButton>
-            )}
-            <Toggle
-              aria-label="Tools"
-              variant="ghost"
-              size="xs"
-              pressed={toolsOpen}
-              onPressedChange={(pressed) => setToolsOpen(Boolean(pressed))}
-            >
-              <SlidersHorizontal />
-            </Toggle>
-            <DeviceButton label="Float device over chat" onClick={floatActive}>
-              <PictureInPicture2 />
-            </DeviceButton>
-            <DeviceButton label="Power off" onClick={() => closeActive(true)}>
-              <Power />
-            </DeviceButton>
-            <DeviceButton label="Close" onClick={() => closeActive(false)}>
-              <X />
-            </DeviceButton>
-          </>
-        ) : null}
-      </div>
-      {hostReady && state.hostStatusDetail ? (
+      {hostReady && !activeDevice && state.hostStatusDetail ? (
         <div
           role="status"
           className="whitespace-pre-line border-b px-3 py-2 text-xs text-muted-foreground"
@@ -278,34 +199,19 @@ export function DevicePanel(props: {
       ) : null}
       <div className="@container relative flex min-h-0 flex-1">
         {activeDevice && activeSession ? (
-          <>
-            <div className="relative min-h-0 min-w-0 flex-1">
-              <DeviceStreamView
-                key={deviceKey(activeDevice)}
-                environmentId={environmentId}
-                platform={activeDevice.platform}
-                deviceName={activeDevice.name}
-                deviceDescription={`${state.hosts.find((host) => host.id === activeDevice.hostId)?.label ?? "Device host"} · ${activeDevice.version}`}
-                deviceId={activeDevice.id}
-                hostId={activeDevice.hostId}
-                visible={props.visible}
-                axOverlay={axOverlay}
-                onHandle={setHandle}
-              />
-            </div>
-            {toolsOpen ? (
-              <DeviceToolsPanel
-                key={deviceKey(activeDevice)}
-                environmentId={environmentId}
-                device={activeDevice}
-                access={access}
-                axOverlay={axOverlay}
-                onAxOverlayChange={setAxOverlay}
-                onClose={() => setToolsOpen(false)}
-                className="absolute inset-y-0 right-0 z-10 w-full max-w-72 border-l shadow-lg @[560px]:static @[560px]:w-72 @[560px]:shrink-0 @[560px]:shadow-none"
-              />
-            ) : null}
-          </>
+          <DeviceWorkspace
+            key={`${environmentId}\u0000${deviceKey(activeDevice)}`}
+            environmentId={environmentId}
+            device={activeDevice}
+            hostLabel={
+              state.hosts.find((host) => host.id === activeDevice.hostId)?.label ?? "Device host"
+            }
+            hostDiagnostics={state.hostStatusDetail}
+            visible={props.visible}
+            onFloat={floatActive}
+            onClose={() => closeActive(false)}
+            onPowerOff={() => closeActive(true)}
+          />
         ) : pendingDevice || hostBusy || !loaded ? (
           <DeviceLoadingView
             name={pendingDevice?.name ?? "Devices"}
@@ -407,32 +313,6 @@ export function DevicePanel(props: {
   );
 }
 
-function DeviceButton(props: {
-  readonly label: string;
-  readonly onClick: () => void;
-  readonly disabled?: boolean;
-  readonly children: React.ReactNode;
-}) {
-  return (
-    <Tooltip>
-      <TooltipTrigger
-        render={
-          <Button
-            size="icon-xs"
-            variant="ghost-muted"
-            aria-label={props.label}
-            onClick={props.onClick}
-            disabled={props.disabled ?? false}
-          />
-        }
-      >
-        {props.children}
-      </TooltipTrigger>
-      <TooltipPopup>{props.label}</TooltipPopup>
-    </Tooltip>
-  );
-}
-
 function groupDevices(state: DeviceServiceState) {
   const groups: Array<{ platform: DevicePlatform; devices: DeviceSummary[] }> = [];
   for (const platform of ["ios", "android"] as const) {
diff --git a/apps/web/src/components/device/DevicePhoneViewport.tsx b/apps/web/src/components/device/DevicePhoneViewport.tsx
new file mode 100644
index 000000000000..730b03fe611a
--- /dev/null
+++ b/apps/web/src/components/device/DevicePhoneViewport.tsx
@@ -0,0 +1,159 @@
+import { useEffect, useRef, type RefObject } from "react";
+import type { PhoneViewer } from "@t3tools/client-runtime/device/phone-viewer";
+import type {
+  DeviceAccessorySource,
+  DeviceModelSource,
+} from "@t3tools/client-runtime/device/model";
+import type { DeviceShapeProfile } from "@t3tools/client-runtime/device/shape-profile";
+import { createPhoneInteraction } from "@t3tools/client-runtime/device/phone-interaction";
+import type { DeviceScreenSize, DeviceStreamClient } from "@t3tools/client-runtime/device/stream";
+import { bindPhoneTrackpad } from "./phoneTrackpad";
+
+const loadPhoneViewer = () => import("@t3tools/client-runtime/device/phone-viewer");
+
+/** Web shell for the framework-independent viewer. The decoded screen and input connection remain owned by DeviceStreamView. */
+export function DevicePhoneViewport(props: {
+  readonly profile: DeviceShapeProfile;
+  readonly model: DeviceModelSource | null;
+  readonly accessory: DeviceAccessorySource | null;
+  readonly source: RefObject<HTMLCanvasElement | null>;
+  readonly onFrameListener: (listener: (() => void) | null) => void;
+  readonly onResetReady: (reset: (() => void) | null) => void;
+  readonly onInputCancel: (cancel: (() => void) | null) => void;
+  readonly client: RefObject<DeviceStreamClient | null>;
+  readonly screen: DeviceScreenSize | null;
+  readonly foldAngle: number | null;
+  readonly onUnavailable: () => void;
+}) {
+  const hostRef = useRef<HTMLDivElement | null>(null);
+  const canvasRef = useRef<HTMLCanvasElement | null>(null);
+  const viewerRef = useRef<PhoneViewer | null>(null);
+  const interactionRef = useRef<ReturnType<typeof createPhoneInteraction> | null>(null);
+  const screenRef = useRef(props.screen);
+  const foldAngleRef = useRef(props.foldAngle);
+  const profileRef = useRef(props.profile);
+  const modelRef = useRef(props.model);
+  const accessoryRef = useRef(props.accessory);
+  const { source, onFrameListener, client, onInputCancel, onResetReady, onUnavailable } = props;
+
+  useEffect(() => {
+    foldAngleRef.current = props.foldAngle;
+    viewerRef.current?.setFoldAngle(props.foldAngle);
+  }, [props.foldAngle]);
+
+  useEffect(() => {
+    screenRef.current = props.screen;
+    profileRef.current = props.profile;
+    modelRef.current = props.model;
+    accessoryRef.current = props.accessory;
+    interactionRef.current?.end();
+    viewerRef.current?.setModel(props.model);
+    viewerRef.current?.setAccessory(props.accessory);
+    viewerRef.current?.setScreen(props.screen, props.profile);
+  }, [props.screen, props.profile, props.model, props.accessory]);
+
+  useEffect(() => {
+    const host = hostRef.current;
+    const canvas = canvasRef.current;
+    const decoded = source.current;
+    if (!host || !canvas || !decoded) return;
+    let disposed = false;
+    let trackpad: ReturnType<typeof bindPhoneTrackpad> | null = null;
+    let stopTrackpadEnd: (() => void) | undefined;
+    const resize = () => {
+      const { width, height } = host.getBoundingClientRect();
+      viewerRef.current?.resize(width, height, window.devicePixelRatio);
+    };
+    const observer = new ResizeObserver(resize);
+    observer.observe(host);
+    const blur = () => {
+      interactionRef.current?.end();
+      trackpad?.cancel();
+    };
+    onInputCancel(blur);
+    window.addEventListener("blur", blur);
+    void loadPhoneViewer()
+      .then(({ createPhoneViewer }) => {
+        if (disposed) return;
+        const viewer = createPhoneViewer({
+          canvas,
+          source: decoded,
+          onUnavailable,
+          onModelError: (cause) => console.warn("Device 3D asset could not load", cause),
+          profile: profileRef.current,
+          model: modelRef.current,
+          accessory: accessoryRef.current,
+          foldAngle: foldAngleRef.current,
+        });
+        viewerRef.current = viewer;
+        onResetReady(viewer.resetPose);
+        viewer.setScreen(screenRef.current);
+        onFrameListener(viewer.frameUpdated);
+        interactionRef.current = createPhoneInteraction({
+          screenPoint: (point, captured) => viewer.screenPoint(point.x, point.y, captured),
+          touch: (phase, point) => client.current?.sendTouch(phase, point.x, point.y),
+          orbit: viewer.orbit,
+          zoomBy: () => {},
+          onInteractionActive: viewer.setInteractionActive,
+        });
+        trackpad = bindPhoneTrackpad(canvas, interactionRef.current);
+        stopTrackpadEnd = window.desktopBridge?.onTrackpadScrollEnd?.(() => trackpad?.endOrbit());
+        resize();
+        viewer.frameUpdated();
+      })
+      .catch(() => {
+        if (!disposed) onUnavailable();
+      });
+    return () => {
+      disposed = true;
+      stopTrackpadEnd?.();
+      trackpad?.dispose();
+      interactionRef.current?.end();
+      interactionRef.current = null;
+      onInputCancel(null);
+      onResetReady(null);
+      onFrameListener(null);
+      observer.disconnect();
+      window.removeEventListener("blur", blur);
+      viewerRef.current?.dispose();
+      viewerRef.current = null;
+    };
+  }, [onInputCancel, onResetReady, client, onFrameListener, onUnavailable, source]);
+
+  const point = (event: React.PointerEvent<HTMLCanvasElement>) => {
+    const rect = event.currentTarget.getBoundingClientRect();
+    return {
+      x: (event.clientX - rect.left) / rect.width,
+      y: (event.clientY - rect.top) / rect.height,
+    };
+  };
+  return (
+    <div className="absolute inset-0">
+      <div ref={hostRef} className="absolute inset-0">
+        <div
+          aria-hidden
+          className="pointer-events-none absolute bottom-[6%] left-1/2 h-5 w-2/5 -translate-x-1/2 rounded-full bg-foreground/10 blur-xl"
+        />
+        <canvas
+          ref={canvasRef}
+          aria-label="Interactive 3D device. Drag the screen to interact. Drag outside it or swipe with two fingers to turn."
+          className="size-full touch-none"
+          onPointerDown={(event) => {
+            if (event.button !== 0) return;
+            if (!interactionRef.current?.begin(event.pointerId, point(event), event.altKey)) return;
+            event.preventDefault();
+            event.currentTarget.setPointerCapture(event.pointerId);
+            (event.currentTarget.closest('[role="application"]') as HTMLElement | null)?.focus();
+          }}
+          onPointerMove={(event) => interactionRef.current?.move(event.pointerId, point(event))}
+          onPointerUp={(event) => {
+            interactionRef.current?.move(event.pointerId, point(event));
+            interactionRef.current?.end(event.pointerId);
+          }}
+          onPointerCancel={(event) => interactionRef.current?.end(event.pointerId)}
+          onLostPointerCapture={(event) => interactionRef.current?.end(event.pointerId)}
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/apps/web/src/components/device/DeviceStreamView.tsx b/apps/web/src/components/device/DeviceStreamView.tsx
index 4d4744a6268f..25c4c39dae2f 100644
--- a/apps/web/src/components/device/DeviceStreamView.tsx
+++ b/apps/web/src/components/device/DeviceStreamView.tsx
@@ -1,9 +1,18 @@
 import type { DevicePlatform, EnvironmentId } from "@t3tools/contracts";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 
 import { cn } from "~/lib/utils";
 import { Button } from "~/components/ui/button";
 import { refreshDeviceHubAccess, useDeviceHubAccess } from "~/state/device";
+import { createCanvasFrameSink } from "@t3tools/client-runtime/device/frame";
+import { resolveDeviceShape } from "@t3tools/client-runtime/device/shape-profile";
+import { deviceKeyboard, deviceModel } from "./deviceModels";
+import { fitDeviceFrame } from "./deviceFrameLayout";
+import { DeviceDuoViewport } from "./DeviceDuoViewport";
+import { DeviceDuoControls } from "./DeviceDuoControls";
+import { DeviceAndroidFoldControls } from "./DeviceAndroidFoldControls";
+import type { DuoControlState } from "@t3tools/client-runtime/device/duo-control";
+import { DevicePhoneViewport } from "./DevicePhoneViewport";
 import { DeviceLoadingView } from "./DeviceLoadingView";
 import { type DeviceAxElement, fetchDeviceAxTree } from "./deviceHubApi";
 import {
@@ -15,6 +24,18 @@ import {
 } from "@t3tools/client-runtime/device/stream";
 
 const AX_POLL_INTERVAL_MS = 2_000;
+const CONTROLS_RAIL_WIDTH = 56;
+
+export interface DeviceViewControls {
+  readonly phone: boolean;
+  readonly streaming: boolean;
+  readonly phoneUnavailableReason: string | null;
+  readonly showPhone: () => void;
+  readonly showFlat: () => void;
+  readonly resetView: () => void;
+  readonly foldingControls?: ReactNode;
+  readonly keyboard: { readonly attached: boolean; readonly toggle: () => void } | null;
+}
 
 export interface DeviceStreamHandle {
   readonly pressButton: (button: DeviceHardwareButton) => void;
@@ -37,17 +58,46 @@ export function DeviceStreamView(props: {
   readonly deviceDescription?: string;
   readonly visible: boolean;
   readonly hostId: string;
+  /** The full panel opts into the phone spike; compact viewers retain their flat presentation. */
+  readonly allowPhoneView?: boolean;
+  readonly renderControls?: (view: DeviceViewControls) => ReactNode;
   /** Draw accessibility element frames over the screen. */
   readonly axOverlay?: boolean;
   readonly onHandle?: (handle: DeviceStreamHandle | null) => void;
   readonly onScreen?: (screen: DeviceScreenSize | null) => void;
 }) {
+  const [duoControl, setDuoControl] = useState<DuoControlState>({
+    pending: false,
+    requested: null,
+    error: null,
+  });
+  const model = deviceModel(props.platform, props.deviceName ?? "");
+  const isDuo = model?.id === "iphone-duo";
+  const [presentation, setPresentation] = useState<"phone" | "flat">("phone");
+  const [keyboardAttached, setKeyboardAttached] = useState(false);
+  const [phoneUnavailable, setPhoneUnavailable] = useState(false);
+  const onPhoneUnavailable = useCallback(() => setPhoneUnavailable(true), []);
+  const cancelPhoneInputRef = useRef<(() => void) | null>(null);
+  const cancelPhoneInput = useCallback(() => cancelPhoneInputRef.current?.(), []);
+  const resetViewRef = useRef<(() => void) | null>(null);
+  const onResetReady = useCallback((reset: (() => void) | null) => {
+    resetViewRef.current = reset;
+  }, []);
+  const frameListenerRef = useRef<(() => void) | null>(null);
+  const onFrameListener = useCallback((listener: (() => void) | null) => {
+    frameListenerRef.current = listener;
+  }, []);
+  const onInputCancel = useCallback((cancel: (() => void) | null) => {
+    cancelPhoneInputRef.current = cancel;
+  }, []);
   const access = useDeviceHubAccess(props.environmentId, props.hostId);
   const canvasRef = useRef<HTMLCanvasElement | null>(null);
   const clientRef = useRef<DeviceStreamClient | null>(null);
   const [status, setStatus] = useState<DeviceStreamStatus>("connecting");
   const [detail, setDetail] = useState<string | undefined>(undefined);
+  const [showRestartNotice, setShowRestartNotice] = useState(false);
   const [screen, setScreen] = useState<DeviceScreenSize | null>(null);
+  const [foldAngle, setFoldAngle] = useState<number | null>(null);
   const [mjpegUrl, setMjpegUrl] = useState<string | null>(null);
   const [mjpegGeneration, setMjpegGeneration] = useState(0);
   const attachMjpegImage = useCallback((image: HTMLImageElement | null) => {
@@ -67,11 +117,14 @@ export function DeviceStreamView(props: {
     }
     const client = createDeviceStreamClient(
       { platform: props.platform, deviceId: props.deviceId, access },
-      canvas,
+      createCanvasFrameSink(canvas, () => frameListenerRef.current?.()),
       {
+        onDuoControl: setDuoControl,
+        onDuoUnavailable: onPhoneUnavailable,
         onStatus: (next, nextDetail) => {
           setStatus(next);
           setDetail(nextDetail);
+          if (next !== "connecting") setShowRestartNotice(false);
         },
         onScreen: (next) => {
           setScreen(next);
@@ -87,6 +140,7 @@ export function DeviceStreamView(props: {
         },
         onInputConnected: (connected, detail) => {
           setInputState({ connected, ...(detail ? { detail } : {}) });
+          if (!connected) setShowRestartNotice(false);
           onHandle?.({
             pressButton: client.pressButton,
             rotate: client.rotate,
@@ -101,6 +155,7 @@ export function DeviceStreamView(props: {
     client.start();
     onHandle?.({ pressButton: client.pressButton, rotate: client.rotate, inputConnected: false });
     return () => {
+      cancelPhoneInput();
       client.stop();
       clientRef.current = null;
       onHandle?.(null);
@@ -109,7 +164,9 @@ export function DeviceStreamView(props: {
     };
   }, [
     access,
+    cancelPhoneInput,
     onHandle,
+    onPhoneUnavailable,
     onScreen,
     props.deviceId,
     props.environmentId,
@@ -131,6 +188,29 @@ export function DeviceStreamView(props: {
     return w / h;
   }, [props.platform, screen]);
 
+  // Android restarts its encoder when a fold changes the framebuffer size.
+  // Keep the last decoded frame and viewer mounted while the next keyframe arrives.
+  const retainingAndroidFrame =
+    props.platform === "android" &&
+    status === "connecting" &&
+    inputState.connected &&
+    screen !== null;
+  const showPhone =
+    props.allowPhoneView &&
+    (status === "streaming" || retainingAndroidFrame) &&
+    props.visible &&
+    presentation === "phone" &&
+    !phoneUnavailable &&
+    !mjpegUrl &&
+    !props.axOverlay &&
+    (!isDuo || screen?.supportsHingeAngle === true);
+  useEffect(() => {
+    if (!retainingAndroidFrame || !showPhone) return;
+    const timeout = window.setTimeout(() => setShowRestartNotice(true), 2_000);
+    return () => window.clearTimeout(timeout);
+  }, [retainingAndroidFrame, showPhone]);
+  const controlsInset = props.renderControls && !showPhone ? CONTROLS_RAIL_WIDTH : 0;
+
   // The frame is the largest box at `aspect` that fits the container, so a
   // narrow panel shows a shorter phone rather than a squeezed one. CSS
   // `aspect-ratio` alone cannot do this: with the height pinned to 100% the
@@ -154,12 +234,8 @@ export function DeviceStreamView(props: {
     return () => observer.disconnect();
   }, []);
   const frame = useMemo(() => {
-    if (host.width === 0 || host.height === 0) return { width: 0, height: 0 };
-    const byHeight = { width: host.height * aspect, height: host.height };
-    return byHeight.width <= host.width
-      ? byHeight
-      : { width: host.width, height: host.width / aspect };
-  }, [aspect, host]);
+    return fitDeviceFrame(aspect, host.width, host.height, controlsInset);
+  }, [aspect, controlsInset, host]);
 
   // serve-sim streams the raw framebuffer; rotate the display for a device
   // that reports landscape while its frames stay portrait.
@@ -231,123 +307,273 @@ export function DeviceStreamView(props: {
     return { x: Math.min(1, Math.max(0, x)), y: Math.min(1, Math.max(0, y)) };
   };
 
+  const phoneUnavailableReason =
+    isDuo && !screen?.supportsHingeAngle
+      ? "iPhone Duo 3D requires Device Hub 0.11.0 or newer"
+      : phoneUnavailable
+        ? "3D is unavailable on this browser"
+        : mjpegUrl
+          ? "3D requires the H.264 stream"
+          : props.axOverlay
+            ? "Turn off accessibility frames to use 3D"
+            : null;
+
+  const keyboardSource = deviceKeyboard(props.platform, props.deviceName ?? "");
+  const resetView = useCallback(() => {
+    if (!isDuo) {
+      const orientation = keyboardAttached ? "landscape_right" : "portrait";
+      if (screen?.orientation !== orientation) clientRef.current?.setOrientation(orientation);
+    }
+    resetViewRef.current?.();
+  }, [isDuo, keyboardAttached, screen?.orientation]);
+  const profile = resolveDeviceShape({
+    platform: props.platform,
+    name: props.deviceName ?? "",
+    portraitAspect: Math.min(aspect, 1 / aspect),
+  });
+
   return (
     <div
-      ref={hostRef}
-      className="relative flex size-full items-center justify-center overflow-hidden bg-black/90 outline-none"
-      tabIndex={0}
-      role="application"
-      aria-label={`${props.platform === "ios" ? "iOS Simulator" : "Android Emulator"} screen`}
-      onKeyDown={(event) => {
-        if (event.target !== event.currentTarget) return;
-        if (event.metaKey && !["r", "R"].includes(event.key)) return;
-        event.preventDefault();
-        clientRef.current?.sendKey(event.nativeEvent, "down");
-      }}
-      onKeyUp={(event) => {
-        if (event.target !== event.currentTarget) return;
-        clientRef.current?.sendKey(event.nativeEvent, "up");
-      }}
+      className={cn(
+        "relative flex size-full min-h-0 min-w-0",
+        props.allowPhoneView ? "bg-background" : "bg-black/90",
+      )}
     >
+      {props.renderControls ? (
+        <DeviceControlsSlot
+          renderControls={props.renderControls}
+          view={{
+            phone: !!showPhone,
+            streaming: status === "streaming",
+            phoneUnavailableReason,
+            foldingControls:
+              props.platform === "android" && access ? (
+                <DeviceAndroidFoldControls
+                  key={`${props.hostId}:${props.deviceId}`}
+                  access={access}
+                  deviceId={props.deviceId}
+                  visible={props.visible}
+                  enabled={status === "streaming"}
+                  screenWidth={screen?.width}
+                  screenHeight={screen?.height}
+                  onFoldAngle={setFoldAngle}
+                />
+              ) : showPhone && isDuo && screen?.supportsHingeAngle ? (
+                <DeviceDuoControls
+                  screen={screen}
+                  state={duoControl}
+                  enabled={inputState.connected}
+                  onCommand={(command) => {
+                    cancelPhoneInput();
+                    clientRef.current?.controlDuo(command);
+                  }}
+                />
+              ) : null,
+            keyboard:
+              showPhone && keyboardSource
+                ? {
+                    attached: keyboardAttached,
+                    toggle: () => {
+                      cancelPhoneInput();
+                      if (!keyboardAttached && screen?.orientation !== "landscape_right")
+                        clientRef.current?.setOrientation("landscape_right");
+                      setKeyboardAttached(!keyboardAttached);
+                    },
+                  }
+                : null,
+            showPhone: () => setPresentation("phone"),
+            showFlat: () => setPresentation("flat"),
+          }}
+          onResetView={resetView}
+        />
+      ) : null}
       <div
-        className="relative select-none"
-        style={{ width: frame.width, height: frame.height }}
-        onPointerDown={(event) => {
-          event.currentTarget.setPointerCapture(event.pointerId);
-          (event.currentTarget.parentElement as HTMLElement | null)?.focus();
-          pointerActive.current = true;
-          const { x, y } = normalizedPoint(event);
-          clientRef.current?.sendTouch("begin", x, y);
-        }}
-        onPointerMove={(event) => {
-          if (!pointerActive.current) return;
-          const { x, y } = normalizedPoint(event);
-          clientRef.current?.sendTouch("move", x, y);
+        ref={hostRef}
+        className={cn(
+          "relative flex min-h-0 min-w-0 flex-1 items-center justify-center overflow-hidden outline-none",
+          controlsInset && "pr-14",
+        )}
+        tabIndex={0}
+        role="application"
+        aria-label={`${props.platform === "ios" ? "iOS Simulator" : "Android Emulator"} screen`}
+        onKeyDown={(event) => {
+          if (event.target !== event.currentTarget) return;
+          if (event.metaKey && !["r", "R"].includes(event.key)) return;
+          event.preventDefault();
+          clientRef.current?.sendKey(event.nativeEvent, "down");
         }}
-        onPointerUp={(event) => {
-          if (!pointerActive.current) return;
-          pointerActive.current = false;
-          const { x, y } = normalizedPoint(event);
-          clientRef.current?.sendTouch("end", x, y);
-        }}
-        onPointerCancel={(event) => {
-          if (!pointerActive.current) return;
-          pointerActive.current = false;
-          const { x, y } = normalizedPoint(event);
-          clientRef.current?.sendTouch("end", x, y);
+        onKeyUp={(event) => {
+          if (event.target !== event.currentTarget) return;
+          clientRef.current?.sendKey(event.nativeEvent, "up");
         }}
       >
-        <canvas
-          ref={canvasRef}
-          className={cn("absolute top-0 left-0", mjpegUrl && "hidden")}
-          style={mediaStyle}
-        />
-        {props.visible && access && mjpegUrl ? (
-          <img
-            key={mjpegGeneration}
-            ref={attachMjpegImage}
-            alt=""
-            draggable={false}
-            className="absolute top-0 left-0 object-contain"
+        <div
+          className={cn("relative select-none", showPhone && "invisible pointer-events-none")}
+          style={{ width: frame.width, height: frame.height }}
+          onPointerDown={(event) => {
+            event.currentTarget.setPointerCapture(event.pointerId);
+            (event.currentTarget.parentElement as HTMLElement | null)?.focus();
+            pointerActive.current = true;
+            const { x, y } = normalizedPoint(event);
+            clientRef.current?.sendTouch("begin", x, y);
+          }}
+          onPointerMove={(event) => {
+            if (!pointerActive.current) return;
+            const { x, y } = normalizedPoint(event);
+            clientRef.current?.sendTouch("move", x, y);
+          }}
+          onPointerUp={(event) => {
+            if (!pointerActive.current) return;
+            pointerActive.current = false;
+            const { x, y } = normalizedPoint(event);
+            clientRef.current?.sendTouch("end", x, y);
+          }}
+          onPointerCancel={(event) => {
+            if (!pointerActive.current) return;
+            pointerActive.current = false;
+            const { x, y } = normalizedPoint(event);
+            clientRef.current?.sendTouch("end", x, y);
+          }}
+        >
+          <canvas
+            ref={canvasRef}
+            className={cn("absolute top-0 left-0", mjpegUrl && "hidden")}
             style={mediaStyle}
           />
+          {props.visible && access && mjpegUrl ? (
+            <img
+              key={mjpegGeneration}
+              ref={attachMjpegImage}
+              alt=""
+              draggable={false}
+              className="absolute top-0 left-0 object-contain"
+              style={mediaStyle}
+            />
+          ) : null}
+          {axElements.length > 0 ? (
+            <div className="pointer-events-none absolute inset-0" aria-hidden>
+              {axElements.map((element) => (
+                <div
+                  key={element.id}
+                  className="absolute border border-info/80 bg-info/10"
+                  style={{
+                    left: `${element.x * 100}%`,
+                    top: `${element.y * 100}%`,
+                    width: `${element.width * 100}%`,
+                    height: `${element.height * 100}%`,
+                  }}
+                >
+                  {element.label ? (
+                    <span className="absolute -top-3.5 left-0 max-w-full truncate rounded-sm bg-info px-1 text-3xs leading-3.5 text-white">
+                      {element.label}
+                    </span>
+                  ) : null}
+                </div>
+              ))}
+            </div>
+          ) : null}
+        </div>
+        {showPhone && isDuo && model ? (
+          <DeviceDuoViewport
+            onFrameListener={onFrameListener}
+            model={model}
+            controlError={duoControl.error}
+            hingePreview={
+              duoControl.requested?.control === "angle" ? duoControl.requested.value : null
+            }
+            source={canvasRef}
+            client={clientRef}
+            onInputCancel={onInputCancel}
+            onResetReady={onResetReady}
+            screen={screen}
+            onUnavailable={onPhoneUnavailable}
+          />
+        ) : showPhone ? (
+          <DevicePhoneViewport
+            profile={profile}
+            model={deviceModel(props.platform, props.deviceName ?? "")}
+            accessory={keyboardAttached ? keyboardSource : null}
+            source={canvasRef}
+            onFrameListener={onFrameListener}
+            client={clientRef}
+            onInputCancel={onInputCancel}
+            onResetReady={onResetReady}
+            screen={screen}
+            foldAngle={foldAngle}
+            onUnavailable={onPhoneUnavailable}
+          />
+        ) : null}
+        {props.allowPhoneView && !props.renderControls && status === "streaming" ? (
+          <div className="absolute top-3 left-3 flex gap-1 rounded-lg border border-border/50 bg-background/90 p-1 shadow-sm">
+            <Button
+              variant={showPhone ? "secondary" : "ghost"}
+              size="xs"
+              aria-pressed={!!showPhone}
+              disabled={!!phoneUnavailableReason}
+              title={phoneUnavailableReason ?? "Show 3D phone"}
+              onClick={() => setPresentation("phone")}
+            >
+              3D
+            </Button>
+            <Button
+              variant={!showPhone ? "secondary" : "ghost"}
+              size="xs"
+              aria-pressed={!showPhone}
+              onClick={() => setPresentation("flat")}
+            >
+              Flat
+            </Button>
+          </div>
+        ) : null}
+        {status === "streaming" && !inputState.connected ? (
+          <div className="pointer-events-none absolute inset-x-0 bottom-0 flex justify-center p-2">
+            <span className="rounded-md bg-background/85 px-2 py-1 text-xs text-muted-foreground">
+              Input disconnected{inputState.detail ? ` (${inputState.detail})` : ""}, reconnecting…
+            </span>
+          </div>
+        ) : null}
+        {retainingAndroidFrame && showPhone && showRestartNotice ? (
+          <div className="pointer-events-none absolute inset-x-0 bottom-0 flex justify-center p-2">
+            <span className="rounded-md bg-background/85 px-2 py-1 text-xs text-muted-foreground">
+              Waiting for device video…
+            </span>
+          </div>
         ) : null}
-        {axElements.length > 0 ? (
-          <div className="pointer-events-none absolute inset-0" aria-hidden>
-            {axElements.map((element) => (
-              <div
-                key={element.id}
-                className="absolute border border-sky-400/80 bg-sky-400/10"
-                style={{
-                  left: `${element.x * 100}%`,
-                  top: `${element.y * 100}%`,
-                  width: `${element.width * 100}%`,
-                  height: `${element.height * 100}%`,
-                }}
-              >
-                {element.label ? (
-                  <span className="absolute -top-3.5 left-0 max-w-full truncate rounded-sm bg-sky-500 px-1 text-[9px] leading-3.5 text-white">
-                    {element.label}
-                  </span>
-                ) : null}
-              </div>
-            ))}
+        {status !== "streaming" && !(retainingAndroidFrame && showPhone) ? (
+          <div className="absolute inset-0">
+            <DeviceLoadingView
+              name={props.deviceName ?? "Device"}
+              description={props.deviceDescription ?? ""}
+              stage="stream"
+              message={status === "error" ? (detail ?? "Stream failed.") : "Connecting video…"}
+              error={status === "error"}
+            >
+              {status === "error" ? (
+                <Button
+                  size="sm"
+                  variant="outline"
+                  onClick={() => {
+                    // An expired ticket surfaces as unauthorized on restart and
+                    // refreshes access through the effect; no need to mint one here.
+                    clientRef.current?.stop();
+                    clientRef.current?.start();
+                  }}
+                >
+                  Reconnect
+                </Button>
+              ) : null}
+            </DeviceLoadingView>
           </div>
         ) : null}
       </div>
-      {status === "streaming" && !inputState.connected ? (
-        <div className="pointer-events-none absolute inset-x-0 bottom-0 flex justify-center p-2">
-          <span className="rounded-md bg-background/85 px-2 py-1 text-xs text-muted-foreground">
-            Input disconnected{inputState.detail ? ` (${inputState.detail})` : ""}, reconnecting…
-          </span>
-        </div>
-      ) : null}
-      {status !== "streaming" ? (
-        <div className="absolute inset-0">
-          <DeviceLoadingView
-            name={props.deviceName ?? "Device"}
-            description={props.deviceDescription ?? ""}
-            stage="stream"
-            message={status === "error" ? (detail ?? "Stream failed.") : "Connecting video…"}
-            error={status === "error"}
-          >
-            {status === "error" ? (
-              <Button
-                size="sm"
-                variant="outline"
-                onClick={() => {
-                  // An expired ticket surfaces as unauthorized on restart and
-                  // refreshes access through the effect; no need to mint one here.
-                  clientRef.current?.stop();
-                  clientRef.current?.start();
-                }}
-              >
-                Reconnect
-              </Button>
-            ) : null}
-          </DeviceLoadingView>
-        </div>
-      ) : null}
     </div>
   );
 }
+
+function DeviceControlsSlot(props: {
+  renderControls: (view: DeviceViewControls) => ReactNode;
+  view: Omit<DeviceViewControls, "resetView">;
+  onResetView: () => void;
+}) {
+  return props.renderControls({ ...props.view, resetView: props.onResetView });
+}
diff --git a/apps/web/src/components/device/DeviceToolVersions.tsx b/apps/web/src/components/device/DeviceToolVersions.tsx
index d9a79f4bddb5..b72a97d5ff1c 100644
--- a/apps/web/src/components/device/DeviceToolVersions.tsx
+++ b/apps/web/src/components/device/DeviceToolVersions.tsx
@@ -1,5 +1,6 @@
 import type { ReactNode } from "react";
 import type { DeviceToolVersions as ToolVersions } from "@t3tools/contracts";
+import { InlineButton } from "~/components/ui/button";
 import { Popover, PopoverPopup, PopoverTitle, PopoverTrigger } from "~/components/ui/popover";
 
 export function DeviceToolVersions({
@@ -32,7 +33,7 @@ export function DeviceToolVersions({
             ? `${label}: ${version ? `version ${version}` : selected ? "not installed" : "version unknown"}. Show details`
             : undefined
         }
-        className="rounded text-xs text-muted-foreground underline decoration-muted-foreground/40 underline-offset-4 hover:text-foreground focus-visible:outline-2 focus-visible:outline-ring"
+        render={<InlineButton tone="muted" />}
       >
         {kind
           ? version
@@ -44,8 +45,8 @@ export function DeviceToolVersions({
             ? "Versions unavailable"
             : "Versions"}
       </PopoverTrigger>
-      <PopoverPopup align="end" className="w-80">
-        <PopoverTitle className="text-sm">{kind ? label : "Device tools"}</PopoverTitle>
+      <PopoverPopup align="end" width="md">
+        <PopoverTitle>{kind ? label : "Device tools"}</PopoverTitle>
         {tools ? (
           <div className="mt-4 divide-y divide-border/50">
             {(
diff --git a/apps/web/src/components/device/DeviceToolsPanel.tsx b/apps/web/src/components/device/DeviceToolsPanel.tsx
index 79f84529aebb..e0247d743998 100644
--- a/apps/web/src/components/device/DeviceToolsPanel.tsx
+++ b/apps/web/src/components/device/DeviceToolsPanel.tsx
@@ -1,14 +1,7 @@
 import type { DeviceHubAccess } from "@t3tools/client-runtime/state/deviceHubAccess";
-import type {
-  DeviceActionInput,
-  DeviceDetail,
-  DevicePermission,
-  DeviceSummary,
-  DeviceTextSize,
-  EnvironmentId,
-} from "@t3tools/contracts";
+import type { DevicePermission, DeviceSummary, DeviceTextSize } from "@t3tools/contracts";
 import { ChevronDown, X } from "lucide-react";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useEffect, useState } from "react";
 
 import { Button } from "~/components/ui/button";
 import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "~/components/ui/collapsible";
@@ -24,21 +17,8 @@ import { Spinner } from "~/components/ui/spinner";
 import { Switch } from "~/components/ui/switch";
 import { Toggle, ToggleGroup } from "~/components/ui/toggle-group";
 import { cn } from "~/lib/utils";
-import { deviceEnvironment } from "~/state/device";
-import { formatEnvironmentQueryError } from "~/state/query";
-import { useAtomCommand } from "~/state/use-atom-command";
-import {
-  type DeviceEventLogEntry,
-  type DeviceForegroundInfo,
-  subscribeDeviceEventLog,
-  subscribeDeviceForeground,
-} from "./deviceHubApi";
-
-type ActionBody = DeviceActionInput extends infer A
-  ? A extends { readonly type: string }
-    ? Omit<A, "hostId" | "deviceId">
-    : never
-  : never;
+import type { DeviceControls } from "./useDeviceControls";
+import { type DeviceEventLogEntry, subscribeDeviceEventLog } from "./deviceHubApi";
 
 const TEXT_SIZES: ReadonlyArray<{ value: DeviceTextSize; label: string }> = [
   { value: "small", label: "Small" },
@@ -102,7 +82,8 @@ const LOCATION_PRESETS = [
  * local state so the controls never show a value the device did not confirm.
  */
 export function DeviceToolsPanel(props: {
-  readonly environmentId: EnvironmentId;
+  readonly controls: DeviceControls;
+  readonly hostDiagnostics: string | undefined;
   readonly device: DeviceSummary;
   readonly access: DeviceHubAccess | null;
   readonly axOverlay: boolean;
@@ -110,62 +91,10 @@ export function DeviceToolsPanel(props: {
   readonly onClose: () => void;
   readonly className?: string;
 }) {
-  const { environmentId, device } = props;
-  const readDetail = useAtomCommand(deviceEnvironment.detail, { reportFailure: false });
-  const runAction = useAtomCommand(deviceEnvironment.action, { reportFailure: false });
-  const [detail, setDetail] = useState<DeviceDetail | null>(null);
-  const [pending, setPending] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [foreground, setForeground] = useState<DeviceForegroundInfo | null | undefined>(undefined);
-  const isIos = device.platform === "ios";
-
-  const target = useMemo(
-    () => ({ hostId: device.hostId, deviceId: device.id }),
-    [device.hostId, device.id],
-  );
-
-  // The panel is keyed by device, so a mount is always a fresh device.
-  useEffect(() => {
-    let cancelled = false;
-    void readDetail({ environmentId, input: target }).then((result) => {
-      if (cancelled) return;
-      if (result._tag === "Success") setDetail(result.value);
-      else setError(formatEnvironmentQueryError(result.cause));
-    });
-    return () => {
-      cancelled = true;
-    };
-  }, [environmentId, readDetail, target]);
-
-  useEffect(() => {
-    if (!props.access) return;
-    return subscribeDeviceForeground(
-      { access: props.access, platform: device.platform, deviceId: device.id },
-      setForeground,
-    );
-  }, [device.id, device.platform, props.access]);
-
-  const act = useCallback(
-    async (body: ActionBody) => {
-      setPending(true);
-      setError(null);
-      try {
-        const result = await runAction({
-          environmentId,
-          input: { ...target, ...body } as DeviceActionInput,
-        });
-        if (result._tag === "Success") setDetail(result.value);
-        else setError(formatEnvironmentQueryError(result.cause));
-      } finally {
-        setPending(false);
-      }
-    },
-    [environmentId, runAction, target],
-  );
-
+  const { device, controls } = props;
+  const { detail, pending, error, foregroundApp, disabled, act } = controls;
   const settings = detail?.settings;
-  const foregroundApp = foreground === undefined ? (detail?.foregroundApp ?? null) : foreground;
-  const disabled = pending || detail === null;
+  const isIos = device.platform === "ios";
 
   return (
     <div
@@ -194,6 +123,14 @@ export function DeviceToolsPanel(props: {
           </div>
         ) : null}
 
+        {props.hostDiagnostics ? (
+          <Section title="Host diagnostics">
+            <p className="whitespace-pre-line text-xs text-muted-foreground">
+              {props.hostDiagnostics}
+            </p>
+          </Section>
+        ) : null}
+
         <Section title="App">
           <Row label="Foreground">
             <span className="truncate font-mono text-xs">{foregroundApp?.id ?? "—"}</span>
@@ -398,9 +335,7 @@ export function DeviceToolsPanel(props: {
 function Section(props: { readonly title: string; readonly children: React.ReactNode }) {
   return (
     <section className="flex flex-col gap-2 border-b px-3 py-2.5 last:border-b-0">
-      <h3 className="text-xs font-medium tracking-wide text-muted-foreground uppercase">
-        {props.title}
-      </h3>
+      <h3 className="text-xs font-medium text-muted-foreground">{props.title}</h3>
       {props.children}
     </section>
   );
@@ -493,7 +428,8 @@ function SubmitRow(props: {
     >
       <Input
         size="compact"
-        className="min-w-0 flex-1 font-mono"
+        font="mono"
+        className="min-w-0 flex-1"
         placeholder={props.placeholder}
         value={value}
         disabled={props.disabled}
@@ -530,7 +466,8 @@ function LocationSection(props: {
       <div className="flex gap-1.5">
         <Input
           size="compact"
-          className="min-w-0 flex-1 font-mono"
+          font="mono"
+          className="min-w-0 flex-1"
           placeholder="Latitude"
           inputMode="decimal"
           value={latitude}
@@ -539,7 +476,8 @@ function LocationSection(props: {
         />
         <Input
           size="compact"
-          className="min-w-0 flex-1 font-mono"
+          font="mono"
+          className="min-w-0 flex-1"
           placeholder="Longitude"
           inputMode="decimal"
           value={longitude}
@@ -619,7 +557,7 @@ function PermissionsSection(props: {
     <Section title="Permissions">
       <Input
         size="compact"
-        className="font-mono"
+        font="mono"
         placeholder={props.defaultAppId || "App ID"}
         value={appId}
         disabled={props.disabled}
@@ -695,14 +633,14 @@ function EventLogSection(props: {
 
   return (
     <Collapsible open={open} onOpenChange={setOpen}>
-      <CollapsibleTrigger className="flex w-full items-center gap-1.5 border-b px-3 py-2.5 text-left text-xs font-medium tracking-wide text-muted-foreground uppercase">
+      <CollapsibleTrigger className="flex w-full items-center gap-1.5 border-b px-3 py-2.5 text-left text-xs font-medium text-muted-foreground">
         Event log
         <ChevronDown
           className={cn("ml-auto size-3.5 transition-transform", open && "rotate-180")}
         />
       </CollapsibleTrigger>
       <CollapsiblePanel>
-        <ol className="max-h-64 overflow-y-auto px-3 py-2 font-mono text-[11px] leading-relaxed">
+        <ol className="max-h-64 overflow-y-auto px-3 py-2 font-mono text-2xs leading-relaxed">
           {entries.length === 0 ? (
             <li className="text-muted-foreground">No events yet.</li>
           ) : (
diff --git a/apps/web/src/components/device/DeviceWorkspace.tsx b/apps/web/src/components/device/DeviceWorkspace.tsx
new file mode 100644
index 000000000000..046f07b45a8e
--- /dev/null
+++ b/apps/web/src/components/device/DeviceWorkspace.tsx
@@ -0,0 +1,131 @@
+import type { DeviceSummary, EnvironmentId } from "@t3tools/contracts";
+import { useEffect, useRef, useState } from "react";
+import {
+  captureDeviceScreenshot,
+  DeviceScreenshotError,
+} from "@t3tools/client-runtime/device/screenshot";
+import { refreshDeviceHubAccess, useDeviceHubAccess } from "~/state/device";
+import { DeviceControlsRail } from "./DeviceControlsRail";
+import { DeviceStreamView, type DeviceStreamHandle } from "./DeviceStreamView";
+import { DeviceToolsPanel } from "./DeviceToolsPanel";
+import { useDeviceControls } from "./useDeviceControls";
+
+/** Keyed by environment and device; the screen, quick controls and drawer share the same session. */
+export function DeviceWorkspace(props: {
+  environmentId: EnvironmentId;
+  device: DeviceSummary;
+  hostLabel: string;
+  hostDiagnostics: string | undefined;
+  visible: boolean;
+  onFloat: () => void;
+  onClose: () => void;
+  onPowerOff: () => void;
+}) {
+  const [handle, setHandle] = useState<DeviceStreamHandle | null>(null);
+  const [toolsOpen, setToolsOpen] = useState(false);
+  const [axOverlay, setAxOverlay] = useState(false);
+  const [screenshotPending, setScreenshotPending] = useState(false);
+  const [screenshotError, setScreenshotError] = useState<string | null>(null);
+  const captureRef = useRef<AbortController | null>(null);
+  const downloadRef = useRef<string | null>(null);
+  const access = useDeviceHubAccess(props.environmentId, props.device.hostId);
+  const controls = useDeviceControls({ ...props, access });
+  useEffect(() => {
+    if (!access || !props.visible) captureRef.current?.abort();
+    return () => {
+      captureRef.current?.abort();
+      if (downloadRef.current) URL.revokeObjectURL(downloadRef.current);
+      downloadRef.current = null;
+    };
+  }, [access, props.visible]);
+  const saveScreenshot = () => {
+    if (!access || captureRef.current || !props.visible) return;
+    const controller = new AbortController();
+    captureRef.current = controller;
+    setScreenshotPending(true);
+    setScreenshotError(null);
+    return captureDeviceScreenshot(
+      { access, platform: props.device.platform, deviceId: props.device.id },
+      controller.signal,
+    )
+      .then((image) => {
+        if (controller.signal.aborted) return;
+        if (downloadRef.current) URL.revokeObjectURL(downloadRef.current);
+        const url = URL.createObjectURL(image);
+        downloadRef.current = url;
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = `${props.device.name.replace(/[^a-z0-9-]/gi, "-")}-${Date.now()}.png`;
+        document.body.append(link);
+        link.click();
+        link.remove();
+      })
+      .catch((cause: unknown) => {
+        if (!controller.signal.aborted) {
+          if (cause instanceof DeviceScreenshotError && cause.status === 401)
+            refreshDeviceHubAccess(props.environmentId);
+          setScreenshotError(
+            cause instanceof Error ? cause.message : "Screenshot capture failed. Try again.",
+          );
+        }
+      })
+      .finally(() => {
+        if (captureRef.current === controller) {
+          captureRef.current = null;
+          setScreenshotPending(false);
+        }
+      });
+  };
+  return (
+    <>
+      <div className="relative flex min-h-0 min-w-0 flex-1 flex-col">
+        {screenshotError || (controls.error && !toolsOpen) ? (
+          <p role="alert" className="px-3 py-2 text-xs text-destructive">
+            {screenshotError ?? controls.error}
+          </p>
+        ) : null}
+        <div className="min-h-0 flex-1">
+          <DeviceStreamView
+            environmentId={props.environmentId}
+            platform={props.device.platform}
+            deviceName={props.device.name}
+            deviceDescription={`${props.hostLabel} · ${props.device.version}`}
+            deviceId={props.device.id}
+            hostId={props.device.hostId}
+            visible={props.visible}
+            axOverlay={axOverlay}
+            allowPhoneView
+            onHandle={setHandle}
+            renderControls={(view) => (
+              <DeviceControlsRail
+                platform={props.device.platform}
+                handle={handle}
+                view={view}
+                controls={controls}
+                screenshotPending={screenshotPending}
+                onScreenshot={() => void saveScreenshot()}
+                toolsOpen={toolsOpen}
+                onTools={() => setToolsOpen(!toolsOpen)}
+                onFloat={props.onFloat}
+                onClose={props.onClose}
+                onPowerOff={props.onPowerOff}
+              />
+            )}
+          />
+        </div>
+      </div>
+      {toolsOpen ? (
+        <DeviceToolsPanel
+          device={props.device}
+          controls={controls}
+          hostDiagnostics={props.hostDiagnostics}
+          access={access}
+          axOverlay={axOverlay}
+          onAxOverlayChange={setAxOverlay}
+          onClose={() => setToolsOpen(false)}
+          className="absolute inset-y-0 right-0 z-10 w-full max-w-72 border-l shadow-lg @[700px]:static @[700px]:w-72 @[700px]:shrink-0 @[700px]:shadow-none"
+        />
+      ) : null}
+    </>
+  );
+}
diff --git a/apps/web/src/components/device/deviceFold.ts b/apps/web/src/components/device/deviceFold.ts
new file mode 100644
index 000000000000..a9eda03831de
--- /dev/null
+++ b/apps/web/src/components/device/deviceFold.ts
@@ -0,0 +1,72 @@
+import type { DeviceHubAccess } from "@t3tools/client-runtime/state/deviceHubAccess";
+import { withDeviceHubQuery } from "@t3tools/client-runtime/state/deviceHubAccess";
+
+export type AndroidFoldPosture = "closed" | "opened";
+
+export interface AndroidFoldState {
+  readonly supported: boolean;
+  readonly posture: "closed" | "half_opened" | "opened" | "flipped" | "tent" | null;
+  readonly hingeAngle: number | null;
+}
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null && !Array.isArray(value);
+
+const parseFold = (payload: unknown): AndroidFoldState => {
+  if (!isRecord(payload) || payload.ok !== true || !isRecord(payload.fold)) {
+    throw new Error("Unexpected Android fold response.");
+  }
+  const { supported, posture, hingeAngle } = payload.fold;
+  if (
+    typeof supported !== "boolean" ||
+    (posture !== null &&
+      posture !== "closed" &&
+      posture !== "half_opened" &&
+      posture !== "opened" &&
+      posture !== "flipped" &&
+      posture !== "tent") ||
+    (hingeAngle !== null && (typeof hingeAngle !== "number" || !Number.isFinite(hingeAngle)))
+  ) {
+    throw new Error("Unexpected Android fold response.");
+  }
+  return { supported, posture, hingeAngle };
+};
+
+const foldRequest = async (
+  access: DeviceHubAccess,
+  deviceId: string,
+  posture?: AndroidFoldPosture,
+  signal?: AbortSignal,
+): Promise<AndroidFoldState> => {
+  const url = withDeviceHubQuery(
+    `${access.httpBase}/vendor/serve-emu/api/fold?${new URLSearchParams({ device: deviceId })}`,
+    access,
+  );
+  const response = await fetch(url, {
+    method: posture ? "POST" : "GET",
+    cache: "no-store",
+    credentials: access.credentials ? "include" : "same-origin",
+    ...(posture
+      ? { headers: { "content-type": "application/json" }, body: JSON.stringify({ posture }) }
+      : {}),
+    ...(signal ? { signal } : {}),
+  });
+  if (!response.ok) {
+    const payload: unknown = await response.json().catch(() => null);
+    const error = isRecord(payload) ? payload.error : null;
+    throw new Error(
+      typeof error === "string" ? error : `Fold command failed (${response.status}).`,
+    );
+  }
+  return parseFold(await response.json());
+};
+
+export const readAndroidFold = (access: DeviceHubAccess, deviceId: string, signal?: AbortSignal) =>
+  foldRequest(access, deviceId, undefined, signal);
+
+export const setAndroidFold = (
+  access: DeviceHubAccess,
+  deviceId: string,
+  posture: AndroidFoldPosture,
+  signal?: AbortSignal,
+) => foldRequest(access, deviceId, posture, signal);
diff --git a/apps/web/src/components/device/deviceFrameLayout.test.ts b/apps/web/src/components/device/deviceFrameLayout.test.ts
new file mode 100644
index 000000000000..c36c8141f89e
--- /dev/null
+++ b/apps/web/src/components/device/deviceFrameLayout.test.ts
@@ -0,0 +1,9 @@
+import { expect, it } from "vite-plus/test";
+import { fitDeviceFrame } from "./deviceFrameLayout";
+
+it("fits a flat device beside the fixed controls rail", () => {
+  const frame = fitDeviceFrame(9 / 19.5, 480, 1_000, 56);
+  expect(frame.width + 56).toBeLessThanOrEqual(480);
+  expect(frame.height).toBeLessThanOrEqual(1_000);
+  expect(frame.width / frame.height).toBeCloseTo(9 / 19.5);
+});
diff --git a/apps/web/src/components/device/deviceFrameLayout.ts b/apps/web/src/components/device/deviceFrameLayout.ts
new file mode 100644
index 000000000000..1842c3b2784e
--- /dev/null
+++ b/apps/web/src/components/device/deviceFrameLayout.ts
@@ -0,0 +1,8 @@
+export function fitDeviceFrame(aspect: number, width: number, height: number, rightInset = 0) {
+  const availableWidth = Math.max(0, width - rightInset);
+  if (availableWidth === 0 || height === 0) return { width: 0, height: 0 };
+  const byHeight = { width: height * aspect, height };
+  return byHeight.width <= availableWidth
+    ? byHeight
+    : { width: availableWidth, height: availableWidth / aspect };
+}
diff --git a/apps/web/src/components/device/deviceModels.ts b/apps/web/src/components/device/deviceModels.ts
new file mode 100644
index 000000000000..d9197a27e357
--- /dev/null
+++ b/apps/web/src/components/device/deviceModels.ts
@@ -0,0 +1,37 @@
+import {
+  resolveDeviceModelId,
+  type DeviceAccessorySource,
+  type DeviceModelSource,
+} from "@t3tools/client-runtime/device/model";
+import type { DevicePlatform } from "@t3tools/contracts";
+import iphoneDuo from "./models/iphone-duo.glb?url";
+import iphone18Pro from "./models/iphone-18-pro.glb?url";
+import iphone18ProMax from "./models/iphone-18-pro-max.glb?url";
+import magicKeyboard from "./models/ipad-pro-13-m5-magic-keyboard.glb?url";
+import ipadPro13M5 from "./models/ipad-pro-13-m5.glb?url";
+
+// Bundled URLs follow the client origin in local, desktop, hosted and remote sessions.
+const models: Record<DeviceModelSource["id"], DeviceModelSource> = {
+  "iphone-duo": { id: "iphone-duo", url: iphoneDuo },
+  "iphone-18-pro": { id: "iphone-18-pro", url: iphone18Pro },
+  "iphone-18-pro-max": { id: "iphone-18-pro-max", url: iphone18ProMax },
+  "ipad-pro-13-m5": { id: "ipad-pro-13-m5", url: ipadPro13M5 },
+};
+
+export function deviceModel(platform: DevicePlatform, name: string): DeviceModelSource | null {
+  const id = resolveDeviceModelId(platform, name);
+  return id ? models[id] : null;
+}
+
+const keyboard: DeviceAccessorySource = {
+  id: "ipad-pro-13-m5-magic-keyboard",
+  modelId: "ipad-pro-13-m5",
+  url: magicKeyboard,
+};
+
+export function deviceKeyboard(
+  platform: DevicePlatform,
+  name: string,
+): DeviceAccessorySource | null {
+  return resolveDeviceModelId(platform, name) === keyboard.modelId ? keyboard : null;
+}
diff --git a/apps/web/src/components/device/models/ipad-pro-13-m5-magic-keyboard.glb b/apps/web/src/components/device/models/ipad-pro-13-m5-magic-keyboard.glb
new file mode 100644
index 000000000000..fd46333b4270
Binary files /dev/null and b/apps/web/src/components/device/models/ipad-pro-13-m5-magic-keyboard.glb differ
diff --git a/apps/web/src/components/device/models/ipad-pro-13-m5.glb b/apps/web/src/components/device/models/ipad-pro-13-m5.glb
new file mode 100644
index 000000000000..0611ac749607
Binary files /dev/null and b/apps/web/src/components/device/models/ipad-pro-13-m5.glb differ
diff --git a/apps/web/src/components/device/models/iphone-18-pro-max.glb b/apps/web/src/components/device/models/iphone-18-pro-max.glb
new file mode 100644
index 000000000000..52438e10f8d6
Binary files /dev/null and b/apps/web/src/components/device/models/iphone-18-pro-max.glb differ
diff --git a/apps/web/src/components/device/models/iphone-18-pro.glb b/apps/web/src/components/device/models/iphone-18-pro.glb
new file mode 100644
index 000000000000..2dae3e9beaa6
Binary files /dev/null and b/apps/web/src/components/device/models/iphone-18-pro.glb differ
diff --git a/apps/web/src/components/device/models/iphone-duo.glb b/apps/web/src/components/device/models/iphone-duo.glb
new file mode 100644
index 000000000000..0269a1dc40e0
Binary files /dev/null and b/apps/web/src/components/device/models/iphone-duo.glb differ
diff --git a/apps/web/src/components/device/models/sources.json b/apps/web/src/components/device/models/sources.json
new file mode 100644
index 000000000000..766b65a7a759
--- /dev/null
+++ b/apps/web/src/components/device/models/sources.json
@@ -0,0 +1,57 @@
+{
+  "author": "Apple Inc.",
+  "assetLicense": "No open-source or redistribution license has been established.",
+  "conversion": {
+    "blender": "4.5.9",
+    "gltfTransform": "4.2.1",
+    "changes": [
+      "Extracted device bodies and a separate Magic Keyboard accessory; excluded unrelated parts and presentation duplicates.",
+      "Normalized conventional device portrait axes, centered their screen and uniformly scaled its height to 2.2 scene units. The Duo retains its upstream centimeter hinge rig.",
+      "Replaced the baked marketing screen with a named placeholder for the live framebuffer.",
+      "Resized textures to at most 1024 pixels and encoded them as WebP; retained body geometry."
+    ]
+  },
+  "models": [
+    {
+      "id": "iphone-18-pro",
+      "file": "iphone-18-pro.glb",
+      "sourceUrl": "https://www.apple.com/105/media/us/iphone-18-pro/2026/591df885-5ee2-4173-86e6-401021249f7c/ar/iphone-18-pro-e-sim.usdz",
+      "sourceSha256": "0f2dac354fbc6505e7917983de460f2cc68e253f96aabf52e9f0468a4803f317",
+      "bodyNode": "UBGArkKGrAMRRnj",
+      "screenNode": "EHjrGDHNHzgNjtE.001"
+    },
+    {
+      "id": "iphone-18-pro-max",
+      "file": "iphone-18-pro-max.glb",
+      "sourceUrl": "https://www.apple.com/105/media/us/iphone-18-pro/2026/591df885-5ee2-4173-86e6-401021249f7c/ar/iphone-18-pro-e-sim.usdz",
+      "sourceSha256": "0f2dac354fbc6505e7917983de460f2cc68e253f96aabf52e9f0468a4803f317",
+      "bodyNode": "wUOhcMgiBmCgGaw",
+      "screenNode": "EHjrGDHNHzgNjtE"
+    },
+    {
+      "id": "ipad-pro-13-m5",
+      "file": "ipad-pro-13-m5.glb",
+      "sourceUrl": "https://www.apple.com/105/media/us/ipad-pro/2025/adee90db-c01e-430d-b726-fe64c0063f08/ar/ipad-pro-space-black.usdz",
+      "sourceSha256": "48098daf7c49117c81a4e4e1808899b93fad081faeba6c8b65124946b83b5ac6",
+      "bodyNode": "zRrSLDpdYmKeRJQ",
+      "screenNode": "lsDiIbtoSGSmWWZ"
+    },
+    {
+      "id": "ipad-pro-13-m5-magic-keyboard",
+      "file": "ipad-pro-13-m5-magic-keyboard.glb",
+      "sourceUrl": "https://www.apple.com/105/media/us/ipad-pro/2025/adee90db-c01e-430d-b726-fe64c0063f08/ar/ipad-pro-space-black.usdz",
+      "sourceSha256": "48098daf7c49117c81a4e4e1808899b93fad081faeba6c8b65124946b83b5ac6",
+      "bodyNode": "zRrSLDpdYmKeRJQ",
+      "screenNode": "lsDiIbtoSGSmWWZ",
+      "accessoryNode": "PoBqSMmyhhcJsBX"
+    },
+    {
+      "id": "iphone-duo",
+      "file": "iphone-duo.glb",
+      "sourceUrl": "https://www.apple.com/105/media/us/iphone-duo/2026/9305e4b9-72d9-4c05-9381-b572adadd5e5/ar/iPhone_Duo_e-sim_Star-White_Variant.usdz",
+      "sourceSha256": "5cab2ea636da0bc0b06c8abf4809843498f7c1d680042b4f95e383b5c6a718b2",
+      "upstreamConversionCommit": "bb265b11c13b395e5302d121458e2d42224a2e9f",
+      "conversion": "Preserved the centimeter split hinge rig and three display meshes from serve-sim; resized textures to 1024 pixels and encoded them as WebP without simplifying or flattening the rig."
+    }
+  ]
+}
diff --git a/apps/web/src/components/device/phoneTrackpad.test.ts b/apps/web/src/components/device/phoneTrackpad.test.ts
new file mode 100644
index 000000000000..b8fb3f334188
--- /dev/null
+++ b/apps/web/src/components/device/phoneTrackpad.test.ts
@@ -0,0 +1,105 @@
+import { afterEach, expect, it, vi } from "vite-plus/test";
+import { bindPhoneTrackpad } from "./phoneTrackpad";
+
+afterEach(() => vi.useRealTimers());
+
+class Canvas extends EventTarget {
+  getBoundingClientRect() {
+    return { width: 400, height: 800 } as DOMRect;
+  }
+}
+const wheel = (ctrlKey = false) =>
+  Object.assign(new Event("wheel", { cancelable: true }), {
+    deltaX: 16,
+    deltaY: -20,
+    deltaMode: 0,
+    ctrlKey,
+  });
+const gesture = (type: string, scale: number) =>
+  Object.assign(new Event(type, { cancelable: true }), { scale });
+
+it("consumes scrolling and page zoom only on the bound canvas and releases listeners on detach", () => {
+  const canvas = new Canvas();
+  const navigate = vi.fn(() => true);
+  const listeners = vi.spyOn(canvas, "addEventListener");
+  const binding = bindPhoneTrackpad(canvas, { navigate, endWheel: vi.fn() });
+  const swipe = wheel();
+  canvas.dispatchEvent(swipe);
+  const pinch = wheel(true);
+  canvas.dispatchEvent(pinch);
+  expect(swipe.defaultPrevented).toBe(true);
+  expect(pinch.defaultPrevented).toBe(true);
+  expect(navigate.mock.calls).toEqual([[{ type: "orbit", x: -0.04, y: 0.025 }]]);
+  expect(
+    listeners.mock.calls.every(
+      ([, , options]) => typeof options === "object" && options.passive === false,
+    ),
+  ).toBe(true);
+  binding.dispose();
+  const detached = wheel(true);
+  canvas.dispatchEvent(detached);
+  expect(detached.defaultPrevented).toBe(false);
+  expect(navigate).toHaveBeenCalledOnce();
+});
+
+it("consumes Safari pinch without zooming the model and resumes orbit after cancellation", () => {
+  const canvas = new Canvas();
+  const navigate = vi.fn(() => true);
+  const binding = bindPhoneTrackpad(canvas, { navigate, endWheel: vi.fn() });
+  canvas.dispatchEvent(gesture("gesturestart", 1));
+  canvas.dispatchEvent(gesture("gesturechange", 1.2));
+  canvas.dispatchEvent(wheel(true));
+  expect(navigate).not.toHaveBeenCalled();
+  binding.cancel();
+  canvas.dispatchEvent(wheel());
+  expect(navigate).toHaveBeenCalledOnce();
+  binding.dispose();
+});
+
+it("normalizes Chrome and Safari pinch, expires wheel sequences and cancels on detach", () => {
+  vi.useFakeTimers();
+  const canvas = new Canvas();
+  const pinch = { begin: vi.fn(() => true), move: vi.fn(), end: vi.fn() };
+  const navigate = vi.fn(() => true);
+  const binding = bindPhoneTrackpad(canvas, { navigate, endWheel: vi.fn() }, pinch);
+  canvas.dispatchEvent(wheel(true));
+  canvas.dispatchEvent(wheel(true));
+  expect(pinch.begin).toHaveBeenCalledOnce();
+  expect(pinch.move.mock.calls).toEqual([[0.2], [0.2]]);
+  vi.advanceTimersByTime(180);
+  expect(pinch.end).toHaveBeenCalledOnce();
+  canvas.dispatchEvent(gesture("gesturestart", 1));
+  canvas.dispatchEvent(gesture("gesturechange", 1.2));
+  expect(pinch.move).toHaveBeenLastCalledWith(Math.log(1.2));
+  canvas.dispatchEvent(wheel(true));
+  expect(pinch.move).toHaveBeenCalledTimes(3);
+  binding.dispose();
+  const count = pinch.move.mock.calls.length;
+  vi.advanceTimersByTime(500);
+  canvas.dispatchEvent(wheel(true));
+  expect(pinch.move).toHaveBeenCalledTimes(count);
+  expect(navigate).not.toHaveBeenCalled();
+});
+
+it("keeps a paused wheel orbit active until native release or browser fallback", () => {
+  vi.useFakeTimers();
+  const canvas = new Canvas();
+  const navigate = vi.fn(() => true);
+  const endWheel = vi.fn();
+  const binding = bindPhoneTrackpad(canvas, { navigate, endWheel });
+  canvas.dispatchEvent(wheel());
+  vi.advanceTimersByTime(500);
+  expect(endWheel).not.toHaveBeenCalled();
+  binding.endOrbit();
+  expect(endWheel).toHaveBeenCalledOnce();
+  canvas.dispatchEvent(wheel());
+  vi.advanceTimersByTime(1199);
+  expect(endWheel).toHaveBeenCalledOnce();
+  vi.advanceTimersByTime(1);
+  expect(endWheel).toHaveBeenCalledTimes(2);
+  canvas.dispatchEvent(wheel());
+  canvas.dispatchEvent(Object.assign(wheel(), { momentum: true }));
+  expect(endWheel).toHaveBeenCalledTimes(3);
+  expect(navigate).toHaveBeenCalledTimes(3);
+  binding.dispose();
+});
diff --git a/apps/web/src/components/device/phoneTrackpad.ts b/apps/web/src/components/device/phoneTrackpad.ts
new file mode 100644
index 000000000000..2851013b61df
--- /dev/null
+++ b/apps/web/src/components/device/phoneTrackpad.ts
@@ -0,0 +1,137 @@
+// @effect-diagnostics globalTimers:off - Canvas-local wheel gesture expiry.
+import {
+  phoneWheelNavigation,
+  type createPhoneInteraction,
+} from "@t3tools/client-runtime/device/phone-interaction";
+
+/** Canvas-local, non-passive listeners consume browser zoom. Safari reports cumulative pinch scale instead of Ctrl-wheel. */
+export function bindPhoneTrackpad(
+  canvas: Pick<
+    HTMLCanvasElement,
+    "addEventListener" | "removeEventListener" | "getBoundingClientRect"
+  >,
+  interaction: Pick<ReturnType<typeof createPhoneInteraction>, "navigate" | "endWheel">,
+  pinch?: {
+    begin: (x: number, y: number) => boolean;
+    move: (logScale: number) => void;
+    end: () => void;
+  },
+) {
+  let scale: number | null = null;
+  let wheelActive = false;
+  let timer: ReturnType<typeof setTimeout> | null = null;
+  let orbitActive = false;
+  let orbitTimer: ReturnType<typeof setTimeout> | null = null;
+  const endOrbit = () => {
+    if (orbitTimer) clearTimeout(orbitTimer);
+    orbitTimer = null;
+    if (!orbitActive) return;
+    orbitActive = false;
+    interaction.endWheel();
+  };
+  const finish = () => {
+    if (timer) clearTimeout(timer);
+    timer = null;
+    wheelActive = false;
+    scale = null;
+    pinch?.end();
+  };
+  const begin = (event: Event) => {
+    const rect = canvas.getBoundingClientRect();
+    const x = "clientX" in event && typeof event.clientX === "number" ? event.clientX : NaN;
+    const y = "clientY" in event && typeof event.clientY === "number" ? event.clientY : NaN;
+    pinch?.begin((x - rect.left) / rect.width, (y - rect.top) / rect.height);
+  };
+  const consume = (event: Event) => {
+    event.preventDefault();
+    event.stopPropagation();
+  };
+  const wheel = (event: WheelEvent) => {
+    consume(event);
+    if (scale !== null) return;
+    if (event.ctrlKey) {
+      endOrbit();
+      if (!wheelActive) {
+        begin(event);
+        wheelActive = true;
+      }
+      const unit =
+        event.deltaMode === 1
+          ? 16
+          : event.deltaMode === 2
+            ? canvas.getBoundingClientRect().height
+            : 1;
+      pinch?.move((-event.deltaY * unit) / 100);
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(finish, 180);
+      return;
+    }
+    if (wheelActive) finish();
+    if ("momentum" in event && event.momentum === true) {
+      endOrbit();
+      return;
+    }
+    const rect = canvas.getBoundingClientRect();
+    const navigation = phoneWheelNavigation({
+      width: rect.width,
+      height: rect.height,
+      deltaX: event.deltaX,
+      deltaY: event.deltaY,
+      deltaMode: event.deltaMode,
+      ctrlKey: event.ctrlKey,
+    });
+    if (navigation && interaction.navigate(navigation)) {
+      orbitActive = true;
+      if (orbitTimer) clearTimeout(orbitTimer);
+      // Browsers without a release signal still return to a useful view.
+      orbitTimer = setTimeout(endOrbit, 1200);
+    }
+  };
+  const gestureScale = (event: Event) => {
+    if (
+      !("scale" in event) ||
+      typeof event.scale !== "number" ||
+      !Number.isFinite(event.scale) ||
+      event.scale <= 0
+    )
+      return null;
+    return event.scale;
+  };
+  const start = (event: Event) => {
+    consume(event);
+    endOrbit();
+    finish();
+    begin(event);
+    scale = gestureScale(event) ?? 1;
+  };
+  const change = (event: Event) => {
+    consume(event);
+    const next = gestureScale(event);
+    if (scale === null || next === null) return;
+    pinch?.move(Math.log(next / scale));
+    scale = next;
+  };
+  const end = (event: Event) => {
+    consume(event);
+    finish();
+  };
+  canvas.addEventListener("wheel", wheel, { passive: false });
+  canvas.addEventListener("gesturestart", start, { passive: false });
+  canvas.addEventListener("gesturechange", change, { passive: false });
+  canvas.addEventListener("gestureend", end, { passive: false });
+  return {
+    endOrbit,
+    cancel() {
+      endOrbit();
+      finish();
+    },
+    dispose() {
+      canvas.removeEventListener("wheel", wheel);
+      canvas.removeEventListener("gesturestart", start);
+      canvas.removeEventListener("gesturechange", change);
+      canvas.removeEventListener("gestureend", end);
+      endOrbit();
+      finish();
+    },
+  };
+}
diff --git a/apps/web/src/components/device/useDeviceControls.test.tsx b/apps/web/src/components/device/useDeviceControls.test.tsx
new file mode 100644
index 000000000000..cadc0c7852ee
--- /dev/null
+++ b/apps/web/src/components/device/useDeviceControls.test.tsx
@@ -0,0 +1,232 @@
+import { EnvironmentId, type DeviceDetail, type DeviceSummary } from "@t3tools/contracts";
+import type { DeviceHubAccess } from "@t3tools/client-runtime/device/hub-access";
+import { act, useEffect } from "react";
+import { create, type ReactTestRenderer } from "react-test-renderer";
+import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
+import { useDeviceControls, type DeviceControls } from "./useDeviceControls";
+
+type Result = { _tag: "Success"; value: DeviceDetail } | { _tag: "Failure"; cause: unknown };
+const { read, action, subscribe } = vi.hoisted(() => ({
+  read: vi.fn<() => Promise<Result>>(),
+  action: vi.fn<() => Promise<Result>>(),
+  subscribe:
+    vi.fn<(_target: unknown, onChange: (app: { id: string } | null) => void) => () => void>(),
+}));
+vi.mock("~/state/device", () => ({ deviceEnvironment: { detail: "detail", action: "action" } }));
+vi.mock("~/state/use-atom-command", () => ({
+  useAtomCommand: (command: string) => (command === "detail" ? read : action),
+}));
+vi.mock("~/state/query", () => ({ formatEnvironmentQueryError: () => "Device action failed" }));
+vi.mock("./deviceHubApi", () => ({ subscribeDeviceForeground: subscribe }));
+
+const device: DeviceSummary = {
+  hostId: "remote",
+  id: "phone",
+  name: "Phone",
+  platform: "ios",
+  version: "iOS",
+  booted: true,
+  physical: false,
+};
+const snapshot = (appearance: "light" | "dark"): Result => ({
+  _tag: "Success",
+  value: {
+    hostId: "remote",
+    deviceId: "phone",
+    settings: { appearance },
+    foregroundApp: null,
+    readAt: "2026-09-20T00:00:00Z",
+  },
+});
+function deferred() {
+  let resolve!: (value: Result) => void;
+  const promise = new Promise<Result>((done) => {
+    resolve = done;
+  });
+  return { promise, resolve };
+}
+let renderer: ReactTestRenderer | undefined;
+let controls: DeviceControls;
+function Probe({ visible, access = null }: { visible: boolean; access?: DeviceHubAccess | null }) {
+  const next = useDeviceControls({
+    environmentId: EnvironmentId.make("environment"),
+    device,
+    access,
+    visible,
+  });
+  useEffect(() => {
+    controls = next;
+  }, [next]);
+  return null;
+}
+beforeEach(() => {
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  read.mockReset();
+  action.mockReset();
+  subscribe.mockReset();
+  subscribe.mockReturnValue(() => {});
+  read.mockResolvedValue(snapshot("light"));
+});
+afterEach(async () => {
+  await act(async () => renderer?.unmount());
+  vi.unstubAllGlobals();
+});
+async function mount() {
+  await act(async () => {
+    renderer = create(<Probe visible />);
+  });
+}
+
+it("serializes rapid actions and retains confirmed settings while pending or after failure", async () => {
+  await mount();
+  const response = deferred();
+  action.mockReturnValueOnce(response.promise);
+  let pending!: Promise<void>;
+  await act(async () => {
+    pending = controls.act({ type: "setAppearance", value: "dark" });
+    await controls.act({ type: "setAppearance", value: "light" });
+  });
+  expect(action).toHaveBeenCalledOnce();
+  expect(controls.disabled).toBe(true);
+  expect(controls.detail?.settings.appearance).toBe("light");
+  await act(async () => {
+    response.resolve(snapshot("dark"));
+    await pending;
+  });
+  expect(controls.detail?.settings.appearance).toBe("dark");
+  action.mockResolvedValueOnce({ _tag: "Failure", cause: "offline" });
+  await act(async () => controls.act({ type: "setAppearance", value: "light" }));
+  expect(controls.detail?.settings.appearance).toBe("dark");
+  expect(controls.error).toBe("Device action failed");
+  expect(controls.disabled).toBe(false);
+});
+
+it("serializes host actions across hide/reopen and discards detached results", async () => {
+  await mount();
+  const response = deferred();
+  action.mockReturnValueOnce(response.promise);
+  let pending!: Promise<void>;
+  await act(async () => {
+    pending = controls.act({ type: "setAppearance", value: "dark" });
+  });
+  await act(async () => renderer!.update(<Probe visible={false} />));
+  expect(controls.disabled).toBe(true);
+  await act(async () => renderer!.update(<Probe visible />));
+  await act(async () => controls.act({ type: "setAppearance", value: "light" }));
+  expect(action).toHaveBeenCalledOnce();
+  expect(controls.disabled).toBe(true);
+  const confirmed = deferred();
+  read.mockReturnValueOnce(confirmed.promise);
+  await act(async () => {
+    response.resolve(snapshot("dark"));
+    await response.promise;
+  });
+  expect(controls.detail?.settings.appearance).toBe("light");
+  expect(controls.disabled).toBe(true);
+  await act(async () => {
+    confirmed.resolve(snapshot("dark"));
+    await pending;
+  });
+  expect(controls.detail?.settings.appearance).toBe("dark");
+  expect(controls.disabled).toBe(false);
+  action.mockResolvedValueOnce(snapshot("dark"));
+  await act(async () => controls.act({ type: "setAppearance", value: "dark" }));
+  expect(action).toHaveBeenCalledTimes(2);
+  expect(controls.detail?.settings.appearance).toBe("dark");
+});
+
+it("keeps actions disabled when settings cannot be confirmed after a detached command", async () => {
+  await mount();
+  const response = deferred();
+  action.mockReturnValueOnce(response.promise);
+  let pending!: Promise<void>;
+  await act(async () => {
+    pending = controls.act({ type: "setAppearance", value: "dark" });
+  });
+  await act(async () => renderer!.update(<Probe visible={false} />));
+  await act(async () => renderer!.update(<Probe visible />));
+  read.mockResolvedValueOnce({ _tag: "Failure", cause: "offline" });
+  await act(async () => {
+    response.resolve(snapshot("dark"));
+    await pending;
+  });
+  expect(controls.detail).toBeNull();
+  expect(controls.disabled).toBe(true);
+  expect(controls.error).toBe("Device action failed");
+  await act(async () => controls.act({ type: "setAppearance", value: "light" }));
+  expect(action).toHaveBeenCalledOnce();
+  await act(async () => renderer!.update(<Probe visible={false} />));
+  await act(async () => renderer!.update(<Probe visible />));
+  expect(controls.disabled).toBe(false);
+  expect(controls.error).toBeNull();
+});
+
+it("disables stale settings after a failed reopen read and recovers on a successful read", async () => {
+  await mount();
+  await act(async () => renderer!.update(<Probe visible={false} />));
+  read.mockResolvedValueOnce({ _tag: "Failure", cause: "offline" });
+  await act(async () => renderer!.update(<Probe visible />));
+  expect(controls.detail).toBeNull();
+  expect(controls.disabled).toBe(true);
+  expect(controls.error).toBe("Device action failed");
+  await act(async () => controls.act({ type: "setAppearance", value: "dark" }));
+  expect(action).not.toHaveBeenCalled();
+  await act(async () => renderer!.update(<Probe visible={false} />));
+  await act(async () => renderer!.update(<Probe visible />));
+  expect(controls.detail?.settings.appearance).toBe("light");
+  expect(controls.disabled).toBe(false);
+  expect(controls.error).toBeNull();
+});
+
+it("does not let an older refresh overwrite a newer confirmed action", async () => {
+  await mount();
+  await act(async () => renderer!.update(<Probe visible={false} />));
+  const refresh = deferred();
+  read.mockReturnValueOnce(refresh.promise);
+  await act(async () => renderer!.update(<Probe visible />));
+  action.mockResolvedValueOnce(snapshot("dark"));
+  await act(async () => controls.act({ type: "setAppearance", value: "dark" }));
+  await act(async () => {
+    refresh.resolve(snapshot("light"));
+    await refresh.promise;
+  });
+  expect(controls.detail?.settings.appearance).toBe("dark");
+});
+
+it.each(["hidden", "access renewed"] as const)(
+  "uses the detail snapshot until a new foreground event after the subscription is %s",
+  async (restart) => {
+    const access: DeviceHubAccess = {
+      httpBase: "https://remote.test/api/device-hub",
+      wsBase: "wss://remote.test/api/device-hub",
+      query: {},
+      credentials: false,
+    };
+    const detail = snapshot("light");
+    if (detail._tag !== "Success") throw new Error("Expected a successful snapshot");
+    read.mockResolvedValue({
+      ...detail,
+      value: { ...detail.value, foregroundApp: { id: "snapshot.app" } },
+    });
+    await act(async () => {
+      renderer = create(<Probe visible access={access} />);
+    });
+    const oldEvent = subscribe.mock.calls[0]![1];
+    await act(async () => oldEvent({ id: "previous.live.app" }));
+    expect(controls.foregroundApp?.id).toBe("previous.live.app");
+    if (restart === "hidden") {
+      await act(async () => renderer!.update(<Probe visible={false} access={access} />));
+      await act(async () => renderer!.update(<Probe visible access={access} />));
+    } else {
+      await act(async () =>
+        renderer!.update(<Probe visible access={{ ...access, query: { ticket: "renewed" } }} />),
+      );
+    }
+    expect(controls.foregroundApp?.id).toBe("snapshot.app");
+    await act(async () => oldEvent({ id: "late.previous.app" }));
+    expect(controls.foregroundApp?.id).toBe("snapshot.app");
+    const newEvent = subscribe.mock.calls[1]![1];
+    await act(async () => newEvent({ id: "current.live.app" }));
+    expect(controls.foregroundApp?.id).toBe("current.live.app");
+  },
+);
diff --git a/apps/web/src/components/device/useDeviceControls.ts b/apps/web/src/components/device/useDeviceControls.ts
new file mode 100644
index 000000000000..1ac8d2862984
--- /dev/null
+++ b/apps/web/src/components/device/useDeviceControls.ts
@@ -0,0 +1,130 @@
+import type { DeviceHubAccess } from "@t3tools/client-runtime/state/deviceHubAccess";
+import type {
+  DeviceActionInput,
+  DeviceDetail,
+  DeviceSummary,
+  EnvironmentId,
+} from "@t3tools/contracts";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { deviceEnvironment } from "~/state/device";
+import { formatEnvironmentQueryError } from "~/state/query";
+import { useAtomCommand } from "~/state/use-atom-command";
+import { subscribeDeviceForeground, type DeviceForegroundInfo } from "./deviceHubApi";
+
+type ActionBody = DeviceActionInput extends infer A
+  ? A extends { readonly type: string }
+    ? Omit<A, "hostId" | "deviceId">
+    : never
+  : never;
+
+/** One confirmed settings snapshot and serialized actions for the rail and drawer. Mount keyed by device. */
+export function useDeviceControls(options: {
+  environmentId: EnvironmentId;
+  device: DeviceSummary;
+  access: DeviceHubAccess | null;
+  visible: boolean;
+}) {
+  const { environmentId, device, access, visible } = options;
+  const readDetail = useAtomCommand(deviceEnvironment.detail, { reportFailure: false });
+  const runAction = useAtomCommand(deviceEnvironment.action, { reportFailure: false });
+  const [detail, setDetail] = useState<DeviceDetail | null>(null);
+  const [pending, setPending] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [foreground, setForeground] = useState<DeviceForegroundInfo | null | undefined>();
+  // Hiding invalidates UI results, but does not cancel host commands. Keep them serialized
+  // until settlement rather than allowing a reopened panel to race the previous command.
+  const busy = useRef(false);
+  const generation = useRef(0);
+  const visibleRead = useRef<Parameters<typeof readDetail>[0] | null>(null);
+  const target = useMemo(
+    () => ({ hostId: device.hostId, deviceId: device.id }),
+    [device.hostId, device.id],
+  );
+
+  useEffect(() => {
+    const revision = ++generation.current;
+    if (!visible) return;
+    const request = { environmentId, input: target };
+    visibleRead.current = request;
+    void readDetail(request).then((result) => {
+      if (generation.current !== revision) return;
+      if (result._tag === "Success") {
+        setDetail(result.value);
+        setError(null);
+      } else {
+        setDetail(null);
+        setError(formatEnvironmentQueryError(result.cause));
+      }
+    });
+    return () => {
+      visibleRead.current = null;
+      generation.current++;
+    };
+  }, [environmentId, readDetail, target, visible]);
+
+  useEffect(() => {
+    if (!access || !visible) return;
+    let active = true;
+    const unsubscribe = subscribeDeviceForeground(
+      { access, platform: device.platform, deviceId: device.id },
+      (app) => {
+        if (active) setForeground(app);
+      },
+    );
+    return () => {
+      active = false;
+      unsubscribe();
+      setForeground(undefined);
+    };
+  }, [access, device.id, device.platform, visible]);
+
+  const available = detail !== null && visible;
+  const act = async (body: ActionBody) => {
+    if (busy.current || !available) return;
+    busy.current = true;
+    // A settings read started before this action must not overwrite its confirmed result.
+    const revision = ++generation.current;
+    setPending(true);
+    setError(null);
+    return runAction({
+      environmentId,
+      input: { ...target, ...body } as DeviceActionInput,
+    })
+      .then((result) => {
+        if (generation.current !== revision) {
+          const request = visibleRead.current;
+          if (!request) return;
+          // Reopening can read settings before the host command finishes. Confirm them again
+          // after it settles, keeping actions serialized through this refresh.
+          const refreshRevision = ++generation.current;
+          return readDetail(request).then((refreshed) => {
+            if (generation.current !== refreshRevision) return;
+            if (refreshed._tag === "Success") {
+              setDetail(refreshed.value);
+              setError(null);
+            } else {
+              setDetail(null);
+              setError(formatEnvironmentQueryError(refreshed.cause));
+            }
+          });
+        }
+        if (result._tag === "Success") setDetail(result.value);
+        else setError(formatEnvironmentQueryError(result.cause));
+      })
+      .finally(() => {
+        busy.current = false;
+        setPending(false);
+      });
+  };
+
+  return {
+    detail,
+    pending,
+    error,
+    act,
+    disabled: pending || !detail || !visible,
+    foregroundApp: foreground === undefined ? (detail?.foregroundApp ?? null) : foreground,
+  };
+}
+
+export type DeviceControls = ReturnType<typeof useDeviceControls>;
diff --git a/apps/web/src/components/diffs/DiffCommentAnnotation.test.tsx b/apps/web/src/components/diffs/DiffCommentAnnotation.test.tsx
index d430e3837148..6feb102c87cc 100644
--- a/apps/web/src/components/diffs/DiffCommentAnnotation.test.tsx
+++ b/apps/web/src/components/diffs/DiffCommentAnnotation.test.tsx
@@ -25,10 +25,8 @@ describe("DiffCommentAnnotation", () => {
     expect(markup).toContain("Add a comment…");
     expect(markup).toContain(">Comment</button>");
     expect(markup).toContain("autofocus");
-    const textareaControl = markup.match(/<span[^>]*data-slot="textarea-control"[^>]*>/)?.[0];
-    expect(textareaControl).toBeDefined();
-    expect(textareaControl).not.toContain("ring-ring");
-    expect(markup).toContain("cursor-text");
+    // The comment box is the standard small Textarea, not a bespoke surface.
+    expect(markup).toMatch(/<span[^>]*data-size="sm"[^>]*data-slot="textarea-control"/);
   });
 
   it("lets a pull-request diff configure actions without replacing the composer", () => {
diff --git a/apps/web/src/components/diffs/DiffCommentAnnotation.tsx b/apps/web/src/components/diffs/DiffCommentAnnotation.tsx
index bce9f7e55f58..7126ccbbb2e2 100644
--- a/apps/web/src/components/diffs/DiffCommentAnnotation.tsx
+++ b/apps/web/src/components/diffs/DiffCommentAnnotation.tsx
@@ -65,17 +65,18 @@ export function DiffCommentAnnotation({
         onPointerDown={(event) => event.stopPropagation()}
       >
         <MessageCircle className="mt-0.5 size-3.5 shrink-0 text-primary/70" aria-hidden="true" />
-        <p className="min-w-0 flex-1 whitespace-pre-wrap text-[13px] leading-5">{displayedText}</p>
+        <p className="min-w-0 flex-1 whitespace-pre-wrap text-sm leading-5">{displayedText}</p>
         {onDelete ? (
-          <Button
-            className="-my-1 -mr-1 shrink-0 text-muted-foreground opacity-0 transition-opacity group-hover/comment:opacity-100 focus-visible:opacity-100 max-sm:opacity-100"
-            variant="ghost"
-            size="icon-xs"
-            aria-label="Delete comment"
-            onClick={onDelete}
-          >
-            <Trash2 className="size-3" />
-          </Button>
+          <span className="-my-1 -mr-1 flex shrink-0 opacity-0 transition-opacity group-hover/comment:opacity-100 focus-within:opacity-100 max-sm:opacity-100">
+            <Button
+              variant="ghost-muted"
+              size="icon-xs"
+              aria-label="Delete comment"
+              onClick={onDelete}
+            >
+              <Trash2 className="size-3" />
+            </Button>
+          </span>
         ) : null}
       </div>
     );
@@ -91,8 +92,6 @@ export function DiffCommentAnnotation({
       <Textarea
         ref={textareaRef}
         autoFocus={focusOnMount}
-        unstyled
-        className="relative inline-flex w-full rounded-md border border-border/50 bg-background/20 font-sans text-foreground transition-colors focus-within:border-border/70 [&_[data-slot=textarea]]:min-h-12 [&_[data-slot=textarea]]:cursor-text [&_[data-slot=textarea]]:caret-foreground [&_[data-slot=textarea]]:px-2.5 [&_[data-slot=textarea]]:py-1.5 [&_[data-slot=textarea]]:font-sans [&_[data-slot=textarea]]:text-xs [&_[data-slot=textarea]]:leading-5 max-sm:[&_[data-slot=textarea]]:min-h-12"
         size="sm"
         value={displayedText}
         placeholder={placeholder}
@@ -114,13 +113,8 @@ export function DiffCommentAnnotation({
         }}
       />
       <div className="mt-1.5 flex items-center gap-1">
-        <span className="mr-auto text-[10px] text-muted-foreground/70">⌘/Ctrl Enter to send</span>
-        <Button
-          className="text-muted-foreground hover:text-foreground"
-          variant="ghost"
-          size="xs"
-          onClick={onCancel}
-        >
+        <span className="mr-auto text-3xs text-muted-foreground/70">⌘/Ctrl Enter to send</span>
+        <Button variant="ghost-muted" size="xs" onClick={onCancel}>
           Cancel
         </Button>
         {secondaryAction ? (
diff --git a/apps/web/src/components/diffs/DiffFileLoadingBoundary.tsx b/apps/web/src/components/diffs/DiffFileLoadingBoundary.tsx
index 0ce87e142e2e..6bf4302fbcc1 100644
--- a/apps/web/src/components/diffs/DiffFileLoadingBoundary.tsx
+++ b/apps/web/src/components/diffs/DiffFileLoadingBoundary.tsx
@@ -19,7 +19,7 @@ export function DiffFileLoadingBoundary({ load, count }: { load: () => void; cou
     <div ref={ref} role="status" aria-label="Loading diff…">
       {Array.from({ length: Math.min(count, 4) }, (_, index) => (
         <div key={index} aria-hidden className="border-b border-border/40">
-          <DiffFileHeaderSkeleton titleClassName="w-1/2 max-w-64" />
+          <DiffFileHeaderSkeleton titleWidth="medium" />
         </div>
       ))}
     </div>
diff --git a/apps/web/src/components/files/FileBreadcrumbs.tsx b/apps/web/src/components/files/FileBreadcrumbs.tsx
index 3021ff0fab6d..a98b4dca69d2 100644
--- a/apps/web/src/components/files/FileBreadcrumbs.tsx
+++ b/apps/web/src/components/files/FileBreadcrumbs.tsx
@@ -10,6 +10,8 @@ import {
   MenuGroup,
   MenuItem,
   MenuPopup,
+  MenuRadioGroup,
+  MenuRadioItem,
   MenuSeparator,
   MenuTrigger,
 } from "~/components/ui/menu";
@@ -59,9 +61,7 @@ function BreadcrumbLabel(props: {
       >
         {props.label}
       </TooltipTrigger>
-      <TooltipPopup side="top" className="max-w-80">
-        {props.pathLabel}
-      </TooltipPopup>
+      <TooltipPopup side="top">{props.pathLabel}</TooltipPopup>
     </Tooltip>
   );
 }
@@ -104,7 +104,6 @@ function BreadcrumbMenuContent(props: {
     <MenuPopup
       align="start"
       side="bottom"
-      className="w-max min-w-32 max-w-[min(19rem,var(--available-width))]"
       onKeyDown={(event) => {
         if (event.key !== "ArrowLeft" || !canGoBack || parentPath === null) return;
         event.preventDefault();
@@ -141,39 +140,58 @@ function BreadcrumbMenuContent(props: {
               : "This folder is empty."}
           </MenuItem>
         ) : (
-          children.map((entry) => {
-            const isCurrentFile = entry.kind === "file" && entry.path === props.currentFilePath;
-            return (
-              <MenuItem
-                key={entry.path}
-                closeOnClick={entry.kind === "file"}
-                aria-current={isCurrentFile ? "page" : undefined}
-                className={cn(
-                  isCurrentFile && "bg-foreground/[0.08]",
-                  entry.ignored && "text-muted-foreground",
-                )}
-                onClick={() => {
-                  if (entry.kind === "directory") {
-                    props.onDirectoryChange(entry.path);
-                    return;
-                  }
-                  props.onOpenChange(false);
-                  props.onOpenFile(entry.path);
-                }}
-              >
-                <PierreEntryIcon pathValue={entry.path} kind={entry.kind} theme={resolvedTheme} />
-                <Tooltip>
-                  <TooltipTrigger render={<span className="min-w-0 flex-1 truncate" />}>
-                    {entry.label}
-                  </TooltipTrigger>
-                  <TooltipPopup side="right" className="max-w-80">
-                    {entry.path}
-                  </TooltipPopup>
-                </Tooltip>
-                {entry.kind === "directory" ? <ChevronRightIcon /> : null}
-              </MenuItem>
-            );
-          })
+          // Files form a radio group keyed by path so the open file is marked as checked;
+          // directories only navigate the menu, so they stay plain items.
+          <MenuRadioGroup
+            value={props.currentFilePath}
+            onValueChange={(path) => {
+              props.onOpenChange(false);
+              props.onOpenFile(path);
+            }}
+          >
+            {children.map((entry) => {
+              const isCurrentFile = entry.kind === "file" && entry.path === props.currentFilePath;
+              const row = (
+                <>
+                  <PierreEntryIcon pathValue={entry.path} kind={entry.kind} theme={resolvedTheme} />
+                  <Tooltip>
+                    <TooltipTrigger
+                      render={
+                        <span
+                          className={cn(
+                            "min-w-0 flex-1 truncate",
+                            entry.ignored && "text-muted-foreground",
+                          )}
+                        />
+                      }
+                    >
+                      {entry.label}
+                    </TooltipTrigger>
+                    <TooltipPopup side="right">{entry.path}</TooltipPopup>
+                  </Tooltip>
+                </>
+              );
+              return entry.kind === "directory" ? (
+                <MenuItem
+                  key={entry.path}
+                  closeOnClick={false}
+                  onClick={() => props.onDirectoryChange(entry.path)}
+                >
+                  {row}
+                  <ChevronRightIcon />
+                </MenuItem>
+              ) : (
+                <MenuRadioItem
+                  key={entry.path}
+                  value={entry.path}
+                  closeOnClick
+                  aria-current={isCurrentFile ? "page" : undefined}
+                >
+                  <span className="flex min-w-0 items-center gap-2">{row}</span>
+                </MenuRadioItem>
+              );
+            })}
+          </MenuRadioGroup>
         )}
       </MenuGroup>
       {entriesQuery.error && entriesQuery.data !== null ? (
@@ -227,9 +245,7 @@ function DirectoryBreadcrumb(props: FileBreadcrumbsProps & { readonly crumb: Fil
         >
           <span className="block truncate">{props.crumb.label}</span>
         </TooltipTrigger>
-        <TooltipPopup side="top" className="max-w-80">
-          {props.crumb.path || props.projectName}
-        </TooltipPopup>
+        <TooltipPopup side="top">{props.crumb.path || props.projectName}</TooltipPopup>
       </Tooltip>
       {open ? (
         <BreadcrumbMenuContent
diff --git a/apps/web/src/components/files/FilePreviewPanel.test.ts b/apps/web/src/components/files/FilePreviewPanel.test.ts
index 5ef590847c4b..ebebf510994b 100644
--- a/apps/web/src/components/files/FilePreviewPanel.test.ts
+++ b/apps/web/src/components/files/FilePreviewPanel.test.ts
@@ -7,6 +7,7 @@ import {
 } from "./fileCommentAnnotations";
 import {
   isMarkdownPreviewFile,
+  resolveFilePreviewPath,
   setMarkdownTaskChecked,
   shouldShowFileExplorer,
 } from "./filePreviewMode";
@@ -120,3 +121,24 @@ describe("setMarkdownTaskChecked", () => {
     expect(setMarkdownTaskChecked(markdown, 200, true)).toBe(markdown);
   });
 });
+
+describe("resolveFilePreviewPath", () => {
+  it.each([
+    ["/repo/project", null],
+    ["/repo/project/", null],
+    [".", null],
+    [null, null],
+    ["/repo/project/src", "/repo/project/src"],
+    ["/repo/project/src/main.ts", "/repo/project/src/main.ts"],
+    ["src/main.ts", "src/main.ts"],
+    ["/repo/project-other", "/repo/project-other"],
+  ])("opens %s in the appropriate workspace surface", (path, expected) => {
+    const relativePath = resolveFilePreviewPath(path, "/repo/project");
+    expect(relativePath).toBe(expected);
+    if (expected === null) {
+      expect(
+        shouldShowFileExplorer({ relativePath, explorerOpen: false, attachmentOpen: false }),
+      ).toBe(true);
+    }
+  });
+});
diff --git a/apps/web/src/components/files/FilePreviewPanel.tsx b/apps/web/src/components/files/FilePreviewPanel.tsx
index 26c9f0d38bd9..112d381c75a8 100644
--- a/apps/web/src/components/files/FilePreviewPanel.tsx
+++ b/apps/web/src/components/files/FilePreviewPanel.tsx
@@ -83,6 +83,7 @@ import { DiffCommentAnnotation } from "../diffs/DiffCommentAnnotation";
 import { projectFileCacheKey, projectFileEditorCacheKey } from "./fileContentRevision";
 import {
   isMarkdownPreviewFile,
+  resolveFilePreviewPath,
   setMarkdownTaskChecked,
   shouldShowFileExplorer,
 } from "./filePreviewMode";
@@ -911,7 +912,7 @@ export default function FilePreviewPanel({
   environmentId,
   cwd,
   projectName,
-  relativePath,
+  relativePath: requestedPath,
   attachment,
   threadRef,
   composerDraftTarget,
@@ -927,6 +928,8 @@ export default function FilePreviewPanel({
   selectedFilePending,
   workspaceMutationId,
 }: FilePreviewPanelProps) {
+  const relativePath =
+    attachment === undefined ? resolveFilePreviewPath(requestedPath, cwd) : requestedPath;
   const { resolvedTheme } = useTheme();
   const wordWrap = useClientSettings((settings) => settings.wordWrap);
   const primaryEnvironmentId = usePrimaryEnvironmentId();
@@ -952,7 +955,12 @@ export default function FilePreviewPanel({
   // shown. The read still runs: a folder named `assets.png` is only knowable as a
   // folder from the read failure, and the server stats before reading, so a folder
   // costs an open and a stat and returns no body.
-  const file = useProjectFileQuery(environmentId, cwd, relativePath, attachment === undefined);
+  const file = useProjectFileQuery(
+    environmentId,
+    cwd,
+    relativePath,
+    attachment === undefined && relativePath !== null,
+  );
   // A chat link cannot tell a folder from a file, so a folder arrives here as
   // a file surface and the read fails. Keep the breadcrumbs, drop the preview
   // pane, and let the tree fill the surface with the folder revealed. Mutation
@@ -1103,10 +1111,11 @@ export default function FilePreviewPanel({
       {relativePath && attachment === undefined ? (
         <div className={FILE_SURFACE_SUBHEADER_CLASS} data-surface-subheader>
           <ScrollArea
+            radius="none"
             ref={breadcrumbRef}
             hideScrollbars
             scrollFade
-            className="min-w-0 flex-1 rounded-none"
+            className="min-w-0 flex-1"
             data-file-breadcrumbs
           >
             <div className="flex h-full w-max min-w-full items-center text-xs">
@@ -1184,7 +1193,7 @@ export default function FilePreviewPanel({
       !isMedia &&
       !renderBrowserFile &&
       file.data?.truncated ? (
-        <div className="shrink-0 border-b border-warning/20 bg-warning-surface px-3 py-1.5 text-[11px] text-warning-foreground">
+        <div className="shrink-0 border-b border-warning/20 bg-warning-surface px-3 py-1.5 text-2xs text-warning-foreground">
           Preview limited to the first 1 MB of a {file.data.byteLength.toLocaleString()} byte file.
         </div>
       ) : null}
diff --git a/apps/web/src/components/files/ProjectFilePicker.tsx b/apps/web/src/components/files/ProjectFilePicker.tsx
index a59e8dd77e47..38d21f6c1005 100644
--- a/apps/web/src/components/files/ProjectFilePicker.tsx
+++ b/apps/web/src/components/files/ProjectFilePicker.tsx
@@ -130,7 +130,7 @@ function OpenProjectFilePicker(props: ProjectFilePickerProps & { target: ActiveP
         setHighlightedItemValue(null);
         setQuery(value);
       }}
-      panelClassName="max-h-[min(34rem,76vh)]"
+      panelSize="tall-list"
       testId="project-file-picker"
       value={query}
     >
diff --git a/apps/web/src/components/files/filePreviewMode.ts b/apps/web/src/components/files/filePreviewMode.ts
index 9770d36fa2c3..12a3eb95a3e8 100644
--- a/apps/web/src/components/files/filePreviewMode.ts
+++ b/apps/web/src/components/files/filePreviewMode.ts
@@ -1,5 +1,12 @@
+import { workspaceRelativeFilePath } from "@t3tools/client-runtime/markdown-links";
 import { isAbsolutePath } from "~/terminal-links";
 
+/** Resolve workspace links before choosing between the explorer and a file preview. */
+export function resolveFilePreviewPath(path: string | null, cwd: string): string | null {
+  if (path === null) return null;
+  return path === "." || workspaceRelativeFilePath(path, cwd) === "." ? null : path;
+}
+
 export const isMarkdownPreviewFile = (path: string): boolean => /\.(?:md|mdx)$/i.test(path);
 
 export function shouldShowFileExplorer(input: {
diff --git a/apps/web/src/components/files/fileSurfaceChrome.tsx b/apps/web/src/components/files/fileSurfaceChrome.tsx
index 4425ba6cd5e8..184c5626e90f 100644
--- a/apps/web/src/components/files/fileSurfaceChrome.tsx
+++ b/apps/web/src/components/files/fileSurfaceChrome.tsx
@@ -29,8 +29,11 @@ export const FILE_LINK_REVEAL_UNSAFE_CSS = `
     color: var(--code-foreground, var(--foreground)) !important;
   }
 
+  /* Tint through --diffs-line-bg, not background-color. The editor paints row
+     tints on a layer below its text selection; a background on the row itself
+     covers the selection and makes selected text on this line invisible. */
   [${FILE_LINK_REVEAL_ATTRIBUTE}][data-line] {
-    background-color: light-dark(
+    --diffs-line-bg: light-dark(
       color-mix(
         in lab,
         var(--diffs-computed-diff-line-bg) 82%,
@@ -114,7 +117,7 @@ export function FileSurfaceNotice(props: { readonly children: ReactNode }) {
   return (
     <div
       role="status"
-      className="shrink-0 border-b border-warning/20 bg-warning-surface px-3 py-1.5 text-[11px] text-warning-foreground"
+      className="shrink-0 border-b border-warning/20 bg-warning-surface px-3 py-1.5 text-2xs text-warning-foreground"
     >
       {props.children}
     </div>
diff --git a/apps/web/src/components/media/MediaActions.tsx b/apps/web/src/components/media/MediaActions.tsx
index d6c5cca70153..d4e96c5445b4 100644
--- a/apps/web/src/components/media/MediaActions.tsx
+++ b/apps/web/src/components/media/MediaActions.tsx
@@ -186,9 +186,7 @@ export function MediaActions({
           void showMenu({ x: bounds.left, y: bounds.bottom });
         }}
       />
-      <TooltipPopup className="max-w-[min(40rem,calc(100vw-2rem))] break-all font-mono text-[11px] leading-tight">
-        {tooltip}
-      </TooltipPopup>
+      <TooltipPopup variant="code">{tooltip}</TooltipPopup>
     </Tooltip>
   );
 }
diff --git a/apps/web/src/components/onboarding/WelcomeWizard.test.tsx b/apps/web/src/components/onboarding/WelcomeWizard.test.tsx
new file mode 100644
index 000000000000..b36a8e815238
--- /dev/null
+++ b/apps/web/src/components/onboarding/WelcomeWizard.test.tsx
@@ -0,0 +1,214 @@
+// @vitest-environment jsdom
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { EnvironmentId, ProjectId } from "@t3tools/contracts";
+import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
+
+const mocks = vi.hoisted(() => ({
+  importThreads: vi.fn(),
+  createProject: vi.fn(),
+  complete: vi.fn(),
+  refresh: vi.fn(),
+  toast: vi.fn(),
+  projects: [] as Array<{ id: string; environmentId: string; workspaceRoot: string }>,
+}));
+vi.mock("../../state/agentSessions", () => ({ agentSessionImport: "import" }));
+vi.mock("../../state/projects", () => ({ projectEnvironment: { create: "create" } }));
+vi.mock("../../state/use-atom-command", () => ({
+  useAtomCommand: (command: string) =>
+    command === "import"
+      ? mocks.importThreads
+      : command === "create"
+        ? mocks.createProject
+        : mocks.refresh,
+}));
+vi.mock("../../onboarding/firstRun", () => ({ useCompleteOnboarding: () => mocks.complete }));
+vi.mock("../../state/entities", () => ({
+  useProjects: () => mocks.projects,
+  readProjects: () => mocks.projects,
+}));
+vi.mock("../../state/environments", () => {
+  const environment = {
+    environmentId: "test-env",
+    label: "Computer",
+    connection: { phase: "connected" },
+  };
+  return {
+    useEnvironments: () => ({ environments: [environment] }),
+    usePrimaryEnvironment: () => environment,
+  };
+});
+vi.mock("../../state/server", () => ({
+  serverEnvironment: {
+    providersValueAtom: () => [],
+    configValueAtom: () => null,
+    refreshProviders: "refresh",
+  },
+}));
+vi.mock("@effect/atom-react", () => ({ useAtomValue: (value: unknown) => value }));
+vi.mock("../../onboarding/useProjectScans", () => ({
+  useProjectScans: () => [
+    {
+      environmentId: "test-env",
+      isPending: false,
+      error: null,
+      refresh: mocks.refresh,
+      data: {
+        truncated: false,
+        candidates: [
+          {
+            path: "/project",
+            title: "project",
+            projectId: "test-project",
+            threadCount: 29,
+            lastActiveAt: new Date().toISOString(),
+            sources: ["codex"],
+          },
+        ],
+      },
+    },
+  ],
+}));
+vi.mock("../../connection/onboarding", () => ({ connectPairing: vi.fn() }));
+vi.mock("../../state/terminal", () => ({ terminalEnvironment: {} }));
+vi.mock("../clerk/useT3ConnectAuthPrompt", () => ({ useT3ConnectAuthPrompt: vi.fn() }));
+vi.mock("../../cloud/publicConfig", () => ({ hasCloudPublicConfig: () => false }));
+vi.mock("../ThreadTerminalDrawer", () => ({ TerminalViewport: () => null }));
+vi.mock("../settings/ChatGptWelcomeCoordinator", () => ({ ChatGptWelcomeCoordinator: () => null }));
+vi.mock("../settings/CodexSetupSection", () => ({
+  CodexSetupSection: () => null,
+  AddManagedCodexAccountDialog: () => null,
+}));
+vi.mock("../cloud/CloudEnvironmentConnectList", () => ({
+  CloudEnvironmentConnectRows: () => null,
+}));
+vi.mock("../ui/toast", () => ({
+  toastManager: { add: mocks.toast, close: vi.fn(), update: vi.fn() },
+}));
+
+import { WelcomeWizard } from "./WelcomeWizard";
+
+let root: Root;
+let container: HTMLDivElement;
+
+beforeEach(() => {
+  vi.clearAllMocks();
+  vi.stubGlobal(
+    "ResizeObserver",
+    class {
+      observe() {}
+      unobserve() {}
+      disconnect() {}
+    },
+  );
+  Object.defineProperty(Element.prototype, "getAnimations", {
+    configurable: true,
+    value: () => [],
+  });
+  mocks.projects = [{ id: "test-project", environmentId: "test-env", workspaceRoot: "/project" }];
+  mocks.complete.mockResolvedValue(undefined);
+  mocks.refresh.mockResolvedValue(undefined);
+  mocks.importThreads.mockResolvedValue({
+    _tag: "Success",
+    value: { importedCount: 28, skippedCount: 1 },
+  });
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  container = document.createElement("div");
+  document.body.append(container);
+  root = createRoot(container);
+});
+afterEach(async () => {
+  await act(async () => root.unmount());
+  container.remove();
+});
+
+async function click(label: string) {
+  const button = [...document.querySelectorAll("button")].find(
+    (element) => element.textContent?.trim() === label,
+  );
+  expect(button, `button ${label}`).toBeDefined();
+  await act(async () => button!.click());
+}
+
+it("enters the workspace after a partial import and warns after navigation finishes", async () => {
+  let finishNavigation = () => {};
+  const navigation = new Promise<void>((resolve) => {
+    finishNavigation = resolve;
+  });
+  const onDone = vi.fn(() => navigation);
+  await act(async () => root.render(<WelcomeWizard localAvailable onDone={onDone} />));
+  await click("Continue");
+  await click("Continue");
+  await click("Import 1 project");
+  expect(onDone).toHaveBeenCalledWith({
+    environmentId: EnvironmentId.make("test-env"),
+    projectId: ProjectId.make("test-project"),
+  });
+  expect(mocks.toast).not.toHaveBeenCalled();
+  await act(async () => finishNavigation());
+  expect(mocks.toast).toHaveBeenCalledWith(
+    expect.objectContaining({
+      type: "warning",
+      description: "Imported 28 threads. 1 thread could not be imported.",
+    }),
+  );
+  expect(mocks.toast.mock.invocationCallOrder[0]).toBeGreaterThan(
+    onDone.mock.invocationCallOrder[0]!,
+  );
+});
+
+it.each([
+  [0, 0, null],
+  [29, 0, null],
+  [1, 0, null],
+  [0, 1, "1 thread could not be imported."],
+  [0, 2, "2 threads could not be imported."],
+] as const)(
+  "finishes setup with %i imported and %i skipped threads",
+  async (importedCount, skippedCount, warning) => {
+    mocks.importThreads.mockResolvedValue({
+      _tag: "Success",
+      value: { importedCount, skippedCount },
+    });
+    const onDone = vi.fn();
+    await act(async () => root.render(<WelcomeWizard localAvailable onDone={onDone} />));
+    await click("Continue");
+    await click("Continue");
+    await click("Import 1 project");
+    expect(onDone).toHaveBeenCalledOnce();
+    if (warning === null && importedCount > 0) {
+      expect(mocks.toast).toHaveBeenCalledWith({
+        type: "success",
+        title: `Imported ${importedCount} ${importedCount === 1 ? "thread" : "threads"}`,
+      });
+    } else if (warning === null) {
+      expect(mocks.toast).not.toHaveBeenCalled();
+    } else {
+      expect(mocks.toast).toHaveBeenCalledWith(
+        expect.objectContaining({ type: "warning", description: warning }),
+      );
+    }
+  },
+);
+
+it("keeps setup open when saving completion fails and preserves the import warning on retry", async () => {
+  mocks.complete.mockRejectedValueOnce(new Error("settings unavailable"));
+  const onDone = vi.fn();
+  await act(async () => root.render(<WelcomeWizard localAvailable onDone={onDone} />));
+  await click("Continue");
+  await click("Continue");
+  await click("Import 1 project");
+  expect(onDone).not.toHaveBeenCalled();
+  expect(mocks.toast).toHaveBeenCalledWith(
+    expect.objectContaining({ type: "error", title: "Could not finish setup" }),
+  );
+  await click("Do not import projects");
+  expect(onDone).toHaveBeenCalledOnce();
+  expect(mocks.importThreads).toHaveBeenCalledOnce();
+  expect(mocks.toast).toHaveBeenLastCalledWith(
+    expect.objectContaining({
+      type: "warning",
+      description: "Imported 28 threads. 1 thread could not be imported.",
+    }),
+  );
+});
diff --git a/apps/web/src/components/onboarding/WelcomeWizard.tsx b/apps/web/src/components/onboarding/WelcomeWizard.tsx
index 7e8dea7f2dea..124566efa39d 100644
--- a/apps/web/src/components/onboarding/WelcomeWizard.tsx
+++ b/apps/web/src/components/onboarding/WelcomeWizard.tsx
@@ -4,6 +4,7 @@ import type {
   AgentSessionProjectCandidate,
   EnvironmentId,
   ProjectId,
+  ProviderInstanceId,
   ScopedProjectRef,
   ServerConfig,
   ServerProvider,
@@ -13,7 +14,12 @@ import {
   isAtomCommandInterrupted,
   squashAtomCommandFailure,
 } from "@t3tools/client-runtime/state/runtime";
-import { CommandId, ProviderDriverKind, ThreadId } from "@t3tools/contracts";
+import {
+  CommandId,
+  defaultInstanceIdForDriver,
+  ProviderDriverKind,
+  ThreadId,
+} from "@t3tools/contracts";
 import * as Schema from "effect/Schema";
 import {
   ArrowRightIcon,
@@ -60,6 +66,10 @@ import { useAtomCommand } from "../../state/use-atom-command";
 import { connectPairing } from "../../connection/onboarding";
 import { getProviderSummary } from "../settings/providerStatus";
 import { getDriverOption } from "../settings/providerDriverMeta";
+import { ChatGptWelcomeCoordinator } from "../settings/ChatGptWelcomeCoordinator";
+import { AddManagedCodexAccountDialog, CodexSetupSection } from "../settings/CodexSetupSection";
+import { readCodexSetupMode } from "../settings/CodexSetupSection.logic";
+import { buildProviderInstanceUpdatePatch } from "../settings/SettingsPanels.logic";
 import { TerminalViewport } from "../ThreadTerminalDrawer";
 import { CloudEnvironmentConnectRows } from "../cloud/CloudEnvironmentConnectList";
 import { ClaudeAI, OpenAI } from "../Icons";
@@ -81,7 +91,7 @@ import { formatRelativeTime } from "../../timestampFormat";
  * First-run welcome wizard. Rendered over the workspace at `/welcome` on a
  * fresh install (no completed-onboarding flag, empty workspace). Flow per the
  * onboarding overhaul spec: connection choice → sign-in/pair (remote paths) →
- * agent setup with inline install terminal → project import → main screen.
+ * managed Codex setup or an inline CLI terminal → project import → main screen.
  * Every step past the connection gate is skippable; the whole wizard is
  * re-runnable by clearing the flag.
  */
@@ -96,17 +106,21 @@ const SCAN_LIMIT_MESSAGE = "Scan limit reached. Some projects or conversations m
 export function WelcomeWizard({
   localAvailable,
   onDone,
+  resumeEnvironmentId,
 }: {
   /** Whether this client is authenticated to the server serving the app. */
   readonly localAvailable: boolean;
-  readonly onDone: (projectRef?: ScopedProjectRef) => void;
+  readonly resumeEnvironmentId?: EnvironmentId | undefined;
+  readonly onDone: (projectRef?: ScopedProjectRef) => void | Promise<void>;
 }) {
   const completeOnboarding = useCompleteOnboarding();
-  const [step, setStep] = useState<WizardStep>("connection");
+  const [step, setStep] = useState<WizardStep>(resumeEnvironmentId ? "agents" : "connection");
   const { environments } = useEnvironments();
   const [selection, setSelection] = useState<ReadonlySet<EnvironmentId> | null>(null);
   const autoSelectedComputers = useRef(new Set<EnvironmentId>());
-  const [setupIds, setSetupIds] = useState<readonly EnvironmentId[]>([]);
+  const [setupIds, setSetupIds] = useState<readonly EnvironmentId[]>(
+    resumeEnvironmentId ? [resumeEnvironmentId] : [],
+  );
   const [isImporting, setIsImporting] = useState(false);
   const finishingPromiseRef = useRef<Promise<boolean> | null>(null);
   const completionErrorToastIdRef = useRef<ReturnType<typeof toastManager.add> | null>(null);
@@ -141,7 +155,7 @@ export function WelcomeWizard({
   };
   const stageIndex = step === "agents" ? 1 : step === "import" ? 2 : 0;
   const finish = useCallback(
-    (projectRef?: ScopedProjectRef) => {
+    (projectRef?: ScopedProjectRef, importWarning?: string, importedThreadCount = 0) => {
       if (finishingPromiseRef.current !== null) return finishingPromiseRef.current;
       if (completionErrorToastIdRef.current !== null) {
         toastManager.close(completionErrorToastIdRef.current);
@@ -149,12 +163,25 @@ export function WelcomeWizard({
       }
 
       const completion = completeOnboarding()
-        .then(() => {
+        .then(async () => {
           if (completionErrorToastIdRef.current !== null) {
             toastManager.close(completionErrorToastIdRef.current);
             completionErrorToastIdRef.current = null;
           }
-          onDone(projectRef);
+          await onDone(projectRef);
+          if (importWarning) {
+            toastManager.add({
+              type: "warning",
+              title: "Some history was not imported",
+              description: importWarning,
+              timeout: 0,
+            });
+          } else if (importedThreadCount > 0) {
+            toastManager.add({
+              type: "success",
+              title: `Imported ${importedThreadCount} ${importedThreadCount === 1 ? "thread" : "threads"}`,
+            });
+          }
           return true;
         })
         .catch(() => {
@@ -184,6 +211,7 @@ export function WelcomeWizard({
   return (
     <Dialog open disablePointerDismissal onOpenChange={(_, event) => event.cancel()}>
       <WizardPopup
+        size="wide"
         bottomStickOnMobile={false}
         showCloseButton={false}
         initialFocus={() => document.getElementById("onboarding-pairing-url") ?? true}
@@ -193,7 +221,7 @@ export function WelcomeWizard({
           identity={
             <div className="flex items-baseline gap-1.5" role="img" aria-label="T3 Code">
               <T3Wordmark className="h-4 w-auto shrink-0" aria-hidden />
-              <span className="text-[1.4rem] font-medium tracking-tight text-muted-foreground">
+              <span className="text-2xl font-medium tracking-tight text-muted-foreground">
                 Code
               </span>
             </div>
@@ -248,6 +276,7 @@ export function WelcomeWizard({
           )}
         </WizardPanel>
       </WizardPopup>
+      <ChatGptWelcomeCoordinator />
     </Dialog>
   );
 }
@@ -350,40 +379,39 @@ function ConnectionStep({
             onToggleEnvironment={onToggleEnvironment}
           />
         ) : null}
-        <Collapsible
-          open={pairingOpen}
-          onOpenChange={setPairingOpen}
-          className="rounded-lg border border-border bg-background"
-        >
-          <CollapsibleTrigger
-            disabled={isPairing}
-            render={
-              <Button
-                variant="ghost"
-                className="h-auto min-h-14 w-full justify-start gap-3 px-3 py-3 text-left whitespace-normal sm:h-auto"
-              />
-            }
-          >
-            <LinkIcon className="size-4 text-muted-foreground" />
-            <span className="flex-1">Add a computer</span>
-            <ChevronRightIcon
-              className={cn("size-4 text-muted-foreground", pairingOpen && "rotate-90")}
-            />
-          </CollapsibleTrigger>
-          <CollapsiblePanel>
-            <div className="px-3 pb-3">
-              <PairingForm
-                isPairing={isPairing}
-                setIsPairing={setIsPairing}
-                onPaired={(environmentId) => {
-                  setPairingOpen(false);
-                  onPaired(environmentId);
-                  requestAnimationFrame(() => continueRef.current?.focus());
-                }}
+        <div className="rounded-lg border border-border bg-background">
+          <Collapsible open={pairingOpen} onOpenChange={setPairingOpen}>
+            <CollapsibleTrigger
+              disabled={isPairing}
+              render={
+                <Button
+                  variant="ghost"
+                  size="sm-multiline"
+                  className="min-h-14 w-full justify-start"
+                />
+              }
+            >
+              <LinkIcon className="size-4 text-muted-foreground" />
+              <span className="flex-1 text-left">Add a computer</span>
+              <ChevronRightIcon
+                className={cn("size-4 text-muted-foreground", pairingOpen && "rotate-90")}
               />
-            </div>
-          </CollapsiblePanel>
-        </Collapsible>
+            </CollapsibleTrigger>
+            <CollapsiblePanel>
+              <div className="px-3 pb-3">
+                <PairingForm
+                  isPairing={isPairing}
+                  setIsPairing={setIsPairing}
+                  onPaired={(environmentId) => {
+                    setPairingOpen(false);
+                    onPaired(environmentId);
+                    requestAnimationFrame(() => continueRef.current?.focus());
+                  }}
+                />
+              </div>
+            </CollapsiblePanel>
+          </Collapsible>
+        </div>
       </div>
       <div className="mt-6 flex items-center justify-end gap-3">
         <Button
@@ -419,69 +447,64 @@ function ConnectAccountOption({
   const onDiscoveryReady = useCallback(() => setDiscoveryReady(true), []);
 
   return (
-    <Collapsible
-      open={expanded && !!isSignedIn && discoveryReady}
-      onOpenChange={setExpanded}
-      className="rounded-lg border border-border bg-background"
-    >
-      <CollapsibleTrigger
-        disabled={disabled || !isLoaded}
-        onClick={(event) => {
-          if (!isSignedIn) {
-            event.preventDefault();
-            setExpanded(true);
-            openAuthPrompt();
+    <div className="rounded-lg border border-border bg-background">
+      <Collapsible open={expanded && !!isSignedIn && discoveryReady} onOpenChange={setExpanded}>
+        <CollapsibleTrigger
+          disabled={disabled || !isLoaded}
+          onClick={(event) => {
+            if (!isSignedIn) {
+              event.preventDefault();
+              setExpanded(true);
+              openAuthPrompt();
+            }
+          }}
+          render={
+            <Button variant="ghost" size="sm-multiline" className="min-h-14 w-full justify-start" />
           }
-        }}
-        render={
-          <Button
-            variant="ghost"
-            className="h-auto min-h-14 w-full justify-start gap-3 px-3 py-3 text-left whitespace-normal sm:h-auto"
+        >
+          <CloudIcon className="size-4 text-muted-foreground" />
+          <span className="flex-1 text-left">T3 Connect</span>
+          <span className="text-xs text-muted-foreground">
+            {!isLoaded
+              ? "Loading sign-in…"
+              : !isSignedIn
+                ? "Sign in"
+                : !discoveryReady
+                  ? "Loading computers…"
+                  : null}
+          </span>
+          <ChevronRightIcon
+            className={cn("size-4 text-muted-foreground", expanded && isSignedIn && "rotate-90")}
           />
-        }
-      >
-        <CloudIcon className="size-4 text-muted-foreground" />
-        <span className="flex-1">T3 Connect</span>
-        <span className="text-xs text-muted-foreground">
-          {!isLoaded
-            ? "Loading sign-in…"
-            : !isSignedIn
-              ? "Sign in"
-              : !discoveryReady
-                ? "Loading computers…"
-                : null}
-        </span>
-        <ChevronRightIcon
-          className={cn("size-4 text-muted-foreground", expanded && isSignedIn && "rotate-90")}
-        />
-      </CollapsibleTrigger>
-      <CollapsiblePanel keepMounted>
-        <div className="px-3 pb-3">
-          <div className="mb-3 space-y-1.5">
-            {isSignedIn ? (
-              <CloudEnvironmentConnectRows
-                primaryEnvironmentId={null}
-                savedEnvironments={environments}
-                showSavedEnvironments
-                onDiscoveryReady={onDiscoveryReady}
-                selection={{ selectedIds, onChange: onToggleEnvironment, autoSelectedComputers }}
-                refreshWhileEmpty
-                empty={
-                  <p className="py-3 text-sm text-muted-foreground">No computers linked yet.</p>
-                }
-              />
-            ) : null}
+        </CollapsibleTrigger>
+        <CollapsiblePanel keepMounted>
+          <div className="px-3 pb-3">
+            <div className="mb-3 space-y-1.5">
+              {isSignedIn ? (
+                <CloudEnvironmentConnectRows
+                  primaryEnvironmentId={null}
+                  savedEnvironments={environments}
+                  showSavedEnvironments
+                  onDiscoveryReady={onDiscoveryReady}
+                  selection={{ selectedIds, onChange: onToggleEnvironment, autoSelectedComputers }}
+                  refreshWhileEmpty
+                  empty={
+                    <p className="py-3 text-sm text-muted-foreground">No computers linked yet.</p>
+                  }
+                />
+              ) : null}
+            </div>
+            <p className="text-sm text-muted-foreground">
+              Run this on each computer you want to connect.
+            </p>
+            <CommandBlock command="npx t3 connect" className="mt-3" />
+            <p className="mt-3 text-xs text-muted-foreground">
+              Keep T3 Code running. Select the computers you want to set up above.
+            </p>
           </div>
-          <p className="text-sm text-muted-foreground">
-            Run this on each computer you want to connect.
-          </p>
-          <CommandBlock command="npx t3 connect" className="mt-3" />
-          <p className="mt-3 text-xs text-muted-foreground">
-            Keep T3 Code running. Select the computers you want to set up above.
-          </p>
-        </div>
-      </CollapsiblePanel>
-    </Collapsible>
+        </CollapsiblePanel>
+      </Collapsible>
+    </div>
   );
 }
 
@@ -588,8 +611,8 @@ function PairingForm({
               {isPairing ? "Pairing..." : "Pair"}
             </Button>
           </div>
-          <CollapsiblePanel className="pt-3">
-            <p className="text-sm text-muted-foreground">
+          <CollapsiblePanel>
+            <p className="pt-3 text-sm text-muted-foreground">
               Run this on the computer with your code.
             </p>
             <CommandBlock command="npx t3 pair" className="mt-2" />
@@ -606,7 +629,7 @@ function PairingForm({
 
 // ── Step 3: agents ───────────────────────────────────────────
 
-const PRIMARY_AGENT_DRIVERS = ["claudeAgent", "codex"] as const;
+const PRIMARY_AGENT_DRIVERS = ["codex", "claudeAgent"] as const;
 type OnboardingAgentDriver = (typeof PRIMARY_AGENT_DRIVERS)[number];
 
 /** Setup values stay fixed while provider probes refresh the surrounding cards. */
@@ -619,13 +642,7 @@ interface AgentTerminalSession {
   readonly keybindings: ServerConfig["keybindings"];
 }
 
-/**
- * Claude Code and Codex use live probe status. Install opens the built-in
- * terminal inline with the vendor's standalone installer pre-typed. The update
- * RPC can't install a binary that isn't there yet (it infers the installer from
- * the installed binary's path), and the terminal also handles the interactive
- * login that follows.
- */
+/** Codex uses managed setup; existing CLI installs retain the terminal path. */
 function AgentsStep({
   environmentIds,
   onContinue,
@@ -635,11 +652,11 @@ function AgentsStep({
 }) {
   const { environments } = useEnvironments();
   return (
-    <StepShell title="Your agents" description="Agents available on your selected computers.">
-      <ScrollArea
-        scrollFade
-        className="mt-5 h-auto max-h-96 [&_[data-slot=scroll-area-scrollbar]]:opacity-100"
-      >
+    <StepShell
+      title="Connect your agents"
+      description="Choose an agent to start coding. You can add more later."
+    >
+      <ScrollArea scrollFade className="mt-5 h-auto max-h-[min(32rem,55dvh)]">
         <div className="space-y-5 pr-3">
           {environmentIds.map((environmentId) => (
             <ConnectedAgentsStep
@@ -676,6 +693,12 @@ function ConnectedAgentsStep({
   });
   const serverConfig = useAtomValue(serverEnvironment.configValueAtom(environmentId));
   const [terminalSession, setTerminalSession] = useState<AgentTerminalSession | null>(null);
+  const [addingAccount, setAddingAccount] = useState(false);
+  const [createdAccount, setCreatedAccount] = useState<{
+    instanceId: ProviderInstanceId;
+    displayName: string;
+    autoStart: boolean;
+  } | null>(null);
 
   // Re-probe on entry so freshly installed CLIs show up without a manual
   // refresh; harmless when nothing changed (single-flighted per environment).
@@ -685,44 +708,114 @@ function ConnectedAgentsStep({
 
   const byDriver = useMemo(() => selectOnboardingProvidersByDriver(providers), [providers]);
 
-  const primaryAgents = PRIMARY_AGENT_DRIVERS.map((driver) => ({
-    driver,
-    provider: byDriver.get(driver),
-  }));
+  const primaryAgents = PRIMARY_AGENT_DRIVERS.flatMap((driver) => {
+    const instances =
+      driver === "codex" ? providers?.filter((provider) => provider.driver === driver) : undefined;
+    return instances?.length
+      ? instances.map((provider) => ({ driver, provider, instanceId: provider.instanceId }))
+      : [{ driver, provider: byDriver.get(driver), instanceId: byDriver.get(driver)?.instanceId }];
+  });
+  // Keep the newly created row mounted while settings and provider snapshots catch up.
+  if (createdAccount) {
+    const index = primaryAgents.findIndex(
+      (agent) => agent.instanceId === createdAccount.instanceId,
+    );
+    const [existing] = index >= 0 ? primaryAgents.splice(index, 1) : [];
+    primaryAgents.unshift(
+      existing ?? {
+        driver: "codex",
+        provider: undefined,
+        instanceId: createdAccount.instanceId,
+      },
+    );
+  }
   return (
     <section>
       <h2 className="mb-2 text-sm font-medium">{machineLabel}</h2>
       <div className="space-y-1.5">
-        {primaryAgents.map(({ driver, provider }) => (
-          <AgentCard
-            key={driver}
-            driver={driver}
-            provider={provider}
-            terminalOpen={terminalSession?.driver === driver}
-            terminalAvailable={serverConfig !== null}
-            onOpenTerminal={() => {
-              if (provider === undefined || serverConfig === null) return;
-              setTerminalSession({
-                environmentId,
-                driver,
-                providerInstanceId: provider.instanceId,
-                cwd: serverConfig.cwd,
-                command: provider.installed
-                  ? resolveOnboardingProviderLoginCommand(
-                      provider,
-                      serverConfig.settings,
-                      serverConfig.environment.platform.os,
-                    )
-                  : resolveOnboardingProviderInstallCommand(
-                      driver,
-                      serverConfig.environment.platform.os,
-                    ),
-                keybindings: serverConfig.keybindings,
-              });
-            }}
-          />
-        ))}
+        {primaryAgents.map(({ driver, provider, instanceId }) =>
+          driver === "codex" && serverConfig !== null ? (
+            <OnboardingCodexSetup
+              key={instanceId ?? driver}
+              environmentId={environmentId}
+              provider={provider}
+              serverConfig={serverConfig}
+              createdAccount={instanceId === createdAccount?.instanceId ? createdAccount : null}
+              onAutoStartConsumed={() =>
+                setCreatedAccount((account) => (account ? { ...account, autoStart: false } : null))
+              }
+              terminalOpen={terminalSession?.driver === driver}
+              onOpenTerminal={() => {
+                if (provider === undefined) return;
+                setTerminalSession({
+                  environmentId,
+                  driver,
+                  providerInstanceId: provider.instanceId,
+                  cwd: serverConfig.cwd,
+                  command: provider.installed
+                    ? resolveOnboardingProviderLoginCommand(
+                        provider,
+                        serverConfig.settings,
+                        serverConfig.environment.platform.os,
+                      )
+                    : resolveOnboardingProviderInstallCommand(
+                        driver,
+                        serverConfig.environment.platform.os,
+                      ),
+                  keybindings: serverConfig.keybindings,
+                });
+              }}
+            />
+          ) : (
+            <AgentCard
+              key={driver}
+              driver={driver}
+              provider={provider}
+              terminalOpen={terminalSession?.driver === driver}
+              terminalAvailable={serverConfig !== null}
+              onOpenTerminal={() => {
+                if (provider === undefined || serverConfig === null) return;
+                setTerminalSession({
+                  environmentId,
+                  driver,
+                  providerInstanceId: provider.instanceId,
+                  cwd: serverConfig.cwd,
+                  command: provider.installed
+                    ? resolveOnboardingProviderLoginCommand(
+                        provider,
+                        serverConfig.settings,
+                        serverConfig.environment.platform.os,
+                      )
+                    : resolveOnboardingProviderInstallCommand(
+                        driver,
+                        serverConfig.environment.platform.os,
+                      ),
+                  keybindings: serverConfig.keybindings,
+                });
+              }}
+            />
+          ),
+        )}
       </div>
+      {providers?.some(
+        (provider) =>
+          provider.driver === "codex" && getOnboardingProviderState(provider) === "ready",
+      ) ? (
+        <div className="mt-3">
+          <Button size="xs" variant="ghost-muted" onClick={() => setAddingAccount(true)}>
+            Connect another ChatGPT account
+          </Button>
+        </div>
+      ) : null}
+      {addingAccount ? (
+        <AddManagedCodexAccountDialog
+          environmentId={environmentId}
+          onClose={() => setAddingAccount(false)}
+          onAccountCreated={(instanceId, displayName) =>
+            setCreatedAccount({ instanceId, displayName, autoStart: true })
+          }
+        />
+      ) : null}
       {terminalSession !== null ? (
         <AgentInstallTerminal
           key={`${terminalSession.environmentId}:${terminalSession.providerInstanceId}:${terminalSession.driver}`}
@@ -737,6 +830,93 @@ function ConnectedAgentsStep({
   );
 }
 
+function OnboardingCodexSetup({
+  createdAccount,
+  onAutoStartConsumed,
+  environmentId,
+  provider,
+  serverConfig,
+  terminalOpen,
+  onOpenTerminal,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly provider: ServerProvider | undefined;
+  readonly serverConfig: ServerConfig;
+  readonly terminalOpen: boolean;
+  readonly onOpenTerminal: () => void;
+  readonly createdAccount: {
+    instanceId: ProviderInstanceId;
+    displayName: string;
+    autoStart: boolean;
+  } | null;
+  readonly onAutoStartConsumed: () => void;
+}) {
+  const update = useAtomCommand(serverEnvironment.updateSettings, "Codex setup settings");
+  const instanceId =
+    createdAccount?.instanceId ??
+    provider?.instanceId ??
+    defaultInstanceIdForDriver(ProviderDriverKind.make("codex"));
+  const settings = serverConfig.settings;
+  const instance = settings.providerInstances[instanceId] ?? {
+    driver: ProviderDriverKind.make("codex"),
+    enabled: settings.providers.codex.enabled,
+    config: createdAccount ? { enabled: true, setupMode: "managed" } : settings.providers.codex,
+  };
+  const mode = readCodexSetupMode(instance.config);
+  const existingChosen =
+    mode === "existing" &&
+    instance.config !== null &&
+    typeof instance.config === "object" &&
+    "setupMode" in instance.config &&
+    instance.config.setupMode === "existing";
+  const changeMode = (setupMode: "managed" | "existing") => {
+    void update({
+      environmentId,
+      input: {
+        patch: buildProviderInstanceUpdatePatch({
+          settings,
+          instanceId,
+          driver: ProviderDriverKind.make("codex"),
+          isDefault: instanceId === defaultInstanceIdForDriver(ProviderDriverKind.make("codex")),
+          instance: {
+            ...instance,
+            enabled: true,
+            config: {
+              ...(instance.config !== null && typeof instance.config === "object"
+                ? instance.config
+                : {}),
+              enabled: true,
+              setupMode,
+            },
+          },
+        }),
+      },
+    });
+  };
+  return existingChosen ? (
+    <AgentCard
+      driver="codex"
+      provider={provider}
+      terminalOpen={terminalOpen}
+      terminalAvailable
+      onOpenTerminal={onOpenTerminal}
+    />
+  ) : (
+    <CodexSetupSection
+      presentation="onboarding"
+      autoStart={createdAccount?.autoStart === true}
+      displayName={createdAccount?.displayName}
+      onAutoStartConsumed={onAutoStartConsumed}
+      environmentId={environmentId}
+      instanceId={instanceId}
+      provider={provider}
+      mode={mode}
+      enabled={provider?.enabled ?? true}
+      onModeChange={changeMode}
+    />
+  );
+}
+
 function AgentCard({
   driver,
   provider,
@@ -752,20 +932,21 @@ function AgentCard({
 }) {
   const meta = getDriverOption(ProviderDriverKind.make(driver));
   const Icon = meta?.icon;
-  const displayName = driver === "claudeAgent" ? "Claude Code" : (meta?.label ?? driver);
+  const displayName =
+    provider?.displayName || (driver === "claudeAgent" ? "Claude Code" : (meta?.label ?? driver));
   const summary = getProviderSummary(provider);
   const providerState = getOnboardingProviderState(provider);
 
   return (
-    <div className="flex items-center gap-3 rounded-lg border border-border bg-background px-3 py-2.5">
+    <div className="flex items-center gap-3 rounded-lg border border-border bg-background px-4 py-4">
       {Icon ? (
         <Icon className={cn("size-5 shrink-0", driver !== "claudeAgent" && "fill-foreground")} />
       ) : null}
       <div className="min-w-0 flex-1">
         <span className="block text-sm font-medium text-foreground">{displayName}</span>
         <p className="mt-0.5 text-xs leading-relaxed break-words whitespace-pre-wrap text-muted-foreground">
-          {summary.headline}
-          {summary.detail ? ` · ${summary.detail}` : ""}
+          {providerState === "ready" ? "Ready to code." : summary.headline}
+          {providerState !== "ready" && summary.detail ? ` · ${summary.detail}` : ""}
         </p>
       </div>
       <div className="shrink-0">
@@ -896,9 +1077,12 @@ function AgentInstallTerminal({
   ]);
 
   return (
-    <div className="thread-terminal-drawer mt-4 overflow-hidden rounded-lg border border-border/70 bg-background text-foreground">
+    <div
+      data-thread-terminal-drawer
+      className="mt-4 overflow-hidden rounded-lg border border-border/70 bg-background text-foreground"
+    >
       <div className="flex items-center justify-between border-b border-border/60 bg-background/60 px-3 py-1.5">
-        <span className="text-[11px] font-medium text-muted-foreground">
+        <span className="text-2xs font-medium text-muted-foreground">
           {setupState === "writeFailed" ? (
             <>
               Run <code className="rounded bg-muted px-1 font-mono">{command}</code> in this
@@ -958,14 +1142,19 @@ function ImportStep({
   readonly scans: ReturnType<typeof useProjectScans>;
   readonly isImporting: boolean;
   readonly setIsImporting: (value: boolean) => void;
-  readonly onDone: (projectRef?: ScopedProjectRef) => Promise<boolean>;
+  readonly onDone: (
+    projectRef?: ScopedProjectRef,
+    importWarning?: string,
+    importedThreadCount?: number,
+  ) => Promise<boolean>;
 }) {
   const { environments } = useEnvironments();
   const createProject = useAtomCommand(projectEnvironment.create, { reportFailure: false });
   const importThreads = useAtomCommand(agentSessionImport, { reportFailure: false });
   const projects = useProjects();
   const [selectedPaths, setSelectedPaths] = useState<ReadonlySet<string> | null>(null);
-  const [importError, setImportError] = useState("");
+  const importWarningRef = useRef("");
+  const importedThreadCountRef = useRef(0);
   const [landingProject, setLandingProject] = useState<ScopedProjectRef | null>(null);
   // Keep project creation attempts separate from completed history imports so both can retry.
   const importedProjectsRef = useRef(new Map<string, ScopedProjectRef>());
@@ -994,9 +1183,11 @@ function ImportStep({
       )
     ) {
       setLandingProject(null);
-      void onDone(landingProject).then((completed) => {
-        if (!completed) setIsImporting(false);
-      });
+      void onDone(landingProject, importWarningRef.current, importedThreadCountRef.current).then(
+        (completed) => {
+          if (!completed) setIsImporting(false);
+        },
+      );
     }
   }, [landingProject, onDone, projects, setIsImporting]);
 
@@ -1026,7 +1217,7 @@ function ImportStep({
       importedProjectsRef.current,
     );
     if (projectRef === undefined) {
-      void onDone();
+      void onDone(undefined, importWarningRef.current, importedThreadCountRef.current);
       return;
     }
     setIsImporting(true);
@@ -1040,7 +1231,8 @@ function ImportStep({
       return;
     }
     setIsImporting(true);
-    setImportError("");
+    importWarningRef.current = "";
+    importedThreadCountRef.current = 0;
     lastImportSelectionRef.current = selection.map((candidate) => candidate.key);
     const importGeneration = importGenerationRef.current;
     const importedProjects = importedProjectsRef.current;
@@ -1136,23 +1328,17 @@ function ImportStep({
       if (refreshEnvironments.has(scan.environmentId)) scan.refresh();
     }
     setIsImporting(false);
+    importedThreadCountRef.current = importedThreadCount;
     if (importedProjectsCount < selection.length) {
       if (importedThreadCount > 0 && skippedThreadCount > 0) {
-        setImportError(
-          `Imported ${importedThreadCount} ${importedThreadCount === 1 ? "thread" : "threads"}. ${skippedThreadCount} ${skippedThreadCount === 1 ? "thread" : "threads"} could not be imported.`,
-        );
+        importWarningRef.current = `Imported ${importedThreadCount} ${importedThreadCount === 1 ? "thread" : "threads"}. ${skippedThreadCount} ${skippedThreadCount === 1 ? "thread" : "threads"} could not be imported.`;
       } else if (skippedThreadCount > 0) {
-        setImportError(
-          `${skippedThreadCount} ${skippedThreadCount === 1 ? "thread could" : "threads could"} not be imported.`,
-        );
+        importWarningRef.current = `${skippedThreadCount} ${skippedThreadCount === 1 ? "thread could" : "threads could"} not be imported.`;
       } else if (importedThreadCount > 0) {
-        setImportError(
-          `Imported ${importedThreadCount} ${importedThreadCount === 1 ? "thread" : "threads"}. Some thread history could not be imported.`,
-        );
+        importWarningRef.current = `Imported ${importedThreadCount} ${importedThreadCount === 1 ? "thread" : "threads"}. Some thread history could not be imported.`;
       } else {
-        setImportError("Could not import thread history.");
+        importWarningRef.current = "Could not import thread history.";
       }
-      return;
     }
     finishAfterImport();
   };
@@ -1206,10 +1392,7 @@ function ImportStep({
           </div>
         </div>
       ) : null}
-      <ScrollArea
-        scrollFade
-        className="mt-2 h-auto max-h-80 [&_[data-slot=scroll-area-scrollbar]]:opacity-100"
-      >
+      <ScrollArea scrollFade className="mt-2 h-auto max-h-80">
         <div className="space-y-5 pr-3">
           {scans.map((scan) => {
             const scanCandidates = candidates.filter(
@@ -1262,14 +1445,9 @@ function ImportStep({
           })}
         </div>
       </ScrollArea>
-      {importError ? <p className="mt-3 text-sm text-destructive">{importError}</p> : null}
       <div className="mt-6 flex flex-wrap items-center justify-end gap-3">
-        <Button
-          variant="ghost-muted"
-          disabled={isImporting}
-          onClick={importError ? finishAfterImport : () => void onDone()}
-        >
-          {importError ? "Continue without the rest" : "Do not import projects"}
+        <Button variant="ghost-muted" disabled={isImporting} onClick={finishAfterImport}>
+          Do not import projects
         </Button>
         <Button
           autoFocus
@@ -1454,12 +1632,10 @@ function ImportCandidateRow({
             {label}
           </span>
           {secondary !== undefined ? (
-            <span className="truncate font-mono text-[11px] text-muted-foreground">
-              {secondary}
-            </span>
+            <span className="truncate font-mono text-2xs text-muted-foreground">{secondary}</span>
           ) : null}
         </TooltipTrigger>
-        <TooltipPopup className="max-w-96 break-all font-mono">{candidate.path}</TooltipPopup>
+        <TooltipPopup variant="code">{candidate.path}</TooltipPopup>
       </Tooltip>
       <ImportRowMeta
         sources={nested ? null : candidate.sources}
diff --git a/apps/web/src/components/preview/AgentBrowserCursor.tsx b/apps/web/src/components/preview/AgentBrowserCursor.tsx
index 408f268fa0c4..b9de15d980e0 100644
--- a/apps/web/src/components/preview/AgentBrowserCursor.tsx
+++ b/apps/web/src/components/preview/AgentBrowserCursor.tsx
@@ -55,7 +55,7 @@ function AgentBrowserCursorEvent(props: {
 
   return (
     <div
-      className="pointer-events-none absolute left-0 top-0 z-40 transition-[transform,opacity] duration-150 ease-out motion-reduce:transition-none"
+      className="pointer-events-none absolute left-0 top-0 z-40 transition-[opacity,transform] duration-150 ease-out motion-reduce:transition-none"
       style={{
         opacity: agentBrowserCursorOpacity(active, controller),
         transform: `translate3d(${event.x * zoomFactor * (content?.scale ?? 1) + (content?.x ?? 0) - (content?.scrollLeft ?? 0)}px, ${event.y * zoomFactor * (content?.scale ?? 1) + (content?.y ?? 0) - (content?.scrollTop ?? 0)}px, 0)`,
diff --git a/apps/web/src/components/preview/BrowserMockup.tsx b/apps/web/src/components/preview/BrowserMockup.tsx
index 35cfbb421e7c..b89cdc07613a 100644
--- a/apps/web/src/components/preview/BrowserMockup.tsx
+++ b/apps/web/src/components/preview/BrowserMockup.tsx
@@ -6,16 +6,16 @@ export function BrowserMockup({ className }: { className?: string }) {
     <div
       aria-hidden
       className={cn(
-        "relative flex flex-col gap-0.5 overflow-hidden rounded-[5px] border border-border/60 bg-card p-1 shadow-xs/5",
+        "relative flex flex-col gap-0.5 overflow-hidden rounded-sm border border-border/60 bg-card p-1 shadow-xs/5",
         className,
       )}
     >
-      <div className="flex gap-[2px]">
+      <div className="flex gap-0.5">
         <span className="size-[3px] rounded-full bg-destructive/80" />
         <span className="size-[3px] rounded-full bg-warning/80" />
         <span className="size-[3px] rounded-full bg-success/80" />
       </div>
-      <div className="mt-[1px] flex flex-1 flex-col gap-[2px]">
+      <div className="mt-[1px] flex flex-1 flex-col gap-0.5">
         <span className="h-[2px] w-full rounded-full bg-muted-foreground/30" />
         <span className="h-[2px] w-3/5 rounded-full bg-muted-foreground/20" />
       </div>
diff --git a/apps/web/src/components/preview/PreviewAutomationHosts.test.tsx b/apps/web/src/components/preview/PreviewAutomationHosts.test.tsx
index 75ed20cc4fe7..542b84907b6e 100644
--- a/apps/web/src/components/preview/PreviewAutomationHosts.test.tsx
+++ b/apps/web/src/components/preview/PreviewAutomationHosts.test.tsx
@@ -8,13 +8,22 @@ import {
   type PreviewOpenInput,
   type PreviewSessionSnapshot,
 } from "@t3tools/contracts";
+import type { AtomCommandResult } from "@t3tools/client-runtime/state/runtime";
+import * as Cause from "effect/Cause";
 import { AsyncResult, Atom } from "effect/unstable/reactivity";
 import { act } from "react";
 import { create, type ReactTestRenderer } from "react-test-renderer";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
 
+import { useBrowserSurfaceStore } from "~/browser/browserSurfaceStore";
+import { previewRuntimeTabId } from "~/browser/previewRuntimeTabId";
 import { __resetClientSettingsPersistenceForTests } from "~/hooks/useSettings";
-import { readThreadPreviewState, resetPreviewStateForTests } from "~/previewStateStore";
+import {
+  applyPreviewServerSnapshot,
+  readThreadPreviewState,
+  resetPreviewStateForTests,
+  applyPreviewDesktopState,
+} from "~/previewStateStore";
 import { appAtomRegistry, AppAtomRegistryProvider } from "~/rpc/atomRegistry";
 
 import { PreviewAutomationHosts } from "./PreviewAutomationHosts";
@@ -31,7 +40,7 @@ const mocks = vi.hoisted(() => ({
     vi.fn<
       (target: { environmentId: EnvironmentId; input: PreviewAutomationResponse }) => Promise<void>
     >(),
-  focus: vi.fn(async () => undefined),
+  focus: vi.fn<() => Promise<AtomCommandResult<void, Error>>>(),
 }));
 
 vi.mock("~/localApi", () => ({
@@ -110,12 +119,21 @@ beforeEach(async () => {
   vi.clearAllMocks();
   mocks.getClientSettings.mockReset().mockResolvedValue(savedSettings);
   mocks.respond.mockReset();
+  mocks.focus.mockReset().mockResolvedValue(AsyncResult.success(undefined));
   __resetClientSettingsPersistenceForTests();
   resetPreviewStateForTests();
+  useBrowserSurfaceStore.setState({ byTabId: {} });
   appAtomRegistry.set(requestsAtom, AsyncResult.initial(false));
   vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
   vi.stubGlobal("window", { addEventListener: vi.fn(), removeEventListener: vi.fn() });
-  vi.stubGlobal("document", { hasFocus: () => false, querySelectorAll: () => [] });
+  vi.stubGlobal(
+    "document",
+    Object.assign(new EventTarget(), {
+      hasFocus: () => false,
+      visibilityState: "visible",
+      querySelectorAll: () => [],
+    }),
+  );
   await act(() => {
     renderer = create(
       <AppAtomRegistryProvider>
@@ -161,7 +179,11 @@ describe("PreviewAutomationHosts open", () => {
       input: { threadId, viewport, profileId: "work" },
     });
     expect(mocks.getClientSettings).toHaveBeenCalledOnce();
-    await expect(response.promise).resolves.toMatchObject({ requestId: "open-request", ok: true });
+    await expect(response.promise).resolves.toMatchObject({
+      requestId: "open-request",
+      ok: true,
+      result: { available: false, tabId: snapshot.tabId },
+    });
     expect(readThreadPreviewState(threadRef).snapshot).toEqual(snapshot);
     expect(mocks.setClientSettings).not.toHaveBeenCalled();
   });
@@ -188,3 +210,154 @@ describe("PreviewAutomationHosts open", () => {
     expect(mocks.setClientSettings).not.toHaveBeenCalled();
   });
 });
+
+describe("PreviewAutomationHosts ownership", () => {
+  it("reports only local live tabs and removes ownership when their web contents close", async () => {
+    await act(() => {
+      appAtomRegistry.set(
+        requestsAtom,
+        AsyncResult.success({ type: "connected", connectionId: "automation-connection" }),
+      );
+      applyPreviewServerSnapshot(threadRef, snapshot);
+    });
+    expect(mocks.focus).toHaveBeenLastCalledWith(
+      expect.objectContaining({ input: expect.objectContaining({ liveTabs: [] }) }),
+    );
+    const overlay = {
+      hasWebContents: true,
+      canGoBack: false,
+      canGoForward: false,
+      loading: false,
+      zoomFactor: 1,
+      pictureInPicture: false,
+      colorScheme: "system" as const,
+      audioMuted: false,
+      audible: false,
+      controller: "none" as const,
+      favicon: null,
+    };
+    await act(() => applyPreviewDesktopState(threadRef, snapshot.tabId, overlay));
+    expect(mocks.focus).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        input: expect.objectContaining({
+          liveTabs: [{ threadId, tabId: snapshot.tabId, visible: false }],
+        }),
+      }),
+    );
+    const reportCount = mocks.focus.mock.calls.length;
+    await act(() =>
+      applyPreviewDesktopState(threadRef, snapshot.tabId, { ...overlay, loading: true }),
+    );
+    expect(mocks.focus).toHaveBeenCalledTimes(reportCount);
+    const runtimeTabId = previewRuntimeTabId(threadRef, null, snapshot.tabId);
+    const owner = Symbol();
+    await act(() => {
+      useBrowserSurfaceStore.getState().claim(runtimeTabId, owner, false);
+      useBrowserSurfaceStore
+        .getState()
+        .present(runtimeTabId, owner, { x: 0, y: 0, width: 800, height: 600 }, true, 0, 1);
+    });
+    expect(mocks.focus).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        input: expect.objectContaining({
+          liveTabs: [{ threadId, tabId: snapshot.tabId, visible: true }],
+        }),
+      }),
+    );
+    for (const visibilityState of ["hidden", "visible"]) {
+      await act(() => {
+        Object.assign(document, { visibilityState });
+        document.dispatchEvent(new Event("visibilitychange"));
+      });
+      expect(mocks.focus).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          input: expect.objectContaining({
+            focused: false,
+            liveTabs: [{ threadId, tabId: snapshot.tabId, visible: visibilityState === "visible" }],
+          }),
+        }),
+      );
+    }
+    await act(() => {
+      appAtomRegistry.set(
+        requestsAtom,
+        AsyncResult.success({ type: "connected", connectionId: "reconnected" }),
+      );
+    });
+    expect(mocks.focus).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        input: expect.objectContaining({
+          connectionId: "reconnected",
+          liveTabs: [{ threadId, tabId: snapshot.tabId, visible: true }],
+        }),
+      }),
+    );
+    await act(() =>
+      applyPreviewDesktopState(threadRef, snapshot.tabId, { ...overlay, hasWebContents: false }),
+    );
+    expect(mocks.focus).toHaveBeenLastCalledWith(
+      expect.objectContaining({ input: expect.objectContaining({ liveTabs: [] }) }),
+    );
+  });
+
+  it.each([false, true])(
+    "retries failed reports without clearing newer connection reports (reconnect: %s)",
+    async (reconnect) => {
+      const report = deferred<Awaited<ReturnType<typeof mocks.focus>>>();
+      mocks.focus.mockReturnValueOnce(report.promise);
+      await act(() => {
+        appAtomRegistry.set(
+          requestsAtom,
+          AsyncResult.success({ type: "connected", connectionId: "first" }),
+        );
+      });
+      if (reconnect) {
+        await act(() => {
+          appAtomRegistry.set(
+            requestsAtom,
+            AsyncResult.success({ type: "connected", connectionId: "second" }),
+          );
+        });
+      }
+      await act(async () => {
+        report.resolve(AsyncResult.failure(Cause.fail(new Error("Focus report failed"))));
+        await report.promise;
+      });
+      expect(mocks.focus).toHaveBeenCalledTimes(reconnect ? 2 : 1);
+      await act(() => {
+        document.dispatchEvent(new Event("visibilitychange"));
+      });
+      expect(mocks.focus).toHaveBeenCalledTimes(2);
+      expect(mocks.focus).toHaveBeenLastCalledWith(
+        expect.objectContaining({
+          input: expect.objectContaining({ connectionId: reconnect ? "second" : "first" }),
+        }),
+      );
+    },
+  );
+
+  it("does not claim an available runtime from a server snapshot alone", async () => {
+    const response = deferred<PreviewAutomationResponse>();
+    mocks.respond.mockImplementationOnce(async ({ input }) => response.resolve(input));
+    await act(async () => {
+      applyPreviewServerSnapshot(threadRef, snapshot);
+      appAtomRegistry.set(
+        requestsAtom,
+        AsyncResult.success({
+          ...requestEvent,
+          request: {
+            ...requestEvent.request,
+            operation: "status",
+            tabId: snapshot.tabId,
+            input: {},
+          },
+        }),
+      );
+      await response.promise;
+    });
+    await expect(response.promise).resolves.toMatchObject({
+      ok: true,
+      result: { available: false, tabId: snapshot.tabId },
+    });
+  });
+});
diff --git a/apps/web/src/components/preview/PreviewAutomationHosts.tsx b/apps/web/src/components/preview/PreviewAutomationHosts.tsx
index a793e8a2c8c0..173a027e9df2 100644
--- a/apps/web/src/components/preview/PreviewAutomationHosts.tsx
+++ b/apps/web/src/components/preview/PreviewAutomationHosts.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { RegistryContext, useAtomSet, useAtomValue } from "@effect/atom-react";
+import { parseScopedThreadKey } from "@t3tools/client-runtime/environment";
 import { squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 import {
   FILL_PREVIEW_VIEWPORT,
@@ -22,12 +23,14 @@ import {
 import { resolvePreviewViewport } from "@t3tools/shared/previewViewport";
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { Atom } from "effect/unstable/reactivity";
+import { useShallow } from "zustand/react/shallow";
 
 import {
   applyPreviewServerSnapshot,
   readThreadPreviewState,
   reconcilePreviewServerSessions,
   updatePreviewServerSnapshot,
+  useActivePreviewSessions,
 } from "~/previewStateStore";
 import {
   browserMiniPlayerSource,
@@ -250,7 +253,7 @@ const currentStatus = async (
   }
   const navStatus = snapshot?.navStatus;
   return {
-    available: Boolean(previewBridge?.automation),
+    available: false,
     visible,
     tabId,
     url: navStatus && navStatus._tag !== "Idle" ? navStatus.url : null,
@@ -292,6 +295,30 @@ export function PreviewAutomationHosts() {
 
 function PreviewAutomationHost(props: { readonly environmentId: EnvironmentId }) {
   const { environmentId } = props;
+  const previewSessions = useActivePreviewSessions();
+  const visibleRuntimeTabIds = useBrowserSurfaceStore(
+    useShallow((state) =>
+      Object.keys(state.byTabId).filter((tabId) => state.byTabId[tabId]?.visible),
+    ),
+  );
+  const liveTabs = useMemo(
+    () =>
+      Object.entries(previewSessions).flatMap(([key, state]) => {
+        const ref = parseScopedThreadKey(key);
+        if (ref?.environmentId !== environmentId) return [];
+        return Object.values(state.sessions)
+          .filter((tab) => state.desktopByTabId[tab.tabId]?.hasWebContents)
+          .map((tab) => ({
+            threadId: ref.threadId,
+            tabId: tab.tabId,
+            visible: visibleRuntimeTabIds.includes(
+              previewRuntimeTabId(ref, state.serverEpoch, tab.tabId),
+            ),
+          }));
+      }),
+    [environmentId, previewSessions, visibleRuntimeTabIds],
+  );
+  const lastFocusReportRef = useRef<string | null>(null);
   const registry = useContext(RegistryContext);
   const [automationClientId] = useState(createPreviewAutomationClientId);
   const initialAutomationHost = useMemo<PreviewAutomationHostState>(
@@ -804,24 +831,35 @@ function PreviewAutomationHost(props: { readonly environmentId: EnvironmentId })
   useEffect(() => {
     const report = () => {
       if (!automationConnectionId) return;
-      void focusAutomationHost({
+      const input = {
+        clientId: automationClientId,
         environmentId,
-        input: {
-          clientId: automationClientId,
-          environmentId,
-          connectionId: automationConnectionId,
-          focused: document.hasFocus(),
-        },
+        connectionId: automationConnectionId,
+        focused: document.hasFocus() && document.visibilityState === "visible",
+        liveTabs: liveTabs.map((tab) => ({
+          ...tab,
+          visible: tab.visible && document.visibilityState === "visible",
+        })),
+      };
+      const reportKey = JSON.stringify(input);
+      if (lastFocusReportRef.current === reportKey) return;
+      lastFocusReportRef.current = reportKey;
+      void focusAutomationHost({ environmentId, input }).then((result) => {
+        if (result._tag === "Failure" && lastFocusReportRef.current === reportKey) {
+          lastFocusReportRef.current = null;
+        }
       });
     };
     report();
     window.addEventListener("focus", report);
     window.addEventListener("blur", report);
+    document.addEventListener("visibilitychange", report);
     return () => {
       window.removeEventListener("focus", report);
       window.removeEventListener("blur", report);
+      document.removeEventListener("visibilitychange", report);
     };
-  }, [automationClientId, automationConnectionId, environmentId, focusAutomationHost]);
+  }, [automationClientId, automationConnectionId, environmentId, focusAutomationHost, liveTabs]);
 
   return null;
 }
diff --git a/apps/web/src/components/preview/PreviewChromeRow.tsx b/apps/web/src/components/preview/PreviewChromeRow.tsx
index 7ca0c496a04b..0fd12aecb8bf 100644
--- a/apps/web/src/components/preview/PreviewChromeRow.tsx
+++ b/apps/web/src/components/preview/PreviewChromeRow.tsx
@@ -181,11 +181,6 @@ export function PreviewChromeRow({
                 <InputGroupInput
                   ref={inputRef}
                   value={inputFocused ? draft : url}
-                  className={cn(
-                    onOpenInBrowser &&
-                      !inputFocused &&
-                      "group-hover/address:pe-7 transition-[padding]",
-                  )}
                   onChange={(event) => setDraft(event.target.value)}
                   onFocus={() => {
                     setDraft(url);
@@ -213,26 +208,26 @@ export function PreviewChromeRow({
             />
           </Tooltip>
           {onOpenInBrowser && !inputFocused ? (
-            <InputGroupAddon
-              align="inline-end"
-              className="pointer-events-none absolute inset-y-0 right-0 opacity-0 transition-opacity group-hover/address:pointer-events-auto group-hover/address:opacity-100"
-            >
-              <Tooltip>
-                <TooltipTrigger
-                  render={
-                    <Button
-                      variant="ghost"
-                      size="icon-xs"
-                      onClick={onOpenInBrowser}
-                      aria-label="Open in system browser"
-                      type="button"
-                    />
-                  }
-                >
-                  <ExternalLink />
-                </TooltipTrigger>
-                <TooltipPopup>Open in system browser</TooltipPopup>
-              </Tooltip>
+            <InputGroupAddon align="inline-end">
+              {/* Revealed on hover so a resting address bar reads as plain text. */}
+              <span className="pointer-events-none flex opacity-0 transition-opacity focus-within:pointer-events-auto focus-within:opacity-100 group-hover/address:pointer-events-auto group-hover/address:opacity-100">
+                <Tooltip>
+                  <TooltipTrigger
+                    render={
+                      <Button
+                        variant="ghost"
+                        size="icon-xs"
+                        onClick={onOpenInBrowser}
+                        aria-label="Open in system browser"
+                        type="button"
+                      />
+                    }
+                  >
+                    <ExternalLink />
+                  </TooltipTrigger>
+                  <TooltipPopup>Open in system browser</TooltipPopup>
+                </Tooltip>
+              </span>
             </InputGroupAddon>
           ) : null}
         </InputGroup>
diff --git a/apps/web/src/components/preview/PreviewMoreMenu.tsx b/apps/web/src/components/preview/PreviewMoreMenu.tsx
index 7080fb5238f4..88c596bbaded 100644
--- a/apps/web/src/components/preview/PreviewMoreMenu.tsx
+++ b/apps/web/src/components/preview/PreviewMoreMenu.tsx
@@ -108,7 +108,7 @@ export function PreviewMoreMenu({
         </TooltipTrigger>
         <TooltipPopup>More</TooltipPopup>
       </Tooltip>
-      <MenuPopup align="end" sideOffset={6} className="min-w-56">
+      <MenuPopup align="end" sideOffset={6}>
         <MenuItem onClick={callTab(bridge.hardReload)} disabled={tabDisabled}>
           Hard reload
         </MenuItem>
@@ -125,7 +125,7 @@ export function PreviewMoreMenu({
         </MenuItem>
         <MenuSub>
           <MenuSubTrigger disabled={tabDisabled}>Appearance</MenuSubTrigger>
-          <MenuSubPopup className="min-w-32">
+          <MenuSubPopup>
             <MenuRadioGroup
               value={colorScheme}
               onValueChange={(value) => {
@@ -185,7 +185,6 @@ export function PreviewMoreMenu({
               type="button"
               onClick={callTab(bridge.resetZoom)}
               aria-label="Reset zoom"
-              className="[:hover,[data-pressed]]:bg-foreground/10"
               disabled={tabDisabled}
             >
               <RotateCcw />
@@ -206,10 +205,11 @@ export function PreviewMoreMenu({
             each one drove the popup far past its width.
           */}
           {profileName ? (
-            // Truncation sits on the label itself: it renders a block box, so
-            // `text-overflow` on an inline child inside it never applies and a
-            // long name would push the popup past its width instead.
-            <MenuGroupLabel className="max-w-64 truncate">Profile: {profileName}</MenuGroupLabel>
+            // Truncation needs a block box: `text-overflow` on an inline child
+            // never applies and a long name would push the popup past its width.
+            <MenuGroupLabel className="max-w-64">
+              <span className="block truncate">Profile: {profileName}</span>
+            </MenuGroupLabel>
           ) : null}
           <MenuItem
             onClick={() =>
diff --git a/apps/web/src/components/preview/PreviewPanelShell.tsx b/apps/web/src/components/preview/PreviewPanelShell.tsx
index eddb549cf225..b436932f7c4c 100644
--- a/apps/web/src/components/preview/PreviewPanelShell.tsx
+++ b/apps/web/src/components/preview/PreviewPanelShell.tsx
@@ -7,7 +7,6 @@ import {
   useState,
 } from "react";
 
-import { isElectron } from "~/env";
 import { useResizableWidth } from "~/hooks/useResizableWidth";
 import { cn } from "~/lib/utils";
 
@@ -64,7 +63,6 @@ export function PreviewPanelShell(props: {
   defaultWidth?: number;
   children: ReactNode;
 }) {
-  const useDragRegion = isElectron && props.mode !== "sheet" && props.mode !== "embedded";
   const isInline = props.mode === "inline";
   const collapsible = isInline && props.open !== undefined;
   const open = props.open ?? true;
@@ -128,7 +126,7 @@ export function PreviewPanelShell(props: {
             : "shrink-0 border-l border-border"
           : "w-full",
         collapsible &&
-          "[[data-panel-animations=true]_&]:transition-[width] [[data-panel-animations=true]_&]:[transition-duration:var(--panel-animation-duration)] [[data-panel-animations=true]_&]:ease-out",
+          "[[data-panel-animations=true]_&]:transition-[width] [[data-panel-animations=true]_&]:duration-(--panel-animation-duration) [[data-panel-animations=true]_&]:ease-out",
         collapsible && open && "[[data-panel-animations=true]_&]:starting:w-0!",
         collapsible && !open && "pointer-events-none",
       )}
@@ -149,7 +147,6 @@ export function PreviewPanelShell(props: {
           className="flex h-full min-h-0 min-w-0 flex-col"
           style={collapsible && !maximized ? { width: `calc(${width}px - 1px)` } : undefined}
         >
-          {useDragRegion ? <div className="electron-drag-region h-0 w-full" aria-hidden /> : null}
           {props.children}
         </div>
       </div>
diff --git a/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx b/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx
index 3e42c39715ee..0538495da7c4 100644
--- a/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx
+++ b/apps/web/src/components/preview/ThreadPreviewMiniPlayer.tsx
@@ -462,7 +462,9 @@ function MiniPlayerShell({
               <span
                 className={cn(
                   "block size-2 rounded-full shadow-sm ring-1 ring-background/70",
-                  recording ? "bg-red-500 motion-safe:animate-status-pulse" : "bg-foreground/25",
+                  recording
+                    ? "bg-destructive motion-safe:animate-status-pulse"
+                    : "bg-foreground/25",
                 )}
               />
             </div>
@@ -475,7 +477,7 @@ function MiniPlayerShell({
             >
               {recording ? (
                 <span aria-hidden className="flex size-6 shrink-0 items-center justify-center">
-                  <span className="size-2 rounded-full bg-red-500 motion-safe:animate-status-pulse" />
+                  <span className="size-2 rounded-full bg-destructive motion-safe:animate-status-pulse" />
                 </span>
               ) : null}
               <Tooltip>
diff --git a/apps/web/src/components/preview/previewMiniPlayerLayout.ts b/apps/web/src/components/preview/previewMiniPlayerLayout.ts
index faa529ae91c2..c2db453b29a3 100644
--- a/apps/web/src/components/preview/previewMiniPlayerLayout.ts
+++ b/apps/web/src/components/preview/previewMiniPlayerLayout.ts
@@ -11,7 +11,7 @@ import type { DeviceScreenSize } from "@t3tools/client-runtime/device/stream";
 
 export const PREVIEW_MINI_PLAYER_EDGE_GAP = 12;
 export const PREVIEW_MINI_PLAYER_CORNER_RADIUS = 12;
-// The mini-player shell straddles this webview at 47 and 49; dialogs begin at 50.
+// The mini-player shell straddles this webview at 47 and 49: above --z-sheet, under dialogs (50).
 export const PREVIEW_MINI_PLAYER_WEBVIEW_Z_INDEX = 48;
 // A fresh player is the largest box at the source aspect ratio that fits here.
 const PREVIEW_MINI_PLAYER_DEFAULT_BOX = { width: 320, height: 320 } as const;
diff --git a/apps/web/src/components/projectScriptEditor.tsx b/apps/web/src/components/projectScriptEditor.tsx
index 774398feda06..b3708f5721f6 100644
--- a/apps/web/src/components/projectScriptEditor.tsx
+++ b/apps/web/src/components/projectScriptEditor.tsx
@@ -319,7 +319,7 @@ export function ProjectScriptEditorDialog({
                           <Button
                             type="button"
                             variant="outline"
-                            className="size-9 shrink-0 hover:bg-popover active:bg-popover data-pressed:bg-popover data-pressed:shadow-xs/5 data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:border-transparent dark:bg-white/[0.035] dark:data-pressed:before:shadow-none"
+                            className="size-9 shrink-0"
                             aria-label="Choose icon"
                           />
                         }
@@ -431,7 +431,7 @@ export function ProjectScriptEditorDialog({
               </fieldset>
             </form>
           </DialogPanel>
-          <DialogFooter className="dark:border-transparent dark:bg-transparent">
+          <DialogFooter variant="bare">
             {isEditing && (
               <Button
                 type="button"
diff --git a/apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx b/apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx
index 88e8144eed0b..0b4a3a6e7639 100644
--- a/apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx
+++ b/apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx
@@ -208,7 +208,7 @@ function LinkPullRequestDialog({
             this environment has a project for.
           </DialogDescription>
         </DialogHeader>
-        <DialogPanel className="space-y-3">
+        <DialogPanel>
           <Input
             ref={inputRef}
             placeholder="Pull request URL or #42"
diff --git a/apps/web/src/components/pullRequest/PullRequestCandidatePicker.tsx b/apps/web/src/components/pullRequest/PullRequestCandidatePicker.tsx
index bae150dd9186..d8e7058783cb 100644
--- a/apps/web/src/components/pullRequest/PullRequestCandidatePicker.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCandidatePicker.tsx
@@ -147,8 +147,6 @@ export function PullRequestCandidatePicker<T>({
                 index={index}
                 value={keys[index]}
                 disabled={disabled}
-                className="min-h-0 py-1.5 text-xs sm:min-h-0 sm:text-xs"
-                contentClassName="flex min-w-0 items-center gap-2"
               >
                 {children(candidate)}
               </ComboboxItem>
diff --git a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
index e9797016aad7..b000674077b0 100644
--- a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
@@ -147,7 +147,7 @@ export function PullRequestChecksPopover({
       >
         <presentation.Icon aria-hidden className={cn("size-3.5", presentation.toneClassName)} />
       </PopoverTrigger>
-      <PopoverPopup align="start" className="w-80 max-w-full" side="bottom">
+      <PopoverPopup align="start" width="md" side="bottom">
         <p className="mb-2 font-medium text-sm">{presentation.label}</p>
         {summary === null ? null : <p className="mb-2 text-muted-foreground text-xs">{summary}</p>}
         {stale ? (
diff --git a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
index 131593ab6d22..251f3cd49f95 100644
--- a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
@@ -70,6 +70,8 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
   DropdownMenuTrigger,
 } from "../ui/menu";
 import { toastManager } from "../ui/toast";
@@ -783,7 +785,7 @@ function PullRequestCodeTab({
           variant="ghost-muted"
           aria-expanded={!collapsed}
           aria-label={collapsed ? "Expand diff" : "Collapse diff"}
-          className="mr-1 rounded hover:bg-transparent"
+          className="mr-1"
           onClick={(event) => {
             event.stopPropagation();
             toggleFile(item.id);
@@ -826,7 +828,7 @@ function PullRequestCodeTab({
         <PullRequestDiffStat
           additions={additions}
           deletions={deletions}
-          className="font-mono text-[11px]"
+          className="font-mono text-2xs"
         />
       );
       const viewedFiles = filesViewedRef.current;
@@ -840,7 +842,7 @@ function PullRequestCodeTab({
               attribute is what the header's capture listener looks for. */}
           <label
             data-viewed-toggle=""
-            className="flex cursor-pointer select-none items-center gap-1.5 text-[11px] text-muted-foreground"
+            className="flex cursor-pointer select-none items-center gap-1.5 text-2xs text-muted-foreground"
             onClick={(event) => event.stopPropagation()}
           >
             <Checkbox
@@ -850,7 +852,7 @@ function PullRequestCodeTab({
             />
             {stale ? (
               <Tooltip>
-                <TooltipTrigger render={<span className="text-amber-600 dark:text-amber-500" />}>
+                <TooltipTrigger render={<span className="text-warning-foreground" />}>
                   Changed
                 </TooltipTrigger>
                 <TooltipPopup side="bottom">
@@ -1069,38 +1071,39 @@ function PullRequestCodeTab({
         {orderedCommits.length > 0 ? (
           <DropdownMenu>
             <DropdownMenuTrigger
-              className="inline-flex h-6 min-w-0 max-w-64 items-center gap-1 rounded-md bg-accent px-2 text-xs font-medium text-accent-foreground outline-none transition-colors hover:bg-accent/80 focus-visible:ring-2 focus-visible:ring-ring"
+              render={<Button size="xs" variant="secondary" />}
+              className="min-w-0 max-w-64"
               aria-label={`Diff scope: ${scopeLabel}`}
             >
               <span className="truncate">{scopeLabel}</span>
               <ChevronDownIcon className="size-3.5 shrink-0 opacity-70" />
             </DropdownMenuTrigger>
-            <DropdownMenuContent align="start" className="w-80">
-              <DropdownMenuItem
-                className={commit === null ? "bg-foreground/[0.08]" : undefined}
-                onClick={() => onSelectedCommitChange(null)}
+            <DropdownMenuContent align="start">
+              <DropdownMenuRadioGroup
+                value={commit ?? "all"}
+                onValueChange={(value) => onSelectedCommitChange(value === "all" ? null : value)}
               >
-                <span>All commits</span>
-              </DropdownMenuItem>
-              {orderedCommits.slice(0, visibleCommitCount).map((entry) => (
-                <DropdownMenuItem
-                  key={entry.oid}
-                  className={entry.oid === commit ? "bg-foreground/[0.08]" : undefined}
-                  onClick={() => onSelectedCommitChange(entry.oid)}
-                >
-                  {/* Headlines run long, and the abbreviated oid after one is what a reader
-                      matches against the commit list on the host. */}
-                  <Tooltip>
-                    <TooltipTrigger
-                      render={<span className="min-w-0 truncate">{entry.messageHeadline}</span>}
-                    />
-                    <TooltipPopup side="top">{entry.messageHeadline}</TooltipPopup>
-                  </Tooltip>
-                  <span className="ml-auto shrink-0 font-mono text-xs text-muted-foreground">
-                    {entry.oid.slice(0, 7)}
-                  </span>
-                </DropdownMenuItem>
-              ))}
+                <DropdownMenuRadioItem value="all" closeOnClick>
+                  <span>All commits</span>
+                </DropdownMenuRadioItem>
+                {orderedCommits.slice(0, visibleCommitCount).map((entry) => (
+                  <DropdownMenuRadioItem key={entry.oid} value={entry.oid} closeOnClick>
+                    {/* Headlines run long, and the abbreviated oid after one is what a reader
+                        matches against the commit list on the host. */}
+                    <span className="flex items-center gap-2">
+                      <Tooltip>
+                        <TooltipTrigger
+                          render={<span className="min-w-0 truncate">{entry.messageHeadline}</span>}
+                        />
+                        <TooltipPopup side="top">{entry.messageHeadline}</TooltipPopup>
+                      </Tooltip>
+                      <span className="ml-auto shrink-0 font-mono text-xs text-muted-foreground">
+                        {entry.oid.slice(0, 7)}
+                      </span>
+                    </span>
+                  </DropdownMenuRadioItem>
+                ))}
+              </DropdownMenuRadioGroup>
               {orderedCommits.length > visibleCommitCount ? (
                 // Kept out of the radio group: it changes how much of the list is on screen
                 // rather than what the diff is scoped to.
@@ -1154,7 +1157,7 @@ function PullRequestCodeTab({
                   <TooltipTrigger render={<span className="flex shrink-0 items-center" />}>
                     <TriangleAlertIcon
                       aria-label="Your ticks could not be read"
-                      className="size-3.5 text-amber-600 dark:text-amber-500"
+                      className="size-3.5 text-warning-foreground"
                     />
                   </TooltipTrigger>
                   <TooltipPopup side="bottom">
@@ -1168,7 +1171,7 @@ function PullRequestCodeTab({
                   <TooltipTrigger render={<span className="flex shrink-0 items-center" />}>
                     <TriangleAlertIcon
                       aria-label="This count covers only part of the change"
-                      className="size-3.5 text-amber-600 dark:text-amber-500"
+                      className="size-3.5 text-warning-foreground"
                     />
                   </TooltipTrigger>
                   <TooltipPopup side="bottom">
@@ -1184,7 +1187,7 @@ function PullRequestCodeTab({
               <TooltipTrigger render={<span className="flex shrink-0 items-center" />}>
                 <TriangleAlertIcon
                   aria-label="Some of this diff was not shown"
-                  className="size-3.5 text-amber-600 dark:text-amber-500"
+                  className="size-3.5 text-warning-foreground"
                 />
               </TooltipTrigger>
               <TooltipPopup side="bottom">
@@ -1404,63 +1407,63 @@ function PullRequestCodeTab({
       {/* Above the code, closed, and counted: these belong to the change rather than to any
             line of it, and in the stream they read as cards dropped into the patch. */}
       {orphanFiles.size > 0 ? (
-        <Collapsible
-          className="shrink-0 border-b border-border/60"
-          open={orphansOpen}
-          onOpenChange={setOrphansOpen}
-        >
-          {/* Still a heading, so the section keeps its place in a screen reader's outline;
+        <div className="shrink-0 border-b border-border/60">
+          <Collapsible open={orphansOpen} onOpenChange={setOrphansOpen}>
+            {/* Still a heading, so the section keeps its place in a screen reader's outline;
                 the count is spelled out there rather than left as a bare number. */}
-          <h2>
-            <CollapsibleTrigger className="flex w-full items-center gap-1.5 px-4 py-2 text-left text-xs text-muted-foreground">
-              {/* While slices are still arriving a conversation may simply belong to a file
+            <h2>
+              <CollapsibleTrigger className="flex w-full items-center gap-1.5 px-4 py-2 text-left text-xs text-muted-foreground">
+                {/* While slices are still arriving a conversation may simply belong to a file
                     that has not landed yet, which is not the same as being off the diff. */}
-              <span>
-                {nextCursor === null
-                  ? "Conversations not on the current diff"
-                  : "Conversations not on the diff loaded so far"}
-              </span>
-              <ChevronRightIcon
-                aria-hidden
-                className={cn("size-3.5 transition-transform", orphansOpen && "rotate-90")}
-              />
-              <span aria-hidden className="tabular-nums">
-                {orphanThreads.length}
-              </span>
-              <span className="sr-only">
-                {orphanThreads.length === 1
-                  ? "1 conversation"
-                  : `${orphanThreads.length} conversations`}
-              </span>
-            </CollapsibleTrigger>
-          </h2>
-          <CollapsiblePanel>
-            {/* Capped: opened on a change with dozens of them, this would otherwise leave no
+                <span>
+                  {nextCursor === null
+                    ? "Conversations not on the current diff"
+                    : "Conversations not on the diff loaded so far"}
+                </span>
+                <ChevronRightIcon
+                  aria-hidden
+                  className={cn("size-3.5 transition-transform", orphansOpen && "rotate-90")}
+                />
+                <span aria-hidden className="tabular-nums">
+                  {orphanThreads.length}
+                </span>
+                <span className="sr-only">
+                  {orphanThreads.length === 1
+                    ? "1 conversation"
+                    : `${orphanThreads.length} conversations`}
+                </span>
+              </CollapsibleTrigger>
+            </h2>
+            <CollapsiblePanel>
+              {/* Capped: opened on a change with dozens of them, this would otherwise leave no
                   room for the diff it sits above. */}
-            <div className="max-h-64 space-y-3 overflow-auto px-4 pb-3">
-              {[...orphanFiles].map(([path, threads]) => (
-                <div key={path}>
-                  <Tooltip>
-                    <TooltipTrigger
-                      render={<p className="truncate px-3 text-xs text-muted-foreground">{path}</p>}
-                    />
-                    <TooltipPopup side="top">{path}</TooltipPopup>
-                  </Tooltip>
-                  <div className="mt-1 space-y-2">
-                    {threads.map((thread) => (
-                      <div key={thread.id}>
-                        {thread.line === null ? null : (
-                          <p className="px-3 text-xs text-muted-foreground">Line {thread.line}</p>
-                        )}
-                        {renderThreadCard(thread)}
-                      </div>
-                    ))}
+              <div className="max-h-64 space-y-3 overflow-auto px-4 pb-3">
+                {[...orphanFiles].map(([path, threads]) => (
+                  <div key={path}>
+                    <Tooltip>
+                      <TooltipTrigger
+                        render={
+                          <p className="truncate px-3 text-xs text-muted-foreground">{path}</p>
+                        }
+                      />
+                      <TooltipPopup side="top">{path}</TooltipPopup>
+                    </Tooltip>
+                    <div className="mt-1 space-y-2">
+                      {threads.map((thread) => (
+                        <div key={thread.id}>
+                          {thread.line === null ? null : (
+                            <p className="px-3 text-xs text-muted-foreground">Line {thread.line}</p>
+                          )}
+                          {renderThreadCard(thread)}
+                        </div>
+                      ))}
+                    </div>
                   </div>
-                </div>
-              ))}
-            </div>
-          </CollapsiblePanel>
-        </Collapsible>
+                ))}
+              </div>
+            </CollapsiblePanel>
+          </Collapsible>
+        </div>
       ) : null}
       <div className="flex min-h-0 flex-1 overflow-hidden">
         {/* Relative wrapper so the review overlay floats over the diff rather than pushing it
diff --git a/apps/web/src/components/pullRequest/PullRequestCommentBody.tsx b/apps/web/src/components/pullRequest/PullRequestCommentBody.tsx
index d730c0f859a1..073cd2a07efb 100644
--- a/apps/web/src/components/pullRequest/PullRequestCommentBody.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCommentBody.tsx
@@ -44,8 +44,8 @@ export function PullRequestCommentBody({
       {overflowing ? (
         <Button
           size="xs"
-          variant="ghost"
-          className="mt-2 text-muted-foreground"
+          variant="ghost-muted"
+          className="mt-2"
           aria-expanded={expanded}
           aria-controls={id}
           onClick={() => {
diff --git a/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx b/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx
index fd7ebee57a13..39fd7470d136 100644
--- a/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx
@@ -85,7 +85,6 @@ export function PullRequestCommentForm({
     <div className="space-y-2">
       <Textarea
         ref={textareaRef}
-        className="[&_textarea]:max-h-64"
         // Locked while posting: the body is cleared on success, which would otherwise throw
         // away a new draft typed while the request was still in flight.
         disabled={submitting !== null || actionPending}
diff --git a/apps/web/src/components/pullRequest/PullRequestComposer.tsx b/apps/web/src/components/pullRequest/PullRequestComposer.tsx
index bd5839e1bf26..e00df846f39e 100644
--- a/apps/web/src/components/pullRequest/PullRequestComposer.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestComposer.tsx
@@ -78,13 +78,7 @@ export function PullRequestComposer({
       }}
     >
       <PopoverTrigger
-        render={
-          <Button
-            size="icon"
-            variant="glass"
-            className="rounded-full shadow-lg [--glass-opacity:50%]"
-          />
-        }
+        render={<Button size="icon" variant="glass" />}
         // The only label this control has, so the pending count belongs in it: the badge beside
         // the icon is decorative and a reader who cannot see it still needs the number.
         aria-label={
@@ -99,7 +93,7 @@ export function PullRequestComposer({
         {pendingComments.length > 0 ? (
           <span
             aria-hidden
-            className="absolute -top-1 -right-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-1 text-[9px] font-semibold tabular-nums text-white"
+            className="absolute -top-1 -right-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-info px-1 text-3xs font-semibold tabular-nums text-white"
           >
             {pendingComments.length}
           </span>
@@ -110,7 +104,7 @@ export function PullRequestComposer({
         side="top"
         align="end"
         sideOffset={8}
-        className="w-96 max-w-[calc(100vw-2rem)]"
+        width="lg"
         initialFocus={mode === "review" ? reviewRef : commentRef}
         aria-label="Pull request composer"
       >
@@ -131,7 +125,7 @@ export function PullRequestComposer({
               </Toggle>
             </ToggleGroup>
           ) : (
-            <PopoverTitle className="text-sm">
+            <PopoverTitle>
               {mode === "review" ? "Review pull request" : "Comment on pull request"}
             </PopoverTitle>
           )}
diff --git a/apps/web/src/components/pullRequest/PullRequestCopyableCode.tsx b/apps/web/src/components/pullRequest/PullRequestCopyableCode.tsx
index 4c9d14b53734..bcfb3b180113 100644
--- a/apps/web/src/components/pullRequest/PullRequestCopyableCode.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCopyableCode.tsx
@@ -58,7 +58,7 @@ export function PullRequestCopyableCode({
           Copied
         </span>
       </TooltipTrigger>
-      <TooltipPopup className="max-w-96 wrap-anywhere font-mono" side={tooltipSide}>
+      <TooltipPopup variant="code" side={tooltipSide}>
         {`${isCopied ? "Copied" : copyLabel}: ${value}`}
       </TooltipPopup>
     </Tooltip>
diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
index fb36fcd08752..1b42fdd4481a 100644
--- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
@@ -379,7 +379,7 @@ function PullRequestBaseFreshnessWarning({
             type="button"
             aria-label={summary}
             className={cn(
-              "inline-flex min-w-0 shrink-0 cursor-help items-center gap-1 rounded-sm text-amber-600 outline-none focus-visible:ring-2 focus-visible:ring-ring dark:text-amber-400/90",
+              "inline-flex min-w-0 shrink-0 cursor-help items-center gap-1 rounded-sm text-warning-foreground outline-none focus-visible:ring-2 focus-visible:ring-ring",
               className,
             )}
           />
@@ -388,12 +388,7 @@ function PullRequestBaseFreshnessWarning({
         {children}
         <TriangleAlertIcon aria-hidden className={cn("size-3.5 shrink-0", iconClassName)} />
       </PopoverTrigger>
-      <PopoverPopup
-        align="start"
-        side="bottom"
-        className="max-w-80"
-        viewportClassName="py-2.5 [--viewport-inline-padding:--spacing(3)]"
-      >
+      <PopoverPopup align="start" side="bottom" className="max-w-80" padding="compact">
         <p className="text-xs text-foreground">{summary}</p>
         <p className="mt-0.5 text-xs text-muted-foreground">Changes can be cleanly merged.</p>
         {/* Each way the host offers and this reader may take, as its own button: a split button
@@ -1569,7 +1564,7 @@ export function PullRequestDetailPanel({
           />
           <TooltipPopup>Check out this pull request</TooltipPopup>
         </Tooltip>
-        <MenuPopup align="end" side="bottom" className="min-w-72">
+        <MenuPopup align="end" side="bottom">
           <MenuItem onClick={() => startCheckout("worktree")}>
             <GitBranchIcon className="mt-1 size-3.5 shrink-0 self-start" />
             <span className="flex min-w-0 flex-col">
@@ -1985,9 +1980,11 @@ export function PullRequestDetailPanel({
                 </Tooltip>
               ) : (primaryAction === "merged" || primaryAction === "closed") &&
                 statePresentation !== null ? (
-                <Badge size="control" variant="outline" className={statePresentation.toneClassName}>
-                  <statePresentation.Icon className="size-3.5" />
-                  {statePresentation.label}
+                <Badge size="control" variant="outline">
+                  <span className={cn("flex items-center gap-1", statePresentation.toneClassName)}>
+                    <statePresentation.Icon className="size-3.5" />
+                    {statePresentation.label}
+                  </span>
                 </Badge>
               ) : null}
               <Menu>
@@ -2000,7 +1997,6 @@ export function PullRequestDetailPanel({
                             aria-label={
                               refreshing ? "Refreshing pull request" : "More pull request actions"
                             }
-                            className="size-6"
                             size="icon-xs"
                             variant="ghost-muted"
                           />
@@ -2021,7 +2017,7 @@ export function PullRequestDetailPanel({
                     {refreshing ? "Refreshing pull request" : "More pull request actions"}
                   </TooltipPopup>
                 </Tooltip>
-                <MenuPopup align="end" side="bottom" className="min-w-72">
+                <MenuPopup align="end" side="bottom">
                   <PullRequestThreadLinks
                     display="menu-item"
                     environmentId={environmentId}
@@ -2258,13 +2254,13 @@ export function PullRequestDetailPanel({
                     <PullRequestActorLabel
                       actor={detail.author}
                       profileUrl={authorProfileUrl}
-                      className="shrink-0 rounded-full"
-                      labelClassName="sr-only"
+                      variant="avatar"
+                      className="shrink-0"
                     />
                     <span className="shrink-0">{formatRelativeTimeLabel(detail.updatedAt)}</span>
                   </span>
                   <span aria-hidden className="h-3 w-px shrink-0 bg-border/70" />
-                  <span className="flex min-w-0 flex-1 items-center gap-1.5 font-mono text-[11px] text-muted-foreground/65">
+                  <span className="flex min-w-0 flex-1 items-center gap-1.5 font-mono text-2xs text-muted-foreground/65">
                     {/* An out-of-date base wears the warning on the branch name itself, so the
                         name is amber and pointing at either the name or the mark opens the way
                         out. Up to date, the name keeps its plain tooltip. */}
@@ -2326,7 +2322,7 @@ export function PullRequestDetailPanel({
                       <TooltipPopup side="top">{detail.headBranch}</TooltipPopup>
                     </Tooltip>
                   </span>
-                  <span className="ml-auto inline-flex shrink-0 items-center justify-end gap-2 text-[11px]">
+                  <span className="ml-auto inline-flex shrink-0 items-center justify-end gap-2 text-2xs">
                     <span
                       className="inline-flex items-center gap-1 tabular-nums"
                       aria-label={`${detail.changedFiles.toLocaleString()} changed ${
@@ -2339,7 +2335,7 @@ export function PullRequestDetailPanel({
                     <PullRequestDiffStat
                       additions={detail.additions}
                       deletions={detail.deletions}
-                      className="shrink-0 font-mono text-[11px]"
+                      className="shrink-0 font-mono text-2xs"
                     />
                   </span>
                 </div>
@@ -2434,11 +2430,7 @@ export function PullRequestDetailPanel({
                 )}
                 <div className="mt-2 flex min-h-5 min-w-0 items-center gap-2 text-xs text-muted-foreground">
                   <PullRequestMetaLine className="min-w-0 whitespace-nowrap">
-                    <PullRequestActorLabel
-                      actor={detail.author}
-                      profileUrl={authorProfileUrl}
-                      className="font-medium"
-                    />
+                    <PullRequestActorLabel actor={detail.author} profileUrl={authorProfileUrl} />
                     <span>updated {formatRelativeTimeLabel(detail.updatedAt)}</span>
                   </PullRequestMetaLine>
                   {checkoutCommand ? (
@@ -2617,7 +2609,7 @@ export function PullRequestDetailPanel({
               <div className="ml-auto flex shrink-0 items-center gap-2 text-xs text-muted-foreground">
                 <PullRequestMetaLine
                   className={cn(
-                    "whitespace-nowrap text-[11px] transition-opacity",
+                    "whitespace-nowrap text-2xs transition-opacity",
                     (activityPending || activityError) && "opacity-35",
                   )}
                 >
@@ -2672,8 +2664,7 @@ export function PullRequestDetailPanel({
                 </PullRequestMetaLine>
                 <Button
                   size="xs"
-                  variant="ghost"
-                  className="h-7 px-2 text-[10px] text-muted-foreground"
+                  variant="ghost-muted"
                   aria-label={
                     timelineOrder === "newest"
                       ? "Show oldest activity first"
diff --git a/apps/web/src/components/pullRequest/PullRequestEditButton.tsx b/apps/web/src/components/pullRequest/PullRequestEditButton.tsx
index b04ec17b8754..bdc7c26eb769 100644
--- a/apps/web/src/components/pullRequest/PullRequestEditButton.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestEditButton.tsx
@@ -12,16 +12,15 @@ export function PullRequestEditButton({
   "aria-label": string;
 }) {
   return (
-    <Button
-      {...props}
-      size="icon-xs"
-      variant="ghost"
+    <span
       className={cn(
-        "shrink-0 text-muted-foreground opacity-0 transition-opacity pointer-coarse:opacity-100 group-focus-within:opacity-100 group-hover:opacity-100 focus-visible:opacity-100 motion-reduce:transition-none",
+        "flex shrink-0 opacity-0 transition-opacity pointer-coarse:opacity-100 group-focus-within:opacity-100 group-hover:opacity-100 focus-within:opacity-100 motion-reduce:transition-none",
         className,
       )}
     >
-      <PencilIcon aria-hidden className="size-3" />
-    </Button>
+      <Button {...props} size="icon-xs" variant="ghost-muted">
+        <PencilIcon aria-hidden className="size-3" />
+      </Button>
+    </span>
   );
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestGhosts.tsx b/apps/web/src/components/pullRequest/PullRequestGhosts.tsx
index d30fe5109703..85c9802c2170 100644
--- a/apps/web/src/components/pullRequest/PullRequestGhosts.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestGhosts.tsx
@@ -169,13 +169,9 @@ export function PullRequestDetailGhost({
                 <span className="min-w-0 truncate font-medium">{seed.repository}</span>
                 <InlineButton
                   onClick={() => void readLocalApi()?.shell.openExternal(seed.url)}
-                  className={cn(
-                    "font-medium underline-offset-2 hover:underline",
-                    statePresentation?.toneClassName,
-                  )}
                   aria-label={`Open pull request #${seed.number} on host`}
                 >
-                  #{seed.number}
+                  <span className={statePresentation?.toneClassName}>#{seed.number}</span>
                   <ExternalLinkIcon aria-hidden className="size-2.5" />
                 </InlineButton>
               </>
@@ -219,11 +215,7 @@ export function PullRequestDetailGhost({
               <div className="mt-2 flex min-h-5 min-w-0 items-center gap-2 text-xs text-muted-foreground">
                 {seed ? (
                   <PullRequestMetaLine className="min-w-0 whitespace-nowrap">
-                    <PullRequestActorLabel
-                      actor={seed.author ?? null}
-                      className="font-medium"
-                      tooltip={false}
-                    />
+                    <PullRequestActorLabel actor={seed.author ?? null} tooltip={false} />
                     <span>updated {formatRelativeTimeLabel(seed.updatedAt)}</span>
                   </PullRequestMetaLine>
                 ) : (
diff --git a/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx b/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx
index 1ed759eaa80e..3f183b264b2b 100644
--- a/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestLinkPreview.tsx
@@ -15,6 +15,7 @@ import { useAtomQueryRunner } from "~/state/use-atom-query-runner";
 import { useEnvironmentQuery } from "~/state/query";
 
 import { PreviewCard, PreviewCardPopup, PreviewCardTrigger } from "../ui/preview-card";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { PullRequestActorAvatar, resolvePullRequestState } from "./pullRequestPresentation";
 
 interface PullRequestLinkPreviewTarget {
@@ -81,6 +82,8 @@ export function PullRequestLinkPreview({
         })
       : link;
   const detail = detailQuery.data;
+  const showCard = detail !== null || (detailQuery.error !== null && fallback !== undefined);
+  const showUrlTooltip = open && detailQuery.error !== null && !showCard;
   const state =
     detail === null
       ? null
@@ -94,39 +97,46 @@ export function PullRequestLinkPreview({
 
   return (
     <PreviewCard open={open} onOpenChange={setOpen}>
-      <PreviewCardTrigger render={trigger} delay={350} closeDelay={120} />
-      {detail !== null || detailQuery.error !== null ? (
-        <PreviewCardPopup align="center" className="w-80 max-w-[calc(100vw-2rem)] p-3">
-          {detail === null ? (
-            (fallback ?? (
-              <p className="text-xs leading-relaxed text-muted-foreground wrap-anywhere">
-                {originalUrl}
-              </p>
-            ))
-          ) : (
-            <div className="min-w-0">
-              <div className="flex min-w-0 items-center gap-1.5 text-[11px] text-muted-foreground">
-                <span className="min-w-0 truncate">{detail.repository}</span>
-                <span className="shrink-0">#{detail.number}</span>
-                <span aria-hidden>·</span>
-                {state === null ? null : (
-                  <span className="inline-flex shrink-0 items-center gap-1">
-                    <state.Icon aria-hidden className={`size-3 ${state.toneClassName}`} />
-                    {state.label}
+      <Tooltip open={showUrlTooltip}>
+        <PreviewCardTrigger
+          render={<TooltipTrigger render={trigger} />}
+          delay={350}
+          closeDelay={120}
+        />
+        <TooltipPopup side="top">{originalUrl}</TooltipPopup>
+      </Tooltip>
+      {showCard ? (
+        <PreviewCardPopup align="center" className="w-80 max-w-[calc(100vw-2rem)]">
+          <div className="p-3">
+            {detail === null ? (
+              fallback
+            ) : (
+              <div className="min-w-0">
+                <div className="flex min-w-0 items-center gap-1.5 text-2xs text-muted-foreground">
+                  <span className="min-w-0 truncate">{detail.repository}</span>
+                  <span className="shrink-0">#{detail.number}</span>
+                  <span aria-hidden>·</span>
+                  {state === null ? null : (
+                    <span className="inline-flex shrink-0 items-center gap-1">
+                      <state.Icon aria-hidden className={`size-3 ${state.toneClassName}`} />
+                      {state.label}
+                    </span>
+                  )}
+                </div>
+                <p className="mt-1 text-sm font-medium leading-snug text-foreground text-pretty">
+                  {detail.title}
+                </p>
+                <div className="mt-2 flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
+                  <PullRequestActorAvatar actor={detail.author} className="size-4" />
+                  <span className="min-w-0 truncate">{authorLabel}</span>
+                  <span aria-hidden>·</span>
+                  <span className="shrink-0">
+                    opened {formatRelativeTimeLabel(detail.createdAt)}
                   </span>
-                )}
+                </div>
               </div>
-              <p className="mt-1 text-sm font-medium leading-snug text-foreground text-pretty">
-                {detail.title}
-              </p>
-              <div className="mt-2 flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
-                <PullRequestActorAvatar actor={detail.author} className="size-4" />
-                <span className="min-w-0 truncate">{authorLabel}</span>
-                <span aria-hidden>·</span>
-                <span className="shrink-0">opened {formatRelativeTimeLabel(detail.createdAt)}</span>
-              </div>
-            </div>
-          )}
+            )}
+          </div>
         </PreviewCardPopup>
       ) : null}
     </PreviewCard>
diff --git a/apps/web/src/components/pullRequest/PullRequestListEmptyState.tsx b/apps/web/src/components/pullRequest/PullRequestListEmptyState.tsx
index 6c4fb9769b43..a5c60d3dada0 100644
--- a/apps/web/src/components/pullRequest/PullRequestListEmptyState.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestListEmptyState.tsx
@@ -100,7 +100,7 @@ export function PullRequestListEmptyState({
   // Ahead of the search and the filters, because neither can produce a row until a project does.
   if (!hasProjects) {
     return (
-      <Empty className="py-16">
+      <Empty>
         <BranchMark joined={false} />
         <EmptyHeader>
           <EmptyTitle>No projects in this workspace</EmptyTitle>
@@ -131,7 +131,7 @@ export function PullRequestListEmptyState({
 
   if (query.length > 0) {
     return (
-      <Empty className="py-16">
+      <Empty>
         <BranchMark joined={false} />
         <EmptyHeader>
           {/* A pasted paragraph is still a search, but it is not a title. */}
@@ -142,7 +142,7 @@ export function PullRequestListEmptyState({
             The hosts were searched for it. Try fewer words, or search by number, author or branch.
           </EmptyDescription>
         </EmptyHeader>
-        <EmptyContent className="flex-row flex-wrap justify-center gap-2">
+        <div className="flex flex-wrap justify-center gap-2">
           <Button size="sm" variant="outline" onClick={onClearQuery}>
             <SearchIcon className="size-3.5" />
             Clear search
@@ -153,13 +153,13 @@ export function PullRequestListEmptyState({
             <RefreshIcon size="sm" refreshing={refreshing} />
             {refreshing ? "Checking..." : "Check again"}
           </Button>
-        </EmptyContent>
+        </div>
       </Empty>
     );
   }
 
   return (
-    <Empty className="py-16">
+    <Empty>
       <BranchMark joined={false} />
       <EmptyHeader>
         <EmptyTitle>{filtered ? "Nothing under these filters" : "No pull requests"}</EmptyTitle>
@@ -169,7 +169,7 @@ export function PullRequestListEmptyState({
             : "Pull requests from every project in this workspace appear here."}
         </EmptyDescription>
       </EmptyHeader>
-      <EmptyContent className="flex-row flex-wrap justify-center gap-2">
+      <div className="flex flex-wrap justify-center gap-2">
         {canLoadMore ? (
           <Button size="sm" variant="outline" disabled={loadingMore} onClick={onLoadMore}>
             {loadingMore ? "Loading..." : "Load more pull requests"}
@@ -179,7 +179,7 @@ export function PullRequestListEmptyState({
           <RefreshIcon size="sm" refreshing={refreshing} />
           {refreshing ? "Checking..." : "Check again"}
         </Button>
-      </EmptyContent>
+      </div>
     </Empty>
   );
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestListFilters.tsx b/apps/web/src/components/pullRequest/PullRequestListFilters.tsx
index 9b4769109c23..0cbfde70dfd8 100644
--- a/apps/web/src/components/pullRequest/PullRequestListFilters.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestListFilters.tsx
@@ -202,9 +202,7 @@ function PullRequestFilterRadioGroup<Value extends string>({
         return (
           <Tooltip key={option.value}>
             <TooltipTrigger render={item} />
-            <TooltipPopup side="top" className="max-w-80">
-              {option.unavailable}
-            </TooltipPopup>
+            <TooltipPopup side="top">{option.unavailable}</TooltipPopup>
           </Tooltip>
         );
       })}
@@ -234,7 +232,7 @@ function PullRequestFilterRadioSubmenu<Value extends string>({
           {current.label}
         </span>
       </MenuSubTrigger>
-      <MenuSubPopup className="min-w-56">
+      <MenuSubPopup>
         <PullRequestFilterRadioGroup
           label={label}
           value={value}
@@ -279,7 +277,7 @@ function PullRequestAuthorFilter({
           {value ?? "Anyone"}
         </span>
       </MenuSubTrigger>
-      <MenuSubPopup className="w-80">
+      <MenuSubPopup>
         <div className="p-1 pb-2">
           <InputGroup>
             <InputGroupAddon>
@@ -348,7 +346,7 @@ function PullRequestLabelFilter({
           {value.length === 0 ? "Any" : `${value.length} selected`}
         </span>
       </MenuSubTrigger>
-      <MenuSubPopup className="w-72">
+      <MenuSubPopup>
         {visible.length === 0 ? (
           <MenuItem disabled>No labels in this view</MenuItem>
         ) : (
@@ -359,7 +357,6 @@ function PullRequestLabelFilter({
             return (
               <MenuCheckboxItem
                 key={key}
-                className="grid-cols-[1rem_minmax(0,1fr)]"
                 checked={checked}
                 onCheckedChange={(next) =>
                   onChange(
@@ -503,14 +500,7 @@ export function PullRequestFiltersMenu({
   ];
   return (
     <Menu onOpenChange={onOpenChange}>
-      <MenuTrigger
-        render={
-          <Button
-            className={filterCount > 0 ? "[--control-icon-color:currentColor]" : undefined}
-            variant="outline"
-          />
-        }
-      >
+      <MenuTrigger render={<Button variant="outline" />}>
         <ListFilterIcon className="size-4" />
         <span>Filters</span>
         {filterCount > 0 ? (
@@ -519,7 +509,7 @@ export function PullRequestFiltersMenu({
           </span>
         ) : null}
       </MenuTrigger>
-      <MenuPopup align="end" side="bottom" className="w-56">
+      <MenuPopup align="end" side="bottom">
         <PullRequestFilterRadioSubmenu
           label="State"
           value={state}
diff --git a/apps/web/src/components/pullRequest/PullRequestListRow.tsx b/apps/web/src/components/pullRequest/PullRequestListRow.tsx
index ea1577a23558..67dcb6a5f3cf 100644
--- a/apps/web/src/components/pullRequest/PullRequestListRow.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestListRow.tsx
@@ -68,7 +68,7 @@ export function PullRequestRowGlyph({
           />
         </span>
       </span>
-      {below ? <span className="inline-flex text-[11px]">{below}</span> : null}
+      {below ? <span className="inline-flex text-2xs">{below}</span> : null}
     </span>
   );
 }
@@ -100,15 +100,15 @@ export function PullRequestRowLines({
         {number}
         <span className="min-w-0 truncate text-sm">{title}</span>
         {signals ? (
-          <span className="flex shrink-0 items-center gap-1 text-[11px]">{signals}</span>
+          <span className="flex shrink-0 items-center gap-1 text-2xs">{signals}</span>
         ) : null}
         {status ? (
-          <span className="ml-auto flex shrink-0 items-center gap-1.5 text-[11px]">{status}</span>
+          <span className="ml-auto flex shrink-0 items-center gap-1.5 text-2xs">{status}</span>
         ) : null}
       </span>
       <span
         className={cn(
-          "flex min-w-0 items-center gap-1.5 overflow-hidden text-[11px] text-muted-foreground",
+          "flex min-w-0 items-center gap-1.5 overflow-hidden text-2xs text-muted-foreground",
           metaClassName,
         )}
       >
diff --git a/apps/web/src/components/pullRequest/PullRequestReactions.tsx b/apps/web/src/components/pullRequest/PullRequestReactions.tsx
index 82e80b86c2f7..f653dcea94d2 100644
--- a/apps/web/src/components/pullRequest/PullRequestReactions.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestReactions.tsx
@@ -134,7 +134,7 @@ export function PullRequestReactionBar({
           >
             <SmilePlusIcon aria-hidden className="size-3.5" />
           </PopoverTrigger>
-          <PopoverPopup align="start" className="w-auto" side="top" viewportClassName="py-2">
+          <PopoverPopup align="start" side="top" padding="compact">
             <div className="flex items-center gap-0.5">
               {PULL_REQUEST_REACTION_ORDER.map((content) => {
                 const reacted =
diff --git a/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx b/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
index d49cb52cc3f2..1ba8ccba3780 100644
--- a/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
@@ -220,7 +220,7 @@ export function ReviewThreadCard({
     >
       <div className="flex items-center gap-2 text-xs text-muted-foreground">
         {thread.isResolved ? (
-          <CheckCircle2Icon className="size-3.5 text-emerald-600 dark:text-emerald-500" />
+          <CheckCircle2Icon className="size-3.5 text-success-foreground" />
         ) : (
           <CircleIcon className="size-3.5" />
         )}
@@ -265,7 +265,7 @@ export function ReviewThreadCard({
             {comments.map((comment) => (
               <article key={comment.id} className="group min-w-0">
                 <div className="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
-                  <PullRequestActorLabel actor={comment.author} className="text-foreground" />
+                  <PullRequestActorLabel actor={comment.author} />
                   <span>{formatRelativeTimeLabel(comment.createdAt)}</span>
                   <PullRequestReactionBar
                     className="ml-auto justify-end"
@@ -312,7 +312,6 @@ export function ReviewThreadCard({
               <Button
                 size="xs"
                 variant="ghost"
-                className="px-1"
                 disabled={loadingMore}
                 onClick={() => void loadMore()}
               >
@@ -352,12 +351,7 @@ export function ReviewThreadCard({
                 </div>
               </div>
             ) : (
-              <Button
-                size="xs"
-                variant="ghost"
-                className="mt-2 px-1"
-                onClick={() => setReplying(true)}
-              >
+              <Button size="xs" variant="ghost" className="mt-2" onClick={() => setReplying(true)}>
                 Reply
               </Button>
             )
diff --git a/apps/web/src/components/pullRequest/PullRequestReviewForm.tsx b/apps/web/src/components/pullRequest/PullRequestReviewForm.tsx
index 68182eda7574..f4f9ed18381b 100644
--- a/apps/web/src/components/pullRequest/PullRequestReviewForm.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestReviewForm.tsx
@@ -126,7 +126,6 @@ export function PullRequestReviewForm({
       <Textarea
         ref={textareaRef}
         rows={3}
-        className="[&_textarea]:max-h-64"
         value={body}
         placeholder={
           requestChangesSummaryRequired && verdicts.includes("request-changes")
diff --git a/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx b/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
index ac4c83ad714e..aeefa28a9c50 100644
--- a/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
@@ -120,7 +120,7 @@ export function PullRequestReviewerPicker({
     >
       {(candidate) => (
         <>
-          <PullRequestActorLabel actor={candidate} className="min-w-0 flex-1 truncate" />
+          <PullRequestActorLabel actor={candidate} className="flex-1" />
           {candidate.kind === "team" ? (
             <span className="shrink-0 text-muted-foreground">team</span>
           ) : null}
diff --git a/apps/web/src/components/pullRequest/PullRequestRow.tsx b/apps/web/src/components/pullRequest/PullRequestRow.tsx
index e32decde136c..04008281f5e7 100644
--- a/apps/web/src/components/pullRequest/PullRequestRow.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestRow.tsx
@@ -27,10 +27,11 @@ import {
  * narrow row shows one label and a "+N" while a wide one spreads out up to three. The "+N"
  * rides on whichever pill is the last visible one, and is hidden as soon as the next slot shows.
  */
+// Each slot's pill appears at a wider row, and its overflow count yields to the next slot.
 const LABEL_SLOTS = [
-  { pill: "", overflow: "@xl/pr-row-meta:hidden" },
-  { pill: "hidden @xl/pr-row-meta:inline-flex", overflow: "@3xl/pr-row-meta:hidden" },
-  { pill: "hidden @3xl/pr-row-meta:inline-flex", overflow: "" },
+  { overflow: "@xl/pr-row-meta:hidden" },
+  { overflow: "@3xl/pr-row-meta:hidden" },
+  { overflow: "" },
 ] as const;
 
 function PullRequestRowLabels({ labels }: { labels: EnvironmentPullRequestEntry["labels"] }) {
@@ -42,7 +43,17 @@ function PullRequestRowLabels({ labels }: { labels: EnvironmentPullRequestEntry[
         if (!label) return null;
         const remaining = labels.length - index - 1;
         return (
-          <PullRequestLabelChip key={label.name} label={label} className={slot.pill}>
+          <PullRequestLabelChip
+            key={label.name}
+            label={label}
+            className={
+              index === 0
+                ? ""
+                : index === 1
+                  ? "hidden @xl/pr-row-meta:inline-flex"
+                  : "hidden @3xl/pr-row-meta:inline-flex"
+            }
+          >
             {remaining > 0 ? (
               <span className={cn("shrink-0", slot.overflow)}>+{remaining}</span>
             ) : null}
@@ -193,7 +204,7 @@ function PullRequestRowImpl({
               <Tooltip>
                 <TooltipTrigger
                   render={
-                    <span className="flex min-w-6 items-center gap-1 overflow-hidden rounded-full border border-border/60 px-1 text-[10px]" />
+                    <span className="flex min-w-6 items-center gap-1 overflow-hidden rounded-full border border-border/60 px-1 text-3xs" />
                   }
                 >
                   <span className="sr-only">matched in the description</span>
diff --git a/apps/web/src/components/pullRequest/PullRequestStackHeader.tsx b/apps/web/src/components/pullRequest/PullRequestStackHeader.tsx
index a97c4ab77a29..51df3bbb096c 100644
--- a/apps/web/src/components/pullRequest/PullRequestStackHeader.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestStackHeader.tsx
@@ -11,16 +11,18 @@ export function PullRequestStackHeader({
   stale?: boolean;
 }) {
   return (
-    <MenuGroupLabel className="flex items-center justify-between gap-2">
-      <span>Stack #{number}</span>
-      {notice ? (
-        <Tooltip>
-          <TooltipTrigger render={<span role="status" className="text-xs font-normal" />}>
-            {stale ? "May be stale" : "Refreshing…"}
-          </TooltipTrigger>
-          <TooltipPopup>{notice}</TooltipPopup>
-        </Tooltip>
-      ) : null}
+    <MenuGroupLabel>
+      <div className="flex items-center justify-between gap-2">
+        <span>Stack #{number}</span>
+        {notice ? (
+          <Tooltip>
+            <TooltipTrigger render={<span role="status" className="text-xs font-normal" />}>
+              {stale ? "May be stale" : "Refreshing…"}
+            </TooltipTrigger>
+            <TooltipPopup>{notice}</TooltipPopup>
+          </Tooltip>
+        ) : null}
+      </div>
     </MenuGroupLabel>
   );
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx b/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
index 28fc9cdc67f0..61eeed0f0f32 100644
--- a/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
@@ -145,7 +145,7 @@ export function PullRequestStackMenu({
             {notice ? ` · ${notice}` : null}
           </TooltipPopup>
         </Tooltip>
-        <MenuPopup align="start" className="w-96 max-w-[calc(100vw-2rem)]">
+        <MenuPopup align="start">
           <MenuGroup>
             <PullRequestStackHeader number={stack.number} notice={notice} stale={!!onRetry} />
             {onRetry ? <MenuItem onClick={onRetry}>Retry stack refresh</MenuItem> : null}
diff --git a/apps/web/src/components/pullRequest/PullRequestStackPopover.tsx b/apps/web/src/components/pullRequest/PullRequestStackPopover.tsx
index 9f2267e4572c..b15aad925e5f 100644
--- a/apps/web/src/components/pullRequest/PullRequestStackPopover.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestStackPopover.tsx
@@ -85,7 +85,6 @@ export function PullRequestStackPopover({
       </Tooltip>
       <MenuPopup
         align="start"
-        className="w-96 max-w-[calc(100vw-2rem)]"
         onClick={(event) => event.stopPropagation()}
         onKeyDown={(event) => event.stopPropagation()}
       >
diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
index b461e4d5859d..cd2eaf6de501 100644
--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
@@ -78,11 +78,7 @@ function CommentIdentity({
       : null;
   return (
     <div className="flex min-w-0 flex-1 flex-wrap items-center gap-x-2 gap-y-1 text-xs">
-      <PullRequestActorLabel
-        actor={actor}
-        profileUrl={profileUrl}
-        className="max-w-full font-medium text-foreground [&>img]:size-6 [&>span:first-child]:size-6"
-      />
+      <PullRequestActorLabel actor={actor} profileUrl={profileUrl} className="max-w-full" />
       <Tooltip>
         <TooltipTrigger
           render={
@@ -378,74 +374,77 @@ function CommentGroup({
     null,
   );
   return (
-    <Collapsible
-      className="overflow-hidden rounded-lg border border-border/70 bg-muted/20"
-      onOpenChange={onOpenChange}
-    >
-      <div className="flex items-center gap-3 pl-3">
-        <div className="flex shrink-0 -space-x-1.5">
-          {authors.slice(0, 3).map((actor) => (
-            <PullRequestActorLabel
-              key={actor?.login ?? "ghost"}
-              actor={actor}
-              profileUrl={
-                detail.provider === "github" && actor
-                  ? new URL(
-                      actor.isBot || actor.login.endsWith("[bot]")
-                        ? `/apps/${encodeURIComponent(actor.login.replace(/\[bot\]$/, ""))}`
-                        : `/${encodeURIComponent(actor.login)}`,
-                      detail.url,
-                    ).toString()
-                  : null
-              }
-              labelClassName="sr-only"
-              className="relative rounded-full bg-background ring-2 ring-background hover:z-10 focus-visible:z-10 [&>img]:size-6 [&>span:first-child]:size-6"
-            />
-          ))}
-          {authors.length > 3 ? (
-            <span className="relative flex size-6 items-center justify-center rounded-full bg-muted text-[10px] text-muted-foreground ring-2 ring-background">
-              +{authors.length - 3}
-            </span>
-          ) : null}
-        </div>
-        <CollapsibleTrigger
-          aria-label={label}
-          className="group flex min-w-0 flex-1 items-center gap-3 rounded-md py-3 pr-3 text-left hover:bg-muted/30"
-        >
-          <span className="min-w-0 flex-1 space-y-1">
-            <span className="block text-xs font-medium text-foreground/90">{label}</span>
-            <span className="flex flex-wrap gap-x-1.5 text-[11px] text-muted-foreground">
-              <span>
-                {authors.length} {authors.length === 1 ? "author" : "authors"}
+    <div className="overflow-hidden rounded-lg border border-border bg-background">
+      <Collapsible onOpenChange={onOpenChange}>
+        <div className="flex items-center gap-3 pl-3">
+          <div className="flex shrink-0 -space-x-1.5">
+            {authors.slice(0, 3).map((actor) => (
+              // The ring separates the overlapping faces; it belongs to the stack, not the actor.
+              <span
+                key={actor?.login ?? "ghost"}
+                className="relative flex rounded-full ring-2 ring-background hover:z-10 focus-within:z-10"
+              >
+                <PullRequestActorLabel
+                  actor={actor}
+                  profileUrl={
+                    detail.provider === "github" && actor
+                      ? new URL(
+                          actor.isBot || actor.login.endsWith("[bot]")
+                            ? `/apps/${encodeURIComponent(actor.login.replace(/\[bot\]$/, ""))}`
+                            : `/${encodeURIComponent(actor.login)}`,
+                          detail.url,
+                        ).toString()
+                      : null
+                  }
+                  variant="avatar"
+                />
               </span>
-              {fileCount > 0 ? (
-                <span>
-                  · {fileCount} {fileCount === 1 ? "file" : "files"}
-                </span>
-              ) : null}
-              {latest ? (
+            ))}
+            {authors.length > 3 ? (
+              <span className="relative flex size-6 items-center justify-center rounded-full bg-muted text-3xs text-muted-foreground ring-2 ring-background">
+                +{authors.length - 3}
+              </span>
+            ) : null}
+          </div>
+          <CollapsibleTrigger
+            aria-label={label}
+            className="group flex min-w-0 flex-1 items-center gap-3 rounded-md py-3 pr-3 text-left hover:bg-muted/30"
+          >
+            <span className="min-w-0 flex-1 space-y-1">
+              <span className="block text-xs font-medium text-foreground/90">{label}</span>
+              <span className="flex flex-wrap gap-x-1.5 text-2xs text-muted-foreground">
                 <span>
-                  · Latest{" "}
-                  <Tooltip>
-                    <TooltipTrigger render={<time dateTime={latest} />}>
-                      {formatRelativeTimeLabel(latest)}
-                    </TooltipTrigger>
-                    <TooltipPopup>{new Date(latest).toLocaleString()}</TooltipPopup>
-                  </Tooltip>
+                  {authors.length} {authors.length === 1 ? "author" : "authors"}
                 </span>
-              ) : null}
+                {fileCount > 0 ? (
+                  <span>
+                    · {fileCount} {fileCount === 1 ? "file" : "files"}
+                  </span>
+                ) : null}
+                {latest ? (
+                  <span>
+                    · Latest{" "}
+                    <Tooltip>
+                      <TooltipTrigger render={<time dateTime={latest} />}>
+                        {formatRelativeTimeLabel(latest)}
+                      </TooltipTrigger>
+                      <TooltipPopup>{new Date(latest).toLocaleString()}</TooltipPopup>
+                    </Tooltip>
+                  </span>
+                ) : null}
+              </span>
             </span>
-          </span>
-          <ChevronRightIcon
-            aria-hidden
-            className="size-3.5 shrink-0 text-muted-foreground transition-transform group-data-panel-open:rotate-90"
-          />
-        </CollapsibleTrigger>
-      </div>
-      <CollapsiblePanel keepMounted>
-        <div className="border-t border-border/60 px-3 pb-3">{children}</div>
-      </CollapsiblePanel>
-    </Collapsible>
+            <ChevronRightIcon
+              aria-hidden
+              className="size-3.5 shrink-0 text-muted-foreground transition-transform group-data-panel-open:rotate-90"
+            />
+          </CollapsibleTrigger>
+        </div>
+        <CollapsiblePanel keepMounted>
+          <div className="border-t border-border/60 px-3 pb-3">{children}</div>
+        </CollapsiblePanel>
+      </Collapsible>
+    </div>
   );
 }
 
@@ -753,14 +752,7 @@ export function PullRequestSummaryTab({
                           <PullRequestActorLabel
                             actor={entry.actor}
                             tooltip={false}
-                            className={cn(
-                              "gap-0 [&>span:last-child]:sr-only",
-                              // Only where the wrapper is not already drawing one, or the opaque
-                              // separator would cover the verdict in the band they share.
-                              entry.outcome
-                                ? undefined
-                                : "[&>img]:ring-2 [&>img]:ring-background [&>span:first-child]:ring-2 [&>span:first-child]:ring-background",
-                            )}
+                            variant="avatar"
                           />
                           {/* Colour alone says nothing to a reader who cannot see it, and the
                               login beside this is already in the accessible name. */}
@@ -930,8 +922,8 @@ export function PullRequestSummaryTab({
         actions={
           <Button
             size="xs"
-            variant="ghost"
-            className="h-7 shrink-0 px-2 text-[10px] text-muted-foreground"
+            variant="ghost-muted"
+            className="shrink-0"
             aria-label={
               commentOrder === "newest"
                 ? "Show oldest comments first"
@@ -951,7 +943,7 @@ export function PullRequestSummaryTab({
         ) : (
           <>
             {detail.commentsTruncated ? (
-              <p className="mb-2 rounded-md border border-amber-500/30 bg-amber-500/5 px-2 py-1.5 text-xs">
+              <p className="mb-2 rounded-md border border-warning/30 bg-warning-surface px-2 py-1.5 text-xs">
                 This conversation is longer than this page reads in one go. The most recent{" "}
                 {detail.comments.length} are here; open it on the host to read the rest.
               </p>
diff --git a/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx b/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
index 5d0ba801edb5..9435304f6d7e 100644
--- a/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
@@ -141,7 +141,7 @@ function ActorTimelineMarker({
       <PullRequestActorAvatar
         actor={actor}
         className={cn(
-          "size-7 bg-muted text-[9px] transition-opacity",
+          "size-7 bg-muted text-3xs transition-opacity",
           muted && "opacity-45 grayscale",
         )}
       />
@@ -156,9 +156,7 @@ function friendlyReviewState(value: string): string {
 
 function ReviewStateBadge({ state }: { state: string }) {
   return (
-    <span className="text-[10px] font-medium text-muted-foreground">
-      {friendlyReviewState(state)}
-    </span>
+    <span className="text-3xs font-medium text-muted-foreground">{friendlyReviewState(state)}</span>
   );
 }
 
@@ -166,8 +164,8 @@ function OpenOnHostButton({ url, onOpen }: { url: string | null; onOpen: (url: s
   return url === null ? null : (
     <Button
       size="icon-xs"
-      variant="ghost"
-      className="-mr-1 -mt-1 shrink-0 text-muted-foreground"
+      variant="ghost-muted"
+      className="-mr-1 -mt-1 shrink-0"
       aria-label="Open activity on host"
       onClick={() => onOpen(url)}
     >
@@ -224,7 +222,7 @@ function ConversationCard({
               <span className="text-muted-foreground">{event.title}</span>
               {event.reviewState ? <ReviewStateBadge state={event.reviewState} /> : null}
             </div>
-            <PullRequestMetaLine className="mt-1 flex-wrap text-[11px] text-muted-foreground">
+            <PullRequestMetaLine className="mt-1 flex-wrap text-2xs text-muted-foreground">
               <span>{formatRelativeTimeLabel(event.at)}</span>
               {event.path ? (
                 <span className="inline-flex min-w-0 items-center gap-1">
@@ -330,7 +328,7 @@ function ConversationGroup({
               <span className="block text-xs font-semibold">
                 {events.length.toLocaleString()} {events.length === 1 ? "comment" : "comments"}
               </span>
-              <span className="block truncate text-[10px] text-muted-foreground">
+              <span className="block truncate text-3xs text-muted-foreground">
                 {actors.length.toLocaleString()} {actors.length === 1 ? "author" : "authors"} ·{" "}
                 {formatRelativeTimeLabel(first.at)}
               </span>
@@ -391,7 +389,7 @@ function CommitEvent({
           <div className="truncate text-xs font-semibold text-foreground transition-colors group-hover:text-primary">
             {event.body ?? "Untitled commit"}
           </div>
-          <div className="mt-1 flex flex-wrap items-center gap-x-2 gap-y-0.5 text-[10px] text-muted-foreground">
+          <div className="mt-1 flex flex-wrap items-center gap-x-2 gap-y-0.5 text-3xs text-muted-foreground">
             <code className="font-mono">{event.id.slice(0, 7)}</code>
             <span>{formatRelativeTimeLabel(event.at)}</span>
           </div>
@@ -400,7 +398,7 @@ function CommitEvent({
           <PullRequestDiffStat
             additions={event.additions}
             deletions={event.deletions}
-            className="ml-auto shrink-0 font-mono text-[10px]"
+            className="ml-auto shrink-0 font-mono text-3xs"
           />
         ) : null}
       </div>
@@ -433,7 +431,7 @@ function LifecycleEvent({ event }: { event: PullRequestTimelineEvent }) {
           {event.actor ? <ActorName actor={event.actor} /> : null}
           <span className="font-semibold text-foreground">{presentation.label}</span>
         </div>
-        <div className="mt-0.5 text-[11px] text-muted-foreground">
+        <div className="mt-0.5 text-2xs text-muted-foreground">
           {formatRelativeTimeLabel(event.at)}
         </div>
       </div>
@@ -500,7 +498,7 @@ function ReviewVerdictEvent({
             </Tooltip>
           </div>
           <div className="mt-0.5 flex min-w-0 flex-wrap items-center gap-x-2 gap-y-1">
-            <PullRequestMetaLine className="flex-wrap text-[11px] text-muted-foreground">
+            <PullRequestMetaLine className="flex-wrap text-2xs text-muted-foreground">
               <span>{formatRelativeTimeLabel(event.at)}</span>
               {event.path ? (
                 <span className="inline-flex min-w-0 items-center gap-1">
diff --git a/apps/web/src/components/pullRequest/PullRequestsUnavailableState.tsx b/apps/web/src/components/pullRequest/PullRequestsUnavailableState.tsx
index 364df38b3e7d..da182d268637 100644
--- a/apps/web/src/components/pullRequest/PullRequestsUnavailableState.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestsUnavailableState.tsx
@@ -2,14 +2,7 @@ import { RefreshIcon } from "~/components/ui/refresh-icon";
 import { ExternalLinkIcon } from "lucide-react";
 
 import { Button } from "../ui/button";
-import {
-  Empty,
-  EmptyContent,
-  EmptyDescription,
-  EmptyHeader,
-  EmptyMedia,
-  EmptyTitle,
-} from "../ui/empty";
+import { Empty, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "../ui/empty";
 import { PullRequestGlyph } from "./pullRequestIcons";
 
 export function PullRequestsUnavailableState({
@@ -26,7 +19,7 @@ export function PullRequestsUnavailableState({
   gitHubUrl?: string;
 }) {
   return (
-    <Empty className="min-h-0 justify-center-safe overflow-y-auto px-4 py-16 md:px-4 [&>*]:shrink-0">
+    <Empty className="min-h-0 justify-center-safe overflow-y-auto [&>*]:shrink-0">
       <EmptyMedia variant="icon">
         <PullRequestGlyph.pullRequest />
       </EmptyMedia>
@@ -37,7 +30,7 @@ export function PullRequestsUnavailableState({
         <EmptyDescription>{error}</EmptyDescription>
       </EmptyHeader>
       {onRetry || gitHubUrl ? (
-        <EmptyContent className="flex-row flex-wrap justify-center gap-2">
+        <div className="flex flex-wrap justify-center gap-2">
           {onRetry ? (
             <Button
               size="sm"
@@ -60,7 +53,7 @@ export function PullRequestsUnavailableState({
               Open on GitHub
             </Button>
           ) : null}
-        </EmptyContent>
+        </div>
       ) : null}
     </Empty>
   );
diff --git a/apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx b/apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx
index 15221f26e63d..3dd1bcbefaff 100644
--- a/apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx
+++ b/apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx
@@ -16,6 +16,7 @@ import { useAtomCommand } from "~/state/use-atom-command";
 import { formatRelativeTimeLabel } from "~/timestampFormat";
 import { Button } from "../ui/button";
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu";
+import { MiddleTruncate } from "../ui/middle-truncate";
 import { ScrollArea } from "../ui/scroll-area";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { openLinkPullRequestDialog } from "./LinkPullRequestDialog";
@@ -161,7 +162,17 @@ function LinkRow({
                 />
               ) : null}
               {snapshot !== null ? (
-                <PullRequestRowBranches head={snapshot.headBranch} base={snapshot.baseBranch} />
+                <>
+                  {/* Cut in the middle: rows from one owner differ in the repository name at the
+                      end, which a tail cut would hide. */}
+                  <Tooltip>
+                    <TooltipTrigger render={<span className="flex min-w-0 max-w-32 font-mono" />}>
+                      <MiddleTruncate value={link.repository} showTitle={false} />
+                    </TooltipTrigger>
+                    <TooltipPopup>{link.repository}</TooltipPopup>
+                  </Tooltip>
+                  <PullRequestRowBranches head={snapshot.headBranch} base={snapshot.baseBranch} />
+                </>
               ) : (
                 <span className="truncate font-mono">
                   {link.host}/{link.repository}
@@ -297,7 +308,7 @@ function EnabledThreadPullRequestsPanel({ threadRef }: { threadRef: ScopedThread
           ))}
         </div>
       </ScrollArea>
-      <footer className="flex items-center justify-between border-t border-border/60 px-2 py-1.5 text-[.7rem] text-muted-foreground">
+      <footer className="flex items-center justify-between border-t border-border/60 px-2 py-1.5 text-2xs text-muted-foreground">
         <span>
           {openCount} open · {links.length} linked
           {lastSynced ? ` · synced ${formatRelativeTimeLabel(lastSynced)}` : ""}
diff --git a/apps/web/src/components/pullRequest/pullRequestPresentation.tsx b/apps/web/src/components/pullRequest/pullRequestPresentation.tsx
index d46cad36622c..3ab443363cd2 100644
--- a/apps/web/src/components/pullRequest/pullRequestPresentation.tsx
+++ b/apps/web/src/components/pullRequest/pullRequestPresentation.tsx
@@ -23,6 +23,7 @@ import { Children, type CSSProperties, isValidElement, type ReactNode, useState
 import { cn } from "~/lib/utils";
 
 import { Badge } from "../ui/badge";
+import { InlineButton } from "../ui/button";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import type { PullRequestReviewOutcome } from "./pullRequestDetail.logic";
 import { pullRequestLabelColor } from "./pullRequestList.logic";
@@ -57,14 +58,8 @@ export function PullRequestLabelChip({
   return (
     <Badge
       size={size}
-      variant="secondary"
-      className={cn(
-        "min-w-0 max-w-40 shrink justify-start gap-1 rounded-full px-2",
-        size === "sm" && "h-4 text-[.625rem]",
-        color &&
-          "bg-[color-mix(in_srgb,var(--label)_8%,transparent)] text-[color-mix(in_srgb,var(--label)_30%,var(--color-foreground))] dark:bg-[color-mix(in_srgb,var(--label)_12%,transparent)] dark:text-[color-mix(in_srgb,var(--label)_45%,var(--color-foreground))]",
-        className,
-      )}
+      variant={color ? "label" : "secondary"}
+      className={cn("min-w-0 max-w-40 shrink justify-start", className)}
       {...(color ? { style: { "--label": color } as CSSProperties } : {})}
     >
       <span className="truncate">{label.name}</span>
@@ -411,7 +406,7 @@ export function PullRequestReviewOutcomeBadge({
 }) {
   const presentation = REVIEW_OUTCOME_PRESENTATION[outcome];
   return (
-    <Badge size="sm" variant={presentation.badgeVariant} className={cn("gap-1", className)}>
+    <Badge size="sm" variant={presentation.badgeVariant} className={className}>
       <presentation.Icon aria-hidden className="size-3" />
       {presentation.label}
     </Badge>
@@ -433,7 +428,7 @@ export function PullRequestActorAvatar({
     <span
       aria-hidden
       className={cn(
-        "flex size-4 shrink-0 items-center justify-center rounded-full bg-muted text-[8px] font-medium text-muted-foreground",
+        "flex size-4 shrink-0 items-center justify-center rounded-full bg-muted text-3xs font-medium text-muted-foreground",
         className,
       )}
     >
@@ -451,51 +446,56 @@ export function PullRequestActorAvatar({
   );
 }
 
-/** GitHub attributes work from a deleted account to "ghost"; say the same word everywhere. */
+/**
+ * GitHub attributes work from a deleted account to "ghost"; say the same word everywhere.
+ *
+ * An actor as a login beside its avatar, or as the avatar alone. With a profile URL the actor
+ * is an inline link; `className` places it and never restyles it.
+ */
 export function PullRequestActorLabel({
   actor,
   className,
-  labelClassName,
+  variant = "label",
   tooltip = true,
   profileUrl,
 }: {
   actor: PullRequestActor | null;
   className?: string;
-  labelClassName?: string;
+  variant?: "label" | "avatar";
   tooltip?: boolean;
   profileUrl?: string | null;
 }) {
   const login = actor?.login ?? "ghost";
   const label = (
-    <>
+    <span className={cn("flex min-w-0 items-center", variant === "label" && "gap-1.5")}>
       <PullRequestActorAvatar actor={actor} />
-      <span className={cn("truncate", labelClassName)}>{login}</span>
-    </>
+      <span className={variant === "label" ? "truncate font-medium text-foreground" : "sr-only"}>
+        {login}
+      </span>
+    </span>
   );
-  if (!tooltip) {
-    return <span className={cn("flex min-w-0 items-center gap-1.5", className)}>{label}</span>;
-  }
+  const placement = cn("flex min-w-0 shrink", className);
+  if (!tooltip) return <span className={placement}>{label}</span>;
   return (
     <Tooltip>
       <TooltipTrigger
         render={
           profileUrl ? (
-            <a
-              href={profileUrl}
-              target="_blank"
-              rel="noopener noreferrer"
-              aria-label={`Open ${login}'s profile`}
+            <InlineButton
+              className={placement}
+              render={
+                <a
+                  href={profileUrl}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  aria-label={`Open ${login}'s profile`}
+                />
+              }
             />
           ) : (
-            <span />
+            <span className={placement} />
           )
         }
-        className={cn(
-          "flex min-w-0 items-center gap-1.5",
-          profileUrl &&
-            "cursor-pointer rounded-sm underline-offset-2 outline-none hover:text-foreground hover:underline focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background",
-          className,
-        )}
       >
         {label}
       </TooltipTrigger>
diff --git a/apps/web/src/components/search/HighlightedSearchLine.tsx b/apps/web/src/components/search/HighlightedSearchLine.tsx
index 9d5296227765..c10f33856509 100644
--- a/apps/web/src/components/search/HighlightedSearchLine.tsx
+++ b/apps/web/src/components/search/HighlightedSearchLine.tsx
@@ -111,7 +111,7 @@ function HighlightedTokens(props: {
     .map((segment) =>
       segment.isMatch ? (
         <mark
-          className="rounded-[2px] bg-primary/25 text-inherit"
+          className="rounded-xs bg-primary/25 text-inherit"
           key={`${segment.start}:${segment.end}:match`}
           style={tokenStyle(segment.token)}
         >
diff --git a/apps/web/src/components/search/ProjectContentSearchDialog.tsx b/apps/web/src/components/search/ProjectContentSearchDialog.tsx
index f8707dbf68f3..23a220cf0ef1 100644
--- a/apps/web/src/components/search/ProjectContentSearchDialog.tsx
+++ b/apps/web/src/components/search/ProjectContentSearchDialog.tsx
@@ -67,14 +67,13 @@ function SearchOptionButton(props: {
           <Toggle
             aria-label={props.label}
             pressed={props.active}
-            className="size-8 rounded-[5px] font-mono text-muted-foreground data-pressed:text-foreground sm:size-7"
-            size="compact"
-            variant="ghost"
+            size="segmented"
+            variant="segmented"
             onClick={props.onClick}
           />
         }
       >
-        {props.children}
+        <span className="font-mono">{props.children}</span>
       </TooltipTrigger>
       <TooltipPopup side="top">{props.label}</TooltipPopup>
     </Tooltip>
@@ -89,11 +88,13 @@ function EmptyContentSearchDialog() {
       footerActionLabel="Open file"
       inputProps={{ disabled: true, placeholder: "Search project contents…" }}
       mode="none"
-      panelClassName="flex min-h-0 flex-1 items-center justify-center px-6 text-center text-sm text-muted-foreground"
+      panelSize="fill"
       testId="project-content-search"
       value=""
     >
-      Open a project to search its files.
+      <p className="m-auto px-6 text-center text-muted-foreground text-sm">
+        Open a project to search its files.
+      </p>
     </CommandPaletteContent>
   );
 }
@@ -218,7 +219,7 @@ function OpenContentSearchDialog(props: {
       }}
       mode="none"
       onValueChange={setQuery}
-      panelClassName="flex min-h-0 flex-1 flex-col"
+      panelSize="fill"
       testId="project-content-search"
       value={query}
     >
@@ -264,7 +265,7 @@ function OpenContentSearchDialog(props: {
                         {path.directory}
                       </span>
                     ) : null}
-                    <span className="ml-auto rounded-full bg-muted px-1.5 py-0.5 tabular-nums text-[10px] text-muted-foreground">
+                    <span className="ml-auto rounded-full bg-muted px-1.5 py-0.5 tabular-nums text-3xs text-muted-foreground">
                       {group.matches.length}
                     </span>
                   </div>
diff --git a/apps/web/src/components/settings/AddCodexAccountDialog.tsx b/apps/web/src/components/settings/AddCodexAccountDialog.tsx
new file mode 100644
index 000000000000..802e5d912c24
--- /dev/null
+++ b/apps/web/src/components/settings/AddCodexAccountDialog.tsx
@@ -0,0 +1,143 @@
+import { useAtomValue } from "@effect/atom-react";
+import {
+  ProviderDriverKind,
+  ProviderInstanceId,
+  type EnvironmentId,
+  type ServerProvider,
+} from "@t3tools/contracts";
+import { useEffect, useEffectEvent, useState, type ReactNode } from "react";
+import { usesChatGptSharing } from "@t3tools/shared/usageLimits";
+
+import { useEnvironmentSettings } from "../../hooks/useSettings";
+import { randomUUID } from "../../lib/utils";
+import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
+import { Button } from "../ui/button";
+import { Dialog } from "../ui/dialog";
+import { Input } from "../ui/input";
+import { WizardFooter, WizardHeader, WizardPanel, WizardPopup } from "../ui/wizard";
+import { SettingsRow } from "./settingsLayout";
+
+export function AddCodexAccountDialog({
+  environmentId,
+  onClose,
+  renderSetup,
+  onAccountCreated,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly onClose: () => void;
+  readonly onAccountCreated?:
+    | ((instanceId: ProviderInstanceId, displayName: string) => void)
+    | undefined;
+  readonly renderSetup: (instanceId: ProviderInstanceId, provider: ServerProvider) => ReactNode;
+}) {
+  const settings = useEnvironmentSettings(environmentId);
+  const providers = useAtomValue(serverEnvironment.providersValueAtom(environmentId));
+  const update = useAtomCommand(serverEnvironment.updateSettings, "Add ChatGPT account");
+  const [name, setName] = useState("Personal");
+  const displayName = `ChatGPT - ${name.trim()}`;
+  const [instanceId, setInstanceId] = useState<ProviderInstanceId | null>(null);
+  const [pending, setPending] = useState(false);
+  const provider = providers?.find((candidate) => candidate.instanceId === instanceId);
+  const connected = usesChatGptSharing(provider);
+  const closeAfterConnection = useEffectEvent(onClose);
+  useEffect(() => {
+    // The destination snapshot confirms remote transfer as well as local sign-in.
+    if (connected) closeAfterConnection();
+  }, [connected]);
+
+  const createAccount = async () => {
+    if (pending || !name.trim()) return;
+    setPending(true);
+    // The ID is routing identity; the name is editable and need not be unique.
+    const id = ProviderInstanceId.make(`codex_${randomUUID()}`);
+    const result = await update({
+      environmentId,
+      input: {
+        patch: {
+          providerInstances: {
+            ...settings.providerInstances,
+            [id]: {
+              driver: ProviderDriverKind.make("codex"),
+              displayName,
+              enabled: true,
+              config: { enabled: true, setupMode: "managed" },
+            },
+          },
+        },
+      },
+    });
+    if (result._tag === "Success") {
+      if (onAccountCreated) {
+        onAccountCreated(id, displayName);
+        onClose();
+      } else {
+        setInstanceId(id);
+      }
+    }
+    setPending(false);
+  };
+
+  return (
+    <Dialog
+      open={!connected}
+      onOpenChange={(open) => {
+        if (!open) onClose();
+      }}
+    >
+      <WizardPopup size="wide">
+        <WizardHeader
+          title={instanceId ? displayName : "Add ChatGPT account"}
+          description="Each account has its own Codex instance and sign-in. Choose the other account on the sign-in page."
+        />
+        <WizardPanel>
+          {instanceId ? (
+            provider?.setup ? (
+              renderSetup(instanceId, provider)
+            ) : (
+              <SettingsRow title="Codex runtime" description="Preparing managed setup." />
+            )
+          ) : (
+            <form
+              id="add-codex-account"
+              onSubmit={(event) => {
+                event.preventDefault();
+                void createAccount();
+              }}
+            >
+              <SettingsRow
+                title="Account name"
+                description="Shown in the provider list and model picker."
+                control={
+                  <Input
+                    aria-label="Account name"
+                    value={name}
+                    disabled={pending}
+                    onChange={(event) => setName(event.target.value)}
+                    placeholder="e.g. Personal or Work"
+                  />
+                }
+              />
+            </form>
+          )}
+        </WizardPanel>
+        <WizardFooter>
+          {instanceId ? (
+            <Button variant="outline" onClick={onClose}>
+              Finish later
+            </Button>
+          ) : (
+            <>
+              <Button variant="outline" disabled={pending} onClick={onClose}>
+                Cancel
+              </Button>
+              <Button type="submit" form="add-codex-account" disabled={pending || !name.trim()}>
+                {pending ? "Adding account…" : "Continue"}
+              </Button>
+            </>
+          )}
+        </WizardFooter>
+      </WizardPopup>
+    </Dialog>
+  );
+}
diff --git a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
index 810a1507930d..b1cb8bf3555f 100644
--- a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
+++ b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
@@ -14,6 +14,7 @@ import { useEnvironmentSettings, useUpdateEnvironmentSettings } from "../../hook
 import { cn } from "../../lib/utils";
 import { normalizeProviderAccentColor } from "../../providerInstances";
 import { Button } from "../ui/button";
+import { ChatGptConnectionButton } from "./ChatGptConnectionButton";
 import { ACPRegistryIcon, Gemini, GithubCopilotIcon, PiAgentIcon, type Icon } from "../Icons";
 import { Dialog } from "../ui/dialog";
 import { Badge } from "../ui/badge";
@@ -30,6 +31,7 @@ import {
   type WizardNavigation,
 } from "./AddProviderInstanceDialog.logic";
 import { AddProviderInstanceWizardSteps } from "./AddProviderInstanceWizardSteps";
+import { AddManagedCodexAccountDialog } from "./CodexSetupSection";
 
 const PROVIDER_ACCENT_SWATCHES = [
   "#2563eb",
@@ -126,6 +128,7 @@ export function AddProviderInstanceDialog({
   const updateSettings = useUpdateEnvironmentSettings(environmentId);
 
   const [wizardStep, setWizardStep] = useState(0);
+  const [addingChatGptAccount, setAddingChatGptAccount] = useState(false);
   const [driver, setDriver] = useState<ProviderDriverKind>(DEFAULT_DRIVER_KIND);
   const [label, setLabel] = useState("");
   const [accentColor, setAccentColor] = useState<string>("");
@@ -185,7 +188,10 @@ export function AddProviderInstanceDialog({
     setHasAttemptedSubmit(true);
     if (instanceIdError !== null) return;
 
-    const config = configByDriver[driver] ?? {};
+    const config =
+      driver === "codex"
+        ? { ...configByDriver[driver], setupMode: "existing" }
+        : (configByDriver[driver] ?? {});
     const hasConfig = Object.keys(config).length > 0;
     const normalizedAccentColor = normalizeProviderAccentColor(accentColor);
 
@@ -222,17 +228,21 @@ export function AddProviderInstanceDialog({
     }
   };
 
+  if (addingChatGptAccount) {
+    return (
+      <AddManagedCodexAccountDialog
+        environmentId={environmentId}
+        onClose={() => onOpenChange(false)}
+      />
+    );
+  }
+
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <WizardPopup>
+      <WizardPopup size="wide">
         <WizardHeader
           title="Add provider instance"
-          description={
-            <>
-              Configure an additional provider instance on {environmentLabel} — for example, a
-              second Codex install pointed at a different workspace.
-            </>
-          }
+          description={<>Add an account or configure a provider on {environmentLabel}.</>}
         >
           <AddProviderInstanceWizardSteps
             currentStep={wizardStep}
@@ -251,7 +261,7 @@ export function AddProviderInstanceDialog({
               value={driver}
               onValueChange={(value) => setDriver(ProviderDriverKind.make(value))}
               aria-labelledby="add-instance-driver-label"
-              className="grid grid-cols-1 gap-2 sm:grid-cols-2"
+              className="grid grid-cols-1 sm:grid-cols-2"
             >
               {DRIVER_OPTIONS.map((option) => {
                 const IconComponent = option.icon;
@@ -259,7 +269,7 @@ export function AddProviderInstanceDialog({
                   <RadioPrimitive.Root
                     key={option.value}
                     value={option.value}
-                    className="relative flex cursor-pointer items-center gap-3 rounded-lg bg-card px-3 py-3 text-left text-muted-foreground outline-none ring-1 ring-black/5 hover:bg-zinc-50 focus-visible:ring-2 focus-visible:ring-ring data-checked:bg-primary/8 data-checked:text-foreground data-checked:ring-2 data-checked:ring-primary data-checked:hover:bg-primary/8 dark:bg-white/3 dark:ring-white/5 dark:hover:bg-white/5 dark:data-checked:bg-primary/15 dark:data-checked:ring-primary dark:data-checked:hover:bg-primary/15"
+                    className="relative flex cursor-pointer items-center gap-3 rounded-lg bg-card px-3 py-3 text-left text-muted-foreground outline-none ring-1 ring-black/5 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring data-checked:bg-primary/8 data-checked:text-foreground data-checked:ring-2 data-checked:ring-primary data-checked:hover:bg-primary/8 dark:bg-white/3 dark:ring-white/5 dark:hover:bg-white/5 dark:data-checked:bg-primary/15 dark:data-checked:ring-primary dark:data-checked:hover:bg-primary/15"
                   >
                     <IconComponent className="size-4 shrink-0" aria-hidden />
                     <span className="min-w-0 flex-1 truncate text-sm font-medium text-foreground">
@@ -287,7 +297,7 @@ export function AddProviderInstanceDialog({
                     value={option.value}
                     disabled
                     className={cn(
-                      "relative flex cursor-not-allowed items-center gap-3 rounded-lg bg-card/60 px-3 py-3 text-left opacity-55 outline-none ring-1 ring-black/5 dark:bg-white/2 dark:ring-white/5",
+                      "relative flex cursor-not-allowed items-center gap-3 rounded-lg bg-card/60 px-3 py-3 text-left opacity-64 outline-none ring-1 ring-black/5 dark:bg-white/2 dark:ring-white/5",
                     )}
                   >
                     <IconComponent className="size-4 shrink-0 text-muted-foreground" aria-hidden />
@@ -306,12 +316,11 @@ export function AddProviderInstanceDialog({
           <label className={cn("grid gap-2", wizardStep !== 1 && "hidden")}>
             <span className="text-xs font-medium text-foreground">Label</span>
             <Input
-              className="bg-background"
               placeholder="e.g. Work"
               value={label}
               onChange={(event) => setLabel(event.target.value)}
             />
-            <span className="text-[11px] text-muted-foreground">
+            <span className="text-2xs text-muted-foreground">
               Shown in the provider list. Optional.
             </span>
           </label>
@@ -319,7 +328,6 @@ export function AddProviderInstanceDialog({
           <label className={cn("grid gap-2", wizardStep !== 1 && "hidden")}>
             <span className="text-xs font-medium text-foreground">Instance ID</span>
             <Input
-              className="bg-background"
               placeholder={`${driver}_work`}
               value={instanceId}
               onChange={(event) => {
@@ -328,9 +336,9 @@ export function AddProviderInstanceDialog({
               aria-invalid={showInstanceIdError}
             />
             {showInstanceIdError ? (
-              <span className="text-[11px] text-destructive">{instanceIdError}</span>
+              <span className="text-2xs text-destructive">{instanceIdError}</span>
             ) : (
-              <span className="text-[11px] text-muted-foreground">
+              <span className="text-2xs text-muted-foreground">
                 Routing key used by threads and sessions. Letters, digits, '-', or '_'.
               </span>
             )}
@@ -369,15 +377,14 @@ export function AddProviderInstanceDialog({
                 <Button
                   type="button"
                   size="xs"
-                  variant="ghost"
-                  className="text-muted-foreground"
+                  variant="ghost-muted"
                   onClick={() => setAccentColor("")}
                 >
                   Clear
                 </Button>
               ) : null}
             </div>
-            <span className="text-[11px] text-muted-foreground">
+            <span className="text-2xs text-muted-foreground">
               Optional marker shown in the picker.
             </span>
           </div>
@@ -403,7 +410,7 @@ export function AddProviderInstanceDialog({
 
         <WizardFooter>
           <Button
-            variant="outline"
+            variant={wizardStep === 0 ? "ghost-muted" : "outline"}
             onClick={() => {
               if (wizardStep === 0) {
                 onOpenChange(false);
@@ -414,7 +421,14 @@ export function AddProviderInstanceDialog({
           >
             {wizardStep === 0 ? "Cancel" : "Back"}
           </Button>
-          {wizardStep < ADD_PROVIDER_WIZARD_STEPS.length - 1 ? (
+          {wizardStep === 0 && driver === "codex" ? (
+            <>
+              <Button variant="outline" onClick={() => navigateToStep(1)}>
+                Configure manually
+              </Button>
+              <ChatGptConnectionButton onClick={() => setAddingChatGptAccount(true)} />
+            </>
+          ) : wizardStep < ADD_PROVIDER_WIZARD_STEPS.length - 1 ? (
             <Button onClick={() => navigateToStep(wizardStep + 1)}>Next</Button>
           ) : (
             <Button onClick={handleSave}>Add instance</Button>
diff --git a/apps/web/src/components/settings/BitbucketCredentialsSettings.tsx b/apps/web/src/components/settings/BitbucketCredentialsSettings.tsx
new file mode 100644
index 000000000000..a423334d1c7f
--- /dev/null
+++ b/apps/web/src/components/settings/BitbucketCredentialsSettings.tsx
@@ -0,0 +1,223 @@
+import type { BitbucketSettings, EnvironmentId } from "@t3tools/contracts";
+import { ExternalLinkIcon } from "lucide-react";
+import { useState } from "react";
+
+import { useEnvironmentSettings } from "../../hooks/useSettings";
+import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
+import { Button, InlineButton } from "../ui/button";
+import { Input } from "../ui/input";
+import { Label } from "../ui/label";
+import { Toggle, ToggleGroup } from "../ui/toggle-group";
+
+type CredentialMethod = "access-token" | "api-token";
+
+const METHODS: Record<
+  CredentialMethod,
+  {
+    readonly label: string;
+    readonly description: string;
+    readonly link: string;
+    readonly linkLabel: string;
+  }
+> = {
+  "access-token": {
+    label: "Access token",
+    description:
+      "Scoped to one repository, project, or workspace. Create it in that item's Bitbucket settings.",
+    link: "https://support.atlassian.com/bitbucket-cloud/docs/access-tokens/",
+    linkLabel: "Learn more",
+  },
+  "api-token": {
+    label: "API token",
+    description:
+      "Uses your Atlassian account, so it reaches every repository you can. Give it read and write access to repositories and pull requests, and read:user:bitbucket.",
+    link: "https://id.atlassian.com/manage-profile/security/api-tokens",
+    linkLabel: "Create an API token",
+  },
+};
+
+function savedMethod(saved: BitbucketSettings): CredentialMethod | null {
+  if (saved.accessToken.length > 0) return "access-token";
+  if (saved.email.length > 0 && saved.apiToken.length > 0) return "api-token";
+  return null;
+}
+
+/** A write-only token field. It never shows the saved token; typing a new one replaces it. */
+function TokenInput({
+  id,
+  isSaved,
+  draft,
+  onDraftChange,
+}: {
+  readonly id: string;
+  readonly isSaved: boolean;
+  readonly draft: string;
+  readonly onDraftChange: (draft: string) => void;
+}) {
+  return (
+    <Input
+      id={id}
+      type="password"
+      autoComplete="off"
+      size="sm"
+      placeholder={isSaved ? "Stored secret, enter a new value to replace" : "Not set"}
+      value={draft}
+      onChange={(event) => onDraftChange(event.target.value)}
+    />
+  );
+}
+
+/**
+ * Bitbucket credentials for one environment: an access token or an Atlassian
+ * account email + API token, never both. Tokens are write-only: the server
+ * keeps them in its secret store and only reports whether each one is set.
+ */
+export function BitbucketCredentialsSettings({
+  environmentId,
+  onSaved,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly onSaved: () => void;
+}) {
+  const saved = useEnvironmentSettings(environmentId, (settings) => settings.bitbucket);
+  const updateSettings = useAtomCommand(serverEnvironment.updateSettings, {
+    label: "save Bitbucket credentials",
+  });
+  const [methodChoice, setMethodChoice] = useState<CredentialMethod | null>(null);
+  const [accessToken, setAccessToken] = useState("");
+  const [emailDraft, setEmailDraft] = useState<string | null>(null);
+  const [apiToken, setApiToken] = useState("");
+  const [saving, setSaving] = useState(false);
+  const current = savedMethod(saved);
+  const method = methodChoice ?? current ?? "access-token";
+  const methodIsSaved = current === method;
+  const email = (emailDraft ?? saved.email).trim();
+  const newAccessToken = accessToken.trim();
+  const newApiToken = apiToken.trim();
+  const info = METHODS[method];
+
+  // Saving one method clears the other, so a hidden credential never wins over the visible one.
+  const patch: BitbucketSettings | null =
+    method === "access-token"
+      ? newAccessToken
+        ? { accessToken: newAccessToken, email: "", apiToken: "" }
+        : null
+      : email && (newApiToken || saved.apiToken)
+        ? // Resending the saved token's redacted value keeps it.
+          { accessToken: "", email, apiToken: newApiToken || saved.apiToken }
+        : null;
+  const canSave =
+    patch !== null &&
+    (method === "access-token" || !methodIsSaved || newApiToken !== "" || email !== saved.email);
+
+  const save = async (next: BitbucketSettings) => {
+    setSaving(true);
+    try {
+      const result = await updateSettings({
+        environmentId,
+        input: { patch: { bitbucket: next } },
+      });
+      if (result._tag === "Success") {
+        setAccessToken("");
+        setApiToken("");
+        setEmailDraft(null);
+        onSaved();
+      }
+    } finally {
+      setSaving(false);
+    }
+  };
+
+  return (
+    <form
+      className="grid gap-4"
+      onSubmit={(event) => {
+        event.preventDefault();
+        if (canSave && patch) void save(patch);
+      }}
+    >
+      {/* Locked while saving: a successful save clears the drafts, which would drop edits made mid-request. */}
+      <fieldset disabled={saving} className="contents">
+        <ToggleGroup
+          aria-label="Bitbucket sign-in method"
+          variant="segmented"
+          value={[method]}
+          onValueChange={(next) => {
+            const value = next[0];
+            if (value === "access-token" || value === "api-token") setMethodChoice(value);
+          }}
+        >
+          <Toggle value="access-token">{METHODS["access-token"].label}</Toggle>
+          <Toggle value="api-token">{METHODS["api-token"].label}</Toggle>
+        </ToggleGroup>
+        <p className="max-w-2xl text-xs leading-relaxed text-muted-foreground">
+          {info.description}{" "}
+          <InlineButton render={<a href={info.link} target="_blank" rel="noreferrer noopener" />}>
+            {info.linkLabel}
+            <ExternalLinkIcon aria-hidden className="size-3" />
+          </InlineButton>
+        </p>
+        {method === "access-token" ? (
+          <div className="grid gap-1.5">
+            <Label htmlFor={`bitbucket-access-token-${environmentId}`}>Access token</Label>
+            <TokenInput
+              id={`bitbucket-access-token-${environmentId}`}
+              isSaved={methodIsSaved}
+              draft={accessToken}
+              onDraftChange={setAccessToken}
+            />
+          </div>
+        ) : (
+          <>
+            <div className="grid gap-1.5">
+              <Label htmlFor={`bitbucket-email-${environmentId}`}>Atlassian account email</Label>
+              <Input
+                id={`bitbucket-email-${environmentId}`}
+                type="email"
+                autoComplete="off"
+                size="sm"
+                placeholder="you@example.com"
+                value={emailDraft ?? saved.email}
+                onChange={(event) => setEmailDraft(event.target.value)}
+              />
+            </div>
+            <div className="grid gap-1.5">
+              <Label htmlFor={`bitbucket-api-token-${environmentId}`}>API token</Label>
+              <TokenInput
+                id={`bitbucket-api-token-${environmentId}`}
+                isSaved={methodIsSaved}
+                draft={apiToken}
+                onDraftChange={setApiToken}
+              />
+            </div>
+          </>
+        )}
+        <div className="flex items-center justify-between gap-3">
+          <p className="text-xs text-muted-foreground">
+            {current === null
+              ? "Without a saved token, the server falls back to its T3CODE_BITBUCKET_* environment variables."
+              : methodIsSaved
+                ? null
+                : `Saving replaces your ${METHODS[current].label.toLowerCase()}.`}
+          </p>
+          <div className="flex shrink-0 gap-2">
+            {current !== null ? (
+              <Button
+                size="xs"
+                variant="outline"
+                disabled={saving}
+                onClick={() => void save({ accessToken: "", email: "", apiToken: "" })}
+              >
+                Remove
+              </Button>
+            ) : null}
+            <Button type="submit" size="xs" disabled={!canSave || saving}>
+              Save
+            </Button>
+          </div>
+        </div>
+      </fieldset>
+    </form>
+  );
+}
diff --git a/apps/web/src/components/settings/BrowserImportWizard.tsx b/apps/web/src/components/settings/BrowserImportWizard.tsx
index 81d1f480d8d0..afa9acd0c124 100644
--- a/apps/web/src/components/settings/BrowserImportWizard.tsx
+++ b/apps/web/src/components/settings/BrowserImportWizard.tsx
@@ -490,9 +490,11 @@ function ImportingStep() {
         <DialogTitle>Importing cookies</DialogTitle>
         <DialogDescription>This may take a moment.</DialogDescription>
       </DialogHeader>
-      <DialogPanel className="flex items-center gap-3 py-6">
-        <Spinner size="md" tone="muted" />
-        <span className="text-sm text-muted-foreground">Importing…</span>
+      <DialogPanel>
+        <div className="flex items-center gap-3 py-2">
+          <Spinner size="md" tone="muted" />
+          <span className="text-sm text-muted-foreground">Importing…</span>
+        </div>
       </DialogPanel>
     </>
   );
@@ -515,11 +517,13 @@ function CheckingStep({
             : "Checking whether the browser has closed."}
         </DialogDescription>
       </DialogHeader>
-      <DialogPanel className="flex items-center gap-3 py-6">
-        <Spinner size="md" tone="muted" />
-        <span className="text-sm text-muted-foreground">
-          {check === "fullDiskAccess" ? "Checking access…" : "Checking…"}
-        </span>
+      <DialogPanel>
+        <div className="flex items-center gap-3 py-2">
+          <Spinner size="md" tone="muted" />
+          <span className="text-sm text-muted-foreground">
+            {check === "fullDiskAccess" ? "Checking access…" : "Checking…"}
+          </span>
+        </div>
       </DialogPanel>
     </>
   );
diff --git a/apps/web/src/components/settings/ChatGptAccountPicker.tsx b/apps/web/src/components/settings/ChatGptAccountPicker.tsx
new file mode 100644
index 000000000000..f3eaa907765d
--- /dev/null
+++ b/apps/web/src/components/settings/ChatGptAccountPicker.tsx
@@ -0,0 +1,74 @@
+import { useState } from "react";
+import type { ProviderAuthMethod } from "@t3tools/contracts";
+import { RadioGroup, Radio } from "../ui/radio-group";
+import {
+  Dialog,
+  DialogPopup,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from "../ui/dialog";
+import { ChatGptConnectionButton } from "./ChatGptConnectionButton";
+
+export function ChatGptAccountPicker({
+  open,
+  methods,
+  onClose,
+  onSelect,
+}: {
+  open: boolean;
+  methods: readonly ProviderAuthMethod[];
+  onClose: () => void;
+  onSelect: (methodId: string) => void;
+}) {
+  const profiles = methods.filter((method) => method.id.startsWith("chatgpt-profile:"));
+  const [selection, setSelection] = useState<string | null>(null);
+  const selectedMethodId =
+    selection === "chatgpt-change-account"
+      ? selection
+      : (profiles.find((profile) => profile.id === selection)?.id ??
+        profiles[0]?.id ??
+        "chatgpt-change-account");
+  return (
+    <Dialog
+      open={open}
+      onOpenChange={(value) => {
+        if (!value) onClose();
+      }}
+    >
+      <DialogPopup>
+        <DialogHeader>
+          <DialogTitle>Reconnect ChatGPT</DialogTitle>
+          <DialogDescription>
+            On OpenAI, sign in with the account you choose here.
+          </DialogDescription>
+        </DialogHeader>
+        <div className="px-6 pb-6">
+          <RadioGroup
+            aria-label="ChatGPT account to connect"
+            value={selectedMethodId}
+            onValueChange={(value) => setSelection(value)}
+          >
+            {profiles.map((profile) => (
+              <label
+                key={profile.id}
+                className="flex cursor-pointer items-center gap-3 rounded-lg border px-3 py-3 text-sm"
+              >
+                <Radio value={profile.id} />
+                <span className="min-w-0 break-all font-medium">{profile.name}</span>
+              </label>
+            ))}
+            <label className="flex cursor-pointer items-center gap-3 rounded-lg border px-3 py-3 text-sm">
+              <Radio value="chatgpt-change-account" />
+              <span className="font-medium">Use a different account</span>
+            </label>
+          </RadioGroup>
+        </div>
+        <DialogFooter>
+          <ChatGptConnectionButton onClick={() => onSelect(selectedMethodId)} />
+        </DialogFooter>
+      </DialogPopup>
+    </Dialog>
+  );
+}
diff --git a/apps/web/src/components/settings/ChatGptConnectionButton.tsx b/apps/web/src/components/settings/ChatGptConnectionButton.tsx
new file mode 100644
index 000000000000..d3e13c507266
--- /dev/null
+++ b/apps/web/src/components/settings/ChatGptConnectionButton.tsx
@@ -0,0 +1,12 @@
+import type { ComponentProps } from "react";
+import { OpenAI } from "../Icons";
+import { Button } from "../ui/button";
+
+export function ChatGptConnectionButton({ children, ...props }: ComponentProps<typeof Button>) {
+  return (
+    <Button {...props}>
+      <OpenAI className="size-4 shrink-0" aria-hidden="true" />
+      {children ?? "Continue with ChatGPT"}
+    </Button>
+  );
+}
diff --git a/apps/web/src/components/settings/ChatGptUsageButton.tsx b/apps/web/src/components/settings/ChatGptUsageButton.tsx
new file mode 100644
index 000000000000..e79fbdb96fea
--- /dev/null
+++ b/apps/web/src/components/settings/ChatGptUsageButton.tsx
@@ -0,0 +1,19 @@
+import type { ComponentProps } from "react";
+import { ExternalLinkIcon } from "lucide-react";
+import { CHATGPT_USAGE_URL } from "@t3tools/shared/usageLimits";
+import { ensureLocalApi } from "../../localApi";
+import { Button } from "../ui/button";
+
+export function ChatGptUsageButton(props: Omit<ComponentProps<typeof Button>, "onClick">) {
+  return (
+    <Button
+      variant="ghost-muted"
+      size="sm"
+      {...props}
+      onClick={() => void ensureLocalApi().shell.openExternal(CHATGPT_USAGE_URL)}
+    >
+      Manage usage
+      <ExternalLinkIcon className="size-3.5" aria-hidden="true" />
+    </Button>
+  );
+}
diff --git a/apps/web/src/components/settings/ChatGptWelcomeCoordinator.tsx b/apps/web/src/components/settings/ChatGptWelcomeCoordinator.tsx
new file mode 100644
index 000000000000..2d689ef6e6ee
--- /dev/null
+++ b/apps/web/src/components/settings/ChatGptWelcomeCoordinator.tsx
@@ -0,0 +1,83 @@
+import { useAtomValue } from "@effect/atom-react";
+import { usesChatGptSharing } from "@t3tools/shared/usageLimits";
+import { useState } from "react";
+import { environmentPresentations } from "../../state/presentation";
+import { OpenAI } from "../Icons";
+import { Button } from "../ui/button";
+import {
+  Dialog,
+  DialogPopup,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+  DialogFooter,
+} from "../ui/dialog";
+import { ChatGptUsageButton } from "./ChatGptUsageButton";
+
+const STORAGE_KEY = "t3:chatgpt-sharing-welcome:v1";
+function readAcknowledgedProfiles(): string[] {
+  try {
+    const value: unknown = JSON.parse(localStorage.getItem(STORAGE_KEY) ?? "[]");
+    return Array.isArray(value)
+      ? value.filter((key): key is string => typeof key === "string")
+      : [];
+  } catch {
+    return [];
+  }
+}
+
+/** Read the verified environment snapshot, never the browser callback acknowledgment. */
+export function ChatGptWelcomeCoordinator() {
+  const presentations = useAtomValue(environmentPresentations.presentationsAtom);
+  const [acknowledged, setAcknowledged] = useState(readAcknowledgedProfiles);
+  const profiles = [...presentations].flatMap(([environmentId, presentation]) =>
+    presentation.connection.phase !== "connected"
+      ? []
+      : (presentation.serverConfig?.providers ?? []).filter(usesChatGptSharing).map((provider) => ({
+          key: JSON.stringify([
+            environmentId,
+            provider.instanceId,
+            provider.auth.profileId ?? provider.auth.email ?? "default",
+          ]),
+          environmentLabel: presentation.entry.target.label,
+          providerName: provider.displayName ?? "Codex",
+        })),
+  );
+  const next = profiles.find((profile) => !acknowledged.includes(profile.key));
+  const dismiss = () => {
+    if (!next) return;
+    const updated = [...acknowledged, next.key];
+    setAcknowledged(updated);
+    try {
+      localStorage.setItem(STORAGE_KEY, JSON.stringify(updated));
+    } catch {
+      /* Session dismissal still works. */
+    }
+  };
+  return (
+    <Dialog
+      open={next !== undefined}
+      onOpenChange={(open) => {
+        if (!open) dismiss();
+      }}
+    >
+      <DialogPopup>
+        <DialogHeader>
+          <OpenAI className="mb-2 size-8" aria-hidden="true" />
+          <DialogTitle>Your ChatGPT plan is connected</DialogTitle>
+          <DialogDescription>
+            Eligible usage in T3 Code uses your ChatGPT plan. Manage your shared usage and any
+            credit settings in ChatGPT.
+          </DialogDescription>
+          <p className="text-xs text-muted-foreground">
+            {next?.providerName} on {next?.environmentLabel}
+          </p>
+        </DialogHeader>
+        <DialogFooter>
+          <ChatGptUsageButton />
+          <Button onClick={dismiss}>Continue</Button>
+        </DialogFooter>
+      </DialogPopup>
+    </Dialog>
+  );
+}
diff --git a/apps/web/src/components/settings/CodexSetupSection.logic.ts b/apps/web/src/components/settings/CodexSetupSection.logic.ts
new file mode 100644
index 000000000000..46868d513db0
--- /dev/null
+++ b/apps/web/src/components/settings/CodexSetupSection.logic.ts
@@ -0,0 +1,8 @@
+export function readCodexSetupMode(config: unknown): "managed" | "existing" {
+  return config !== null &&
+    typeof config === "object" &&
+    "setupMode" in config &&
+    config.setupMode === "managed"
+    ? "managed"
+    : "existing";
+}
diff --git a/apps/web/src/components/settings/CodexSetupSection.tsx b/apps/web/src/components/settings/CodexSetupSection.tsx
new file mode 100644
index 000000000000..32aa640b1e75
--- /dev/null
+++ b/apps/web/src/components/settings/CodexSetupSection.tsx
@@ -0,0 +1,1144 @@
+import {
+  isAtomCommandInterrupted,
+  squashAtomCommandFailure,
+  type AtomCommandResult,
+} from "@t3tools/client-runtime/state/runtime";
+import type {
+  ChatGptHandoffInput,
+  ChatGptTransferredProfile,
+  EnvironmentId,
+  ProviderInstanceId,
+  ServerProvider,
+} from "@t3tools/contracts";
+import { codexAuthHandoffUrl } from "@t3tools/shared/codexAuthHandoff";
+import { providerAuthReturnUrl } from "@t3tools/shared/providerAuthReturnUrl";
+import { isLoopbackHost } from "@t3tools/shared/preview";
+import { CheckIcon, ChevronRightIcon, ExternalLinkIcon } from "lucide-react";
+import { Children, useCallback, useEffect, useId, useRef, useState, type ReactNode } from "react";
+
+import { ensureLocalApi } from "../../localApi";
+import {
+  useEnvironmentHttpBaseUrl,
+  usePrimaryEnvironmentId,
+  useEnvironment,
+} from "../../state/environments";
+import { useEnvironmentQuery } from "../../state/query";
+import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
+import { Button } from "../ui/button";
+import { ChatGptConnectionButton } from "./ChatGptConnectionButton";
+import { ChatGptUsageButton } from "./ChatGptUsageButton";
+import { ChatGptAccountPicker } from "./ChatGptAccountPicker";
+import { Input } from "../ui/input";
+import { OpenAI } from "../Icons";
+import { RedactedSensitiveText } from "./RedactedSensitiveText";
+import { SettingsRow } from "./settingsLayout";
+import { AddCodexAccountDialog } from "./AddCodexAccountDialog";
+import { getOnboardingProviderState } from "../../onboarding/providerReadiness.logic";
+import { getProviderSummary } from "./providerStatus";
+
+const noop = () => undefined;
+
+interface CodexSetupSectionProps {
+  readonly environmentId: EnvironmentId;
+  readonly instanceId: ProviderInstanceId;
+  readonly provider: ServerProvider | undefined;
+  readonly mode: "managed" | "existing";
+  readonly enabled: boolean;
+  readonly readOnly?: boolean;
+  readonly presentation?: "settings" | "onboarding";
+  readonly onModeChange: (mode: "managed" | "existing") => void;
+  readonly autoStart?: boolean;
+  readonly displayName?: string | undefined;
+  readonly onAutoStartConsumed?: () => void;
+  readonly onSignInCancelled?: (() => void) | undefined;
+}
+
+/** Welcome and provider settings run the same environment-owned setup flow. */
+export function CodexSetupSection(props: CodexSetupSectionProps) {
+  const [requested, setRequested] = useState(false);
+  const existingState = getOnboardingProviderState(props.provider);
+  const existingReady = props.enabled && existingState === "ready";
+  const existingAuthenticated = props.provider?.auth.status === "authenticated";
+  const existingChecking = existingState === "checking";
+  const existingSummary = getProviderSummary(props.provider);
+  const content =
+    props.mode === "existing" && props.presentation === "onboarding" ? (
+      <CodexWelcomeCard
+        title={props.displayName || props.provider?.displayName || "Codex"}
+        description={
+          existingReady ? (
+            props.provider?.auth.email?.trim() ? (
+              <>
+                Signed in as{" "}
+                <RedactedSensitiveText
+                  value={props.provider.auth.email.trim()}
+                  ariaLabel="Toggle account email visibility"
+                  revealTooltip="Click to reveal email"
+                  hideTooltip="Click to hide email"
+                  className="break-all"
+                />
+                .
+              </>
+            ) : (
+              "Connected with your Codex CLI."
+            )
+          ) : existingChecking ? (
+            "Checking your Codex CLI..."
+          ) : props.provider?.installed ? (
+            existingSummary.headline
+          ) : (
+            "Code with your ChatGPT subscription."
+          )
+        }
+        control={
+          existingReady ? (
+            <span className="inline-flex items-center gap-1.5 text-xs font-medium text-success-foreground">
+              <CheckIcon className="size-3.5" />
+              Ready
+            </span>
+          ) : existingChecking ? (
+            <span className="text-xs text-muted-foreground">Checking...</span>
+          ) : existingAuthenticated ? (
+            <span className="text-xs text-muted-foreground">{existingSummary.headline}</span>
+          ) : (
+            <ChatGptConnectionButton
+              size="sm"
+              disabled={props.readOnly}
+              onClick={() => {
+                setRequested(true);
+                props.onModeChange("managed");
+              }}
+            >
+              Continue with ChatGPT
+            </ChatGptConnectionButton>
+          )
+        }
+        secondaryControl={
+          !existingAuthenticated && !existingReady && !existingChecking ? (
+            <Button size="sm" variant="ghost-muted" onClick={() => props.onModeChange("existing")}>
+              Use existing CLI
+            </Button>
+          ) : null
+        }
+      />
+    ) : props.mode === "existing" ? null : props.provider?.setup === undefined ? (
+      props.presentation === "onboarding" ? (
+        <CodexWelcomeCard
+          title={props.displayName || props.provider?.displayName || "Codex"}
+          description={<CodexSignInDescription />}
+          control={
+            <Button size="sm" variant="outline" className="min-w-44" disabled>
+              Open sign-in page
+            </Button>
+          }
+          secondaryControl={
+            <Button size="sm" variant="ghost-muted" disabled>
+              Cancel
+            </Button>
+          }
+        />
+      ) : (
+        <SettingsRow title="ChatGPT account" description="Preparing sign-in." />
+      )
+    ) : (
+      <ManagedCodexSetup
+        key={`${props.environmentId}:${props.instanceId}`}
+        {...props}
+        autoStart={requested || props.autoStart === true}
+        onAutoStartConsumed={() => {
+          setRequested(false);
+          props.onAutoStartConsumed?.();
+        }}
+      />
+    );
+  return content;
+}
+
+/** All add-Codex entry points use the same managed account setup. */
+export function AddManagedCodexAccountDialog({
+  environmentId,
+  onClose,
+  onAccountCreated,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly onClose: () => void;
+  readonly onAccountCreated?:
+    | ((instanceId: ProviderInstanceId, displayName: string) => void)
+    | undefined;
+}) {
+  return (
+    <AddCodexAccountDialog
+      environmentId={environmentId}
+      onClose={onClose}
+      onAccountCreated={onAccountCreated}
+      renderSetup={(instanceId, provider) => (
+        <ManagedCodexSetup
+          key={instanceId}
+          environmentId={environmentId}
+          instanceId={instanceId}
+          provider={provider}
+          mode="managed"
+          enabled
+          autoStart
+          onAutoStartConsumed={noop}
+          onModeChange={noop}
+          onSignInCancelled={onClose}
+          allowExistingCli={false}
+        />
+      )}
+    />
+  );
+}
+
+function ManagedCodexSetup({
+  environmentId,
+  instanceId,
+  provider,
+  enabled,
+  readOnly,
+  onModeChange,
+  autoStart,
+  onAutoStartConsumed,
+  allowExistingCli = true,
+  presentation,
+  displayName,
+  onSignInCancelled,
+}: CodexSetupSectionProps & {
+  readonly autoStart: boolean;
+  readonly onAutoStartConsumed: () => void;
+  readonly allowExistingCli?: boolean;
+}) {
+  const target = { environmentId, input: { instanceId } };
+  const authQuery = useEnvironmentQuery(serverEnvironment.providerAuthState(target));
+  const installQuery = useEnvironmentQuery(serverEnvironment.providerInstallState(target));
+  const [handoff, setHandoff] = useState<{
+    environmentId: EnvironmentId;
+    input: ChatGptHandoffInput;
+  } | null>(null);
+  const handoffQuery = useEnvironmentQuery(
+    handoff ? serverEnvironment.chatGptHandoffState(handoff) : null,
+  );
+  const auth = handoffQuery.data?.phase === "auth" ? handoffQuery.data.state : authQuery.data;
+  const [accountPickerOpen, setAccountPickerOpen] = useState(false);
+  const [requestedMethodId, setRequestedMethodId] = useState("chatgpt");
+  const reconnectEmail = auth?.methods?.find((method) => method.id === "chatgpt")?.accountEmail;
+  const requestedAccountEmail = auth?.methods?.find(
+    (method) => method.id === requestedMethodId,
+  )?.accountEmail;
+  const hasSavedAccount = auth?.methods?.some((method) => method.id.startsWith("chatgpt-profile:"));
+  const url = auth?.interaction?.type === "browser" ? auth.interaction.url : auth?.authorizationUrl;
+  const installation = installQuery.data;
+  const httpBaseUrl = useEnvironmentHttpBaseUrl(environmentId);
+  const local = httpBaseUrl !== null && isLoopbackHost(new URL(httpBaseUrl).hostname);
+  const options = { reportFailure: false, reportDefect: false };
+  const startAuth = useAtomCommand(serverEnvironment.startProviderAuth, options);
+  const refreshProviders = useAtomCommand(serverEnvironment.refreshProviders, options);
+  const completeAuth = useAtomCommand(serverEnvironment.completeProviderAuth, options);
+  const cancelAuth = useAtomCommand(serverEnvironment.cancelProviderAuth, options);
+  const logoutAuth = useAtomCommand(serverEnvironment.logoutProviderAuth, options);
+  const startInstall = useAtomCommand(serverEnvironment.startProviderInstall, options);
+  const cancelInstall = useAtomCommand(serverEnvironment.cancelProviderInstall, options);
+  const reconnectProfile = useAtomCommand(serverEnvironment.chatGptReconnectProfile, options);
+  const importProfile = useAtomCommand(serverEnvironment.chatGptImportProfile, options);
+  const clientCallback =
+    !handoff && (!local || window.desktopBridge?.receiveProviderAuthCallback !== undefined);
+  const remoteWeb = clientCallback && !window.desktopBridge?.receiveProviderAuthCallback;
+  const primaryEnvironmentId = usePrimaryEnvironmentId();
+  const primaryEnvironment = useEnvironment(primaryEnvironmentId);
+  const primaryHttpBaseUrl = useEnvironmentHttpBaseUrl(primaryEnvironmentId);
+  const primaryAuthEnvironmentId =
+    !local &&
+    primaryEnvironmentId &&
+    primaryEnvironment?.connection.phase === "connected" &&
+    primaryHttpBaseUrl &&
+    isLoopbackHost(new URL(primaryHttpBaseUrl).hostname) &&
+    (window.desktopBridge !== undefined || isLoopbackHost(window.location.hostname))
+      ? primaryEnvironmentId
+      : null;
+  const returnUrl = new URL(window.location.href);
+  if (returnUrl.pathname === "/welcome") returnUrl.hash = `agents:${environmentId}`;
+  if (returnUrl.pathname === "/settings/providers")
+    returnUrl.searchParams.set("instanceId", instanceId);
+  const needsManualCallback = remoteWeb;
+  const callbackHelpId = useId();
+  const [callbackHelpOpen, setCallbackHelpOpen] = useState(false);
+  const [callbackDraft, setCallbackDraft] = useState({ flowId: "", value: "" });
+  const callbackUrl = callbackDraft.flowId === auth?.flowId ? callbackDraft.value : "";
+  const [pending, setPending] = useState(false);
+  const [awaitingProvider, setAwaitingProvider] = useState<"sign-in" | "handoff" | null>(null);
+  const pendingRef = useRef(false);
+  const [error, setError] = useState<string | null>(null);
+  const continueWithSignIn = useRef<string | null>(null);
+  const openRequested = useRef(false);
+  const openedFlow = useRef<string | null>(null);
+  const [autoStartHandled, setAutoStartHandled] = useState(false);
+  const installed = installation?.installedVersion != null;
+  const authenticated = provider?.auth.status === "authenticated";
+  const updateAvailable =
+    installed &&
+    installation?.source !== "local" &&
+    installation?.version != null &&
+    installation.version !== installation.installedVersion;
+  // Auth receipts and provider snapshots arrive independently. Keep the current
+  // attempt pending until its authenticated snapshot arrives, even after success.
+  const finishingSignIn =
+    awaitingProvider !== null &&
+    !authenticated &&
+    (auth?.phase === "succeeded" || awaitingProvider === "handoff");
+  useEffect(() => {
+    if (authenticated || auth?.phase === "failed" || auth?.phase === "cancelled") {
+      setAwaitingProvider(null);
+    }
+  }, [authenticated, auth?.phase]);
+  useEffect(() => {
+    if (awaitingProvider && auth?.phase === "succeeded") {
+      void refreshProviders({ environmentId, input: { instanceId } });
+    }
+  }, [awaitingProvider, auth?.phase, refreshProviders, environmentId, instanceId]);
+  const startingAutomatically = autoStart && !autoStartHandled;
+  const waitingForAuthState =
+    awaitingProvider === "sign-in" && !authenticated && (auth === null || auth.phase === "idle");
+  const authInProgress =
+    finishingSignIn ||
+    waitingForAuthState ||
+    handoff !== null ||
+    auth?.phase === "starting" ||
+    auth?.phase === "waiting" ||
+    auth?.phase === "verifying";
+  const installActive =
+    installation?.phase === "downloading" ||
+    installation?.phase === "extracting" ||
+    installation?.phase === "verifying";
+  const authActive = startingAutomatically || authInProgress || (pending && !installActive);
+  const unavailable =
+    readOnly || !enabled || pending || authQuery.error !== null || installQuery.error !== null;
+  const busy = pending || authInProgress || installActive;
+
+  const run = useCallback(
+    async <A, E>(
+      request: () => Promise<AtomCommandResult<A, E>>,
+      onSuccess?: (value: A) => void,
+    ) => {
+      if (pendingRef.current) return false;
+      pendingRef.current = true;
+      setPending(true);
+      setError(null);
+      let succeeded = false;
+      try {
+        const result = await request();
+        if (result._tag === "Failure") {
+          if (!isAtomCommandInterrupted(result)) {
+            const failure = squashAtomCommandFailure(result);
+            setError(failure instanceof Error ? failure.message : "Codex setup failed. Try again.");
+          }
+        } else {
+          succeeded = true;
+          onSuccess?.(result.value);
+        }
+      } catch {
+        setError("Codex setup failed. Try again.");
+      }
+      pendingRef.current = false;
+      setPending(false);
+      return succeeded;
+    },
+    [],
+  );
+
+  const handoffId = useId();
+  const handoffSequence = useRef(0);
+  const importedAttempt = useRef<string | null>(null);
+  const [transferFailed, setTransferFailed] = useState(false);
+  const transferProfile = useCallback(
+    async (profile: ChatGptTransferredProfile) => {
+      const succeeded = await run(() =>
+        importProfile({ environmentId, input: { instanceId, profile } }),
+      );
+      if (succeeded) {
+        setAwaitingProvider("handoff");
+        setHandoff(null);
+      }
+      setTransferFailed(!succeeded);
+    },
+    [run, importProfile, environmentId, instanceId],
+  );
+  useEffect(() => {
+    if (!handoff || handoffQuery.data?.phase !== "finished") return;
+    const attemptId = handoff.input.attemptId;
+    if (importedAttempt.current === attemptId) return;
+    importedAttempt.current = attemptId;
+    void transferProfile(handoffQuery.data.profile);
+  }, [handoff, handoffQuery.data, transferProfile]);
+  useEffect(() => {
+    if (!handoff) return;
+    if (
+      handoffQuery.error ||
+      (handoffQuery.data?.phase === "auth" &&
+        ["failed", "cancelled"].includes(handoffQuery.data.state.phase))
+    ) {
+      setError(
+        handoffQuery.data?.phase === "auth"
+          ? (handoffQuery.data.state.message ?? "ChatGPT sign-in could not finish. Try again.")
+          : "ChatGPT sign-in on the primary environment was interrupted. Try again.",
+      );
+      setHandoff(null);
+    }
+  }, [handoff, handoffQuery.data, handoffQuery.error]);
+  const cancelSignIn = useCallback(() => {
+    setAwaitingProvider(null);
+    if (handoff) {
+      setHandoff(null);
+      return Promise.resolve();
+    }
+    return run(() => cancelAuth({ environmentId, input: { instanceId, flowId: auth!.flowId! } }));
+  }, [handoff, run, cancelAuth, environmentId, instanceId, auth]);
+
+  const signIn = useCallback(
+    async (methodId = "chatgpt") => {
+      if (pendingRef.current) return;
+      openRequested.current = true;
+      setTransferFailed(false);
+      setRequestedMethodId(methodId);
+      const returnUrl = new URL(window.location.href);
+      if (returnUrl.pathname === "/welcome") returnUrl.hash = `agents:${environmentId}`;
+      if (returnUrl.pathname === "/settings/providers")
+        returnUrl.searchParams.set("instanceId", instanceId);
+      if (primaryAuthEnvironmentId) {
+        const attemptId = `${handoffId}:${++handoffSequence.current}`;
+        const succeeded = await run(
+          () => reconnectProfile({ environmentId, input: { instanceId, methodId } }),
+          (profile) =>
+            setHandoff({
+              environmentId: primaryAuthEnvironmentId,
+              input: {
+                instanceId,
+                environmentId,
+                attemptId,
+                returnUrl: returnUrl.toString(),
+                profile,
+              },
+            }),
+        );
+        if (!succeeded) openRequested.current = false;
+        return;
+      }
+      if (
+        !(await run(
+          () =>
+            startAuth({
+              environmentId,
+              input: {
+                instanceId,
+                methodId,
+                returnUrl: returnUrl.toString(),
+                callbackMode: clientCallback ? "client" : "server",
+              },
+            }),
+          () => setAwaitingProvider("sign-in"),
+        ))
+      ) {
+        openRequested.current = false;
+      }
+    },
+    [
+      environmentId,
+      instanceId,
+      run,
+      startAuth,
+      clientCallback,
+      primaryAuthEnvironmentId,
+      reconnectProfile,
+      handoffId,
+    ],
+  );
+
+  const setup = useCallback(
+    async (methodId = "chatgpt") => {
+      if (unavailable || busy) return;
+      if (installed && !updateAvailable) {
+        await signIn(methodId);
+      } else {
+        continueWithSignIn.current = methodId;
+        if (!(await run(() => startInstall({ environmentId, input: { instanceId } })))) {
+          continueWithSignIn.current = null;
+        }
+      }
+    },
+    [
+      unavailable,
+      busy,
+      installed,
+      updateAvailable,
+      signIn,
+      run,
+      startInstall,
+      environmentId,
+      instanceId,
+    ],
+  );
+
+  useEffect(() => {
+    if (
+      !autoStart ||
+      autoStartHandled ||
+      unavailable ||
+      busy ||
+      installation === null ||
+      !provider?.setup?.canInstall
+    )
+      return;
+    setAutoStartHandled(true);
+    onAutoStartConsumed();
+    void setup();
+  }, [
+    autoStart,
+    autoStartHandled,
+    unavailable,
+    busy,
+    installation,
+    provider?.setup?.canInstall,
+    onAutoStartConsumed,
+    setup,
+  ]);
+
+  useEffect(() => {
+    if (!continueWithSignIn.current || pending || installActive) return;
+    if (installation?.phase === "failed" || installation?.phase === "cancelled") {
+      continueWithSignIn.current = null;
+    } else if (installed) {
+      const methodId = continueWithSignIn.current;
+      continueWithSignIn.current = null;
+      void signIn(methodId);
+    }
+  }, [pending, installActive, installation?.phase, installed, signIn]);
+
+  const receivingCallback = useRef<string | null>(null);
+  const flowId = auth?.flowId;
+  const openPage = useCallback(
+    async (authorizationUrl: string) => {
+      try {
+        const receive = window.desktopBridge?.receiveProviderAuthCallback;
+        if (receive && clientCallback && flowId) {
+          if (receivingCallback.current === authorizationUrl) {
+            await ensureLocalApi().shell.openExternal(authorizationUrl);
+            return;
+          }
+          receivingCallback.current = authorizationUrl;
+          const callbackUrl = await receive(authorizationUrl);
+          if (receivingCallback.current !== authorizationUrl) return;
+          receivingCallback.current = null;
+          await run(() =>
+            completeAuth({ environmentId, input: { instanceId, flowId, callbackUrl } }),
+          );
+        } else {
+          await ensureLocalApi().shell.openExternal(authorizationUrl);
+        }
+      } catch {
+        setError(
+          "Could not finish sign-in on this computer. Try again or paste the redirect URL below.",
+        );
+      }
+    },
+    [clientCallback, flowId, run, completeAuth, environmentId, instanceId],
+  );
+
+  useEffect(() => {
+    if (!clientCallback || !url || !window.desktopBridge?.cancelProviderAuthCallback) return;
+    return () => {
+      if (receivingCallback.current === url) receivingCallback.current = null;
+      void window.desktopBridge?.cancelProviderAuthCallback?.(url).catch(() => undefined);
+    };
+  }, [clientCallback, url]);
+
+  useEffect(() => {
+    if (
+      !openRequested.current ||
+      auth?.phase !== "waiting" ||
+      !auth.flowId ||
+      !url ||
+      openedFlow.current === auth.flowId
+    )
+      return;
+    openedFlow.current = auth.flowId;
+    openRequested.current = false;
+    if (!remoteWeb) void openPage(url);
+  }, [auth?.phase, auth?.flowId, url, openPage, remoteWeb]);
+
+  const runtimeDescription =
+    installation?.phase === "downloading"
+      ? `Downloading ${(installation.downloadedBytes / 1_000_000).toFixed(1)}${installation.totalBytes === null ? "" : ` of ${(installation.totalBytes / 1_000_000).toFixed(1)}`} MB.`
+      : installation?.phase === "extracting"
+        ? "Installing Codex."
+        : installation?.phase === "verifying"
+          ? "Checking Codex."
+          : installed
+            ? `${installation?.source === "local" ? "Using your installed Codex" : "Managed by T3 Code"}${installation?.installedVersion ? ` · v${installation.installedVersion}` : ""}.`
+            : (installation?.message ?? "T3 Code downloads and manages Codex for you.");
+  const accountDescription = finishingSignIn ? (
+    "Finishing sign-in..."
+  ) : installActive ? (
+    runtimeDescription
+  ) : authActive || auth?.phase === "failed" || auth?.phase === "cancelled" ? (
+    auth?.phase === "waiting" && requestedAccountEmail ? (
+      `Continue as ${requestedAccountEmail} on OpenAI.`
+    ) : (
+      (auth?.message ?? "Finish signing in in your browser.")
+    )
+  ) : authenticated ? (
+    provider?.auth.email?.trim() ? (
+      <>
+        Signed in as{" "}
+        <RedactedSensitiveText
+          value={provider.auth.email.trim()}
+          ariaLabel="Toggle account email visibility"
+          revealTooltip="Click to reveal email"
+          hideTooltip="Click to hide email"
+        />
+        .
+      </>
+    ) : (
+      "Signed in with ChatGPT."
+    )
+  ) : (
+    (reconnectEmail ?? "Use your ChatGPT subscription.")
+  );
+
+  const handoffUrl =
+    needsManualCallback && url && auth?.flowId && providerAuthReturnUrl(returnUrl.toString())
+      ? codexAuthHandoffUrl(
+          {
+            authorizationUrl: url,
+            returnUrl: returnUrl.toString(),
+            environmentId,
+            instanceId,
+            flowId: auth.flowId,
+          },
+          import.meta.env.DEV,
+        )
+      : null;
+  const waitingControl = (
+    <Button
+      size="sm"
+      variant={remoteWeb ? "default" : "outline"}
+      className={presentation === "onboarding" ? "min-w-44" : undefined}
+      disabled={
+        handoffQuery.data?.phase === "finished"
+          ? pending || !transferFailed
+          : !url || auth?.phase !== "waiting"
+      }
+      onClick={() => {
+        if (handoffQuery.data?.phase === "finished")
+          void transferProfile(handoffQuery.data.profile);
+        else if (url) void openPage(url);
+      }}
+    >
+      {finishingSignIn
+        ? "Finishing sign-in..."
+        : handoffQuery.data?.phase === "finished"
+          ? transferFailed
+            ? "Retry connection"
+            : "Finishing sign-in..."
+          : auth?.phase === "waiting"
+            ? remoteWeb
+              ? "Open ChatGPT sign-in"
+              : "Open sign-in page"
+            : presentation === "onboarding"
+              ? "Open sign-in page"
+              : "Signing in..."}
+    </Button>
+  );
+  const callbackCompletion =
+    !handoff && auth?.phase === "waiting" && url ? (
+      <div className="flex w-full flex-col gap-3 text-xs leading-relaxed text-muted-foreground">
+        <p>If sign-in doesn't return to T3 Code, paste the URL from the final localhost page.</p>
+        <form
+          className="flex flex-col gap-2 sm:flex-row sm:items-center"
+          onSubmit={(event) => {
+            event.preventDefault();
+            if (!auth.flowId || !callbackUrl.trim()) return;
+            const value = callbackUrl.trim();
+            const submittedFlowId = auth.flowId;
+            void run(() =>
+              completeAuth({
+                environmentId,
+                input: { instanceId, flowId: submittedFlowId, callbackUrl: value },
+              }),
+            ).then((connected) => {
+              if (connected) setCallbackDraft({ flowId: submittedFlowId, value: "" });
+            });
+          }}
+        >
+          <div className="min-w-0 flex-1">
+            <Input
+              aria-label="ChatGPT sign-in redirect URL"
+              type="password"
+              autoComplete="off"
+              placeholder="Paste the URL from the sign-in tab"
+              value={callbackUrl}
+              maxLength={16_384}
+              disabled={pending || readOnly}
+              onChange={(event) =>
+                setCallbackDraft({ flowId: auth.flowId ?? "", value: event.target.value })
+              }
+            />
+          </div>
+          <Button
+            variant="outline"
+            type="submit"
+            disabled={pending || readOnly || !callbackUrl.trim()}
+          >
+            Connect
+          </Button>
+        </form>
+        {!remoteWeb ? (
+          <div>
+            <Button
+              size="xs"
+              variant="ghost-muted"
+              onClick={() => void ensureLocalApi().shell.openExternal(url)}
+            >
+              Try sign-in in your browser
+              <ExternalLinkIcon className="size-3.5" />
+            </Button>
+          </div>
+        ) : null}
+        {handoffUrl ? (
+          <details>
+            <summary className="cursor-pointer">Other ways to connect</summary>
+            <Button className="mt-2" size="sm" variant="outline" render={<a href={handoffUrl} />}>
+              Use T3 desktop for automatic return
+            </Button>
+          </details>
+        ) : null}
+      </div>
+    ) : null;
+  const callbackHelpContent =
+    callbackCompletion && callbackHelpOpen ? (
+      <div id={callbackHelpId} className="w-full border-t border-border/50 pt-3">
+        {callbackCompletion}
+      </div>
+    ) : null;
+  const callbackFallback = needsManualCallback ? (
+    callbackCompletion
+  ) : callbackCompletion ? (
+    <div className="space-y-3 text-xs leading-relaxed text-muted-foreground">
+      <CodexSignInDescription
+        label="Having trouble signing in?"
+        expanded={callbackHelpOpen}
+        controls={callbackHelpId}
+        onToggle={() => setCallbackHelpOpen((open) => !open)}
+      />
+      {callbackHelpContent}
+    </div>
+  ) : null;
+
+  const accountPicker = (
+    <ChatGptAccountPicker
+      open={accountPickerOpen}
+      methods={auth?.methods ?? []}
+      onClose={() => setAccountPickerOpen(false)}
+      onSelect={(methodId) => {
+        setAccountPickerOpen(false);
+        void setup(
+          auth?.methods?.some((method) => method.id === methodId)
+            ? methodId
+            : "chatgpt-change-account",
+        );
+      }}
+    />
+  );
+
+  const logoutWarning =
+    auth?.phase === "idle" && auth.message?.startsWith("Signed out locally.") ? auth.message : null;
+
+  if (presentation === "onboarding") {
+    const setupError =
+      logoutWarning ??
+      error ??
+      (authQuery.error || installQuery.error
+        ? "Could not read setup status. Reconnect and try again."
+        : installation?.phase === "failed"
+          ? installation.message
+          : null);
+    return (
+      <>
+        {accountPicker}
+        <CodexWelcomeCard
+          title={displayName || provider?.displayName || "Codex"}
+          description={
+            installActive ? (
+              runtimeDescription
+            ) : authenticated ? (
+              provider?.auth.email?.trim() ? (
+                <>
+                  Signed in as{" "}
+                  <RedactedSensitiveText
+                    value={provider.auth.email.trim()}
+                    ariaLabel="Toggle account email visibility"
+                    revealTooltip="Click to reveal email"
+                    hideTooltip="Click to hide email"
+                    className="break-all"
+                  />
+                  .
+                </>
+              ) : (
+                "Connected to ChatGPT."
+              )
+            ) : callbackCompletion && !needsManualCallback ? (
+              <CodexSignInDescription
+                expanded={callbackHelpOpen}
+                controls={callbackHelpId}
+                onToggle={() => setCallbackHelpOpen((open) => !open)}
+              />
+            ) : startingAutomatically ||
+              waitingForAuthState ||
+              auth?.phase === "starting" ||
+              auth?.phase === "waiting" ||
+              (pending && !installActive) ? (
+              <CodexSignInDescription />
+            ) : authActive || auth?.phase === "failed" || auth?.phase === "cancelled" ? (
+              accountDescription
+            ) : (
+              "Code with your ChatGPT subscription."
+            )
+          }
+          control={
+            authenticated && !busy ? (
+              <span className="inline-flex items-center gap-1.5 text-xs font-medium text-success-foreground">
+                <CheckIcon className="size-3.5" />
+                Ready
+              </span>
+            ) : authActive ? (
+              waitingControl
+            ) : (
+              <ChatGptConnectionButton
+                size="sm"
+                disabled={
+                  unavailable ||
+                  busy ||
+                  (!installed ? !provider?.setup?.canInstall : !provider?.setup?.canAuthenticate)
+                }
+                onClick={() => {
+                  if (hasSavedAccount) setAccountPickerOpen(true);
+                  else void setup();
+                }}
+              >
+                {installActive || pending
+                  ? "Setting up..."
+                  : hasSavedAccount
+                    ? "Reconnect account"
+                    : "Continue with ChatGPT"}
+              </ChatGptConnectionButton>
+            )
+          }
+          secondaryControl={
+            (authActive && !finishingSignIn) || installActive ? (
+              <Button
+                size="sm"
+                variant="ghost-muted"
+                disabled={pending || readOnly}
+                onClick={() => {
+                  openRequested.current = false;
+                  continueWithSignIn.current = null;
+                  if (handoff || (authActive && auth?.flowId)) void cancelSignIn();
+                  else if (installation?.operationId)
+                    void run(() =>
+                      cancelInstall({
+                        environmentId,
+                        input: { instanceId, operationId: installation.operationId! },
+                      }),
+                    );
+                }}
+              >
+                Cancel
+              </Button>
+            ) : !authActive && !authenticated && hasSavedAccount ? (
+              <Button
+                size="sm"
+                variant="ghost-muted"
+                disabled={unavailable || busy}
+                onClick={() => void setup("chatgpt-change-account")}
+              >
+                Use a different account
+              </Button>
+            ) : !authActive && !authenticated && allowExistingCli ? (
+              <Button
+                size="sm"
+                variant="ghost-muted"
+                disabled={readOnly || busy}
+                onClick={() => onModeChange("existing")}
+              >
+                Use existing CLI
+              </Button>
+            ) : null
+          }
+        >
+          {needsManualCallback ? callbackFallback : callbackHelpContent}
+          {setupError ? (
+            <p role="alert" className="text-xs text-destructive">
+              {setupError}
+            </p>
+          ) : null}
+        </CodexWelcomeCard>
+      </>
+    );
+  }
+
+  return (
+    <section aria-label="Codex setup" className="divide-y divide-border/50">
+      {accountPicker}
+      <SettingsRow
+        title="ChatGPT account"
+        description={accountDescription}
+        control={
+          <div className="flex flex-wrap items-center justify-end gap-2">
+            {authActive ? (
+              <>
+                {waitingControl}
+                {!finishingSignIn && (
+                  <Button
+                    size="sm"
+                    variant="ghost"
+                    disabled={pending || readOnly}
+                    onClick={() => {
+                      if (!handoff && !auth?.flowId) return;
+                      openRequested.current = false;
+                      void cancelSignIn();
+                      onSignInCancelled?.();
+                    }}
+                  >
+                    Cancel
+                  </Button>
+                )}
+              </>
+            ) : installActive ? (
+              <Button
+                size="sm"
+                variant="ghost"
+                disabled={pending || readOnly}
+                onClick={() => {
+                  if (!installation?.operationId) return;
+                  continueWithSignIn.current = null;
+                  void run(() =>
+                    cancelInstall({
+                      environmentId,
+                      input: { instanceId, operationId: installation.operationId! },
+                    }),
+                  );
+                }}
+              >
+                Cancel
+              </Button>
+            ) : authenticated ? (
+              <>
+                <Button
+                  size="sm"
+                  variant="outline"
+                  disabled={unavailable || busy}
+                  onClick={() => setAccountPickerOpen(true)}
+                >
+                  Change account
+                </Button>
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  disabled={unavailable || busy}
+                  onClick={() => void run(() => logoutAuth(target))}
+                >
+                  Disconnect
+                </Button>
+              </>
+            ) : (
+              <>
+                <ChatGptConnectionButton
+                  size="sm"
+                  disabled={
+                    unavailable ||
+                    busy ||
+                    (!installed ? !provider?.setup?.canInstall : !provider?.setup?.canAuthenticate)
+                  }
+                  onClick={() => {
+                    if (hasSavedAccount) setAccountPickerOpen(true);
+                    else void setup();
+                  }}
+                >
+                  {pending
+                    ? "Setting up..."
+                    : hasSavedAccount
+                      ? "Reconnect account"
+                      : "Continue with ChatGPT"}
+                </ChatGptConnectionButton>
+                {hasSavedAccount ? (
+                  <Button
+                    size="sm"
+                    variant="ghost"
+                    disabled={unavailable || busy}
+                    onClick={() => void setup("chatgpt-change-account")}
+                  >
+                    Use a different account
+                  </Button>
+                ) : null}
+              </>
+            )}
+          </div>
+        }
+      />
+      {authenticated ? (
+        <div className="flex justify-end px-3 py-1 sm:px-4">
+          <ChatGptUsageButton />
+        </div>
+      ) : null}
+      {logoutWarning ? (
+        <p role="alert" className="px-3 py-2 text-xs text-muted-foreground sm:px-4">
+          {logoutWarning}
+        </p>
+      ) : null}
+      {callbackFallback ? <div className="px-3 py-3 sm:px-4">{callbackFallback}</div> : null}
+      {error || authQuery.error || installQuery.error || installation?.phase === "failed" ? (
+        <p role="alert" className="px-3 py-2 text-xs text-destructive sm:px-4">
+          {error ??
+            (installation?.phase === "failed"
+              ? installation.message
+              : "Could not read Codex setup status. Reconnect and try again.")}
+        </p>
+      ) : null}
+    </section>
+  );
+}
+
+/** The server selects the executable for managed instances; local config cannot override it. */
+export function CodexManagedRuntimeFields({
+  environmentId,
+  instanceId,
+  provider,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly instanceId: ProviderInstanceId;
+  readonly provider: ServerProvider | undefined;
+}) {
+  const installation = useEnvironmentQuery(
+    serverEnvironment.providerInstallState({
+      environmentId,
+      input: { instanceId },
+    }),
+  );
+  const executablePath = installation.data?.executablePath ?? "";
+  return (
+    <>
+      <SettingsRow
+        title="Binary path"
+        description="Selected by T3 Code."
+        control={
+          <div className="w-full sm:w-80">
+            <Input
+              aria-label="Codex binary path"
+              value={executablePath}
+              title={executablePath}
+              placeholder={installation.error ? "Could not read runtime path" : "Not installed"}
+              disabled
+            />
+          </div>
+        }
+      />
+      <SettingsRow
+        title="CODEX_HOME path"
+        description="Shared Codex config, sessions, and state."
+        control={
+          <div className="w-full sm:w-80">
+            <Input
+              aria-label="Codex home path"
+              value={provider?.runtimePaths?.homePath ?? ""}
+              title={provider?.runtimePaths?.homePath}
+              placeholder="Unavailable"
+              disabled
+            />
+          </div>
+        }
+      />
+      <SettingsRow
+        title="Shadow home path"
+        description={
+          provider?.runtimePaths?.shadowHomePath
+            ? "Account-specific home sharing the Codex state above."
+            : "This instance uses the shared Codex home directly."
+        }
+        control={
+          <div className="w-full sm:w-80">
+            <Input
+              aria-label="Codex shadow home path"
+              value={provider?.runtimePaths?.shadowHomePath ?? ""}
+              title={provider?.runtimePaths?.shadowHomePath ?? undefined}
+              placeholder={provider?.runtimePaths ? "Not used" : "Unavailable"}
+              disabled
+            />
+          </div>
+        }
+      />
+    </>
+  );
+}
+
+function CodexSignInDescription({
+  label = "Complete sign-in in your browser.",
+  expanded = false,
+  controls,
+  onToggle,
+}: {
+  readonly label?: string;
+  readonly expanded?: boolean;
+  readonly controls?: string;
+  readonly onToggle?: () => void;
+}) {
+  if (!onToggle) return <div className="leading-relaxed">{label}</div>;
+  return (
+    <button
+      type="button"
+      className="inline-flex items-center gap-1.5 rounded-sm text-left leading-relaxed outline-none focus-visible:ring-2 focus-visible:ring-ring"
+      aria-label="Having trouble signing in?"
+      aria-expanded={expanded}
+      aria-controls={controls}
+      onClick={onToggle}
+    >
+      {label}
+      <ChevronRightIcon aria-hidden className={`size-3 shrink-0 ${expanded ? "rotate-90" : ""}`} />
+    </button>
+  );
+}
+
+/** A single, calm setup row for the first-run welcome screen. */
+function CodexWelcomeCard({
+  title,
+  description,
+  control,
+  secondaryControl,
+  children,
+}: {
+  readonly title: string;
+  readonly description: ReactNode;
+  readonly control?: ReactNode;
+  readonly secondaryControl?: ReactNode;
+  readonly children?: ReactNode;
+}) {
+  const footer = Children.toArray(children);
+  return (
+    <div className="rounded-lg border border-border bg-background px-4 py-4">
+      <div className="flex flex-wrap items-center gap-3">
+        <OpenAI className="size-5 shrink-0 fill-foreground" />
+        <div className="min-w-0 flex-1">
+          <h3 className="text-sm font-medium">{title}</h3>
+          <div className="mt-0.5 text-xs leading-relaxed text-muted-foreground">{description}</div>
+        </div>
+        {control || secondaryControl ? (
+          <div className="flex shrink-0 flex-wrap items-center justify-end gap-2 has-[button]:w-full has-[button]:flex-col-reverse has-[button]:items-end sm:has-[button]:w-auto sm:has-[button]:flex-row sm:has-[button]:items-center">
+            {secondaryControl}
+            {control}
+          </div>
+        ) : null}
+      </div>
+      {footer.length > 0 ? (
+        <div className="ml-8 mt-2 flex flex-wrap items-center gap-2">{footer}</div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/apps/web/src/components/settings/ConnectionsSettings.tsx b/apps/web/src/components/settings/ConnectionsSettings.tsx
index 7ad90bbf81f5..5a0ed91a6dc7 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.tsx
+++ b/apps/web/src/components/settings/ConnectionsSettings.tsx
@@ -143,6 +143,7 @@ import {
   supportsServerUpdateThreadContinuation,
 } from "~/versionSkew";
 import { hasCloudPublicConfig } from "~/cloud/publicConfig";
+import { RemoveT3ConnectEnvironmentDialog } from "../clerk/RemoveT3ConnectEnvironmentDialog";
 import { useCloudLinkController } from "~/cloud/useCloudLinkController";
 import { authEnvironment } from "~/state/auth";
 import { environmentCatalog } from "~/connection/catalog";
@@ -756,7 +757,7 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
           <div className="flex min-h-5 items-center gap-1.5">
             <ConnectionStatusDot
               tooltipText={`Link created at ${formatAccessTimestamp(pairingLink.createdAt)}`}
-              dotClassName="bg-amber-400"
+              dotClassName="bg-warning"
             />
             <h3 className="text-sm font-medium text-foreground">{primaryLabel}</h3>
           </div>
@@ -771,11 +772,11 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
             <AccessScopeSummary scopes={pairingLink.scopes} label="Pairing link scopes" />
           </p>
           {!credential ? (
-            <p className="text-[11px] text-muted-foreground/70">
+            <p className="text-2xs text-muted-foreground/70">
               Create a new link to share from this client.
             </p>
           ) : shareablePairingUrl === null ? (
-            <p className="text-[11px] text-muted-foreground/70">
+            <p className="text-2xs text-muted-foreground/70">
               Copy the token and pair from another client using this backend&apos;s reachable host.
             </p>
           ) : null}
@@ -828,12 +829,11 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
                     : "Clipboard copy is unavailable here. Manually copy this code into another client."}
                 </DialogDescription>
               </DialogHeader>
-              <DialogPanel className="space-y-4">
+              <DialogPanel>
                 <Textarea
                   readOnly
                   value={revealValue}
                   rows={isRevealValueUrl ? 4 : 3}
-                  className="text-xs leading-relaxed"
                   onFocus={(event) => event.currentTarget.select()}
                   onClick={(event) => event.currentTarget.select()}
                 />
@@ -883,7 +883,7 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
                 role="radiogroup"
                 aria-label="Endpoint the pairing QR code and URL use"
               >
-                <p className="text-[11px] text-muted-foreground/70">Reach this machine via</p>
+                <p className="text-2xs text-muted-foreground/70">Reach this machine via</p>
                 {endpointCopyOptions.map((option) => {
                   const isSelected = option.id === selectedQrOption?.id;
                   return (
@@ -908,7 +908,7 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
                       >
                         {option.label}
                       </span>
-                      <span className="min-w-0 truncate text-[11px] text-muted-foreground/70">
+                      <span className="min-w-0 truncate text-2xs text-muted-foreground/70">
                         {option.detail}
                       </span>
                     </button>
@@ -920,14 +920,12 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
               <Tooltip>
                 <TooltipTrigger
                   render={
-                    <code className="min-w-0 flex-1 truncate font-mono text-[11px] text-muted-foreground">
+                    <code className="min-w-0 flex-1 truncate font-mono text-2xs text-muted-foreground">
                       {qrPairingUrl}
                     </code>
                   }
                 />
-                <TooltipPopup side="top" className="max-w-80 break-all">
-                  {qrPairingUrl}
-                </TooltipPopup>
+                <TooltipPopup side="top">{qrPairingUrl}</TooltipPopup>
               </Tooltip>
               <Button
                 size="xs"
@@ -954,7 +952,7 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
             </div>
           ) : (
             <div className="flex size-[192px] shrink-0 items-center justify-center self-center rounded-xl border border-border/50 p-4 sm:self-start">
-              <p className="text-center text-[11px] text-muted-foreground/70">
+              <p className="text-center text-2xs text-muted-foreground/70">
                 No QR for this endpoint. Another device scanning a loopback link would dial itself;
                 copy the URL for use on this machine instead.
               </p>
@@ -1014,7 +1012,7 @@ const ConnectedClientListRow = memo(function ConnectedClientListRow({
             />
             <h3 className="text-sm font-medium text-foreground">{primaryLabel}</h3>
             {clientSession.current ? (
-              <span className="text-[10px] text-muted-foreground/80 rounded-md border border-border/50 bg-muted/50 px-1 py-0.5">
+              <span className="text-3xs text-muted-foreground/80 rounded-md border border-border/50 bg-muted/50 px-1 py-0.5">
                 This device
               </span>
             ) : null}
@@ -1135,7 +1133,7 @@ const AuthorizedClientsHeaderAction = memo(function AuthorizedClientsHeaderActio
               authorized client.
             </DialogDescription>
           </DialogHeader>
-          <DialogPanel className="space-y-5">
+          <DialogPanel>
             <label className="block">
               <span className="mb-1.5 block text-xs font-medium text-foreground">
                 Client label (optional)
@@ -1334,20 +1332,18 @@ const AdvertisedEndpointListRow = memo(function AdvertisedEndpointListRow({
                   </p>
                 }
               />
-              <TooltipPopup side="top" className="max-w-80">
-                {endpoint.httpBaseUrl}
-              </TooltipPopup>
+              <TooltipPopup side="top">{endpoint.httpBaseUrl}</TooltipPopup>
             </Tooltip>
           ) : null}
           {!isAvailable ? (
-            <span className="shrink-0 rounded-md border border-border/70 px-1 py-0.5 text-[10px] text-muted-foreground">
+            <span className="shrink-0 rounded-md border border-border/70 px-1 py-0.5 text-3xs text-muted-foreground">
               Setup required
             </span>
           ) : null}
         </div>
         <div className="ml-auto flex min-h-6 shrink-0 items-center justify-end gap-2">
           {isDefault ? (
-            <span className="rounded-md border border-primary/30 bg-primary/10 px-1 py-0.5 text-[10px] text-primary">
+            <span className="rounded-md border border-primary/30 bg-primary/10 px-1 py-0.5 text-3xs text-primary">
               Default
             </span>
           ) : null}
@@ -1554,6 +1550,18 @@ function SavedBackendListRow({
     versionMismatch !== null &&
     (serverUpdateState.status === "idle" || serverUpdateState.status === "failed");
 
+  const statusTooltip = `${
+    unsupported
+      ? (environment.connection.error ?? connectionStatusText(environment.connection))
+      : enabled
+        ? connectionStatusText(environment.connection)
+        : "Switched off"
+  }${
+    versionMismatch
+      ? `\nUpdate available: ${versionMismatch.serverVersion} → ${versionMismatch.clientVersion}`
+      : ""
+  }`;
+
   return (
     <EnvironmentRow
       kind={machineKind}
@@ -1561,7 +1569,10 @@ function SavedBackendListRow({
       dimmed={!enabled}
       subtitle={
         <Tooltip>
+          {/* The status can change while the tooltip is open, and base-ui only
+              re-measures the popup when the trigger's payload changes. */}
           <TooltipTrigger
+            payload={statusTooltip}
             render={
               <span
                 className={cn(
@@ -1573,15 +1584,8 @@ function SavedBackendListRow({
           >
             {subtitleText}
           </TooltipTrigger>
-          <TooltipPopup side="top" className="max-w-80 whitespace-pre-wrap leading-tight">
-            {unsupported
-              ? (environment.connection.error ?? connectionStatusText(environment.connection))
-              : enabled
-                ? connectionStatusText(environment.connection)
-                : "Switched off"}
-            {versionMismatch
-              ? `\nUpdate available: ${versionMismatch.serverVersion} → ${versionMismatch.clientVersion}`
-              : ""}
+          <TooltipPopup side="top" className="whitespace-pre-wrap">
+            {statusTooltip}
           </TooltipPopup>
         </Tooltip>
       }
@@ -1626,9 +1630,8 @@ function SavedBackendListRow({
           render={
             <Button
               type="button"
-              variant="ghost"
+              variant="ghost-muted"
               size="icon-xs"
-              className="text-muted-foreground hover:text-foreground"
               disabled={isRemoving}
               aria-label={`More actions for ${environment.label}`}
             />
@@ -1636,7 +1639,7 @@ function SavedBackendListRow({
         >
           <EllipsisIcon className="size-3.5" />
         </MenuTrigger>
-        <MenuPopup align="end" className="min-w-52">
+        <MenuPopup align="end">
           <EnvironmentIconMenu
             environmentId={environmentId}
             serverConfig={environment.serverConfig}
@@ -2512,18 +2515,8 @@ export function ConnectionsSettings() {
     [setEnvironmentEnabled],
   );
 
-  // Removing forgets the pairing, credentials, and cached threads on this
-  // device. Switching off is the reversible path, so removal always confirms.
-  const handleRemoveSavedBackend = useCallback(
+  const removeSavedBackend = useCallback(
     async (environment: EnvironmentPresentation) => {
-      // Fail closed: no mounted confirm host means no removal.
-      const confirmed = await requestConfirmDialog(
-        `Remove ${environment.label} from this device?\nThis forgets its pairing, credentials, and cached threads here. Switch it off instead to keep it saved.`,
-        { variant: "destructive" },
-      );
-      if (confirmed !== true) {
-        return;
-      }
       const environmentId = environment.environmentId;
       setRemovingSavedEnvironmentId(environmentId);
       setSavedBackendError(null);
@@ -2545,6 +2538,28 @@ export function ConnectionsSettings() {
     [removeEnvironment],
   );
 
+  // Removing forgets the pairing, credentials, and cached threads on this
+  // device. Switching off is the reversible path, so removal always confirms.
+  // T3 Connect environments get their own dialog: removing one here leaves its
+  // account registration, so it points to where that can be deregistered.
+  const [pendingT3ConnectRemoval, setPendingT3ConnectRemoval] =
+    useState<EnvironmentPresentation | null>(null);
+  const handleRemoveSavedBackend = useCallback(
+    async (environment: EnvironmentPresentation) => {
+      if (environment.relayManaged && hasCloudPublicConfig()) {
+        setPendingT3ConnectRemoval(environment);
+        return;
+      }
+      // Fail closed: no mounted confirm host means no removal.
+      const confirmed = await requestConfirmDialog(
+        `Remove ${environment.label} from this device?\nThis forgets its pairing, credentials, and cached threads here. Switch it off instead to keep it saved.`,
+        { variant: "destructive" },
+      );
+      if (confirmed === true) await removeSavedBackend(environment);
+    },
+    [removeSavedBackend],
+  );
+
   const visibleDesktopPairingLinks = desktopPairingLinks;
   const tailscaleHttpsEndpoint = useMemo(
     () => desktopAdvertisedEndpoints.find(isTailscaleHttpsEndpoint) ?? null,
@@ -2666,7 +2681,7 @@ export function ConnectionsSettings() {
         </label>
       </div>
       <div>
-        <span className="mt-1 block text-[11px] text-muted-foreground">
+        <span className="mt-1 block text-2xs text-muted-foreground">
           Paste a full pairing URL here to fill both fields automatically.
         </span>
       </div>
@@ -2739,7 +2754,7 @@ export function ConnectionsSettings() {
                         <AutocompleteItem
                           key={`${target.alias}:${target.hostname}:${target.port ?? ""}`}
                           value={target}
-                          className="h-8 min-h-8 gap-2 whitespace-nowrap"
+                          className="h-8 min-h-8 whitespace-nowrap"
                         >
                           <span className="min-w-0 truncate text-sm font-medium">
                             {target.alias}
@@ -2759,7 +2774,7 @@ export function ConnectionsSettings() {
                     })}
                   </AutocompleteList>
                 ) : (
-                  <AutocompleteEmpty className="break-all px-3 py-2 text-xs">
+                  <AutocompleteEmpty className="break-all">
                     No hosts match "{savedBackendSshHost.trim()}".
                   </AutocompleteEmpty>
                 )}
@@ -3292,16 +3307,15 @@ export function ConnectionsSettings() {
                     render={
                       <Button
                         type="button"
-                        variant="ghost"
+                        variant="ghost-muted"
                         size="icon-xs"
-                        className="text-muted-foreground hover:text-foreground"
                         aria-label="More actions for this machine"
                       />
                     }
                   >
                     <EllipsisIcon className="size-3.5" />
                   </MenuTrigger>
-                  <MenuPopup align="end" className="min-w-52">
+                  <MenuPopup align="end">
                     <EnvironmentIconMenu
                       environmentId={primaryEnvironmentId}
                       serverConfig={primaryServerConfig}
@@ -3608,7 +3622,7 @@ export function ConnectionsSettings() {
                   Tailscale to proxy HTTPS traffic to this backend.
                 </DialogDescription>
               </DialogHeader>
-              <DialogPanel className="space-y-4">
+              <DialogPanel>
                 <label className="block">
                   <span className="text-sm font-medium text-foreground">HTTPS port</span>
                   <Input
@@ -3637,9 +3651,7 @@ export function ConnectionsSettings() {
                       }
                     />
                     {pendingTailscaleServeBaseUrl ? (
-                      <TooltipPopup side="top" className="max-w-80">
-                        {pendingTailscaleServeBaseUrl}
-                      </TooltipPopup>
+                      <TooltipPopup side="top">{pendingTailscaleServeBaseUrl}</TooltipPopup>
                     ) : null}
                   </Tooltip>
                 </div>
@@ -3689,11 +3701,7 @@ export function ConnectionsSettings() {
         headerAction={
           <div className="flex items-center gap-1">
             {savedServerUpdateTargets.length > 0 ? (
-              <ServerUpdatesAction
-                targets={savedServerUpdateTargets}
-                variant="ghost"
-                className="font-normal text-muted-foreground/60 hover:text-muted-foreground"
-              />
+              <ServerUpdatesAction targets={savedServerUpdateTargets} variant="ghost-muted" />
             ) : null}
             <Dialog
               open={addBackendDialogOpen}
@@ -3709,12 +3717,7 @@ export function ConnectionsSettings() {
                   render={
                     <DialogTrigger
                       render={
-                        <Button
-                          size="xs"
-                          variant="ghost"
-                          className="font-normal text-muted-foreground/60 hover:text-muted-foreground"
-                          aria-label="Add environment"
-                        >
+                        <Button size="xs" variant="ghost-muted" aria-label="Add environment">
                           <PlusIcon className="size-3" />
                           <span>Add environment</span>
                         </Button>
@@ -3772,6 +3775,17 @@ export function ConnectionsSettings() {
           savedEnvironments={savedEnvironments}
         />
       </SettingsSection>
+      {hasCloudPublicConfig() ? (
+        <RemoveT3ConnectEnvironmentDialog
+          environmentLabel={pendingT3ConnectRemoval?.label ?? null}
+          onCancel={() => setPendingT3ConnectRemoval(null)}
+          onConfirm={() => {
+            if (!pendingT3ConnectRemoval) return;
+            setPendingT3ConnectRemoval(null);
+            void removeSavedBackend(pendingT3ConnectRemoval);
+          }}
+        />
+      ) : null}
       <LoadBalancingSettings environments={loadBalancingEnvironments} />
       <GitHubRoutingSettings environments={loadBalancingEnvironments} />
     </SettingsPageContainer>
diff --git a/apps/web/src/components/settings/CustomModelEditor.tsx b/apps/web/src/components/settings/CustomModelEditor.tsx
index 9fa65e0bf23e..48b91748d780 100644
--- a/apps/web/src/components/settings/CustomModelEditor.tsx
+++ b/apps/web/src/components/settings/CustomModelEditor.tsx
@@ -154,7 +154,8 @@ export function CustomModelEditor({
         value={choice.id}
         onChange={(event) => updateChoice(descriptor.key, choice.key, { id: event.target.value })}
         placeholder="value"
-        className="w-28 font-mono"
+        font="mono"
+        className="w-28"
         spellCheck={false}
         aria-label="Choice value"
       />
@@ -168,7 +169,7 @@ export function CustomModelEditor({
         className="min-w-0 flex-1"
         aria-label="Choice label"
       />
-      <label className="flex shrink-0 items-center gap-1.5 text-[11px] text-muted-foreground">
+      <label className="flex shrink-0 items-center gap-1.5 text-2xs text-muted-foreground">
         <Switch
           size="sm"
           checked={choice.isDefault}
@@ -200,7 +201,7 @@ export function CustomModelEditor({
       className="flex flex-col gap-2 rounded-md border border-border/60 bg-background/40 p-2.5"
     >
       <div className="flex flex-wrap items-center gap-2">
-        <span className="w-14 shrink-0 text-[11px] text-muted-foreground">Option {index + 1}</span>
+        <span className="w-14 shrink-0 text-2xs text-muted-foreground">Option {index + 1}</span>
         {presets.length > 0 ? (
           <Select
             value={idSelectValue(descriptor)}
@@ -230,7 +231,8 @@ export function CustomModelEditor({
             value={descriptor.id}
             onChange={(event) => updateDescriptor(descriptor.key, { id: event.target.value })}
             placeholder="optionId"
-            className="w-36 font-mono"
+            font="mono"
+            className="w-36"
             spellCheck={false}
             aria-label="Option id"
           />
diff --git a/apps/web/src/components/settings/DeviceHostEditor.tsx b/apps/web/src/components/settings/DeviceHostEditor.tsx
index 926f404be2e9..263ee1779ea1 100644
--- a/apps/web/src/components/settings/DeviceHostEditor.tsx
+++ b/apps/web/src/components/settings/DeviceHostEditor.tsx
@@ -72,7 +72,7 @@ export function DeviceHostEditor({
             Hosts on the same machine are skipped.
           </DialogDescription>
         </DialogHeader>
-        <DialogPanel className="space-y-4">
+        <DialogPanel>
           <label className="block space-y-1.5 text-sm">
             <span>Name</span>
             <Input
diff --git a/apps/web/src/components/settings/DiagnosticsSettings.tsx b/apps/web/src/components/settings/DiagnosticsSettings.tsx
index 0a987eca8c1d..de8cdcee4c76 100644
--- a/apps/web/src/components/settings/DiagnosticsSettings.tsx
+++ b/apps/web/src/components/settings/DiagnosticsSettings.tsx
@@ -94,7 +94,7 @@ function StatBlock({
 }) {
   return (
     <div className="min-w-0 border-border/60 px-4 py-3 sm:px-5">
-      <div className="flex min-w-0 items-center gap-1.5 text-[11px] font-medium uppercase tracking-[0.08em] text-muted-foreground/70">
+      <div className="flex min-w-0 items-center gap-1.5 text-2xs font-medium uppercase tracking-widest text-muted-foreground/70">
         <span className="min-w-0 truncate">{label}</span>
         {tooltip ? (
           <Tooltip>
@@ -109,19 +109,14 @@ function StatBlock({
                 </button>
               }
             />
-            <TooltipPopup
-              side="top"
-              className="max-w-[min(300px,calc(100vw-2rem))] whitespace-normal text-left text-[11px] leading-relaxed text-wrap"
-            >
-              {tooltip}
-            </TooltipPopup>
+            <TooltipPopup side="top">{tooltip}</TooltipPopup>
           </Tooltip>
         ) : null}
       </div>
       <div
         className={cn(
           "mt-1 truncate font-mono text-lg font-semibold tabular-nums text-foreground",
-          tone === "warning" && "text-amber-600 dark:text-amber-400",
+          tone === "warning" && "text-warning-foreground",
           tone === "danger" && "text-destructive",
         )}
       >
@@ -172,10 +167,11 @@ function DiagnosticsTable({
 }) {
   return (
     <ScrollArea
+      radius="none"
       chainVerticalScroll
       scrollFade
       hideScrollbars
-      className="w-full max-w-full rounded-none"
+      className="w-full max-w-full"
     >
       <table
         className={cn("w-full text-left text-xs", minTableWidth, columnWidths && "table-fixed")}
@@ -187,7 +183,7 @@ function DiagnosticsTable({
             ))}
           </colgroup>
         ) : null}
-        <thead className="border-b border-border/60 text-[11px] uppercase tracking-[0.08em] text-muted-foreground/70">
+        <thead className="border-b border-border/60 text-2xs uppercase tracking-widest text-muted-foreground/70">
           <tr>
             {headers.map((header, index) => (
               <th
@@ -219,15 +215,12 @@ function TraceIdCell({ traceId }: { traceId: string }) {
       <Tooltip>
         <TooltipTrigger
           render={
-            <span className="min-w-0 flex-1 truncate font-mono text-[11px]">
+            <span className="min-w-0 flex-1 truncate font-mono text-2xs">
               {shortenTraceId(traceId)}
             </span>
           }
         />
-        <TooltipPopup
-          side="top"
-          className="max-w-[min(520px,calc(100vw-2rem))] break-all font-mono text-[11px]"
-        >
+        <TooltipPopup side="top" variant="code">
           {traceId}
         </TooltipPopup>
       </Tooltip>
@@ -294,15 +287,12 @@ function ProcessNameCell({
       ) : (
         <span className="size-5 shrink-0" aria-hidden="true" />
       )}
-      <span className="size-1.5 shrink-0 rounded-full bg-emerald-500/80" />
+      <span className="size-1.5 shrink-0 rounded-full bg-success/80" />
       <Tooltip>
         <TooltipTrigger
           render={<span className="min-w-0 truncate font-medium text-foreground">{name}</span>}
         />
-        <TooltipPopup
-          side="top"
-          className="max-w-[min(440px,calc(100vw-2rem))] whitespace-normal break-words text-left font-mono text-[11px] leading-relaxed text-wrap"
-        >
+        <TooltipPopup side="top" variant="code">
           {process.command}
         </TooltipPopup>
       </Tooltip>
@@ -354,86 +344,86 @@ function ProcessDiagnosticsTable({
   }, []);
 
   return (
-    <ScrollArea
-      chainVerticalScroll
-      scrollFade
-      hideScrollbars
-      className="max-h-[min(64vh,44rem)] w-full max-w-full rounded-none border-t border-border/60"
-    >
-      <table className="w-full min-w-[1040px] table-fixed text-left text-xs">
-        <colgroup>
-          <col className="w-[24%]" />
-          <col className="w-[8%]" />
-          <col className="w-[10%]" />
-          <col className="w-[33%]" />
-          <col className="w-[8%]" />
-          <col className="w-[11%]" />
-          <col className="w-[6%]" />
-        </colgroup>
-        <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-[11px] uppercase tracking-[0.08em] text-muted-foreground/70">
-          <tr>
-            <th className="px-4 py-2 font-semibold sm:pl-5">Name</th>
-            <th className="px-3 py-2 text-right font-semibold">CPU</th>
-            <th className="px-3 py-2 text-right font-semibold">Memory</th>
-            <th className="px-3 py-2 font-semibold">Command</th>
-            <th className="px-3 py-2 text-right font-semibold">PID</th>
-            <th className="px-3 py-2 font-semibold">Type</th>
-            <th className="p-2 text-right font-semibold sm:pr-4">Kill</th>
-          </tr>
-        </thead>
-        <tbody className="divide-y divide-border/50">
-          {visibleProcesses.length === 0 ? (
+    <div className="border-t border-border/60">
+      <ScrollArea
+        radius="none"
+        chainVerticalScroll
+        scrollFade
+        hideScrollbars
+        className="max-h-[min(64vh,44rem)] w-full max-w-full"
+      >
+        <table className="w-full min-w-[1040px] table-fixed text-left text-xs">
+          <colgroup>
+            <col className="w-[24%]" />
+            <col className="w-[8%]" />
+            <col className="w-[10%]" />
+            <col className="w-[33%]" />
+            <col className="w-[8%]" />
+            <col className="w-[11%]" />
+            <col className="w-[6%]" />
+          </colgroup>
+          <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-2xs uppercase tracking-widest text-muted-foreground/70">
             <tr>
-              <td colSpan={7} className="px-4 py-4 text-xs text-muted-foreground sm:px-5">
-                {emptyLabel ?? "No live descendant processes found."}
-              </td>
+              <th className="px-4 py-2 font-semibold sm:pl-5">Name</th>
+              <th className="px-3 py-2 text-right font-semibold">CPU</th>
+              <th className="px-3 py-2 text-right font-semibold">Memory</th>
+              <th className="px-3 py-2 font-semibold">Command</th>
+              <th className="px-3 py-2 text-right font-semibold">PID</th>
+              <th className="px-3 py-2 font-semibold">Type</th>
+              <th className="p-2 text-right font-semibold sm:pr-4">Kill</th>
             </tr>
-          ) : null}
-          {visibleProcesses.map((process) => (
-            <tr key={process.pid} className="hover:bg-muted/20">
-              <td className="px-4 py-2 align-middle sm:pl-5">
-                <ProcessNameCell
-                  process={process}
-                  isExpanded={!collapsedPids.has(process.pid)}
-                  onToggle={toggleProcess}
-                />
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
-                {process.cpuPercent.toFixed(1)}%
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
-                {formatBytes(process.rssBytes)}
-              </td>
-              <td className="px-3 py-2 align-middle text-muted-foreground">
-                <Tooltip>
-                  <TooltipTrigger
-                    render={<span className="block truncate">{process.command}</span>}
+          </thead>
+          <tbody className="divide-y divide-border/50">
+            {visibleProcesses.length === 0 ? (
+              <tr>
+                <td colSpan={7} className="px-4 py-4 text-xs text-muted-foreground sm:px-5">
+                  {emptyLabel ?? "No live descendant processes found."}
+                </td>
+              </tr>
+            ) : null}
+            {visibleProcesses.map((process) => (
+              <tr key={process.pid} className="hover:bg-muted/20">
+                <td className="px-4 py-2 align-middle sm:pl-5">
+                  <ProcessNameCell
+                    process={process}
+                    isExpanded={!collapsedPids.has(process.pid)}
+                    onToggle={toggleProcess}
                   />
-                  <TooltipPopup
-                    side="top"
-                    className="max-w-[min(440px,calc(100vw-2rem))] whitespace-normal break-words text-left font-mono text-[11px] leading-relaxed text-wrap"
-                  >
-                    {process.command}
-                  </TooltipPopup>
-                </Tooltip>
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums text-muted-foreground">
-                {process.pid}
-              </td>
-              <td className="truncate px-3 py-2 align-middle text-muted-foreground">
-                {formatProcessType(process)}
-              </td>
-              <td className="p-2 align-middle sm:pr-4">
-                <ProcessSignalActions
-                  disabled={signalingPid === process.pid}
-                  onSignal={(signal) => onSignal(process.pid, signal)}
-                />
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    </ScrollArea>
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
+                  {process.cpuPercent.toFixed(1)}%
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
+                  {formatBytes(process.rssBytes)}
+                </td>
+                <td className="px-3 py-2 align-middle text-muted-foreground">
+                  <Tooltip>
+                    <TooltipTrigger
+                      render={<span className="block truncate">{process.command}</span>}
+                    />
+                    <TooltipPopup side="top" variant="code">
+                      {process.command}
+                    </TooltipPopup>
+                  </Tooltip>
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums text-muted-foreground">
+                  {process.pid}
+                </td>
+                <td className="truncate px-3 py-2 align-middle text-muted-foreground">
+                  {formatProcessType(process)}
+                </td>
+                <td className="p-2 align-middle sm:pr-4">
+                  <ProcessSignalActions
+                    disabled={signalingPid === process.pid}
+                    onSignal={(signal) => onSignal(process.pid, signal)}
+                  />
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </ScrollArea>
+    </div>
   );
 }
 
@@ -475,17 +465,14 @@ function ResourceHistoryProcessNameCell({
       <span
         className={cn(
           "size-1.5 shrink-0 rounded-full",
-          process.isServerRoot ? "bg-amber-500/90" : "bg-emerald-500/80",
+          process.isServerRoot ? "bg-warning/90" : "bg-success/80",
         )}
       />
       <Tooltip>
         <TooltipTrigger
           render={<span className="min-w-0 truncate font-medium text-foreground">{name}</span>}
         />
-        <TooltipPopup
-          side="top"
-          className="max-w-[min(440px,calc(100vw-2rem))] whitespace-normal break-words text-left font-mono text-[11px] leading-relaxed text-wrap"
-        >
+        <TooltipPopup side="top" variant="code">
           {process.command}
         </TooltipPopup>
       </Tooltip>
@@ -583,91 +570,90 @@ function ProcessResourceHistoryTable({
   }, null);
 
   return (
-    <ScrollArea
-      chainVerticalScroll
-      scrollFade
-      hideScrollbars
-      className="max-h-[min(64vh,44rem)] w-full max-w-full border-t border-border/60"
-    >
-      <table className="w-full min-w-[980px] table-fixed text-left text-xs">
-        <colgroup>
-          <col className="w-[24%]" />
-          <col className="w-[10%]" />
-          <col className="w-[10%]" />
-          <col className="w-[10%]" />
-          <col className="w-[10%]" />
-          <col className="w-[10%]" />
-          <col className="w-[16%]" />
-          <col className="w-[10%]" />
-        </colgroup>
-        <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-[11px] uppercase tracking-[0.08em] text-muted-foreground/70">
-          <tr>
-            <th className="px-4 py-2 font-semibold sm:pl-5">Process</th>
-            <th className="px-3 py-2 text-right font-semibold">CPU Time</th>
-            <th className="px-3 py-2 text-right font-semibold">Current</th>
-            <th className="px-3 py-2 text-right font-semibold">Average</th>
-            <th className="px-3 py-2 text-right font-semibold">Peak</th>
-            <th className="px-3 py-2 text-right font-semibold">Max Mem</th>
-            <th className="px-3 py-2 font-semibold">Command</th>
-            <th className="px-3 py-2 text-right font-semibold sm:pr-5">PID</th>
-          </tr>
-        </thead>
-        <tbody className="divide-y divide-border/50">
-          {processes.length === 0 ? (
+    <div className="border-t border-border/60">
+      <ScrollArea
+        chainVerticalScroll
+        scrollFade
+        hideScrollbars
+        className="max-h-[min(64vh,44rem)] w-full max-w-full"
+      >
+        <table className="w-full min-w-[980px] table-fixed text-left text-xs">
+          <colgroup>
+            <col className="w-[24%]" />
+            <col className="w-[10%]" />
+            <col className="w-[10%]" />
+            <col className="w-[10%]" />
+            <col className="w-[10%]" />
+            <col className="w-[10%]" />
+            <col className="w-[16%]" />
+            <col className="w-[10%]" />
+          </colgroup>
+          <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-2xs uppercase tracking-widest text-muted-foreground/70">
             <tr>
-              <td colSpan={8} className="px-4 py-4 text-xs text-muted-foreground sm:px-5">
-                {emptyLabel}
-              </td>
+              <th className="px-4 py-2 font-semibold sm:pl-5">Process</th>
+              <th className="px-3 py-2 text-right font-semibold">CPU Time</th>
+              <th className="px-3 py-2 text-right font-semibold">Current</th>
+              <th className="px-3 py-2 text-right font-semibold">Average</th>
+              <th className="px-3 py-2 text-right font-semibold">Peak</th>
+              <th className="px-3 py-2 text-right font-semibold">Max Mem</th>
+              <th className="px-3 py-2 font-semibold">Command</th>
+              <th className="px-3 py-2 text-right font-semibold sm:pr-5">PID</th>
             </tr>
-          ) : null}
-          {processes.map((process) => (
-            <tr key={process.processKey} className="hover:bg-muted/20">
-              <td className="px-4 py-2 align-middle sm:pl-5">
-                <ResourceHistoryProcessNameCell
-                  process={process}
-                  visualDepth={
-                    process.isServerRoot || shallowestChildDepth === null
-                      ? 0
-                      : Math.max(1, process.depth - shallowestChildDepth + 1)
-                  }
-                />
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
-                {formatCpuTime(process.cpuSecondsApprox)}
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
-                {process.currentCpuPercent.toFixed(1)}%
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
-                {process.avgCpuPercent.toFixed(1)}%
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
-                {process.maxCpuPercent.toFixed(1)}%
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
-                {formatBytes(process.maxRssBytes)}
-              </td>
-              <td className="px-3 py-2 align-middle text-muted-foreground">
-                <Tooltip>
-                  <TooltipTrigger
-                    render={<span className="block truncate">{process.command}</span>}
+          </thead>
+          <tbody className="divide-y divide-border/50">
+            {processes.length === 0 ? (
+              <tr>
+                <td colSpan={8} className="px-4 py-4 text-xs text-muted-foreground sm:px-5">
+                  {emptyLabel}
+                </td>
+              </tr>
+            ) : null}
+            {processes.map((process) => (
+              <tr key={process.processKey} className="hover:bg-muted/20">
+                <td className="px-4 py-2 align-middle sm:pl-5">
+                  <ResourceHistoryProcessNameCell
+                    process={process}
+                    visualDepth={
+                      process.isServerRoot || shallowestChildDepth === null
+                        ? 0
+                        : Math.max(1, process.depth - shallowestChildDepth + 1)
+                    }
                   />
-                  <TooltipPopup
-                    side="top"
-                    className="max-w-[min(440px,calc(100vw-2rem))] whitespace-normal break-words text-left font-mono text-[11px] leading-relaxed text-wrap"
-                  >
-                    {process.command}
-                  </TooltipPopup>
-                </Tooltip>
-              </td>
-              <td className="px-3 py-2 text-right align-middle font-mono tabular-nums text-muted-foreground sm:pr-5">
-                {process.pid}
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    </ScrollArea>
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
+                  {formatCpuTime(process.cpuSecondsApprox)}
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
+                  {process.currentCpuPercent.toFixed(1)}%
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
+                  {process.avgCpuPercent.toFixed(1)}%
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
+                  {process.maxCpuPercent.toFixed(1)}%
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums">
+                  {formatBytes(process.maxRssBytes)}
+                </td>
+                <td className="px-3 py-2 align-middle text-muted-foreground">
+                  <Tooltip>
+                    <TooltipTrigger
+                      render={<span className="block truncate">{process.command}</span>}
+                    />
+                    <TooltipPopup side="top" variant="code">
+                      {process.command}
+                    </TooltipPopup>
+                  </Tooltip>
+                </td>
+                <td className="px-3 py-2 text-right align-middle font-mono tabular-nums text-muted-foreground sm:pr-5">
+                  {process.pid}
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </ScrollArea>
+    </div>
   );
 }
 
@@ -676,15 +662,15 @@ function DiagnosticsLastChecked({ checkedAt }: { checkedAt: DateTime.Utc | null
   const relative = getRelativeTimeState(checkedAt ? DateTime.formatIso(checkedAt) : null);
 
   if (relative.status === "missing") {
-    return <span className="text-[11px] text-muted-foreground/50">Checking</span>;
+    return <span className="text-2xs text-muted-foreground/50">Checking</span>;
   }
 
   if (relative.status === "invalid") {
-    return <span className="text-[11px] text-muted-foreground/50">Checked unavailable</span>;
+    return <span className="text-2xs text-muted-foreground/50">Checked unavailable</span>;
   }
 
   return (
-    <span className="text-[11px] text-muted-foreground/60">
+    <span className="text-2xs text-muted-foreground/60">
       {relative.suffix ? (
         <>
           Checked <span className="font-mono tabular-nums">{relative.value}</span> {relative.suffix}
@@ -1114,9 +1100,7 @@ export function DiagnosticsSettingsPanel() {
               <div
                 className={cn(
                   "flex items-start gap-2",
-                  traceDiagnosticsPartialFailure
-                    ? "text-amber-600 dark:text-amber-400"
-                    : "text-destructive",
+                  traceDiagnosticsPartialFailure ? "text-warning-foreground" : "text-destructive",
                 )}
               >
                 <AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
@@ -1224,10 +1208,11 @@ export function DiagnosticsSettingsPanel() {
       <SettingsSection title="Span Logs">
         {data && data.latestWarningAndErrorLogs.length > 0 ? (
           <ScrollArea
+            radius="none"
             chainVerticalScroll
             scrollFade
             hideScrollbars
-            className="w-full max-w-full rounded-none"
+            className="w-full max-w-full"
           >
             <table className="w-full min-w-[920px] table-fixed text-left text-xs">
               <colgroup>
@@ -1237,7 +1222,7 @@ export function DiagnosticsSettingsPanel() {
                 <col className="w-[26%]" />
                 <col className="w-[30%]" />
               </colgroup>
-              <thead className="border-b border-border/60 text-[11px] uppercase tracking-[0.08em] text-muted-foreground/70">
+              <thead className="border-b border-border/60 text-2xs uppercase tracking-widest text-muted-foreground/70">
                 <tr>
                   <th className="whitespace-nowrap px-4 py-2.5 font-semibold sm:pl-5">Time</th>
                   <th className="whitespace-nowrap px-4 py-2.5 font-semibold">Level</th>
@@ -1256,7 +1241,7 @@ export function DiagnosticsSettingsPanel() {
                       {formatRelativeNoWrap(event.seenAt)}
                     </td>
                     <td className="px-4 py-3 align-top">
-                      <span className="inline-flex rounded bg-muted px-1.5 py-0.5 font-mono text-[11px] font-medium uppercase text-foreground/80">
+                      <span className="inline-flex rounded bg-muted px-1.5 py-0.5 font-mono text-2xs font-medium uppercase text-foreground/80">
                         {event.level}
                       </span>
                     </td>
diff --git a/apps/web/src/components/settings/EnvironmentIconPicker.tsx b/apps/web/src/components/settings/EnvironmentIconPicker.tsx
index b3b33fab0252..0add490159a9 100644
--- a/apps/web/src/components/settings/EnvironmentIconPicker.tsx
+++ b/apps/web/src/components/settings/EnvironmentIconPicker.tsx
@@ -99,10 +99,10 @@ export function EnvironmentIconMenu({
         <EnvironmentMachineIcon kind={resolved} />
         Icon
       </MenuSubTrigger>
-      <MenuSubPopup className="min-w-44">
+      <MenuSubPopup>
         {lock !== null ? (
           <>
-            <MenuItem disabled className="whitespace-normal text-xs">
+            <MenuItem disabled className="whitespace-normal">
               {lock}
             </MenuItem>
             <MenuSeparator />
diff --git a/apps/web/src/components/settings/ExpandableText.tsx b/apps/web/src/components/settings/ExpandableText.tsx
index 36c0ce7c9529..f24e0589fa55 100644
--- a/apps/web/src/components/settings/ExpandableText.tsx
+++ b/apps/web/src/components/settings/ExpandableText.tsx
@@ -37,7 +37,8 @@ export function ExpandableText({
         <InlineButton
           aria-expanded={expanded}
           aria-controls={textId}
-          className="mt-1 text-[11px] font-medium text-foreground/70 underline-offset-2 hover:text-foreground hover:underline"
+          tone="muted"
+          className="mt-1"
           onClick={() => setExpanded((value) => !value)}
         >
           {expanded ? "Show less" : expandLabel}
diff --git a/apps/web/src/components/settings/FoldedSettingsSection.tsx b/apps/web/src/components/settings/FoldedSettingsSection.tsx
index d12af6209235..cb6f09af1001 100644
--- a/apps/web/src/components/settings/FoldedSettingsSection.tsx
+++ b/apps/web/src/components/settings/FoldedSettingsSection.tsx
@@ -16,12 +16,14 @@ export function FoldedSettingsSection({
   title,
   summary,
   control,
+  headerPlacement = "inside",
   children,
 }: {
   readonly id: string;
   readonly title: string;
   readonly summary?: string | null;
   readonly control?: ReactNode;
+  readonly headerPlacement?: "inside" | "outside";
   readonly children: ReactNode;
 }) {
   const [open, setOpen] = useState(false);
@@ -34,6 +36,38 @@ export function FoldedSettingsSection({
     if (!open) setOpen(true);
   }
 
+  if (headerPlacement === "outside") {
+    return (
+      <section id={id} ref={targetRef} tabIndex={-1} className="outline-none">
+        <Collapsible open={open} onOpenChange={setOpen}>
+          <div className="space-y-2.5">
+            <div
+              data-settings-scroll-target
+              className="flex min-h-7 items-start justify-between gap-4 px-3 sm:px-4"
+            >
+              <h2>
+                <CollapsibleTrigger className="flex min-h-7 items-center gap-2 rounded-md text-sm font-normal text-foreground/70 outline-none focus-visible:ring-2 focus-visible:ring-ring">
+                  {title}
+                  <ChevronRightIcon
+                    aria-hidden
+                    className={cn(
+                      "size-4 shrink-0 transition-transform duration-150 motion-reduce:transition-none",
+                      open && "rotate-90",
+                    )}
+                  />
+                </CollapsibleTrigger>
+              </h2>
+              {control}
+            </div>
+            <CollapsiblePanel>
+              <SettingsGroup>{children}</SettingsGroup>
+            </CollapsiblePanel>
+          </div>
+        </Collapsible>
+      </section>
+    );
+  }
+
   return (
     <section id={id} ref={targetRef} tabIndex={-1} className="outline-none">
       <Collapsible open={open} onOpenChange={setOpen} render={<SettingsGroup divided={false} />}>
diff --git a/apps/web/src/components/settings/FontFamilyPicker.tsx b/apps/web/src/components/settings/FontFamilyPicker.tsx
index 1981b852c03d..b7e43eef8209 100644
--- a/apps/web/src/components/settings/FontFamilyPicker.tsx
+++ b/apps/web/src/components/settings/FontFamilyPicker.tsx
@@ -1,5 +1,5 @@
 import { LegendList, type LegendListRef } from "@legendapp/list/react";
-import { CheckIcon, ChevronDownIcon } from "lucide-react";
+import { CheckIcon } from "lucide-react";
 import { useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
 import { isMonospaceFamily, queryInstalledFontFamilies } from "../../appearanceFonts";
 import {
@@ -11,7 +11,7 @@ import {
   ComboboxPopup,
   ComboboxTrigger,
 } from "../ui/combobox";
-import { selectTriggerVariants } from "../ui/select";
+import { SelectButton } from "../ui/select";
 
 const DEFAULT_FONT_VALUE = "__default__";
 
@@ -173,9 +173,7 @@ export function FontFamilyPicker({
             {family}
           </span>
           <span className="flex shrink-0 items-center gap-1.5">
-            {isDefault ? (
-              <span className="text-[10px] text-muted-foreground/60">default</span>
-            ) : null}
+            {isDefault ? <span className="text-3xs text-muted-foreground/60">default</span> : null}
             {item === selectedValue ? (
               <CheckIcon className="size-3.5 text-muted-foreground" />
             ) : null}
@@ -204,11 +202,8 @@ export function FontFamilyPicker({
         void listRef.current?.scrollIndexIntoView?.({ index: eventDetails.index, animated: false });
       }}
     >
-      <ComboboxTrigger aria-label={ariaLabel} className={selectTriggerVariants({ size: "sm" })}>
-        <span className="min-w-0 truncate">
-          {selectedFamily.length === 0 ? defaultFamily : selectedFamily}
-        </span>
-        <ChevronDownIcon className="-me-1 size-3 opacity-50" />
+      <ComboboxTrigger aria-label={ariaLabel} render={<SelectButton size="sm" />}>
+        {selectedFamily.length === 0 ? defaultFamily : selectedFamily}
       </ComboboxTrigger>
       <ComboboxPopup align="end" className="flex w-72 flex-col">
         <ComboboxSearchInput
diff --git a/apps/web/src/components/settings/IntegrationsSettings.tsx b/apps/web/src/components/settings/IntegrationsSettings.tsx
index b6b4a77b7c04..f77cfcc25768 100644
--- a/apps/web/src/components/settings/IntegrationsSettings.tsx
+++ b/apps/web/src/components/settings/IntegrationsSettings.tsx
@@ -304,7 +304,7 @@ function BrowserViewportSetting({ disabled }: { readonly disabled: boolean }) {
             >
               <SelectValue>{viewportSelectLabel(viewport)}</SelectValue>
             </SelectTrigger>
-            <SelectPopup align="end" alignItemWithTrigger={false} className="min-w-64">
+            <SelectPopup align="end" alignItemWithTrigger={false}>
               <SelectItem value={FILL_VALUE}>Fill panel</SelectItem>
               <SelectItem value={RESPONSIVE_VALUE}>Responsive</SelectItem>
               <SelectGroup>
@@ -1183,7 +1183,7 @@ function BrowserProfilesSetting({ disabled }: { readonly disabled: boolean }) {
             <PlusIcon />
             Add profile
           </MenuTrigger>
-          <MenuPopup align="end" className="min-w-56">
+          <MenuPopup align="end">
             <MenuItem
               disabled={!settingsHydrated || atProfileLimit}
               onClick={() => createProfile("New profile")}
@@ -1278,14 +1278,11 @@ function BrowserProfilesSetting({ disabled }: { readonly disabled: boolean }) {
                     onCommit={(next) => renameProfile(profile.id, next)}
                   />
                 )}
-                {/*
-                  Dimmed with the rest of the row: a `Badge` has no disabled
-                  treatment of its own, so a solid `bg-primary` pill would
-                  otherwise sit at full strength beside a name, rename field
-                  and menu button that are all at 0.64.
-                */}
+                {/* Dimmed with the rest of the row, whose controls are all disabled. */}
                 {isDefault ? (
-                  <Badge className={cn(profileWritesDisabled && "opacity-64")}>Default</Badge>
+                  <span className={cn("flex", profileWritesDisabled && "opacity-64")}>
+                    <Badge>Default</Badge>
+                  </span>
                 ) : null}
               </span>
               <Menu>
@@ -1301,7 +1298,7 @@ function BrowserProfilesSetting({ disabled }: { readonly disabled: boolean }) {
                 >
                   <MoreVertical />
                 </MenuTrigger>
-                <MenuPopup align="end" className="min-w-44">
+                <MenuPopup align="end">
                   <MenuItem
                     disabled={!settingsHydrated || isDefault}
                     onClick={() => {
diff --git a/apps/web/src/components/settings/KeybindingsSettings.logic.test.ts b/apps/web/src/components/settings/KeybindingsSettings.logic.test.ts
index 10fc154d5b0c..7729ce183754 100644
--- a/apps/web/src/components/settings/KeybindingsSettings.logic.test.ts
+++ b/apps/web/src/components/settings/KeybindingsSettings.logic.test.ts
@@ -46,6 +46,24 @@ describe("KeybindingsSettings.logic", () => {
       );
     },
   );
+  it("orders Usage bindings and command choices like the page", () => {
+    const expected = [
+      "usage.cost",
+      "usage.open",
+      "usage.tokens",
+      "usage.limits",
+      "usage.period.day",
+      "usage.period.week",
+      "usage.period.month",
+      "usage.period.quarter",
+    ];
+    const bindings = DEFAULT_RESOLVED_KEYBINDINGS.toReversed();
+    expect(buildKeybindingRows(bindings, "usage").map((row) => row.command)).toEqual(expected);
+    expect(
+      buildKeybindingCommandOptions(bindings).filter((command) => command.startsWith("usage.")),
+    ).toEqual(expected);
+  });
+
   it("builds searchable rows with readable key and when values", () => {
     const rows = buildKeybindingRows(
       [
@@ -243,6 +261,7 @@ describe("KeybindingsSettings.logic", () => {
         "chat.new",
         "rightPanel.toggleMaximized",
         "thread.stop",
+        "usage.open",
         "script.setup-db.run",
       ]),
     );
diff --git a/apps/web/src/components/settings/KeybindingsSettings.logic.ts b/apps/web/src/components/settings/KeybindingsSettings.logic.ts
index dc4d33bc28ba..a06628e5d505 100644
--- a/apps/web/src/components/settings/KeybindingsSettings.logic.ts
+++ b/apps/web/src/components/settings/KeybindingsSettings.logic.ts
@@ -13,6 +13,17 @@ import {
 
 import { shortcutKeyFromEvent } from "../../keybindings";
 import { isMacPlatform } from "../../lib/utils";
+import { METRIC_OPTIONS, WINDOW_OPTIONS } from "../usage/usageShortcuts";
+
+const usageCommandOrder = new Map<KeybindingCommand, number>(
+  [...METRIC_OPTIONS, ...WINDOW_OPTIONS].map((option, index) => [option.command, index]),
+);
+
+function compareUsageCommands(left: KeybindingCommand, right: KeybindingCommand): number | null {
+  const leftIndex = usageCommandOrder.get(left);
+  const rightIndex = usageCommandOrder.get(right);
+  return leftIndex !== undefined && rightIndex !== undefined ? leftIndex - rightIndex : null;
+}
 
 export type KeybindingSource = "Default" | "Custom" | "Project";
 
@@ -204,7 +215,9 @@ export function buildKeybindingRows(
   });
 
   rowsWithConflicts.sort((left, right) => {
-    const commandCompare = left.command.localeCompare(right.command);
+    const commandCompare =
+      compareUsageCommands(left.command, right.command) ??
+      left.command.localeCompare(right.command);
     if (commandCompare !== 0) return commandCompare;
     return left.key.localeCompare(right.key);
   });
@@ -277,13 +290,18 @@ export function buildKeybindingCommandOptions(
   for (const binding of keybindings) {
     commands.add(binding.command);
   }
-  return [...commands].toSorted((left, right) =>
-    commandLabel(left).localeCompare(commandLabel(right)),
+  return [...commands].toSorted(
+    (left, right) =>
+      compareUsageCommands(left, right) ?? commandLabel(left).localeCompare(commandLabel(right)),
   );
 }
 
 export function commandLabel(command: KeybindingCommand): string {
   if (command === "thread.copyReference") return "Pull Request: Copy Link or Thread ID";
+  const usageMetric = METRIC_OPTIONS.find((option) => option.command === command);
+  if (usageMetric) return `Usage: ${usageMetric.label}`;
+  const usagePeriod = WINDOW_OPTIONS.find((option) => option.command === command);
+  if (usagePeriod) return `Usage: Period: ${usagePeriod.label}`;
   const raw = String(command);
   if (raw.startsWith("script.") && raw.endsWith(".run")) {
     return `Run Script: ${titleCaseCommandSegment(raw.slice("script.".length, -".run".length))}`;
diff --git a/apps/web/src/components/settings/KeybindingsSettings.tsx b/apps/web/src/components/settings/KeybindingsSettings.tsx
index 104bcb86cd95..c46bdb35e9f4 100644
--- a/apps/web/src/components/settings/KeybindingsSettings.tsx
+++ b/apps/web/src/components/settings/KeybindingsSettings.tsx
@@ -42,6 +42,7 @@ import { useSettingsScope } from "./SettingsScopeContext";
 import { Badge } from "../ui/badge";
 import { Button } from "../ui/button";
 import { Input } from "../ui/input";
+import { InputGroup, InputGroupAddon, InputGroupInput } from "../ui/input-group";
 import { Kbd, KbdGroup } from "../ui/kbd";
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from "../ui/menu";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover";
@@ -79,9 +80,9 @@ function KeybindingPill({ value }: { value: string }) {
     return { part, key: seen === 0 ? part : `${part}-${seen}` };
   });
   return (
-    <KbdGroup className="bg-transparent p-0 shadow-none">
+    <KbdGroup>
       {parts.map(({ part, key }) => (
-        <Kbd key={key} className="min-w-6 justify-center px-1.5">
+        <Kbd key={key}>
           {part === "mod"
             ? navigator.platform.toLowerCase().includes("mac")
               ? "⌘"
@@ -143,9 +144,11 @@ function ExpandableHeaderSearch({
   }
 
   return (
-    <div className="relative">
-      <SearchIcon className="pointer-events-none absolute top-1/2 left-2 size-3 -translate-y-1/2 text-muted-foreground" />
-      <Input
+    <InputGroup className="w-44">
+      <InputGroupAddon>
+        <SearchIcon aria-hidden className="size-3" />
+      </InputGroupAddon>
+      <InputGroupInput
         ref={inputRef}
         autoFocus
         type="search"
@@ -163,10 +166,9 @@ function ExpandableHeaderSearch({
         }}
         placeholder="Search keybindings"
         aria-label="Search keybindings"
-        className="w-44 [&_[data-slot=input]]:pl-7"
         size="sm"
       />
-    </div>
+    </InputGroup>
   );
 }
 
@@ -253,7 +255,7 @@ function WarningTooltipIcon({
             tabIndex={focusable ? 0 : undefined}
             aria-label={label}
             className={cn(
-              "inline-flex size-5 shrink-0 items-center justify-center rounded-sm text-warning outline-none transition-colors hover:bg-warning/10 focus-visible:ring-[3px] focus-visible:ring-warning/25",
+              "inline-flex size-5 shrink-0 items-center justify-center rounded-sm text-warning outline-none transition-colors hover:bg-warning/10 focus-visible:ring-3 focus-visible:ring-warning/25",
               className,
             )}
           />
@@ -261,9 +263,7 @@ function WarningTooltipIcon({
       >
         <TriangleAlertIcon className="size-3.5" />
       </TooltipTrigger>
-      <TooltipPopup side="top" className="max-w-72 whitespace-normal leading-relaxed">
-        {children}
-      </TooltipPopup>
+      <TooltipPopup side="top">{children}</TooltipPopup>
     </Tooltip>
   );
 }
@@ -320,24 +320,15 @@ function WhenVariableSelect({
 
   return (
     <Select value={value} onValueChange={(nextValue) => nextValue && onChange(nextValue)}>
-      <SelectTrigger size="compact" className="min-w-0 flex-1 font-mono">
-        <SelectValue placeholder="Condition" className="leading-7" />
+      <SelectTrigger size="compact" className="min-w-0 flex-1">
+        <SelectValue placeholder="Condition" />
         {unknownIdentifiers && unknownIdentifiers.length > 0 ? (
           <UnknownWhenVariableWarning identifiers={unknownIdentifiers} focusable={false} />
         ) : null}
       </SelectTrigger>
-      <SelectContent
-        alignItemWithTrigger={false}
-        matchTriggerWidth={false}
-        popupClassName="w-fit"
-        className="max-h-72 w-fit min-w-44"
-      >
+      <SelectContent alignItemWithTrigger={false} matchTriggerWidth={false} className="max-h-72">
         {options.map((option) => (
-          <SelectItem
-            key={option}
-            value={option}
-            className="min-h-7 w-full py-1 font-mono text-[12px]"
-          >
+          <SelectItem key={option} value={option} className="w-full">
             <span className="truncate">{option}</span>
           </SelectItem>
         ))}
@@ -540,18 +531,9 @@ function WhenExpressionNodeEditor({
           <SelectTrigger size="compact" className="w-24">
             <SelectValue />
           </SelectTrigger>
-          <SelectContent
-            alignItemWithTrigger={false}
-            matchTriggerWidth={false}
-            popupClassName="w-fit"
-            className="w-fit min-w-24"
-          >
-            <SelectItem value="and" className="min-h-7 py-1 font-mono text-[12px]">
-              and
-            </SelectItem>
-            <SelectItem value="or" className="min-h-7 py-1 font-mono text-[12px]">
-              or
-            </SelectItem>
+          <SelectContent alignItemWithTrigger={false} matchTriggerWidth={false}>
+            <SelectItem value="and">and</SelectItem>
+            <SelectItem value="or">or</SelectItem>
           </SelectContent>
         </Select>
         <Button type="button" variant="outline" size="compact" onClick={addCondition}>
@@ -669,27 +651,24 @@ function WhenExpressionBuilder({
       </div>
 
       <div className="space-y-1.5">
-        <div className="relative">
-          <Input
+        <InputGroup>
+          <InputGroupInput
             value={expressionDraft}
             onChange={(event) => updateExpressionDraft(event.currentTarget.value)}
             placeholder="Always"
             aria-invalid={Boolean(parseError)}
             aria-label="When expression"
-            className={cn(
-              "h-7 rounded-md font-mono text-[12px] leading-7 sm:h-7 sm:leading-7",
-              unknownIdentifiers.length > 0 && "pr-9",
-              parseError && "border-destructive/70 focus-visible:border-destructive",
-            )}
+            size="compact"
+            font="mono"
           />
           {unknownIdentifiers.length > 0 ? (
-            <span className="absolute inset-y-0 right-2 flex items-center">
+            <InputGroupAddon align="inline-end">
               <UnknownWhenVariableWarning identifiers={unknownIdentifiers} />
-            </span>
+            </InputGroupAddon>
           ) : null}
-        </div>
+        </InputGroup>
         {parseError ? (
-          <div className="flex items-center gap-1.5 text-[11px] text-destructive">
+          <div className="flex items-center gap-1.5 text-2xs text-destructive">
             <CircleXIcon className="size-3.5" />
             {parseError}
           </div>
@@ -719,7 +698,7 @@ function WhenExpressionBuilder({
           </div>
         )}
         {parseError ? (
-          <div className="pointer-events-none absolute inset-0 flex items-center justify-center rounded-lg border border-destructive/30 bg-background/75 p-4 text-center text-xs text-destructive backdrop-blur-[1px]">
+          <div className="pointer-events-none absolute inset-0 flex items-center justify-center rounded-lg border border-destructive/30 bg-background/75 p-4 text-center text-xs text-destructive backdrop-blur-xs">
             Fix the expression above to continue editing visually.
           </div>
         ) : null}
@@ -863,7 +842,7 @@ function KeybindingKeyControl({
           onClick={() => setDraft({ isRecording: true })}
           aria-label={`Edit shortcut for ${commandLabel(row.command)}: ${formatShortcutLabel(row.binding.shortcut)}`}
           className={cn(
-            "inline-flex h-8 cursor-pointer items-center rounded-md border border-transparent px-1.5 sm:h-7 outline-none transition-colors hover:border-border/70 hover:bg-accent focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/24",
+            "inline-flex h-8 cursor-pointer items-center rounded-md border border-transparent px-1.5 sm:h-7 outline-none transition-colors hover:border-border/70 hover:bg-accent focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/24",
             pillClassName,
           )}
         >
@@ -877,7 +856,8 @@ function KeybindingKeyControl({
           value={isRecording ? "" : keyDraft}
           placeholder={isRecording ? "Press shortcut" : "Unassigned"}
           size="sm"
-          className={cn("w-44 font-mono", isRecording && "border-primary/70 bg-primary/5")}
+          font="mono"
+          className="w-44"
           onFocus={() => setDraft({ isRecording: true })}
           onBlur={() => setDraft({ isRecording: false })}
           onChange={(event) => setDraft({ keyDraft: event.currentTarget.value })}
@@ -911,12 +891,12 @@ function WhenClauseControl({
           <Button
             variant={expression ? "ghost" : "ghost-muted"}
             size="micro"
-            className="min-w-0 shrink font-mono"
+            className="min-w-0 shrink"
           />
         }
         aria-label={`Edit when clause for ${label}`}
       >
-        <span className="truncate">{expression || "Always"}</span>
+        <span className="truncate font-mono">{expression || "Always"}</span>
         <ChevronDownIcon className="size-3.5 shrink-0 opacity-60" />
       </PopoverTrigger>
       <PopoverContent align="start" sideOffset={6}>
@@ -952,9 +932,8 @@ function KeybindingRowMenu({
         render={
           <Button
             type="button"
-            variant="ghost"
+            variant="ghost-muted"
             size="icon-sm"
-            className="text-muted-foreground hover:text-foreground"
             disabled={isSaving}
             aria-label={`Actions for ${commandLabel(row.command)}`}
           />
@@ -962,7 +941,7 @@ function KeybindingRowMenu({
       >
         <EllipsisIcon className="size-3.5" />
       </MenuTrigger>
-      <MenuPopup align="end" className="min-w-36">
+      <MenuPopup align="end">
         {canReset ? (
           <MenuItem disabled={isSaving} onClick={() => onReset(row)}>
             Reset to default
@@ -981,7 +960,7 @@ function KeybindingRowMenu({
 function KeybindingSourceBadge({ source }: { source: KeybindingRow["source"] }) {
   if (source === "Default") return null;
   return (
-    <Badge variant="outline" size="sm" className="font-normal text-muted-foreground">
+    <Badge variant="outline" size="sm">
       {source}
     </Badge>
   );
@@ -1010,7 +989,7 @@ function KeybindingRowWhen({
 }) {
   return (
     <span className="flex h-6 items-center gap-1.5">
-      <span className="text-[12px] leading-none text-muted-foreground/70">When</span>
+      <span className="text-xs leading-none text-muted-foreground/70">When</span>
       <WhenClauseControl
         label={commandLabel(row.command)}
         expression={editor.whenDraftExpression}
@@ -1159,13 +1138,9 @@ function NewKeybindingCommandSelect({
       <SelectTrigger size="sm" className={className}>
         <SelectValue placeholder="Command" />
       </SelectTrigger>
-      <SelectContent
-        alignItemWithTrigger={false}
-        matchTriggerWidth={false}
-        className="max-h-72 w-fit min-w-56"
-      >
+      <SelectContent alignItemWithTrigger={false} matchTriggerWidth={false} className="max-h-72">
         {commandOptions.map((command) => (
-          <SelectItem key={command} value={command} className="min-h-7 w-full py-1 text-[12px]">
+          <SelectItem key={command} value={command} className="w-full">
             <span className="truncate">{commandLabel(command)}</span>
           </SelectItem>
         ))}
@@ -1191,7 +1166,8 @@ function NewKeybindingKeyInput({
       value={draft.isRecording ? "" : draft.keyDraft}
       placeholder={draft.isRecording ? "Press shortcut" : "Unassigned"}
       size="sm"
-      className={cn("font-mono", draft.isRecording && "border-primary/70 bg-primary/5", className)}
+      font="mono"
+      className={className}
       onFocus={() => draft.setDraft({ isRecording: true })}
       onBlur={() => draft.setDraft({ isRecording: false })}
       onChange={(event) => draft.setDraft({ keyDraft: event.currentTarget.value })}
@@ -1232,9 +1208,8 @@ function NewKeybindingCancelIcon({
         render={
           <Button
             type="button"
-            variant="ghost"
+            variant="ghost-muted"
             size="icon-sm"
-            className="text-muted-foreground hover:text-foreground"
             disabled={isSaving}
             aria-label="Cancel new keybinding"
             onClick={onCancel}
@@ -1259,7 +1234,7 @@ function NewKeybindingSettingsRow(props: NewKeybindingProps) {
       title="New keybinding"
       description={
         <span className="flex h-6 items-center gap-1.5">
-          <span className="text-[12px] leading-none text-muted-foreground/70">When</span>
+          <span className="text-xs leading-none text-muted-foreground/70">When</span>
           <NewKeybindingWhen draft={draft} variables={variables} />
         </span>
       }
@@ -1337,7 +1312,7 @@ function KeybindingsList(props: KeybindingsListProps) {
 /** Shown in the browser build only; the desktop app receives every shortcut. */
 function BrowserKeybindingNotice() {
   return (
-    <div className="flex items-center gap-2 px-3 py-2.5 text-[12px] leading-[1.45] text-muted-foreground sm:px-4">
+    <div className="flex items-center gap-2 px-3 py-2.5 text-xs leading-normal text-muted-foreground sm:px-4">
       <TriangleAlertIcon className="size-3.5 shrink-0 text-warning" aria-hidden />
       <span>
         Some shortcuts may be claimed by the browser before T3 Turbo sees them. Use the desktop app
@@ -1513,7 +1488,7 @@ export function KeybindingsSettingsPanel() {
   const cancelAdd = useCallback(() => setIsAddingBinding(false), []);
 
   const bindingsCount = (
-    <span className="text-[11px] text-muted-foreground">
+    <span className="text-2xs text-muted-foreground">
       {rows.length + (isAddingBinding ? 1 : 0)}{" "}
       {rows.length + (isAddingBinding ? 1 : 0) === 1 ? "binding" : "bindings"}
     </span>
diff --git a/apps/web/src/components/settings/OpenSourceLicenses.tsx b/apps/web/src/components/settings/OpenSourceLicenses.tsx
index dc4703cad51a..02a87caf7ac7 100644
--- a/apps/web/src/components/settings/OpenSourceLicenses.tsx
+++ b/apps/web/src/components/settings/OpenSourceLicenses.tsx
@@ -179,7 +179,7 @@ function LicenseManifestError({ message, onRetry }: { message: string; onRetry:
     <div className="flex flex-col items-start gap-3 px-3 py-5 sm:px-4">
       <div className="flex flex-col gap-1">
         <h3 className="text-sm font-medium text-foreground">Open-source notices are unavailable</h3>
-        <p className="max-w-[70ch] text-pretty text-[13px] leading-[1.45] text-muted-foreground/80">
+        <p className="max-w-[70ch] text-pretty text-xs leading-normal text-muted-foreground/80">
           {message}
         </p>
       </div>
diff --git a/apps/web/src/components/settings/PanelAnimationsPreview.tsx b/apps/web/src/components/settings/PanelAnimationsPreview.tsx
index a56504479c4d..34178f9b54c7 100644
--- a/apps/web/src/components/settings/PanelAnimationsPreview.tsx
+++ b/apps/web/src/components/settings/PanelAnimationsPreview.tsx
@@ -5,7 +5,7 @@ import { cn } from "~/lib/utils";
 export function PanelAnimationsPreview({ durationMs }: { durationMs: number }) {
   const [panelsOpen, setPanelsOpen] = useState(true);
   const transitionClass =
-    "transition-[width,height,border-width] [transition-duration:var(--preview-duration)] ease-out motion-reduce:transition-none";
+    "transition-[width,height,border-width] duration-(--preview-duration) ease-out motion-reduce:transition-none";
 
   return (
     <button
diff --git a/apps/web/src/components/settings/ProcessSignalActions.tsx b/apps/web/src/components/settings/ProcessSignalActions.tsx
index ab96e019ef34..9c973cabbba2 100644
--- a/apps/web/src/components/settings/ProcessSignalActions.tsx
+++ b/apps/web/src/components/settings/ProcessSignalActions.tsx
@@ -19,7 +19,7 @@ export function ProcessSignalActions({
             <InlineButton
               disabled={disabled}
               aria-label="Send SIGINT"
-              className="text-[11px] font-medium text-muted-foreground underline-offset-2 hover:text-foreground hover:underline"
+              tone="muted"
               onClick={() => onSignal("SIGINT")}
             >
               INT
@@ -34,7 +34,7 @@ export function ProcessSignalActions({
             <InlineButton
               disabled={disabled}
               aria-label="Send SIGKILL"
-              className="text-[11px] font-medium text-destructive underline-offset-2 hover:underline"
+              tone="destructive"
               onClick={() => onSignal("SIGKILL")}
             >
               KILL
diff --git a/apps/web/src/components/settings/ProjectActionsList.tsx b/apps/web/src/components/settings/ProjectActionsList.tsx
index 1794a5fdaa2e..e28cafc4e787 100644
--- a/apps/web/src/components/settings/ProjectActionsList.tsx
+++ b/apps/web/src/components/settings/ProjectActionsList.tsx
@@ -34,12 +34,12 @@ export function ProjectActionsList({
             <ScriptIcon icon={script.icon} className="size-4 shrink-0 text-muted-foreground" />
             <span className="min-w-0 truncate">{script.name}</span>
             {script.runOnWorktreeCreate ? (
-              <span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-[11px] font-normal text-muted-foreground">
+              <span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-2xs font-normal text-muted-foreground">
                 setup
               </span>
             ) : null}
             {script.previewUrl ? (
-              <span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-[11px] font-normal text-muted-foreground max-sm:hidden">
+              <span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-2xs font-normal text-muted-foreground max-sm:hidden">
                 preview · desktop only
               </span>
             ) : null}
@@ -51,16 +51,17 @@ export function ProjectActionsList({
             {shortcutLabel ? (
               <span className="text-xs text-muted-foreground">{shortcutLabel}</span>
             ) : null}
-            <Button
-              size="icon-xs"
-              variant="ghost"
-              className="shrink-0 text-muted-foreground opacity-0 group-focus-within:opacity-100 group-hover:opacity-100"
-              aria-label={`Edit ${script.name}`}
-              disabled={disabled}
-              onClick={() => onEdit(script)}
-            >
-              <SettingsIcon className="size-3.5" />
-            </Button>
+            <span className="flex shrink-0 opacity-0 group-focus-within:opacity-100 group-hover:opacity-100">
+              <Button
+                size="icon-xs"
+                variant="ghost-muted"
+                aria-label={`Edit ${script.name}`}
+                disabled={disabled}
+                onClick={() => onEdit(script)}
+              >
+                <SettingsIcon className="size-3.5" />
+              </Button>
+            </span>
           </>
         }
       />
diff --git a/apps/web/src/components/settings/ProjectActionsSettings.tsx b/apps/web/src/components/settings/ProjectActionsSettings.tsx
index edbde5e7439a..f9b7b44ec0c8 100644
--- a/apps/web/src/components/settings/ProjectActionsSettings.tsx
+++ b/apps/web/src/components/settings/ProjectActionsSettings.tsx
@@ -156,7 +156,7 @@ export function ProjectActionsSettings() {
                   Import scripts
                   <ChevronDownIcon className="size-3.5" />
                 </MenuTrigger>
-                <MenuPopup align="end" className="w-72">
+                <MenuPopup align="end">
                   <MenuGroup>
                     <MenuGroupLabel>Import from t3.json</MenuGroupLabel>
                     <p className="px-2 pb-2 text-pretty text-sm text-muted-foreground">
diff --git a/apps/web/src/components/settings/ProjectDefaultsSettings.tsx b/apps/web/src/components/settings/ProjectDefaultsSettings.tsx
index 25a3f5d1fa26..62a58307aaf5 100644
--- a/apps/web/src/components/settings/ProjectDefaultsSettings.tsx
+++ b/apps/web/src/components/settings/ProjectDefaultsSettings.tsx
@@ -129,97 +129,149 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
     updateSettings({ defaultModelSelection: value });
   };
 
+  const modelRow = (
+    <SettingsRow
+      serverScoped
+      settingKeys={["defaultModelSelection"]}
+      mixed={mixedModel}
+      id="default-model"
+      title="Model"
+      description={
+        isProjectScope
+          ? "Model for new threads in this project."
+          : "Default model for new threads. Projects can override it."
+      }
+      status={
+        unavailable || mixedModel || modelSource === "project"
+          ? undefined
+          : settings.defaultModelSelection === null
+            ? "Automatic"
+            : undefined
+      }
+      resetAction={
+        settings.defaultModelSelection !== null ? (
+          <SettingResetButton label="default model" onClick={() => setModel(null)} />
+        ) : null
+      }
+      control={
+        selection && activeEntry ? (
+          <div className="flex min-w-0 flex-wrap items-center justify-end gap-1.5">
+            <ProviderModelPicker
+              activeInstanceId={selection.instanceId}
+              model={selection.model}
+              lockedProvider={null}
+              instanceEntries={entries}
+              modelOptionsByInstance={modelOptions}
+              triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
+              {...(mixedModel ? { triggerLabel: "Mixed" } : {})}
+              getModelDisabledReason={modelDisabledReason}
+              onOpenProviderSetup={(instanceId) => {
+                if (representative)
+                  void navigate({
+                    to: "/settings/providers",
+                    search: { environmentId: representative.environmentId, instanceId },
+                  });
+              }}
+              onInstanceModelChange={(instanceId, model) =>
+                setModel(createModelSelection(instanceId, model))
+              }
+            />
+            {!mixedModel ? (
+              <TraitsPicker
+                provider={activeEntry.driverKind}
+                models={activeEntry.models}
+                model={selection.model}
+                prompt=""
+                onPromptChange={() => {}}
+                modelOptions={selection.options ?? []}
+                allowPromptInjectedEffort={false}
+                planModeEnabled={settings.planModeEnabled}
+                triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
+                onModelOptionsChange={(options) =>
+                  setModel(createModelSelection(selection.instanceId, selection.model, options))
+                }
+              />
+            ) : null}
+          </div>
+        ) : (
+          <span className="text-sm text-muted-foreground">No providers available</span>
+        )
+      }
+    />
+  );
+  const workspaceRow = (
+    <SettingsRow
+      serverScoped
+      settingKeys={["defaultThreadEnvMode"]}
+      mixed={mixedWorkspace}
+      id={searchableSetting("new-threads").id}
+      title="Workspace"
+      description={
+        isProjectScope
+          ? "Where new threads in this project start."
+          : "Where new threads start. Projects and their t3.json can override it."
+      }
+      resetAction={
+        !isProjectScope && settings.defaultThreadEnvMode !== null ? (
+          <SettingResetButton
+            label="default workspace"
+            onClick={() => updateSettings({ defaultThreadEnvMode: null })}
+          />
+        ) : null
+      }
+      control={
+        <Select
+          value={mixedWorkspace ? null : (effective?.defaultThreadEnvMode ?? null)}
+          onValueChange={(value) => {
+            if (value === "local" || value === "worktree")
+              updateSettings({ defaultThreadEnvMode: value });
+          }}
+        >
+          <SelectTrigger size="sm" aria-label="Default workspace">
+            <SelectValue>
+              {(value: string | null) =>
+                value === "local" || value === "worktree"
+                  ? resolveEnvModeLabel(value)
+                  : unavailable
+                    ? "Unavailable"
+                    : "Mixed"
+              }
+            </SelectValue>
+          </SelectTrigger>
+          <SelectPopup align="end" alignItemWithTrigger={false}>
+            <SelectItem value="local">{resolveEnvModeLabel("local")}</SelectItem>
+            <SelectItem value="worktree">{resolveEnvModeLabel("worktree")}</SelectItem>
+          </SelectPopup>
+        </Select>
+      }
+    />
+  );
+
   return (
     <SettingsSection
       id={
-        category === "general"
+        category === "general" || category === "project"
           ? "project-defaults"
           : category === "integrations"
             ? "browser-access"
             : "source-control-defaults"
       }
       title={
-        category === "general"
+        category === "general" || category === "project"
           ? "New threads"
           : category === "integrations"
             ? "Browser"
             : "Repositories"
       }
     >
-      {category === "general" ? (
+      {category === "project" ? (
         <>
-          <SettingsRow
-            serverScoped
-            settingKeys={["defaultModelSelection"]}
-            mixed={mixedModel}
-            id="default-model"
-            title="Model"
-            description={
-              isProjectScope
-                ? "Model for new threads in this project."
-                : "Default model for new threads. Projects can override it."
-            }
-            status={
-              unavailable || mixedModel || modelSource === "project"
-                ? undefined
-                : settings.defaultModelSelection === null
-                  ? "Automatic"
-                  : undefined
-            }
-            resetAction={
-              settings.defaultModelSelection !== null ? (
-                <SettingResetButton label="default model" onClick={() => setModel(null)} />
-              ) : null
-            }
-            control={
-              selection && activeEntry ? (
-                <div className="flex min-w-0 flex-wrap items-center justify-end gap-1.5">
-                  <ProviderModelPicker
-                    activeInstanceId={selection.instanceId}
-                    model={selection.model}
-                    lockedProvider={null}
-                    instanceEntries={entries}
-                    modelOptionsByInstance={modelOptions}
-                    triggerVariant="outline"
-                    triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
-                    {...(mixedModel ? { triggerLabel: "Mixed" } : {})}
-                    getModelDisabledReason={modelDisabledReason}
-                    onOpenProviderSetup={(instanceId) => {
-                      if (representative)
-                        void navigate({
-                          to: "/settings/providers",
-                          search: { environmentId: representative.environmentId, instanceId },
-                        });
-                    }}
-                    onInstanceModelChange={(instanceId, model) =>
-                      setModel(createModelSelection(instanceId, model))
-                    }
-                  />
-                  {!mixedModel ? (
-                    <TraitsPicker
-                      provider={activeEntry.driverKind}
-                      models={activeEntry.models}
-                      model={selection.model}
-                      prompt=""
-                      onPromptChange={() => {}}
-                      modelOptions={selection.options ?? []}
-                      allowPromptInjectedEffort={false}
-                      planModeEnabled={settings.planModeEnabled}
-                      triggerVariant="outline"
-                      triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
-                      onModelOptionsChange={(options) =>
-                        setModel(
-                          createModelSelection(selection.instanceId, selection.model, options),
-                        )
-                      }
-                    />
-                  ) : null}
-                </div>
-              ) : (
-                <span className="text-sm text-muted-foreground">No providers available</span>
-              )
-            }
-          />
+          {modelRow}
+          {workspaceRow}
+        </>
+      ) : category === "general" ? (
+        <>
+          {modelRow}
           <SettingsRow
             serverScoped
             settingKeys={["defaultRuntimeMode"]}
@@ -264,7 +316,7 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
                     const option = runtimeModeConfig[mode];
                     const Icon = option.icon;
                     return (
-                      <SelectItem key={mode} value={mode} className="min-w-64 py-2">
+                      <SelectItem key={mode} value={mode} className="min-w-64">
                         <div className="grid gap-0.5">
                           <span className="inline-flex items-center gap-1.5 font-medium">
                             <Icon className="size-3.5 shrink-0 text-muted-foreground" />
@@ -281,51 +333,7 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
               </Select>
             }
           />
-          <SettingsRow
-            serverScoped
-            settingKeys={["defaultThreadEnvMode"]}
-            mixed={mixedWorkspace}
-            id={searchableSetting("new-threads").id}
-            title="Workspace"
-            description={
-              isProjectScope
-                ? "Where new threads in this project start."
-                : "Where new threads start. Projects and their t3.json can override it."
-            }
-            resetAction={
-              !isProjectScope && settings.defaultThreadEnvMode !== null ? (
-                <SettingResetButton
-                  label="default workspace"
-                  onClick={() => updateSettings({ defaultThreadEnvMode: null })}
-                />
-              ) : null
-            }
-            control={
-              <Select
-                value={mixedWorkspace ? null : (effective?.defaultThreadEnvMode ?? null)}
-                onValueChange={(value) => {
-                  if (value === "local" || value === "worktree")
-                    updateSettings({ defaultThreadEnvMode: value });
-                }}
-              >
-                <SelectTrigger size="sm" aria-label="Default workspace">
-                  <SelectValue>
-                    {(value: string | null) =>
-                      value === "local" || value === "worktree"
-                        ? resolveEnvModeLabel(value)
-                        : unavailable
-                          ? "Unavailable"
-                          : "Mixed"
-                    }
-                  </SelectValue>
-                </SelectTrigger>
-                <SelectPopup align="end" alignItemWithTrigger={false}>
-                  <SelectItem value="local">{resolveEnvModeLabel("local")}</SelectItem>
-                  <SelectItem value="worktree">{resolveEnvModeLabel("worktree")}</SelectItem>
-                </SelectPopup>
-              </Select>
-            }
-          />
+          {workspaceRow}
           <SettingsRow
             serverScoped
             settingKeys={["worktreeSubmodules"]}
diff --git a/apps/web/src/components/settings/ProjectFaviconPickerDialog.tsx b/apps/web/src/components/settings/ProjectFaviconPickerDialog.tsx
index aa4d291851c7..5ed077f31bcf 100644
--- a/apps/web/src/components/settings/ProjectFaviconPickerDialog.tsx
+++ b/apps/web/src/components/settings/ProjectFaviconPickerDialog.tsx
@@ -71,7 +71,7 @@ export function ProjectFaviconPickerDialog(props: {
       {props.open ? (
         <CommandDialogPopup
           aria-label="Choose project icon"
-          className="overflow-hidden p-0"
+          className="overflow-hidden"
           onBackdropPointerDown={() => props.onOpenChange(false)}
         >
           <CommandPaletteContent
@@ -115,7 +115,7 @@ export function ProjectFaviconPickerDialog(props: {
               setHighlightedItemValue(null);
               setQuery(value);
             }}
-            panelClassName="max-h-[min(34rem,76vh)]"
+            panelSize="tall-list"
             testId="project-favicon-picker"
             value={query}
           >
diff --git a/apps/web/src/components/settings/ProjectIconPickerDialog.tsx b/apps/web/src/components/settings/ProjectIconPickerDialog.tsx
index f2474e531c07..d9c48c036efb 100644
--- a/apps/web/src/components/settings/ProjectIconPickerDialog.tsx
+++ b/apps/web/src/components/settings/ProjectIconPickerDialog.tsx
@@ -105,7 +105,7 @@ export function ProjectIconPickerDialog({
           <DialogTitle>Choose project icon</DialogTitle>
           <DialogDescription>Choose an icon, emoji, or monogram.</DialogDescription>
         </DialogHeader>
-        <DialogPanel className="flex min-h-0 flex-col gap-4">
+        <DialogPanel className="flex min-h-0 flex-col">
           <ToggleGroup
             aria-label="Icon type"
             variant="segmented"
diff --git a/apps/web/src/components/settings/ProjectSettingsPanel.tsx b/apps/web/src/components/settings/ProjectSettingsPanel.tsx
index c31edf0f7e3d..8e5edec0f485 100644
--- a/apps/web/src/components/settings/ProjectSettingsPanel.tsx
+++ b/apps/web/src/components/settings/ProjectSettingsPanel.tsx
@@ -10,7 +10,7 @@ import { AsyncResult } from "effect/unstable/reactivity";
 import { type EnvironmentId, type ProjectIconOverride } from "@t3tools/contracts";
 import { useLocation, useNavigate } from "@tanstack/react-router";
 import * as Cause from "effect/Cause";
-import { Trash2Icon } from "lucide-react";
+import { InfoIcon, Trash2Icon } from "lucide-react";
 import { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 import { useComposerDraftStore } from "../../composerDraftStore";
@@ -25,6 +25,7 @@ import { useThreadShells } from "../../state/entities";
 import { projectEnvironment } from "../../state/projects";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { ProjectFavicon } from "../ProjectFavicon";
+import { Alert, AlertDescription } from "../ui/alert";
 import { Button } from "../ui/button";
 import { Input } from "../ui/input";
 import { stackedThreadToast, toastManager } from "../ui/toast";
@@ -39,6 +40,7 @@ import {
   ProjectFaviconPickerDialog,
 } from "./ProjectFaviconPickerDialog";
 import { ProjectActionsSettings } from "./ProjectActionsSettings";
+import { ProjectDefaultsSettings } from "./ProjectDefaultsSettings";
 import { projectGroupTitleNeedsUpdate } from "./ProjectSettingsPanel.logic";
 import { useSettingsProjectGroups } from "./useSettingsProjectGroups";
 
@@ -52,7 +54,8 @@ function memberKey(member: { environmentId: string; id: string }): string {
   return `${member.environmentId}:${member.id}`;
 }
 
-export type ProjectSettingsCategory = "general" | "integrations" | "source-control";
+/** `project` is the Projects page shortcut: the new-thread defaults people change most. */
+export type ProjectSettingsCategory = "general" | "integrations" | "source-control" | "project";
 
 export function ProjectSettingsPanel({
   projectKey,
@@ -406,6 +409,12 @@ function ProjectDetail({
   return (
     <>
       <SettingsPageContainer className="gap-6">
+        <Alert variant="info">
+          <InfoIcon aria-hidden />
+          <AlertDescription>
+            Can't find a setting? Keep this project picked above and hop to any other settings page.
+          </AlertDescription>
+        </Alert>
         <SettingsSection id="project-overview" title="Project" hideTitle>
           <SettingsRow
             title="Name"
@@ -480,6 +489,7 @@ function ProjectDetail({
             }
           />
         </SettingsSection>
+        <ProjectDefaultsSettings category="project" />
         <ProjectActionsSettings />
         {hasMultipleCheckouts ? checkoutChoices : null}
         <SettingsSection title="Danger">
diff --git a/apps/web/src/components/settings/ProjectsSettings.tsx b/apps/web/src/components/settings/ProjectsSettings.tsx
index 995b11191179..397662c5f700 100644
--- a/apps/web/src/components/settings/ProjectsSettings.tsx
+++ b/apps/web/src/components/settings/ProjectsSettings.tsx
@@ -3,6 +3,7 @@ import { EnvironmentId } from "@t3tools/contracts";
 import { ProjectSettingsPanel } from "./ProjectSettingsPanel";
 import { useSettingsScope } from "./SettingsScopeContext";
 import { SettingsScopeNotice } from "./SettingsScopeNotice";
+import { SettingsPageContainer } from "./settingsLayout";
 
 /** Project identity and checkout management for the selected project. */
 export function ProjectsSettings() {
@@ -22,7 +23,9 @@ export function ProjectsSettings() {
           checkoutKey={value.checkout ?? null}
         />
       ) : scope.kind === "unavailable" ? (
-        <p className="p-8 text-sm text-muted-foreground">{scope.message}</p>
+        <SettingsPageContainer>
+          <p className="text-sm text-muted-foreground">{scope.message}</p>
+        </SettingsPageContainer>
       ) : (
         <SettingsScopeNotice target="project">
           Choose a project to manage its name, icon, checkouts and actions.
diff --git a/apps/web/src/components/settings/ProviderAccentColorPicker.tsx b/apps/web/src/components/settings/ProviderAccentColorPicker.tsx
index 500f3c0a7cb3..76f6b7bae52c 100644
--- a/apps/web/src/components/settings/ProviderAccentColorPicker.tsx
+++ b/apps/web/src/components/settings/ProviderAccentColorPicker.tsx
@@ -46,7 +46,7 @@ function ProviderCustomColorPanel(props: {
         />
         <Input
           nativeInput
-          size="sm"
+          size="compact"
           value={hexDraft ?? currentColor}
           onChange={(event) => {
             const nextColor = event.currentTarget.value;
@@ -56,7 +56,7 @@ function ProviderCustomColorPanel(props: {
             props.onCommit(nextColor);
           }}
           onBlur={() => setHexDraft(null)}
-          className="font-mono text-xs"
+          font="mono"
           aria-label="Custom hex accent color"
           spellCheck={false}
         />
@@ -90,28 +90,25 @@ function ProviderCustomColorPicker(props: {
           </button>
         }
       />
-      <PopoverPopup
-        side="bottom"
-        align="start"
-        sideOffset={6}
-        className="overflow-hidden rounded-md p-0 [--viewport-inline-padding:0px] [&_[data-slot=popover-viewport]]:p-0"
-      >
+      <PopoverPopup side="bottom" align="start" sideOffset={6} padding="none">
         <ProviderCustomColorPanel value={normalized} onCommit={props.onCommit} />
-        <PopoverClose
-          render={
-            <Button
-              type="button"
-              size="sm"
-              variant="ghost"
-              className="h-8 w-full justify-start rounded-none border-t border-border/60 px-3 text-xs text-muted-foreground [--control-icon-color:currentColor]"
-              onClick={props.onClear}
-              disabled={!props.value}
-            >
-              <XIcon className="size-3.5" aria-hidden />
-              Clear color
-            </Button>
-          }
-        />
+        <div className="border-t border-border/60 p-1">
+          <PopoverClose
+            render={
+              <Button
+                type="button"
+                size="compact"
+                variant="ghost-muted"
+                className="w-full justify-start"
+                onClick={props.onClear}
+                disabled={!props.value}
+              >
+                <XIcon aria-hidden />
+                Clear color
+              </Button>
+            }
+          />
+        </div>
       </PopoverPopup>
     </Popover>
   );
diff --git a/apps/web/src/components/settings/ProviderAuthCallbackCoordinator.tsx b/apps/web/src/components/settings/ProviderAuthCallbackCoordinator.tsx
new file mode 100644
index 000000000000..a4cf60b60cda
--- /dev/null
+++ b/apps/web/src/components/settings/ProviderAuthCallbackCoordinator.tsx
@@ -0,0 +1,50 @@
+import { useEffect, useRef, useState } from "react";
+import { pendingProviderAuthDelivery, clearProviderAuthDelivery } from "../../providerAuthDelivery";
+import { serverEnvironment } from "../../state/server";
+import { useEnvironments } from "../../state/environments";
+import { useAtomCommand } from "../../state/use-atom-command";
+import { toastManager } from "../ui/toast";
+
+/** Hosted web receives only the one-time code; the selected environment verifies and stores tokens. */
+export function ProviderAuthCallbackCoordinator() {
+  const completeAuth = useAtomCommand(serverEnvironment.completeProviderAuth, {
+    reportFailure: false,
+  });
+  const { environments } = useEnvironments();
+  const [delivery, setDelivery] = useState(pendingProviderAuthDelivery);
+  const started = useRef(false);
+  const environmentId = delivery?.environmentId;
+  const connected = environments.some(
+    (environment) =>
+      environment.environmentId === environmentId && environment.connection.phase === "connected",
+  );
+  useEffect(() => {
+    const input = delivery;
+    if (!input || started.current || !connected) return;
+    started.current = true;
+    void completeAuth({
+      environmentId: input.environmentId,
+      input: { instanceId: input.instanceId, flowId: input.flowId, callbackUrl: input.callbackUrl },
+    })
+      .then((result) => {
+        if (result._tag === "Failure")
+          toastManager.add({
+            type: "error",
+            title: "ChatGPT sign-in couldn't finish",
+            description: "Return to the provider and try again.",
+          });
+      })
+      .catch(() =>
+        toastManager.add({
+          type: "error",
+          title: "ChatGPT sign-in couldn't finish",
+          description: "Reconnect to the environment and try again.",
+        }),
+      )
+      .finally(() => {
+        setDelivery(undefined);
+        clearProviderAuthDelivery();
+      });
+  }, [completeAuth, connected, delivery]);
+  return null;
+}
diff --git a/apps/web/src/components/settings/ProviderInstanceCard.test.ts b/apps/web/src/components/settings/ProviderInstanceCard.test.ts
index a5085774f0c6..6bcc7fe5d8ce 100644
--- a/apps/web/src/components/settings/ProviderInstanceCard.test.ts
+++ b/apps/web/src/components/settings/ProviderInstanceCard.test.ts
@@ -118,7 +118,7 @@ describe("deriveProviderModelsForDisplay", () => {
 
     expect(markup).toContain("Authenticated as");
     expect(markup).toContain('aria-label="Toggle account email visibility"');
-    expect(markup).toContain("blur-[2px]");
+    expect(markup).toContain("blur-xs");
     expect(markup).not.toContain("developer@example.com");
   });
   it("surfaces a failed probe message in both the list row and the editor", () => {
diff --git a/apps/web/src/components/settings/ProviderInstanceCard.tsx b/apps/web/src/components/settings/ProviderInstanceCard.tsx
index 0a8c8fcbe404..fea12160a3cf 100644
--- a/apps/web/src/components/settings/ProviderInstanceCard.tsx
+++ b/apps/web/src/components/settings/ProviderInstanceCard.tsx
@@ -3,6 +3,7 @@
 import { Spinner } from "~/components/ui/spinner";
 
 import {
+  AlertTriangleIcon,
   ArrowUpCircleIcon,
   CopyIcon,
   DownloadIcon,
@@ -14,7 +15,7 @@ import {
 } from "lucide-react";
 import * as Arr from "effect/Array";
 import * as Result from "effect/Result";
-import { useEffect, useRef, useState, type ReactNode } from "react";
+import { useEffect, useRef, useState, type ReactElement, type ReactNode } from "react";
 import {
   isProviderDriverKind,
   resolveProviderInstanceEnabled,
@@ -48,6 +49,8 @@ import { ProviderInstanceIcon, providerInstanceInitials } from "../chat/Provider
 import { ProviderAccentColorPicker } from "./ProviderAccentColorPicker";
 import { RedactedSensitiveText } from "./RedactedSensitiveText";
 import { SettingsRow, SettingsSection } from "./settingsLayout";
+import { FoldedSettingsSection } from "./FoldedSettingsSection";
+import { readCodexSetupMode } from "./CodexSetupSection.logic";
 import {
   getProviderVersionAdvisoryPresentation,
   PROVIDER_STATUS_STYLES,
@@ -58,6 +61,22 @@ import {
 
 const ENVIRONMENT_VARIABLE_NAME_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 
+function ProviderStatusDiagnostic({
+  detail,
+  children,
+}: {
+  detail: string | null;
+  children: ReactElement;
+}) {
+  if (!detail) return children;
+  return (
+    <Tooltip>
+      <TooltipTrigger render={children} />
+      <TooltipPopup side="top">{detail}</TooltipPopup>
+    </Tooltip>
+  );
+}
+
 let environmentVariableDraftId = 0;
 const nextEnvironmentVariableDraftId = () => `provider-env-${environmentVariableDraftId++}`;
 
@@ -268,7 +287,8 @@ function ProviderEnvironmentSection(props: {
             <div key={variable.id} className="flex min-w-0 flex-wrap items-center gap-1.5">
               <DraftInput
                 size="sm"
-                className="w-full min-w-0 font-mono sm:w-44 sm:shrink-0"
+                font="mono"
+                className="w-full min-w-0 sm:w-44 sm:shrink-0"
                 value={variable.name}
                 onCommit={(name) => updateVariable(variable.id, { name: name.trim() })}
                 placeholder="VARIABLE_NAME"
@@ -280,7 +300,8 @@ function ProviderEnvironmentSection(props: {
               </span>
               <DraftInput
                 size="sm"
-                className="min-w-0 flex-1 font-mono"
+                font="mono"
+                className="min-w-0 flex-1"
                 value={variable.valueRedacted ? "" : variable.value}
                 onCommit={(value) => updateVariable(variable.id, { value })}
                 type={variable.sensitive ? "password" : undefined}
@@ -298,10 +319,6 @@ function ProviderEnvironmentSection(props: {
                       type="button"
                       size="icon-micro"
                       variant="ghost-muted"
-                      className={cn(
-                        "[--control-icon-color:currentColor]",
-                        variable.sensitive && "text-foreground",
-                      )}
                       onClick={() => {
                         const sensitive = !variable.sensitive;
                         updateVariable(variable.id, {
@@ -329,8 +346,7 @@ function ProviderEnvironmentSection(props: {
               <Button
                 type="button"
                 size="icon-micro"
-                variant="ghost-muted"
-                className="[--control-icon-color:currentColor] hover:text-destructive"
+                variant="ghost-destructive"
                 onClick={() => removeVariable(variable.id)}
                 aria-label={`Remove environment variable ${variable.name || index + 1}`}
               >
@@ -373,6 +389,7 @@ interface ProviderInstanceCardProps {
    */
   readonly headerAction?: ReactNode | undefined;
   readonly setup?: ReactNode;
+  readonly runtime?: ReactNode;
   readonly hiddenModels: ReadonlyArray<string>;
   readonly favoriteModels: ReadonlyArray<string>;
   readonly modelOrder: ReadonlyArray<string>;
@@ -380,6 +397,7 @@ interface ProviderInstanceCardProps {
   readonly onFavoriteModelsChange: (next: ReadonlyArray<string>) => void;
   readonly onModelOrderChange: (next: ReadonlyArray<string>) => void;
   readonly onRunUpdate?: (() => void) | undefined;
+  readonly onInstallRecommended?: (() => void) | undefined;
   readonly isUpdating?: boolean | undefined;
 }
 
@@ -415,6 +433,7 @@ export function ProviderInstanceCard({
   onDelete,
   headerAction,
   setup,
+  runtime,
   hiddenModels,
   favoriteModels,
   modelOrder,
@@ -422,9 +441,11 @@ export function ProviderInstanceCard({
   onFavoriteModelsChange,
   onModelOrderChange,
   onRunUpdate,
+  onInstallRecommended,
   isUpdating = false,
 }: ProviderInstanceCardProps) {
   const enabled = resolveProviderInstanceEnabled(instance);
+  const compatibility = enabled ? liveProvider?.compatibilityAdvisory : undefined;
   // A locally disabled provider reads "Disabled" with a muted dot even if its
   // last server status is stale. Enabled providers use the server status.
   const statusKey: ProviderStatusKey = enabled
@@ -441,8 +462,18 @@ export function ProviderInstanceCard({
       ? (liveProvider.auth.label ?? liveProvider.auth.type ?? null)
       : null;
   const versionLabel = getProviderVersionLabel(liveProvider?.version);
-  const versionAdvisory = getProviderVersionAdvisoryPresentation(liveProvider?.versionAdvisory);
+  const versionAdvisory = getProviderVersionAdvisoryPresentation(
+    liveProvider?.versionAdvisory,
+    liveProvider?.compatibilityAdvisory,
+    enabled,
+  );
   const updateCommand = versionAdvisory?.updateCommand ?? null;
+  const hasCompatibilityWarning =
+    compatibility !== undefined &&
+    compatibility.status !== "supported" &&
+    compatibility.status !== "unknown";
+  const VersionAdvisoryIcon = hasCompatibilityWarning ? AlertTriangleIcon : ArrowUpCircleIcon;
+  const onRunVersionAction = versionAdvisory?.targetVersion ? onInstallRecommended : onRunUpdate;
   const FallbackIconComponent = driverOption?.icon;
   const displayName =
     instance.displayName?.trim() || driverOption?.label || String(instance.driver);
@@ -543,7 +574,7 @@ export function ProviderInstanceCard({
       showBadge={Boolean(accentColor)}
       className="size-5"
       iconClassName="size-4 text-foreground/80"
-      badgeClassName="right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-[7px]"
+      badgeClassName="right-[-0.125rem] bottom-[-0.125rem] h-3 min-w-3 px-0.5 text-5xs"
     />
   ) : FallbackIconComponent ? (
     <span className="inline-flex size-5 shrink-0 items-center justify-center">
@@ -551,7 +582,7 @@ export function ProviderInstanceCard({
     </span>
   ) : (
     <span
-      className="inline-flex size-5 shrink-0 items-center justify-center text-[10px] font-semibold leading-none text-foreground/80"
+      className="inline-flex size-5 shrink-0 items-center justify-center text-3xs font-semibold leading-none text-foreground/80"
       aria-hidden
     >
       {providerInstanceInitials(displayName)}
@@ -571,10 +602,16 @@ export function ProviderInstanceCard({
     statusKey === "warning" || statusKey === "error" ? (
       <span className={cn("size-1.5 shrink-0 rounded-full", statusStyle.dot)} aria-hidden />
     ) : null;
-  // Trouble states carry the server's explanation (a failed probe, a shadow
-  // home entry that is not a symlink, a missing binary). Show it wherever the
-  // headline shows so the user can act without opening the editor.
   const needsAttention = statusKey === "warning" || statusKey === "error";
+  const statusDiagnostic = hasCompatibilityWarning && needsAttention ? summary.detail : null;
+  // Keep compatibility copy compact; the version popover carries the explanation.
+  const inlineStatusDetail = hasCompatibilityWarning
+    ? compatibility?.status === "broken"
+      ? "Incompatible"
+      : compatibility?.status === "unsupported"
+        ? "Unsupported"
+        : "Limited support"
+    : summary.detail;
   const editorStatusNode =
     isAuthenticated && authEmail ? (
       <>
@@ -582,16 +619,16 @@ export function ProviderInstanceCard({
         <span>Authenticated as</span>
         <ProviderAuthEmail email={authEmail} />
         {authLabel ? <span>· {authLabel}</span> : null}
-        {summary.detail ? (
-          <span className="min-w-0 [overflow-wrap:anywhere]">· {summary.detail}</span>
+        {inlineStatusDetail ? (
+          <span className="min-w-0 [overflow-wrap:anywhere]">· {inlineStatusDetail}</span>
         ) : null}
       </>
     ) : (
       <>
         {statusDotNode}
         <span>{summary.headline}</span>
-        {summary.detail ? (
-          <span className="min-w-0 [overflow-wrap:anywhere]">· {summary.detail}</span>
+        {inlineStatusDetail ? (
+          <span className="min-w-0 [overflow-wrap:anywhere]">· {inlineStatusDetail}</span>
         ) : null}
       </>
     );
@@ -621,18 +658,29 @@ export function ProviderInstanceCard({
           <span className="min-w-0 flex-1">
             <span className="flex min-w-0 items-center gap-2">
               <span className="truncate text-sm font-medium text-foreground">{displayName}</span>
-              {String(instanceId) !== String(instance.driver) ? (
-                <code className="min-w-0 truncate rounded bg-muted/60 px-1 py-0.5 text-[10px] text-muted-foreground">
-                  {instanceId}
-                </code>
-              ) : null}
               {versionLabel ? (
                 <code className="max-w-24 shrink-0 truncate text-xs text-muted-foreground">
                   {versionLabel}
                 </code>
               ) : null}
               {versionAdvisory ? (
-                updateCommand ? (
+                hasCompatibilityWarning ? (
+                  <Tooltip>
+                    <TooltipTrigger
+                      render={
+                        <span
+                          tabIndex={0}
+                          role="img"
+                          aria-label={versionAdvisory.title}
+                          className="pointer-events-auto relative inline-flex shrink-0 text-warning"
+                        >
+                          <VersionAdvisoryIcon className="size-3.5" />
+                        </span>
+                      }
+                    />
+                    <TooltipPopup side="top">{versionAdvisory.detail}</TooltipPopup>
+                  </Tooltip>
+                ) : updateCommand ? (
                   <Tooltip>
                     <TooltipTrigger
                       render={
@@ -659,14 +707,19 @@ export function ProviderInstanceCard({
                 )
               ) : null}
             </span>
-            <span className="mt-0.5 flex items-start gap-1.5 text-[13px] leading-[1.45] text-muted-foreground/80">
+            <span className="mt-0.5 flex items-start gap-1.5 text-xs leading-normal text-muted-foreground/80">
               {statusDotNode ? (
                 <span className="flex h-[1.45em] shrink-0 items-center">{statusDotNode}</span>
               ) : null}
-              <span className="line-clamp-2 [overflow-wrap:anywhere]">
-                {summary.headline}
-                {needsAttention && summary.detail ? ` · ${summary.detail}` : null}
-              </span>
+              <ProviderStatusDiagnostic detail={statusDiagnostic}>
+                <span
+                  tabIndex={statusDiagnostic ? 0 : undefined}
+                  className="pointer-events-auto line-clamp-2 [overflow-wrap:anywhere]"
+                >
+                  {summary.headline}
+                  {needsAttention && inlineStatusDetail ? ` · ${inlineStatusDetail}` : null}
+                </span>
+              </ProviderStatusDiagnostic>
             </span>
           </span>
         </div>
@@ -697,33 +750,32 @@ export function ProviderInstanceCard({
       >
         {versionAdvisory ? (
           <Popover>
-            <PopoverTrigger
-              render={
-                <Button
-                  type="button"
-                  size="icon-xs"
-                  variant="ghost"
-                  className={cn(
-                    "[--control-icon-color:currentColor]",
-                    versionAdvisory.emphasis === "strong"
-                      ? "text-warning hover:text-warning"
-                      : "text-muted-foreground hover:text-foreground",
-                  )}
-                  aria-label="Update available — view details"
-                >
-                  <ArrowUpCircleIcon />
-                </Button>
-              }
-            />
-            <PopoverPopup
-              side="bottom"
-              align="end"
-              className="w-[min(21rem,calc(100vw-1.5rem))] [--popup-width:min(21rem,calc(100vw-1.5rem))]"
-            >
+            <Tooltip>
+              <TooltipTrigger
+                render={
+                  <PopoverTrigger
+                    render={
+                      <Button
+                        type="button"
+                        size="icon-xs"
+                        variant="ghost-muted"
+                        aria-label={`${versionAdvisory.title} — view details`}
+                      >
+                        <VersionAdvisoryIcon
+                          className={cn(hasCompatibilityWarning && "text-warning")}
+                        />
+                      </Button>
+                    }
+                  />
+                }
+              />
+              <TooltipPopup side="top">{versionAdvisory.title}</TooltipPopup>
+            </Tooltip>
+            <PopoverPopup side="bottom" align="end" width="md">
               <div className="grid min-w-0 gap-3">
                 <div className="grid gap-0.5">
-                  <p className="text-[13px] font-semibold leading-tight text-foreground">
-                    Update available
+                  <p className="text-sm font-semibold leading-tight text-foreground">
+                    {versionAdvisory.title}
                   </p>
                   <p
                     className={cn(
@@ -736,21 +788,25 @@ export function ProviderInstanceCard({
                     {versionAdvisory.detail}
                   </p>
                 </div>
-                {onRunUpdate ? (
+                {onRunVersionAction ? (
                   <Button
                     type="button"
                     size="xs"
                     variant="outline"
                     className="w-full"
                     disabled={isUpdating}
-                    onClick={onRunUpdate}
+                    onClick={onRunVersionAction}
                   >
                     {isUpdating ? <Spinner /> : <DownloadIcon />}
-                    {isUpdating ? "Updating" : "Update now"}
+                    {isUpdating
+                      ? "Updating"
+                      : versionAdvisory.targetVersion
+                        ? `Install ${getProviderVersionLabel(versionAdvisory.targetVersion)}`
+                        : "Update now"}
                   </Button>
                 ) : null}
-                {onRunUpdate && updateCommand ? (
-                  <div className="flex items-center gap-2 text-[10px] font-medium uppercase tracking-wider text-muted-foreground">
+                {onRunVersionAction && updateCommand ? (
+                  <div className="flex items-center gap-2 text-3xs font-medium uppercase tracking-wider text-muted-foreground">
                     <span aria-hidden className="h-px flex-1 bg-border" />
                     or, update manually using
                     <span aria-hidden className="h-px flex-1 bg-border" />
@@ -758,7 +814,7 @@ export function ProviderInstanceCard({
                 ) : null}
                 {updateCommand ? (
                   <div className="flex min-w-0 items-center gap-1 rounded-md border border-border/70 bg-muted/40 py-0.5 pr-0.5 pl-2">
-                    <code className="min-w-0 flex-1 truncate font-mono text-[11px] text-foreground">
+                    <code className="min-w-0 flex-1 truncate font-mono text-2xs text-foreground">
                       {updateCommand}
                     </code>
                     <Tooltip>
@@ -767,8 +823,8 @@ export function ProviderInstanceCard({
                           <Button
                             type="button"
                             size="icon-xs"
-                            variant="ghost"
-                            className="shrink-0 text-muted-foreground hover:text-foreground"
+                            variant="ghost-muted"
+                            className="shrink-0"
                             onClick={() =>
                               copyToClipboard(updateCommand, { providerName: displayName })
                             }
@@ -791,9 +847,8 @@ export function ProviderInstanceCard({
           <Button
             type="button"
             size="icon-xs"
-            variant="ghost-muted"
+            variant="ghost-destructive"
             disabled={readOnly}
-            className="[--control-icon-color:currentColor] hover:text-destructive"
             onClick={onDelete}
             aria-label={`Delete instance ${instanceId}`}
           >
@@ -804,13 +859,40 @@ export function ProviderInstanceCard({
     </div>
   );
 
+  const runtimeFields = driverOption ? (
+    <ProviderSettingsForm
+      definition={driverOption}
+      value={instance.config}
+      idPrefix={`provider-instance-${instanceId}`}
+      variant="settings"
+      onChange={updateConfig}
+    />
+  ) : (
+    <SettingsRow
+      title="Driver"
+      description={
+        <span>
+          This instance uses <code className="text-foreground">{String(instance.driver)}</code>,
+          which is not available in this build. Its configuration is preserved.
+        </span>
+      }
+    />
+  );
+
   return (
     <>
       <SettingsSection title={displayName} icon={titleIconNode} headerAction={editorHeaderAction}>
         <SettingsRow
           title="Display name"
           status={
-            <div className="flex min-w-0 flex-wrap items-center gap-x-1.5">{editorStatusNode}</div>
+            <ProviderStatusDiagnostic detail={statusDiagnostic}>
+              <div
+                tabIndex={statusDiagnostic ? 0 : undefined}
+                className="flex min-w-0 flex-wrap items-baseline gap-x-1.5"
+              >
+                {editorStatusNode}
+              </div>
+            </ProviderStatusDiagnostic>
           }
           control={
             <div
@@ -844,33 +926,31 @@ export function ProviderInstanceCard({
 
       {setup ? <SettingsSection title="Setup">{setup}</SettingsSection> : null}
 
-      <SettingsSection
-        title="Runtime"
-        inert={readOnly}
-        aria-disabled={readOnly || undefined}
-        className={readOnly ? "opacity-50 select-none" : undefined}
-      >
-        {driverOption ? (
-          <ProviderSettingsForm
-            definition={driverOption}
-            value={instance.config}
-            idPrefix={`provider-instance-${instanceId}`}
-            variant="settings"
-            onChange={updateConfig}
-          />
-        ) : (
-          <SettingsRow
-            title="Driver"
-            description={
-              <span>
-                This instance uses{" "}
-                <code className="text-foreground">{String(instance.driver)}</code>, which is not
-                available in this build. Its configuration is preserved.
-              </span>
-            }
-          />
-        )}
-      </SettingsSection>
+      {instance.driver === "codex" && readCodexSetupMode(instance.config) === "managed" ? (
+        <div
+          inert={readOnly}
+          aria-disabled={readOnly || undefined}
+          className={readOnly ? "opacity-50 select-none" : undefined}
+        >
+          <FoldedSettingsSection
+            key={instanceId}
+            id={`provider-instance-${instanceId}-runtime`}
+            title="Runtime"
+            headerPlacement="outside"
+          >
+            {runtime ?? runtimeFields}
+          </FoldedSettingsSection>
+        </div>
+      ) : (
+        <SettingsSection
+          title="Runtime"
+          inert={readOnly}
+          aria-disabled={readOnly || undefined}
+          className={readOnly ? "opacity-50 select-none" : undefined}
+        >
+          {runtimeFields}
+        </SettingsSection>
+      )}
 
       <SettingsSection
         title="Environment"
diff --git a/apps/web/src/components/settings/ProviderModelsSection.tsx b/apps/web/src/components/settings/ProviderModelsSection.tsx
index 0cc88eb06384..f4b1bfd7439b 100644
--- a/apps/web/src/components/settings/ProviderModelsSection.tsx
+++ b/apps/web/src/components/settings/ProviderModelsSection.tsx
@@ -312,13 +312,7 @@ export function ProviderModelsSection({
         render={
           <Button
             size="icon-micro"
-            variant="ghost"
-            className={cn(
-              "[--control-icon-color:currentColor]",
-              isFavorite
-                ? "text-yellow-500 hover:text-yellow-600"
-                : "text-muted-foreground/40 hover:text-muted-foreground",
-            )}
+            variant="ghost-muted"
             onClick={() => handleToggleFavorite(model.slug)}
             aria-label={`${isFavorite ? "Remove" : "Add"} ${model.name} ${
               isFavorite ? "from" : "to"
@@ -326,7 +320,7 @@ export function ProviderModelsSection({
           />
         }
       >
-        <StarIcon className={cn("size-3", isFavorite && "fill-current")} />
+        <StarIcon className={cn("size-3", isFavorite && "fill-current text-warning")} />
       </TooltipTrigger>
       <TooltipPopup side="top">
         {isFavorite ? "Remove from favorites" : "Add to favorites"}
@@ -476,19 +470,19 @@ export function ProviderModelsSection({
         <span className="flex min-w-0 items-baseline gap-2">
           <span className={cn(nameClassName, "truncate")}>{model.name}</span>
           {model.name !== model.slug ? (
-            <code className="truncate font-mono text-[11px] text-muted-foreground/70">
+            <code className="truncate font-mono text-2xs text-muted-foreground/70">
               {model.slug}
             </code>
           ) : null}
           {model.isCustom ? (
-            <span className="text-[11px] text-muted-foreground/70">custom</span>
+            <span className="text-2xs text-muted-foreground/70">custom</span>
           ) : null}
         </span>
         {/*
           Always a grid item so the columns line up across rows; the text
           itself drops out on phone widths where it would starve the name.
         */}
-        <span className="text-[11px] text-muted-foreground/70">
+        <span className="text-2xs text-muted-foreground/70">
           {capLabels.length > 0 ? (
             <span className="hidden sm:inline">{capLabels.join(" · ")}</span>
           ) : null}
@@ -500,7 +494,7 @@ export function ProviderModelsSection({
   };
 
   const groupLabel = (label: string, isFirst: boolean) => (
-    <div className={cn("px-2 pb-1.5 text-[11px] text-muted-foreground", isFirst ? "pt-1" : "pt-5")}>
+    <div className={cn("px-2 pb-1.5 text-2xs text-muted-foreground", isFirst ? "pt-1" : "pt-5")}>
       {label}
     </div>
   );
diff --git a/apps/web/src/components/settings/ProviderSettingsForm.tsx b/apps/web/src/components/settings/ProviderSettingsForm.tsx
index d0c366831bb0..94372b97c868 100644
--- a/apps/web/src/components/settings/ProviderSettingsForm.tsx
+++ b/apps/web/src/components/settings/ProviderSettingsForm.tsx
@@ -240,7 +240,7 @@ function ProviderSettingsFieldRow({
   const inputId = `${idPrefix}-${field.key}`;
   const descriptionClassName =
     variant === "dialog"
-      ? "text-[11px] text-muted-foreground"
+      ? "text-2xs text-muted-foreground"
       : "mt-1 block text-xs text-muted-foreground";
   const label = <span className="text-xs font-medium text-foreground">{field.label}</span>;
   const description = field.description ? (
@@ -388,7 +388,6 @@ function ProviderSettingsFieldRow({
         ) : (
           <Input
             id={inputId}
-            className="bg-background"
             type={type}
             autoComplete={field.control === "password" ? "off" : undefined}
             value={readProviderConfigString(value, field.key)}
diff --git a/apps/web/src/components/settings/ProviderSettingsPanel.environment.test.tsx b/apps/web/src/components/settings/ProviderSettingsPanel.environment.test.tsx
index 90d84d1c1efa..2d5d5d751719 100644
--- a/apps/web/src/components/settings/ProviderSettingsPanel.environment.test.tsx
+++ b/apps/web/src/components/settings/ProviderSettingsPanel.environment.test.tsx
@@ -58,6 +58,7 @@ vi.mock("./settingsLayout", async (importOriginal) => {
   };
 });
 
+vi.mock("./SettingsScopeSentence", () => ({ SettingsScopeSentence: () => null }));
 vi.mock("react/compiler-runtime", async () => {
   const { reactHookHarness } = await import("../../test/reactHookHarness");
   return { c: reactHookHarness.useMemoCache };
diff --git a/apps/web/src/components/settings/ProviderSettingsPanel.logic.ts b/apps/web/src/components/settings/ProviderSettingsPanel.logic.ts
index b415b5f69b07..e6748ae0fc7f 100644
--- a/apps/web/src/components/settings/ProviderSettingsPanel.logic.ts
+++ b/apps/web/src/components/settings/ProviderSettingsPanel.logic.ts
@@ -20,18 +20,22 @@ export function isProviderSettingsEnvironmentAvailable(input: {
 export function buildProviderEnvironmentOptions<T extends ProviderEnvironmentOptionLike>(
   environments: ReadonlyArray<T>,
   primaryEnvironmentId: EnvironmentId | null,
+  environmentIds?: readonly EnvironmentId[],
 ): ReadonlyArray<T> {
-  return environments.toSorted((left, right) => {
-    const leftIsPrimary = left.environmentId === primaryEnvironmentId;
-    const rightIsPrimary = right.environmentId === primaryEnvironmentId;
-    if (leftIsPrimary !== rightIsPrimary) {
-      return leftIsPrimary ? -1 : 1;
-    }
-    return (
-      left.label.localeCompare(right.label) ||
-      String(left.environmentId).localeCompare(String(right.environmentId))
-    );
-  });
+  const allowed = environmentIds ? new Set(environmentIds) : null;
+  return environments
+    .filter((environment) => !allowed || allowed.has(environment.environmentId))
+    .toSorted((left, right) => {
+      const leftIsPrimary = left.environmentId === primaryEnvironmentId;
+      const rightIsPrimary = right.environmentId === primaryEnvironmentId;
+      if (leftIsPrimary !== rightIsPrimary) {
+        return leftIsPrimary ? -1 : 1;
+      }
+      return (
+        left.label.localeCompare(right.label) ||
+        String(left.environmentId).localeCompare(String(right.environmentId))
+      );
+    });
 }
 
 export function resolveSelectedProviderEnvironmentId(
diff --git a/apps/web/src/components/settings/ProviderSettingsPanel.tsx b/apps/web/src/components/settings/ProviderSettingsPanel.tsx
index 7f09e89c53df..aa947d5d1de7 100644
--- a/apps/web/src/components/settings/ProviderSettingsPanel.tsx
+++ b/apps/web/src/components/settings/ProviderSettingsPanel.tsx
@@ -84,6 +84,8 @@ import { ExpandableText } from "./ExpandableText";
 import { ProviderInstanceCard } from "./ProviderInstanceCard";
 import { UsageProviderSettings } from "./UsageProviderSettings";
 import { ProviderSetupSection, readAntigravityAuthMethod } from "./ProviderSetupSection";
+import { CodexSetupSection, CodexManagedRuntimeFields } from "./CodexSetupSection";
+import { readCodexSetupMode } from "./CodexSetupSection.logic";
 import { DRIVER_OPTIONS, getDriverOption } from "./providerDriverMeta";
 import { searchableSetting } from "./settingsSearch";
 import {
@@ -203,7 +205,7 @@ function ProviderSettingsPlaceholder({
         divided={false}
         className={cn(providerCardHeightClassName, "flex overflow-x-hidden overflow-y-auto")}
       >
-        <Empty className="min-h-88">
+        <Empty>
           <EmptyMedia variant="icon">{icon}</EmptyMedia>
           <EmptyHeader>
             <EmptyTitle>{title}</EmptyTitle>
@@ -265,6 +267,7 @@ interface ProviderSettingsTarget {
   readonly environmentId?: EnvironmentId;
   readonly instanceId?: ProviderInstanceId;
   readonly scoped?: boolean;
+  readonly environmentIds?: readonly EnvironmentId[];
 }
 
 export function ProviderSettingsPanel(target: ProviderSettingsTarget) {
@@ -283,8 +286,9 @@ function ProviderSettingsPanelContent(target: ProviderSettingsTarget) {
   const primaryEnvironmentId = usePrimaryEnvironmentId();
   const searchTargetId = useSettingsSearchTargetId();
   const options = useMemo(
-    () => buildProviderEnvironmentOptions(environments, primaryEnvironmentId),
-    [environments, primaryEnvironmentId],
+    () =>
+      buildProviderEnvironmentOptions(environments, primaryEnvironmentId, target.environmentIds),
+    [environments, primaryEnvironmentId, target.environmentIds],
   );
   // Raw user intent; the effective selection is re-derived every render so a
   // device that drops out of the catalog falls back without erasing the pick —
@@ -314,7 +318,25 @@ function ProviderSettingsPanelContent(target: ProviderSettingsTarget) {
       hasServerConfig: environment.serverConfig !== null,
     }),
   )?.environmentId;
+  const searchableCursorEnvironmentId = options.find(
+    (environment) =>
+      environment.serverConfig?.environment.platform.os === "darwin" &&
+      isProviderSettingsEnvironmentAvailable({
+        connectionPhase: environment.connection.phase,
+        hasServerConfig: true,
+      }),
+  )?.environmentId;
   useEffect(() => {
+    if (
+      !target.scoped &&
+      searchTargetId === searchableSetting("cursor-keychain-usage").id &&
+      (!selectedEnvironmentCanRenderSettings ||
+        selectedEnvironment?.serverConfig?.environment.platform.os !== "darwin") &&
+      searchableCursorEnvironmentId !== undefined
+    ) {
+      setSelectedEnvironmentId(searchableCursorEnvironmentId);
+      return;
+    }
     if (
       !target.scoped &&
       (searchTargetId === searchableSetting("provider-health-check-interval").id ||
@@ -326,7 +348,9 @@ function ProviderSettingsPanelContent(target: ProviderSettingsTarget) {
     }
   }, [
     searchTargetId,
+    searchableCursorEnvironmentId,
     searchableEnvironmentId,
+    selectedEnvironment,
     selectedEnvironmentCanRenderSettings,
     target.scoped,
   ]);
@@ -334,7 +358,7 @@ function ProviderSettingsPanelContent(target: ProviderSettingsTarget) {
     options.length === 1 && options[0]?.entry.target._tag === "PrimaryConnectionTarget";
   const deviceTabs =
     !target.scoped && !onlyPrimaryDevice && options.length > 0 ? (
-      <ScrollArea hideScrollbars scrollFade className="h-11 min-w-0 flex-1 rounded-none">
+      <ScrollArea radius="none" hideScrollbars scrollFade className="h-11 min-w-0 flex-1">
         <ToggleGroup
           aria-label="Devices"
           variant="segmented"
@@ -353,7 +377,7 @@ function ProviderSettingsPanelContent(target: ProviderSettingsTarget) {
               <Tooltip key={environment.environmentId}>
                 <TooltipTrigger
                   render={
-                    <Toggle value={environment.environmentId} className="gap-2 text-left">
+                    <Toggle value={environment.environmentId}>
                       <EnvironmentMachineIcon
                         kind={machine}
                         className="size-3.5 shrink-0"
@@ -649,7 +673,10 @@ export function EnvironmentProviderSettings({
   }, [environmentId, refreshServerProviders]);
 
   const runProviderUpdate = useCallback(
-    async (candidate: ProviderSettingsUpdateCandidate) => {
+    async (
+      candidate: Pick<ProviderSettingsUpdateCandidate, "driver" | "instanceId">,
+      targetVersion?: string,
+    ) => {
       // Ref-based re-entry guard, mirroring refreshProviders: a state updater
       // may run after this function returns, so it cannot gate the dispatch.
       if (updatingInstanceIdsRef.current.has(candidate.instanceId)) {
@@ -663,6 +690,7 @@ export function EnvironmentProviderSettings({
         input: {
           provider: candidate.driver,
           instanceId: candidate.instanceId,
+          ...(targetVersion ? { targetVersion } : {}),
         },
       });
       if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
@@ -887,9 +915,8 @@ export function EnvironmentProviderSettings({
     );
     const updateCandidate = providerUpdateCandidateByInstanceId.get(row.instanceId);
     const isInstanceUpdateRunning =
-      updateCandidate !== undefined &&
-      (updatingProviderInstanceIds.has(updateCandidate.instanceId) ||
-        isProviderUpdateActive(updateCandidate));
+      updatingProviderInstanceIds.has(row.instanceId) ||
+      (liveProvider !== undefined && isProviderUpdateActive(liveProvider));
     const showInlineUpdateButton = updateCandidate !== undefined;
     const canRunInlineUpdate = updateCandidate !== undefined && !isInstanceUpdateRunning;
     const modelPreferences = settings.providerModelPreferences?.[row.instanceId] ?? {
@@ -912,6 +939,17 @@ export function EnvironmentProviderSettings({
         selected={mode === "list" && selectedRow?.instanceId === row.instanceId}
         onSelect={mode === "list" ? () => setSelectedInstanceId(row.instanceId) : undefined}
         readOnly={readOnly}
+        runtime={
+          mode === "editor" &&
+          row.driver === "codex" &&
+          readCodexSetupMode(row.instance.config) === "managed" ? (
+            <CodexManagedRuntimeFields
+              environmentId={environmentId}
+              instanceId={row.instanceId}
+              provider={liveProvider}
+            />
+          ) : undefined
+        }
         setup={
           mode === "editor" && row.driver === "antigravity" ? (
             <ProviderSetupSection
@@ -925,6 +963,30 @@ export function EnvironmentProviderSettings({
               readOnly={readOnly}
               onEnable={() => updateProviderInstance(row, { ...row.instance, enabled: true })}
             />
+          ) : mode === "editor" &&
+            row.driver === "codex" &&
+            readCodexSetupMode(row.instance.config) === "managed" ? (
+            <CodexSetupSection
+              environmentId={environmentId}
+              instanceId={row.instanceId}
+              provider={liveProvider}
+              mode={readCodexSetupMode(row.instance.config)}
+              enabled={resolveProviderInstanceEnabled(row.instance)}
+              readOnly={readOnly}
+              onModeChange={(setupMode) =>
+                updateProviderInstance(row, {
+                  ...row.instance,
+                  enabled: true,
+                  config: {
+                    ...(row.instance.config !== null && typeof row.instance.config === "object"
+                      ? row.instance.config
+                      : {}),
+                    enabled: true,
+                    setupMode,
+                  },
+                })
+              }
+            />
           ) : null
         }
         onUpdate={(next) => {
@@ -971,6 +1033,19 @@ export function EnvironmentProviderSettings({
             modelOrder,
           })
         }
+        onInstallRecommended={
+          mode === "editor" &&
+          liveProvider?.compatibilityAdvisory?.message &&
+          liveProvider.compatibilityAdvisory.recommendedVersion &&
+          liveProvider.versionAdvisory?.canInstallVersion
+            ? () => {
+                void runProviderUpdate(
+                  liveProvider,
+                  liveProvider.compatibilityAdvisory?.recommendedVersion ?? undefined,
+                );
+              }
+            : undefined
+        }
         onRunUpdate={
           mode === "editor" && showInlineUpdateButton && updateCandidate
             ? () => {
@@ -978,19 +1053,18 @@ export function EnvironmentProviderSettings({
               }
             : undefined
         }
-        isUpdating={
-          mode === "editor" && showInlineUpdateButton ? isInstanceUpdateRunning : undefined
-        }
+        isUpdating={mode === "editor" ? isInstanceUpdateRunning : undefined}
       />
     );
   };
 
   return (
     <>
-      <SettingsSection {...searchableSetting("providers")} variant="plain">
-        <div className="flex min-h-11 min-w-0 items-center gap-2 px-3 sm:px-4">
-          {deviceTabs}
-          <div className="ml-auto flex min-w-0 shrink-0 items-center gap-2">
+      <SettingsSection
+        {...searchableSetting("providers")}
+        variant="plain"
+        headerAction={
+          <div className="flex min-w-0 items-center gap-2">
             {readOnly ? (
               <span className="min-w-0 truncate text-xs text-muted-foreground">
                 <ProviderLastChecked lastCheckedAt={lastCheckedAt} />
@@ -1039,7 +1113,11 @@ export function EnvironmentProviderSettings({
               </>
             )}
           </div>
-        </div>
+        }
+      >
+        {deviceTabs ? (
+          <div className="flex min-h-11 min-w-0 items-center gap-2 px-3 sm:px-4">{deviceTabs}</div>
+        ) : null}
         {readOnly ? (
           <SettingsGroup divided={false} className="overflow-hidden">
             <SettingsRow
@@ -1088,6 +1166,7 @@ export function EnvironmentProviderSettings({
         environmentId={environmentId}
         environmentLabel={environmentLabel}
         sources={settings.usageLimitSources}
+        cursorKeychainUsageEnabled={settings.cursorKeychainUsageEnabled}
         readOnly={readOnly}
       />
 
diff --git a/apps/web/src/components/settings/RedactedSensitiveText.tsx b/apps/web/src/components/settings/RedactedSensitiveText.tsx
index 95b31b403698..4ae2276b8e63 100644
--- a/apps/web/src/components/settings/RedactedSensitiveText.tsx
+++ b/apps/web/src/components/settings/RedactedSensitiveText.tsx
@@ -44,8 +44,8 @@ export function RedactedSensitiveText(props: {
           <button
             type="button"
             className={cn(
-              "min-w-0 cursor-pointer rounded-sm font-mono text-[11px] leading-none transition hover:text-foreground",
-              revealed ? "text-muted-foreground" : "select-none text-muted-foreground blur-[2px]",
+              "min-w-0 cursor-pointer rounded-sm font-mono text-2xs leading-normal transition hover:text-foreground",
+              revealed ? "text-muted-foreground" : "select-none text-muted-foreground blur-xs",
               props.className,
             )}
             onClick={() => setRevealed((current) => !current)}
diff --git a/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx b/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
index 51cabd6010bc..7f0a5f497bc9 100644
--- a/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
+++ b/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
@@ -142,10 +142,10 @@ function categoryLabel(category: ResourceTelemetryProcessCategory): string {
 }
 
 function categoryDotClass(category: ResourceTelemetryProcessCategory): string {
-  if (category === "resource-monitor") return "bg-amber-500";
-  if (category.startsWith("electron-")) return "bg-sky-500";
+  if (category === "resource-monitor") return "bg-warning";
+  if (category.startsWith("electron-")) return "bg-info";
   if (category === "server") return "bg-violet-500";
-  return "bg-emerald-500";
+  return "bg-success";
 }
 
 function ioSemanticsLabel(semantics: ResourceTelemetryIoSemantics): string {
@@ -194,12 +194,10 @@ function SourceStatusBadge({
   return (
     <span
       className={cn(
-        "inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-[10px] font-semibold uppercase tracking-[0.08em]",
+        "inline-flex items-center gap-1.5 rounded-full border px-2.5 py-1 text-3xs font-semibold uppercase tracking-widest",
         tone === "neutral" && "border-border/70 bg-muted/45 text-muted-foreground",
-        tone === "default" &&
-          "border-emerald-500/25 bg-emerald-500/10 text-emerald-700 dark:text-emerald-300",
-        tone === "warning" &&
-          "border-amber-500/30 bg-amber-500/10 text-amber-700 dark:text-amber-300",
+        tone === "default" && "border-success/25 bg-success/10 text-success-foreground",
+        tone === "warning" && "border-warning/30 bg-warning/10 text-warning-foreground",
         tone === "danger" && "border-destructive/30 bg-destructive/10 text-destructive",
       )}
     >
@@ -207,8 +205,8 @@ function SourceStatusBadge({
         className={cn(
           "size-1.5 rounded-full",
           tone === "neutral" && "bg-muted-foreground/55",
-          tone === "default" && "bg-emerald-500",
-          tone === "warning" && "bg-amber-500",
+          tone === "default" && "bg-success",
+          tone === "warning" && "bg-warning",
           tone === "danger" && "bg-destructive",
         )}
       />
@@ -220,14 +218,14 @@ function SourceStatusBadge({
 function LastSampleLabel({ sampledAt }: { sampledAt: DateTime.Utc | null }) {
   useRelativeTimeTick();
   if (!sampledAt) {
-    return <span className="text-[11px] text-muted-foreground/55">Waiting for sample</span>;
+    return <span className="text-2xs text-muted-foreground/55">Waiting for sample</span>;
   }
   const relative = formatRelativeTime(DateTime.formatIso(sampledAt));
   if (!relative) {
-    return <span className="text-[11px] text-muted-foreground/55">Waiting for sample</span>;
+    return <span className="text-2xs text-muted-foreground/55">Waiting for sample</span>;
   }
   return (
-    <span className="text-[11px] text-muted-foreground/60">
+    <span className="text-2xs text-muted-foreground/60">
       Updated <span className="font-mono tabular-nums">{relative.value}</span>
       {relative.suffix ? ` ${relative.suffix}` : ""}
     </span>
@@ -249,7 +247,7 @@ function IconStat({
 }) {
   return (
     <div className="group min-w-0 px-4 py-4 sm:px-5">
-      <div className="flex items-center gap-2 text-[10px] font-semibold uppercase tracking-[0.11em] text-muted-foreground/70">
+      <div className="flex items-center gap-2 text-3xs font-semibold uppercase tracking-widest text-muted-foreground/70">
         <span className="text-muted-foreground/55 transition-colors group-hover:text-foreground/65">
           {icon}
         </span>
@@ -257,15 +255,15 @@ function IconStat({
       </div>
       <div
         className={cn(
-          "mt-2.5 truncate font-mono text-2xl font-semibold tracking-[-0.05em] tabular-nums text-foreground",
-          tone === "warning" && "text-amber-600 dark:text-amber-300",
+          "mt-2.5 truncate font-mono text-2xl font-semibold tracking-tighter tabular-nums text-foreground",
+          tone === "warning" && "text-warning-foreground",
           tone === "danger" && "text-destructive",
         )}
       >
         {value}
       </div>
       {detail ? (
-        <div className="mt-1.5 truncate text-[10px] text-muted-foreground/60">{detail}</div>
+        <div className="mt-1.5 truncate text-3xs text-muted-foreground/60">{detail}</div>
       ) : null}
     </div>
   );
@@ -284,10 +282,10 @@ function AggregateCard({
     <div className="relative overflow-hidden border-t border-border/60 px-4 py-4 first:border-t-0 md:border-t-0 md:border-l md:first:border-l-0 sm:px-5">
       <span className={cn("absolute inset-x-5 top-0 h-0.5 rounded-full opacity-75", accentClass)} />
       <div className="flex items-center justify-between gap-3">
-        <div className="text-[10px] font-semibold uppercase tracking-[0.11em] text-muted-foreground/75">
+        <div className="text-3xs font-semibold uppercase tracking-widest text-muted-foreground/75">
           {label}
         </div>
-        <div className="rounded-md bg-muted/55 px-1.5 py-0.5 font-mono text-[9px] tabular-nums text-muted-foreground/70">
+        <div className="rounded-md bg-muted/55 px-1.5 py-0.5 font-mono text-3xs tabular-nums text-muted-foreground/70">
           {aggregate.processCount} {aggregate.processCount === 1 ? "process" : "processes"}
         </div>
       </div>
@@ -304,7 +302,7 @@ function AggregateCard({
 function MetricPair({ label, value }: { label: string; value: string }) {
   return (
     <div className="min-w-0">
-      <div className="text-[9px] font-semibold uppercase tracking-[0.08em] text-muted-foreground/45">
+      <div className="text-3xs font-semibold uppercase tracking-widest text-muted-foreground/45">
         {label}
       </div>
       <div className="truncate font-mono text-xs font-medium tabular-nums text-foreground/90">
@@ -321,8 +319,8 @@ function HealthSource({ label, health }: { label: string; health: ResourceTeleme
   return (
     <div className="flex items-start justify-between gap-4 border-t border-border/50 py-3 first:border-t-0">
       <div className="min-w-0">
-        <div className="text-[13px] font-medium text-foreground">{label}</div>
-        <div className="mt-1 text-[11px] leading-relaxed text-muted-foreground/65">
+        <div className="text-sm font-medium text-foreground">{label}</div>
+        <div className="mt-1 text-2xs leading-relaxed text-muted-foreground/65">
           {expectedInBrowser
             ? "Available when this page runs inside the desktop app."
             : Option.match(health.lastError, {
@@ -358,10 +356,10 @@ function DetailRow({
 }) {
   return (
     <div className="flex items-center justify-between gap-4 border-t border-border/50 py-2.5 first:border-t-0">
-      <span className="text-[11px] text-muted-foreground/75">{label}</span>
+      <span className="text-2xs text-muted-foreground/75">{label}</span>
       <span
         className={cn(
-          "min-w-0 truncate text-right font-mono text-[11px] tabular-nums text-foreground/85",
+          "min-w-0 truncate text-right font-mono text-2xs tabular-nums text-foreground/85",
           valueClassName,
         )}
       >
@@ -407,15 +405,15 @@ function ResourceHistoryChart({
 
   return (
     <div className="border-t border-border/60 px-4 py-4 sm:px-5">
-      <div className="mb-3 flex flex-wrap items-center gap-x-4 gap-y-1 text-[10px] text-muted-foreground/65">
+      <div className="mb-3 flex flex-wrap items-center gap-x-4 gap-y-1 text-3xs text-muted-foreground/65">
         <span className="inline-flex items-center gap-1.5">
           <span className="h-1.5 w-3 rounded-full bg-foreground/70" /> CPU average
         </span>
         <span className="inline-flex items-center gap-1.5">
-          <span className="h-1.5 w-3 rounded-full bg-sky-500/70" /> I/O reads
+          <span className="h-1.5 w-3 rounded-full bg-info/70" /> I/O reads
         </span>
         <span className="inline-flex items-center gap-1.5">
-          <span className="h-1.5 w-3 rounded-full bg-amber-500/80" /> I/O writes
+          <span className="h-1.5 w-3 rounded-full bg-warning/80" /> I/O writes
         </span>
       </div>
       <div className="flex h-32 items-end gap-1 overflow-hidden rounded-lg border border-border/40 bg-muted/8 px-2 pt-3 pb-2">
@@ -445,21 +443,23 @@ function ResourceHistoryChart({
                       style={{ height: `${cpuHeight}%` }}
                     />
                     <span
-                      className="block rounded-t-sm bg-sky-500/70"
+                      className="block rounded-t-sm bg-info/70"
                       style={{ height: `${readHeight}%` }}
                     />
                     <span
-                      className="block rounded-t-sm bg-amber-500/80"
+                      className="block rounded-t-sm bg-warning/80"
                       style={{ height: `${writeHeight}%` }}
                     />
                   </div>
                 }
               />
-              <TooltipPopup side="top" className="space-y-0.5 text-left">
-                <div>CPU avg {bucket.avgCpuPercent.toFixed(1)}%</div>
-                <div>CPU peak {bucket.maxCpuPercent.toFixed(1)}%</div>
-                <div>Read {formatBytes(bucket.ioReadBytes)}</div>
-                <div>Write {formatBytes(bucket.ioWriteBytes)}</div>
+              <TooltipPopup side="top" className="text-left">
+                <div className="space-y-0.5">
+                  <div>CPU avg {bucket.avgCpuPercent.toFixed(1)}%</div>
+                  <div>CPU peak {bucket.maxCpuPercent.toFixed(1)}%</div>
+                  <div>Read {formatBytes(bucket.ioReadBytes)}</div>
+                  <div>Write {formatBytes(bucket.ioWriteBytes)}</div>
+                </div>
               </TooltipPopup>
             </Tooltip>
           );
@@ -503,10 +503,7 @@ function ProcessTreeName({
         <TooltipTrigger
           render={<span className="min-w-0 truncate font-medium text-foreground">{name}</span>}
         />
-        <TooltipPopup
-          side="top"
-          className="max-w-[min(520px,calc(100vw-2rem))] whitespace-normal break-words text-left font-mono text-[11px]"
-        >
+        <TooltipPopup side="top" variant="code">
           {process.command || process.name}
         </TooltipPopup>
       </Tooltip>
@@ -532,7 +529,7 @@ function ProcessActions({
   onSignal: (process: ResourceTelemetryProcess, signal: ServerProcessSignal) => void;
 }) {
   if (!canSignalProcess(process)) {
-    return <span className="text-[10px] text-muted-foreground/35">—</span>;
+    return <span className="text-3xs text-muted-foreground/35">—</span>;
   }
   const isSignaling = signalingKeys.has(processIdentityKey(process));
   return (
@@ -568,100 +565,102 @@ function ProcessTable({
   }, []);
 
   return (
-    <ScrollArea
-      chainVerticalScroll
-      scrollFade
-      hideScrollbars
-      className="max-h-[min(68vh,48rem)] w-full max-w-full border-t border-border/60"
-    >
-      <table className="w-full min-w-[1320px] table-fixed text-left text-xs">
-        <colgroup>
-          <col className="w-[20%]" />
-          <col className="w-[10%]" />
-          <col className="w-[7%]" />
-          <col className="w-[8%]" />
-          <col className="w-[9%]" />
-          <col className="w-[9%]" />
-          <col className="w-[9%]" />
-          <col className="w-[10%]" />
-          <col className="w-[8%]" />
-          <col className="w-[6%]" />
-          <col className="w-[4%]" />
-        </colgroup>
-        <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-[10px] uppercase tracking-[0.08em] text-muted-foreground/65">
-          <tr>
-            <th className="px-4 py-2 font-semibold sm:pl-5">Process</th>
-            <th className="px-3 py-2 font-semibold">Category</th>
-            <th className="px-3 py-2 text-right font-semibold">CPU</th>
-            <th className="px-3 py-2 text-right font-semibold">CPU Time</th>
-            <th className="px-3 py-2 text-right font-semibold">Memory</th>
-            <th className="px-3 py-2 text-right font-semibold">Read/s</th>
-            <th className="px-3 py-2 text-right font-semibold">Write/s</th>
-            <th className="px-3 py-2 text-right font-semibold">Read Total</th>
-            <th className="px-3 py-2 text-right font-semibold">Write Total</th>
-            <th className="px-3 py-2 text-right font-semibold">PID</th>
-            <th className="px-2 py-2 text-right font-semibold sm:pr-4">Kill</th>
-          </tr>
-        </thead>
-        <tbody className="divide-y divide-border/50">
-          {visible.length === 0 ? (
+    <div className="border-t border-border/60">
+      <ScrollArea
+        chainVerticalScroll
+        scrollFade
+        hideScrollbars
+        className="max-h-[min(68vh,48rem)] w-full max-w-full"
+      >
+        <table className="w-full min-w-[1320px] table-fixed text-left text-xs">
+          <colgroup>
+            <col className="w-[20%]" />
+            <col className="w-[10%]" />
+            <col className="w-[7%]" />
+            <col className="w-[8%]" />
+            <col className="w-[9%]" />
+            <col className="w-[9%]" />
+            <col className="w-[9%]" />
+            <col className="w-[10%]" />
+            <col className="w-[8%]" />
+            <col className="w-[6%]" />
+            <col className="w-[4%]" />
+          </colgroup>
+          <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-3xs uppercase tracking-widest text-muted-foreground/65">
             <tr>
-              <td colSpan={11} className="px-4 py-5 text-xs text-muted-foreground sm:px-5">
-                Waiting for the native process monitor.
-              </td>
+              <th className="px-4 py-2 font-semibold sm:pl-5">Process</th>
+              <th className="px-3 py-2 font-semibold">Category</th>
+              <th className="px-3 py-2 text-right font-semibold">CPU</th>
+              <th className="px-3 py-2 text-right font-semibold">CPU Time</th>
+              <th className="px-3 py-2 text-right font-semibold">Memory</th>
+              <th className="px-3 py-2 text-right font-semibold">Read/s</th>
+              <th className="px-3 py-2 text-right font-semibold">Write/s</th>
+              <th className="px-3 py-2 text-right font-semibold">Read Total</th>
+              <th className="px-3 py-2 text-right font-semibold">Write Total</th>
+              <th className="px-3 py-2 text-right font-semibold">PID</th>
+              <th className="px-2 py-2 text-right font-semibold sm:pr-4">Kill</th>
             </tr>
-          ) : null}
-          {visible.map((process) => (
-            <tr key={processIdentityKey(process)} className="hover:bg-muted/20">
-              <td className="px-4 py-2 sm:pl-5">
-                <ProcessTreeName
-                  process={process}
-                  collapsed={collapsed.has(processIdentityKey(process))}
-                  onToggle={toggle}
-                />
-              </td>
-              <td className="truncate px-3 py-2 text-[11px] text-muted-foreground">
-                {categoryLabel(process.category)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums">
-                {process.cpuPercent.toFixed(1)}%
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums">
-                {formatCpuTime(process.cpuTimeMs)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums">
-                {formatBytes(process.residentBytes)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-sky-700 dark:text-sky-300">
-                {formatRate(process.ioReadBytesPerSecond)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-amber-700 dark:text-amber-300">
-                {formatRate(process.ioWriteBytesPerSecond)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
-                {formatBytes(process.ioReadBytes)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
-                <Tooltip>
-                  <TooltipTrigger render={<span>{formatBytes(process.ioWriteBytes)}</span>} />
-                  <TooltipPopup side="top">{ioSemanticsLabel(process.ioSemantics)}</TooltipPopup>
-                </Tooltip>
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
-                {process.identity.pid}
-              </td>
-              <td className="px-2 py-2 text-right sm:pr-4">
-                <ProcessActions
-                  process={process}
-                  signalingKeys={signalingKeys}
-                  onSignal={onSignal}
-                />
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    </ScrollArea>
+          </thead>
+          <tbody className="divide-y divide-border/50">
+            {visible.length === 0 ? (
+              <tr>
+                <td colSpan={11} className="px-4 py-5 text-xs text-muted-foreground sm:px-5">
+                  Waiting for the native process monitor.
+                </td>
+              </tr>
+            ) : null}
+            {visible.map((process) => (
+              <tr key={processIdentityKey(process)} className="hover:bg-muted/20">
+                <td className="px-4 py-2 sm:pl-5">
+                  <ProcessTreeName
+                    process={process}
+                    collapsed={collapsed.has(processIdentityKey(process))}
+                    onToggle={toggle}
+                  />
+                </td>
+                <td className="truncate px-3 py-2 text-2xs text-muted-foreground">
+                  {categoryLabel(process.category)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums">
+                  {process.cpuPercent.toFixed(1)}%
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums">
+                  {formatCpuTime(process.cpuTimeMs)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums">
+                  {formatBytes(process.residentBytes)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-info-foreground">
+                  {formatRate(process.ioReadBytesPerSecond)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-warning-foreground">
+                  {formatRate(process.ioWriteBytesPerSecond)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
+                  {formatBytes(process.ioReadBytes)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
+                  <Tooltip>
+                    <TooltipTrigger render={<span>{formatBytes(process.ioWriteBytes)}</span>} />
+                    <TooltipPopup side="top">{ioSemanticsLabel(process.ioSemantics)}</TooltipPopup>
+                  </Tooltip>
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
+                  {process.identity.pid}
+                </td>
+                <td className="px-2 py-2 text-right sm:pr-4">
+                  <ProcessActions
+                    process={process}
+                    signalingKeys={signalingKeys}
+                    onSignal={onSignal}
+                  />
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </ScrollArea>
+    </div>
   );
 }
 
@@ -671,93 +670,92 @@ function HistoryProcessTable({
   processes: ReadonlyArray<ResourceTelemetryProcessSummary>;
 }) {
   return (
-    <ScrollArea
-      chainVerticalScroll
-      scrollFade
-      hideScrollbars
-      className="max-h-[28rem] w-full max-w-full border-t border-border/60"
-    >
-      <table className="w-full min-w-[1020px] table-fixed text-left text-xs">
-        <colgroup>
-          <col className="w-[24%]" />
-          <col className="w-[11%]" />
-          <col className="w-[10%]" />
-          <col className="w-[10%]" />
-          <col className="w-[11%]" />
-          <col className="w-[11%]" />
-          <col className="w-[11%]" />
-          <col className="w-[7%]" />
-          <col className="w-[5%]" />
-        </colgroup>
-        <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-[10px] uppercase tracking-[0.08em] text-muted-foreground/65">
-          <tr>
-            <th className="px-4 py-2 font-semibold sm:pl-5">Process</th>
-            <th className="px-3 py-2 font-semibold">Category</th>
-            <th className="px-3 py-2 text-right font-semibold">CPU Time</th>
-            <th className="px-3 py-2 text-right font-semibold">Peak CPU</th>
-            <th className="px-3 py-2 text-right font-semibold">Peak Mem</th>
-            <th className="px-3 py-2 text-right font-semibold">Read</th>
-            <th className="px-3 py-2 text-right font-semibold">Write</th>
-            <th className="px-3 py-2 text-right font-semibold">Samples</th>
-            <th className="px-3 py-2 text-right font-semibold sm:pr-5">PID</th>
-          </tr>
-        </thead>
-        <tbody className="divide-y divide-border/50">
-          {processes.length === 0 ? (
+    <div className="border-t border-border/60">
+      <ScrollArea
+        chainVerticalScroll
+        scrollFade
+        hideScrollbars
+        className="max-h-[28rem] w-full max-w-full"
+      >
+        <table className="w-full min-w-[1020px] table-fixed text-left text-xs">
+          <colgroup>
+            <col className="w-[24%]" />
+            <col className="w-[11%]" />
+            <col className="w-[10%]" />
+            <col className="w-[10%]" />
+            <col className="w-[11%]" />
+            <col className="w-[11%]" />
+            <col className="w-[11%]" />
+            <col className="w-[7%]" />
+            <col className="w-[5%]" />
+          </colgroup>
+          <thead className="sticky top-0 z-10 border-b border-border/60 bg-card text-3xs uppercase tracking-widest text-muted-foreground/65">
             <tr>
-              <td colSpan={9} className="px-4 py-5 text-xs text-muted-foreground sm:px-5">
-                No retained process samples in this window.
-              </td>
+              <th className="px-4 py-2 font-semibold sm:pl-5">Process</th>
+              <th className="px-3 py-2 font-semibold">Category</th>
+              <th className="px-3 py-2 text-right font-semibold">CPU Time</th>
+              <th className="px-3 py-2 text-right font-semibold">Peak CPU</th>
+              <th className="px-3 py-2 text-right font-semibold">Peak Mem</th>
+              <th className="px-3 py-2 text-right font-semibold">Read</th>
+              <th className="px-3 py-2 text-right font-semibold">Write</th>
+              <th className="px-3 py-2 text-right font-semibold">Samples</th>
+              <th className="px-3 py-2 text-right font-semibold sm:pr-5">PID</th>
             </tr>
-          ) : null}
-          {processes.map((process) => (
-            <tr key={processSummaryIdentityKey(process)} className="hover:bg-muted/20">
-              <td className="px-4 py-2 sm:pl-5">
-                <Tooltip>
-                  <TooltipTrigger
-                    render={
-                      <span className="block truncate font-medium text-foreground">
-                        {process.name || process.command}
-                      </span>
-                    }
-                  />
-                  <TooltipPopup
-                    side="top"
-                    className="max-w-[min(520px,calc(100vw-2rem))] whitespace-normal break-words text-left font-mono text-[11px]"
-                  >
-                    {process.command || process.name}
-                  </TooltipPopup>
-                </Tooltip>
-              </td>
-              <td className="truncate px-3 py-2 text-[11px] text-muted-foreground">
-                {categoryLabel(process.category)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums">
-                {formatCpuTime(process.cpuTimeMs)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums">
-                {process.maxCpuPercent.toFixed(1)}%
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums">
-                {formatBytes(process.peakRssBytes)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-sky-700 dark:text-sky-300">
-                {formatBytes(process.ioReadBytes)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-amber-700 dark:text-amber-300">
-                {formatBytes(process.ioWriteBytes)}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
-                {process.sampleCount}
-              </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground sm:pr-5">
-                {process.identity.pid}
-              </td>
-            </tr>
-          ))}
-        </tbody>
-      </table>
-    </ScrollArea>
+          </thead>
+          <tbody className="divide-y divide-border/50">
+            {processes.length === 0 ? (
+              <tr>
+                <td colSpan={9} className="px-4 py-5 text-xs text-muted-foreground sm:px-5">
+                  No retained process samples in this window.
+                </td>
+              </tr>
+            ) : null}
+            {processes.map((process) => (
+              <tr key={processSummaryIdentityKey(process)} className="hover:bg-muted/20">
+                <td className="px-4 py-2 sm:pl-5">
+                  <Tooltip>
+                    <TooltipTrigger
+                      render={
+                        <span className="block truncate font-medium text-foreground">
+                          {process.name || process.command}
+                        </span>
+                      }
+                    />
+                    <TooltipPopup side="top" variant="code">
+                      {process.command || process.name}
+                    </TooltipPopup>
+                  </Tooltip>
+                </td>
+                <td className="truncate px-3 py-2 text-2xs text-muted-foreground">
+                  {categoryLabel(process.category)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums">
+                  {formatCpuTime(process.cpuTimeMs)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums">
+                  {process.maxCpuPercent.toFixed(1)}%
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums">
+                  {formatBytes(process.peakRssBytes)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-info-foreground">
+                  {formatBytes(process.ioReadBytes)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-warning-foreground">
+                  {formatBytes(process.ioWriteBytes)}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground">
+                  {process.sampleCount}
+                </td>
+                <td className="px-3 py-2 text-right font-mono tabular-nums text-muted-foreground sm:pr-5">
+                  {process.identity.pid}
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </ScrollArea>
+    </div>
   );
 }
 
@@ -773,7 +771,7 @@ function AttributionTable({ entries }: { entries: ReadonlyArray<ResourceAttribut
           <col className="w-[10%]" />
           <col className="w-[12%]" />
         </colgroup>
-        <thead className="border-b border-border/60 text-[10px] uppercase tracking-[0.08em] text-muted-foreground/65">
+        <thead className="border-b border-border/60 text-3xs uppercase tracking-widest text-muted-foreground/65">
           <tr>
             <th className="px-4 py-2 font-semibold sm:pl-5">Component</th>
             <th className="px-3 py-2 font-semibold">Operation</th>
@@ -797,10 +795,10 @@ function AttributionTable({ entries }: { entries: ReadonlyArray<ResourceAttribut
                 {entry.component}
               </td>
               <td className="truncate px-3 py-2 text-muted-foreground">{entry.operation}</td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-sky-700 dark:text-sky-300">
+              <td className="px-3 py-2 text-right font-mono tabular-nums text-info-foreground">
                 {formatBytes(entry.logicalReadBytes)}
               </td>
-              <td className="px-3 py-2 text-right font-mono tabular-nums text-amber-700 dark:text-amber-300">
+              <td className="px-3 py-2 text-right font-mono tabular-nums text-warning-foreground">
                 {formatBytes(entry.logicalWriteBytes)}
               </td>
               <td className="px-3 py-2 text-right font-mono tabular-nums">{entry.count}</td>
@@ -985,10 +983,10 @@ export function ResourceTelemetryDiagnostics({
           </div>
         }
       >
-        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-[0_1px_1px_rgb(0_0_0/0.03),0_8px_30px_rgb(0_0_0/0.035)]">
+        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-sm/5">
           <div className="flex flex-col gap-3 border-b border-border/60 bg-linear-to-r from-muted/45 via-muted/20 to-transparent px-4 py-4 sm:flex-row sm:items-center sm:justify-between sm:px-5">
             <div>
-              <div className="text-[10px] font-semibold uppercase tracking-[0.14em] text-muted-foreground/70">
+              <div className="text-3xs font-semibold uppercase tracking-widest text-muted-foreground/70">
                 T3 system footprint
               </div>
               <p className="mt-1 max-w-xl text-xs leading-relaxed text-muted-foreground">
@@ -996,8 +994,8 @@ export function ResourceTelemetryDiagnostics({
                 the monitor itself.
               </p>
             </div>
-            <div className="flex items-center gap-2 text-[10px] text-muted-foreground/65">
-              <span className="size-1.5 rounded-full bg-emerald-500" />
+            <div className="flex items-center gap-2 text-3xs text-muted-foreground/65">
+              <span className="size-1.5 rounded-full bg-success" />
               Sampling every {snapshot ? formatSampleInterval(snapshot.sampleIntervalMs) : "..."}
             </div>
           </div>
@@ -1063,17 +1061,17 @@ export function ResourceTelemetryDiagnostics({
             <div className="grid border-t border-border/60 bg-muted/10 md:grid-cols-3">
               <AggregateCard
                 label="Backend + agents"
-                accentClass="bg-emerald-500/80"
+                accentClass="bg-success/80"
                 aggregate={snapshot.groups.backend}
               />
               <AggregateCard
                 label="Desktop"
-                accentClass="bg-sky-500/80"
+                accentClass="bg-info/80"
                 aggregate={snapshot.groups.electron}
               />
               <AggregateCard
                 label="Monitor overhead"
-                accentClass="bg-amber-500/80"
+                accentClass="bg-warning/80"
                 aggregate={snapshot.groups.monitor}
               />
             </div>
@@ -1093,9 +1091,9 @@ export function ResourceTelemetryDiagnostics({
           ) : null
         }
       >
-        <div className="grid overflow-hidden rounded-2xl border border-border/70 bg-card shadow-[0_1px_1px_rgb(0_0_0/0.03)] md:grid-cols-2 md:divide-x md:divide-border/60">
+        <div className="grid overflow-hidden rounded-2xl border border-border/70 bg-card shadow-xs/5 md:grid-cols-2 md:divide-x md:divide-border/60">
           <div className="px-4 py-4 sm:px-5">
-            <div className="mb-3 flex items-center gap-2 text-[10px] font-semibold uppercase tracking-[0.12em] text-muted-foreground/70">
+            <div className="mb-3 flex items-center gap-2 text-3xs font-semibold uppercase tracking-widest text-muted-foreground/70">
               <span className="flex size-6 items-center justify-center rounded-md bg-muted/60">
                 <BatteryIcon className="size-3.5" />
               </span>
@@ -1152,10 +1150,10 @@ export function ResourceTelemetryDiagnostics({
               </>
             ) : (
               <div className="rounded-xl border border-dashed border-border/70 bg-muted/20 px-4 py-5">
-                <div className="text-[13px] font-medium text-foreground">
+                <div className="text-sm font-medium text-foreground">
                   Desktop host signals not connected
                 </div>
-                <p className="mt-1.5 max-w-sm text-[11px] leading-relaxed text-muted-foreground/70">
+                <p className="mt-1.5 max-w-sm text-2xs leading-relaxed text-muted-foreground/70">
                   Power, idle, lock, and thermal state are supplied by the desktop host. Process
                   telemetry remains fully active in this browser session.
                 </p>
@@ -1163,7 +1161,7 @@ export function ResourceTelemetryDiagnostics({
             )}
           </div>
           <div className="border-t border-border/60 px-4 py-4 md:border-t-0 sm:px-5">
-            <div className="mb-3 flex items-center gap-2 text-[10px] font-semibold uppercase tracking-[0.12em] text-muted-foreground/70">
+            <div className="mb-3 flex items-center gap-2 text-3xs font-semibold uppercase tracking-widest text-muted-foreground/70">
               <span className="flex size-6 items-center justify-center rounded-md bg-muted/60">
                 <GaugeIcon className="size-3.5" />
               </span>
@@ -1186,7 +1184,7 @@ export function ResourceTelemetryDiagnostics({
                   value={String(snapshot.health.inaccessibleProcessCount)}
                   valueClassName={
                     snapshot.health.inaccessibleProcessCount > 0
-                      ? "text-amber-600 dark:text-amber-300"
+                      ? "text-warning-foreground"
                       : undefined
                   }
                 />
@@ -1230,7 +1228,7 @@ export function ResourceTelemetryDiagnostics({
           </div>
         }
       >
-        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-[0_1px_1px_rgb(0_0_0/0.03)]">
+        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-xs/5">
           {history.error ? (
             <div className="flex items-start gap-2 border-b border-destructive/20 bg-destructive/5 px-4 py-3 text-xs text-destructive sm:px-5">
               <AlertTriangleIcon className="mt-0.5 size-3.5 shrink-0" />
@@ -1247,13 +1245,13 @@ export function ResourceTelemetryDiagnostics({
         icon={<CpuIcon className="size-4 text-muted-foreground" />}
         headerAction={
           snapshot ? (
-            <span className="text-[10px] text-muted-foreground/55">
+            <span className="text-3xs text-muted-foreground/55">
               Identity: <span className="font-mono">PID + start time</span>
             </span>
           ) : null
         }
       >
-        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-[0_1px_1px_rgb(0_0_0/0.03)]">
+        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-xs/5">
           <ProcessTable
             processes={snapshot?.processes ?? []}
             signalingKeys={signalingKeys}
@@ -1266,11 +1264,11 @@ export function ResourceTelemetryDiagnostics({
         title="Instrumented application I/O"
         icon={<DatabaseIcon className="size-4 text-muted-foreground" />}
         headerAction={
-          <span className="text-[10px] text-muted-foreground/55">Logical bytes by operation</span>
+          <span className="text-3xs text-muted-foreground/55">Logical bytes by operation</span>
         }
       >
-        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-[0_1px_1px_rgb(0_0_0/0.03)]">
-          <div className="bg-muted/15 px-4 py-3 text-[11px] leading-relaxed text-muted-foreground sm:px-5">
+        <div className="overflow-hidden rounded-2xl border border-border/70 bg-card shadow-xs/5">
+          <div className="bg-muted/15 px-4 py-3 text-2xs leading-relaxed text-muted-foreground sm:px-5">
             Native counters identify which process is reading or writing. These application-level
             counters identify known T3 operations so process spikes can be correlated with specific
             persistence and logging paths.
diff --git a/apps/web/src/components/settings/SettingInheritance.tsx b/apps/web/src/components/settings/SettingInheritance.tsx
index a351fa5fa25b..e08ca680649f 100644
--- a/apps/web/src/components/settings/SettingInheritance.tsx
+++ b/apps/web/src/components/settings/SettingInheritance.tsx
@@ -208,30 +208,22 @@ export function SettingInheritance({
                   size="icon-micro"
                   variant="ghost-muted"
                   aria-label={`${overrideSummary}. Show where this value comes from`}
-                  className={cn(
-                    "[--control-icon-color:currentColor]",
-                    state === "overridden"
-                      ? "text-primary hover:text-primary"
-                      : state === "mixed"
-                        ? "text-warning hover:text-warning"
-                        : state === "environment"
-                          ? "text-foreground/70 hover:text-foreground"
-                          : "text-muted-foreground/60 hover:text-foreground",
-                  )}
                 />
               }
             />
           }
         >
-          <LayersIcon className="size-3" />
+          <LayersIcon
+            className={cn(
+              "size-3",
+              state === "overridden" && "text-primary",
+              state === "mixed" && "text-warning",
+            )}
+          />
         </TooltipTrigger>
         <TooltipPopup side="top">{overrideSummary}</TooltipPopup>
       </Tooltip>
-      <PopoverPopup
-        align="start"
-        className="w-72 max-w-[calc(100vw-2rem)]"
-        viewportClassName="p-0 [--viewport-inline-padding:0px]"
-      >
+      <PopoverPopup align="start" width="md" padding="none">
         <div className="divide-y divide-border/60">
           {chains.map(({ target, environment, machine, layers }) => (
             <section
@@ -290,10 +282,7 @@ export function SettingInheritance({
                     <div className="flex items-center justify-between gap-3 px-2 text-xs text-muted-foreground">
                       <span>Overridden by</span>
                       {onClearOverrides ? (
-                        <InlineButton
-                          className="font-medium text-foreground underline-offset-2 hover:underline"
-                          onClick={() => onClearOverrides(overriding)}
-                        >
+                        <InlineButton onClick={() => onClearOverrides(overriding)}>
                           Reset {overriding.length === 1 ? "it" : "all"}
                         </InlineButton>
                       ) : null}
@@ -304,10 +293,7 @@ export function SettingInheritance({
                           key={project.projectId}
                           className="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-x-3 px-2 py-1"
                         >
-                          <InlineButton
-                            className="min-w-0 justify-start text-left text-foreground underline-offset-2 hover:underline"
-                            onClick={project.open}
-                          >
+                          <InlineButton className="min-w-0 justify-start" onClick={project.open}>
                             <span className="truncate">{project.label}</span>
                           </InlineButton>
                           <span className="max-w-32 truncate text-muted-foreground tabular-nums">
diff --git a/apps/web/src/components/settings/SettingsBreadcrumb.tsx b/apps/web/src/components/settings/SettingsBreadcrumb.tsx
index a21b58d03e0b..c4e019d6fcf7 100644
--- a/apps/web/src/components/settings/SettingsBreadcrumb.tsx
+++ b/apps/web/src/components/settings/SettingsBreadcrumb.tsx
@@ -1,37 +1,9 @@
-import { resolveEnvironmentMachineKind } from "@t3tools/contracts";
-import { LayersIcon } from "lucide-react";
-import type { ReactNode } from "react";
-
-import { cn } from "../../lib/utils";
-import type { SidebarProjectSnapshot } from "../../sidebarProjectGrouping";
-import type { EnvironmentPresentation } from "../../state/environments";
-import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
-import { ProjectFavicon } from "../ProjectFavicon";
-import {
-  Menu,
-  MenuPopup,
-  MenuRadioGroup,
-  MenuRadioItem,
-  MenuRadioItemIndicator,
-  MenuSeparator,
-  MenuTrigger,
-} from "../ui/menu";
 import {
   WorkspaceBreadcrumb,
   WorkspaceBreadcrumbItem,
   WorkspaceBreadcrumbSeparator,
 } from "../WorkspaceBreadcrumb";
 import { SETTINGS_SECTION_LABELS } from "./settingsSearch";
-import { resolveSettingsScope, type SettingsScopeSearch } from "./settingsScope";
-import {
-  ALL_ENVIRONMENTS_VALUE,
-  ALL_PROJECTS_VALUE,
-  environmentAxisValue,
-  projectAxisValue,
-  selectEnvironmentAxis,
-  selectProjectAxis,
-  settingsScopeEnvironmentLabel,
-} from "./settingsScopeAxis";
 
 const SETTINGS_BREADCRUMB_LABELS: Readonly<Record<string, string>> = {
   ...SETTINGS_SECTION_LABELS,
@@ -44,27 +16,11 @@ function settingsBreadcrumbLabel(pathname: string): string | null {
   return SETTINGS_BREADCRUMB_LABELS[normalizedPathname] ?? null;
 }
 
-export interface SettingsScopeBreadcrumbProps {
-  readonly value: SettingsScopeSearch;
-  readonly groups: readonly SidebarProjectSnapshot[];
-  readonly environments: readonly EnvironmentPresentation[];
-  readonly onChange: (next: SettingsScopeSearch) => void;
-}
-
 /**
- * `Settings / Section / Environment / Project`. The last two crumbs are the
- * targets a change applies to and read like the usage page's filter: muted at
- * "all", foreground once narrowed. A project is the same project on every
- * environment, so the environment crumb alone decides where a project
- * override is written.
+ * `Settings / Section`. The scope a change applies to lives at the top of the
+ * page content, see `SettingsScopeSentence`.
  */
-export function SettingsBreadcrumb({
-  pathname,
-  scope,
-}: {
-  pathname: string;
-  scope?: SettingsScopeBreadcrumbProps | undefined;
-}) {
+export function SettingsBreadcrumb({ pathname }: { pathname: string }) {
   const sectionLabel = settingsBreadcrumbLabel(pathname);
 
   return (
@@ -78,158 +34,6 @@ export function SettingsBreadcrumb({
       <WorkspaceBreadcrumbItem current className="truncate">
         {sectionLabel ?? "Settings"}
       </WorkspaceBreadcrumbItem>
-      {scope ? (
-        <>
-          <WorkspaceBreadcrumbSeparator />
-          <WorkspaceBreadcrumbItem className="min-w-0 shrink">
-            <EnvironmentScopeMenu {...scope} />
-          </WorkspaceBreadcrumbItem>
-          <WorkspaceBreadcrumbSeparator />
-          <WorkspaceBreadcrumbItem className="min-w-0 shrink">
-            <ProjectScopeMenu {...scope} />
-          </WorkspaceBreadcrumbItem>
-        </>
-      ) : null}
     </WorkspaceBreadcrumb>
   );
 }
-
-function ScopeMenu({
-  ariaLabel,
-  icon,
-  label,
-  narrowed,
-  children,
-}: {
-  ariaLabel: string;
-  icon: ReactNode;
-  label: string;
-  narrowed: boolean;
-  children: ReactNode;
-}) {
-  return (
-    <Menu>
-      <MenuTrigger
-        aria-label={ariaLabel}
-        className={cn(
-          "inline-flex min-w-0 max-w-56 cursor-pointer items-center gap-1.5 rounded-sm text-left transition-colors focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring",
-          narrowed ? "text-foreground" : "text-muted-foreground hover:text-foreground",
-        )}
-      >
-        {icon}
-        <span className="min-w-0 truncate">{label}</span>
-      </MenuTrigger>
-      <MenuPopup align="start" className="w-64 max-w-[calc(100vw-2rem)]">
-        {children}
-      </MenuPopup>
-    </Menu>
-  );
-}
-
-function EnvironmentScopeMenu({
-  value,
-  groups,
-  environments,
-  onChange,
-}: SettingsScopeBreadcrumbProps) {
-  const resolved = resolveSettingsScope(value, groups, environments);
-  const environmentValue = environmentAxisValue(
-    value,
-    resolved.kind === "checkout" ? resolved.environmentId : null,
-  );
-  const selected = environments.find(
-    (environment) => environment.environmentId === environmentValue,
-  );
-  return (
-    <ScopeMenu
-      ariaLabel="Environment scope"
-      narrowed={environmentValue !== ALL_ENVIRONMENTS_VALUE}
-      icon={
-        selected ? (
-          <EnvironmentMachineIcon
-            aria-hidden
-            kind={resolveEnvironmentMachineKind(selected.serverConfig)}
-            className="size-3.5 shrink-0"
-          />
-        ) : null
-      }
-      label={
-        selected
-          ? settingsScopeEnvironmentLabel(selected, environments)
-          : environmentValue !== ALL_ENVIRONMENTS_VALUE
-            ? "Unavailable environment"
-            : "All environments"
-      }
-    >
-      <MenuRadioGroup
-        value={environmentValue}
-        onValueChange={(next) => {
-          if (typeof next === "string") onChange(selectEnvironmentAxis(value, next));
-        }}
-      >
-        <MenuRadioItem value={ALL_ENVIRONMENTS_VALUE}>
-          <span className="flex min-w-0 items-center gap-2">
-            <LayersIcon aria-hidden className="size-3.5" />
-            <span className="min-w-0 flex-1 truncate">All environments</span>
-            <MenuRadioItemIndicator />
-          </span>
-        </MenuRadioItem>
-        <MenuSeparator />
-        {environments.map((environment) => (
-          <MenuRadioItem key={environment.environmentId} value={environment.environmentId}>
-            <span className="flex min-w-0 items-center gap-2">
-              <EnvironmentMachineIcon
-                aria-hidden
-                kind={resolveEnvironmentMachineKind(environment.serverConfig)}
-                className="size-3.5"
-              />
-              <span className="min-w-0 flex-1 truncate">
-                {settingsScopeEnvironmentLabel(environment, environments)}
-              </span>
-              {environment.connection.phase === "connected" ? null : (
-                <span className="shrink-0 text-xs text-muted-foreground">Offline</span>
-              )}
-              <MenuRadioItemIndicator />
-            </span>
-          </MenuRadioItem>
-        ))}
-      </MenuRadioGroup>
-    </ScopeMenu>
-  );
-}
-
-function ProjectScopeMenu({ value, groups, onChange }: SettingsScopeBreadcrumbProps) {
-  const selected = groups.find((group) => group.projectKey === value.project);
-  return (
-    <ScopeMenu
-      ariaLabel="Project scope"
-      narrowed={value.project !== undefined}
-      icon={selected ? <ProjectFavicon project={selected} className="size-3.5 shrink-0" /> : null}
-      label={selected?.displayName ?? (value.project ? "Unavailable project" : "All projects")}
-    >
-      <MenuRadioGroup
-        value={projectAxisValue(value)}
-        onValueChange={(next) => {
-          if (typeof next === "string") onChange(selectProjectAxis(value, next));
-        }}
-      >
-        <MenuRadioItem value={ALL_PROJECTS_VALUE}>
-          <span className="flex min-w-0 items-center gap-2">
-            <span className="min-w-0 flex-1 truncate">All projects</span>
-            <MenuRadioItemIndicator />
-          </span>
-        </MenuRadioItem>
-        <MenuSeparator />
-        {groups.map((group) => (
-          <MenuRadioItem key={group.projectKey} value={group.projectKey}>
-            <span className="flex min-w-0 items-center gap-2">
-              <ProjectFavicon project={group} className="size-3.5" />
-              <span className="min-w-0 flex-1 truncate">{group.displayName}</span>
-              <MenuRadioItemIndicator />
-            </span>
-          </MenuRadioItem>
-        ))}
-      </MenuRadioGroup>
-    </ScopeMenu>
-  );
-}
diff --git a/apps/web/src/components/settings/SettingsFontPreviews.tsx b/apps/web/src/components/settings/SettingsFontPreviews.tsx
index 2d64538d5c46..6f392598b9e7 100644
--- a/apps/web/src/components/settings/SettingsFontPreviews.tsx
+++ b/apps/web/src/components/settings/SettingsFontPreviews.tsx
@@ -46,7 +46,7 @@ export function PromptFontPreview() {
         skills={EMPTY_SKILLS}
         disabled={false}
         placeholder={DISCONNECTED_COMPOSER_PLACEHOLDER}
-        className="max-h-40 min-h-12"
+        className="max-h-42 min-h-14"
         onChange={onChange}
         onPaste={noop}
       />
diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx
index 6ea08076ad88..fc5082fcf1a4 100644
--- a/apps/web/src/components/settings/SettingsPanels.tsx
+++ b/apps/web/src/components/settings/SettingsPanels.tsx
@@ -22,6 +22,7 @@ import {
 import {
   DEFAULT_ENVIRONMENT_IDENTIFICATION_MODE,
   DEFAULT_UNIFIED_SETTINGS,
+  type ChatWidth,
   type DiffLayout,
   type EnvironmentIdentificationMode,
   MAX_APPEARANCE_CONTRAST,
@@ -197,6 +198,12 @@ const TIMESTAMP_FORMAT_LABELS = {
   "24-hour": "24-hour",
 } as const;
 
+const CHAT_WIDTH_LABELS: Record<ChatWidth, string> = {
+  comfortable: "Comfortable",
+  wide: "Wide",
+  full: "Full",
+};
+
 const DIFF_LAYOUT_LABELS: Record<DiffLayout, string> = {
   stacked: "Stacked",
   split: "Split",
@@ -264,7 +271,7 @@ function AboutVersionTitle() {
   return (
     <span className="inline-flex items-baseline gap-2">
       <span>Version</span>
-      <code className="text-[11px] font-medium text-muted-foreground">{APP_VERSION}</code>
+      <code className="text-2xs font-medium text-muted-foreground">{APP_VERSION}</code>
     </span>
   );
 }
@@ -532,6 +539,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       ...(settings.diffColorScheme !== DEFAULT_UNIFIED_SETTINGS.diffColorScheme
         ? ["Diff colors"]
         : []),
+      ...(settings.chatWidth !== DEFAULT_UNIFIED_SETTINGS.chatWidth ? ["Chat width"] : []),
       ...(settings.panelAnimationDurationMs !== DEFAULT_UNIFIED_SETTINGS.panelAnimationDurationMs
         ? ["Panel animations"]
         : []),
@@ -641,6 +649,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       settings.browserAutoShowFloatingPreview,
       settings.appearanceContrast,
       settings.diffColorScheme,
+      settings.chatWidth,
       settings.enableAgentBrowserAccess,
       settings.confirmQuit,
       settings.confirmThreadArchive,
@@ -752,6 +761,7 @@ export function useSettingsRestore(onRestored?: () => void) {
     updateSettings({
       appearanceContrast: DEFAULT_UNIFIED_SETTINGS.appearanceContrast,
       diffColorScheme: DEFAULT_UNIFIED_SETTINGS.diffColorScheme,
+      chatWidth: DEFAULT_UNIFIED_SETTINGS.chatWidth,
       timestampFormat: DEFAULT_UNIFIED_SETTINGS.timestampFormat,
       notificationMode: DEFAULT_UNIFIED_SETTINGS.notificationMode,
       inAppNotificationsEnabled: DEFAULT_UNIFIED_SETTINGS.inAppNotificationsEnabled,
@@ -899,7 +909,7 @@ function BackgroundActivityAdvancedDialog({
             Tune the shared power policy and the background intervals that feed it.
           </DialogDescription>
         </DialogHeader>
-        <DialogPanel className="space-y-0 px-6 pb-5">
+        <DialogPanel>
           <div className="overflow-hidden rounded-xl border bg-card text-card-foreground">
             <div className="flex flex-col gap-3 border-b px-4 py-3 sm:flex-row sm:items-center sm:justify-between">
               <div className="min-w-0 space-y-1">
@@ -1368,8 +1378,8 @@ export function AppearanceSettingsPanel() {
                         : "flex shrink-0 gap-1"
                     }
                   >
-                    <span className="size-2 rounded-full bg-[var(--diff-deletion)]" />
-                    <span className="size-2 rounded-full bg-[var(--diff-addition)]" />
+                    <span className="size-2 rounded-full bg-diff-deletion" />
+                    <span className="size-2 rounded-full bg-diff-addition" />
                   </span>
                   <SelectValue>
                     {settings.diffColorScheme === "blue-orange" ? "Blue & orange" : "Red & green"}
@@ -1383,6 +1393,38 @@ export function AppearanceSettingsPanel() {
             </div>
           }
         />
+        <SettingsRow
+          {...searchableSetting("chat-width")}
+          description="Set how wide messages and the composer can grow on large screens."
+          resetAction={
+            settings.chatWidth !== DEFAULT_UNIFIED_SETTINGS.chatWidth ? (
+              <SettingResetButton
+                label="chat width"
+                onClick={() => updateSettings({ chatWidth: DEFAULT_UNIFIED_SETTINGS.chatWidth })}
+              />
+            ) : null
+          }
+          control={
+            <div className="w-full sm:w-40">
+              <Select
+                value={settings.chatWidth}
+                onValueChange={(value) => {
+                  if (value === "comfortable" || value === "wide" || value === "full")
+                    updateSettings({ chatWidth: value });
+                }}
+              >
+                <SelectTrigger size="sm" className="w-full min-w-0" aria-label="Chat width">
+                  <SelectValue>{CHAT_WIDTH_LABELS[settings.chatWidth]}</SelectValue>
+                </SelectTrigger>
+                <SelectPopup align="end" alignItemWithTrigger={false}>
+                  <SelectItem value="comfortable">Comfortable (default)</SelectItem>
+                  <SelectItem value="wide">Wide</SelectItem>
+                  <SelectItem value="full">Full</SelectItem>
+                </SelectPopup>
+              </Select>
+            </div>
+          }
+        />
       </SettingsSection>
 
       <SettingsSection id="motion" title="Motion">
@@ -2046,7 +2088,7 @@ function LegacyFeaturesSection() {
     <section id="legacy-features" ref={targetRef} tabIndex={-1} className="space-y-2.5">
       <Collapsible open={open} onOpenChange={setOpen}>
         <CollapsibleTrigger className="group flex min-h-8 w-full items-center gap-2 px-3 sm:px-4">
-          <h2 className="text-sm font-normal tracking-[-0.005em] text-foreground/70 transition-colors group-hover:text-foreground">
+          <h2 className="text-sm font-normal text-foreground/70 transition-colors group-hover:text-foreground">
             Legacy features
           </h2>
           <ChevronRightIcon className="size-4 text-muted-foreground transition-transform duration-200 group-data-panel-open:rotate-90" />
@@ -3113,7 +3155,6 @@ export function GeneralSettingsPanel() {
                   lockedProvider={null}
                   instanceEntries={textGenerationModelInstanceEntries}
                   modelOptionsByInstance={textGenerationModelOptionsByInstance}
-                  triggerVariant="outline"
                   triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
                   {...(mixedTextGenerationModel ? { triggerLabel: "Mixed" } : {})}
                   getModelDisabledReason={textGenerationModelDisabledReason}
@@ -3164,7 +3205,6 @@ export function GeneralSettingsPanel() {
                     modelOptions={textGenModelOptions}
                     allowPromptInjectedEffort={false}
                     planModeEnabled={settings.planModeEnabled}
-                    triggerVariant="outline"
                     triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
                     onModelOptionsChange={(nextOptions) => {
                       updateSettings({
diff --git a/apps/web/src/components/settings/SettingsScopeContext.tsx b/apps/web/src/components/settings/SettingsScopeContext.tsx
index 1602c29d76e2..add38f3e1880 100644
--- a/apps/web/src/components/settings/SettingsScopeContext.tsx
+++ b/apps/web/src/components/settings/SettingsScopeContext.tsx
@@ -10,6 +10,7 @@ import { getProjectFileQueryAtom, optimisticFileAtom } from "../files/projectFil
 import { useSettingsProjectGroups } from "./useSettingsProjectGroups";
 import { resolveScopedSettingsTargets, selectScopedSettingsEnvironments } from "./scopedSettings";
 import { resolveSettingsScope, type SettingsScopeSearch } from "./settingsScope";
+import { selectSingleEnvironmentScope } from "./settingsScopeAxis";
 
 /**
  * Each member's decoded t3.json, so file-backed settings show the file as a
@@ -53,10 +54,22 @@ function useMemberProjectFiles(scope: ReturnType<typeof resolveSettingsScope>) {
   );
 }
 
-function useResolvedSettingsScope(search: SettingsScopeSearch) {
+function useResolvedSettingsScope(rawSearch: SettingsScopeSearch, singleEnvironment: boolean) {
   const groups = useSettingsProjectGroups();
   const { environments: availableEnvironments } = useEnvironments();
   const primaryEnvironmentId = usePrimaryEnvironmentId();
+  const search = useMemo(
+    () =>
+      singleEnvironment
+        ? selectSingleEnvironmentScope(
+            rawSearch,
+            resolveSettingsScope(rawSearch, groups, availableEnvironments),
+            availableEnvironments,
+            primaryEnvironmentId,
+          )
+        : rawSearch,
+    [availableEnvironments, groups, primaryEnvironmentId, rawSearch, singleEnvironment],
+  );
   const scope = useMemo(
     () => resolveSettingsScope(search, groups, availableEnvironments),
     [availableEnvironments, groups, search],
@@ -81,12 +94,13 @@ function useResolvedSettingsScope(search: SettingsScopeSearch) {
       ) ??
       targets[0] ??
       null;
-    return { scope, groups, ...selected, targets, target };
-  }, [availableEnvironments, groups, primaryEnvironmentId, projectFiles, scope]);
+    return { scope, groups, search, ...selected, targets, target };
+  }, [availableEnvironments, groups, primaryEnvironmentId, projectFiles, scope, search]);
 }
 
 const SettingsScopeContext = createContext<
   | (ReturnType<typeof useResolvedSettingsScope> & {
+      singleEnvironment: boolean;
       search: SettingsScopeSearch;
       selectScope: (next: SettingsScopeSearch) => void;
     })
@@ -97,15 +111,17 @@ export function SettingsScopeProvider({
   search,
   onChange,
   children,
+  singleEnvironment = false,
 }: {
+  singleEnvironment?: boolean;
   search: SettingsScopeSearch;
   onChange: (next: SettingsScopeSearch) => void;
   children: ReactNode;
 }) {
-  const resolved = useResolvedSettingsScope(search);
+  const resolved = useResolvedSettingsScope(search, singleEnvironment);
   const value = useMemo(
-    () => ({ ...resolved, search, selectScope: onChange }),
-    [onChange, resolved, search],
+    () => ({ ...resolved, singleEnvironment, selectScope: onChange }),
+    [onChange, resolved, singleEnvironment],
   );
   return <SettingsScopeContext value={value}>{children}</SettingsScopeContext>;
 }
diff --git a/apps/web/src/components/settings/SettingsScopeNotice.tsx b/apps/web/src/components/settings/SettingsScopeNotice.tsx
index 1bf365b729e7..bd248370db53 100644
--- a/apps/web/src/components/settings/SettingsScopeNotice.tsx
+++ b/apps/web/src/components/settings/SettingsScopeNotice.tsx
@@ -66,7 +66,7 @@ export function SettingsScopeNotice({
       <Alert role="status">
         <AlertDescription>
           <p>{children}</p>
-          <AlertAction className="flex-wrap gap-2">
+          <AlertAction className="flex-wrap">
             {choices.map((choice) => (
               <Button
                 key={JSON.stringify(choice.search)}
diff --git a/apps/web/src/components/settings/SettingsScopeSentence.tsx b/apps/web/src/components/settings/SettingsScopeSentence.tsx
new file mode 100644
index 000000000000..4223ebc90775
--- /dev/null
+++ b/apps/web/src/components/settings/SettingsScopeSentence.tsx
@@ -0,0 +1,221 @@
+import { resolveEnvironmentMachineKind } from "@t3tools/contracts";
+import { useLocation } from "@tanstack/react-router";
+import { ChevronDownIcon, LayersIcon } from "lucide-react";
+import type { ReactNode } from "react";
+
+import type { SidebarProjectSnapshot } from "../../sidebarProjectGrouping";
+import { useEnvironments, type EnvironmentPresentation } from "../../state/environments";
+import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
+import { ProjectFavicon } from "../ProjectFavicon";
+import { InlineButton } from "../ui/button";
+import {
+  Menu,
+  MenuPopup,
+  MenuRadioGroup,
+  MenuRadioItem,
+  MenuRadioItemIndicator,
+  MenuSeparator,
+  MenuTrigger,
+} from "../ui/menu";
+import { useOptionalSettingsScope } from "./SettingsScopeContext";
+import { resolveSettingsScope, type SettingsScopeSearch } from "./settingsScope";
+import {
+  ALL_ENVIRONMENTS_VALUE,
+  ALL_PROJECTS_VALUE,
+  environmentAxisValue,
+  projectAxisValue,
+  selectEnvironmentAxis,
+  selectProjectAxis,
+  settingsScopeEnvironmentLabel,
+} from "./settingsScopeAxis";
+
+/** Pages whose every row is saved on this client; they have no scope to pick. */
+export const SETTINGS_DEVICE_ONLY_PATHS: ReadonlySet<string> = new Set([
+  "/settings/appearance",
+  "/settings/snap-shot",
+  "/settings/connections",
+]);
+
+interface SettingsScopeMenuProps {
+  readonly value: SettingsScopeSearch;
+  readonly groups: readonly SidebarProjectSnapshot[];
+  readonly environments: readonly EnvironmentPresentation[];
+  readonly singleEnvironment: boolean;
+  readonly onChange: (next: SettingsScopeSearch) => void;
+}
+
+/**
+ * "Applying settings for <project> across <environment>" at the top of a settings
+ * page. The two pickers are the targets a change is written to. A project is
+ * the same project on every environment, so the environment alone decides
+ * where a project override is written.
+ */
+export function SettingsScopeSentence() {
+  const scope = useOptionalSettingsScope();
+  const pathname = useLocation({ select: (location) => location.pathname });
+  const { environments } = useEnvironments();
+  if (scope === null || SETTINGS_DEVICE_ONLY_PATHS.has(pathname)) return null;
+  const props: SettingsScopeMenuProps = {
+    value: scope.search,
+    singleEnvironment: scope.singleEnvironment,
+    groups: scope.groups,
+    environments,
+    onChange: scope.selectScope,
+  };
+  return (
+    <p className="flex min-w-0 flex-wrap items-center gap-x-1.5 gap-y-1 px-3 text-base text-muted-foreground sm:px-4">
+      {/* Each connective stays with its picker so a wrap never strands "on". */}
+      <span className="flex min-w-0 items-center gap-1.5">
+        <span className="shrink-0">Applying settings for</span>
+        <ProjectScopeMenu {...props} />
+      </span>
+      <span className="flex min-w-0 items-center gap-1.5">
+        <span className="shrink-0">
+          {/* A legacy checkout link names one environment without `machine`. */}
+          {scope.search.machine || scope.scope.kind === "checkout" ? "on" : "across"}
+        </span>
+        <EnvironmentScopeMenu {...props} />
+      </span>
+    </p>
+  );
+}
+
+function ScopeMenu({
+  ariaLabel,
+  icon,
+  label,
+  children,
+}: {
+  ariaLabel: string;
+  icon: ReactNode;
+  label: string;
+  children: ReactNode;
+}) {
+  return (
+    <Menu>
+      <MenuTrigger
+        aria-label={`${ariaLabel}: ${label}`}
+        render={<InlineButton tone="picker" />}
+        className="min-w-0 max-w-72"
+      >
+        {icon}
+        <span className="min-w-0 truncate">{label}</span>
+        <ChevronDownIcon aria-hidden className="size-3.5 shrink-0 text-muted-foreground" />
+      </MenuTrigger>
+      <MenuPopup align="start">{children}</MenuPopup>
+    </Menu>
+  );
+}
+
+function EnvironmentScopeMenu({
+  value,
+  groups,
+  environments,
+  onChange,
+  singleEnvironment,
+}: SettingsScopeMenuProps) {
+  const resolved = resolveSettingsScope(value, groups, environments);
+  const environmentValue = environmentAxisValue(
+    value,
+    resolved.kind === "checkout" ? resolved.environmentId : null,
+  );
+  const selected = environments.find(
+    (environment) => environment.environmentId === environmentValue,
+  );
+  return (
+    <ScopeMenu
+      ariaLabel="Environment scope"
+      icon={
+        selected ? (
+          <EnvironmentMachineIcon
+            aria-hidden
+            kind={resolveEnvironmentMachineKind(selected.serverConfig)}
+            className="size-3.5 shrink-0"
+          />
+        ) : null
+      }
+      label={
+        selected
+          ? settingsScopeEnvironmentLabel(selected, environments)
+          : environmentValue !== ALL_ENVIRONMENTS_VALUE
+            ? "Unavailable environment"
+            : singleEnvironment
+              ? "No environments"
+              : "All environments"
+      }
+    >
+      <MenuRadioGroup
+        value={environmentValue}
+        onValueChange={(next) => {
+          if (typeof next === "string") onChange(selectEnvironmentAxis(value, next));
+        }}
+      >
+        {!singleEnvironment ? (
+          <>
+            <MenuRadioItem value={ALL_ENVIRONMENTS_VALUE}>
+              <span className="flex min-w-0 items-center gap-2">
+                <LayersIcon aria-hidden className="size-3.5" />
+                <span className="min-w-0 flex-1 truncate">All environments</span>
+                <MenuRadioItemIndicator />
+              </span>
+            </MenuRadioItem>
+            <MenuSeparator />
+          </>
+        ) : null}
+        {environments.map((environment) => (
+          <MenuRadioItem key={environment.environmentId} value={environment.environmentId}>
+            <span className="flex min-w-0 items-center gap-2">
+              <EnvironmentMachineIcon
+                aria-hidden
+                kind={resolveEnvironmentMachineKind(environment.serverConfig)}
+                className="size-3.5"
+              />
+              <span className="min-w-0 flex-1 truncate">
+                {settingsScopeEnvironmentLabel(environment, environments)}
+              </span>
+              {environment.connection.phase === "connected" ? null : (
+                <span className="shrink-0 text-xs text-muted-foreground">Offline</span>
+              )}
+              <MenuRadioItemIndicator />
+            </span>
+          </MenuRadioItem>
+        ))}
+      </MenuRadioGroup>
+    </ScopeMenu>
+  );
+}
+
+function ProjectScopeMenu({ value, groups, onChange }: SettingsScopeMenuProps) {
+  const selected = groups.find((group) => group.projectKey === value.project);
+  return (
+    <ScopeMenu
+      ariaLabel="Project scope"
+      icon={selected ? <ProjectFavicon project={selected} className="size-3.5 shrink-0" /> : null}
+      label={selected?.displayName ?? (value.project ? "Unavailable project" : "All projects")}
+    >
+      <MenuRadioGroup
+        value={projectAxisValue(value)}
+        onValueChange={(next) => {
+          if (typeof next === "string") onChange(selectProjectAxis(value, next));
+        }}
+      >
+        <MenuRadioItem value={ALL_PROJECTS_VALUE}>
+          <span className="flex min-w-0 items-center gap-2">
+            <span className="min-w-0 flex-1 truncate">All projects</span>
+            <MenuRadioItemIndicator />
+          </span>
+        </MenuRadioItem>
+        <MenuSeparator />
+        {groups.map((group) => (
+          <MenuRadioItem key={group.projectKey} value={group.projectKey}>
+            <span className="flex min-w-0 items-center gap-2">
+              <ProjectFavicon project={group} className="size-3.5" />
+              <span className="min-w-0 flex-1 truncate">{group.displayName}</span>
+              <MenuRadioItemIndicator />
+            </span>
+          </MenuRadioItem>
+        ))}
+      </MenuRadioGroup>
+    </ScopeMenu>
+  );
+}
diff --git a/apps/web/src/components/settings/SettingsSidebarNav.tsx b/apps/web/src/components/settings/SettingsSidebarNav.tsx
index 8049806c8fd4..3982144663e1 100644
--- a/apps/web/src/components/settings/SettingsSidebarNav.tsx
+++ b/apps/web/src/components/settings/SettingsSidebarNav.tsx
@@ -28,7 +28,6 @@ import {
 import { useLocation, useNavigate } from "@tanstack/react-router";
 
 import { Button } from "../ui/button";
-import { Input } from "../ui/input";
 import { Kbd } from "../ui/kbd";
 import {
   SidebarContent,
@@ -38,6 +37,7 @@ import {
   SidebarMenuButton,
   SidebarMenuItem,
   useSidebar,
+  SidebarInput,
 } from "../ui/sidebar";
 import { SidebarUtilityMenu } from "../sidebar/SidebarChrome";
 import { scrollToSettingsTarget } from "./settingsLayout";
@@ -118,7 +118,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
   const searchInputRef = useRef<HTMLInputElement>(null);
   const [query, setQuery] = useState("");
   const [activeResultIndex, setActiveResultIndex] = useState(0);
-  const searchableItems = useAvailableSettingsSearchItems();
+  const searchableItems = useAvailableSettingsSearchItems(scopeSearch);
   const results = useMemo(() => searchSettings(query, searchableItems), [query, searchableItems]);
   const isSearching = query.trim().length > 0;
   const hasResults = results.length > 0;
@@ -236,114 +236,117 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
   return (
     <>
       <SidebarContent className="overflow-x-hidden">
-        <SidebarGroup className="gap-2 p-[var(--sidebar-content-inset)]">
-          <div className="flex h-8 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground">
-            <SearchIcon className="size-4 shrink-0 text-sidebar-muted-foreground/80" />
-            <Input
-              ref={searchInputRef}
-              nativeInput
-              unstyled
-              type="search"
-              value={query}
-              onChange={(event) => {
-                setQuery(event.currentTarget.value);
-                setActiveResultIndex(0);
-              }}
-              onKeyDown={handleSearchKeyDown}
-              placeholder="Search"
-              aria-label="Search settings"
-              role="combobox"
-              aria-autocomplete="list"
-              aria-expanded={isSearching && hasResults}
-              aria-controls={isSearching && hasResults ? "settings-search-results" : undefined}
-              aria-activedescendant={
-                isSearching && results[activeResultIndex]
-                  ? `settings-search-result-${results[activeResultIndex].id}`
-                  : undefined
-              }
-              className="min-w-0 flex-1 [&_[data-slot=input]]:h-auto [&_[data-slot=input]]:p-0 [&_[data-slot=input]]:leading-normal [&_[data-slot=input]]:text-sm [&_[data-slot=input]]:font-medium [&_[data-slot=input]]:text-sidebar-foreground [&_[data-slot=input]]:placeholder:text-sidebar-muted-foreground"
-            />
-            {isSearching ? (
-              <Button
-                type="button"
-                size="icon-micro"
-                variant="ghost"
-                className="shrink-0 text-sidebar-muted-foreground hover:bg-sidebar-control-surface hover:text-sidebar-foreground"
-                aria-label="Clear settings search"
-                onClick={() => {
-                  clearSearch();
-                  searchInputRef.current?.focus();
+        <SidebarGroup>
+          <div className="flex flex-col gap-2">
+            <div className="flex h-8 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground">
+              <SearchIcon className="size-4 shrink-0 text-sidebar-muted-foreground/80" />
+              <SidebarInput
+                ref={searchInputRef}
+                nativeInput
+                type="search"
+                value={query}
+                onChange={(event) => {
+                  setQuery(event.currentTarget.value);
+                  setActiveResultIndex(0);
                 }}
+                onKeyDown={handleSearchKeyDown}
+                placeholder="Search"
+                aria-label="Search settings"
+                role="combobox"
+                aria-autocomplete="list"
+                aria-expanded={isSearching && hasResults}
+                aria-controls={isSearching && hasResults ? "settings-search-results" : undefined}
+                aria-activedescendant={
+                  isSearching && results[activeResultIndex]
+                    ? `settings-search-result-${results[activeResultIndex].id}`
+                    : undefined
+                }
+                className="min-w-0 flex-1"
+              />
+              {isSearching ? (
+                <Button
+                  type="button"
+                  size="icon-micro"
+                  variant="ghost-muted"
+                  className="shrink-0"
+                  aria-label="Clear settings search"
+                  onClick={() => {
+                    clearSearch();
+                    searchInputRef.current?.focus();
+                  }}
+                >
+                  <XIcon className="size-3" />
+                </Button>
+              ) : (
+                <Kbd>/</Kbd>
+              )}
+            </div>
+            {isSearching && results.length === 0 ? (
+              <p
+                role="status"
+                className="px-2 py-6 text-center text-xs text-sidebar-muted-foreground"
               >
-                <XIcon className="size-3" />
-              </Button>
-            ) : (
-              <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">/</Kbd>
-            )}
-          </div>
-          {isSearching && results.length === 0 ? (
-            <p
-              role="status"
-              className="px-2 py-6 text-center text-xs text-sidebar-muted-foreground"
-            >
-              No settings found
-            </p>
-          ) : null}
-          {isSearching ? (
-            <SidebarMenu
-              className="ps-px"
-              id={hasResults ? "settings-search-results" : undefined}
-              role={hasResults ? "listbox" : undefined}
-              aria-label={hasResults ? "Settings search results" : undefined}
-            >
-              {results.map((item, index) => (
-                <SidebarMenuItem key={item.id} role="presentation">
-                  <SidebarMenuButton
-                    id={`settings-search-result-${item.id}`}
-                    role="option"
-                    aria-selected={index === activeResultIndex}
-                    tabIndex={-1}
-                    size="sm"
-                    isActive={index === activeResultIndex}
-                    className="h-auto min-h-10 items-start gap-2 rounded-md px-2 py-2 text-left hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
-                    onMouseMove={() => setActiveResultIndex(index)}
-                    onClick={() => handleSearchResultClick(item)}
-                  >
-                    <SettingsSectionIcon to={item.to} />
-                    <span className="min-w-0 flex-1">
-                      <span className="block truncate text-sm font-medium text-sidebar-foreground">
-                        {item.title}
-                      </span>
-                      <span className="block truncate text-[11px] text-sidebar-muted-foreground/75">
-                        {SETTINGS_SECTION_LABELS[item.to]}
-                      </span>
-                    </span>
-                  </SidebarMenuButton>
-                </SidebarMenuItem>
-              ))}
-            </SidebarMenu>
-          ) : (
-            <SidebarMenu className="ps-px">
-              {navItems.map((item) => {
-                const Icon = item.icon;
-                const isGeneralDetailPage =
-                  item.to === "/settings/general" && pathname === "/settings/open-source-licenses";
-                const isActive =
-                  isGeneralDetailPage || pathname === item.to || pathname.startsWith(`${item.to}/`);
-                return (
-                  <SidebarMenuItem key={item.to}>
+                No settings found
+              </p>
+            ) : null}
+            {isSearching ? (
+              <SidebarMenu
+                id={hasResults ? "settings-search-results" : undefined}
+                role={hasResults ? "listbox" : undefined}
+                aria-label={hasResults ? "Settings search results" : undefined}
+              >
+                {results.map((item, index) => (
+                  <SidebarMenuItem key={item.id} role="presentation">
                     <SidebarMenuButton
-                      isActive={isActive}
-                      onClick={() => handleSectionClick(item.to)}
+                      id={`settings-search-result-${item.id}`}
+                      role="option"
+                      aria-selected={index === activeResultIndex}
+                      tabIndex={-1}
+                      size="sm"
+                      isActive={index === activeResultIndex}
+                      className="h-auto min-h-10 items-start"
+                      onMouseMove={() => setActiveResultIndex(index)}
+                      onClick={() => handleSearchResultClick(item)}
                     >
-                      <Icon />
-                      <span className="truncate">{item.label}</span>
+                      <SettingsSectionIcon to={item.to} />
+                      <span className="min-w-0 flex-1">
+                        <span className="block truncate text-sm font-medium text-sidebar-foreground">
+                          {item.title}
+                        </span>
+                        <span className="block truncate text-2xs text-sidebar-muted-foreground/75">
+                          {SETTINGS_SECTION_LABELS[item.to]}
+                        </span>
+                      </span>
                     </SidebarMenuButton>
                   </SidebarMenuItem>
-                );
-              })}
-            </SidebarMenu>
-          )}
+                ))}
+              </SidebarMenu>
+            ) : (
+              <SidebarMenu>
+                {navItems.map((item) => {
+                  const Icon = item.icon;
+                  const isGeneralDetailPage =
+                    item.to === "/settings/general" &&
+                    pathname === "/settings/open-source-licenses";
+                  const isActive =
+                    isGeneralDetailPage ||
+                    pathname === item.to ||
+                    pathname.startsWith(`${item.to}/`);
+                  return (
+                    <SidebarMenuItem key={item.to}>
+                      <SidebarMenuButton
+                        isActive={isActive}
+                        onClick={() => handleSectionClick(item.to)}
+                      >
+                        <Icon />
+                        <span className="truncate">{item.label}</span>
+                      </SidebarMenuButton>
+                    </SidebarMenuItem>
+                  );
+                })}
+              </SidebarMenu>
+            )}
+          </div>
         </SidebarGroup>
       </SidebarContent>
       <SidebarFooter>
diff --git a/apps/web/src/components/settings/SnapShotSettings.test.tsx b/apps/web/src/components/settings/SnapShotSettings.test.tsx
index 584c224493dc..b8f5bed9979f 100644
--- a/apps/web/src/components/settings/SnapShotSettings.test.tsx
+++ b/apps/web/src/components/settings/SnapShotSettings.test.tsx
@@ -27,6 +27,7 @@ vi.mock("react/compiler-runtime", async () => {
 vi.mock("@effect/atom-react", () => ({ useAtomValue: () => [] }));
 vi.mock("../../state/server", () => ({ primaryServerKeybindingsAtom: {} }));
 vi.mock("./SettingsScopeContext", () => ({ useOptionalSettingsScope: () => null }));
+vi.mock("./SettingsScopeSentence", () => ({ SettingsScopeSentence: () => null }));
 const bridge = vi.hoisted(() => ({
   getSnapShotState: vi.fn<() => Promise<DesktopSnapShotState>>(),
   setSnapShotShortcutSuppressed: vi.fn(),
diff --git a/apps/web/src/components/settings/SnapShotSettings.tsx b/apps/web/src/components/settings/SnapShotSettings.tsx
index 26f1b609704e..286d065b449f 100644
--- a/apps/web/src/components/settings/SnapShotSettings.tsx
+++ b/apps/web/src/components/settings/SnapShotSettings.tsx
@@ -7,11 +7,9 @@ import {
   type DesktopSnapShotSetupAction,
   type SnapShotShortcut,
 } from "@t3tools/contracts";
-import { ChevronDownIcon, PlayIcon } from "lucide-react";
+import { PlayIcon } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
 
-import { cn } from "~/lib/utils";
-
 import { useClientSettings, useUpdateClientSettings } from "../../hooks/useSettings";
 import { getDesktopSnapShotBridge } from "../../lib/desktopSnapShot";
 import {
@@ -44,7 +42,7 @@ import {
 import { searchableSetting } from "./settingsSearch";
 import { Button } from "../ui/button";
 import { Menu, MenuItem, MenuPopup, MenuRadioGroup, MenuRadioItem, MenuTrigger } from "../ui/menu";
-import { selectTriggerVariants } from "../ui/select";
+import { SelectButton } from "../ui/select";
 import { Switch } from "../ui/switch";
 import { toastManager } from "../ui/toast";
 import { SnapShotSetupDialog } from "./SnapShotSetupDialog";
@@ -56,10 +54,7 @@ import {
   type CaptureSetupStep,
 } from "./SnapShotSetupDialog.logic";
 
-const soundOptionRowClassName =
-  "grid grid-cols-[1fr_auto] rounded-sm has-data-checked:bg-foreground/[0.08]";
-const soundOptionItemClassName = "data-checked:bg-transparent";
-const soundPreviewClassName = "min-h-7 w-7 justify-center px-0";
+const soundOptionRowClassName = "grid grid-cols-[1fr_auto]";
 
 function captureSettingsError(title: string, error: unknown) {
   return { title, message: error instanceof Error ? error.message : "Try again." };
@@ -497,21 +492,19 @@ export function SnapShotSettings() {
                   <Menu>
                     <MenuTrigger
                       aria-label={"Snapshot sound: " + soundLabel}
-                      className={cn(selectTriggerVariants({ size: "sm" }), "w-auto min-w-0")}
+                      render={<SelectButton size="sm" />}
+                      className="w-auto min-w-0"
                       disabled={!captureAvailable}
                     >
-                      <span className="min-w-0 flex-1 truncate text-left">
-                        {soundSelection === "off" ? (
-                          "Off"
-                        ) : soundSelection === "soft-pop" ? (
-                          <>
-                            Whoosh <span className="text-muted-foreground">(Default)</span>
-                          </>
-                        ) : (
-                          "Click"
-                        )}
-                      </span>
-                      <ChevronDownIcon className="-me-1 size-3 shrink-0 opacity-50" />
+                      {soundSelection === "off" ? (
+                        "Off"
+                      ) : soundSelection === "soft-pop" ? (
+                        <>
+                          Whoosh <span className="text-muted-foreground">(Default)</span>
+                        </>
+                      ) : (
+                        "Click"
+                      )}
                     </MenuTrigger>
                     <MenuPopup align="end">
                       <MenuRadioGroup
@@ -524,16 +517,11 @@ export function SnapShotSettings() {
                           Off
                         </MenuRadioItem>
                         <div className={soundOptionRowClassName}>
-                          <MenuRadioItem
-                            className={soundOptionItemClassName}
-                            closeOnClick
-                            value="soft-pop"
-                          >
+                          <MenuRadioItem closeOnClick value="soft-pop">
                             Whoosh <span className="text-muted-foreground">(Default)</span>
                           </MenuRadioItem>
                           <MenuItem
                             aria-label="Play Whoosh"
-                            className={soundPreviewClassName}
                             closeOnClick={false}
                             onClick={() => playSnapShotSound("soft-pop")}
                           >
@@ -541,16 +529,11 @@ export function SnapShotSettings() {
                           </MenuItem>
                         </div>
                         <div className={soundOptionRowClassName}>
-                          <MenuRadioItem
-                            className={soundOptionItemClassName}
-                            closeOnClick
-                            value="camera-shutter"
-                          >
+                          <MenuRadioItem closeOnClick value="camera-shutter">
                             Click
                           </MenuRadioItem>
                           <MenuItem
                             aria-label="Play Click"
-                            className={soundPreviewClassName}
                             closeOnClick={false}
                             onClick={() => playSnapShotSound("camera-shutter")}
                           >
diff --git a/apps/web/src/components/settings/SnapShotSetupDialog.tsx b/apps/web/src/components/settings/SnapShotSetupDialog.tsx
index f0adbcc40cf1..c6003adc740f 100644
--- a/apps/web/src/components/settings/SnapShotSetupDialog.tsx
+++ b/apps/web/src/components/settings/SnapShotSetupDialog.tsx
@@ -5,7 +5,8 @@ import {
   type DesktopSnapShotSetupAction,
   type DesktopSnapShotState,
 } from "@t3tools/contracts";
-import { useId, useState, type ReactNode } from "react";
+import { useState, type ReactNode } from "react";
+import { MacAccessibilityIcon, MacScreenRecordingIcon } from "../Icons";
 import { CaptureShortcutConfig } from "./CaptureShortcutConfig";
 import { Button } from "../ui/button";
 import { Dialog, DialogDescription } from "../ui/dialog";
@@ -61,72 +62,6 @@ const GNOME_ACCESS_COPY = {
   },
 };
 
-function ScreenRecordingIcon() {
-  const gradientId = useId();
-  return (
-    <svg
-      viewBox="0 0 32 32"
-      className="size-8 shrink-0 drop-shadow-[0_1px_1px_#0005]"
-      aria-hidden="true"
-    >
-      <defs>
-        <linearGradient id={gradientId} x2="0" y2="1">
-          <stop stopColor="#ff6972" />
-          <stop offset="1" stopColor="#ff2938" />
-        </linearGradient>
-      </defs>
-      <rect
-        x="0.5"
-        y="0.5"
-        width="31"
-        height="31"
-        rx="7"
-        fill={`url(#${gradientId})`}
-        stroke="#ffffff40"
-      />
-      <circle cx="16" cy="16" r="10" fill="none" stroke="#fff" strokeWidth="2" />
-      <circle cx="16" cy="16" r="4.5" fill="#fff" />
-    </svg>
-  );
-}
-
-function AccessibilityPermissionIcon() {
-  const gradientId = useId();
-  return (
-    <svg
-      viewBox="0 0 32 32"
-      className="size-8 shrink-0 drop-shadow-[0_1px_1px_#0005]"
-      aria-hidden="true"
-    >
-      <defs>
-        <linearGradient id={gradientId} x2="0" y2="1">
-          <stop stopColor="#48b6ff" />
-          <stop offset="1" stopColor="#0085ff" />
-        </linearGradient>
-      </defs>
-      <rect
-        x="0.5"
-        y="0.5"
-        width="31"
-        height="31"
-        rx="7"
-        fill={`url(#${gradientId})`}
-        stroke="#ffffff40"
-      />
-      <circle cx="16" cy="16" r="10" fill="none" stroke="#fff" strokeWidth="1.75" />
-      <circle cx="16" cy="10" r="1.6" fill="#fff" />
-      <path
-        d="m10 13 6 1 6-1M16 14v4m0 0-2.5 6m2.5-6 2.5 6"
-        fill="none"
-        stroke="#fff"
-        strokeWidth="1.6"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-      />
-    </svg>
-  );
-}
-
 export function SnapShotSetupDialog({
   state,
   initialStep,
@@ -333,7 +268,7 @@ export function SnapShotSetupDialog({
                     permissions={[
                       {
                         id: "screenRecording",
-                        icon: <ScreenRecordingIcon />,
+                        icon: <MacScreenRecordingIcon className="size-8 shrink-0 drop-shadow-sm" />,
                         title: "Screen Recording",
                         description: "Capture the window you're using.",
                         granted: macPermissions.screenRecording,
@@ -341,7 +276,7 @@ export function SnapShotSetupDialog({
                       },
                       {
                         id: "accessibility",
-                        icon: <AccessibilityPermissionIcon />,
+                        icon: <MacAccessibilityIcon className="size-8 shrink-0 drop-shadow-sm" />,
                         title: "Accessibility",
                         description: includeAccessibility
                           ? "Include text and controls from the captured app."
diff --git a/apps/web/src/components/settings/SourceControlSettings.tsx b/apps/web/src/components/settings/SourceControlSettings.tsx
index d7d8be98cc66..9fba0edc7d44 100644
--- a/apps/web/src/components/settings/SourceControlSettings.tsx
+++ b/apps/web/src/components/settings/SourceControlSettings.tsx
@@ -56,6 +56,7 @@ import {
   JujutsuIcon,
   type Icon,
 } from "../Icons";
+import { BitbucketCredentialsSettings } from "./BitbucketCredentialsSettings";
 import { RedactedSensitiveText } from "./RedactedSensitiveText";
 import { SourceControlWritingSettingsSection } from "./SourceControlWritingSettings";
 import {
@@ -234,7 +235,9 @@ function itemSummary({
       );
     }
 
-    if (!item.executable) {
+    // API integrations have no CLI to sign in with; an unverified saved credential falls
+    // through to the "could not verify" detail instead of repeating the setup hint.
+    if (!item.executable && auth.status === "unauthenticated") {
       return <span>Available. {item.installHint}</span>;
     }
 
@@ -242,8 +245,8 @@ function itemSummary({
       return (
         <span>
           {item.label} is not authenticated on this server. Sign in or configure credentials using
-          the <code className="rounded bg-muted px-1 py-px text-[11px]">{item.executable}</code>{" "}
-          tool on the server host to enable change request features.
+          the <code className="rounded bg-muted px-1 py-px text-2xs">{item.executable}</code> tool
+          on the server host to enable change request features.
         </span>
       );
     }
@@ -277,7 +280,11 @@ function DiscoveryItemRow({
   const searchTargetId = useSettingsSearchTargetId();
 
   useEffect(() => {
-    if (item.kind === "git" && searchTargetId === searchableSetting("git-fetch-interval").id) {
+    if (
+      (item.kind === "git" && searchTargetId === searchableSetting("git-fetch-interval").id) ||
+      (item.kind === "bitbucket" &&
+        searchTargetId === searchableSetting("bitbucket-credentials").id)
+    ) {
       setIsExpanded(true);
     }
   }, [item.kind, searchTargetId]);
@@ -294,9 +301,7 @@ function DiscoveryItemRow({
           <div className="min-w-0 flex-1 space-y-1">
             <div className="flex min-w-0 flex-wrap items-center gap-2">
               <SourceControlItemMark item={item} />
-              <span className="truncate text-sm font-medium tracking-[-0.005em] text-foreground">
-                {item.label}
-              </span>
+              <span className="truncate text-sm font-medium text-foreground">{item.label}</span>
               {version ? <code className="text-xs text-muted-foreground">{version}</code> : null}
               {isVcsNotReady(item) ? (
                 <Badge variant="warning" size="sm">
@@ -309,7 +314,7 @@ function DiscoveryItemRow({
                 </Badge>
               ) : null}
             </div>
-            <p className="flex min-w-0 flex-wrap items-center gap-x-1 text-[13px] leading-[1.45] text-muted-foreground/80">
+            <p className="flex min-w-0 flex-wrap items-center gap-x-1 text-xs leading-normal text-muted-foreground/80">
               {itemSummary({ item, auth, authAccount })}
             </p>
           </div>
@@ -440,20 +445,21 @@ function SourceControlSectionSkeleton({
             <div className="min-w-0 flex-1 space-y-2">
               <div className="flex items-center gap-2">
                 <span className="relative inline-flex size-5 shrink-0 items-center justify-center">
-                  <Skeleton className="size-4.5 rounded-md" />
+                  <Skeleton className="size-4.5" />
                   <Skeleton
-                    className="pointer-events-none absolute -left-0.5 -top-0.5 size-2 rounded-full ring-2 ring-background"
+                    shape="pill"
+                    className="pointer-events-none absolute -left-0.5 -top-0.5 size-2"
                     aria-hidden
                   />
                 </span>
-                <Skeleton className="h-4 w-28 rounded-full" />
-                <Skeleton className="h-5 w-14 rounded-full" />
+                <Skeleton shape="pill" className="h-4 w-28" />
+                <Skeleton shape="pill" className="h-5 w-14" />
               </div>
-              <Skeleton className="h-3 w-full max-w-xs rounded-full" />
+              <Skeleton shape="pill" className="h-3 w-full max-w-xs" />
             </div>
             <div className="flex shrink-0 items-center gap-2">
-              <Skeleton className="size-7 rounded-md" />
-              <Skeleton className="h-5 w-9 rounded-full" />
+              <Skeleton className="size-7" />
+              <Skeleton shape="pill" className="h-5 w-9" />
             </div>
           </div>
         </div>
@@ -475,7 +481,7 @@ function EmptySourceControlDiscovery({
 
   return (
     <SettingsSection id={searchableSetting("source-control").id} title="Server environment">
-      <Empty className="min-h-88">
+      <Empty>
         <EmptyMedia variant="icon">
           <PullRequestGlyph.pullRequest />
         </EmptyMedia>
@@ -587,7 +593,18 @@ export function SourceControlSettingsPanel() {
               headerAction={hasVersionControlSystems ? null : scanButton}
             >
               {result.sourceControlProviders.map((item) => (
-                <DiscoveryItemRow key={`provider:${item.kind}`} item={item} />
+                <DiscoveryItemRow key={`provider:${item.kind}`} item={item}>
+                  {item.kind === "bitbucket" ? (
+                    <SettingsSearchTarget id={searchableSetting("bitbucket-credentials").id}>
+                      <BitbucketCredentialsSettings
+                        // Drafts belong to one environment; switching must not carry them over.
+                        key={environmentId}
+                        environmentId={environmentId}
+                        onSaved={handleScan}
+                      />
+                    </SettingsSearchTarget>
+                  ) : undefined}
+                </DiscoveryItemRow>
               ))}
             </SettingsSection>
           ) : null}
diff --git a/apps/web/src/components/settings/SourceControlWritingSettings.tsx b/apps/web/src/components/settings/SourceControlWritingSettings.tsx
index a4d4e1f950c3..362e6032267d 100644
--- a/apps/web/src/components/settings/SourceControlWritingSettings.tsx
+++ b/apps/web/src/components/settings/SourceControlWritingSettings.tsx
@@ -304,7 +304,6 @@ export function SourceControlWritingSettingsSection() {
                   lockedProvider={null}
                   instanceEntries={instanceEntries}
                   modelOptionsByInstance={modelOptionsByInstance}
-                  triggerVariant="outline"
                   triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
                   triggerAriaLabel="Source control writer model"
                   {...(mixedWriterModel ? { triggerLabel: "Mixed" } : {})}
diff --git a/apps/web/src/components/settings/StorageSettings.tsx b/apps/web/src/components/settings/StorageSettings.tsx
index f5aee54ccea5..360979eead7a 100644
--- a/apps/web/src/components/settings/StorageSettings.tsx
+++ b/apps/web/src/components/settings/StorageSettings.tsx
@@ -62,7 +62,7 @@ function RetentionControl({
             <NumberFieldInput
               aria-label={`${label} in days`}
               size={new Intl.NumberFormat().format(draft ?? value).length}
-              className="field-sizing-content w-auto min-w-[1ch] grow-0 text-right in-data-[size=sm]:px-1"
+              className="field-sizing-content w-auto min-w-[1ch] grow-0 text-right"
             />
             <span aria-hidden="true" className="self-center pr-2 text-xs">
               days
diff --git a/apps/web/src/components/settings/ThemeColorPicker.tsx b/apps/web/src/components/settings/ThemeColorPicker.tsx
index 7ddb89fa89aa..30f1752f6cbf 100644
--- a/apps/web/src/components/settings/ThemeColorPicker.tsx
+++ b/apps/web/src/components/settings/ThemeColorPicker.tsx
@@ -171,7 +171,7 @@ function ThemeColorPickerPanel({
       <div className="flex items-center justify-between border-b border-border/70 px-4 py-3">
         <div className="min-w-0">
           <p className="truncate text-xs font-semibold text-foreground">{label}</p>
-          <p className="text-[11px] text-muted-foreground">Choose a color</p>
+          <p className="text-2xs text-muted-foreground">Choose a color</p>
         </div>
         <span
           className="size-7 shrink-0 rounded-full shadow-sm"
@@ -193,7 +193,7 @@ function ThemeColorPickerPanel({
         />
         <div className="grid grid-cols-[1fr_1.2fr] gap-2">
           <label className="grid min-w-0 gap-1">
-            <span className="px-1 text-[10px] font-semibold uppercase tracking-[0.08em] text-muted-foreground">
+            <span className="px-1 text-3xs font-semibold uppercase tracking-widest text-muted-foreground">
               HEX
             </span>
             <span className="flex min-w-0 items-center gap-2 rounded-lg border border-input bg-background px-2 focus-within:border-ring">
@@ -219,7 +219,7 @@ function ThemeColorPickerPanel({
             </span>
           </label>
           <label className="grid min-w-0 gap-1">
-            <span className="px-1 text-[10px] font-semibold uppercase tracking-[0.08em] text-muted-foreground">
+            <span className="px-1 text-3xs font-semibold uppercase tracking-widest text-muted-foreground">
               RGB
             </span>
             <span className="flex min-w-0 items-center rounded-lg border border-input bg-background px-2 focus-within:border-ring">
@@ -284,7 +284,7 @@ function ThemeColorPicker({
       </Tooltip>
       <PopoverPopup
         align="end"
-        className="overflow-hidden rounded-2xl border border-border/70 p-0 shadow-2xl [--viewport-inline-padding:0px] [&_[data-slot=popover-viewport]]:p-0"
+        padding="none"
         data-theme-editor-panel=""
         side="bottom"
         sideOffset={10}
@@ -323,7 +323,7 @@ export const ThemeColorField = memo(function ThemeColorField({
     <div
       className={cn(
         "flex min-h-11 min-w-0 items-center gap-2 rounded-lg px-2 py-1.5 transition-[background-color,box-shadow]",
-        selected && "bg-accent/60 shadow-[inset_0_0_0_1px_var(--ring)]",
+        selected && "bg-accent/60 inset-ring inset-ring-ring",
       )}
       data-theme-color-role={role}
     >
@@ -353,14 +353,14 @@ export const ThemeColorField = memo(function ThemeColorField({
         <Input
           aria-invalid={!isColorValue}
           aria-label={`${label} hex value`}
-          className="w-28 shrink-0 rounded-md border-0 bg-black/10 font-mono text-xs text-foreground shadow-none focus-within:bg-black/15 focus-within:ring-0 dark:bg-black/20 dark:focus-within:bg-black/25 [&_[data-slot=input]]:text-right"
+          className="w-28 shrink-0"
+          font="mono"
           id={`${role}-hex`}
           nativeInput
           onChange={(event) => onChange(role, event.currentTarget.value)}
           onFocus={() => onSelect?.(role)}
           onPointerDown={() => onSelect?.(role)}
-          size="sm"
-          unstyled
+          size="compact"
           value={editorValue}
         />
       </div>
diff --git a/apps/web/src/components/settings/ThemeEditorPanel.tsx b/apps/web/src/components/settings/ThemeEditorPanel.tsx
index 02d1dad458f1..339fc4b0c72b 100644
--- a/apps/web/src/components/settings/ThemeEditorPanel.tsx
+++ b/apps/web/src/components/settings/ThemeEditorPanel.tsx
@@ -947,11 +947,7 @@ export function ThemeEditorPanel({
     // A locked mode stays hoverable so the tooltip can say why it is off;
     // a real disabled attribute would swallow the pointer events.
     const button = (
-      <Toggle
-        aria-disabled={lockReason !== null}
-        value={appearance}
-        className={lockReason !== null ? "opacity-50" : undefined}
-      >
+      <Toggle aria-disabled={lockReason !== null} value={appearance}>
         {appearance === "light" ? "Light" : "Dark"}
       </Toggle>
     );
diff --git a/apps/web/src/components/settings/ThemeImportDialog.tsx b/apps/web/src/components/settings/ThemeImportDialog.tsx
index 891294960028..a4e221327d09 100644
--- a/apps/web/src/components/settings/ThemeImportDialog.tsx
+++ b/apps/web/src/components/settings/ThemeImportDialog.tsx
@@ -111,12 +111,12 @@ function ThemeJsonEditor({
   }, []);
 
   return (
-    <div className="relative overflow-hidden rounded-xl border border-input bg-background shadow-xs/5 focus-within:border-ring focus-within:ring-[3px] focus-within:ring-ring/24">
+    <div className="relative overflow-hidden rounded-xl border border-input bg-background shadow-xs/5 focus-within:border-ring focus-within:ring-3 focus-within:ring-ring/24">
       {isPlainText ? null : (
         <pre
           ref={highlightRef}
           aria-hidden
-          className="pointer-events-none absolute inset-0 m-0 overflow-hidden whitespace-pre-wrap break-words p-3 font-mono text-[12px] leading-5 text-foreground"
+          className="pointer-events-none absolute inset-0 m-0 overflow-hidden whitespace-pre-wrap break-words p-3 font-mono text-xs leading-5 text-foreground"
         >
           <code dangerouslySetInnerHTML={{ __html: highlightedJson }} />
         </pre>
@@ -124,7 +124,7 @@ function ThemeJsonEditor({
       <textarea
         aria-label="Theme JSON"
         className={cn(
-          "relative z-10 block min-h-44 w-full resize-y overflow-auto bg-transparent p-3 font-mono text-[12px] leading-5 caret-foreground outline-none placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground",
+          "relative z-10 block min-h-44 w-full resize-y overflow-auto bg-transparent p-3 font-mono text-xs leading-5 caret-foreground outline-none placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground",
           isPlainText ? "text-foreground" : "text-transparent",
         )}
         id={id}
@@ -427,7 +427,7 @@ export function ThemeImportDialog({
         <DialogHeader>
           <DialogTitle>Add a theme</DialogTitle>
         </DialogHeader>
-        <DialogPanel className="space-y-5">
+        <DialogPanel>
           <ThemeSearchSection
             onInstalled={(themes, context) => {
               onImportedMany(themes, context);
@@ -438,7 +438,7 @@ export function ThemeImportDialog({
 
           <div className="flex items-center gap-3" aria-hidden>
             <div className="h-px flex-1 bg-border" />
-            <span className="text-muted-foreground text-[11px] uppercase tracking-wider">
+            <span className="text-muted-foreground text-2xs uppercase tracking-wider">
               or import a file
             </span>
             <div className="h-px flex-1 bg-border" />
diff --git a/apps/web/src/components/settings/ThemeSettings.tsx b/apps/web/src/components/settings/ThemeSettings.tsx
index 6403555c4840..b0e474ad475b 100644
--- a/apps/web/src/components/settings/ThemeSettings.tsx
+++ b/apps/web/src/components/settings/ThemeSettings.tsx
@@ -231,12 +231,12 @@ function ThemeLibraryCard({
                           </button>
                         </ThemeVariantTooltip>
                         <span
-                          className="pointer-events-none absolute bottom-0 left-1/2 inline-flex max-w-24 -translate-x-1/2 items-center gap-1 text-[11px] font-medium text-foreground"
+                          className="pointer-events-none absolute bottom-0 left-1/2 inline-flex max-w-24 -translate-x-1/2 items-center gap-1 text-2xs font-medium text-foreground"
                           style={{ marginLeft: rootOffsetX }}
                         >
                           <span className="truncate">{selected.option.label}</span>
                           {options.length > 1 ? (
-                            <span className="shrink-0 rounded-full bg-muted px-1 text-[9px] text-muted-foreground">
+                            <span className="shrink-0 rounded-full bg-muted px-1 text-3xs text-muted-foreground">
                               +{options.length - 1}
                             </span>
                           ) : null}
@@ -256,7 +256,7 @@ function ThemeLibraryCard({
                                     aria-label={`Use ${option.label} for ${mode} mode${optionIsActive ? ", currently active" : ""}`}
                                     aria-pressed={optionIsActive}
                                     className={cn(
-                                      "absolute left-1/2 top-1 z-30 flex size-7 items-center justify-center rounded-full bg-background shadow-sm outline-none transition-[transform,opacity] duration-200 ease-out motion-reduce:transition-none focus-visible:ring-2 focus-visible:ring-ring",
+                                      "absolute left-1/2 top-1 z-30 flex size-7 items-center justify-center rounded-full bg-background shadow-sm outline-none transition-[opacity,transform] duration-200 ease-out motion-reduce:transition-none focus-visible:ring-2 focus-visible:ring-ring",
                                       optionIsActive ? "ring-2 ring-ring" : "ring-1 ring-border/70",
                                     )}
                                     style={{
@@ -387,8 +387,7 @@ function ThemeLibraryCard({
                                 : `Remove ${theme.label}`
                             }
                             size="icon-xs"
-                            variant="ghost"
-                            className="text-muted-foreground hover:text-destructive"
+                            variant="ghost-destructive"
                             onClick={(event) => {
                               event.stopPropagation();
                               onRemove();
@@ -885,12 +884,12 @@ export function ThemeLibrary({
 
   return (
     <div className="space-y-3">
-      <h3 className="px-3 text-sm font-normal tracking-[-0.005em] text-foreground/70 sm:px-4">
+      <h3 className="px-3 text-sm font-normal text-foreground/70 sm:px-4">
         {searchableSetting("color-scheme").title}
       </h3>
       {renderModeTiles()}
       <div className="flex min-h-8 flex-wrap items-center justify-between gap-3 px-3 pt-2 sm:px-4">
-        <h3 className="text-sm font-normal tracking-[-0.005em] text-foreground/70">
+        <h3 className="text-sm font-normal text-foreground/70">
           {searchableSetting("theme").title}
         </h3>
         <div className="flex flex-wrap items-center justify-end gap-2">
diff --git a/apps/web/src/components/settings/ThemeWireframe.tsx b/apps/web/src/components/settings/ThemeWireframe.tsx
index 895d8d1eecb7..6f403ed4301a 100644
--- a/apps/web/src/components/settings/ThemeWireframe.tsx
+++ b/apps/web/src/components/settings/ThemeWireframe.tsx
@@ -66,7 +66,7 @@ function ThemeWireframePane({
 
       {/* Composer */}
       <span
-        className="absolute bottom-[8%] left-[26%] right-[6%] flex h-[15%] items-center justify-between rounded-md px-[2.5%]"
+        className="absolute bottom-[8%] left-[26%] right-[6%] flex h-[15%] items-center justify-between rounded-md px-1"
         style={{
           backgroundColor: colors.surface,
           boxShadow: `inset 0 0 0 1px ${line}`,
@@ -92,7 +92,7 @@ function ThemeWireframePane({
       >
         {[0, 1, 2].map((row) => (
           <span
-            className="absolute left-[11%] right-[11%] flex items-center gap-[5%]"
+            className="absolute left-[11%] right-[11%] flex items-center gap-1"
             key={row}
             style={{ top: `${10 + row * 30}%`, height: "20%" }}
           >
diff --git a/apps/web/src/components/settings/UsageProviderSettings.tsx b/apps/web/src/components/settings/UsageProviderSettings.tsx
index cf2887f39684..46ed099b166e 100644
--- a/apps/web/src/components/settings/UsageProviderSettings.tsx
+++ b/apps/web/src/components/settings/UsageProviderSettings.tsx
@@ -1,8 +1,11 @@
 import type { EnvironmentId, UnifiedSettings } from "@t3tools/contracts";
+import { useAtomValue } from "@effect/atom-react";
 import { PlusIcon } from "lucide-react";
 import { useState } from "react";
 
 import { useUpdateEnvironmentSettings } from "../../hooks/useSettings";
+import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
 import {
   AlertDialog,
   AlertDialogClose,
@@ -13,6 +16,7 @@ import {
   AlertDialogTitle,
 } from "../ui/alert-dialog";
 import { Button } from "../ui/button";
+import { Switch } from "../ui/switch";
 import { AddUsageLimitSourceDialog } from "./AddUsageLimitSourceDialog";
 import { searchableSetting } from "./settingsSearch";
 import { SettingsRow, SettingsSection } from "./settingsLayout";
@@ -22,17 +26,43 @@ export function UsageProviderSettings({
   environmentId,
   environmentLabel,
   sources,
+  cursorKeychainUsageEnabled,
   readOnly,
 }: {
   readonly environmentId: EnvironmentId;
   readonly environmentLabel: string;
   readonly sources: UnifiedSettings["usageLimitSources"];
+  readonly cursorKeychainUsageEnabled: boolean;
   readonly readOnly: boolean;
 }) {
   const updateSettings = useUpdateEnvironmentSettings(environmentId);
+  const updateCursorSettings = useAtomCommand(serverEnvironment.updateSettings, {
+    label: "update Cursor account usage",
+  });
+  const refreshProviders = useAtomCommand(serverEnvironment.refreshProviders, {
+    reportFailure: false,
+  });
+  const platform = useAtomValue(serverEnvironment.configValueAtom(environmentId))?.environment
+    .platform;
   const [adding, setAdding] = useState(false);
+  const [updatingCursor, setUpdatingCursor] = useState(false);
   const entries = Object.entries(sources);
 
+  const setCursorUsageEnabled = async (enabled: boolean) => {
+    setUpdatingCursor(true);
+    try {
+      const result = await updateCursorSettings({
+        environmentId,
+        input: { patch: { cursorKeychainUsageEnabled: enabled } },
+      });
+      if (result._tag === "Success") {
+        await refreshProviders({ environmentId, input: {} });
+      }
+    } finally {
+      setUpdatingCursor(false);
+    }
+  };
+
   return (
     <>
       <SettingsSection
@@ -46,8 +76,23 @@ export function UsageProviderSettings({
           ) : null
         }
       >
+        {platform?.os === "darwin" ? (
+          <SettingsRow
+            id="cursor-keychain-usage"
+            title="Cursor account usage"
+            description="Read your existing Cursor CLI login from macOS Keychain to show account history and monthly limits. macOS may ask you to allow access."
+            control={
+              <Switch
+                aria-label="Cursor account usage"
+                checked={cursorKeychainUsageEnabled}
+                disabled={readOnly || updatingCursor}
+                onCheckedChange={(enabled) => void setCursorUsageEnabled(enabled)}
+              />
+            }
+          />
+        ) : null}
         {entries.length === 0 ? (
-          <SettingsRow title="No usage providers configured." />
+          <SettingsRow title="No hubs configured." />
         ) : (
           entries.map(([id, source]) => {
             const label = source.label?.trim() || source.url;
diff --git a/apps/web/src/components/settings/providerStatus.test.ts b/apps/web/src/components/settings/providerStatus.test.ts
index 46dc7e262512..5e2a93f48ca9 100644
--- a/apps/web/src/components/settings/providerStatus.test.ts
+++ b/apps/web/src/components/settings/providerStatus.test.ts
@@ -1,7 +1,7 @@
 import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
-import { getProviderSummary } from "./providerStatus";
+import { getProviderSummary, getProviderVersionAdvisoryPresentation } from "./providerStatus";
 
 const provider: ServerProvider = {
   instanceId: ProviderInstanceId.make("codex"),
@@ -69,3 +69,73 @@ describe("getProviderSummary", () => {
     expect(getProviderSummary({ ...provider, status: "disabled" }).headline).toBe("Disabled");
   });
 });
+
+it("does not suggest copying a command that installs an incompatible latest version", () => {
+  const advisory = {
+    status: "behind_latest" as const,
+    currentVersion: "1.0.0",
+    latestVersion: "2.0.0",
+    updateCommand: "npm install -g fixture@latest",
+    canUpdate: true,
+    checkedAt: provider.checkedAt,
+    message: null,
+  };
+  const compatibility = {
+    status: "supported" as const,
+    latestVersionStatus: "broken" as const,
+    message: null,
+    recommendedRange: null,
+    recommendedVersion: null,
+  };
+  expect(getProviderVersionAdvisoryPresentation(advisory, compatibility)).toBeNull();
+  expect(
+    getProviderVersionAdvisoryPresentation(advisory, { ...compatibility, status: "broken" }, false),
+  ).toBeNull();
+  expect(
+    getProviderVersionAdvisoryPresentation(advisory, {
+      ...compatibility,
+      latestVersionStatus: "supported",
+    }),
+  ).not.toBeNull();
+});
+
+it("shows compatibility in the version popover even when the installed version is current", () => {
+  const advisory = {
+    status: "current" as const,
+    currentVersion: "2.0.0",
+    latestVersion: "2.0.0",
+    updateCommand: "npm install -g fixture@latest",
+    canUpdate: true,
+    checkedAt: provider.checkedAt,
+    message: null,
+  };
+  const compatibility = {
+    status: "broken" as const,
+    latestVersionStatus: "broken" as const,
+    message: "This version drops turns. Use 1.9.0.",
+    recommendedRange: null,
+    recommendedVersion: "1.9.0",
+  };
+  expect(getProviderVersionAdvisoryPresentation(advisory, compatibility)).toEqual({
+    title: "Known broken version",
+    detail: compatibility.message,
+    updateCommand: null,
+    emphasis: "strong",
+    targetVersion: "1.9.0",
+  });
+  expect(
+    getProviderVersionAdvisoryPresentation(undefined, {
+      ...compatibility,
+      status: "graceful",
+      recommendedVersion: null,
+      recommendedRange: ">=2.1.0",
+      message: null,
+    }),
+  ).toEqual({
+    title: "Limited support",
+    detail: "Use >=2.1.0 for full support.",
+    updateCommand: null,
+    emphasis: "normal",
+    targetVersion: null,
+  });
+});
diff --git a/apps/web/src/components/settings/providerStatus.ts b/apps/web/src/components/settings/providerStatus.ts
index 853aa4afb195..c399d1e546af 100644
--- a/apps/web/src/components/settings/providerStatus.ts
+++ b/apps/web/src/components/settings/providerStatus.ts
@@ -1,4 +1,8 @@
-import type { ServerProvider, ServerProviderVersionAdvisory } from "@t3tools/contracts";
+import type {
+  ServerProvider,
+  ServerProviderVersionAdvisory,
+  ServerProviderCompatibilityAdvisory,
+} from "@t3tools/contracts";
 
 /**
  * Visual treatment for each server-reported provider status. Centralized so
@@ -99,14 +103,53 @@ export function getProviderVersionLabel(version: string | null | undefined) {
   return /^\d/.test(version) ? `v${version}` : version;
 }
 
+const COMPATIBILITY_TITLES = {
+  graceful: "Limited support",
+  unsupported: "Unsupported version",
+  broken: "Known broken version",
+} as const;
+
+/** Compatibility guidance shares the version popover, with safe install actions. */
 export function getProviderVersionAdvisoryPresentation(
   advisory: ServerProviderVersionAdvisory | undefined,
+  compatibility?: ServerProviderCompatibilityAdvisory | undefined,
+  showCompatibility = true,
 ): {
+  readonly title: string;
   readonly detail: string;
   readonly updateCommand: string | null;
   readonly emphasis: "normal" | "strong";
+  readonly targetVersion: string | null;
 } | null {
-  if (!advisory || advisory.status === "current" || advisory.status === "unknown") {
+  const latestIsIncompatible =
+    compatibility?.latestVersionStatus === "broken" ||
+    compatibility?.latestVersionStatus === "unsupported";
+  if (
+    showCompatibility &&
+    compatibility &&
+    (compatibility.status === "graceful" ||
+      compatibility.status === "unsupported" ||
+      compatibility.status === "broken")
+  ) {
+    const targetVersion = compatibility.recommendedVersion;
+    const recommendation = getProviderVersionLabel(targetVersion) ?? compatibility.recommendedRange;
+    return {
+      title: COMPATIBILITY_TITLES[compatibility.status],
+      detail:
+        compatibility.message ??
+        (recommendation ? `Use ${recommendation} for full support.` : "Update for full support."),
+      updateCommand:
+        targetVersion || latestIsIncompatible ? null : (advisory?.updateCommand ?? null),
+      emphasis: compatibility.status === "graceful" ? "normal" : "strong",
+      targetVersion,
+    };
+  }
+  if (
+    !advisory ||
+    advisory.status === "current" ||
+    advisory.status === "unknown" ||
+    latestIsIncompatible
+  ) {
     return null;
   }
 
@@ -115,6 +158,7 @@ export function getProviderVersionAdvisoryPresentation(
   const versionLabel = getProviderVersionLabel(version);
 
   return {
+    title: label,
     detail:
       advisory.message ??
       (versionLabel
@@ -122,5 +166,6 @@ export function getProviderVersionAdvisoryPresentation(
         : `${label}: install the latest provider version.`),
     updateCommand: advisory.updateCommand,
     emphasis: "normal" as const,
+    targetVersion: null,
   };
 }
diff --git a/apps/web/src/components/settings/settingsLayout.tsx b/apps/web/src/components/settings/settingsLayout.tsx
index 6691b93a7242..0794553cb8fb 100644
--- a/apps/web/src/components/settings/settingsLayout.tsx
+++ b/apps/web/src/components/settings/settingsLayout.tsx
@@ -23,6 +23,7 @@ import { WorkspacePageContainer, type WorkspacePageWidth } from "../WorkspacePag
 import { Button } from "../ui/button";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { useOptionalSettingsScope } from "./SettingsScopeContext";
+import { SettingsScopeSentence } from "./SettingsScopeSentence";
 import {
   isProjectScopedSettingKey,
   listProjectOverrides,
@@ -136,13 +137,8 @@ export function SettingsSearchTarget({
   );
 }
 
-/**
- * Trigger classes for the composer model/traits pickers when they sit in a
- * settings row: match the `sm` control box (the composer pins them to 28px at
- * every breakpoint) and drop the composer's max-width.
- */
-export const SETTINGS_PICKER_TRIGGER_CLASSNAME =
-  "h-8 min-h-8 min-w-0 max-w-none shrink-0 text-foreground/90 hover:text-foreground sm:h-7 sm:min-h-7";
+/** Layout for the composer model/traits pickers in a settings row: drop the composer's max-width. */
+export const SETTINGS_PICKER_TRIGGER_CLASSNAME = "min-w-0 max-w-none shrink-0";
 
 /** Info affordance explaining how a setting interacts with the shared background policy. */
 export function PolicyTooltip({ children }: { readonly children: string }) {
@@ -156,9 +152,7 @@ export function PolicyTooltip({ children }: { readonly children: string }) {
           </Button>
         }
       />
-      <TooltipPopup side="top" className="max-w-72">
-        {children}
-      </TooltipPopup>
+      <TooltipPopup side="top">{children}</TooltipPopup>
     </Tooltip>
   );
 }
@@ -208,7 +202,7 @@ export function SettingsSection({
           className="flex min-h-7 items-start justify-between gap-4 px-3 sm:px-4"
         >
           <div className="min-w-0">
-            <h2 className="flex min-h-7 items-center gap-2 text-sm font-normal tracking-[-0.005em] text-foreground/70">
+            <h2 className="flex min-h-7 items-center gap-2 text-sm font-normal text-foreground/70">
               {icon}
               {title}
             </h2>
@@ -234,7 +228,7 @@ export function SettingsUnavailableGroup({
 
   return (
     <div className="border-border/60 bg-muted/20 py-1.5">
-      <div className="flex items-start gap-2 px-3 py-2 text-[12px] leading-relaxed text-muted-foreground sm:px-4">
+      <div className="flex items-start gap-2 px-3 py-2 text-xs leading-relaxed text-muted-foreground sm:px-4">
         <InfoIcon className="mt-0.5 size-3.5 shrink-0 text-warning" />
         <p>{message}</p>
       </div>
@@ -372,9 +366,7 @@ export function SettingsRow({
           {control}
         </div>
       </TooltipTrigger>
-      <TooltipPopup side="top" className="max-w-72">
-        {message}
-      </TooltipPopup>
+      <TooltipPopup side="top">{message}</TooltipPopup>
     </Tooltip>
   );
   // A mixed selection keeps the real control with "Mixed" as its placeholder
@@ -435,7 +427,7 @@ export function SettingsRow({
       tabIndex={rowProps.id ? -1 : rowProps.tabIndex}
       data-slot="settings-row"
       className={cn(
-        "@container/settings-row rounded-xl px-3 sm:px-4 aria-disabled:opacity-50 aria-disabled:[&_*]:text-muted-foreground",
+        "@container/settings-row rounded-xl px-3 sm:px-4 aria-disabled:opacity-64 aria-disabled:[&_*]:text-muted-foreground",
         children ? "pt-3 pb-1" : "py-3",
         className,
       )}
@@ -443,7 +435,7 @@ export function SettingsRow({
       <div className="flex flex-col gap-3 @min-[32rem]/settings-row:grid @min-[32rem]/settings-row:grid-cols-[minmax(0,1fr)_minmax(10rem,auto)] @min-[32rem]/settings-row:items-center @min-[32rem]/settings-row:gap-8">
         <div className="min-w-0 flex-1 space-y-1">
           <div className="flex min-h-5 items-center gap-1.5">
-            <h3 className="text-sm font-medium tracking-[-0.005em] text-foreground">{title}</h3>
+            <h3 className="text-sm font-medium text-foreground">{title}</h3>
             {renderedInheritance ? (
               <span className="inline-flex h-5 w-5 shrink-0 items-center justify-center">
                 {renderedInheritance}
@@ -454,7 +446,7 @@ export function SettingsRow({
             </span>
           </div>
           {description ? (
-            <p className="max-w-xl text-[13px] leading-[1.45] text-muted-foreground/80">
+            <p className="max-w-xl text-xs leading-normal text-muted-foreground/80">
               {description}
             </p>
           ) : null}
@@ -549,6 +541,7 @@ export function SettingsPageContainer({
         data-settings-page-scroll
       >
         <WorkspacePageContainer width={width} className={cn("gap-8", className)}>
+          <SettingsScopeSentence />
           {children}
         </WorkspacePageContainer>
       </div>
diff --git a/apps/web/src/components/settings/settingsScopeAxis.ts b/apps/web/src/components/settings/settingsScopeAxis.ts
index 166a31a40c05..0c0915c54c88 100644
--- a/apps/web/src/components/settings/settingsScopeAxis.ts
+++ b/apps/web/src/components/settings/settingsScopeAxis.ts
@@ -1,5 +1,5 @@
 import type { EnvironmentPresentation } from "../../state/environments";
-import type { SettingsScopeSearch } from "./settingsScope";
+import type { ResolvedSettingsScope, SettingsScopeSearch } from "./settingsScope";
 
 type ScopeEnvironment = Pick<EnvironmentPresentation, "environmentId" | "label" | "displayUrl">;
 
@@ -53,3 +53,25 @@ export function selectProjectAxis(search: SettingsScopeSearch, value: string): S
   if (search.machine) next.machine = search.machine;
   return next;
 }
+
+/** Provider configuration always belongs to one environment, including project scopes. */
+export function selectSingleEnvironmentScope(
+  search: SettingsScopeSearch,
+  scope: ResolvedSettingsScope,
+  environments: readonly {
+    readonly environmentId: EnvironmentPresentation["environmentId"];
+    readonly connection: Pick<EnvironmentPresentation["connection"], "phase">;
+  }[],
+  primaryEnvironmentId: string | null,
+): SettingsScopeSearch {
+  if (search.machine || scope.kind === "unavailable") return search;
+  const selectedIds = new Set(scope.environmentIds);
+  const candidates = environments.filter((environment) =>
+    selectedIds.has(environment.environmentId),
+  );
+  const selected =
+    candidates.find((environment) => environment.environmentId === primaryEnvironmentId) ??
+    candidates.find((environment) => environment.connection.phase === "connected") ??
+    candidates[0];
+  return selected ? { ...search, machine: selected.environmentId } : search;
+}
diff --git a/apps/web/src/components/settings/settingsSearch.test.ts b/apps/web/src/components/settings/settingsSearch.test.ts
index 1819ce2a224a..fbdceb3e6b56 100644
--- a/apps/web/src/components/settings/settingsSearch.test.ts
+++ b/apps/web/src/components/settings/settingsSearch.test.ts
@@ -155,6 +155,7 @@ describe("searchSettings", () => {
       hasCloudPublicConfig: false,
       hasEnvironment: false,
       hasProviderSettingsEnvironment: false,
+      hasMacProviderSettingsEnvironment: false,
       canManageLocalBackend: false,
       isWslSettingsRowVisible: false,
       hasThreadAutoSettlement: false,
@@ -166,6 +167,7 @@ describe("searchSettings", () => {
       "network-access",
       "publish-agent-activity",
       "provider-health-check-interval",
+      "cursor-keychain-usage",
       "source-control-writer-model",
       "source-control-writing-style",
       "t3-connect",
@@ -178,11 +180,31 @@ describe("searchSettings", () => {
     expect(available.map((item) => item.id).filter((id) => gatedIds.has(id))).toEqual([]);
   });
 
+  it("offers Cursor Keychain settings only when a macOS provider environment is available", () => {
+    const availability = {
+      hasCloudPublicConfig: false,
+      hasEnvironment: true,
+      hasProviderSettingsEnvironment: true,
+      hasMacProviderSettingsEnvironment: false,
+      canManageLocalBackend: false,
+      isWslSettingsRowVisible: false,
+      hasThreadAutoSettlement: false,
+    };
+    const itemIds = (macAvailable: boolean) =>
+      filterAvailableSettingsSearchItems({
+        ...availability,
+        hasMacProviderSettingsEnvironment: macAvailable,
+      }).map((item) => item.id);
+    expect(itemIds(false)).not.toContain("cursor-keychain-usage");
+    expect(itemIds(true)).toContain("cursor-keychain-usage");
+  });
+
   it("keeps the local toggle searchable without offering hidden host publishing controls", () => {
     const availability = {
       hasCloudPublicConfig: true,
       hasEnvironment: true,
       hasProviderSettingsEnvironment: true,
+      hasMacProviderSettingsEnvironment: false,
       canManageLocalBackend: false,
       isWslSettingsRowVisible: false,
       hasThreadAutoSettlement: false,
@@ -205,6 +227,7 @@ describe("searchSettings", () => {
       hasCloudPublicConfig: false,
       hasEnvironment: false,
       hasProviderSettingsEnvironment: false,
+      hasMacProviderSettingsEnvironment: false,
       canManageLocalBackend: false,
       isWslSettingsRowVisible: false,
       hasThreadAutoSettlement: true,
@@ -343,6 +366,7 @@ describe("searchSettings", () => {
       hasCloudPublicConfig: false,
       hasEnvironment: true,
       hasProviderSettingsEnvironment: true,
+      hasMacProviderSettingsEnvironment: false,
       canManageLocalBackend: false,
       isWslSettingsRowVisible: false,
       hasThreadAutoSettlement: true,
@@ -437,6 +461,7 @@ describe("auto-settlement search availability", () => {
       hasCloudPublicConfig: false,
       hasEnvironment: true,
       hasProviderSettingsEnvironment: true,
+      hasMacProviderSettingsEnvironment: false,
       canManageLocalBackend: false,
       isWslSettingsRowVisible: false,
       hasThreadAutoSettlement: availability.eligibleEnvironmentIds.length > 0,
diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts
index 0f149050ba90..3fde00889393 100644
--- a/apps/web/src/components/settings/settingsSearch.ts
+++ b/apps/web/src/components/settings/settingsSearch.ts
@@ -56,6 +56,7 @@ export interface SettingsSearchItem {
   readonly cloudOnly?: boolean;
   readonly environmentOnly?: boolean;
   readonly providerSettingsOnly?: boolean;
+  readonly macProviderSettingsOnly?: boolean;
   readonly localBackendManagementOnly?: boolean;
   readonly localEnvironmentOnly?: boolean;
   readonly wslAvailableOnly?: boolean;
@@ -72,6 +73,7 @@ export interface SettingsSearchAvailability {
   readonly hasCloudPublicConfig: boolean;
   readonly hasEnvironment: boolean;
   readonly hasProviderSettingsEnvironment: boolean;
+  readonly hasMacProviderSettingsEnvironment: boolean;
   readonly canManageLocalBackend: boolean;
   readonly isWslSettingsRowVisible: boolean;
   readonly hasThreadAutoSettlement: boolean;
@@ -211,6 +213,12 @@ export const SETTINGS_SEARCH_ITEMS = [
     to: "/settings/appearance",
     searchTerms: ["red green blue orange additions deletions changes counts palette colorblind"],
   },
+  {
+    id: "chat-width",
+    title: "Chat width",
+    to: "/settings/appearance",
+    searchTerms: ["wide full width column layout messages composer monitor"],
+  },
   {
     id: "panel-animations",
     title: "Panel animations",
@@ -548,6 +556,14 @@ export const SETTINGS_SEARCH_ITEMS = [
     ],
     providerSettingsOnly: true,
   },
+  {
+    id: "cursor-keychain-usage",
+    title: "Cursor account usage",
+    to: "/settings/providers",
+    searchTerms: ["cursor macOS keychain usage tokens cost limits permission"],
+    providerSettingsOnly: true,
+    macProviderSettingsOnly: true,
+  },
   {
     id: "provider-health-check-interval",
     title: "Health check interval",
@@ -681,6 +697,14 @@ export const SETTINGS_SEARCH_ITEMS = [
     environmentOnly: true,
     scope: "environment-defaults",
   },
+  {
+    id: "bitbucket-credentials",
+    title: "Bitbucket credentials",
+    to: "/settings/source-control",
+    searchTerms: ["bitbucket atlassian access token api token email credentials sign in"],
+    environmentOnly: true,
+    scope: "environment-defaults",
+  },
   {
     id: "source-control-writing-style",
     title: "Source control writing style",
@@ -952,6 +976,7 @@ export function filterAvailableSettingsSearchItems(
       (!item.cloudOnly || availability.hasCloudPublicConfig) &&
       (!item.environmentOnly || availability.hasEnvironment) &&
       (!item.providerSettingsOnly || availability.hasProviderSettingsEnvironment) &&
+      (!item.macProviderSettingsOnly || availability.hasMacProviderSettingsEnvironment) &&
       (!item.localBackendManagementOnly || availability.canManageLocalBackend) &&
       (!item.localEnvironmentOnly || !availability.localEnvironmentDisabled) &&
       (!item.wslAvailableOnly || availability.isWslSettingsRowVisible) &&
diff --git a/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts b/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts
index a0601e41729f..a5be950b81ab 100644
--- a/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts
+++ b/apps/web/src/components/settings/useAvailableSettingsSearchItems.ts
@@ -10,12 +10,13 @@ import { useEnvironmentQuery } from "~/state/query";
 import { usePrimarySessionState } from "~/environments/primary";
 import { isWslSettingsRowVisible } from "./ConnectionsSettings.logic";
 import { isProviderSettingsEnvironmentAvailable } from "./ProviderSettingsPanel.logic";
+import type { SettingsScopeSearch } from "./settingsScope";
 import {
   filterAvailableSettingsSearchItems,
   getThreadAutoSettlementSearchAvailability,
 } from "./settingsSearch";
 
-export function useAvailableSettingsSearchItems() {
+export function useAvailableSettingsSearchItems(scopeSearch: SettingsScopeSearch = {}) {
   const { environments } = useEnvironments();
   const primarySessionState = usePrimarySessionState();
   const localEnvironmentDisabled = isLocalEnvironmentDisabled();
@@ -41,6 +42,16 @@ export function useAvailableSettingsSearchItems() {
             hasServerConfig: environment.serverConfig !== null,
           }),
         ),
+        hasMacProviderSettingsEnvironment: environments.some(
+          (environment) =>
+            (scopeSearch.machine === undefined ||
+              environment.environmentId === scopeSearch.machine) &&
+            environment.serverConfig?.environment.platform.os === "darwin" &&
+            isProviderSettingsEnvironmentAvailable({
+              connectionPhase: environment.connection.phase,
+              hasServerConfig: true,
+            }),
+        ),
         canManageLocalBackend,
         isWslSettingsRowVisible: isWslSettingsRowVisible({
           state: desktopWsl.data,
@@ -55,6 +66,7 @@ export function useAvailableSettingsSearchItems() {
       desktopWsl.error,
       environments,
       localEnvironmentDisabled,
+      scopeSearch.machine,
     ],
   );
 }
diff --git a/apps/web/src/components/sidebar/DesktopUpdateStatusIcon.tsx b/apps/web/src/components/sidebar/DesktopUpdateStatusIcon.tsx
index 833559e1cc27..04ee884bbf6c 100644
--- a/apps/web/src/components/sidebar/DesktopUpdateStatusIcon.tsx
+++ b/apps/web/src/components/sidebar/DesktopUpdateStatusIcon.tsx
@@ -67,7 +67,7 @@ function DesktopUpdateDownloadingIcon({ percent }: { readonly percent: number |
           cy="16"
           r={DOWNLOAD_PROGRESS_RADIUS}
           fill="none"
-          stroke="color-mix(in srgb, currentColor 22%, transparent)"
+          className="stroke-current/22"
           strokeWidth="1.5"
         />
         <circle
diff --git a/apps/web/src/components/sidebar/SidebarChrome.tsx b/apps/web/src/components/sidebar/SidebarChrome.tsx
index 14fc3c6681a5..1bfdc9a9dbdf 100644
--- a/apps/web/src/components/sidebar/SidebarChrome.tsx
+++ b/apps/web/src/components/sidebar/SidebarChrome.tsx
@@ -1,7 +1,7 @@
 import { ArrowLeftIcon, ChartNoAxesColumnIcon, SettingsIcon } from "lucide-react";
 import type { ReactNode } from "react";
 import { memo, useCallback } from "react";
-import { Link, useCanGoBack, useLocation, useNavigate } from "@tanstack/react-router";
+import { Link, useLocation, useNavigate } from "@tanstack/react-router";
 
 import { APP_BASE_NAME } from "../../branding";
 import { useActiveEnvironmentId } from "../../state/entities";
@@ -14,14 +14,12 @@ import { T3Wordmark } from "../T3Wordmark";
 import {
   resolveEnvironmentIdentificationPillLabel,
   resolveSidebarStageBackdropVariant,
-  resolveSidebarStageFocusRingOffsetClass,
   SidebarStageBackdrop,
   useEnvironmentStageLabel,
 } from "../SidebarStageBackdrop";
 import { Badge } from "../ui/badge";
 import {
   SidebarFooter,
-  SidebarHeader,
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
@@ -30,6 +28,7 @@ import {
 } from "../ui/sidebar";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { readPullRequestListPreferences } from "../pullRequest/pullRequestListPreferences";
+import { isSidebarUtilityPage, useNavigateToMainApp } from "./mainAppLocation";
 import { SidebarThreadUndoNotice } from "./SidebarThreadUndoNotice";
 import { SidebarProviderUpdatePill } from "./SidebarProviderUpdatePill";
 import { resolveSidebarProductLabel } from "./SidebarChrome.logic";
@@ -53,25 +52,23 @@ export const SidebarChromeHeader = memo(function SidebarChromeHeader({
       : null;
 
   return (
-    <SidebarHeader
+    // The titlebar row, not a padded SidebarHeader: it aligns to the window controls.
+    <div
       className={cn(
-        "@container/sidebar-header relative h-[var(--workspace-topbar-height)] shrink-0 flex-row items-center px-3 py-0 md:px-0",
+        "@container/sidebar-header relative flex h-[var(--workspace-topbar-height)] shrink-0 flex-row items-center gap-2 px-3 md:px-0",
         isElectron && "drag-region",
       )}
     >
       {backdropVariant ? <SidebarStageBackdrop variant={backdropVariant} /> : null}
       <SidebarTrigger
-        className={cn(
-          "relative z-10 md:hidden",
-          backdropVariant &&
-            "focus-visible:ring-white/90 [&_svg]:stroke-white/90! [&_svg]:opacity-100! [&_svg]:hover:stroke-white! [:hover,[data-pressed]]:bg-white/15",
-          backdropVariant && resolveSidebarStageFocusRingOffsetClass(backdropVariant),
-        )}
+        // Over the stage artwork: the media viewer's control-on-imagery treatment.
+        variant={backdropVariant ? "media-navigation" : "ghost"}
+        className="relative top-auto z-10 translate-y-0 md:hidden"
       />
       <SidebarBrand onBackdrop={backdropVariant !== null} />
       {pillLabel ? (
         <Badge
-          className="relative z-10 ml-1 hidden rounded-full px-1.5 text-muted-foreground @[15rem]/sidebar-header:inline-flex"
+          className="relative z-10 ml-1 hidden @[15rem]/sidebar-header:inline-flex"
           data-environment-identification="pill"
           size="sm"
           variant="secondary"
@@ -79,7 +76,7 @@ export const SidebarChromeHeader = memo(function SidebarChromeHeader({
           {pillLabel}
         </Badge>
       ) : null}
-    </SidebarHeader>
+    </div>
   );
 });
 
@@ -138,22 +135,13 @@ function SidebarUtilityItem({
 
 export const SidebarUtilityMenu = memo(function SidebarUtilityMenu() {
   const navigate = useNavigate();
-  const canGoBack = useCanGoBack();
+  const navigateToMainApp = useNavigateToMainApp();
   const { isMobile, setOpenMobile } = useSidebar();
   const activeEnvironmentId = useActiveEnvironmentId();
   const primaryEnvironmentId = usePrimaryEnvironmentId();
   const switcherEnvironmentId = activeEnvironmentId ?? primaryEnvironmentId;
-  const currentFooterPage = useLocation({
-    select: (location) =>
-      /^\/settings(?:\/|$)/.test(location.pathname)
-        ? "settings"
-        : /^\/projects\/[^/]+\/?$/.test(location.pathname)
-          ? "project-settings"
-          : location.pathname === "/usage"
-            ? "usage"
-            : location.pathname === "/pull-requests"
-              ? "pull-requests"
-              : null,
+  const isOnUtilityPage = useLocation({
+    select: (location) => isSidebarUtilityPage(location.pathname),
   });
   const { environments } = useEnvironments();
   // The page reads every connected server, so one of them offering pull requests is enough for
@@ -187,12 +175,8 @@ export const SidebarUtilityMenu = memo(function SidebarUtilityMenu() {
 
   const handleBackClick = useCallback(() => {
     closeMobileSidebar();
-    if (canGoBack) {
-      window.history.back();
-      return;
-    }
-    void navigate({ to: "/" });
-  }, [canGoBack, closeMobileSidebar, navigate]);
+    void navigateToMainApp();
+  }, [closeMobileSidebar, navigateToMainApp]);
 
   return (
     <>
@@ -202,7 +186,7 @@ export const SidebarUtilityMenu = memo(function SidebarUtilityMenu() {
         </div>
       ) : null}
       <SidebarMenu className="flex-row items-center">
-        {currentFooterPage ? (
+        {isOnUtilityPage ? (
           <SidebarMenuItem className="min-w-0 flex-1">
             <SidebarMenuButton onClick={handleBackClick}>
               <ArrowLeftIcon />
diff --git a/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx b/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx
index 4e9547842353..1a85725041fe 100644
--- a/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx
+++ b/apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx
@@ -11,17 +11,16 @@ import {
   type ProviderUpdateSidebarPillView,
 } from "../ProviderUpdateLaunchNotification.logic";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
-import { Button } from "../ui/button";
 
 const PROVIDER_UPDATE_PILL_STYLES = {
   loading:
-    "bg-sidebar-control-surface text-sidebar-foreground group-has-[button.provider-update-main:hover]/provider-update:bg-sidebar-row-hover",
+    "bg-sidebar-control-surface text-sidebar-foreground group-has-[button[data-provider-update-main]:hover]/provider-update:bg-sidebar-row-hover",
   success:
-    "bg-sidebar-control-surface text-sidebar-foreground group-has-[button.provider-update-main:hover]/provider-update:bg-sidebar-row-hover",
+    "bg-sidebar-control-surface text-sidebar-foreground group-has-[button[data-provider-update-main]:hover]/provider-update:bg-sidebar-row-hover",
   warning:
-    "bg-warning/12 text-warning group-has-[button.provider-update-main:hover]/provider-update:bg-warning/18",
+    "bg-warning/12 text-warning group-has-[button[data-provider-update-main]:hover]/provider-update:bg-warning/18",
   error:
-    "bg-destructive/12 text-destructive group-has-[button.provider-update-main:hover]/provider-update:bg-destructive/18",
+    "bg-destructive/12 text-destructive group-has-[button[data-provider-update-main]:hover]/provider-update:bg-destructive/18",
 } as const;
 
 const PROVIDER_UPDATE_PILL_PROGRESS_STYLES = {
@@ -126,7 +125,7 @@ export function SidebarProviderUpdatePill() {
 
   return (
     <div
-      className={`group/provider-update relative flex min-h-7 w-full shrink-0 items-center overflow-hidden rounded-lg text-[11px] leading-4 font-medium transform-gpu transition-all duration-180 ease-[cubic-bezier(0.22,1,0.36,1)] will-change-transform ${
+      className={`group/provider-update relative flex min-h-7 w-full shrink-0 items-center overflow-hidden rounded-lg text-2xs leading-4 font-medium transform-gpu transition-all duration-180 ease-drawer will-change-transform ${
         PROVIDER_UPDATE_PILL_STYLES[displayedView.tone]
       } ${
         exitingKey === displayedView.key
@@ -153,7 +152,7 @@ export function SidebarProviderUpdatePill() {
         <div
           key={displayedView.key}
           aria-hidden="true"
-          className={`pointer-events-none absolute inset-y-0 left-0 w-full origin-left animate-[provider-update-pill-countdown_var(--provider-update-pill-dismiss-ms)_linear_forwards] border-r border-current/15 shadow-[inset_0_1px_0_rgb(255_255_255_/_0.08)] ${
+          className={`pointer-events-none absolute inset-y-0 left-0 w-full origin-left scale-x-0 transition-transform duration-(--provider-update-pill-dismiss-ms) ease-linear starting:scale-x-100 border-r border-current/15 inset-shadow-2xs inset-shadow-white/8 ${
             PROVIDER_UPDATE_PILL_PROGRESS_STYLES[displayedView.tone]
           }`}
           style={
@@ -170,7 +169,8 @@ export function SidebarProviderUpdatePill() {
             <button
               type="button"
               aria-label={displayedView.description}
-              className="provider-update-main relative z-[1] flex min-w-0 flex-1 items-center gap-2 px-2 py-1.5 text-left"
+              data-provider-update-main
+              className="relative z-[1] flex min-w-0 flex-1 items-center gap-2 px-2 py-1.5 text-left"
               onClick={openProviderSettings}
             >
               {displayedView.tone === "loading" ? (
@@ -192,15 +192,14 @@ export function SidebarProviderUpdatePill() {
         <Tooltip>
           <TooltipTrigger
             render={
-              <Button
-                size="icon-micro"
-                variant="ghost"
+              <button
+                type="button"
                 aria-label="Dismiss provider update notice"
-                className="relative z-[1] mr-1 [--control-icon-color:currentColor] rounded-md text-inherit opacity-70 hover:bg-transparent hover:opacity-100"
+                className="relative z-[1] mr-1 flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md opacity-70 outline-none hover:opacity-100 focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-ring"
                 onClick={() => startExit(displayedView.key, null, displayedView.key)}
               >
                 <XIcon className="size-3.5 shrink-0" />
-              </Button>
+              </button>
             }
           />
           <TooltipPopup side="top">Dismiss until provider status changes</TooltipPopup>
diff --git a/apps/web/src/components/sidebar/SidebarThreadHeader.tsx b/apps/web/src/components/sidebar/SidebarThreadHeader.tsx
index 6f9a686e5219..e552e64c19a3 100644
--- a/apps/web/src/components/sidebar/SidebarThreadHeader.tsx
+++ b/apps/web/src/components/sidebar/SidebarThreadHeader.tsx
@@ -21,8 +21,7 @@ import {
 
 import { cn } from "~/lib/utils";
 import { Button } from "../ui/button";
-import { Input } from "../ui/input";
-import { SidebarMenuButton } from "../ui/sidebar";
+import { SidebarInput, SidebarMenuButton } from "../ui/sidebar";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 
 export interface SidebarThreadHeaderProps {
@@ -84,11 +83,10 @@ export function SidebarThreadHeader({
         ref={searchFieldRef}
         className="flex h-8 min-w-0 flex-1 items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
       >
-        <SearchIcon className="size-4 shrink-0 text-[var(--sidebar-icon-color)]" />
-        <Input
+        <SearchIcon className="size-4 shrink-0 text-(--sidebar-icon-color)" />
+        <SidebarInput
           ref={searchInputRef}
           nativeInput
-          unstyled
           type="search"
           value={searchQuery}
           onChange={(event) => onSearchQueryChange(event.currentTarget.value)}
@@ -104,14 +102,14 @@ export function SidebarThreadHeader({
               ? `sidebar-thread-search-result-${activeSearchResultIndex}`
               : undefined
           }
-          className="min-w-0 flex-1 [&_[data-slot=input]]:h-auto [&_[data-slot=input]]:p-0 [&_[data-slot=input]]:leading-normal [&_[data-slot=input]]:text-sm [&_[data-slot=input]]:font-medium [&_[data-slot=input]]:text-sidebar-foreground [&_[data-slot=input]]:placeholder:text-[var(--sidebar-icon-color)]"
+          className="min-w-0 flex-1"
         />
         {isSearching ? (
           <Button
             type="button"
             size="icon-micro"
-            variant="ghost"
-            className="shrink-0 text-sidebar-muted-foreground hover:bg-sidebar-control-surface hover:text-sidebar-foreground"
+            variant="ghost-muted"
+            className="shrink-0"
             aria-label="Clear thread search"
             onClick={() => {
               onClearSearch();
@@ -189,10 +187,7 @@ export function SidebarHeaderIconButton({
             type="button"
             aria-label={label}
             {...rest}
-            className={cn(
-              "relative size-7 shrink-0 focus-visible:ring-offset-2 focus-visible:ring-offset-sidebar",
-              className,
-            )}
+            className={cn("relative size-7 shrink-0", className)}
           />
         }
       >
diff --git a/apps/web/src/components/sidebar/SidebarThreadUndoNotice.tsx b/apps/web/src/components/sidebar/SidebarThreadUndoNotice.tsx
index 74f767f05d9a..8f26a62c89bf 100644
--- a/apps/web/src/components/sidebar/SidebarThreadUndoNotice.tsx
+++ b/apps/web/src/components/sidebar/SidebarThreadUndoNotice.tsx
@@ -17,11 +17,7 @@ export function SidebarThreadUndoNotice() {
     <Alert role="status" variant="sidebar">
       <AlertDescription>
         {notice.action} {notice.count} thread{notice.count === 1 ? "" : "s"},{" "}
-        <InlineButton
-          underline
-          onClick={undoLatestThreadAction}
-          className="hover:text-sidebar-foreground"
-        >
+        <InlineButton onClick={undoLatestThreadAction}>
           {shortcut ? `${shortcut} to undo` : "Undo"}
         </InlineButton>
       </AlertDescription>
diff --git a/apps/web/src/components/sidebar/SidebarUpdatePill.tsx b/apps/web/src/components/sidebar/SidebarUpdatePill.tsx
index a94b7801ecfd..e9ba268300b2 100644
--- a/apps/web/src/components/sidebar/SidebarUpdatePill.tsx
+++ b/apps/web/src/components/sidebar/SidebarUpdatePill.tsx
@@ -100,7 +100,7 @@ function SidebarUpdateArchitectureWarningContent() {
   if (!visible || !description) return null;
 
   return (
-    <Alert variant="warning" className="rounded-2xl border-warning/40 bg-warning/8 text-xs">
+    <Alert variant="warning">
       <TriangleAlertIcon />
       <AlertTitle>Intel build on Apple Silicon</AlertTitle>
       <AlertDescription>{description}</AlertDescription>
@@ -311,7 +311,7 @@ function SidebarUpdateControl() {
               !isInteractionDisabled && "hover:bg-sidebar-row-hover",
             )
           : cn(
-              "text-[var(--sidebar-icon-color)]",
+              "text-(--sidebar-icon-color)",
               !isInteractionDisabled && "hover:bg-sidebar-row-hover hover:text-sidebar-foreground",
             ),
         disabled && !showUpdateIconState && "opacity-60",
@@ -393,7 +393,6 @@ function SidebarUpdateControl() {
           <PopoverPopup
             align="center"
             aria-label="Nightly update release notes"
-            className="max-w-none text-balance shadow-xl shadow-black/25"
             initialFocus={false}
             onKeyDownCapture={(event) => {
               if (
diff --git a/apps/web/src/components/sidebar/SidebarUpdateReleaseNotes.tsx b/apps/web/src/components/sidebar/SidebarUpdateReleaseNotes.tsx
index 89204d1bd89b..ef9713fd7312 100644
--- a/apps/web/src/components/sidebar/SidebarUpdateReleaseNotes.tsx
+++ b/apps/web/src/components/sidebar/SidebarUpdateReleaseNotes.tsx
@@ -85,7 +85,7 @@ export function SidebarUpdateReleaseNotes({
 
           return (
             <div key={releaseNote.version}>
-              {index > 0 && <Separator className="my-3 bg-border/60" />}
+              {index > 0 && <Separator className="my-3" />}
               <section>
                 <h3 className="text-foreground text-xs leading-4 font-semibold">
                   {index === 0 ? "What's changed" : `Changes in ${releaseNote.version}`}
@@ -108,7 +108,7 @@ export function SidebarUpdateReleaseNotes({
         })}
         {state.omittedReleaseCount > 0 ? (
           <div>
-            <Separator className="my-3 bg-border/60" />
+            <Separator className="my-3" />
             <ReleaseLink releaseUrl={getDesktopUpdateReleaseHistoryUrl()} shell={shell}>
               {`${state.omittedReleaseCount} older ${state.omittedReleaseCount === 1 ? "release" : "releases"} on GitHub`}
             </ReleaseLink>
diff --git a/apps/web/src/components/sidebar/mainAppLocation.ts b/apps/web/src/components/sidebar/mainAppLocation.ts
new file mode 100644
index 000000000000..fcbf2f489d33
--- /dev/null
+++ b/apps/web/src/components/sidebar/mainAppLocation.ts
@@ -0,0 +1,36 @@
+import { useLocation, useNavigate } from "@tanstack/react-router";
+import { useCallback, useEffect } from "react";
+
+// Settings, Usage, and Pull Requests replace the sidebar utility row with a
+// Back button. Everything else is the main app. Legacy `/projects/<key>` links
+// redirect into settings, so they count too and are never remembered.
+export function isSidebarUtilityPage(pathname: string) {
+  return (
+    pathname === "/settings" ||
+    pathname.startsWith("/settings/") ||
+    pathname.startsWith("/projects/") ||
+    pathname === "/usage" ||
+    pathname === "/pull-requests"
+  );
+}
+
+let mainAppHref: string | null = null;
+
+// Mount once in the app shell. Records the latest main app URL so Back can
+// return there no matter how many utility pages were visited since.
+export function MainAppLocationTracker() {
+  const href = useLocation({
+    select: (location) => (isSidebarUtilityPage(location.pathname) ? null : location.href),
+  });
+  useEffect(() => {
+    if (href !== null) mainAppHref = href;
+  }, [href]);
+  return null;
+}
+
+// Leaves a utility page for the last main app URL, or the thread list when
+// the app was opened directly on a utility page.
+export function useNavigateToMainApp() {
+  const navigate = useNavigate();
+  return useCallback(() => navigate({ href: mainAppHref ?? "/" }), [navigate]);
+}
diff --git a/apps/web/src/components/threadActionMenu.logic.test.ts b/apps/web/src/components/threadActionMenu.logic.test.ts
index 14965d4add58..c5ebeda55627 100644
--- a/apps/web/src/components/threadActionMenu.logic.test.ts
+++ b/apps/web/src/components/threadActionMenu.logic.test.ts
@@ -7,11 +7,18 @@ const baseState: ThreadActionMenuState = {
   projectFilter: null,
   isPinned: false,
   isSettled: false,
+  autoSettleEnabled: true,
   isSnoozed: false,
   canSnoozeNow: true,
   isRegeneratingTitle: false,
   isRunning: false,
-  supports: { settlement: true, snooze: true, pinning: true, titleRegeneration: true },
+  supports: {
+    settlement: true,
+    autoSettleOptOut: true,
+    snooze: true,
+    pinning: true,
+    titleRegeneration: true,
+  },
   snoozePresets: [
     { id: "hour", label: "In 1 hour", whenLabel: "3:00 PM", snoozedUntil: "2026-08-07T15:00:00Z" },
   ],
@@ -32,7 +39,13 @@ describe("buildThreadActionMenuItems", () => {
     expect(
       ids({
         ...baseState,
-        supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
+        supports: {
+          settlement: false,
+          autoSettleOptOut: false,
+          snooze: false,
+          pinning: false,
+          titleRegeneration: false,
+        },
       }),
     ).toEqual(["rename", "mark-unread", "copy", "project-settings", "archive", "delete"]);
   });
@@ -66,7 +79,7 @@ describe("buildThreadActionMenuItems", () => {
     const filterIndex = items.findIndex((candidate) => candidate.id === "filter-by-project");
     expect(items[filterIndex]).toMatchObject({ label: "Show all projects", icon: "folder-tree" });
     expect(items[filterIndex - 1]?.id).toBe("mark-unread");
-    expect(items[filterIndex + 1]?.id).toBe("copy");
+    expect(items[filterIndex + 1]?.id).toBe("auto-settle");
   });
 
   it("includes branch items only for threads with a branch", () => {
@@ -84,6 +97,25 @@ describe("buildThreadActionMenuItems", () => {
     expect(ids(baseState)).toEqual(expect.arrayContaining(["pin", "settle", "snooze"]));
   });
 
+  it("offers auto-settle as a submenu with the current option checked", () => {
+    const find = (state: ThreadActionMenuState) =>
+      buildThreadActionMenuItems(state).find((item) => item.id === "auto-settle");
+    const on = find(baseState);
+    expect(on?.label).toBe("Auto-settle behavior");
+    expect(on?.children?.map((child) => [child.id, child.checked])).toEqual([
+      ["auto-settle:enabled", true],
+      ["auto-settle:disabled", false],
+    ]);
+    const off = find({ ...baseState, autoSettleEnabled: false });
+    expect(off?.children?.map((child) => child.checked)).toEqual([false, true]);
+    // Sits with the per-thread settings after Mark unread, not the lifecycle verbs.
+    const items = buildThreadActionMenuItems(baseState);
+    expect(items[items.findIndex((item) => item.id === "mark-unread") + 1]?.id).toBe("auto-settle");
+    expect(
+      ids({ ...baseState, supports: { ...baseState.supports, autoSettleOptOut: false } }),
+    ).not.toContain("auto-settle");
+  });
+
   it("disables snooze when the thread cannot snooze, keeping presets visible", () => {
     const snooze = buildThreadActionMenuItems({ ...baseState, canSnoozeNow: false }).find(
       (item) => item.id === "snooze",
@@ -117,7 +149,13 @@ describe("buildThreadActionMenuItems", () => {
     expect(
       ids({
         ...baseState,
-        supports: { settlement: false, snooze: false, pinning: false, titleRegeneration: false },
+        supports: {
+          settlement: false,
+          autoSettleOptOut: false,
+          snooze: false,
+          pinning: false,
+          titleRegeneration: false,
+        },
       }),
     ).toContain("archive");
   });
diff --git a/apps/web/src/components/threadActionMenu.logic.ts b/apps/web/src/components/threadActionMenu.logic.ts
index c37ec31f929c..838fc91a636c 100644
--- a/apps/web/src/components/threadActionMenu.logic.ts
+++ b/apps/web/src/components/threadActionMenu.logic.ts
@@ -14,6 +14,9 @@ export type ThreadActionMenuId =
   | "unpin"
   | "settle"
   | "unsettle"
+  | "auto-settle"
+  | "auto-settle:enabled"
+  | "auto-settle:disabled"
   | "snooze"
   | `snooze:${string}`
   | "unsnooze"
@@ -40,6 +43,8 @@ export interface ThreadActionMenuState {
   } | null;
   readonly isPinned: boolean;
   readonly isSettled: boolean;
+  /** False while the user has turned automatic settlement off for this thread. */
+  readonly autoSettleEnabled: boolean;
   readonly isSnoozed: boolean;
   readonly canSnoozeNow: boolean;
   readonly isRegeneratingTitle: boolean;
@@ -47,6 +52,8 @@ export interface ThreadActionMenuState {
   readonly isRunning: boolean;
   readonly supports: {
     readonly settlement: boolean;
+    /** Server understands thread.auto-settle.set. */
+    readonly autoSettleOptOut: boolean;
     readonly snooze: boolean;
     readonly pinning: boolean;
     readonly titleRegeneration: boolean;
@@ -131,6 +138,31 @@ export function buildThreadActionMenuItems(
           },
         ]
       : []),
+    // A submenu with the current option checked, not a one-shot action:
+    // this is a setting, and it sits with the other per-thread settings
+    // rather than the lifecycle verbs above. Disabled keeps long-running
+    // threads out of the settled shelf no matter how quiet they get.
+    ...(state.supports.autoSettleOptOut
+      ? [
+          {
+            id: "auto-settle" as const,
+            label: "Auto-settle behavior",
+            icon: "timer",
+            children: [
+              {
+                id: "auto-settle:enabled" as const,
+                label: "Enabled",
+                checked: state.autoSettleEnabled,
+              },
+              {
+                id: "auto-settle:disabled" as const,
+                label: "Disabled",
+                checked: !state.autoSettleEnabled,
+              },
+            ],
+          },
+        ]
+      : []),
     {
       id: "copy",
       label: "Copy",
diff --git a/apps/web/src/components/ui/alert-dialog.tsx b/apps/web/src/components/ui/alert-dialog.tsx
index 6e6c1ce2b210..2dae216fa88a 100644
--- a/apps/web/src/components/ui/alert-dialog.tsx
+++ b/apps/web/src/components/ui/alert-dialog.tsx
@@ -101,7 +101,7 @@ function AlertDialogFooter({
 function AlertDialogTitle({ className, ...props }: AlertDialogPrimitive.Title.Props) {
   return (
     <AlertDialogPrimitive.Title
-      className={cn("font-heading font-semibold text-xl leading-none", className)}
+      className={cn("wrap-anywhere font-semibold text-xl leading-none", className)}
       data-slot="alert-dialog-title"
       {...props}
     />
diff --git a/apps/web/src/components/ui/alert.tsx b/apps/web/src/components/ui/alert.tsx
index e2a08066e6c0..1521002256cc 100644
--- a/apps/web/src/components/ui/alert.tsx
+++ b/apps/web/src/components/ui/alert.tsx
@@ -6,9 +6,15 @@ import { cn } from "~/lib/utils";
 
 const alertVariants = cva("relative rounded-xl border px-3.5 py-3 text-card-foreground text-sm", {
   defaultVariants: {
+    surface: "default",
     variant: "default",
   },
   variants: {
+    // "glass" floats the alert over content; alert-glass tints from data-variant.
+    surface: {
+      default: "",
+      glass: "alert-glass",
+    },
     variant: {
       default: "bg-transparent dark:bg-input/32 [&_svg]:text-muted-foreground",
       sidebar:
@@ -45,6 +51,7 @@ function alertChildSlot(child: React.ReactElement): string | undefined {
 function Alert({
   className,
   variant,
+  surface,
   controlAlignment = "center",
   children,
   ...props
@@ -73,8 +80,9 @@ function Alert({
 
   return (
     <div
-      className={cn(alertVariants({ variant }), className)}
+      className={cn(alertVariants({ surface, variant }), className)}
       data-slot="alert"
+      data-variant={variant ?? "default"}
       role="alert"
       {...props}
     >
diff --git a/apps/web/src/components/ui/autocomplete.tsx b/apps/web/src/components/ui/autocomplete.tsx
index 49735c97e3d6..8251d8c24b7c 100644
--- a/apps/web/src/components/ui/autocomplete.tsx
+++ b/apps/web/src/components/ui/autocomplete.tsx
@@ -30,7 +30,7 @@ function AutocompleteInput({
       {startAddon && (
         <div
           aria-hidden="true"
-          className="[&_svg]:-mx-0.5 pointer-events-none absolute inset-y-0 start-px z-10 flex items-center ps-[calc(--spacing(3)-1px)] opacity-80 has-[+[data-size=sm]]:ps-[calc(--spacing(2.5)-1px)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4"
+          className="[&_svg]:-mx-0.5 pointer-events-none has-[button]:pointer-events-auto absolute inset-y-0 start-px z-10 flex items-center ps-[calc(--spacing(3)-1px)] opacity-80 has-[+[data-size=sm]]:ps-[calc(--spacing(2.5)-1px)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4"
           data-slot="autocomplete-start-addon"
         >
           {startAddon}
@@ -125,7 +125,7 @@ function AutocompleteItem({ className, children, ...props }: AutocompletePrimiti
   return (
     <AutocompletePrimitive.Item
       className={cn(
-        "flex min-h-8 cursor-default select-none items-center rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='text-'])]:text-muted-foreground",
+        "flex min-h-8 cursor-default select-none items-center gap-2 rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-selected:bg-accent/50 data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='text-'])]:text-muted-foreground",
         className,
       )}
       data-slot="autocomplete-item"
diff --git a/apps/web/src/components/ui/badge.tsx b/apps/web/src/components/ui/badge.tsx
index 32275cc41616..db688707fb91 100644
--- a/apps/web/src/components/ui/badge.tsx
+++ b/apps/web/src/components/ui/badge.tsx
@@ -34,6 +34,9 @@ const badgeVariants = cva(
         secondary: "bg-secondary text-secondary-foreground [button&,a&]:hover:bg-secondary/90",
         success: "bg-success/8 text-success-foreground dark:bg-success/16",
         warning: "bg-warning/8 text-warning-foreground dark:bg-warning/16",
+        // A code-host label tinted from the --label color the consumer sets in style.
+        label:
+          "bg-[color-mix(in_srgb,var(--label)_8%,transparent)] text-[color-mix(in_srgb,var(--label)_30%,var(--color-foreground))] dark:bg-[color-mix(in_srgb,var(--label)_12%,transparent)] dark:text-[color-mix(in_srgb,var(--label)_45%,var(--color-foreground))]",
       },
     },
   },
@@ -57,4 +60,5 @@ function Badge({ className, variant, size, render, ...props }: BadgeProps) {
   });
 }
 
+// The *Variants function is for components/ui modules only.
 export { Badge, badgeVariants };
diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx
index 898e205d4843..1a101f107114 100644
--- a/apps/web/src/components/ui/button.tsx
+++ b/apps/web/src/components/ui/button.tsx
@@ -8,7 +8,7 @@ import type * as React from "react";
 import { cn } from "~/lib/utils";
 
 const buttonVariants = cva(
-  "[--control-icon-color:currentColor] [&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-[var(--control-radius)] border font-medium text-base outline-none transition-[box-shadow,scale] [&:active:not([aria-haspopup])]:scale-[0.97] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--control-radius)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 sm:text-sm [&_svg:not([class*='text-'])]:text-[var(--control-icon-color)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+  "[--control-icon-color:currentColor] [&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-[var(--control-radius)] border font-medium text-base outline-none transition-[box-shadow,scale] [&:active:not([aria-haspopup])]:scale-[0.97] before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--control-radius)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 aria-disabled:cursor-not-allowed aria-disabled:opacity-64 sm:text-sm [&_svg:not([class*='text-'])]:text-[var(--control-icon-color)] [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
   {
     defaultVariants: {
       size: "default",
@@ -39,7 +39,6 @@ const buttonVariants = cva(
         xs: "h-7 gap-1 px-[calc(--spacing(2)-1px)] text-sm sm:h-6 sm:text-xs [&_svg:not([class*='size-'])]:size-4 sm:[&_svg:not([class*='size-'])]:size-3.5",
       },
       variant: {
-        chip: "",
         default:
           "not-disabled:inset-shadow-[0_1px_--theme(--color-white/16%)] border-primary bg-primary text-primary-foreground shadow-primary/24 shadow-xs [:active,[data-pressed]]:inset-shadow-[0_1px_--theme(--color-black/8%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-primary/90",
         destructive:
@@ -49,14 +48,16 @@ const buttonVariants = cva(
         ghost:
           "[--control-icon-color:var(--contrast-muted-foreground)] border-transparent text-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent",
         "ghost-muted":
-          "[--control-icon-color:var(--contrast-muted-foreground)] border-transparent text-muted-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent [:hover,[data-pressed]]:text-foreground",
+          "[--control-icon-color:currentColor] border-transparent text-muted-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent [:hover,[data-pressed]]:text-foreground",
+        "ghost-destructive":
+          "[--control-icon-color:currentColor] border-transparent text-muted-foreground data-pressed:bg-accent [:hover,[data-pressed]]:bg-accent [:hover,[data-pressed]]:text-destructive",
         glass:
-          "surface-glass [--control-icon-color:var(--contrast-muted-foreground)] border-border/60 text-foreground shadow-sm [:hover,[data-pressed]]:border-border",
+          "surface-glass [--control-icon-color:var(--contrast-muted-foreground)] rounded-full border-border/60 text-foreground shadow-sm before:rounded-full [:hover,[data-pressed]]:border-border",
         link: "border-transparent underline-offset-4 [:hover,[data-pressed]]:underline",
         "media-close":
           "[--control-icon-color:currentColor] border-transparent bg-black/65 text-white shadow-sm ring-1 ring-white/20 [:hover,[data-pressed]]:bg-black/80 focus-visible:ring-white",
         "media-navigation":
-          "[--control-icon-color:currentColor] absolute top-1/2 z-20 -translate-y-1/2 border-transparent text-white/90 [:hover,[data-pressed]]:bg-white/10 [:hover,[data-pressed]]:text-white focus-visible:ring-white",
+          "[--control-icon-color:currentColor] absolute top-1/2 z-20 -translate-y-1/2 border-transparent text-white/90 [:hover,[data-pressed]]:bg-white/10 [:hover,[data-pressed]]:text-white focus-visible:ring-white focus-visible:ring-offset-transparent",
         outline:
           "[--control-icon-color:var(--contrast-muted-foreground)] border-input bg-popover not-dark:bg-clip-padding text-foreground shadow-xs/5 not-disabled:not-active:not-data-pressed:before:shadow-[0_1px_--theme(--color-black/4%)] dark:bg-input/32 dark:not-disabled:before:shadow-[0_-1px_--theme(--color-white/2%)] dark:not-disabled:not-active:not-data-pressed:before:shadow-[0_-1px_--theme(--color-white/6%)] [:disabled,:active,[data-pressed]]:shadow-none [:hover,[data-pressed]]:bg-accent/50 dark:[:hover,[data-pressed]]:bg-input/64",
         overlay: "border-transparent bg-black/70 text-white/65 [:hover,[data-pressed]]:bg-black/90",
@@ -69,9 +70,12 @@ const buttonVariants = cva(
   },
 );
 
+type ButtonVariant = NonNullable<VariantProps<typeof buttonVariants>["variant"]>;
+type ButtonSize = NonNullable<VariantProps<typeof buttonVariants>["size"]>;
+
 interface ButtonProps extends useRender.ComponentProps<"button"> {
-  variant?: VariantProps<typeof buttonVariants>["variant"];
-  size?: VariantProps<typeof buttonVariants>["size"];
+  variant?: ButtonVariant;
+  size?: ButtonSize;
 }
 
 function Button({ className, variant, size, render, ...props }: ButtonProps) {
@@ -80,8 +84,7 @@ function Button({ className, variant, size, render, ...props }: ButtonProps) {
     : "button";
 
   const defaultProps = {
-    className:
-      variant === "chip" ? cn(className) : cn(buttonVariants({ className, size, variant })),
+    className: cn(buttonVariants({ className, size, variant })),
     "data-slot": "button",
     type: typeValue,
   };
@@ -93,24 +96,42 @@ function Button({ className, variant, size, render, ...props }: ButtonProps) {
   });
 }
 
-export { Button, buttonVariants };
+// buttonVariants is exported for other components/ui modules only; app code
+// renders a Button (with `render` for other elements) instead.
+export { Button, buttonVariants, type ButtonSize, type ButtonVariant };
+
+const inlineButtonVariants = cva(
+  "inline-flex shrink-0 cursor-pointer items-center gap-0.5 whitespace-nowrap font-medium underline-offset-2 hover:underline focus-visible:outline-2 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-64",
+  {
+    defaultVariants: { tone: "default" },
+    variants: {
+      tone: {
+        default: "text-foreground",
+        muted: "text-muted-foreground hover:text-foreground",
+        destructive: "text-destructive/80 hover:text-destructive",
+        /** Opens a menu from inside a sentence; the dotted underline marks it as a choice. */
+        picker:
+          "gap-1.5 text-foreground underline decoration-foreground/30 decoration-dotted decoration-from-font underline-offset-4 hover:decoration-foreground hover:decoration-solid data-popup-open:decoration-foreground data-popup-open:decoration-solid",
+      },
+    },
+  },
+);
 
-/** An inline action that keeps the geometry of surrounding text or a graph node. */
+/** An inline text action that keeps the size of the surrounding text and underlines on hover. */
 export function InlineButton({
   className,
-  underline = false,
+  tone,
+  render,
   ...props
-}: React.ComponentProps<"button"> & { underline?: boolean }) {
-  return (
-    <button
-      type="button"
-      data-slot="inline-button"
-      className={cn(
-        "inline-flex shrink-0 cursor-pointer items-center gap-0.5 whitespace-nowrap focus-visible:outline-2 focus-visible:outline-ring disabled:pointer-events-none disabled:opacity-64",
-        underline && "border-b border-transparent hover:border-current",
-        className,
-      )}
-      {...props}
-    />
-  );
+}: useRender.ComponentProps<"button"> & VariantProps<typeof inlineButtonVariants>) {
+  const defaultProps = {
+    className: cn(inlineButtonVariants({ tone }), className),
+    "data-slot": "inline-button",
+    type: render ? undefined : ("button" as const),
+  };
+  return useRender({
+    defaultTagName: "button",
+    props: mergeProps<"button">(defaultProps, props),
+    render,
+  });
 }
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index 442817631827..4020df1653cc 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -30,7 +30,6 @@ function Combobox<Value, Multiple extends boolean | undefined = false>(
 
 function ComboboxInput({
   className,
-  inputClassName,
   showTrigger = true,
   showClear = false,
   startAddon,
@@ -38,7 +37,6 @@ function ComboboxInput({
   unstyled = false,
   ...props
 }: Omit<ComboboxPrimitive.Input.Props, "size"> & {
-  inputClassName?: string;
   showTrigger?: boolean;
   showClear?: boolean;
   startAddon?: React.ReactNode;
@@ -71,7 +69,10 @@ function ComboboxInput({
         data-slot="combobox-input"
         render={
           <Input
-            className={cn("has-disabled:opacity-100", inputClassName)}
+            className={cn(
+              "has-disabled:opacity-100",
+              unstyled && "rounded-none bg-transparent text-sm",
+            )}
             nativeInput
             size={sizeValue}
             unstyled={unstyled}
@@ -116,7 +117,6 @@ function ComboboxSearchInput(props: React.ComponentProps<typeof ComboboxInput>)
         <ComboboxInput
           {...props}
           className="[&_input]:h-6.5 [&_input]:ps-5 [&_input]:font-sans [&_input]:leading-6.5"
-          inputClassName="rounded-none bg-transparent text-sm"
           showTrigger={false}
           size="sm"
           unstyled
@@ -185,28 +185,24 @@ function ComboboxPopup({
 
 function ComboboxItem({
   className,
-  contentClassName,
   children,
   hideIndicator: _hideIndicator = false,
   ...props
 }: ComboboxPrimitive.Item.Props & {
-  contentClassName?: string;
   hideIndicator?: boolean;
 }) {
   return (
     <ComboboxPrimitive.Item
       className={cn(
-        "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-sm px-2 py-1 text-base outline-none hover:bg-accent data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-selected:bg-foreground/[0.08] data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+        "flex min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center rounded-sm px-2 py-1 text-base outline-none not-data-disabled:hover:bg-accent data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-selected:bg-foreground/[0.08] data-selected:text-foreground data-highlighted:bg-accent data-highlighted:text-accent-foreground [&[data-highlighted][data-selected]]:bg-accent [&[data-highlighted][data-selected]]:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
         className,
       )}
       data-slot="combobox-item"
       {...props}
     >
+      {/* Children lay out as one row: a label that truncates, then any trailing meta. */}
       <div
-        className={cn(
-          "min-w-0 flex-1 [&_svg:not([class*='text-'])]:text-muted-foreground",
-          contentClassName,
-        )}
+        className="flex min-w-0 flex-1 items-center gap-2 [&_svg:not([class*='text-'])]:text-muted-foreground"
         data-slot="combobox-item-content"
       >
         {children}
diff --git a/apps/web/src/components/ui/command.tsx b/apps/web/src/components/ui/command.tsx
index f8e9b72b1b4c..d3a83865151d 100644
--- a/apps/web/src/components/ui/command.tsx
+++ b/apps/web/src/components/ui/command.tsx
@@ -93,19 +93,11 @@ function Command({
 
 function CommandInput({
   className,
-  wrapperClassName,
   placeholder,
   ...props
-}: React.ComponentProps<typeof AutocompleteInput> & {
-  wrapperClassName?: string | undefined;
-}) {
+}: React.ComponentProps<typeof AutocompleteInput>) {
   return (
-    <div
-      className={cn(
-        "px-[var(--command-shell-inset)] py-1.5 [&_[data-slot=autocomplete-start-addon]]:ps-[calc(var(--command-shell-inset)+0.0625rem)]",
-        wrapperClassName,
-      )}
-    >
+    <div className="px-[var(--command-shell-inset)] py-1.5 [&_[data-slot=autocomplete-start-addon]]:ps-[calc(var(--command-shell-inset)+0.0625rem)]">
       <AutocompleteInput
         autoFocus
         className={cn(
@@ -160,13 +152,24 @@ function CommandCollection({ ...props }: React.ComponentProps<typeof Autocomplet
   return <AutocompleteCollection data-slot="command-collection" {...props} />;
 }
 
-function CommandItem({ className, ...props }: React.ComponentProps<typeof AutocompleteItem>) {
+// Pass `active` when the palette tracks the highlighted row itself; the
+// primitive's hover and keyboard highlight are then ignored so the two never
+// disagree, and the row shows the active surface instead.
+function CommandItem({
+  className,
+  active,
+  ...props
+}: React.ComponentProps<typeof AutocompleteItem> & { active?: boolean }) {
   return (
     <AutocompleteItem
       className={cn(
         "py-1.5 data-selected:bg-foreground/[0.06] data-highlighted:bg-foreground/[0.09] data-highlighted:text-foreground [&[data-highlighted][data-selected]]:bg-foreground/[0.09] [&[data-highlighted][data-selected]]:text-foreground",
+        active !== undefined &&
+          "cursor-pointer hover:bg-transparent hover:text-inherit data-highlighted:bg-transparent data-highlighted:text-inherit data-selected:bg-transparent data-selected:text-inherit [&[data-highlighted][data-selected]]:bg-transparent [&[data-highlighted][data-selected]]:text-inherit",
+        active && "bg-accent! text-accent-foreground!",
         className,
       )}
+      data-active={active || undefined}
       data-slot="command-item"
       {...props}
     />
diff --git a/apps/web/src/components/ui/dialog.tsx b/apps/web/src/components/ui/dialog.tsx
index 22ce5637204f..463cedd79fba 100644
--- a/apps/web/src/components/ui/dialog.tsx
+++ b/apps/web/src/components/ui/dialog.tsx
@@ -61,24 +61,22 @@ function DialogPopup({
   children,
   showCloseButton = true,
   bottomStickOnMobile = true,
-  backdropClassName,
-  viewportClassName,
   variant = "default",
   ...props
 }: DialogPrimitive.Popup.Props & {
   showCloseButton?: boolean;
   bottomStickOnMobile?: boolean;
-  backdropClassName?: string;
-  viewportClassName?: string;
   variant?: "default" | "media";
 }) {
   return (
     <DialogPortal>
-      <DialogBackdrop className={backdropClassName} variant={variant} />
+      {/* Media opens from inside other overlays (a composer chip, a popover), so it sits above them. */}
+      <DialogBackdrop className={variant === "media" ? "z-[60]" : undefined} variant={variant} />
       <DialogViewport
         className={cn(
           bottomStickOnMobile && "max-sm:grid-rows-[1fr_auto] max-sm:p-0 max-sm:pt-12",
-          viewportClassName,
+          variant === "media" &&
+            "z-[60] grid-rows-1 place-items-center px-4 py-6 [-webkit-app-region:no-drag]",
         )}
       >
         <DialogPrimitive.Popup
@@ -145,7 +143,7 @@ function DialogFooter({
 function DialogTitle({ className, ...props }: DialogPrimitive.Title.Props) {
   return (
     <DialogPrimitive.Title
-      className={cn("font-heading font-semibold text-xl leading-none", className)}
+      className={cn("wrap-anywhere font-semibold text-xl leading-none", className)}
       data-slot="dialog-title"
       {...props}
     />
@@ -171,7 +169,7 @@ function DialogPanel({
     <ScrollArea scrollFade={scrollFade}>
       <div
         className={cn(
-          "p-6 in-[[data-slot=dialog-popup]:has([data-slot=dialog-header])]:pt-1 in-[[data-slot=dialog-popup]:has([data-slot=dialog-footer]:not(.border-t))]:pb-1",
+          "space-y-4 p-6 in-[[data-slot=dialog-popup]:has([data-slot=dialog-header])]:pt-1 in-[[data-slot=dialog-popup]:has([data-slot=dialog-footer]:not(.border-t))]:pb-1",
           className,
         )}
         data-slot="dialog-panel"
diff --git a/apps/web/src/components/ui/discovery-list.tsx b/apps/web/src/components/ui/discovery-list.tsx
index d03ca0edd5e0..70af3c8418bd 100644
--- a/apps/web/src/components/ui/discovery-list.tsx
+++ b/apps/web/src/components/ui/discovery-list.tsx
@@ -24,7 +24,7 @@ export function DiscoveryListRow({
     <button
       type="button"
       {...props}
-      className="group flex w-full items-center gap-3 px-3 py-3 text-left hover:bg-accent/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50"
+      className="group flex w-full items-center gap-3 px-3 py-3 text-left hover:bg-accent/40 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-64"
     >
       {icon}
       <div className="flex min-w-0 flex-1 flex-col">
diff --git a/apps/web/src/components/ui/empty.tsx b/apps/web/src/components/ui/empty.tsx
index 5390dd665620..aa69c3624013 100644
--- a/apps/web/src/components/ui/empty.tsx
+++ b/apps/web/src/components/ui/empty.tsx
@@ -2,11 +2,25 @@ import { cva, type VariantProps } from "class-variance-authority";
 
 import { cn } from "~/lib/utils";
 
-function Empty({ className, ...props }: React.ComponentProps<"div">) {
+// Size sets how much room the state claims and how large its title reads:
+// "compact" is a card-sized notice, "hero" fills a whole route.
+const emptySizeClassName = {
+  compact:
+    "min-h-64 gap-4 p-6 md:p-10 [&_[data-slot=empty-media]]:mb-0 [&_[data-slot=empty-title]]:text-[1.0625rem] [&_[data-slot=empty-title]]:leading-6 [&_[data-slot=empty-description]]:text-[0.8125rem] [&_[data-slot=empty-description]]:leading-[1.125rem]",
+  default: "gap-6 p-6 md:p-12",
+  hero: "gap-6 p-6 md:p-12 [&_[data-slot=empty-title]]:text-2xl sm:[&_[data-slot=empty-title]]:text-3xl",
+} as const;
+
+function Empty({
+  className,
+  size = "default",
+  ...props
+}: React.ComponentProps<"div"> & { size?: keyof typeof emptySizeClassName }) {
   return (
     <div
       className={cn(
-        "flex min-w-0 flex-1 flex-col items-center justify-center gap-6 text-balance p-6 text-center md:p-12",
+        "flex min-w-0 flex-1 flex-col items-center justify-center text-balance text-center",
+        emptySizeClassName[size],
         className,
       )}
       data-slot="empty"
@@ -77,11 +91,7 @@ function EmptyMedia({
 
 function EmptyTitle({ className, ...props }: React.ComponentProps<"div">) {
   return (
-    <div
-      className={cn("font-heading font-semibold text-xl", className)}
-      data-slot="empty-title"
-      {...props}
-    />
+    <div className={cn("font-semibold text-xl", className)} data-slot="empty-title" {...props} />
   );
 }
 
@@ -89,7 +99,7 @@ function EmptyDescription({ className, ...props }: React.ComponentProps<"p">) {
   return (
     <div
       className={cn(
-        "text-muted-foreground text-sm [&>a:hover]:text-primary [&>a]:underline [&>a]:underline-offset-4 [[data-slot=empty-title]+&]:mt-1",
+        "text-muted-foreground text-sm [&>a:hover]:text-primary [&>a]:underline [&>a]:underline-offset-4 [[data-slot=empty-title]+&]:mt-1 [[data-slot=empty-description]+&]:mt-1",
         className,
       )}
       data-slot="empty-description"
diff --git a/apps/web/src/components/ui/input.tsx b/apps/web/src/components/ui/input.tsx
index cae3dfe62852..448986505a00 100644
--- a/apps/web/src/components/ui/input.tsx
+++ b/apps/web/src/components/ui/input.tsx
@@ -7,6 +7,8 @@ import { cn } from "~/lib/utils";
 
 type InputProps = Omit<InputPrimitive.Props & React.RefAttributes<HTMLInputElement>, "size"> & {
   size?: "sm" | "compact" | "default" | "lg" | number;
+  /** Monospace with tabular digits, for paths, commands, colors and numbers. */
+  font?: "default" | "mono";
   unstyled?: boolean;
   nativeInput?: boolean;
 };
@@ -14,6 +16,7 @@ type InputProps = Omit<InputPrimitive.Props & React.RefAttributes<HTMLInputEleme
 function Input({
   className,
   size = "default",
+  font = "default",
   unstyled = false,
   nativeInput = false,
   ...props
@@ -25,6 +28,9 @@ function Input({
     size === "lg" && "h-9.5 leading-9.5 sm:h-8.5 sm:leading-8.5",
     props.type === "search" &&
       "[&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none [&::-webkit-search-results-button]:appearance-none [&::-webkit-search-results-decoration]:appearance-none",
+    // Number fields are typed into; browser spin buttons crowd narrow fields and step by 1.
+    props.type === "number" &&
+      "[appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none",
     props.type === "file" &&
       "text-muted-foreground file:me-3 file:bg-transparent file:font-medium file:text-foreground file:text-sm",
   );
@@ -63,6 +69,7 @@ function Input({
           !unstyled &&
             size === "compact" &&
             "rounded-md before:rounded-[calc(var(--radius-md)-1px)]",
+          font === "mono" && "font-mono tabular-nums",
           className,
         ) || undefined
       }
diff --git a/apps/web/src/components/ui/menu.tsx b/apps/web/src/components/ui/menu.tsx
index 8beed75880ae..a8687dcdbc7d 100644
--- a/apps/web/src/components/ui/menu.tsx
+++ b/apps/web/src/components/ui/menu.tsx
@@ -35,13 +35,6 @@ function MenuPopup({
   anchor?: MenuPrimitive.Positioner.Props["anchor"];
   keepMounted?: boolean;
 }) {
-  const hasExplicitWidthClass =
-    typeof className === "string" &&
-    className.split(/\s+/).some((classToken) => {
-      const utility = classToken.split(":").at(-1) ?? classToken;
-      return /^(?:min-|max-)?w-/.test(utility);
-    });
-
   return (
     <MenuPrimitive.Portal keepMounted={keepMounted}>
       <MenuPrimitive.Positioner
@@ -60,7 +53,8 @@ function MenuPopup({
             // the Review panel header). Drag hit-testing ignores z-index, so
             // the topmost row would stay unhoverable without this opt-out.
             "[-webkit-app-region:no-drag]",
-            !hasExplicitWidthClass && "min-w-32",
+            // Menus size to their content from one minimum, never past the viewport.
+            "min-w-[min(10rem,calc(100vw-2rem))] max-w-[calc(100vw-2rem)]",
             className,
           )}
           data-slot="menu-popup"
@@ -117,7 +111,7 @@ function MenuItemLabel({ className, ...props }: React.ComponentProps<"span">) {
     <span
       data-slot="menu-item-label"
       className={cn(
-        "min-w-0 in-data-[density=touch]:[text-box:trim-both_cap_alphabetic] supports-[text-box:trim-both_cap_alphabetic]:in-data-[density=touch]:py-[0.5em]",
+        "min-w-0 truncate in-data-[density=touch]:[text-box:trim-both_cap_alphabetic] supports-[text-box:trim-both_cap_alphabetic]:in-data-[density=touch]:py-[0.5em]",
         className,
       )}
       {...props}
@@ -139,7 +133,9 @@ function MenuCheckboxItem({
       checked={checked}
       className={cn(
         "grid min-h-8 in-data-[side=none]:min-w-[calc(var(--anchor-width)+1.25rem)] cursor-pointer items-center gap-2 rounded-sm py-1 ps-2 text-base text-foreground outline-none data-disabled:pointer-events-none data-disabled:cursor-not-allowed data-highlighted:bg-accent data-highlighted:text-accent-foreground data-disabled:opacity-64 sm:min-h-7 sm:text-sm [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
-        variant === "switch" ? "grid-cols-[1fr_auto] gap-4 pe-1.5" : "grid-cols-[1rem_1fr] pe-4",
+        variant === "switch"
+          ? "grid-cols-[1fr_auto] gap-4 pe-1.5"
+          : "grid-cols-[1rem_minmax(0,1fr)] pe-4",
         className,
       )}
       data-slot="menu-checkbox-item"
diff --git a/apps/web/src/components/ui/popover.tsx b/apps/web/src/components/ui/popover.tsx
index aec9ce9452b0..5954f3d731d3 100644
--- a/apps/web/src/components/ui/popover.tsx
+++ b/apps/web/src/components/ui/popover.tsx
@@ -16,10 +16,29 @@ function PopoverTrigger({ className, children, ...props }: PopoverPrimitive.Trig
   );
 }
 
+// Popovers hold prose and forms, so a width is fixed rather than a minimum,
+// and every width is capped to the viewport.
+const popoverPopupWidthClassName = {
+  auto: "",
+  sm: "w-64",
+  md: "w-80",
+  lg: "w-96",
+} as const;
+
+// The inset around the content. "compact" suits dense content (a list, a code excerpt, a
+// row of reactions); "none" is for content that draws its own frame edge to edge.
+const popoverViewportPaddingClassName = {
+  default: "py-4 [--viewport-inline-padding:--spacing(4)]",
+  compact: "py-2 [--viewport-inline-padding:--spacing(3)]",
+  // Rounded to the popup so edge-to-edge content clips to its corners.
+  none: "rounded-[calc(var(--radius-lg)-1px)] py-0 [--viewport-inline-padding:0px]",
+} as const;
+
 function PopoverPopup({
   children,
   className,
-  viewportClassName,
+  padding = "default",
+  width = "auto",
   side = "bottom",
   align = "center",
   sideOffset = 4,
@@ -29,7 +48,7 @@ function PopoverPopup({
   anchor,
   ...props
 }: PopoverPrimitive.Popup.Props & {
-  viewportClassName?: string;
+  padding?: keyof typeof popoverViewportPaddingClassName;
   side?: PopoverPrimitive.Positioner.Props["side"];
   align?: PopoverPrimitive.Positioner.Props["align"];
   sideOffset?: PopoverPrimitive.Positioner.Props["sideOffset"];
@@ -37,6 +56,7 @@ function PopoverPopup({
   tooltipStyle?: boolean;
   keepMounted?: PopoverPrimitive.Portal.Props["keepMounted"];
   anchor?: PopoverPrimitive.Positioner.Props["anchor"];
+  width?: keyof typeof popoverPopupWidthClassName;
 }) {
   // Viewport rekeys its children when the active trigger clears on close. Persistent
   // single-trigger forms need a stable container to retain drafts and submit guards.
@@ -59,6 +79,7 @@ function PopoverPopup({
               "w-fit text-balance rounded-md text-xs shadow-md/5 before:rounded-[calc(var(--radius-md)-1px)]",
             !tooltipStyle &&
               "shadow-[0_16px_40px_-18px_rgb(0_0_0/55%)] dark:shadow-[0_18px_44px_-18px_rgb(0_0_0/80%)]",
+            width !== "auto" && ["max-w-[calc(100vw-2rem)]", popoverPopupWidthClassName[width]],
             className,
           )}
           data-slot="popover-popup"
@@ -66,11 +87,11 @@ function PopoverPopup({
         >
           <Viewport
             className={cn(
-              "relative size-full max-h-(--available-height) overflow-clip px-(--viewport-inline-padding) py-4 [--viewport-inline-padding:--spacing(4)] has-data-[slot=calendar]:p-2 data-instant:transition-none **:data-current:data-ending-style:opacity-0 **:data-current:data-starting-style:opacity-0 **:data-previous:data-ending-style:opacity-0 **:data-previous:data-starting-style:opacity-0 **:data-current:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-previous:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-current:opacity-100 **:data-previous:opacity-100 **:data-current:transition-opacity **:data-previous:transition-opacity",
-              tooltipStyle
+              "relative size-full max-h-(--available-height) overflow-clip px-(--viewport-inline-padding) has-data-[slot=calendar]:p-2 data-instant:transition-none **:data-current:data-ending-style:opacity-0 **:data-current:data-starting-style:opacity-0 **:data-previous:data-ending-style:opacity-0 **:data-previous:data-starting-style:opacity-0 **:data-current:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-previous:w-[calc(var(--popup-width)-2*var(--viewport-inline-padding)-2px)] **:data-current:opacity-100 **:data-previous:opacity-100 **:data-current:transition-opacity **:data-previous:transition-opacity",
+              tooltipStyle && padding === "default"
                 ? "py-1 [--viewport-inline-padding:--spacing(2)]"
-                : "not-data-transitioning:overflow-y-auto",
-              viewportClassName,
+                : popoverViewportPaddingClassName[padding],
+              !tooltipStyle && "not-data-transitioning:overflow-y-auto",
             )}
             data-slot="popover-viewport"
           >
@@ -89,7 +110,7 @@ function PopoverClose({ ...props }: PopoverPrimitive.Close.Props) {
 function PopoverTitle({ className, ...props }: PopoverPrimitive.Title.Props) {
   return (
     <PopoverPrimitive.Title
-      className={cn("font-semibold text-lg leading-none", className)}
+      className={cn("font-semibold text-sm leading-none", className)}
       data-slot="popover-title"
       {...props}
     />
diff --git a/apps/web/src/components/ui/scroll-area.tsx b/apps/web/src/components/ui/scroll-area.tsx
index 852a3ed10053..ce9d41edaa5d 100644
--- a/apps/web/src/components/ui/scroll-area.tsx
+++ b/apps/web/src/components/ui/scroll-area.tsx
@@ -29,6 +29,8 @@ function ScrollArea({
   scrollbarGutter = false,
   hideScrollbars = false,
   chainVerticalScroll = false,
+  radius = "inherit",
+  viewportTabIndex,
   ...props
 }: ScrollAreaPrimitive.Root.Props & {
   scrollFade?: boolean;
@@ -38,15 +40,24 @@ function ScrollArea({
   scrollbarGutter?: boolean;
   hideScrollbars?: boolean;
   chainVerticalScroll?: boolean;
+  /** The viewport clips to the parent's radius; "none" for a region flush to an edge. */
+  radius?: "inherit" | "none";
+  /** Override Base UI's focusable viewport when focusable descendants provide scroll access. */
+  viewportTabIndex?: number;
 }) {
   return (
     <ScrollAreaPrimitive.Root
-      className={cn("relative size-full min-h-0 overflow-hidden rounded-[inherit]", className)}
+      className={cn(
+        "relative size-full min-h-0 overflow-hidden",
+        radius === "none" ? "rounded-none" : "rounded-[inherit]",
+        className,
+      )}
       {...props}
     >
       <ScrollAreaPrimitive.Viewport
+        {...(viewportTabIndex === undefined ? {} : { tabIndex: viewportTabIndex })}
         className={cn(
-          "h-full max-h-[inherit] overflow-auto overscroll-contain rounded-[inherit] outline-none transition-shadows focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-has-overflow-x:overscroll-x-contain",
+          "h-full max-h-[inherit] overflow-auto overscroll-contain rounded-[inherit] outline-none transition-shadow focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background data-has-overflow-x:overscroll-x-contain",
           chainVerticalScroll && "overscroll-y-auto",
           scrollFade &&
             "mask-t-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-start)))] mask-b-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-y-end)))] mask-l-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-start)))] mask-r-from-[calc(100%-min(var(--fade-size),var(--scroll-area-overflow-x-end)))] [--fade-size:1.5rem]",
diff --git a/apps/web/src/components/ui/select.tsx b/apps/web/src/components/ui/select.tsx
index a7ab17eb9289..5be840b39beb 100644
--- a/apps/web/src/components/ui/select.tsx
+++ b/apps/web/src/components/ui/select.tsx
@@ -1,5 +1,7 @@
 "use client";
+import { mergeProps } from "@base-ui/react/merge-props";
 import { Select as SelectPrimitive } from "@base-ui/react/select";
+import { useRender } from "@base-ui/react/use-render";
 import { cva, type VariantProps } from "class-variance-authority";
 import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
 import type * as React from "react";
@@ -57,6 +59,37 @@ function SelectTrigger({
   );
 }
 
+/**
+ * The select-field look for a picker that is not a Select, such as a Menu or
+ * Combobox trigger. Render it as that trigger: `<MenuTrigger render={<SelectButton />}>`.
+ */
+function SelectButton({
+  className,
+  size = "default",
+  children,
+  render,
+  ...props
+}: useRender.ComponentProps<"button"> & Pick<VariantProps<typeof selectTriggerVariants>, "size">) {
+  const defaultProps = {
+    className: cn(selectTriggerVariants({ size }), className),
+    "data-slot": "select-trigger",
+    type: render ? undefined : ("button" as const),
+  };
+  return useRender({
+    defaultTagName: "button",
+    props: {
+      ...mergeProps<"button">(defaultProps, props),
+      children: (
+        <>
+          <span className="min-w-0 flex-1 truncate text-left">{children}</span>
+          <ChevronDownIcon aria-hidden className="-me-1 size-3 shrink-0 opacity-50" />
+        </>
+      ),
+    },
+    render,
+  });
+}
+
 function SelectValue({ className, ...props }: SelectPrimitive.Value.Props) {
   return (
     <SelectPrimitive.Value
@@ -69,7 +102,6 @@ function SelectValue({ className, ...props }: SelectPrimitive.Value.Props) {
 
 function SelectPopup({
   className,
-  popupClassName,
   children,
   side = "bottom",
   sideOffset = 4,
@@ -80,7 +112,6 @@ function SelectPopup({
   anchor,
   ...props
 }: SelectPrimitive.Popup.Props & {
-  popupClassName?: string;
   side?: SelectPrimitive.Positioner.Props["side"];
   sideOffset?: SelectPrimitive.Positioner.Props["sideOffset"];
   align?: SelectPrimitive.Positioner.Props["align"];
@@ -116,7 +147,6 @@ function SelectPopup({
             className={cn(
               "dropdown-glass relative h-full rounded-lg shadow-[0_16px_40px_-18px_rgb(0_0_0/55%)] dark:shadow-[0_18px_44px_-18px_rgb(0_0_0/80%)]",
               matchTriggerWidth && "min-w-(--anchor-width)",
-              popupClassName,
             )}
           >
             <SelectPrimitive.List
@@ -182,7 +212,7 @@ function SelectGroupLabel(props: SelectPrimitive.GroupLabel.Props) {
 export {
   Select,
   SelectTrigger,
-  selectTriggerVariants,
+  SelectButton,
   SelectValue,
   SelectPopup,
   SelectPopup as SelectContent,
diff --git a/apps/web/src/components/ui/sheet.tsx b/apps/web/src/components/ui/sheet.tsx
index 0b68ff116484..f0b0017976cb 100644
--- a/apps/web/src/components/ui/sheet.tsx
+++ b/apps/web/src/components/ui/sheet.tsx
@@ -10,11 +10,13 @@ const Sheet = SheetPrimitive.Root;
 
 const SheetPortal = SheetPrimitive.Portal;
 
+// Sheets are docked panels, not dialogs: their layer (--z-sheet) sits under dialogs that open
+// from inside them and under anything the app floats above panels.
 function SheetBackdrop({ className, ...props }: SheetPrimitive.Backdrop.Props) {
   return (
     <SheetPrimitive.Backdrop
       className={cn(
-        "fixed inset-0 z-50 bg-background/60 backdrop-blur-xs transition-all duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0",
+        "fixed inset-0 z-(--z-sheet) bg-background/60 backdrop-blur-xs transition-all duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0",
         className,
       )}
       data-slot="sheet-backdrop"
@@ -35,7 +37,7 @@ function SheetViewport({
   return (
     <SheetPrimitive.Viewport
       className={cn(
-        "fixed inset-0 z-50 grid",
+        "fixed inset-0 z-(--z-sheet) grid",
         side === "bottom" && "grid grid-rows-[1fr_auto] pt-12",
         side === "top" && "grid grid-rows-[auto_1fr] pb-12",
         side === "left" && "flex justify-start",
@@ -55,8 +57,6 @@ function SheetPopup({
   showCloseButton = true,
   keepMounted = false,
   transitionDurationMs,
-  backdropClassName,
-  viewportClassName,
   side = "right",
   variant = "default",
   style,
@@ -65,8 +65,6 @@ function SheetPopup({
   showCloseButton?: boolean;
   keepMounted?: boolean;
   transitionDurationMs?: number;
-  backdropClassName?: string;
-  viewportClassName?: string;
   side?: "right" | "left" | "top" | "bottom";
   variant?: "default" | "inset";
 }) {
@@ -79,14 +77,14 @@ function SheetPopup({
   return (
     <SheetPortal keepMounted={keepMounted}>
       <SheetBackdrop
-        className={cn(
-          instant &&
-            "transition-none! data-ending-style:opacity-100! data-starting-style:opacity-100!",
-          backdropClassName,
-        )}
+        className={
+          instant
+            ? "transition-none! data-ending-style:opacity-100! data-starting-style:opacity-100!"
+            : undefined
+        }
         style={transitionStyle}
       />
-      <SheetViewport className={viewportClassName} side={side} variant={variant}>
+      <SheetViewport side={side} variant={variant}>
         <SheetPrimitive.Popup
           className={cn(
             "relative flex max-h-full min-h-0 w-full min-w-0 flex-col bg-popover not-dark:bg-clip-padding text-popover-foreground shadow-lg/5 transition-[opacity,translate] duration-200 ease-in-out will-change-transform before:pointer-events-none before:absolute before:inset-0 before:shadow-[0_1px_--theme(--color-black/4%)] data-ending-style:opacity-0 data-starting-style:opacity-0 max-sm:before:hidden dark:before:shadow-[0_-1px_--theme(--color-white/6%)]",
@@ -140,7 +138,7 @@ function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {
 function SheetTitle({ className, ...props }: SheetPrimitive.Title.Props) {
   return (
     <SheetPrimitive.Title
-      className={cn("font-heading font-semibold text-xl leading-none", className)}
+      className={cn("font-semibold text-xl leading-none", className)}
       data-slot="sheet-title"
       {...props}
     />
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index 180985620ba1..58957b1477d6 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -5,6 +5,7 @@ import { PanelLeftCloseIcon, PanelLeftIcon } from "lucide-react";
 import * as React from "react";
 import { cn } from "~/lib/utils";
 import { Button } from "~/components/ui/button";
+import { Input, type InputProps } from "~/components/ui/input";
 import { ScrollArea } from "~/components/ui/scroll-area";
 import {
   Sheet,
@@ -232,7 +233,7 @@ function Sidebar({
   if (isMobile) {
     return (
       <SidebarInstanceContext value={instanceContextValue}>
-        <Sheet onOpenChange={setOpenMobile} open={openMobile} {...props}>
+        <Sheet onOpenChange={setOpenMobile} open={openMobile}>
           <SheetPopup
             className={cn(
               "w-(--sidebar-width) max-w-none bg-sidebar surface-grain p-0 text-sidebar-foreground",
@@ -258,6 +259,7 @@ function Sidebar({
                 "flex h-full w-full flex-col pb-safe pt-safe",
                 side === "left" ? "pl-safe" : "pr-safe",
               )}
+              {...props}
             >
               {children}
             </div>
@@ -530,6 +532,20 @@ function SidebarRail({
   );
 }
 
+/** A bare search or rename field that sits in a row of sidebar chrome. */
+function SidebarInput({ className, ...props }: Omit<InputProps, "unstyled" | "variant">) {
+  return (
+    <Input
+      className={cn(
+        "[&_[data-slot=input]]:h-auto [&_[data-slot=input]]:p-0 [&_[data-slot=input]]:font-medium [&_[data-slot=input]]:text-sidebar-foreground [&_[data-slot=input]]:text-sm [&_[data-slot=input]]:leading-normal [&_[data-slot=input]]:placeholder:text-sidebar-muted-foreground",
+        className,
+      )}
+      unstyled
+      {...props}
+    />
+  );
+}
+
 function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {
   return (
     <main
@@ -582,12 +598,19 @@ function SidebarContent({
         hideScrollbars
         scrollFade
         scrollFadePadding={false}
+        // Thread rows provide keyboard access to this scroll region. Keeping
+        // Base UI's viewport out of the tab order lets its presentational role
+        // flatten in WebKit instead of becoming a VoiceOver interaction group.
+        viewportTabIndex={-1}
         className="h-auto min-h-0 flex-1 [&>[data-slot=scroll-area-viewport]]:[--fade-size:0.75rem]"
       >
         <div
           // Reordered rows must not pull the viewport to their new position.
           className={cn(
-            "flex w-full min-w-0 flex-col gap-2 [overflow-anchor:none] group-data-[collapsible=icon]:overflow-hidden",
+            // Stacked groups share one inset between them instead of doubling
+            // it, including across the fixed header's boundary.
+            "flex w-full min-w-0 flex-col [overflow-anchor:none] group-data-[collapsible=icon]:overflow-hidden [&>[data-sidebar=group]+[data-sidebar=group]]:pt-0",
+            fixedHeader && "[&>[data-sidebar=group]:first-child]:pt-0",
             className,
           )}
           data-sidebar="content"
@@ -636,7 +659,7 @@ function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) {
 }
 
 const sidebarMenuButtonVariants = cva(
-  "peer/menu-button flex w-full cursor-pointer items-center gap-[var(--sidebar-control-gap)] overflow-hidden text-left outline-hidden ring-ring transition-[width,height,padding] hover:bg-sidebar-row-hover hover:text-sidebar-foreground focus-visible:ring-2 active:bg-sidebar-row-active active:text-sidebar-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-sidebar-row-selected data-[active=true]:font-medium data-[active=true]:text-sidebar-foreground data-[state=open]:hover:bg-sidebar-row-hover data-[state=open]:hover:text-sidebar-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-[var(--sidebar-content-inset)]! [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0 [&>svg]:text-[var(--sidebar-icon-color)] hover:[&>svg]:text-sidebar-foreground active:[&>svg]:text-sidebar-foreground data-[active=true]:[&>svg]:text-sidebar-foreground",
+  "peer/menu-button flex w-full cursor-pointer items-center gap-[var(--sidebar-control-gap)] overflow-hidden text-left outline-hidden ring-ring transition-[width,height,padding] hover:bg-sidebar-row-hover hover:text-sidebar-foreground focus-visible:ring-2 active:bg-sidebar-row-active active:text-sidebar-foreground disabled:pointer-events-none disabled:opacity-64 aria-disabled:pointer-events-none aria-disabled:opacity-64 data-[active=true]:bg-sidebar-row-selected data-[active=true]:font-medium data-[active=true]:text-sidebar-foreground data-[state=open]:hover:bg-sidebar-row-hover data-[state=open]:hover:text-sidebar-foreground group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-[var(--sidebar-content-inset)]! [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0 [&>svg]:text-[var(--sidebar-icon-color)] hover:[&>svg]:text-sidebar-foreground active:[&>svg]:text-sidebar-foreground data-[active=true]:[&>svg]:text-sidebar-foreground",
   {
     defaultVariants: {
       size: "default",
@@ -749,7 +772,7 @@ function SidebarMenuSubButton({
 }) {
   const defaultProps = {
     className: cn(
-      "-translate-x-px flex h-7 min-w-0 cursor-pointer items-center gap-2 overflow-hidden rounded-lg px-2 text-sidebar-foreground outline-hidden ring-ring hover:bg-sidebar-row-hover hover:text-sidebar-foreground focus-visible:ring-2 active:bg-sidebar-row-active active:text-sidebar-foreground disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-muted-foreground",
+      "-translate-x-px flex h-7 min-w-0 cursor-pointer items-center gap-2 overflow-hidden rounded-lg px-2 text-sidebar-foreground outline-hidden ring-ring hover:bg-sidebar-row-hover hover:text-sidebar-foreground focus-visible:ring-2 active:bg-sidebar-row-active active:text-sidebar-foreground disabled:pointer-events-none disabled:opacity-64 aria-disabled:pointer-events-none aria-disabled:opacity-64 [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0 [&>svg]:text-sidebar-muted-foreground",
       "data-[active=true]:bg-sidebar-row-selected data-[active=true]:text-sidebar-foreground",
       size === "sm" && "text-xs",
       size === "md" && "text-sm",
@@ -770,6 +793,7 @@ function SidebarMenuSubButton({
 }
 
 export {
+  SidebarInput,
   Sidebar,
   SidebarContent,
   SidebarFooter,
diff --git a/apps/web/src/components/ui/skeleton.tsx b/apps/web/src/components/ui/skeleton.tsx
index 0d6e12eaa580..f9fe5b5592f8 100644
--- a/apps/web/src/components/ui/skeleton.tsx
+++ b/apps/web/src/components/ui/skeleton.tsx
@@ -1,12 +1,27 @@
+import { cva, type VariantProps } from "class-variance-authority";
+
 import { cn } from "~/lib/utils";
 
-function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
+// A skeleton's width and height are its content, so consumers size it through
+// className (the lint contract allows layout there). Its shape is not.
+const skeletonVariants = cva("bg-muted-foreground/15 motion-safe:animate-skeleton", {
+  variants: {
+    shape: {
+      block: "rounded-sm",
+      card: "rounded-lg",
+      pill: "rounded-full",
+    },
+  },
+  defaultVariants: { shape: "block" },
+});
+
+function Skeleton({
+  className,
+  shape,
+  ...props
+}: React.ComponentProps<"div"> & VariantProps<typeof skeletonVariants>) {
   return (
-    <div
-      className={cn("rounded-sm bg-muted-foreground/15 motion-safe:animate-skeleton", className)}
-      data-slot="skeleton"
-      {...props}
-    />
+    <div className={cn(skeletonVariants({ shape }), className)} data-slot="skeleton" {...props} />
   );
 }
 
diff --git a/apps/web/src/components/ui/switch.test.tsx b/apps/web/src/components/ui/switch.test.tsx
new file mode 100644
index 000000000000..4b21d7018d4c
--- /dev/null
+++ b/apps/web/src/components/ui/switch.test.tsx
@@ -0,0 +1,80 @@
+// @vitest-environment jsdom
+
+import { act, useState } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
+
+import { Switch } from "./switch";
+
+let root: Root;
+let container: HTMLDivElement;
+
+beforeEach(() => {
+  vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+  container = document.createElement("div");
+  document.body.append(container);
+  root = createRoot(container);
+});
+
+afterEach(async () => {
+  await act(async () => root.unmount());
+  container.remove();
+  vi.unstubAllGlobals();
+});
+
+function ControlledSwitch({
+  initialChecked,
+  initialMixed = false,
+}: {
+  initialChecked: boolean;
+  initialMixed?: boolean;
+}) {
+  const [checked, setChecked] = useState(initialChecked);
+  const [mixed, setMixed] = useState(initialMixed);
+
+  return (
+    <Switch
+      aria-label="Enable Claude Code"
+      checked={checked}
+      mixed={mixed}
+      onCheckedChange={(nextChecked) => {
+        setMixed(false);
+        setChecked(nextChecked);
+      }}
+    />
+  );
+}
+
+function switchRoot() {
+  const element = container.querySelector<HTMLElement>('[role="switch"]');
+  if (!element) throw new Error("Switch was not rendered");
+  return element;
+}
+
+async function clickSwitch() {
+  await act(async () => switchRoot().click());
+}
+
+async function renderSwitch(initialChecked: boolean, initialMixed = false) {
+  await act(async () => {
+    root.render(<ControlledSwitch {...{ initialChecked, initialMixed }} />);
+  });
+}
+
+describe("Switch accessibility", () => {
+  it.each([
+    { initialChecked: false, initialMixed: false, before: false, after: true },
+    { initialChecked: true, initialMixed: false, before: true, after: false },
+    { initialChecked: false, initialMixed: true, before: "mixed", after: true },
+  ])("exposes $before before activation and $after after activation", async (state) => {
+    await renderSwitch(state.initialChecked, state.initialMixed);
+    expect(switchRoot().getAttribute("aria-checked")).toBe(String(state.before));
+
+    await clickSwitch();
+
+    expect(switchRoot().getAttribute("aria-checked")).toBe(String(state.after));
+    expect(container.querySelector<HTMLInputElement>('input[type="checkbox"]')?.checked).toBe(
+      state.after,
+    );
+  });
+});
diff --git a/apps/web/src/components/ui/switch.tsx b/apps/web/src/components/ui/switch.tsx
index 33114c5512be..e6bf20aa64c7 100644
--- a/apps/web/src/components/ui/switch.tsx
+++ b/apps/web/src/components/ui/switch.tsx
@@ -27,7 +27,10 @@ function Switch({
       data-size={size}
       data-slot="switch"
       data-mixed={mixed ? "" : undefined}
-      aria-checked={mixed ? "mixed" : undefined}
+      // Base UI copies every key we pass, even `undefined`, over its own
+      // aria-checked. Only pass the attribute when mixed so the real state
+      // survives for screen readers.
+      {...(mixed ? { "aria-checked": "mixed" as const } : {})}
       {...props}
     >
       <SwitchPrimitive.Thumb
diff --git a/apps/web/src/components/ui/textarea.tsx b/apps/web/src/components/ui/textarea.tsx
index 586ae8e4430a..ad19b187a435 100644
--- a/apps/web/src/components/ui/textarea.tsx
+++ b/apps/web/src/components/ui/textarea.tsx
@@ -28,7 +28,8 @@ function Textarea({ className, size = "default", unstyled = false, ...props }: T
         render={(defaultProps) => (
           <textarea
             className={cn(
-              "field-sizing-content min-h-17.5 w-full rounded-[inherit] px-[calc(--spacing(3)-1px)] py-[calc(--spacing(1.5)-1px)] outline-none max-sm:min-h-20.5",
+              // Auto-grows with content up to one cap, then scrolls.
+              "field-sizing-content min-h-17.5 max-h-64 w-full rounded-[inherit] px-[calc(--spacing(3)-1px)] py-[calc(--spacing(1.5)-1px)] outline-none max-sm:min-h-20.5",
               size === "sm" &&
                 "min-h-16.5 px-[calc(--spacing(2.5)-1px)] py-[calc(--spacing(1)-1px)] max-sm:min-h-19.5",
               size === "lg" && "min-h-18.5 py-[calc(--spacing(2)-1px)] max-sm:min-h-21.5",
diff --git a/apps/web/src/components/ui/toggle.tsx b/apps/web/src/components/ui/toggle.tsx
index 17efb492ebeb..070d47466a7d 100644
--- a/apps/web/src/components/ui/toggle.tsx
+++ b/apps/web/src/components/ui/toggle.tsx
@@ -6,7 +6,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import { cn } from "~/lib/utils";
 
 const toggleVariants = cva(
-  "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer select-none items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-base text-foreground outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 data-pressed:bg-input/64 data-pressed:text-accent-foreground sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+  "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer select-none items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-base text-foreground outline-none transition-shadow before:pointer-events-none before:absolute before:inset-0 before:rounded-[calc(var(--radius-lg)-1px)] pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 aria-disabled:opacity-64 data-pressed:bg-input/64 data-pressed:text-accent-foreground sm:text-sm [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
   {
     defaultVariants: {
       size: "default",
@@ -52,4 +52,5 @@ function Toggle({
   );
 }
 
+// The *Variants function is for components/ui modules only.
 export { Toggle, toggleVariants };
diff --git a/apps/web/src/components/ui/tooltip.tsx b/apps/web/src/components/ui/tooltip.tsx
index c0aaea40ceae..7ba9e4c238c4 100644
--- a/apps/web/src/components/ui/tooltip.tsx
+++ b/apps/web/src/components/ui/tooltip.tsx
@@ -23,7 +23,8 @@ function TooltipPopup({
   align?: TooltipPrimitive.Positioner.Props["align"];
   side?: TooltipPrimitive.Positioner.Props["side"];
   sideOffset?: TooltipPrimitive.Positioner.Props["sideOffset"];
-  variant?: "default" | "glass";
+  /** `code` renders monospace content that breaks anywhere, for paths and commands. */
+  variant?: "default" | "glass" | "code";
   anchor?: TooltipPrimitive.Positioner.Props["anchor"];
 }) {
   return (
@@ -42,6 +43,10 @@ function TooltipPopup({
             variant === "glass"
               ? "dropdown-glass shadow-xl shadow-black/25 before:hidden"
               : "border bg-popover not-dark:bg-clip-padding shadow-md/5",
+            // One wrap width for prose; code dumps get more room and break anywhere.
+            variant === "code"
+              ? "max-w-120 wrap-anywhere text-left font-mono text-[11px] leading-relaxed"
+              : "max-w-80 wrap-anywhere whitespace-normal leading-snug",
             className,
           )}
           data-slot="tooltip-popup"
diff --git a/apps/web/src/components/ui/wizard.tsx b/apps/web/src/components/ui/wizard.tsx
index 925b263f4530..39878e7d7d7f 100644
--- a/apps/web/src/components/ui/wizard.tsx
+++ b/apps/web/src/components/ui/wizard.tsx
@@ -8,10 +8,19 @@ import { DialogPopup, DialogHeader, DialogTitle, DialogDescription, DialogFooter
 /** Compose a wizard from its header, panel, and footer; flow logic stays with the caller. */
 export function WizardPopup({
   children,
+  size = "default",
   ...props
-}: Omit<ComponentProps<typeof DialogPopup>, "className" | "style">) {
+}: Omit<ComponentProps<typeof DialogPopup>, "className" | "style"> & {
+  readonly size?: "default" | "wide";
+}) {
   return (
-    <DialogPopup {...props} className="max-w-xl overflow-x-hidden overflow-y-auto">
+    <DialogPopup
+      {...props}
+      className={cn(
+        "overflow-x-hidden overflow-y-auto",
+        size === "wide" ? "max-w-3xl" : "max-w-xl",
+      )}
+    >
       <div className="flex min-h-0 flex-col">{children}</div>
     </DialogPopup>
   );
diff --git a/apps/web/src/components/usage/UsageLimits.tsx b/apps/web/src/components/usage/UsageLimits.tsx
index 6d30d49a7e4a..585bd6ccf100 100644
--- a/apps/web/src/components/usage/UsageLimits.tsx
+++ b/apps/web/src/components/usage/UsageLimits.tsx
@@ -17,7 +17,7 @@ import {
   remainingPercent,
 } from "@t3tools/shared/usageLimits";
 import { GaugeIcon, TrendingDownIcon, TrendingUpIcon } from "lucide-react";
-import { Fragment, useState } from "react";
+import { Fragment, type ReactNode, useState } from "react";
 
 import { usePrimarySettings } from "../../hooks/useSettings";
 import { environmentPresentations } from "../../state/presentation";
@@ -127,7 +127,7 @@ function WindowBar({
           />
         ) : null}
       </TooltipTrigger>
-      <TooltipPopup side="top" className="max-w-72 text-xs">
+      <TooltipPopup side="top">
         <div className="flex flex-col gap-0.5">
           <span className="text-foreground">
             {remaining}% left{timeLeft !== null ? ` · ${timeLeft}% of the window left` : ""}
@@ -322,14 +322,16 @@ export function ResetCredits({
 export function UsageLimitsSection({
   selectedEnvironmentIds,
   now,
+  cursorPrompt,
 }: {
   readonly selectedEnvironmentIds: ReadonlySet<EnvironmentId> | null;
   readonly now: number;
+  readonly cursorPrompt?: ReactNode;
 }) {
   const presentations = useAtomValue(environmentPresentations.presentationsAtom);
   const selected =
     selectedEnvironmentIds === null
       ? presentations
       : new Map([...presentations].filter(([id]) => selectedEnvironmentIds.has(id)));
-  return <UsageLimitsPooled presentations={selected} now={now} />;
+  return <UsageLimitsPooled presentations={selected} now={now} cursorPrompt={cursorPrompt} />;
 }
diff --git a/apps/web/src/components/usage/UsageLimitsPooled.tsx b/apps/web/src/components/usage/UsageLimitsPooled.tsx
index 1317cef89839..d99ce30b475c 100644
--- a/apps/web/src/components/usage/UsageLimitsPooled.tsx
+++ b/apps/web/src/components/usage/UsageLimitsPooled.tsx
@@ -1,8 +1,11 @@
 import {
+  CHATGPT_USAGE_URL,
   collectLimitAccounts,
+  collectExternalUsageLinks,
   collectLimitNotices,
   collectLimitPools,
-  formatDuration,
+  cursorUsageWindowDetails,
+  displayLimitWindows,
   formatResetsIn,
   type LimitAccount,
   type LimitPool,
@@ -10,9 +13,10 @@ import {
   type LimitPoolWindow,
   remainingPercent,
 } from "@t3tools/shared/usageLimits";
-import { AlertTriangleIcon, TicketIcon } from "lucide-react";
-import { type ReactNode, useState } from "react";
+import { AlertTriangleIcon, ExternalLinkIcon, TicketIcon } from "lucide-react";
+import { Fragment, type ReactNode, useState } from "react";
 
+import { ensureLocalApi } from "../../localApi";
 import { usePrimarySettings } from "../../hooks/useSettings";
 import { cn } from "../../lib/utils";
 import { formatUpcomingTimestamp } from "../../timestampFormat";
@@ -20,6 +24,7 @@ import { ProviderInstanceIcon } from "../chat/ProviderInstanceIcon";
 import { getDriverOption } from "../settings/providerDriverMeta";
 import { RedactedSensitiveText } from "../settings/RedactedSensitiveText";
 import { Button } from "../ui/button";
+import { OpenAI } from "../Icons";
 import { Alert, AlertTitle } from "../ui/alert";
 import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import {
@@ -52,7 +57,7 @@ function AccountChip({ email }: { readonly email: string }) {
     <span
       role="img"
       aria-label={`Account ${accountInitials(email)}`}
-      className="inline-flex size-4 shrink-0 items-center justify-center rounded-full text-[9px] leading-none font-semibold"
+      className="inline-flex size-4 shrink-0 items-center justify-center rounded-full text-3xs leading-none font-semibold"
       style={{ backgroundColor: `oklch(0.85 0.08 ${hue})`, color: `oklch(0.35 0.1 ${hue})` }}
     >
       {accountInitials(email)}
@@ -224,6 +229,7 @@ function PoolSegment({
   color,
   now,
   index,
+  showAccountName,
 }: {
   readonly account: LimitAccount;
   readonly window: LimitPoolMember["window"];
@@ -232,6 +238,7 @@ function PoolSegment({
   readonly now: number;
   /** 1-based position in the bar, shown on the strip and its legend row to tie them together. */
   readonly index: number;
+  readonly showAccountName: boolean;
 }) {
   const [open, setOpen] = useState(false);
   const remaining = remainingPercent(window);
@@ -269,15 +276,20 @@ function PoolSegment({
         ) : null}
         <span
           aria-hidden
-          className="absolute inset-0 flex items-center justify-center text-[10px] leading-none font-semibold text-foreground/80 tabular-nums @2xl/pool:hidden"
+          className="absolute inset-0 flex items-center justify-center text-3xs leading-none font-semibold text-foreground/80 tabular-nums @2xl/pool:hidden"
         >
           {index}
         </span>
         <div className="relative hidden h-full min-w-0 items-center gap-1.5 px-2 text-xs @2xl/pool:flex">
-          <AccountName account={account} className="min-w-0 truncate font-medium text-foreground" />
+          {showAccountName ? (
+            <AccountName
+              account={account}
+              className="min-w-0 truncate font-medium text-foreground"
+            />
+          ) : null}
           <span className="shrink-0 font-semibold text-foreground tabular-nums">{remaining}%</span>
           {/* Countdown and badge get their own plate: fill and hatching run under them otherwise. */}
-          <span className="ms-auto flex shrink-0 items-center gap-1.5 rounded-sm bg-background/85 px-1.5 py-0.5 text-[11px] text-foreground tabular-nums">
+          <span className="ms-auto flex shrink-0 items-center gap-1.5 rounded-sm bg-background/85 px-1.5 py-0.5 text-2xs text-foreground tabular-nums">
             {resetsIn?.replace("resets in ", "↻ ") ?? ""}
             {credits ? (
               <>
@@ -345,9 +357,10 @@ function LegendRow({
   return (
     <PopoverTrigger
       style={{ gridColumn: "1 / -1", gridRow: index + 1 }}
-      className="flex min-h-7 min-w-0 cursor-pointer items-center gap-2 rounded-md px-1 py-0.5 text-start text-xs outline-none focus-visible:ring-2 focus-visible:ring-ring @2xl/pool:hidden"
+      render={<Button variant="ghost" size="compact" />}
+      className="min-w-0 @2xl/pool:hidden"
     >
-      <span className="relative inline-flex size-4 shrink-0 items-center justify-center rounded-sm text-[10px] leading-none font-semibold text-foreground/80 tabular-nums">
+      <span className="relative inline-flex size-4 shrink-0 items-center justify-center rounded-sm text-3xs leading-none font-semibold text-foreground/80 tabular-nums">
         <span
           aria-hidden
           className="absolute inset-0 rounded-sm opacity-35"
@@ -358,7 +371,7 @@ function LegendRow({
       </span>
       <AccountName account={account} className="min-w-0 truncate font-medium text-foreground" />
       <span className="shrink-0 font-semibold text-foreground tabular-nums">{remaining}%</span>
-      <span className="ms-auto flex shrink-0 items-center gap-1.5 text-[11px] text-muted-foreground tabular-nums">
+      <span className="ms-auto flex shrink-0 items-center gap-1.5 text-2xs text-muted-foreground tabular-nums">
         {resetsIn?.replace("resets in ", "↻ ") ?? ""}
         {credits ? (
           <>
@@ -462,6 +475,7 @@ function PoolBar({
               color={color}
               now={now}
               index={position + 1}
+              showAccountName={pool.columns.length > 1}
             />
           ) : null,
         )}
@@ -478,17 +492,21 @@ function PoolWindowCard({
   pool,
   color,
   now,
+  label,
+  description,
 }: {
   readonly pool: LimitPoolWindow;
   readonly color: string;
   readonly now: number;
+  readonly label?: string | undefined;
+  readonly description?: string | undefined;
 }) {
   // The soonest reset that hands anything back; an untouched account resets to no effect.
   const nextRefill = pool.resets.find((reset) => reset.restoresPercent > 0);
   return (
     <div className="grid items-center gap-x-6 gap-y-3 rounded-lg border border-border/60 p-4 md:grid-cols-[11rem_minmax(0,1fr)]">
       <div className="flex flex-col gap-1">
-        <span className="text-sm font-medium text-foreground">{pool.label}</span>
+        <span className="text-sm font-medium text-foreground">{label ?? pool.label}</span>
         <span className="flex items-baseline gap-2">
           <span className="text-3xl font-semibold text-foreground tabular-nums">
             {pool.remainingPercent}%
@@ -496,14 +514,16 @@ function PoolWindowCard({
           <span className="text-sm text-muted-foreground">left</span>
           {pool.pace ? <PaceIcon pace={pool.pace} /> : null}
         </span>
-        {nextRefill ? (
-          <span className="text-xs text-muted-foreground tabular-nums">
-            <span className="font-medium text-foreground">↻ +{nextRefill.restoresPercent}%</span>{" "}
-            {nextRefill.at <= now ? "now" : `in ${formatDuration(nextRefill.at - now)}`}
+        {nextRefill && pool.columns.length > 1 ? (
+          <span className="text-xs font-medium text-foreground tabular-nums">
+            ↻ +{nextRefill.restoresPercent}%
           </span>
         ) : null}
       </div>
       <PoolBar pool={pool} color={color} now={now} />
+      {description ? (
+        <p className="text-xs text-muted-foreground md:col-span-2">{description}</p>
+      ) : null}
     </div>
   );
 }
@@ -511,6 +531,7 @@ function PoolWindowCard({
 function PoolSection({ pool, now }: { readonly pool: LimitPool; readonly now: number }) {
   const color = barColor(pool.driver);
   const label = getDriverOption(pool.driver)?.label ?? String(pool.driver);
+  const windows = displayLimitWindows(pool);
   return (
     <section className="flex flex-col gap-3">
       <h2 className="flex items-center gap-2 text-sm font-medium text-foreground">
@@ -523,9 +544,19 @@ function PoolSection({ pool, now }: { readonly pool: LimitPool; readonly now: nu
         />
         {label}
       </h2>
-      {pool.windows.map((window) => (
-        <PoolWindowCard key={`${window.kind}:${window.id}`} pool={window} color={color} now={now} />
-      ))}
+      {windows.map((window) => {
+        const details = pool.driver === "cursor" ? cursorUsageWindowDetails(window.id) : undefined;
+        return (
+          <PoolWindowCard
+            key={`${window.kind}:${window.id}`}
+            pool={window}
+            color={color}
+            now={now}
+            label={details?.label}
+            description={details?.description}
+          />
+        );
+      })}
     </section>
   );
 }
@@ -538,21 +569,63 @@ function PoolSection({ pool, now }: { readonly pool: LimitPool; readonly now: nu
 export function UsageLimitsPooled({
   presentations,
   now,
+  cursorPrompt,
 }: {
   readonly presentations: Parameters<typeof collectLimitAccounts>[0];
   readonly now: number;
+  readonly cursorPrompt?: ReactNode;
 }) {
   const pools = collectLimitPools(collectLimitAccounts(presentations), now);
   const notices = collectLimitNotices(presentations);
+  const externalLinks = collectExternalUsageLinks(presentations);
+  const cursorPromptAt =
+    Math.max(
+      pools.findIndex((pool) => pool.driver === "codex"),
+      pools.findIndex((pool) => pool.driver === "claudeAgent"),
+    ) + 1;
   return (
     <div className="flex flex-col gap-8">
-      {pools.length === 0 && notices.length === 0 ? (
+      {pools.length === 0 && notices.length === 0 && !cursorPrompt && externalLinks.length === 0 ? (
         <p className="text-sm text-muted-foreground">
           No provider on the selected environments reports subscription limits.
         </p>
       ) : null}
-      {pools.map((pool) => (
-        <PoolSection key={pool.driver} pool={pool} now={now} />
+      {pools.map((pool, index) => (
+        <Fragment key={pool.driver}>
+          {index === cursorPromptAt ? cursorPrompt : null}
+          <PoolSection pool={pool} now={now} />
+        </Fragment>
+      ))}
+      {cursorPromptAt === pools.length ? cursorPrompt : null}
+      {externalLinks.map((link) => (
+        <section
+          key={link.url}
+          className="flex flex-wrap items-center justify-between gap-3 rounded-xl border p-4"
+        >
+          <div className="flex min-w-0 flex-1 items-center gap-3">
+            {link.url === CHATGPT_USAGE_URL ? (
+              <OpenAI className="size-5 shrink-0" aria-hidden="true" />
+            ) : null}
+            <div className="min-w-0 space-y-1">
+              <h2 className="text-sm font-medium">{link.label}</h2>
+              {link.url === CHATGPT_USAGE_URL ? (
+                <p className="text-xs text-muted-foreground">
+                  View usage in ChatGPT with your connected account.
+                </p>
+              ) : link.message ? (
+                <p className="max-w-xl text-xs text-muted-foreground">{link.message}</p>
+              ) : null}
+            </div>
+          </div>
+          <Button
+            variant="ghost-muted"
+            size="xs"
+            onClick={() => void ensureLocalApi().shell.openExternal(link.url)}
+          >
+            Manage usage
+            <ExternalLinkIcon className="size-3.5" aria-hidden="true" />
+          </Button>
+        </section>
       ))}
       <LimitNotices notices={notices} />
     </div>
diff --git a/apps/web/src/components/usage/UsagePage.refresh.test.tsx b/apps/web/src/components/usage/UsagePage.refresh.test.tsx
index f8958ab33d32..61ad487ade70 100644
--- a/apps/web/src/components/usage/UsagePage.refresh.test.tsx
+++ b/apps/web/src/components/usage/UsagePage.refresh.test.tsx
@@ -1,6 +1,7 @@
 import { EnvironmentId, ProviderInstanceId, USAGE_CONTRACT_VERSION } from "@t3tools/contracts";
 import { mergeUsage } from "@t3tools/shared/usageMerge";
 import { StrictMode, act } from "react";
+import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
 import { create, type ReactTestRenderer } from "react-test-renderer";
 import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
 
@@ -9,11 +10,21 @@ const state = vi.hoisted(() => ({
   refreshProviders: vi.fn(async () => undefined),
   metric: "limits",
 }));
-vi.mock("@effect/atom-react", () => ({ useAtomValue: () => state.presentations }));
+vi.mock("@effect/atom-react", () => ({
+  useAtomValue: (atom: unknown) =>
+    atom === "keybindings" ? DEFAULT_RESOLVED_KEYBINDINGS : state.presentations,
+}));
+vi.mock("@tanstack/react-router", () => ({
+  useNavigate: () => vi.fn(),
+  useCanGoBack: () => false,
+}));
 vi.mock("../../state/presentation", () => ({
   environmentPresentations: { presentationsAtom: null },
 }));
-vi.mock("../../state/server", () => ({ serverEnvironment: { refreshProviders: null } }));
+vi.mock("../../state/server", () => ({
+  serverEnvironment: { refreshProviders: null },
+  primaryServerKeybindingsAtom: "keybindings",
+}));
 vi.mock("../../state/use-atom-command", () => ({ useAtomCommand: () => state.refreshProviders }));
 vi.mock("../../env", () => ({ isElectron: false }));
 vi.mock("../../hooks/useSettings", () => ({ usePrimarySettings: () => "24h" }));
@@ -47,7 +58,7 @@ vi.mock("./usagePagePreferences", () => ({
   readUsagePagePreferences: () => ({ metric: state.metric, windowDays: 30 }),
   saveUsagePagePreferences: vi.fn(),
 }));
-vi.mock("../ui/button", () => ({ Button: "button" }));
+vi.mock("../ui/button", () => ({ Button: "button", InlineButton: "button" }));
 vi.mock("../ui/scroll-area", () => ({ ScrollArea: "div" }));
 vi.mock("../ui/select", () => ({
   Select: "select",
@@ -86,6 +97,7 @@ import { UsagePage } from "./UsagePage";
 let renderer: ReactTestRenderer;
 let environmentNumber = 0;
 beforeEach(() => {
+  vi.stubGlobal("window", new EventTarget());
   vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
   vi.spyOn(Date, "now").mockReturnValue(Date.parse("2026-09-11T12:00:00Z"));
   environmentNumber += 1;
diff --git a/apps/web/src/components/usage/UsagePage.test.tsx b/apps/web/src/components/usage/UsagePage.test.tsx
index 0743b91f6edf..6d8caac6a36d 100644
--- a/apps/web/src/components/usage/UsagePage.test.tsx
+++ b/apps/web/src/components/usage/UsagePage.test.tsx
@@ -1,46 +1,21 @@
 import { EnvironmentId, UsageDay, USAGE_CONTRACT_VERSION } from "@t3tools/contracts";
 import { mergeUsage } from "@t3tools/shared/usageMerge";
-import { renderToStaticMarkup } from "react-dom/server";
-import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
+import { act } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
 
 const testState = vi.hoisted(() => ({
   useUsage: vi.fn(),
-  metric: "cost" as "cost" | "tokens" | "limits",
-  breakdown: "time" as "model" | "time",
+  navigate: vi.fn(),
+  canGoBack: true,
 }));
 
-vi.mock("react", async (importOriginal) => {
-  const actual = await importOriginal<typeof import("react")>();
-  return {
-    ...actual,
-    useState: vi.fn((initial: unknown) => [
-      initial === readUsagePagePreferences
-        ? { metric: testState.metric, windowDays: 30 }
-        : typeof initial === "function"
-          ? {
-              days: 1,
-              window: {
-                sinceDay: "2026-08-10",
-                untilDay: "2026-08-11",
-                timeZone: "UTC",
-                resolution: "hour",
-                sinceTime: "2026-08-10T12:37:00.000Z",
-                untilTime: "2026-08-11T12:37:00.000Z",
-              },
-            }
-          : initial === "cost"
-            ? testState.metric
-            : initial === "model"
-              ? testState.breakdown
-              : initial,
-      vi.fn(),
-    ]),
-  };
-});
-
 vi.mock("../../env", () => ({ isElectron: false }));
+vi.mock("@tanstack/react-router", () => ({
+  useNavigate: () => testState.navigate,
+  useCanGoBack: () => testState.canGoBack,
+}));
 vi.mock("../../state/usage", () => ({ useUsage: testState.useUsage }));
-vi.mock("../ui/button", () => ({ Button: "button" }));
 vi.mock("../ui/scroll-area", () => ({ ScrollArea: "div" }));
 vi.mock("../ui/select", () => ({
   Select: "div",
@@ -72,53 +47,6 @@ vi.mock("./usageProviders", async (importOriginal) => {
 });
 
 import { UsagePage } from "./UsagePage";
-import { readUsagePagePreferences } from "./usagePagePreferences";
-
-const providerTotals = (codex: number, claude: number) =>
-  new Map([
-    ["codex", { costUsd: codex, totalTokens: codex * 1_000 }],
-    ["claude", { costUsd: claude, totalTokens: claude * 1_000 }],
-  ] as const);
-
-const modelTotals = Object.freeze([
-  {
-    model: "expensive-model",
-    provider: "claude" as const,
-    costUsd: 10,
-    totalTokens: 100,
-    records: 1,
-    unpricedRecords: 0,
-    costShare: 10 / 16,
-  },
-  {
-    model: "token-heavy-model",
-    provider: "codex" as const,
-    costUsd: 5,
-    totalTokens: 1_000,
-    records: 1,
-    unpricedRecords: 0,
-    costShare: 5 / 16,
-  },
-  {
-    model: "token-heavy-cheaper-model",
-    provider: "codex" as const,
-    costUsd: 1,
-    totalTokens: 1_000,
-    records: 1,
-    unpricedRecords: 0,
-    costShare: 1 / 16,
-  },
-  {
-    model: "unpriced-model",
-    provider: "codex" as const,
-    costUsd: 0,
-    totalTokens: 500,
-    records: 2,
-    unpricedRecords: 2,
-    costShare: 0,
-  },
-]);
-
 const environments = [
   {
     environmentId: EnvironmentId.make("test-environment"),
@@ -140,29 +68,8 @@ const environments = [
 ];
 
 beforeEach(() => {
-  testState.metric = "cost";
-  testState.breakdown = "time";
   testState.useUsage.mockReturnValue({
-    merged: {
-      ...mergeUsage([], USAGE_CONTRACT_VERSION),
-      models: modelTotals,
-      hourly: [
-        {
-          day: "2026-08-10",
-          hourStart: "2026-08-10T13:37:00.000Z",
-          costUsd: 13,
-          totalTokens: 13_000,
-          byProvider: providerTotals(7, 6),
-        },
-        {
-          day: "2026-08-11",
-          hourStart: "2026-08-11T11:37:00.000Z",
-          costUsd: 11,
-          totalTokens: 11_000,
-          byProvider: providerTotals(6, 5),
-        },
-      ],
-    },
+    merged: mergeUsage([], USAGE_CONTRACT_VERSION),
     environments,
     selectedEnvironments: environments,
     isPending: false,
@@ -171,61 +78,75 @@ beforeEach(() => {
   });
 });
 
-describe("UsagePage hourly breakdown", () => {
-  it("keeps recent activity visible first without empty hourly rows", () => {
-    const markup = renderToStaticMarkup(<UsagePage />);
-    const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
-
-    expect(body.match(/<tr/g)).toHaveLength(2);
-    expect(body).toContain("$11.00");
-    expect(body).toContain("$13.00");
-    expect(body.indexOf("$11.00")).toBeLessThan(body.indexOf("$13.00"));
+describe("UsagePage Escape navigation", () => {
+  let renderer: Root;
+  let container: HTMLDivElement;
+  let back: ReturnType<typeof vi.spyOn>;
+
+  beforeEach(async () => {
+    back = vi.spyOn(window.history, "back").mockImplementation(() => {});
+    testState.navigate.mockClear();
+    testState.canGoBack = true;
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    container = document.createElement("div");
+    document.body.append(container);
+    renderer = createRoot(container);
+    await act(() => {
+      renderer.render(<UsagePage />);
+    });
   });
 
-  it("keeps chronological ordering when the token metric is selected", () => {
-    testState.metric = "tokens";
-
-    const markup = renderToStaticMarkup(<UsagePage />);
-    const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
-
-    expect(body).toMatch(/\$11\.00.*\$13\.00/);
+  afterEach(async () => {
+    await act(() => renderer.unmount());
+    container.remove();
+    back.mockRestore();
+    vi.unstubAllGlobals();
   });
-});
 
-describe("UsagePage model breakdown", () => {
-  it("sorts models by cost when the cost metric is selected", () => {
-    testState.breakdown = "model";
+  function escape(properties: { repeat?: boolean; isComposing?: boolean } = {}) {
+    return new KeyboardEvent("keydown", {
+      bubbles: true,
+      cancelable: true,
+      key: "Escape",
+      ...properties,
+    });
+  }
+
+  it("returns to the previous page on Escape", () => {
+    document.body.dispatchEvent(escape());
+    expect(back).toHaveBeenCalledOnce();
+    expect(testState.navigate).not.toHaveBeenCalled();
+  });
 
-    const markup = renderToStaticMarkup(<UsagePage />);
-    const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
+  it("returns home when there is no previous app page", async () => {
+    testState.canGoBack = false;
+    await act(() => renderer.render(<UsagePage />));
 
-    expect(body).toMatch(/expensive-model.*token-heavy-model.*token-heavy-cheaper-model/);
+    document.body.dispatchEvent(escape());
+    expect(testState.navigate).toHaveBeenCalledWith({ to: "/" });
+    expect(back).not.toHaveBeenCalled();
   });
 
-  it("flags a model with no known rates instead of showing it as free", () => {
-    testState.breakdown = "model";
+  it("closes the environment menu before Escape navigates back", async () => {
+    const trigger = container.querySelector<HTMLButtonElement>('[data-slot="menu-trigger"]')!;
+    await act(() => trigger.click());
+    expect(document.querySelector('[role="menu"]')).not.toBeNull();
 
-    const markup = renderToStaticMarkup(<UsagePage />);
-    const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
-    const unpricedRow = body.split("<tr").find((row) => row.includes("unpriced-model")) ?? "";
+    await act(() => {
+      document.activeElement!.dispatchEvent(escape());
+    });
+    expect(trigger.getAttribute("aria-expanded")).toBe("false");
+    expect(back).not.toHaveBeenCalled();
 
-    expect(unpricedRow).toContain("Unpriced");
-    expect(unpricedRow).not.toContain("$0.00");
+    document.body.dispatchEvent(escape());
+    expect(back).toHaveBeenCalledOnce();
   });
 
-  it("sorts models by token usage when the token metric is selected", () => {
-    testState.metric = "tokens";
-    testState.breakdown = "model";
-
-    const markup = renderToStaticMarkup(<UsagePage />);
-    const body = markup.match(/<tbody>(.*?)<\/tbody>/)?.[1] ?? "";
-
-    expect(body).toMatch(/token-heavy-model.*token-heavy-cheaper-model.*expensive-model/);
-    expect(modelTotals.map((model) => model.model)).toEqual([
-      "expensive-model",
-      "token-heavy-model",
-      "token-heavy-cheaper-model",
-      "unpriced-model",
-    ]);
+  it.each([{ repeat: true }, { isComposing: true }])("ignores Escape with %j", (properties) => {
+    document.body.dispatchEvent(escape(properties));
+    expect(back).not.toHaveBeenCalled();
+    expect(testState.navigate).not.toHaveBeenCalled();
   });
 });
+
+// @vitest-environment jsdom
diff --git a/apps/web/src/components/usage/UsagePage.tsx b/apps/web/src/components/usage/UsagePage.tsx
index 8c2b0680d71b..09611858b139 100644
--- a/apps/web/src/components/usage/UsagePage.tsx
+++ b/apps/web/src/components/usage/UsagePage.tsx
@@ -1,6 +1,9 @@
+import { ChatGptUsageButton } from "../settings/ChatGptUsageButton";
+import { usesChatGptSharing } from "@t3tools/shared/usageLimits";
 import { RefreshIcon } from "~/components/ui/refresh-icon";
 import { useAtomValue } from "@effect/atom-react";
 import {
+  ProviderDriverKind,
   USAGE_CONTRACT_VERSION,
   type EnvironmentId,
   type UsageProviderKind,
@@ -9,22 +12,30 @@ import {
   CircleAlertIcon,
   ChevronDownIcon,
   CircleDashedIcon,
+  InfoIcon,
   SlidersHorizontalIcon,
 } from "lucide-react";
 import { useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
-import { refreshUsageLimits } from "@t3tools/client-runtime/state/usage";
+import {
+  cursorKeychainAccessEnvironments,
+  refreshUsageLimits,
+} from "@t3tools/client-runtime/state/usage";
 
 import {
   isCompatibleUsageContractVersion,
   isModelCostUnknown,
   type DailyTotals,
   type HourlyTotals,
+  type MergedUsage,
 } from "@t3tools/shared/usageMerge";
 
 import { isElectron } from "../../env";
 import { cn } from "../../lib/utils";
 import { environmentPresentations } from "../../state/presentation";
-import { serverEnvironment } from "../../state/server";
+import { primaryServerKeybindingsAtom, serverEnvironment } from "../../state/server";
+import { isCommandPaletteOpen } from "../../commandPaletteBus";
+import { isModelPickerOpen } from "../../modelPickerVisibility";
+import { shortcutLabelForCommand } from "../../keybindings";
 import { useUsage, type EnvironmentUsageStatus } from "../../state/usage";
 import { useAtomCommand } from "../../state/use-atom-command";
 import {
@@ -36,10 +47,12 @@ import {
   formatHourShort,
   formatPercent,
   formatTokens,
+  formatUsageContractMismatch,
   formatUsd,
   makeWindow,
 } from "@t3tools/shared/usageFormat";
-import { Button } from "../ui/button";
+import { Button, InlineButton } from "../ui/button";
+import { ProviderInstanceIcon } from "../chat/ProviderInstanceIcon";
 import {
   Menu,
   MenuCheckboxItem,
@@ -53,6 +66,8 @@ import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../
 import { SidebarInset } from "../ui/sidebar";
 import { Skeleton } from "../ui/skeleton";
 import { Toggle, ToggleGroup } from "../ui/toggle-group";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import { Popover, PopoverPopup, PopoverTrigger } from "../ui/popover";
 import {
   WorkspaceBreadcrumb,
   WorkspaceBreadcrumbItem,
@@ -62,7 +77,15 @@ import { WorkspacePageContainer } from "../WorkspacePageContainer";
 import { WorkspacePageHeader } from "../WorkspacePageHeader";
 import { UsageLimitsSection } from "./UsageLimits";
 import { UsagePriceOverrides } from "./UsagePriceOverrides";
-import { UsageProviderChart, type UsageChartMetric } from "./UsageProviderChart";
+import { UsageProviderChart } from "./UsageProviderChart";
+import { sortModelsByTokens } from "./usageBreakdown";
+import {
+  METRIC_OPTIONS,
+  WINDOW_OPTIONS,
+  resolveUsageShortcut,
+  type UsageMetric,
+} from "./usageShortcuts";
+import { useEscapeToGoBack } from "../../hooks/useNavigateBack";
 import { PROVIDER_ORDER, PROVIDER_PRESENTATION, providersWithUsage } from "./usageProviders";
 import {
   readUsagePagePreferences,
@@ -70,30 +93,26 @@ import {
   type UsagePagePreferences,
 } from "./usagePagePreferences";
 
-type UsageMetric = UsageChartMetric | "limits";
-const METRIC_OPTIONS = [
-  { value: "cost", label: "Cost" },
-  { value: "tokens", label: "Tokens" },
-  { value: "limits", label: "Limits" },
-] as const satisfies readonly { value: UsageMetric; label: string }[];
-
 function isUsageMetric(value: string | null | undefined): value is UsageMetric {
   return METRIC_OPTIONS.some((option) => option.value === value);
 }
 
-const WINDOW_OPTIONS = [
-  { days: 1, label: "Past 24h" },
-  { days: 7, label: "7 days" },
-  { days: 30, label: "30 days" },
-  { days: 90, label: "90 days" },
-] as const;
-
 function isUsageWindowDays(value: number): value is UsagePagePreferences["windowDays"] {
   return WINDOW_OPTIONS.some((option) => option.days === value);
 }
 
 export function UsagePage() {
   const [preferences, setPreferences] = useState(readUsagePagePreferences);
+  useEscapeToGoBack();
+  const keybindings = useAtomValue(primaryServerKeybindingsAtom);
+  const shortcutTitle = (
+    option: (typeof METRIC_OPTIONS)[number] | (typeof WINDOW_OPTIONS)[number],
+  ) => {
+    const shortcut = shortcutLabelForCommand(keybindings, option.command, {
+      context: { usagePageOpen: true },
+    });
+    return shortcut ? `${option.label} (${shortcut})` : option.label;
+  };
   const [windowSelection, setWindowSelection] = useState(() => ({
     days: preferences.windowDays,
     window: makeWindow(
@@ -117,6 +136,23 @@ export function UsagePage() {
     selectedEnvironmentIds,
   );
   const presentations = useAtomValue(environmentPresentations.presentationsAtom);
+  const cursorAccessEnvironments = cursorKeychainAccessEnvironments(selectedEnvironments);
+  const sourceMessages = [
+    ...new Set(
+      selectedEnvironments.flatMap(
+        (environment) =>
+          environment.summary?.sources.flatMap((source) =>
+            source.message &&
+            !source.action &&
+            (source.status === "partial" ||
+              source.status === "failed" ||
+              source.fingerprint.provider === "cursor")
+              ? [source.message]
+              : [],
+          ) ?? [],
+      ),
+    ),
+  ];
   const refreshProviders = useAtomCommand(serverEnvironment.refreshProviders, {
     reportFailure: false,
   });
@@ -141,13 +177,22 @@ export function UsagePage() {
   const breakdownModels = useMemo(
     () =>
       breakdown === "model" && metric === "tokens"
-        ? merged.models.toSorted(
-            (left, right) => right.totalTokens - left.totalTokens || right.costUsd - left.costUsd,
-          )
+        ? sortModelsByTokens(merged.models)
         : merged.models,
     [breakdown, merged.models, metric],
   );
   const activeProviders = useMemo(() => providersWithUsage(merged.providers), [merged.providers]);
+  const summaryRows: Array<
+    | { readonly kind: "usage"; readonly provider: UsageProviderKind }
+    | { readonly kind: "enable"; readonly environment: EnvironmentUsageStatus }
+  > = activeProviders.map((provider) => ({ kind: "usage", provider }));
+  const cursorInsertAt =
+    Math.max(activeProviders.indexOf("codex"), activeProviders.indexOf("claude")) + 1;
+  summaryRows.splice(
+    cursorInsertAt,
+    0,
+    ...cursorAccessEnvironments.map((environment) => ({ kind: "enable" as const, environment })),
+  );
   const timeValueColumnWidth = `${60 / (activeProviders.length + 2)}%`;
 
   const selectWindow = (days: number) => {
@@ -166,7 +211,7 @@ export function UsagePage() {
     setPreferences(nextPreferences);
     saveUsagePagePreferences(nextPreferences);
   };
-  const refreshLimits = async (automatic = false) => {
+  const refreshLimits = async (automatic = false, afterPending = false) => {
     try {
       await Promise.all(
         Array.from(presentations, ([environmentId, presentation]) => {
@@ -176,6 +221,7 @@ export function UsagePage() {
               environmentId,
               () => refreshProviders({ environmentId, input: {} }),
               automatic,
+              afterPending,
             );
           }
         }),
@@ -184,6 +230,32 @@ export function UsagePage() {
       setLimitsNow(Date.now());
     }
   };
+  const onUsageKeyDown = useEffectEvent((event: KeyboardEvent) => {
+    if (
+      event.defaultPrevented ||
+      event.repeat ||
+      event.isComposing ||
+      isCommandPaletteOpen() ||
+      isModelPickerOpen()
+    )
+      return;
+
+    const command = resolveUsageShortcut(event, keybindings);
+    const metricOption = METRIC_OPTIONS.find((option) => option.command === command);
+    const periodOption = WINDOW_OPTIONS.find((option) => option.command === command);
+    if (!metricOption && !periodOption) return;
+
+    event.preventDefault();
+    event.stopPropagation();
+    if (metricOption) selectMetric(metricOption.value);
+    if (periodOption && !showingLimits) selectWindow(periodOption.days);
+  });
+
+  useEffect(() => {
+    globalThis.window.addEventListener("keydown", onUsageKeyDown, true);
+    return () => globalThis.window.removeEventListener("keydown", onUsageKeyDown, true);
+  }, []);
+
   const refreshWindow = () => {
     if (refreshingRef.current) return;
 
@@ -249,7 +321,7 @@ export function UsagePage() {
             showUsageStatus={!showingLimits}
             isPartial={isPartial}
             duplicateSources={merged.duplicateSources}
-            staleEnvironments={merged.staleEnvironments}
+            contractMismatches={merged.contractMismatches}
           />
         </WorkspaceBreadcrumbItem>
       </WorkspaceBreadcrumb>
@@ -269,7 +341,7 @@ export function UsagePage() {
           }}
         >
           {METRIC_OPTIONS.map((option) => (
-            <Toggle key={option.value} value={option.value}>
+            <Toggle key={option.value} value={option.value} title={shortcutTitle(option)}>
               {option.label}
             </Toggle>
           ))}
@@ -287,7 +359,7 @@ export function UsagePage() {
           }}
         >
           {WINDOW_OPTIONS.map((option) => (
-            <Toggle key={option.days} value={String(option.days)}>
+            <Toggle key={option.days} value={String(option.days)} title={shortcutTitle(option)}>
               {option.label}
             </Toggle>
           ))}
@@ -322,7 +394,7 @@ export function UsagePage() {
           </SelectTrigger>
           <SelectPopup align="end" alignItemWithTrigger={false}>
             {METRIC_OPTIONS.map((option) => (
-              <SelectItem key={option.value} value={option.value}>
+              <SelectItem key={option.value} value={option.value} title={shortcutTitle(option)}>
                 {option.label}
               </SelectItem>
             ))}
@@ -345,7 +417,11 @@ export function UsagePage() {
           </SelectTrigger>
           <SelectPopup align="end" alignItemWithTrigger={false}>
             {WINDOW_OPTIONS.map((option) => (
-              <SelectItem key={option.days} value={String(option.days)}>
+              <SelectItem
+                key={option.days}
+                value={String(option.days)}
+                title={shortcutTitle(option)}
+              >
                 {option.label}
               </SelectItem>
             ))}
@@ -381,11 +457,30 @@ export function UsagePage() {
                   : `Select an environment to see ${showingLimits ? "limits" : "usage"}.`}
               </p>
             ) : showingLimits ? (
-              <UsageLimitsSection selectedEnvironmentIds={selectedEnvironmentIds} now={limitsNow} />
+              <UsageLimitsSection
+                selectedEnvironmentIds={selectedEnvironmentIds}
+                now={limitsNow}
+                cursorPrompt={
+                  cursorAccessEnvironments.length > 0 ? (
+                    <CursorEnableLimits
+                      environments={cursorAccessEnvironments}
+                      onEnabled={() => {
+                        void refresh();
+                        void refreshLimits(false, true);
+                      }}
+                    />
+                  ) : null
+                }
+              />
             ) : isPending ? (
               <UsageSkeleton />
             ) : (
               <>
+                {sourceMessages.map((message) => (
+                  <p key={message} className="mb-4 text-sm text-muted-foreground">
+                    {message}
+                  </p>
+                ))}
                 <section className="grid gap-6 lg:grid-cols-[minmax(0,18rem)_minmax(0,1fr)]">
                   <div className="flex min-w-0 flex-col gap-5">
                     <div className="flex flex-col gap-1">
@@ -395,17 +490,61 @@ export function UsagePage() {
                           : formatTokens(merged.totalTokens)}
                       </span>
                       <span className="text-xs text-muted-foreground">
-                        {metric !== "cost"
-                          ? `${formatCount(merged.sessions)} sessions`
-                          : merged.costQuality.unpricedShare > 0
-                            ? `${formatCount(merged.sessions)} sessions · API estimate excludes ${formatPercent(
-                                merged.costQuality.unpricedShare,
-                              )} unpriced records`
-                            : `${formatCount(merged.sessions)} sessions · API estimate`}
+                        {formatCount(merged.sessions)} sessions
+                        {metric === "cost" && (
+                          <>
+                            {" · API estimate"}
+                            {merged.costQuality.unpricedShare > 0 && (
+                              <>
+                                {" "}
+                                <Popover>
+                                  <PopoverTrigger
+                                    openOnHover
+                                    render={<InlineButton tone="muted" />}
+                                    aria-label="Unpriced usage details"
+                                  >
+                                    <InfoIcon className="size-3" aria-hidden />
+                                  </PopoverTrigger>
+                                  <PopoverPopup side="top" tooltipStyle>
+                                    API estimate excludes{" "}
+                                    {formatPercent(merged.costQuality.unpricedShare)} unpriced
+                                    records.
+                                  </PopoverPopup>
+                                </Popover>
+                              </>
+                            )}
+                          </>
+                        )}
                       </span>
                     </div>
 
-                    {activeProviders.map((provider) => {
+                    {[...presentations].some(
+                      ([id, presentation]) =>
+                        (selectedEnvironmentIds === null || selectedEnvironmentIds.has(id)) &&
+                        presentation.serverConfig?.providers.some(usesChatGptSharing),
+                    ) ? (
+                      <div className="flex items-center justify-between gap-2 text-xs text-muted-foreground">
+                        <span>ChatGPT shared usage</span>
+                        <ChatGptUsageButton size="xs" />
+                      </div>
+                    ) : null}
+
+                    {summaryRows.map((row) => {
+                      if (row.kind === "enable") {
+                        return (
+                          <CursorEnableRow
+                            key={`enable:${row.environment.environmentId}`}
+                            environmentId={row.environment.environmentId}
+                            label={row.environment.label}
+                            showEnvironment={selectedEnvironments.length > 1}
+                            onEnabled={() => {
+                              void refresh();
+                              void refreshLimits(false, true);
+                            }}
+                          />
+                        );
+                      }
+                      const provider = row.provider;
                       const totals = merged.providers.find((entry) => entry.provider === provider);
                       const share =
                         metric === "cost" ? (totals?.costShare ?? 0) : (totals?.tokenShare ?? 0);
@@ -429,7 +568,7 @@ export function UsagePage() {
                                 <span className="truncate">
                                   {PROVIDER_PRESENTATION[provider].label}
                                 </span>
-                                <span className="shrink-0 whitespace-nowrap text-[11px] text-muted-foreground tabular-nums">
+                                <span className="shrink-0 whitespace-nowrap text-2xs text-muted-foreground tabular-nums">
                                   {sessionLabel}
                                 </span>
                               </span>
@@ -637,6 +776,137 @@ export function UsagePage() {
   );
 }
 
+const CURSOR_KEYCHAIN_COPY = "Requires access to your Cursor login in macOS Keychain.";
+
+function CursorEnableButton({
+  environmentId,
+  label,
+  onEnabled,
+  tooltip,
+  buttonText = "Enable",
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly label: string;
+  readonly onEnabled: () => void;
+  readonly tooltip: boolean;
+  readonly buttonText?: string;
+}) {
+  const updateSettings = useAtomCommand(serverEnvironment.updateSettings, {
+    label: "enable Cursor account usage",
+  });
+  const [pending, setPending] = useState(false);
+  const enable = async () => {
+    setPending(true);
+    try {
+      const result = await updateSettings({
+        environmentId,
+        input: { patch: { cursorKeychainUsageEnabled: true } },
+      });
+      if (result._tag === "Success") onEnabled();
+    } finally {
+      setPending(false);
+    }
+  };
+  const button = tooltip ? (
+    <InlineButton
+      disabled={pending}
+      aria-busy={pending}
+      aria-label={`Enable Cursor usage from ${label}`}
+      onClick={() => void enable()}
+    >
+      {buttonText}
+    </InlineButton>
+  ) : (
+    <Button
+      size="sm"
+      variant="outline"
+      disabled={pending}
+      aria-busy={pending}
+      aria-label={`Enable Cursor usage from ${label}`}
+      onClick={() => void enable()}
+    >
+      {buttonText}
+    </Button>
+  );
+  if (!tooltip) return button;
+  return (
+    <Tooltip>
+      <TooltipTrigger render={button} />
+      <TooltipPopup>{CURSOR_KEYCHAIN_COPY}</TooltipPopup>
+    </Tooltip>
+  );
+}
+
+function CursorEnableRow({
+  environmentId,
+  label,
+  showEnvironment,
+  onEnabled,
+}: {
+  readonly environmentId: EnvironmentId;
+  readonly label: string;
+  readonly showEnvironment: boolean;
+  readonly onEnabled: () => void;
+}) {
+  return (
+    <div className="flex min-w-0 items-baseline justify-between gap-4 text-sm">
+      <span className="flex min-w-0 items-center gap-2 text-sm text-foreground">
+        <span
+          aria-hidden
+          className="size-2 shrink-0 rounded-full"
+          style={{ backgroundColor: PROVIDER_PRESENTATION.cursor.color }}
+        />
+        <ProviderMark provider="cursor" className="size-4" />
+        <span className="truncate">Cursor{showEnvironment ? ` · ${label}` : ""}</span>
+      </span>
+      <CursorEnableButton
+        environmentId={environmentId}
+        label={label}
+        onEnabled={onEnabled}
+        tooltip
+      />
+    </div>
+  );
+}
+
+function CursorEnableLimits({
+  environments,
+  onEnabled,
+}: {
+  readonly environments: readonly EnvironmentUsageStatus[];
+  readonly onEnabled: () => void;
+}) {
+  return (
+    <section className="flex flex-col gap-3">
+      <h2 className="flex items-center gap-2 text-sm font-medium text-foreground">
+        <ProviderInstanceIcon
+          driverKind={ProviderDriverKind.make("cursor")}
+          displayName="Cursor"
+          indicatorBackground="var(--background)"
+          className="size-5"
+          iconClassName="size-4 text-foreground/80"
+        />
+        Cursor
+      </h2>
+      <div className="flex flex-col items-start gap-3 rounded-lg border border-border/60 p-4">
+        <p className="text-xs text-muted-foreground">{CURSOR_KEYCHAIN_COPY}</p>
+        <div className="flex flex-wrap gap-2">
+          {environments.map((environment) => (
+            <CursorEnableButton
+              key={environment.environmentId}
+              environmentId={environment.environmentId}
+              label={environment.label}
+              buttonText={environments.length > 1 ? `Enable on ${environment.label}` : "Enable"}
+              onEnabled={onEnabled}
+              tooltip={false}
+            />
+          ))}
+        </div>
+      </div>
+    </section>
+  );
+}
+
 /** Brand mark for the harness a row belongs to. */
 function ProviderMark({
   provider,
@@ -665,17 +935,21 @@ function Metric({ label, value }: { readonly label: string; readonly value: stri
 function UsageCoverageNotice({
   environments,
   duplicateSources,
-  staleEnvironments,
+  contractMismatches,
 }: {
   readonly environments: readonly EnvironmentUsageStatus[];
   readonly duplicateSources: readonly string[];
-  readonly staleEnvironments: readonly string[];
+  readonly contractMismatches: MergedUsage["contractMismatches"];
 }) {
   const failed = environments.filter((environment) => environment.error !== null);
-  const stale = environments.filter((environment) =>
-    staleEnvironments.includes(environment.environmentId),
+  const mismatchByEnvironment = new Map(
+    contractMismatches.map((mismatch) => [mismatch.environmentId, mismatch]),
   );
-  if (failed.length === 0 && stale.length === 0 && duplicateSources.length === 0) {
+  const incompatible = environments.flatMap((environment) => {
+    const mismatch = mismatchByEnvironment.get(environment.environmentId);
+    return mismatch === undefined ? [] : [{ environment, mismatch }];
+  });
+  if (failed.length === 0 && incompatible.length === 0 && duplicateSources.length === 0) {
     return null;
   }
 
@@ -684,9 +958,9 @@ function UsageCoverageNotice({
       {failed.map((environment) => (
         <span key={environment.label}>{environment.label} could not report usage.</span>
       ))}
-      {stale.map((environment) => (
-        <span key={environment.label}>
-          {environment.label} runs an older server version and is excluded from totals.
+      {incompatible.map(({ environment, mismatch }) => (
+        <span key={environment.environmentId}>
+          {formatUsageContractMismatch(environment.label, mismatch)}
         </span>
       ))}
       {duplicateSources.length > 0 ? (
@@ -708,7 +982,7 @@ function UsageEnvironmentFilter({
   showUsageStatus,
   isPartial,
   duplicateSources,
-  staleEnvironments,
+  contractMismatches,
 }: {
   readonly environments: readonly EnvironmentUsageStatus[];
   readonly selectedEnvironments: readonly EnvironmentUsageStatus[];
@@ -717,7 +991,7 @@ function UsageEnvironmentFilter({
   readonly showUsageStatus: boolean;
   readonly isPartial: boolean;
   readonly duplicateSources: readonly string[];
-  readonly staleEnvironments: readonly string[];
+  readonly contractMismatches: MergedUsage["contractMismatches"];
 }) {
   const [modelPricesOpen, setModelPricesOpen] = useState(false);
   const allSelected = selectedEnvironmentIds === null;
@@ -732,12 +1006,15 @@ function UsageEnvironmentFilter({
   ).length;
   const hasIssue =
     selectedEnvironments.some((environment) => environment.error !== null) ||
-    staleEnvironments.length > 0;
+    contractMismatches.length > 0;
 
   return (
     <>
       <Menu>
-        <MenuTrigger className="group/usage-environment inline-flex min-w-0 max-w-full cursor-pointer items-center gap-1 rounded-sm text-left focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring">
+        <MenuTrigger
+          render={<InlineButton />}
+          className="group/usage-environment min-w-0 max-w-full"
+        >
           <span className="min-w-0 truncate">{label}</span>
           <span className="flex size-3.5 shrink-0 items-center justify-center text-muted-foreground">
             {showUsageStatus && pendingCount > 0 ? (
@@ -751,7 +1028,7 @@ function UsageEnvironmentFilter({
               </>
             ) : showUsageStatus && hasIssue ? (
               <CircleAlertIcon
-                className="size-3.5 text-amber-600 dark:text-amber-400"
+                className="size-3.5 text-warning-foreground"
                 aria-label="Some environments could not report usage"
               />
             ) : (
@@ -762,7 +1039,7 @@ function UsageEnvironmentFilter({
             )}
           </span>
         </MenuTrigger>
-        <MenuPopup align="start" className="w-80 max-w-[calc(100vw-2rem)]">
+        <MenuPopup align="start">
           <MenuCheckboxItem
             checked={allSelected}
             closeOnClick={false}
@@ -794,7 +1071,6 @@ function UsageEnvironmentFilter({
                 key={environment.environmentId}
                 checked={checked}
                 closeOnClick={false}
-                className="grid-cols-[1rem_minmax(0,1fr)]"
                 onCheckedChange={(nextChecked) => {
                   const next = new Set(selectedEnvironments.map((entry) => entry.environmentId));
                   if (nextChecked) next.add(environment.environmentId);
@@ -830,7 +1106,7 @@ function UsageEnvironmentFilter({
             <UsageCoverageNotice
               environments={selectedEnvironments}
               duplicateSources={duplicateSources}
-              staleEnvironments={staleEnvironments}
+              contractMismatches={contractMismatches}
             />
           ) : null}
           <MenuSeparator />
@@ -869,8 +1145,8 @@ function UsageSkeleton() {
             <div key={provider} className="flex flex-col gap-1">
               <div className="flex min-h-5 items-center justify-between gap-4">
                 <span className="flex items-center gap-2">
-                  <Skeleton className="size-2 shrink-0 rounded-full" />
-                  <Skeleton className="size-4 shrink-0 rounded-full" />
+                  <Skeleton shape="pill" className="size-2 shrink-0" />
+                  <Skeleton shape="pill" className="size-4 shrink-0" />
                   <Skeleton className="h-3.5 w-20" />
                 </span>
                 <Skeleton className="h-3.5 w-14" />
@@ -883,8 +1159,8 @@ function UsageSkeleton() {
         <div className="flex flex-col gap-3">
           <Skeleton className="h-5 w-24" />
           <div className="flex flex-col gap-1">
-            <Skeleton className="ml-16 h-56 bg-muted-foreground/10" />
-            <Skeleton className="ml-16 h-4 bg-muted-foreground/10" />
+            <Skeleton className="ml-16 h-56" />
+            <Skeleton className="ml-16 h-4" />
           </div>
         </div>
       </section>
@@ -906,9 +1182,9 @@ function UsageSkeleton() {
       <section className="flex flex-col gap-3">
         <div className="flex items-center justify-between gap-3">
           <h2 className="text-sm font-medium text-foreground">Breakdown</h2>
-          <Skeleton className="h-7 w-28 rounded-lg" />
+          <Skeleton shape="card" className="h-7 w-28" />
         </div>
-        <Skeleton className="h-44 bg-muted-foreground/10" />
+        <Skeleton className="h-44" />
       </section>
     </>
   );
diff --git a/apps/web/src/components/usage/UsagePriceOverrides.tsx b/apps/web/src/components/usage/UsagePriceOverrides.tsx
index 9f3e5697b5ee..79ad4d473409 100644
--- a/apps/web/src/components/usage/UsagePriceOverrides.tsx
+++ b/apps/web/src/components/usage/UsagePriceOverrides.tsx
@@ -252,7 +252,7 @@ export function UsagePriceOverrides({
             Prices apply to all past and future usage on the environments you select.
           </DialogDescription>
         </DialogHeader>
-        <DialogPanel className="grid gap-4">
+        <DialogPanel>
           <div className="flex flex-wrap items-center justify-between gap-2">
             <div className="flex min-w-0 items-center gap-2">
               <Label id="usage-prices-apply-label" className="shrink-0">
@@ -269,7 +269,7 @@ export function UsagePriceOverrides({
                   </span>
                   <ChevronDownIcon className="size-3.5 shrink-0" aria-hidden />
                 </MenuTrigger>
-                <MenuPopup align="start" className="w-80 max-w-[calc(100vw-2rem)]">
+                <MenuPopup align="start">
                   <MenuCheckboxItem
                     checked={selectedIds === null}
                     closeOnClick={false}
@@ -323,12 +323,12 @@ export function UsagePriceOverrides({
                     <col className="w-10" />
                   </colgroup>
                   <TableHeader>
-                    <TableRow className="hover:bg-transparent">
-                      <TableHead className="pl-3">Model ID</TableHead>
+                    <TableRow>
+                      <TableHead>Model ID</TableHead>
                       {USAGE_PRICE_FIELDS.map((field) => (
                         <TableHead key={field.key}>{field.label}</TableHead>
                       ))}
-                      <TableHead className="px-1">
+                      <TableHead>
                         <Button
                           size="icon-xs"
                           variant="ghost"
@@ -347,24 +347,19 @@ export function UsagePriceOverrides({
                   </TableHeader>
                   <TableBody>
                     {rows.length === 0 ? (
-                      <TableRow className="hover:bg-transparent">
-                        <TableCell
-                          colSpan={6}
-                          className="py-8 text-center whitespace-normal text-muted-foreground"
-                        >
-                          {selected.some((environment) => environment.prices === null)
-                            ? "Some environment prices are unavailable."
-                            : "No custom prices. Add a row to override automatic pricing."}
+                      <TableRow>
+                        <TableCell colSpan={6} className="text-center whitespace-normal">
+                          <p className="py-6 text-muted-foreground">
+                            {selected.some((environment) => environment.prices === null)
+                              ? "Some environment prices are unavailable."
+                              : "No custom prices. Add a row to override automatic pricing."}
+                          </p>
                         </TableCell>
                       </TableRow>
                     ) : (
                       rows.map((row) => (
-                        <TableRow
-                          key={row.id}
-                          data-row-id={row.id}
-                          className="hover:bg-transparent"
-                        >
-                          <TableCell className="pl-3 whitespace-normal">
+                        <TableRow key={row.id} data-row-id={row.id}>
+                          <TableCell className="whitespace-normal">
                             {row.isNew ? (
                               <Input
                                 size="compact"
@@ -407,14 +402,16 @@ export function UsagePriceOverrides({
                             ) : null}
                           </TableCell>
                           {row.removed ? (
-                            <TableCell colSpan={4} className="text-muted-foreground">
-                              Automatic pricing after saving
+                            <TableCell colSpan={4}>
+                              <span className="text-muted-foreground">
+                                Automatic pricing after saving
+                              </span>
                             </TableCell>
                           ) : (
                             USAGE_PRICE_FIELDS.map((field) => {
                               const cell = usagePriceCell(selected, row.model, field.key);
                               return (
-                                <TableCell key={field.key} className="px-1">
+                                <TableCell key={field.key}>
                                   <Input
                                     size="compact"
                                     inputMode="decimal"
@@ -429,7 +426,7 @@ export function UsagePriceOverrides({
                                     }
                                     autoComplete="off"
                                     disabled={locked}
-                                    className="tabular-nums"
+                                    font="mono"
                                     onChange={(event) =>
                                       editCell(row, field.key, event.target.value)
                                     }
@@ -438,7 +435,7 @@ export function UsagePriceOverrides({
                               );
                             })
                           )}
-                          <TableCell className="px-1">
+                          <TableCell>
                             <Tooltip>
                               <TooltipTrigger
                                 render={<Button size="icon-xs" variant="ghost" />}
diff --git a/apps/web/src/components/usage/UsageProviderChart.test.ts b/apps/web/src/components/usage/UsageProviderChart.test.ts
index 622d73d13844..e3060dbaefd3 100644
--- a/apps/web/src/components/usage/UsageProviderChart.test.ts
+++ b/apps/web/src/components/usage/UsageProviderChart.test.ts
@@ -89,6 +89,9 @@ describe("buildPeriodColumns", () => {
       { provider: "codex", value: 10 },
       { provider: "claude", value: 20 },
       { provider: "grok", value: 0 },
+      { provider: "cursor", value: 0 },
+      { provider: "opencode", value: 0 },
+      { provider: "antigravity", value: 0 },
     ]);
   });
 
diff --git a/apps/web/src/components/usage/UsageProviderChart.tsx b/apps/web/src/components/usage/UsageProviderChart.tsx
index 4a66349ddfa5..b6388a932ff7 100644
--- a/apps/web/src/components/usage/UsageProviderChart.tsx
+++ b/apps/web/src/components/usage/UsageProviderChart.tsx
@@ -322,7 +322,7 @@ export function UsageProviderChart({
           {ticks.map((tick) => (
             <span
               key={tick}
-              className="absolute right-0 -translate-y-1/2 text-[10px] text-muted-foreground tabular-nums"
+              className="absolute right-0 -translate-y-1/2 text-3xs text-muted-foreground tabular-nums"
               style={{ top: `${(toY(tick) / VIEW_HEIGHT) * 100}%` }}
             >
               {tick === 0 ? "0" : format(tick)}
@@ -434,7 +434,7 @@ export function UsageProviderChart({
         </div>
       </div>
 
-      <div className="flex justify-between pl-16 text-[10px] text-muted-foreground uppercase">
+      <div className="flex justify-between pl-16 text-3xs text-muted-foreground uppercase">
         <span>{periods[0] === undefined ? "" : formatPeriod(periods[0])}</span>
         <span>
           {periods[Math.floor(periods.length / 2)] === undefined
diff --git a/apps/web/src/components/usage/usageBreakdown.test.ts b/apps/web/src/components/usage/usageBreakdown.test.ts
new file mode 100644
index 000000000000..db84528ce361
--- /dev/null
+++ b/apps/web/src/components/usage/usageBreakdown.test.ts
@@ -0,0 +1,31 @@
+import type { ModelTotals } from "@t3tools/shared/usageMerge";
+import { describe, expect, it } from "vite-plus/test";
+
+import { sortModelsByTokens } from "./usageBreakdown";
+
+const model = (name: string, totalTokens: number, costUsd: number): ModelTotals => ({
+  model: name,
+  provider: "codex",
+  costUsd,
+  totalTokens,
+  records: 1,
+  unpricedRecords: 0,
+  costShare: 0,
+});
+
+describe("sortModelsByTokens", () => {
+  it("sorts by tokens, breaks ties by cost, and leaves the input alone", () => {
+    const models = [
+      model("lower-cost", 100, 1),
+      model("more-tokens", 200, 2),
+      model("higher-cost", 100, 3),
+    ];
+
+    expect(sortModelsByTokens(models).map((item) => item.model)).toEqual([
+      "more-tokens",
+      "higher-cost",
+      "lower-cost",
+    ]);
+    expect(models.map((item) => item.model)).toEqual(["lower-cost", "more-tokens", "higher-cost"]);
+  });
+});
diff --git a/apps/web/src/components/usage/usageBreakdown.ts b/apps/web/src/components/usage/usageBreakdown.ts
new file mode 100644
index 000000000000..8245b593e9a9
--- /dev/null
+++ b/apps/web/src/components/usage/usageBreakdown.ts
@@ -0,0 +1,7 @@
+import type { ModelTotals } from "@t3tools/shared/usageMerge";
+
+export function sortModelsByTokens(models: readonly ModelTotals[]) {
+  return models.toSorted(
+    (left, right) => right.totalTokens - left.totalTokens || right.costUsd - left.costUsd,
+  );
+}
diff --git a/apps/web/src/components/usage/usageProviders.ts b/apps/web/src/components/usage/usageProviders.ts
index efad95e531ad..38b78cbcdb04 100644
--- a/apps/web/src/components/usage/usageProviders.ts
+++ b/apps/web/src/components/usage/usageProviders.ts
@@ -1,6 +1,14 @@
 import type { UsageProviderKind } from "@t3tools/contracts";
 
-import { ClaudeAI, GrokIcon, type Icon, OpenAI } from "../Icons";
+import {
+  AntigravityIcon,
+  ClaudeAI,
+  CursorIcon,
+  GrokIcon,
+  type Icon,
+  OpenAI,
+  OpenCodeIcon,
+} from "../Icons";
 
 type UsageProviderPresentation = {
   readonly label: string;
@@ -30,6 +38,9 @@ export const PROVIDER_PRESENTATION = {
     color: "color-mix(in oklab, var(--contrast-foreground) 72%, var(--background))",
     mark: GrokIcon,
   },
+  cursor: { label: "Cursor", color: "#8b8b8b", mark: CursorIcon },
+  opencode: { label: "OpenCode", color: "#5b9bbd", mark: OpenCodeIcon },
+  antigravity: { label: "Antigravity", color: "#8c7bd1", mark: AntigravityIcon },
 } satisfies Record<UsageProviderKind, UsageProviderPresentation>;
 
 /** Stable provider reading order across charts, summaries, tables, and hover rows. */
diff --git a/apps/web/src/components/usage/usageShortcuts.test.ts b/apps/web/src/components/usage/usageShortcuts.test.ts
new file mode 100644
index 000000000000..81eac013c856
--- /dev/null
+++ b/apps/web/src/components/usage/usageShortcuts.test.ts
@@ -0,0 +1,44 @@
+import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
+import { afterEach, describe, expect, it, vi } from "vite-plus/test";
+import { resolveUsageShortcut } from "./usageShortcuts";
+
+class TestElement extends EventTarget {
+  constructor(
+    readonly tagName: string,
+    readonly isContentEditable = false,
+  ) {
+    super();
+  }
+
+  closest() {
+    return null;
+  }
+}
+
+afterEach(() => vi.unstubAllGlobals());
+
+describe("Usage shortcuts while typing", () => {
+  it.each([new TestElement("INPUT"), new TestElement("TEXTAREA"), new TestElement("DIV", true)])(
+    "leaves letters to the focused $tagName field",
+    (target) => {
+      vi.stubGlobal("HTMLElement", TestElement);
+      vi.stubGlobal("navigator", { platform: "Linux" });
+      const event = {
+        key: "t",
+        metaKey: false,
+        ctrlKey: false,
+        shiftKey: false,
+        altKey: false,
+        target,
+      };
+
+      expect(resolveUsageShortcut(event, DEFAULT_RESOLVED_KEYBINDINGS)).toBeNull();
+      expect(
+        resolveUsageShortcut(
+          { ...event, target: new TestElement("BODY") },
+          DEFAULT_RESOLVED_KEYBINDINGS,
+        ),
+      ).toBe("usage.tokens");
+    },
+  );
+});
diff --git a/apps/web/src/components/usage/usageShortcuts.ts b/apps/web/src/components/usage/usageShortcuts.ts
new file mode 100644
index 000000000000..a7132c7caeb7
--- /dev/null
+++ b/apps/web/src/components/usage/usageShortcuts.ts
@@ -0,0 +1,39 @@
+import type { KeybindingCommand, ResolvedKeybindingsConfig } from "@t3tools/contracts";
+import type { UsageChartMetric } from "./UsageProviderChart";
+import { resolveShortcutCommand, type ShortcutEventLike } from "../../keybindings";
+
+export type UsageMetric = UsageChartMetric | "limits";
+export const METRIC_OPTIONS = [
+  { value: "cost", label: "Cost", command: "usage.cost" },
+  { value: "tokens", label: "Tokens", command: "usage.tokens" },
+  { value: "limits", label: "Limits", command: "usage.limits" },
+] as const satisfies readonly { value: UsageMetric; label: string; command: KeybindingCommand }[];
+
+export const WINDOW_OPTIONS = [
+  { days: 1, label: "Past 24h", command: "usage.period.day" },
+  { days: 7, label: "7 days", command: "usage.period.week" },
+  { days: 30, label: "30 days", command: "usage.period.month" },
+  { days: 90, label: "90 days", command: "usage.period.quarter" },
+] as const;
+
+/** Resolves page shortcuts without taking letters from fields or popup controls. */
+export function resolveUsageShortcut(
+  event: ShortcutEventLike & { target: EventTarget | null },
+  keybindings: ResolvedKeybindingsConfig,
+) {
+  const target = event.target;
+  if (
+    target instanceof HTMLElement &&
+    (target.tagName === "INPUT" ||
+      target.tagName === "TEXTAREA" ||
+      target.tagName === "SELECT" ||
+      target.isContentEditable ||
+      target.closest('[role="dialog"], [aria-modal="true"], [data-slot$="popup"]'))
+  ) {
+    return null;
+  }
+
+  return resolveShortcutCommand(event, keybindings, {
+    context: { usagePageOpen: true },
+  });
+}
diff --git a/apps/web/src/connection/platform.ts b/apps/web/src/connection/platform.ts
index bcc2849dd041..edd15c8df3eb 100644
--- a/apps/web/src/connection/platform.ts
+++ b/apps/web/src/connection/platform.ts
@@ -213,7 +213,7 @@ const capabilitiesLayer = Layer.effectContext(
       }),
     });
     const identity = RelayDeviceIdentity.of({
-      deviceId: Effect.succeed(Option.none()),
+      deviceId: Effect.succeedNone,
     });
     const primaryAuth = PrimaryEnvironmentAuth.of({
       bearerToken: Effect.tryPromise({
diff --git a/apps/web/src/connection/storage.test.ts b/apps/web/src/connection/storage.test.ts
index 773d20c3b882..206220768e9a 100644
--- a/apps/web/src/connection/storage.test.ts
+++ b/apps/web/src/connection/storage.test.ts
@@ -87,6 +87,29 @@ describe("makeCatalogBackend", () => {
       expect(setConnectionCatalog).toHaveBeenCalledWith("{}");
     }),
   );
+
+  it.effect("fails IndexedDB writes whose commit aborts", () =>
+    Effect.gen(function* () {
+      vi.stubGlobal("window", {});
+      const transaction = Object.assign(new EventTarget(), {
+        error: null as DOMException | null,
+        objectStore: () => ({
+          put: () => {
+            // A failed commit aborts the transaction without an "error" event.
+            queueMicrotask(() => {
+              transaction.error = new DOMException("Quota exceeded", "QuotaExceededError");
+              transaction.dispatchEvent(new Event("abort"));
+            });
+          },
+        }),
+      });
+      const backend = makeCatalogBackend({ transaction: () => transaction } as never);
+
+      const error = yield* backend.write("{}").pipe(Effect.flip);
+
+      expect(error.message).toContain("QuotaExceededError");
+    }),
+  );
 });
 
 describe("browser GitHub routing permissions", () => {
diff --git a/apps/web/src/connection/storage.ts b/apps/web/src/connection/storage.ts
index 6e777c663199..ec2e4ea5175c 100644
--- a/apps/web/src/connection/storage.ts
+++ b/apps/web/src/connection/storage.ts
@@ -6,6 +6,7 @@ import {
   ConnectionTargetStore,
   EMPTY_CONNECTION_CATALOG_DOCUMENT,
   EnvironmentCacheStore,
+  encodeShellSnapshotForCache,
   putRemoteDpopTokenInCatalog,
   registerConnectionInCatalog,
   removeCatalogValue,
@@ -91,7 +92,6 @@ const ConnectionCatalogDocumentJson = Schema.fromJsonString(ConnectionCatalogDoc
 const decodeConnectionCatalogDocument = Schema.decodeUnknownEffect(ConnectionCatalogDocumentJson);
 const encodeConnectionCatalogDocument = Schema.encodeEffect(ConnectionCatalogDocumentJson);
 const decodeStoredShellSnapshot = Schema.decodeUnknownEffect(StoredShellSnapshotJson);
-const encodeStoredShellSnapshot = Schema.encodeEffect(StoredShellSnapshotJson);
 const decodeStoredThreadSnapshot = Schema.decodeUnknownEffect(StoredThreadSnapshotJson);
 const encodeStoredThreadSnapshot = Schema.encodeEffect(StoredThreadSnapshotJson);
 const decodeStoredServerConfig = Schema.decodeUnknownEffect(StoredServerConfigJson);
@@ -188,7 +188,9 @@ function writeDatabaseValue(
 ) {
   return Effect.callback<void, ConnectionTransientError>((resume) => {
     const transaction = database.transaction(storeName, "readwrite");
-    transaction.addEventListener("error", () => {
+    // Every failed write fires "abort". A failed commit, such as
+    // QuotaExceededError, fires only "abort" and no "error".
+    transaction.addEventListener("abort", () => {
       resume(
         Effect.fail(catalogError("write", transaction.error ?? "Unknown IndexedDB write error")),
       );
@@ -587,7 +589,7 @@ export const connectionStorageLayer = Layer.effectContext(
           Effect.tap(() => Effect.promise(() => projectFaviconCache.hydrate())),
           Effect.flatMap((raw) => {
             if (typeof raw !== "string") {
-              return Effect.succeed(Option.none());
+              return Effect.succeedNone;
             }
             return decodeStoredShellSnapshot(raw).pipe(
               Effect.mapError((cause) => persistenceError("load-shell", cause)),
@@ -606,11 +608,17 @@ export const connectionStorageLayer = Layer.effectContext(
         ),
       saveShell: (environmentId, snapshot) =>
         Effect.gen(function* () {
-          const encoded = yield* encodeStoredShellSnapshot({
-            schemaVersion: SHELL_SNAPSHOT_CACHE_SCHEMA_VERSION,
-            environmentId,
-            snapshot,
-          }).pipe(Effect.mapError((cause) => persistenceError("save-shell", cause)));
+          const encodedSnapshot = yield* encodeShellSnapshotForCache(snapshot);
+          const encoded = yield* Effect.try({
+            try: () =>
+              // @effect-diagnostics-next-line preferSchemaOverJson:off - the snapshot is already encoded.
+              JSON.stringify({
+                schemaVersion: SHELL_SNAPSHOT_CACHE_SCHEMA_VERSION,
+                environmentId,
+                snapshot: encodedSnapshot,
+              } satisfies typeof StoredShellSnapshot.Encoded),
+            catch: (cause) => persistenceError("save-shell", cause),
+          });
           yield* writeDatabaseValue(database, SHELL_STORE_NAME, environmentId, encoded);
         }).pipe(
           Effect.mapError((cause) =>
@@ -623,7 +631,7 @@ export const connectionStorageLayer = Layer.effectContext(
         readDatabaseValue(database, SERVER_CONFIG_STORE_NAME, environmentId).pipe(
           Effect.flatMap((raw) => {
             if (typeof raw !== "string") {
-              return Effect.succeed(Option.none());
+              return Effect.succeedNone;
             }
             return decodeStoredServerConfig(raw).pipe(
               Effect.mapError((cause) => persistenceError("load-server-config", cause)),
@@ -661,7 +669,7 @@ export const connectionStorageLayer = Layer.effectContext(
         ).pipe(
           Effect.flatMap((raw) => {
             if (typeof raw !== "string") {
-              return Effect.succeed(Option.none());
+              return Effect.succeedNone;
             }
             return decodeStoredThreadSnapshot(raw).pipe(
               Effect.mapError((cause) => persistenceError("load-thread", cause)),
@@ -703,7 +711,7 @@ export const connectionStorageLayer = Layer.effectContext(
         readDatabaseValue(database, VCS_REFS_STORE_NAME, vcsRefsCacheKey(environmentId, cwd)).pipe(
           Effect.flatMap((raw) => {
             if (typeof raw !== "string") {
-              return Effect.succeed(Option.none());
+              return Effect.succeedNone;
             }
             return decodeStoredVcsRefs(raw).pipe(
               Effect.mapError((cause) => persistenceError("load-vcs-refs", cause)),
diff --git a/apps/web/src/contextMenuFallback.ts b/apps/web/src/contextMenuFallback.ts
index 2c43641b2b56..db14ed8c860c 100644
--- a/apps/web/src/contextMenuFallback.ts
+++ b/apps/web/src/contextMenuFallback.ts
@@ -9,6 +9,12 @@ const ICON_PATHS: Record<string, ReadonlyArray<{ tag: string; attrs: Record<stri
     { tag: "path", attrs: { d: "M4 8v11a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8" } },
     { tag: "path", attrs: { d: "M10 12h4" } },
   ],
+  check: [{ tag: "path", attrs: { d: "M20 6 9 17l-5-5" } }],
+  timer: [
+    { tag: "line", attrs: { x1: "10", x2: "14", y1: "2", y2: "2" } },
+    { tag: "line", attrs: { x1: "12", x2: "15", y1: "14", y2: "11" } },
+    { tag: "circle", attrs: { cx: "12", cy: "14", r: "8" } },
+  ],
   "chevron-right": [{ tag: "path", attrs: { d: "m9 19 7-7-7-7" } }],
   "circle-check": [
     { tag: "circle", attrs: { cx: "12", cy: "12", r: "10" } },
@@ -347,7 +353,22 @@ export function showContextMenuFallback<T extends string>(
           button.style.pointerEvents = "none";
         }
 
-        if (typeof item.icon === "string") {
+        if (typeof item.checked === "boolean") {
+          // Option rows use the icon slot for the check so labels line up
+          // with icon rows. The unselected option keeps the slot empty.
+          button.setAttribute("role", "menuitemradio");
+          button.setAttribute("aria-checked", item.checked ? "true" : "false");
+          const check = item.checked ? createIconElement("check", "neutral") : null;
+          if (check) {
+            button.appendChild(check);
+          } else {
+            const spacer = document.createElement("span");
+            spacer.className = "size-4.5 shrink-0 sm:size-4";
+            spacer.style.cssText = "display:inline-block;width:1rem;height:1rem;flex-shrink:0;";
+            spacer.setAttribute("aria-hidden", "true");
+            button.appendChild(spacer);
+          }
+        } else if (typeof item.icon === "string") {
           const icon = createIconElement(item.icon, isLeafDestructive ? "destructive" : "neutral");
           if (icon) {
             button.appendChild(icon);
diff --git a/apps/web/src/hooks/useDelayedStatus.ts b/apps/web/src/hooks/useDelayedStatus.ts
new file mode 100644
index 000000000000..c777e3c61390
--- /dev/null
+++ b/apps/web/src/hooks/useDelayedStatus.ts
@@ -0,0 +1,18 @@
+import { createDelayedStatus, type ShownStatus } from "@t3tools/client-runtime/delayed-status";
+import { useEffect, useState } from "react";
+
+/**
+ * Returns `value` only once it has lasted past the show delay, then holds it
+ * for a minimum time, so a short status never flashes. `key` is what the
+ * status belongs to (for example a thread). A new key drops it at once.
+ * Mobile has the same hook.
+ */
+export function useDelayedStatus<A>(key: string, value: A | null): A | null {
+  const [shown, setShown] = useState<ShownStatus<A> | null>(null);
+  const [status] = useState(() => createDelayedStatus<A>(setShown));
+  useEffect(() => () => status.dispose(), [status]);
+  useEffect(() => {
+    status.update(key, value);
+  }, [status, key, value]);
+  return shown?.key === key ? shown.value : null;
+}
diff --git a/apps/web/src/hooks/useNavigateBack.ts b/apps/web/src/hooks/useNavigateBack.ts
new file mode 100644
index 000000000000..887e55d054de
--- /dev/null
+++ b/apps/web/src/hooks/useNavigateBack.ts
@@ -0,0 +1,40 @@
+import { useCanGoBack, useNavigate } from "@tanstack/react-router";
+import { useCallback, useEffect } from "react";
+
+/** Returns to the previous app page, or home when opened without app history. */
+function useNavigateBack() {
+  const navigate = useNavigate();
+  const canGoBack = useCanGoBack();
+
+  return useCallback(() => {
+    if (canGoBack) {
+      window.history.back();
+      return;
+    }
+    void navigate({ to: "/" });
+  }, [canGoBack, navigate]);
+}
+
+/** Enables page-level Escape navigation, letting controls consume Escape first. */
+export function useEscapeToGoBack(onEscape?: () => void) {
+  const navigateBack = useNavigateBack();
+  const handleEscape = onEscape ?? navigateBack;
+
+  useEffect(() => {
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (event.defaultPrevented || event.repeat || event.isComposing || event.key !== "Escape")
+        return;
+      event.preventDefault();
+
+      const activeElement = document.activeElement;
+      if (activeElement instanceof HTMLElement) {
+        activeElement.blur();
+      }
+
+      handleEscape();
+    };
+
+    window.addEventListener("keydown", onKeyDown);
+    return () => window.removeEventListener("keydown", onKeyDown);
+  }, [handleEscape]);
+}
diff --git a/apps/web/src/hooks/useThreadActionMenu.ts b/apps/web/src/hooks/useThreadActionMenu.ts
index 8a24c5110fa7..4a99fa8f5c73 100644
--- a/apps/web/src/hooks/useThreadActionMenu.ts
+++ b/apps/web/src/hooks/useThreadActionMenu.ts
@@ -20,6 +20,7 @@ import { stackedThreadToast, toastManager } from "../components/ui/toast";
 import { threadEnvironment } from "../state/threads";
 import { useAtomCommand } from "../state/use-atom-command";
 import {
+  readEnvironmentSupportsAutoSettleOptOut,
   readEnvironmentSupportsPinning,
   readEnvironmentSupportsSettlement,
   readEnvironmentSupportsSnooze,
@@ -88,6 +89,7 @@ export function useThreadActionMenu(input: {
     unsnoozeThread,
     pinThread,
     confirmAndUnpinThread,
+    setThreadAutoSettle,
     archiveThread,
     deleteThread,
   } = useThreadActions();
@@ -132,6 +134,7 @@ export function useThreadActionMenu(input: {
         const now = new Date();
         const supports = {
           settlement: readEnvironmentSupportsSettlement(threadRef.environmentId),
+          autoSettleOptOut: readEnvironmentSupportsAutoSettleOptOut(threadRef.environmentId),
           snooze: readEnvironmentSupportsSnooze(threadRef.environmentId),
           pinning: readEnvironmentSupportsPinning(threadRef.environmentId),
           titleRegeneration: readEnvironmentSupportsTitleRegeneration(threadRef.environmentId),
@@ -145,6 +148,7 @@ export function useThreadActionMenu(input: {
           projectFilter: null,
           isPinned: thread.pinnedAt != null,
           isSettled: supports.settlement && thread.settledOverride === "settled",
+          autoSettleEnabled: thread.autoSettleDisabledAt == null,
           isSnoozed: supports.snooze && effectiveSnoozed(thread, { now: now.toISOString() }),
           canSnoozeNow: canSnooze(thread, { now: now.toISOString() }),
           isRegeneratingTitle,
@@ -225,6 +229,12 @@ export function useThreadActionMenu(input: {
             await reportFailure("Failed to unpin thread", () => confirmAndUnpinThread(threadRef));
             return;
           }
+          case "auto-settle:enabled":
+          case "auto-settle:disabled":
+            await reportFailure("Failed to update auto-settle", () =>
+              setThreadAutoSettle(threadRef, action === "auto-settle:enabled"),
+            );
+            return;
           case "rename":
             onStartRename();
             return;
@@ -333,6 +343,7 @@ export function useThreadActionMenu(input: {
       projectGroupingSettings,
       projects,
       router,
+      setThreadAutoSettle,
       settleThread,
       snoozeThread,
       threadRef,
diff --git a/apps/web/src/hooks/useThreadActions.ts b/apps/web/src/hooks/useThreadActions.ts
index 0e5491099223..6a82b920ab31 100644
--- a/apps/web/src/hooks/useThreadActions.ts
+++ b/apps/web/src/hooks/useThreadActions.ts
@@ -26,6 +26,7 @@ import { refreshArchivedThreadsForEnvironment } from "../lib/archivedThreadsStat
 import { releaseComposerDraftUploads } from "../lib/composerDraftUploads";
 import { readLocalApi } from "../localApi";
 import {
+  readEnvironmentSupportsAutoSettleOptOut,
   readEnvironmentSupportsPinning,
   readEnvironmentSupportsPinReorder,
   readEnvironmentSupportsActiveReorder,
@@ -106,6 +107,18 @@ function topOfPinnedRunOrderKey(): string | undefined {
   return pinOrderKeyBetween(null, firstKey) ?? undefined;
 }
 
+export class ThreadAutoSettleOptOutUnsupportedError extends Schema.TaggedError<ThreadAutoSettleOptOutUnsupportedError>()(
+  "ThreadAutoSettleOptOutUnsupportedError",
+  {
+    environmentId: EnvironmentId,
+    threadId: ThreadId,
+  },
+) {
+  override get message(): string {
+    return "This environment's server does not support turning auto-settle off per thread yet. Update the server to use it.";
+  }
+}
+
 export class ThreadPinningUnsupportedError extends Schema.TaggedError<ThreadPinningUnsupportedError>()(
   "ThreadPinningUnsupportedError",
   {
@@ -200,6 +213,9 @@ export function useThreadActions() {
   const unpinThreadMutation = useAtomCommand(threadEnvironment.unpin, {
     reportFailure: false,
   });
+  const setThreadAutoSettleMutation = useAtomCommand(threadEnvironment.setAutoSettle, {
+    reportFailure: false,
+  });
   const reorderPinnedThreadMutation = useAtomCommand(threadEnvironment.reorderPin, {
     reportFailure: false,
   });
@@ -556,6 +572,27 @@ export function useThreadActions() {
     [unsettleThreadMutation],
   );
 
+  /** Turns automatic settlement (inactivity, merged PR) on or off for one thread. */
+  const setThreadAutoSettle = useCallback(
+    async (target: ScopedThreadRef, enabled: boolean) => {
+      if (!readEnvironmentSupportsAutoSettleOptOut(target.environmentId)) {
+        return AsyncResult.failure(
+          Cause.fail(
+            new ThreadAutoSettleOptOutUnsupportedError({
+              environmentId: target.environmentId,
+              threadId: target.threadId,
+            }),
+          ),
+        );
+      }
+      return setThreadAutoSettleMutation({
+        environmentId: target.environmentId,
+        input: { threadId: target.threadId, enabled },
+      });
+    },
+    [setThreadAutoSettleMutation],
+  );
+
   const pinThread = useCallback(
     async (target: ScopedThreadRef, opts: { orderKey?: string } = {}) => {
       // Version skew: never send the command to a server that predates it.
@@ -875,6 +912,7 @@ export function useThreadActions() {
       confirmAndUnpinThread,
       reorderPinnedThread,
       reorderActiveThread,
+      setThreadAutoSettle,
     }),
     [
       archiveThread,
@@ -884,6 +922,7 @@ export function useThreadActions() {
       pinThread,
       reorderPinnedThread,
       reorderActiveThread,
+      setThreadAutoSettle,
       settleThread,
       snoozeThread,
       unarchiveThread,
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 04500642be1b..19cb0af7f4e1 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -101,6 +101,9 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
   --command-shell-inset: 0.5rem;
   --command-content-inset: 1rem;
   --floating-content-inset: 0.75rem;
+  /* App layer order: docked sheets, then the floating preview player (47–49, see
+     previewMiniPlayerLayout.ts), then dialogs and popovers (50 and up). */
+  --z-sheet: 46;
   --glass-blur: 12px;
   --glass-opacity: 80%;
   --glass-saturation: 1.14;
@@ -113,6 +116,17 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
   --workspace-titlebar-control-size: 1.75rem;
   --workspace-titlebar-control-gap: 0.75rem;
   --workspace-titlebar-scroll-fade-height: 1.5rem;
+  /* The prompt on phones: iOS zooms into any input under 16px on focus. */
+  --font-size-prompt-touch: max(var(--font-size-prompt, 1rem), 16px);
+  /* Horizontal gutter shared by the page header and the chat column, clear of
+     the device's safe area. */
+  --workspace-gutter: 0.75rem;
+  --workspace-gutter-start: calc(env(safe-area-inset-left) + var(--workspace-gutter));
+  --workspace-gutter-end: calc(env(safe-area-inset-right) + var(--workspace-gutter));
+
+  @variant sm {
+    --workspace-gutter: 1.25rem;
+  }
 
   @variant dark {
     --appearance-contrast-target: white;
@@ -145,6 +159,46 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
 }
 
 @theme inline {
+  /* Two steps below Tailwind's text-xs (12px) for dense UI: metadata rows,
+     badges, counters, keyboard hints and diagnostics tables. 2xs is 11px,
+     3xs is 10px. Provider icon overlays use 4xs (8px) and 5xs (7px) to fit
+     their smaller badges. Registered with tailwind-merge in
+     lib/utils.ts so cn() treats them as font sizes, not colours. */
+  --text-2xs: 0.6875rem;
+  --text-2xs--line-height: calc(1 / 0.6875);
+  --text-3xs: 0.625rem;
+  --text-3xs--line-height: calc(0.875 / 0.625);
+  --text-4xs: 0.5rem;
+  --text-4xs--line-height: 1;
+  --text-5xs: 0.4375rem;
+  --text-5xs--line-height: 1;
+  /* Motion. drawer is the decelerating curve for surfaces that slide or pop in
+     (composer context, pills). */
+  --ease-drawer: cubic-bezier(0.32, 0.72, 0, 1);
+  /* The composer's elevation: a soft drop pulled in under the surface, shared
+     by the composer, its context strip and attached banners. */
+  --shadow-composer: 0 12px 28px -18px rgb(0 0 0 / 40%);
+  --shadow-composer-dark: 0 14px 32px -18px rgb(0 0 0 / 75%);
+  /* Dark-mode shade where an attached surface meets the composer: 10px of
+     shadow fading away from the seam. Inline, so the offsets resolve on the
+     element. below: the context strip under the composer (1rem seam, faint
+     white fill). above: an attached banner over it (its tint on top). */
+  --background-image-composer-seam-below:
+    linear-gradient(
+      to bottom,
+      transparent 0 1rem,
+      rgb(0 0 0 / 18%) 1rem,
+      transparent calc(1rem + 10px)
+    ),
+    linear-gradient(rgb(255 255 255 / 1%), rgb(255 255 255 / 1%));
+  --background-image-composer-seam-above:
+    linear-gradient(var(--chat-composer-attached-tint), var(--chat-composer-attached-tint)),
+    linear-gradient(
+      to top,
+      transparent 0 var(--chat-composer-attachment-overlap),
+      rgb(0 0 0 / 18%) var(--chat-composer-attachment-overlap),
+      transparent calc(var(--chat-composer-attachment-overlap) + 10px)
+    );
   --color-zinc-25: oklch(99.2% 0 0);
   --animate-skeleton: skeleton 2.4s infinite;
   /* Duty-cycled indicator animations: long holds with stepped ramps, so the
@@ -189,6 +243,8 @@ html[data-mobile-composer-route-transition="true"]::view-transition-old(t3-mobil
   --color-popover: var(--popover);
   --color-card-foreground: var(--contrast-card-foreground);
   --color-card: var(--card);
+  --color-code: var(--code-background);
+  --color-code-foreground: var(--code-foreground);
   --color-foreground: var(--contrast-foreground);
   --color-background: var(--background);
   --color-surface-raised: var(--surface-raised);
@@ -1424,8 +1480,7 @@ html[data-theme-id] .chat-markdown .chat-markdown-codeblock pre {
   background-color: transparent;
 }
 
-html[data-theme-id] .chat-markdown .chat-markdown-codeblock-header,
-html[data-theme-id] .chat-markdown .chat-markdown-chrome-action {
+html[data-theme-id] .chat-markdown .chat-markdown-codeblock-header {
   color: color-mix(in srgb, var(--code-foreground) 72%, transparent);
 }
 
@@ -1451,11 +1506,6 @@ html[data-theme-id="t3-chat"] {
   }
 }
 
-html[data-theme-id] .chat-markdown .chat-markdown-chrome-action:hover,
-html[data-theme-id] .chat-markdown .chat-markdown-chrome-action[aria-pressed="true"] {
-  color: var(--code-foreground);
-}
-
 html[data-theme-id] [data-app-sidebar] {
   --background: var(--app-theme-canvas);
   --foreground: var(--app-theme-text);
@@ -1847,10 +1897,14 @@ code {
 }
 
 .chat-markdown a {
-  color: var(--info-foreground);
   text-decoration: none;
 }
 
+/* File links are Chips and own their color and focus ring. */
+.chat-markdown a:not(.chat-markdown-file-link) {
+  color: var(--info-foreground);
+}
+
 .chat-markdown a:not(.chat-markdown-file-link):hover,
 .chat-markdown a:not(.chat-markdown-file-link):focus-visible {
   background-image: radial-gradient(circle, currentcolor 0.75px, transparent 1px);
@@ -1902,17 +1956,6 @@ code {
   font-size: 0.75rem;
 }
 
-.chat-markdown .chat-markdown-file-link,
-.chat-markdown .chat-markdown-file-link:hover {
-  color: var(--contrast-foreground);
-  text-decoration: none;
-}
-
-.chat-markdown .chat-markdown-file-link:focus-visible {
-  outline: none;
-  box-shadow: 0 0 0 2px color-mix(in srgb, var(--ring) 70%, transparent);
-}
-
 .chat-markdown pre {
   max-width: 100%;
   overflow-x: auto;
@@ -1939,20 +1982,10 @@ code {
   background: color-mix(in srgb, var(--contrast-border) 78%, transparent);
 }
 
-.chat-markdown .chat-markdown-codeblock-header,
-.chat-markdown .chat-markdown-chrome-action {
+.chat-markdown .chat-markdown-codeblock-header {
   color: color-mix(in srgb, var(--contrast-foreground) 72%, transparent);
 }
 
-.chat-markdown .chat-markdown-chrome-action:hover {
-  color: var(--contrast-foreground);
-}
-
-.chat-markdown .chat-markdown-chrome-action[aria-pressed="true"] {
-  color: var(--contrast-foreground);
-  background: color-mix(in srgb, var(--contrast-foreground) 8%, transparent);
-}
-
 .chat-markdown .chat-markdown-codeblock pre {
   margin: 0;
   border: none;
@@ -2031,45 +2064,24 @@ code {
   overflow-wrap: anywhere;
 }
 
-/* Prompt-stash save acknowledgement: the new count fades up from just below
-   its resting position, once, then stops. One-shot and event-driven (React
-   remounts the element by key on each stash) — no continuous animation. */
-@keyframes prompt-stash-count-enter {
-  from {
-    opacity: 0;
-    transform: translateY(2px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
+:root {
+  --diff-addition: var(--success);
+  --diff-deletion: var(--destructive);
+  --diff-addition-foreground: light-dark(var(--color-emerald-600), var(--color-emerald-400));
+  --diff-deletion-foreground: light-dark(var(--color-red-600), var(--color-red-400));
 }
 
-/* Expanded capture preview swaps between the screenshot and its extracted text.
-   One-shot fade on whichever panel mounts, so nothing repaints continuously. */
-@keyframes snap-shot-contents-enter {
-  from {
-    opacity: 0;
-  }
-  to {
-    opacity: 1;
-  }
+/* Chat timeline and composer column width, set from the Chat width setting. */
+:root {
+  --chat-max-width: 48rem;
 }
 
-@keyframes provider-update-pill-countdown {
-  from {
-    transform: scaleX(1);
-  }
-  to {
-    transform: scaleX(0);
-  }
+:root[data-chat-width="wide"] {
+  --chat-max-width: 72rem;
 }
 
-:root {
-  --diff-addition: var(--success);
-  --diff-deletion: var(--destructive);
-  --diff-addition-foreground: light-dark(var(--color-emerald-600), var(--color-emerald-400));
-  --diff-deletion-foreground: light-dark(var(--color-red-600), var(--color-red-400));
+:root[data-chat-width="full"] {
+  --chat-max-width: 100%;
 }
 
 :root[data-diff-color-scheme="blue-orange"] {
diff --git a/apps/web/src/keybindings.test.ts b/apps/web/src/keybindings.test.ts
index 82348be3b6e4..a5fc2374be56 100644
--- a/apps/web/src/keybindings.test.ts
+++ b/apps/web/src/keybindings.test.ts
@@ -913,6 +913,25 @@ describe("resolveShortcutCommand", () => {
     );
   });
 
+  it("navigates history with mod+[ and mod+] outside the terminal", () => {
+    const back = event({ key: "[", code: "BracketLeft", metaKey: true });
+    const forward = event({ key: "]", code: "BracketRight", ctrlKey: true });
+    assert.strictEqual(
+      resolveShortcutCommand(back, DEFAULT_RESOLVED_KEYBINDINGS, { platform: "MacIntel" }),
+      "navigation.back",
+    );
+    assert.strictEqual(
+      resolveShortcutCommand(forward, DEFAULT_RESOLVED_KEYBINDINGS, { platform: "Linux" }),
+      "navigation.forward",
+    );
+    assert.isNull(
+      resolveShortcutCommand(back, DEFAULT_RESOLVED_KEYBINDINGS, {
+        platform: "MacIntel",
+        context: { terminalFocus: true },
+      }),
+    );
+  });
+
   it("matches bracket shortcuts using the physical key code", () => {
     assert.strictEqual(
       resolveShortcutCommand(
@@ -1057,6 +1076,20 @@ describe("isRichTextBoldShortcut", () => {
     assert.isTrue(isRichTextBoldShortcut(event({ key: "B", ctrlKey: true })));
   });
 
+  it("matches the B key on non-Latin layouts, like the sidebar toggle does", () => {
+    const cyrillicB = event({ key: "и", code: "KeyB", ctrlKey: true });
+    assert.isTrue(isRichTextBoldShortcut(cyrillicB));
+    assert.strictEqual(
+      resolveShortcutCommand(cyrillicB, DEFAULT_BINDINGS, { platform: "Win32" }),
+      "sidebar.toggle",
+    );
+  });
+
+  it("follows the letter a Latin layout types, not the physical key", () => {
+    assert.isFalse(isRichTextBoldShortcut(event({ key: "x", code: "KeyB", ctrlKey: true })));
+    assert.isTrue(isRichTextBoldShortcut(event({ key: "b", code: "KeyN", ctrlKey: true })));
+  });
+
   it("ignores shifted, alted, bare, and non-keydown presses", () => {
     assert.isFalse(isRichTextBoldShortcut(event({ key: "b", metaKey: true, shiftKey: true })));
     assert.isFalse(isRichTextBoldShortcut(event({ key: "b", metaKey: true, altKey: true })));
@@ -1358,3 +1391,60 @@ describe("composer and pull request shortcuts", () => {
     });
   }
 });
+
+describe("Usage shortcuts", () => {
+  it("scopes letter shortcuts to Usage", () => {
+    assert.strictEqual(
+      resolveShortcutCommand(event({ key: "t" }), DEFAULT_RESOLVED_KEYBINDINGS, {
+        platform: "Linux",
+        context: { usagePageOpen: true },
+      }),
+      "usage.tokens",
+    );
+    assert.isNull(
+      resolveShortcutCommand(event({ key: "t" }), DEFAULT_RESOLVED_KEYBINDINGS, {
+        platform: "Linux",
+      }),
+    );
+  });
+
+  it.each(["Linux", "MacIntel"])(
+    "preserves desktop numbered thread shortcuts on Usage on %s",
+    (platform) => {
+      const shortcut = event({
+        key: "2",
+        ctrlKey: platform === "Linux",
+        metaKey: platform === "MacIntel",
+      });
+      assert.strictEqual(
+        resolveShortcutCommand(shortcut, DEFAULT_RESOLVED_KEYBINDINGS, {
+          platform,
+          context: { usagePageOpen: true, isDesktop: true },
+        }),
+        "thread.jump.2",
+      );
+      assert.isNotNull(
+        shortcutLabelForCommand(DEFAULT_RESOLVED_KEYBINDINGS, "thread.jump.2", {
+          platform,
+          context: { usagePageOpen: true, isDesktop: true },
+        }),
+      );
+    },
+  );
+
+  it("matches shifted number keys for periods and only on Usage", () => {
+    const shortcut = event({ key: "!", code: "Digit1", ctrlKey: true, shiftKey: true });
+    assert.strictEqual(
+      resolveShortcutCommand(shortcut, DEFAULT_RESOLVED_KEYBINDINGS, {
+        platform: "Linux",
+        context: { usagePageOpen: true },
+      }),
+      "usage.period.day",
+    );
+    assert.isNull(
+      resolveShortcutCommand(shortcut, DEFAULT_RESOLVED_KEYBINDINGS, {
+        platform: "Linux",
+      }),
+    );
+  });
+});
diff --git a/apps/web/src/keybindings.ts b/apps/web/src/keybindings.ts
index b615d3564437..73b59bc20b29 100644
--- a/apps/web/src/keybindings.ts
+++ b/apps/web/src/keybindings.ts
@@ -425,7 +425,7 @@ export function isRichTextBoldShortcut(event: ShortcutEventLike): boolean {
     return false;
   }
   return (
-    event.key.toLowerCase() === "b" &&
+    resolveEventKeys(event).has("b") &&
     (event.metaKey || event.ctrlKey) &&
     !event.altKey &&
     !event.shiftKey
diff --git a/apps/web/src/lib/runtime.ts b/apps/web/src/lib/runtime.ts
index 866f38875c76..fd4f2b194096 100644
--- a/apps/web/src/lib/runtime.ts
+++ b/apps/web/src/lib/runtime.ts
@@ -19,7 +19,7 @@ function configuredRelayUrl(): string {
 
 const httpClientLayer = remoteHttpClientLayer((input, init) => globalThis.fetch(input, init));
 const relayTracingLayer = makeRelayClientTracingLayer(resolveRelayTracingConfig(), {
-  serviceName: "t3-web-relay-client",
+  serviceName: "t3code-web",
   serviceVersion: import.meta.env.APP_VERSION,
   runtime: "browser",
   client: typeof window !== "undefined" && window.desktopBridge ? "desktop" : "web",
diff --git a/apps/web/src/lib/threadSort.ts b/apps/web/src/lib/threadSort.ts
index 7785bceaac73..ac3dea3aca5d 100644
--- a/apps/web/src/lib/threadSort.ts
+++ b/apps/web/src/lib/threadSort.ts
@@ -1,9 +1,7 @@
 export {
   getLatestThreadForProject,
   getThreadSortTimestamp,
-  resolveSettledThreadTimestamp,
   sortThreads,
   toSortableTimestamp,
-  type SettledThreadTimestampInput,
   type ThreadSortInput,
 } from "@t3tools/client-runtime/state/thread-sort";
diff --git a/apps/web/src/lib/utils.ts b/apps/web/src/lib/utils.ts
index 3445a06bbb62..ca9a3a6340c2 100644
--- a/apps/web/src/lib/utils.ts
+++ b/apps/web/src/lib/utils.ts
@@ -1,9 +1,13 @@
 import { MessageId, ProjectId, ThreadId } from "@t3tools/contracts";
 import { type CxOptions, cx } from "class-variance-authority";
 import * as Encoding from "effect/Encoding";
-import { twMerge } from "tailwind-merge";
+import { extendTailwindMerge } from "tailwind-merge";
 import { DraftId } from "../composerDraftStore";
 
+// The theme's extra font sizes (index.css). Unregistered, tailwind-merge reads
+// text-2xs as a colour and drops it next to text-muted-foreground.
+const twMerge = extendTailwindMerge({ extend: { theme: { text: ["2xs", "3xs", "4xs", "5xs"] } } });
+
 export function cn(...inputs: CxOptions) {
   return twMerge(cx(inputs));
 }
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
index 8cafbd5009b4..81d1c2140af6 100644
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -4,6 +4,7 @@ import { createHashHistory, createBrowserHistory } from "@tanstack/react-router"
 
 import "./index.css";
 
+import { prepareProviderAuthDelivery } from "./providerAuthDelivery";
 import { isElectron } from "./env";
 import { hasCloudPublicConfig } from "./cloud/publicConfig";
 import { getRouter } from "./router";
@@ -14,6 +15,8 @@ import {
 import { AppRoot } from "./AppRoot";
 import { clearChunkReloadGuard, reloadOnceForChunkLoadError } from "./lib/chunkReloadGuard";
 
+prepareProviderAuthDelivery();
+
 // Electron loads the app from a file-backed shell, so hash history avoids path resolution issues.
 const history = isElectron ? createHashHistory() : createBrowserHistory();
 
diff --git a/apps/web/src/markdown-clipboard.test.ts b/apps/web/src/markdown-clipboard.test.ts
index 9296967e4b82..a08dc299161b 100644
--- a/apps/web/src/markdown-clipboard.test.ts
+++ b/apps/web/src/markdown-clipboard.test.ts
@@ -19,6 +19,7 @@ class FakeText {
 
 class FakeElement {
   readonly nodeType = ELEMENT_NODE;
+  checked = false;
   readonly childNodes: Array<FakeElement | FakeText> = [];
   readonly classList = {
     contains: (name: string) => this.classNames.includes(name),
@@ -61,18 +62,31 @@ class FakeElement {
 
   /** Supports only the selectors markdown-clipboard actually asks for. */
   querySelector(selector: string): FakeElement | null {
+    if (selector.includes(", ")) {
+      for (const part of selector.split(", ")) {
+        const match = this.querySelector(part);
+        if (match) return match;
+      }
+      return null;
+    }
     const childOnly = selector.startsWith(":scope > ");
-    const target = childOnly ? selector.slice(":scope > ".length) : selector;
+    const [target, ...rest] = (childOnly ? selector.slice(":scope > ".length) : selector).split(
+      " > ",
+    );
     const matches = (element: FakeElement): boolean => {
       if (target === 'input[type="checkbox"]') {
         return element.tagName === "INPUT" && element.getAttribute("type") === "checkbox";
       }
-      return element.tagName === target.toUpperCase();
+      return element.tagName === target?.toUpperCase();
     };
     const search = (parent: FakeElement): FakeElement | null => {
       for (const child of parent.childNodes) {
         if (!(child instanceof FakeElement)) continue;
-        if (matches(child)) return child;
+        if (matches(child)) {
+          if (rest.length === 0) return child;
+          const nested = child.querySelector(`:scope > ${rest.join(" > ")}`);
+          if (nested) return nested;
+        }
         if (!childOnly) {
           const nested = search(child);
           if (nested) return nested;
@@ -143,6 +157,57 @@ describe("serializeRenderedMarkdownFragment", () => {
     expect(serializeRenderedMarkdownFragment(asNode(container))).toBe("run `git status` first");
   });
 
+  describe.each([
+    { parentLayout: "tight", childLayout: "tight" },
+    { parentLayout: "tight", childLayout: "loose" },
+    { parentLayout: "loose", childLayout: "tight" },
+    { parentLayout: "loose", childLayout: "loose" },
+  ])("$parentLayout parent with $childLayout child", ({ parentLayout, childLayout }) => {
+    it.each([
+      { parentChecked: null, childChecked: true, parent: "- Parent", child: "  - [x] Child" },
+      {
+        parentChecked: false,
+        childChecked: true,
+        parent: "- [ ] Parent",
+        child: "      - [x] Child",
+      },
+      {
+        parentChecked: true,
+        childChecked: false,
+        parent: "- [x] Parent",
+        child: "      - [ ] Child",
+      },
+    ])("copies $parent with $child", ({ parentChecked, childChecked, parent, child }) => {
+      const parentContent = parentLayout === "loose" ? new FakeElement("P") : new FakeElement("LI");
+      if (parentChecked !== null) {
+        const checkbox = new FakeElement("INPUT", [], { type: "checkbox" });
+        checkbox.checked = parentChecked;
+        parentContent.append(checkbox, new FakeText(" "));
+      }
+      parentContent.append(new FakeText("Parent"));
+      const parentItem =
+        parentLayout === "loose" ? new FakeElement("LI").append(parentContent) : parentContent;
+      const checkbox = new FakeElement("INPUT", [], { type: "checkbox" });
+      checkbox.checked = childChecked;
+      const childContent = new FakeElement(childLayout === "loose" ? "P" : "LI").append(
+        checkbox,
+        new FakeText(" Child"),
+      );
+      const childItem =
+        childLayout === "loose" ? new FakeElement("LI").append(childContent) : childContent;
+      parentItem.append(new FakeText("\n"), new FakeElement("UL").append(childItem));
+      const container = new FakeElement("DIV").append(
+        new FakeElement("P").append(new FakeText("Before")),
+        new FakeElement("UL").append(parentItem),
+        new FakeElement("P").append(new FakeText("After")),
+      );
+
+      expect(serializeRenderedMarkdownFragment(asNode(container))).toBe(
+        `Before\n\n${parent}${parentLayout === "loose" ? "\n\n" : "\n"}${child}\n\nAfter`,
+      );
+    });
+  });
+
   it("copies the complete quote, source, and comment instead of the comment-only chip label", () => {
     const citation = {
       version: 1 as const,
diff --git a/apps/web/src/markdown-clipboard.ts b/apps/web/src/markdown-clipboard.ts
index 4a96c8b31d13..39b941801638 100644
--- a/apps/web/src/markdown-clipboard.ts
+++ b/apps/web/src/markdown-clipboard.ts
@@ -119,7 +119,9 @@ function serializeTable(table: Element): string {
 }
 
 function serializeListItem(item: Element, ordered: boolean, index: number): string {
-  const checkbox = item.querySelector('input[type="checkbox"]');
+  const checkbox = item.querySelector(
+    ':scope > input[type="checkbox"], :scope > p > input[type="checkbox"]',
+  );
   const task = checkbox ? `[${(checkbox as HTMLInputElement).checked ? "x" : " "}] ` : "";
   const marker = ordered ? `${index}. ${task}` : `- ${task}`;
   let content = serializeChildren(item)
diff --git a/apps/web/src/markdown-links.test.ts b/apps/web/src/markdown-links.test.ts
index fb4cd852af73..4c9cdec13941 100644
--- a/apps/web/src/markdown-links.test.ts
+++ b/apps/web/src/markdown-links.test.ts
@@ -531,3 +531,11 @@ describe("directory paths with a trailing separator", () => {
     expect(meta?.basename).not.toBe("");
   });
 });
+
+it("routes the project-root code link to the workspace explorer", () => {
+  const cwd = "/Users/saphid/.t3/worktrees/ov2-standalone-20260918";
+  expect(resolveInlineCodeFileLinkMeta(cwd, cwd)).toMatchObject({
+    workspaceRelativePath: ".",
+    filePath: cwd,
+  });
+});
diff --git a/apps/web/src/observability/clientTracing.ts b/apps/web/src/observability/clientTracing.ts
index 2471de958615..e8ccd4173d35 100644
--- a/apps/web/src/observability/clientTracing.ts
+++ b/apps/web/src/observability/clientTracing.ts
@@ -15,8 +15,9 @@ import { APP_VERSION } from "~/branding";
 
 const DEFAULT_EXPORT_INTERVAL_MS = 1_000;
 const CLIENT_TRACING_RESOURCE = {
-  serviceName: "t3-web",
+  serviceName: "t3code-web",
   attributes: {
+    "service.namespace": "t3code",
     "service.runtime": "t3-web",
     "service.mode": isElectron ? "electron" : "browser",
     "service.version": APP_VERSION,
diff --git a/apps/web/src/onboarding/providerReadiness.logic.ts b/apps/web/src/onboarding/providerReadiness.logic.ts
index c9d0f910ef53..08dd69bd3b03 100644
--- a/apps/web/src/onboarding/providerReadiness.logic.ts
+++ b/apps/web/src/onboarding/providerReadiness.logic.ts
@@ -36,6 +36,8 @@ function quoteProviderBinary(
 export function getOnboardingProviderState(provider: ServerProvider | undefined) {
   if (provider === undefined) return "checking";
   if (!provider.enabled || provider.status === "disabled") return "disabled";
+  if (!provider.installed && provider.status === "warning" && provider.auth.status === "unknown")
+    return "checking";
   if (!provider.installed) return "install";
   if (provider.auth.status === "unauthenticated") return "signIn";
   if (provider.status === "ready") return "ready";
diff --git a/apps/web/src/providerAuthDelivery.ts b/apps/web/src/providerAuthDelivery.ts
new file mode 100644
index 000000000000..369ef217fd00
--- /dev/null
+++ b/apps/web/src/providerAuthDelivery.ts
@@ -0,0 +1,19 @@
+import { readCodexAuthDelivery } from "@t3tools/shared/codexAuthHandoff";
+
+let pending: ReturnType<typeof readCodexAuthDelivery>;
+
+/** Remove the code before the router, tracing, or welcome screen sees the incoming address. */
+export function prepareProviderAuthDelivery() {
+  if (!window.location.hash.startsWith("#codex-auth=")) return;
+  pending = readCodexAuthDelivery(window.location.href);
+  window.history.replaceState(
+    window.history.state,
+    "",
+    pending?.returnUrl ?? `${window.location.pathname}${window.location.search}`,
+  );
+}
+
+export const pendingProviderAuthDelivery = () => pending;
+export const clearProviderAuthDelivery = () => {
+  pending = undefined;
+};
diff --git a/apps/web/src/queuedMessageStore.test.ts b/apps/web/src/queuedMessageStore.test.ts
index 33869d89da62..8d72ab65054b 100644
--- a/apps/web/src/queuedMessageStore.test.ts
+++ b/apps/web/src/queuedMessageStore.test.ts
@@ -1,5 +1,7 @@
+import { ProviderInstanceId } from "@t3tools/contracts";
 import { beforeEach, describe, expect, it } from "vite-plus/test";
 
+import { createLocalDispatchSnapshot } from "./components/ChatView.logic";
 import {
   isQueuedMessageDue,
   latestCompletedToolActivityId,
@@ -15,15 +17,23 @@ function makeMessage(prompt: string): Omit<QueuedComposerMessage, "id"> {
     terminalContexts: [],
     previewAnnotations: [],
     reviewComments: [],
-    submissionIntent: "foreground",
+    sendSettings: {
+      modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" },
+      runtimeMode: "full-access",
+      interactionMode: "default",
+      promptEffort: null,
+    },
     queuedAfterToolActivityId: null,
     createdAt: "2026-09-11T00:00:00.000Z",
   };
 }
 
+const queue = (threadKey: string) =>
+  useQueuedMessageStore.getState().queuesByThreadKey[threadKey] ?? [];
+
 describe("queuedMessageStore", () => {
   beforeEach(() => {
-    useQueuedMessageStore.setState({ queuesByThreadKey: {}, drainGeneration: 0 });
+    useQueuedMessageStore.setState({ queuesByThreadKey: {}, lastDispatchByThreadKey: {} });
   });
 
   it("keeps messages in submission order per thread", () => {
@@ -32,71 +42,112 @@ describe("queuedMessageStore", () => {
     enqueue("thread-a", makeMessage("second"));
     enqueue("thread-b", makeMessage("other"));
 
-    const queues = useQueuedMessageStore.getState().queuesByThreadKey;
-    expect(queues["thread-a"]?.map((message) => message.prompt)).toEqual(["first", "second"]);
-    expect(queues["thread-b"]?.map((message) => message.prompt)).toEqual(["other"]);
+    expect(queue("thread-a").map((message) => message.prompt)).toEqual(["first", "second"]);
+    expect(queue("thread-b").map((message) => message.prompt)).toEqual(["other"]);
   });
 
-  it("take hands the message to exactly one caller", () => {
-    const { enqueue, take } = useQueuedMessageStore.getState();
-    const entry = enqueue("thread-a", makeMessage("first"));
+  it("allows one send per thread and re-anchors the rest to the current tool boundary", () => {
+    const { enqueue, beginSend } = useQueuedMessageStore.getState();
+    const first = enqueue("thread-a", makeMessage("first"));
+    const second = enqueue("thread-a", makeMessage("second"));
 
-    expect(take("thread-a", entry.id, null)?.prompt).toBe("first");
-    expect(take("thread-a", entry.id, null)).toBeNull();
-    expect(useQueuedMessageStore.getState().queuesByThreadKey["thread-a"]).toBeUndefined();
+    expect(beginSend("thread-a", first.id, "tool-2")?.prompt).toBe("first");
+    expect(beginSend("thread-a", first.id, "tool-2")).toBeNull();
+    expect(beginSend("thread-a", second.id, "tool-2")).toBeNull();
+
+    const [sending, waiting] = queue("thread-a");
+    expect(sending?.sending).toBe("preparing");
+    expect(waiting?.queuedAfterToolActivityId).toBe("tool-2");
+    expect(
+      isQueuedMessageDue({ message: waiting!, phase: "running", latestToolActivityId: "tool-2" }),
+    ).toBe(false);
   });
 
-  it("take re-anchors the remaining messages to the current tool boundary", () => {
-    const { enqueue, take } = useQueuedMessageStore.getState();
+  it("finishSend drops the sent message", () => {
+    const { enqueue, beginSend, finishSend } = useQueuedMessageStore.getState();
     const first = enqueue("thread-a", makeMessage("first"));
-    enqueue("thread-a", makeMessage("second"));
+    beginSend("thread-a", first.id, null);
 
-    take("thread-a", first.id, "tool-2");
+    finishSend("thread-a", first.id);
 
-    const [second] = useQueuedMessageStore.getState().queuesByThreadKey["thread-a"] ?? [];
-    expect(second?.queuedAfterToolActivityId).toBe("tool-2");
-    expect(
-      isQueuedMessageDue({ message: second!, phase: "running", latestToolActivityId: "tool-2" }),
-    ).toBe(false);
+    expect(useQueuedMessageStore.getState().queuesByThreadKey["thread-a"]).toBeUndefined();
+  });
+
+  it("failSend returns the message to the head, held", () => {
+    const { enqueue, beginSend, failSend } = useQueuedMessageStore.getState();
+    enqueue("thread-a", makeMessage("first"));
+    const second = enqueue("thread-a", makeMessage("second"));
+    beginSend("thread-a", second.id, null);
+
+    expect(failSend("thread-a", second.id)).toBe(true);
+
+    const [head] = queue("thread-a");
+    expect(queue("thread-a").map((message) => message.prompt)).toEqual(["second", "first"]);
+    expect(head?.sending).toBeUndefined();
+    expect(isQueuedMessageDue({ message: head!, phase: "ready", latestToolActivityId: null })).toBe(
+      false,
+    );
   });
 
-  it("remove keeps the other messages' anchors", () => {
-    const { enqueue, remove } = useQueuedMessageStore.getState();
+  it("remove keeps the other messages' anchors and refuses a message being sent", () => {
+    const { enqueue, remove, beginSend } = useQueuedMessageStore.getState();
     const first = enqueue("thread-a", { ...makeMessage("first"), queuedAfterToolActivityId: "t1" });
     const second = enqueue("thread-a", makeMessage("second"));
 
     expect(remove("thread-a", second.id)?.prompt).toBe("second");
     expect(remove("thread-a", second.id)).toBeNull();
-    expect(useQueuedMessageStore.getState().queuesByThreadKey["thread-a"]).toEqual([first]);
+    expect(queue("thread-a")).toEqual([first]);
+
+    beginSend("thread-a", first.id, "t1");
+    expect(remove("thread-a", first.id)).toBeNull();
   });
 
-  it("holdAtFront returns a failed message to the head, held", () => {
-    const { enqueue, take, holdAtFront } = useQueuedMessageStore.getState();
+  it("a failed send keeps waiting on the dispatch before it", () => {
+    const { enqueue, beginSend, markDispatching, finishSend, failSend } =
+      useQueuedMessageStore.getState();
+    const earlier = createLocalDispatchSnapshot(undefined);
     const first = enqueue("thread-a", makeMessage("first"));
-    enqueue("thread-a", makeMessage("second"));
-    const taken = take("thread-a", first.id, "t1")!;
+    const second = enqueue("thread-a", makeMessage("second"));
+    const third = enqueue("thread-a", makeMessage("third"));
+    const lastDispatch = () => useQueuedMessageStore.getState().lastDispatchByThreadKey["thread-a"];
+    beginSend("thread-a", first.id, null);
+    markDispatching("thread-a", first.id, earlier);
+    finishSend("thread-a", first.id);
+
+    // Fails before its turn start went out: the first send is still the one to wait on.
+    beginSend("thread-a", second.id, null);
+    failSend("thread-a", second.id);
+    expect(lastDispatch()?.thread).toBe(earlier);
+
+    // Fails after going out: it never reached the server, so the first still counts.
+    beginSend("thread-a", third.id, null);
+    markDispatching("thread-a", third.id, { ...earlier, startedAt: "later" });
+    failSend("thread-a", third.id);
+    expect(lastDispatch()?.thread).toBe(earlier);
+  });
 
-    holdAtFront("thread-a", taken);
+  it("Stop takes back a preparing send but not one already dispatching", () => {
+    const { enqueue, beginSend, markDispatching, drain, failSend } =
+      useQueuedMessageStore.getState();
+    const preparing = enqueue("thread-a", makeMessage("preparing"));
+    enqueue("thread-a", makeMessage("waiting"));
+    beginSend("thread-a", preparing.id, null);
 
-    const queue = useQueuedMessageStore.getState().queuesByThreadKey["thread-a"] ?? [];
-    expect(queue.map((message) => message.prompt)).toEqual(["first", "second"]);
-    expect(queue[0]?.holdUntilUserAction).toBe(true);
-    expect(
-      isQueuedMessageDue({ message: queue[0]!, phase: "ready", latestToolActivityId: null }),
-    ).toBe(false);
-  });
+    expect(drain("thread-a").map((message) => message.prompt)).toEqual(["preparing", "waiting"]);
+    expect(markDispatching("thread-a", preparing.id, createLocalDispatchSnapshot(undefined))).toBe(
+      false,
+    );
+    expect(failSend("thread-a", preparing.id)).toBe(false);
 
-  it("drain empties one thread's queue in order", () => {
-    const { enqueue, drain } = useQueuedMessageStore.getState();
-    enqueue("thread-a", makeMessage("first"));
-    enqueue("thread-a", makeMessage("second"));
-    enqueue("thread-b", makeMessage("other"));
+    const dispatching = enqueue("thread-b", makeMessage("dispatching"));
+    enqueue("thread-b", makeMessage("waiting"));
+    beginSend("thread-b", dispatching.id, null);
+    expect(
+      markDispatching("thread-b", dispatching.id, createLocalDispatchSnapshot(undefined)),
+    ).toBe(true);
 
-    expect(drain("thread-a").map((message) => message.prompt)).toEqual(["first", "second"]);
-    expect(useQueuedMessageStore.getState().drainGeneration).toBe(1);
-    expect(drain("thread-a")).toEqual([]);
-    expect(useQueuedMessageStore.getState().drainGeneration).toBe(1);
-    expect(useQueuedMessageStore.getState().queuesByThreadKey["thread-b"]).toHaveLength(1);
+    expect(drain("thread-b").map((message) => message.prompt)).toEqual(["waiting"]);
+    expect(queue("thread-b").map((message) => message.prompt)).toEqual(["dispatching"]);
   });
 });
 
diff --git a/apps/web/src/queuedMessageStore.ts b/apps/web/src/queuedMessageStore.ts
index b342a1380f7a..735cebf33b1c 100644
--- a/apps/web/src/queuedMessageStore.ts
+++ b/apps/web/src/queuedMessageStore.ts
@@ -1,12 +1,30 @@
-import type { PreviewAnnotationPayload } from "@t3tools/contracts";
+import type {
+  ModelSelection,
+  PreviewAnnotationPayload,
+  ProviderInteractionMode,
+  RuntimeMode,
+} from "@t3tools/contracts";
 import { create } from "zustand";
 
-import type { ComposerSubmissionIntent } from "./composer-logic";
+import type { LocalDispatchSnapshot } from "./components/ChatView.logic";
 import type { ComposerFileAttachment, ComposerImageAttachment } from "./composerDraftStore";
 import type { TerminalContextDraft } from "./lib/terminalContext";
 import { randomUUID } from "./lib/utils";
 import type { ReviewCommentContext } from "./reviewCommentContext";
 
+/**
+ * The composer's model and modes when the message was queued. The send uses
+ * these instead of the live composer, so it can go out while the user is on
+ * another thread.
+ */
+export interface QueuedMessageSendSettings {
+  modelSelection: ModelSelection;
+  runtimeMode: RuntimeMode;
+  interactionMode: ProviderInteractionMode;
+  /** Effort written into the prompt text, for providers that read it there. */
+  promptEffort: string | null;
+}
+
 /**
  * A composer submission held back while the thread's turn is running. It
  * carries the full draft snapshot so the send path can dispatch it later with
@@ -20,7 +38,7 @@ export interface QueuedComposerMessage {
   terminalContexts: TerminalContextDraft[];
   previewAnnotations: PreviewAnnotationPayload[];
   reviewComments: ReviewCommentContext[];
-  submissionIntent: ComposerSubmissionIntent;
+  sendSettings: QueuedMessageSendSettings;
   /**
    * The newest completed tool activity at queue time. A different id later
    * means a tool call finished after the user queued, which is the boundary
@@ -32,125 +50,172 @@ export interface QueuedComposerMessage {
    * user pressing send. It waits for Send now instead of leaving on its own.
    */
   holdUntilUserAction?: boolean;
+  /**
+   * Set while a send is under way; the row stays until it settles. Stop can
+   * still take a "preparing" message back (uploads, thread settings), but not
+   * a "dispatching" one, whose turn start is already on the wire.
+   */
+  sending?: "preparing" | "dispatching";
   createdAt: string;
 }
 
+/**
+ * The thread as it was when its last queued turn start went out. The next
+ * message waits until the server has moved past it, so a send that starts a
+ * new turn and the message after it do not leave on one boundary.
+ */
+interface QueuedDispatch {
+  /** The message that went out, or null for a dispatch restored after a failure. */
+  messageId: string | null;
+  thread: LocalDispatchSnapshot;
+  /** The dispatch this one replaced. If this send fails, that one still counts. */
+  previous: LocalDispatchSnapshot | null;
+}
+
 interface QueuedMessageStoreState {
   queuesByThreadKey: Record<string, QueuedComposerMessage[]>;
-  /**
-   * Bumped by `drain`. A send that took a message before a drain and finishes
-   * its upload after it compares this to the value it captured and gives up,
-   * so Stop cannot be followed by a queued message starting a new turn.
-   */
-  drainGeneration: number;
+  lastDispatchByThreadKey: Record<string, QueuedDispatch>;
   enqueue: (threadKey: string, message: Omit<QueuedComposerMessage, "id">) => QueuedComposerMessage;
   /**
-   * Removes one message and returns it, or null when another caller already
-   * took it. The remaining messages are re-anchored to `toolActivityId` so
-   * only one queued message leaves per tool boundary.
+   * Marks one message as sending and returns it, or null when it is gone or
+   * the thread already has a send under way. The other messages are
+   * re-anchored to `toolActivityId` so only one leaves per tool boundary.
    */
-  take: (
+  beginSend: (
     threadKey: string,
     id: string,
     toolActivityId: string | null,
   ) => QueuedComposerMessage | null;
-  /** Removes one message without touching the others' anchors. Null when already gone. */
-  remove: (threadKey: string, id: string) => QueuedComposerMessage | null;
+  /** The turn start is going out. False when Stop took the message back first. */
+  markDispatching: (threadKey: string, id: string, thread: LocalDispatchSnapshot) => boolean;
+  /** Drops a message whose send went out, or that had nothing left to send. */
+  finishSend: (threadKey: string, id: string) => void;
   /**
-   * Puts a message back at the head, held for user action. Used when its
-   * send failed: the queue keeps its order and nothing behind it overtakes.
+   * Moves a message whose send failed back to the head, held for user action.
+   * The queue keeps its order and nothing behind it overtakes. False when
+   * Stop already took the message back.
    */
-  holdAtFront: (threadKey: string, message: QueuedComposerMessage) => void;
-  /** Removes and returns every queued message for the thread, oldest first. */
+  failSend: (threadKey: string, id: string) => boolean;
+  /** Removes one message without touching the others' anchors. Null when gone or sending. */
+  remove: (threadKey: string, id: string) => QueuedComposerMessage | null;
+  /** Removes and returns every message for the thread that is not already on the wire. */
   drain: (threadKey: string) => QueuedComposerMessage[];
 }
 
 const EMPTY_QUEUE: QueuedComposerMessage[] = [];
 
+type QueueState = Pick<QueuedMessageStoreState, "queuesByThreadKey" | "lastDispatchByThreadKey">;
+
+/** Replaces one thread's queue. `lastDispatch` null forgets it; an empty queue always does. */
+function withQueue(
+  state: QueueState,
+  threadKey: string,
+  queue: QueuedComposerMessage[],
+  lastDispatch?: QueuedDispatch | null,
+): QueueState {
+  const queuesByThreadKey = { ...state.queuesByThreadKey, [threadKey]: queue };
+  const lastDispatchByThreadKey = { ...state.lastDispatchByThreadKey };
+  if (lastDispatch) lastDispatchByThreadKey[threadKey] = lastDispatch;
+  if (queue.length === 0) delete queuesByThreadKey[threadKey];
+  if (queue.length === 0 || lastDispatch === null) delete lastDispatchByThreadKey[threadKey];
+  return { queuesByThreadKey, lastDispatchByThreadKey };
+}
+
 /** In-memory only: a queued message is a live intent, not a draft worth persisting. */
-export const useQueuedMessageStore = create<QueuedMessageStoreState>()((set, get) => ({
-  queuesByThreadKey: {},
-  drainGeneration: 0,
-  enqueue: (threadKey, message) => {
-    const entry: QueuedComposerMessage = { ...message, id: randomUUID() };
-    set((state) => ({
-      queuesByThreadKey: {
-        ...state.queuesByThreadKey,
-        [threadKey]: [...(state.queuesByThreadKey[threadKey] ?? EMPTY_QUEUE), entry],
-      },
-    }));
-    return entry;
-  },
-  take: (threadKey, id, toolActivityId) => {
-    const queue = get().queuesByThreadKey[threadKey];
-    const entry = queue?.find((message) => message.id === id);
-    if (!queue || !entry) {
-      return null;
-    }
-    set((state) => {
-      const remaining = (state.queuesByThreadKey[threadKey] ?? EMPTY_QUEUE)
-        .filter((message) => message.id !== id)
-        .map((message) =>
-          message.queuedAfterToolActivityId === toolActivityId
-            ? message
-            : { ...message, queuedAfterToolActivityId: toolActivityId },
-        );
-      const queuesByThreadKey = { ...state.queuesByThreadKey };
-      if (remaining.length === 0) {
-        delete queuesByThreadKey[threadKey];
-      } else {
-        queuesByThreadKey[threadKey] = remaining;
-      }
-      return { queuesByThreadKey };
-    });
-    return entry;
-  },
-  remove: (threadKey, id) => {
-    const queue = get().queuesByThreadKey[threadKey];
-    const entry = queue?.find((message) => message.id === id);
-    if (!queue || !entry) {
-      return null;
-    }
-    set((state) => {
-      const remaining = (state.queuesByThreadKey[threadKey] ?? EMPTY_QUEUE).filter(
-        (message) => message.id !== id,
-      );
-      const queuesByThreadKey = { ...state.queuesByThreadKey };
-      if (remaining.length === 0) {
-        delete queuesByThreadKey[threadKey];
-      } else {
-        queuesByThreadKey[threadKey] = remaining;
-      }
-      return { queuesByThreadKey };
-    });
-    return entry;
-  },
-  holdAtFront: (threadKey, message) => {
-    set((state) => {
-      const rest = (state.queuesByThreadKey[threadKey] ?? EMPTY_QUEUE).filter(
-        (entry) => entry.id !== message.id,
+export const useQueuedMessageStore = create<QueuedMessageStoreState>()((set, get) => {
+  const queueOf = (threadKey: string) => get().queuesByThreadKey[threadKey] ?? EMPTY_QUEUE;
+  const update = (
+    threadKey: string,
+    queue: QueuedComposerMessage[],
+    lastDispatch?: QueuedDispatch | null,
+  ) => set((state) => withQueue(state, threadKey, queue, lastDispatch));
+  return {
+    queuesByThreadKey: {},
+    lastDispatchByThreadKey: {},
+    enqueue: (threadKey, message) => {
+      const entry: QueuedComposerMessage = { ...message, id: randomUUID() };
+      update(threadKey, [...queueOf(threadKey), entry]);
+      return entry;
+    },
+    beginSend: (threadKey, id, toolActivityId) => {
+      const queue = queueOf(threadKey);
+      const entry = queue.find((message) => message.id === id);
+      if (!entry || queue.some((message) => message.sending)) return null;
+      update(
+        threadKey,
+        queue.map((message) =>
+          message.id === id
+            ? { ...message, sending: "preparing" }
+            : message.queuedAfterToolActivityId === toolActivityId
+              ? message
+              : { ...message, queuedAfterToolActivityId: toolActivityId },
+        ),
       );
-      return {
-        queuesByThreadKey: {
-          ...state.queuesByThreadKey,
-          [threadKey]: [{ ...message, holdUntilUserAction: true }, ...rest],
+      return entry;
+    },
+    markDispatching: (threadKey, id, thread) => {
+      const queue = queueOf(threadKey);
+      if (!queue.some((message) => message.id === id && message.sending)) return false;
+      update(
+        threadKey,
+        queue.map((message) =>
+          message.id === id ? { ...message, sending: "dispatching" } : message,
+        ),
+        {
+          messageId: id,
+          thread,
+          previous: get().lastDispatchByThreadKey[threadKey]?.thread ?? null,
         },
-      };
-    });
-  },
-  drain: (threadKey) => {
-    const queue = get().queuesByThreadKey[threadKey];
-    if (!queue || queue.length === 0) {
-      return EMPTY_QUEUE;
-    }
-    set((state) => {
-      const queuesByThreadKey = { ...state.queuesByThreadKey };
-      delete queuesByThreadKey[threadKey];
-      return { queuesByThreadKey, drainGeneration: state.drainGeneration + 1 };
-    });
-    return queue;
-  },
-}));
+      );
+      return true;
+    },
+    finishSend: (threadKey, id) => {
+      const queue = queueOf(threadKey);
+      if (!queue.some((message) => message.id === id)) return;
+      update(
+        threadKey,
+        queue.filter((message) => message.id !== id),
+      );
+    },
+    failSend: (threadKey, id) => {
+      const queue = queueOf(threadKey);
+      const entry = queue.find((message) => message.id === id);
+      if (!entry) return false;
+      const { sending: _sending, ...rest } = entry;
+      // This send never reached the server, so only an earlier one is worth
+      // waiting for.
+      const dispatch = get().lastDispatchByThreadKey[threadKey];
+      update(
+        threadKey,
+        [{ ...rest, holdUntilUserAction: true }, ...queue.filter((message) => message.id !== id)],
+        dispatch?.messageId !== id
+          ? undefined
+          : dispatch.previous && { messageId: null, thread: dispatch.previous, previous: null },
+      );
+      return true;
+    },
+    remove: (threadKey, id) => {
+      const queue = queueOf(threadKey);
+      const entry = queue.find((message) => message.id === id);
+      if (!entry || entry.sending) return null;
+      update(
+        threadKey,
+        queue.filter((message) => message.id !== id),
+      );
+      return entry;
+    },
+    drain: (threadKey) => {
+      const queue = queueOf(threadKey);
+      const drained = queue.filter((message) => message.sending !== "dispatching");
+      if (drained.length === 0) return EMPTY_QUEUE;
+      update(
+        threadKey,
+        queue.filter((message) => message.sending === "dispatching"),
+      );
+      return drained;
+    },
+  };
+});
 
 /**
  * The newest finished tool call. Its id changing is the boundary a queued
diff --git a/apps/web/src/rightPanelLayout.ts b/apps/web/src/rightPanelLayout.ts
index 081a41f4d102..69b796c7ae77 100644
--- a/apps/web/src/rightPanelLayout.ts
+++ b/apps/web/src/rightPanelLayout.ts
@@ -1,5 +1 @@
 export const RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY = "(max-width: 980px)";
-// Applied only while a floating preview overlaps the compact sheet.
-export const RIGHT_PANEL_SHEET_LAYER_CLASS_NAME = "z-[35]";
-export const RIGHT_PANEL_SHEET_CLASS_NAME =
-  "w-[min(42vw,28rem)] min-w-80 max-w-[28rem] p-0 max-[760px]:w-[min(88vw,24rem)] max-[760px]:min-w-0 wco:mt-[env(titlebar-area-height)] wco:h-[calc(100%-env(titlebar-area-height))] wco:max-h-[calc(100%-env(titlebar-area-height))]";
diff --git a/apps/web/src/rightPanelStore.test.ts b/apps/web/src/rightPanelStore.test.ts
index 0902335f97cc..870632a55b97 100644
--- a/apps/web/src/rightPanelStore.test.ts
+++ b/apps/web/src/rightPanelStore.test.ts
@@ -469,6 +469,24 @@ describe("rightPanelStore", () => {
     });
   });
 
+  it("opens workspace-root links as the singleton files explorer", () => {
+    const store = useRightPanelStore.getState();
+    store.openFile(refA, "README.md");
+    store.openFile(refA, ".");
+    store.openFile(refA, ".");
+    const state = selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, refA);
+    expect(state.activeSurfaceId).toBe("files");
+    expect(state.surfaces.map((surface) => surface.id)).toEqual(["file:README.md", "files"]);
+    store.closeSurface(refA, "files");
+    expect(
+      selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, refA).activeSurfaceId,
+    ).toBe("file:README.md");
+    store.openFile(refA, ".");
+    expect(
+      selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, refA).activeSurfaceId,
+    ).toBe("files");
+  });
+
   it("keeps the standalone explorer alongside peer file surfaces", () => {
     useRightPanelStore.getState().open(refA, "files");
     useRightPanelStore.getState().openFile(refA, "src/index.ts");
diff --git a/apps/web/src/rightPanelStore.ts b/apps/web/src/rightPanelStore.ts
index 88cade6250e8..51ac9006f383 100644
--- a/apps/web/src/rightPanelStore.ts
+++ b/apps/web/src/rightPanelStore.ts
@@ -604,6 +604,9 @@ export const useRightPanelStore = create<RightPanelStoreState>()(
       openFile: (ref, requestedPath, line) =>
         set((state) =>
           userAction(state, scopedThreadKey(ref), (current) => {
+            if (requestedPath === ".") {
+              return upsertSurface(current, singletonSurface("files"));
+            }
             // Workspace entry paths use '/', including on Windows.
             const relativePath = /^[A-Za-z]:\/+$/.test(requestedPath)
               ? requestedPath
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index eee703ac3f47..d90bdb6f0a90 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -26,10 +26,14 @@ import { RelayClientInstallDialog } from "../components/cloud/RelayClientInstall
 import { SshPasswordPromptDialog } from "../components/desktop/SshPasswordPromptDialog";
 import { SnapShotCoordinator } from "../components/desktop/SnapShotCoordinator";
 import { DesktopAppActivationCoordinator } from "../components/desktop/DesktopAppActivationCoordinator";
+import { RunningThreadKeepAlive } from "../components/desktop/RunningThreadKeepAlive";
 import { ProviderUpdateLaunchNotification } from "../components/ProviderUpdateLaunchNotification";
 import { ThreadNotificationCoordinator } from "../components/ThreadNotificationCoordinator";
+import { QueuedMessageSender } from "../components/QueuedMessageSender";
 import { ProjectCloneToastCoordinator } from "../components/ProjectCloneToastCoordinator";
 import { SlowRpcRequestToastCoordinator } from "../components/SlowRpcRequestToastCoordinator";
+import { ChatGptWelcomeCoordinator } from "../components/settings/ChatGptWelcomeCoordinator";
+import { ProviderAuthCallbackCoordinator } from "../components/settings/ProviderAuthCallbackCoordinator";
 import { ThemeEditorHost } from "../components/settings/ThemeEditorHost";
 import { useCopyToClipboard } from "../hooks/useCopyToClipboard";
 import { useDefaultThemeAdoption } from "../hooks/useDefaultTheme";
@@ -43,6 +47,7 @@ import {
   toastManager,
 } from "../components/ui/toast";
 import { resolveAndPersistPreferredEditor } from "../editorPreferences";
+import { isElectron } from "../env";
 import { applyAppearanceFontVariables } from "~/appearanceFonts";
 import { applyAppearanceContrast } from "~/appearanceContrast";
 import { useClientSettings } from "../hooks/useSettings";
@@ -173,6 +178,7 @@ function RootRouteView() {
           <EnvironmentThemeSync />
           <GlassAppearanceSync />
           <FontAppearanceSync />
+          <ProviderAuthCallbackCoordinator />
           <CustomSnoozeDialogHost />
           <CommandPalette>
             <AppSidebarLayout>
@@ -213,17 +219,21 @@ function RootRouteView() {
         <EnvironmentThemeSync />
         <GlassAppearanceSync />
         <FontAppearanceSync />
+        <ProviderAuthCallbackCoordinator />
+        <ChatGptWelcomeCoordinator />
         <FirstRunGate
           enabled={primaryEnvironmentAuthenticated}
           hostedStatic={authGateState.status === "hosted-static"}
         >
           {primaryEnvironmentAuthenticated ? <AuthenticatedTracingBootstrap /> : null}
           {primaryEnvironmentAuthenticated ? <DesktopAppActivationCoordinator /> : null}
+          {isElectron ? <RunningThreadKeepAlive /> : null}
           <RelayClientInstallDialog />
           <ConnectOnboardingDialog />
           <SshPasswordPromptDialog />
           <SnapShotCoordinator />
           <ThreadNotificationCoordinator />
+          <QueuedMessageSender />
           <ConfirmDialogHost />
           <CustomSnoozeDialogHost />
           <SlowRpcRequestToastCoordinator />
@@ -261,6 +271,11 @@ function ContrastAppearanceSync() {
     document.documentElement.dataset.diffColorScheme = diffColorScheme;
   }, [diffColorScheme]);
 
+  const chatWidth = useClientSettings((settings) => settings.chatWidth);
+  useEffect(() => {
+    document.documentElement.dataset.chatWidth = chatWidth;
+  }, [chatWidth]);
+
   useEffect(() => {
     applyAppearanceContrast(document.documentElement, appearanceContrast);
   }, [appearanceContrast]);
diff --git a/apps/web/src/routes/_chat.index.tsx b/apps/web/src/routes/_chat.index.tsx
index 6031b927e0b1..40a2f9808df0 100644
--- a/apps/web/src/routes/_chat.index.tsx
+++ b/apps/web/src/routes/_chat.index.tsx
@@ -90,10 +90,11 @@ function IndexDraftLanding() {
 function DraftStartError({ onRetry }: { readonly onRetry: () => void }) {
   return (
     <SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none">
+      {isElectron ? <WorkspacePageHeader electron /> : null}
       <Empty className="flex-1">
         <EmptyHeader className="max-w-md">
-          <EmptyTitle className="text-foreground">Couldn’t start a new thread</EmptyTitle>
-          <EmptyDescription className="mt-2 text-muted-foreground/78">
+          <EmptyTitle>Couldn’t start a new thread</EmptyTitle>
+          <EmptyDescription>
             The project is still available. Try opening the draft again.
           </EmptyDescription>
           <div className="mt-5 flex justify-center">
@@ -138,16 +139,12 @@ function HostedStaticOnboardingState() {
               <div className="mx-auto mb-5 flex size-11 items-center justify-center rounded-xl border border-border/70 bg-background/70 text-muted-foreground">
                 <LinkIcon className="size-5" />
               </div>
-              <EmptyTitle className="text-foreground">
-                Connect to a computer running T3 Code
-              </EmptyTitle>
-              <EmptyDescription className="mt-2 leading-relaxed text-muted-foreground/78">
+              <EmptyTitle>Connect to a computer running T3 Code</EmptyTitle>
+              <EmptyDescription>
                 This app connects to T3 Code running on your computer or a server. Start the T3 Code
                 desktop app or command-line server on that machine and keep it running.
               </EmptyDescription>
-              <EmptyDescription className="mt-2 leading-relaxed text-muted-foreground/78">
-                {description}
-              </EmptyDescription>
+              <EmptyDescription>{description}</EmptyDescription>
               <div className="mt-6 flex justify-center">
                 <Button render={<Link to="/settings/connections" />} size="sm">
                   <PlusIcon className="size-4" />
diff --git a/apps/web/src/routes/_chat.pull-requests.tsx b/apps/web/src/routes/_chat.pull-requests.tsx
index ce2bd238746a..1b7239a0bef5 100644
--- a/apps/web/src/routes/_chat.pull-requests.tsx
+++ b/apps/web/src/routes/_chat.pull-requests.tsx
@@ -132,6 +132,7 @@ import { useLiveRefresh } from "../hooks/useLiveRefresh";
 import { useOpenPanelPullRequestUrl } from "../hooks/useOpenPanelPullRequestUrl";
 import { writeTextToClipboard } from "../hooks/useCopyToClipboard";
 import { toastManager } from "../components/ui/toast";
+import { useEscapeToGoBack } from "../hooks/useNavigateBack";
 import { usePanelAnimationSettings, usePanelPresence } from "../panelAnimations";
 import {
   PULL_REQUESTS_PANEL_REF,
@@ -218,7 +219,7 @@ function PullRequestGroupHeader({
       <Icon aria-hidden className="size-3.5 shrink-0" />
       <h2 className="shrink-0">{group.label}</h2>
       <span className="shrink-0 tabular-nums text-muted-foreground/50">{group.entries.length}</span>
-      <Separator className="min-w-2 flex-1 bg-border/60" />
+      <Separator className="min-w-2 flex-1" />
     </div>
   );
 }
@@ -340,6 +341,7 @@ export const Route = createFileRoute("/_chat/pull-requests")({
 });
 
 function PullRequestsRouteView() {
+  useEscapeToGoBack();
   const search = Route.useSearch();
   const sort = search.sort ?? "ready";
   const statsPolicy: PullRequestStatsPolicy =
@@ -1819,7 +1821,7 @@ function PullRequestsRouteView() {
       )}
 
       {listQuery.error && shownCount > 0 ? (
-        <div className="flex items-center justify-between gap-3 rounded-lg border border-amber-500/30 bg-amber-500/5 px-3 py-2 text-xs">
+        <div className="flex items-center justify-between gap-3 rounded-lg border border-warning/30 bg-warning-surface px-3 py-2 text-xs">
           <span>{listQuery.error} Showing the last pull requests loaded.</span>
           <Button size="xs" variant="outline" onClick={() => listQuery.refresh()}>
             Retry
@@ -2063,8 +2065,9 @@ function PullRequestsRouteView() {
       if (command === "rightPanel.toggle") toggleRightPanelFromShortcut(event);
       if (command === "thread.copyReference") copyPullRequestFromShortcut(event);
     };
-    window.addEventListener("keydown", onKeyDown);
-    return () => window.removeEventListener("keydown", onKeyDown);
+    // Let panel shortcuts consume Escape before page navigation at window.
+    document.addEventListener("keydown", onKeyDown);
+    return () => document.removeEventListener("keydown", onKeyDown);
   }, [keybindings]);
 
   return (
@@ -2234,16 +2237,13 @@ function CompactFilterMenu<Value extends string>({
         aria-label={triggerLabel || iconOnly ? `${label}: ${current.label}` : label}
         title={iconOnly ? `${label}: ${current.label}` : undefined}
         render={
-          outlined ? <Button variant="outline" size={iconOnly ? "icon" : "default"} /> : undefined
-        }
-        className={
-          outlined
-            ? className
-            : cn(
-                "inline-flex h-7 min-w-0 items-center gap-1 rounded-md px-1.5 text-sm font-medium text-muted-foreground hover:bg-accent hover:text-foreground",
-                className,
-              )
+          outlined ? (
+            <Button variant="outline" size={iconOnly ? "icon" : "default"} />
+          ) : (
+            <Button variant="ghost-muted" size="sm" />
+          )
         }
+        className={cn("min-w-0", className)}
       >
         {iconOnly ? (
           <current.Icon aria-hidden className="size-4" />
@@ -2259,7 +2259,7 @@ function CompactFilterMenu<Value extends string>({
           </>
         )}
       </MenuTrigger>
-      <MenuPopup align="start" side="bottom" className="min-w-40">
+      <MenuPopup align="start" side="bottom">
         <MenuRadioGroup value={value} onValueChange={(next) => onChange(next as Value)}>
           {options.map((option) => {
             const item = (
@@ -2280,9 +2280,7 @@ function CompactFilterMenu<Value extends string>({
             ) : (
               <Tooltip key={option.value}>
                 <TooltipTrigger render={item} />
-                <TooltipPopup side="right" className="max-w-64 break-words">
-                  {option.unavailable}
-                </TooltipPopup>
+                <TooltipPopup side="right">{option.unavailable}</TooltipPopup>
               </Tooltip>
             );
           })}
diff --git a/apps/web/src/routes/settings.providers.tsx b/apps/web/src/routes/settings.providers.tsx
index 54eb77ea093a..33e02505b992 100644
--- a/apps/web/src/routes/settings.providers.tsx
+++ b/apps/web/src/routes/settings.providers.tsx
@@ -6,8 +6,8 @@ import { useSettingsScope } from "../components/settings/SettingsScopeContext";
 
 /**
  * Providers are machine state, so the page shows one environment at a time:
- * the chosen one, or the representative of the selection. A project crumb
- * narrows the candidates to the environments that project is registered on.
+ * the chosen one from the settings scope selector.
+ * A project crumb narrows candidates to where that project is registered.
  */
 function SettingsProvidersRoute() {
   const target = Route.useSearch();
diff --git a/apps/web/src/routes/settings.tsx b/apps/web/src/routes/settings.tsx
index e95895926d4d..576307fbe7ad 100644
--- a/apps/web/src/routes/settings.tsx
+++ b/apps/web/src/routes/settings.tsx
@@ -1,27 +1,23 @@
-import {
-  Outlet,
-  createFileRoute,
-  redirect,
-  useCanGoBack,
-  useLocation,
-  useNavigate,
-} from "@tanstack/react-router";
-import { useCallback, useEffect, useState, type ReactNode } from "react";
+import { Outlet, createFileRoute, redirect, useLocation } from "@tanstack/react-router";
+import { useState, type ReactNode } from "react";
 import { RotateCcwIcon } from "lucide-react";
 import { Button } from "../components/ui/button";
 import { useSettingsRestore } from "../components/settings/SettingsPanels";
 
 import { SettingsBreadcrumb } from "../components/settings/SettingsBreadcrumb";
 import { SidebarInset } from "../components/ui/sidebar";
+import { useNavigateToMainApp } from "../components/sidebar/mainAppLocation";
 import { WorkspacePageHeader } from "../components/WorkspacePageHeader";
 import { isElectron } from "../env";
+import { useEscapeToGoBack } from "../hooks/useNavigateBack";
 import {
   SettingsScopeProvider,
   useSettingsScope,
 } from "../components/settings/SettingsScopeContext";
-import { useSettingsProjectGroups } from "../components/settings/useSettingsProjectGroups";
 import { useEnvironments } from "../state/environments";
 import { SettingsScopeNotice } from "../components/settings/SettingsScopeNotice";
+import { SETTINGS_DEVICE_ONLY_PATHS } from "../components/settings/SettingsScopeSentence";
+import { SettingsPageContainer } from "../components/settings/settingsLayout";
 import {
   retainSettingsScope,
   validateSettingsRouteSearch,
@@ -47,13 +43,6 @@ function RestoreDeviceDefaultsButton({ onRestored }: { onRestored: () => void })
   );
 }
 
-/** Pages whose every row is saved on this client; the scope selects are hidden there. */
-const DEVICE_ONLY_PATHS = new Set([
-  "/settings/appearance",
-  "/settings/snap-shot",
-  "/settings/connections",
-]);
-
 function SettingsScopeBoundary({ pathname, children }: { pathname: string; children: ReactNode }) {
   const { scope, connectedEnvironments } = useSettingsScope();
   const { environments } = useEnvironments();
@@ -99,16 +88,23 @@ function SettingsScopeBoundary({ pathname, children }: { pathname: string; child
   }
   // Device-local pages ignore the scope entirely; the project page follows
   // remembered members while a grouping change replaces its URL key.
-  if (DEVICE_ONLY_PATHS.has(pathname) || pathname === "/settings/projects") {
+  if (SETTINGS_DEVICE_ONLY_PATHS.has(pathname) || pathname === "/settings/projects") {
     return children;
   }
+  // Keep the scope sentence on screen so the selection can be changed back.
   if (scope.kind === "unavailable")
-    return <p className="p-8 text-sm text-muted-foreground">{scope.message}</p>;
+    return (
+      <SettingsPageContainer>
+        <p className="text-sm text-muted-foreground">{scope.message}</p>
+      </SettingsPageContainer>
+    );
   if (scope.kind === "environment" && connectedEnvironments.length === 0) {
     return (
-      <p className="p-8 text-sm text-muted-foreground">
-        Reconnect {scope.label} to change its settings.
-      </p>
+      <SettingsPageContainer>
+        <p className="text-sm text-muted-foreground">
+          Reconnect {scope.label} to change its settings.
+        </p>
+      </SettingsPageContainer>
     );
   }
   return children;
@@ -116,55 +112,17 @@ function SettingsScopeBoundary({ pathname, children }: { pathname: string; child
 
 function SettingsContentLayout() {
   const location = useLocation();
-  const navigate = useNavigate();
-  const canGoBack = useCanGoBack();
-  const { search, selectScope } = useSettingsScope();
-  const groups = useSettingsProjectGroups();
-  const { environments } = useEnvironments();
+  const navigateToMainApp = useNavigateToMainApp();
+  useEscapeToGoBack(navigateToMainApp);
+  const { search } = useSettingsScope();
   const [restoreSignal, setRestoreSignal] = useState(0);
-  const showScope = !DEVICE_ONLY_PATHS.has(location.pathname);
-  const navigateBackWithinApp = useCallback(() => {
-    if (canGoBack) {
-      window.history.back();
-      return;
-    }
-    void navigate({ to: "/" });
-  }, [canGoBack, navigate]);
-
-  useEffect(() => {
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.defaultPrevented) return;
-      if (event.key === "Escape") {
-        event.preventDefault();
-
-        const activeElement = document.activeElement;
-        if (activeElement instanceof HTMLElement) {
-          activeElement.blur();
-        }
-
-        navigateBackWithinApp();
-      }
-    };
-
-    window.addEventListener("keydown", onKeyDown);
-    return () => {
-      window.removeEventListener("keydown", onKeyDown);
-    };
-  }, [navigateBackWithinApp]);
 
   return (
     <SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none isolate">
       <div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background text-foreground">
         <WorkspacePageHeader electron={isElectron}>
           <div className="flex w-full items-center gap-3">
-            <SettingsBreadcrumb
-              pathname={location.pathname}
-              scope={
-                showScope
-                  ? { value: search, groups, environments, onChange: selectScope }
-                  : undefined
-              }
-            />
+            <SettingsBreadcrumb pathname={location.pathname} />
             {location.pathname === "/settings/general" ? (
               <div className="ms-auto flex shrink-0 items-center">
                 <RestoreDeviceDefaultsButton
@@ -195,6 +153,7 @@ function SettingsRouteLayout() {
   return (
     <SettingsScopeProvider
       search={rawSearch}
+      singleEnvironment={pathname === "/settings/providers"}
       onChange={(next) => {
         // Send every axis so the retain middleware sees an explicit target
         // even when the choice is "all", which is the absence of a key.
diff --git a/apps/web/src/routes/welcome.tsx b/apps/web/src/routes/welcome.tsx
index eb5d4975ab22..b69911c0abcb 100644
--- a/apps/web/src/routes/welcome.tsx
+++ b/apps/web/src/routes/welcome.tsx
@@ -1,10 +1,15 @@
 import { createFileRoute, redirect, useLocation, useNavigate } from "@tanstack/react-router";
 import { useState } from "react";
+import { EnvironmentId } from "@t3tools/contracts";
+import * as Schema from "effect/Schema";
+import * as Option from "effect/Option";
 
 import { NoProjectsHero } from "../components/NoProjectsHero";
 import { WelcomeWizard } from "../components/onboarding/WelcomeWizard";
 import { useNewThreadHandler } from "../hooks/useHandleNewThread";
 
+const decodeEnvironmentId = Schema.decodeOption(EnvironmentId);
+
 /** Onboarding overlays the workspace. Visiting /welcome reopens setup. */
 export const Route = createFileRoute("/welcome")({
   beforeLoad: ({ context }) => {
@@ -19,6 +24,10 @@ export const Route = createFileRoute("/welcome")({
 function WelcomeRouteView() {
   const { authGateState } = Route.useRouteContext();
   const navigate = useNavigate();
+  const hash = useLocation({ select: (location) => location.hash });
+  const resumeEnvironmentId = hash.startsWith("agents:")
+    ? Option.getOrUndefined(decodeEnvironmentId(hash.slice("agents:".length)))
+    : undefined;
   // The root shell can remount this pending outlet after the location changes.
   // Never reopen setup while the destination route is still loading.
   const isWelcomeRoute = useLocation({ select: (location) => location.pathname === "/welcome" });
@@ -35,15 +44,16 @@ function WelcomeRouteView() {
       {isWelcomeRoute && !dismissed ? (
         <WelcomeWizard
           localAvailable={localAvailable}
-          onDone={(projectRef) => {
+          resumeEnvironmentId={resumeEnvironmentId}
+          onDone={async (projectRef) => {
             setDismissed(true);
             if (projectRef !== undefined) {
-              void openNewThread(projectRef, { replace: true }).catch(() => {
-                void navigate({ to: "/", replace: true });
-              });
+              await openNewThread(projectRef, { replace: true }).catch(() =>
+                navigate({ to: "/", replace: true }),
+              );
               return;
             }
-            void navigate({ to: "/", replace: true });
+            await navigate({ to: "/", replace: true });
           }}
         />
       ) : null}
diff --git a/apps/web/src/shortcutModifierState.test.ts b/apps/web/src/shortcutModifierState.test.ts
index 4ef4b3b6bf2d..20b63220072d 100644
--- a/apps/web/src/shortcutModifierState.test.ts
+++ b/apps/web/src/shortcutModifierState.test.ts
@@ -1,8 +1,13 @@
-import { describe, expect, it } from "vite-plus/test";
+// @vitest-environment jsdom
+
+import { act, createElement } from "react";
+import { createRoot, type Root } from "react-dom/client";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
 
 import {
   areShortcutModifierStatesEqual,
   shortcutModifierStateAfterKeyboardEvent,
+  useShortcutModifierState,
   type ShortcutModifierState,
 } from "./shortcutModifierState";
 
@@ -13,6 +18,67 @@ const emptyState = (): ShortcutModifierState => ({
   shiftKey: false,
 });
 
+describe("useShortcutModifierState", () => {
+  let root: Root;
+  let container: HTMLDivElement;
+
+  beforeEach(() => {
+    vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
+    container = document.createElement("div");
+    document.body.append(container);
+    root = createRoot(container);
+  });
+
+  afterEach(async () => {
+    await act(async () => root.unmount());
+    container.remove();
+    vi.unstubAllGlobals();
+  });
+
+  it.each(["keyup", "paste", "blur"] as const)(
+    "does not render for unchanged modifiers after %s resets the state",
+    async (reset) => {
+      const render = vi.fn();
+      function Consumer() {
+        render(useShortcutModifierState());
+        return null;
+      }
+      await act(async () => {
+        root.render(createElement(Consumer));
+      });
+      const press = async (type: "keydown" | "keyup", key: string, shiftKey = false) => {
+        await act(async () => {
+          window.dispatchEvent(new KeyboardEvent(type, { key, shiftKey }));
+        });
+      };
+
+      await press("keydown", "Shift", true);
+      expect(render).toHaveBeenLastCalledWith({ ...emptyState(), shiftKey: true });
+      if (reset === "keyup") {
+        await press("keyup", "Shift");
+      } else {
+        await act(async () => {
+          window.dispatchEvent(new Event(reset));
+        });
+      }
+      expect(render).toHaveBeenLastCalledWith(emptyState());
+      render.mockClear();
+
+      for (const key of "typing") {
+        await press("keydown", key);
+        await press("keyup", key);
+      }
+      await act(async () => {
+        window.dispatchEvent(new Event("paste"));
+        window.dispatchEvent(new Event("blur"));
+      });
+      expect(render).not.toHaveBeenCalled();
+      await press("keydown", "Shift", true);
+      expect(render).toHaveBeenCalledExactlyOnceWith({ ...emptyState(), shiftKey: true });
+    },
+  );
+});
+
 function keyboardEventLike(type: "keydown" | "keyup", init: Partial<KeyboardEvent>): KeyboardEvent {
   return {
     type,
diff --git a/apps/web/src/shortcutModifierState.ts b/apps/web/src/shortcutModifierState.ts
index 3abeeaa3e8aa..15d6e0a1bcae 100644
--- a/apps/web/src/shortcutModifierState.ts
+++ b/apps/web/src/shortcutModifierState.ts
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 
 export interface ShortcutModifierState {
   metaKey: boolean;
@@ -28,10 +28,18 @@ export function areShortcutModifierStatesEqual(
 
 export function useShortcutModifierState(): ShortcutModifierState {
   const [state, setState] = useState(EMPTY_SHORTCUT_MODIFIER_STATE);
+  const stateRef = useRef(EMPTY_SHORTCUT_MODIFIER_STATE);
 
   useEffect(() => {
+    const updateState = (next: ShortcutModifierState) => {
+      // Even a no-op state dispatch can cost work in the sidebar's large tree.
+      // Ordinary typing must return before dispatching a React update.
+      if (areShortcutModifierStatesEqual(stateRef.current, next)) return;
+      stateRef.current = next;
+      setState(next);
+    };
     const onKeyboardEvent = (event: KeyboardEvent) => {
-      setState((current) => shortcutModifierStateAfterKeyboardEvent(current, event));
+      updateState(shortcutModifierStateAfterKeyboardEvent(stateRef.current, event));
     };
     // Dictation tools (Wispr Flow) paste with a synthetic ⌘V whose Meta keyup
     // never reaches the page, so the tracked state stays "⌘ held" forever and
@@ -39,11 +47,7 @@ export function useShortcutModifierState(): ShortcutModifierState {
     // treat it like a blur and reset. A physically held modifier re-registers
     // on the next real key event.
     const onResetEvent = () => {
-      setState((current) =>
-        areShortcutModifierStatesEqual(current, EMPTY_SHORTCUT_MODIFIER_STATE)
-          ? current
-          : EMPTY_SHORTCUT_MODIFIER_STATE,
-      );
+      updateState(EMPTY_SHORTCUT_MODIFIER_STATE);
     };
 
     window.addEventListener("keydown", onKeyboardEvent, true);
diff --git a/apps/web/src/state/entities.ts b/apps/web/src/state/entities.ts
index 0c32d417f947..bc6fb59761e5 100644
--- a/apps/web/src/state/entities.ts
+++ b/apps/web/src/state/entities.ts
@@ -170,6 +170,14 @@ export function readThreadShell(ref: ScopedThreadRef): EnvironmentThreadShell |
   return appAtomRegistry.get(environmentThreadShells.threadShellAtom(ref));
 }
 
+/** The thread as `useThread` returns it, read outside React. */
+export function readThread(ref: ScopedThreadRef): EnvironmentThread | null {
+  return mergeEnvironmentThread(
+    appAtomRegistry.get(environmentThreadDetails.detailAtom(ref)),
+    readThreadShell(ref),
+  );
+}
+
 /** Whether the environment's server understands thread.settle/unsettle.
     False for pre-settlement servers (capability defaults false on decode),
     so clients under version skew fall back instead of erroring. */
@@ -216,6 +224,15 @@ export function readEnvironmentSupportsPinReorder(environmentId: EnvironmentId):
   );
 }
 
+/** Whether the environment's server understands thread.auto-settle.set.
+    Same version-skew contract as settlement. */
+export function readEnvironmentSupportsAutoSettleOptOut(environmentId: EnvironmentId): boolean {
+  return (
+    appAtomRegistry.get(environmentServerConfigsAtom).get(environmentId)?.environment.capabilities
+      .threadAutoSettleOptOut === true
+  );
+}
+
 export function readEnvironmentSupportsActiveReorder(environmentId: EnvironmentId): boolean {
   return (
     appAtomRegistry.get(environmentServerConfigsAtom).get(environmentId)?.environment.capabilities
diff --git a/apps/web/src/state/threads.test.ts b/apps/web/src/state/threads.test.ts
new file mode 100644
index 000000000000..cf1fc8777283
--- /dev/null
+++ b/apps/web/src/state/threads.test.ts
@@ -0,0 +1,200 @@
+import {
+  EMPTY_ENVIRONMENT_THREAD_STATE,
+  type EnvironmentThreadState,
+} from "@t3tools/client-runtime/state/threads";
+import {
+  EnvironmentId,
+  ProjectId,
+  ProviderInstanceId,
+  ThreadId,
+  type OrchestrationSessionStatus,
+  type OrchestrationThread,
+  type OrchestrationThreadShell,
+} from "@t3tools/contracts";
+import * as Option from "effect/Option";
+import { AsyncResult, Atom, AtomRegistry } from "effect/unstable/reactivity";
+import { describe, expect, it } from "vite-plus/test";
+
+import { createRunningThreadKeepAliveAtom } from "./threads";
+
+const LOCAL = EnvironmentId.make("local");
+const REMOTE = EnvironmentId.make("remote");
+
+function session(threadId: ThreadId, status: OrchestrationSessionStatus) {
+  return {
+    threadId,
+    status,
+    providerName: "codex",
+    runtimeMode: "full-access",
+    activeTurnId: null,
+    lastError: null,
+    updatedAt: "2026-09-24T00:00:00.000Z",
+  } satisfies OrchestrationThread["session"];
+}
+
+function shell(id: string, status: OrchestrationSessionStatus | null) {
+  const threadId = ThreadId.make(id);
+  return {
+    id: threadId,
+    session: status === null ? null : session(threadId, status),
+  } satisfies Pick<OrchestrationThreadShell, "id" | "session">;
+}
+
+function detail(
+  id: string,
+  status: OrchestrationSessionStatus,
+  overrides: Partial<EnvironmentThreadState> = {},
+) {
+  const threadId = ThreadId.make(id);
+  const thread: OrchestrationThread = {
+    id: threadId,
+    projectId: ProjectId.make("project"),
+    title: id,
+    modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
+    runtimeMode: "full-access",
+    interactionMode: "default",
+    branch: null,
+    worktreePath: null,
+    latestTurn: null,
+    createdAt: "2026-09-24T00:00:00.000Z",
+    updatedAt: "2026-09-24T00:00:00.000Z",
+    archivedAt: null,
+    settledOverride: null,
+    settledAt: null,
+    pullRequests: [],
+    deletedAt: null,
+    messages: [],
+    proposedPlans: [],
+    activities: [],
+    checkpoints: [],
+    session: session(threadId, status),
+  };
+  return AsyncResult.success<EnvironmentThreadState>({
+    ...EMPTY_ENVIRONMENT_THREAD_STATE,
+    status: "live",
+    data: Option.some(thread),
+    ...overrides,
+  });
+}
+
+function makeHarness() {
+  // Registry cleanup runs only on `flush`, like the real deferred task.
+  const tasks: Array<() => void> = [];
+  const registry = AtomRegistry.make({
+    scheduleTask: (task) => {
+      tasks.push(task);
+      return () => {};
+    },
+  });
+  const flush = () => {
+    for (let task = tasks.shift(); task !== undefined; task = tasks.shift()) task();
+  };
+  const environmentIds = Atom.make<ReadonlyArray<EnvironmentId>>([LOCAL, REMOTE]).pipe(
+    Atom.keepAlive,
+  );
+  const threads = Atom.family((_environmentId: EnvironmentId) =>
+    Atom.make<ReadonlyArray<ReturnType<typeof shell>>>([]).pipe(Atom.keepAlive),
+  );
+  // Stand-ins for the thread state atoms. Each one lives only while mounted,
+  // as the real stream does.
+  const keys = new Set<string>();
+  const states = Atom.family((_key: string) =>
+    Atom.make<AsyncResult.AsyncResult<EnvironmentThreadState>>(
+      AsyncResult.success(EMPTY_ENVIRONMENT_THREAD_STATE),
+    ),
+  );
+  const stateAtom = (environmentId: EnvironmentId, threadId: string) => {
+    const key = `${environmentId}:${threadId}`;
+    keys.add(key);
+    return states(key);
+  };
+  const keepAlive = createRunningThreadKeepAliveAtom({
+    environmentIdsAtom: environmentIds,
+    threadsAtom: threads,
+    stateAtom,
+  });
+  registry.mount(keepAlive);
+  return {
+    registry,
+    environmentIds,
+    threads,
+    stateAtom,
+    keepAlive,
+    openStreams: () => {
+      flush();
+      return [...keys].filter((key) => registry.getNodes().has(states(key))).toSorted();
+    },
+  };
+}
+
+describe("createRunningThreadKeepAliveAtom", () => {
+  it("keeps running threads open across shell updates and thread view visits", () => {
+    const h = makeHarness();
+    h.registry.set(h.threads(LOCAL), [
+      shell("a", "running"),
+      shell("b", "ready"),
+      shell("c", null),
+    ]);
+    h.registry.set(h.threads(REMOTE), [shell("d", "starting")]);
+    expect(h.openStreams()).toEqual(["local:a", "remote:d"]);
+
+    // A thread view that comes and goes shares the kept stream.
+    const live = detail("a", "running");
+    h.registry.set(h.stateAtom(LOCAL, "a"), live);
+    h.registry.mount(h.stateAtom(LOCAL, "a"))();
+
+    // A shell update that starts or stops nothing does not rebuild the set.
+    const kept = h.registry.get(h.keepAlive);
+    h.registry.set(h.threads(LOCAL), [shell("a", "running"), shell("b", "ready")]);
+    expect(h.registry.get(h.keepAlive)).toBe(kept);
+    expect(h.openStreams()).toEqual(["local:a", "remote:d"]);
+    expect(h.registry.get(h.stateAtom(LOCAL, "a"))).toBe(live);
+  });
+
+  it("holds a stopped thread until its own stream is live and shows the stop", () => {
+    const h = makeHarness();
+    h.registry.set(h.threads(LOCAL), [
+      shell("a", "running"),
+      shell("b", "running"),
+      shell("c", "running"),
+    ]);
+    // "b" has not loaded yet. "c" hit a stream error.
+    h.registry.set(h.stateAtom(LOCAL, "a"), detail("a", "running"));
+    h.registry.set(
+      h.stateAtom(LOCAL, "c"),
+      detail("c", "running", { status: "cached", error: Option.some("Could not sync.") }),
+    );
+
+    // The shell reports the stops first. A failed stream cannot deliver its
+    // stop, so only it is released now.
+    h.registry.set(h.threads(LOCAL), [
+      shell("a", "ready"),
+      shell("b", "ready"),
+      shell("c", "ready"),
+    ]);
+    expect(h.openStreams()).toEqual(["local:a", "local:b"]);
+
+    h.registry.set(h.stateAtom(LOCAL, "a"), detail("a", "ready"));
+    h.registry.set(h.stateAtom(LOCAL, "b"), detail("b", "ready", { status: "synchronizing" }));
+    expect(h.openStreams()).toEqual(["local:b"]);
+    h.registry.set(h.stateAtom(LOCAL, "b"), detail("b", "ready"));
+    expect(h.openStreams()).toEqual([]);
+  });
+
+  it("follows environments that connect and go away", () => {
+    const h = makeHarness();
+    h.registry.set(h.environmentIds, [LOCAL]);
+    h.registry.set(h.threads(REMOTE), [shell("d", "running")]);
+    expect(h.openStreams()).toEqual([]);
+
+    h.registry.set(h.environmentIds, [LOCAL, REMOTE]);
+    expect(h.openStreams()).toEqual(["remote:d"]);
+
+    // Removal drops every mount, including one still waiting for its stop.
+    h.registry.set(h.stateAtom(REMOTE, "d"), detail("d", "running"));
+    h.registry.set(h.threads(REMOTE), [shell("d", "ready")]);
+    expect(h.openStreams()).toEqual(["remote:d"]);
+    h.registry.set(h.environmentIds, [LOCAL]);
+    expect(h.openStreams()).toEqual([]);
+  });
+});
diff --git a/apps/web/src/state/threads.ts b/apps/web/src/state/threads.ts
index deda3ca29e9a..31f8fea47b3f 100644
--- a/apps/web/src/state/threads.ts
+++ b/apps/web/src/state/threads.ts
@@ -1,4 +1,6 @@
 import { useAtomValue } from "@effect/atom-react";
+import { enabledEnvironmentIds } from "@t3tools/client-runtime/state/connections";
+import { arrayElementsEqual } from "@t3tools/client-runtime/state/entities";
 import {
   createEnvironmentThreadDetailAtoms,
   createEnvironmentThreadShellAtoms,
@@ -6,8 +8,9 @@ import {
   EMPTY_ENVIRONMENT_THREAD_STATE,
   type EnvironmentThreadState,
   createThreadEnvironmentAtoms,
+  isThreadSessionRunning,
 } from "@t3tools/client-runtime/state/threads";
-import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
+import type { EnvironmentId, OrchestrationThreadShell, ThreadId } from "@t3tools/contracts";
 import * as Option from "effect/Option";
 import { AsyncResult, Atom } from "effect/unstable/reactivity";
 
@@ -46,3 +49,84 @@ export function useEnvironmentThread(
     () => EMPTY_ENVIRONMENT_THREAD_STATE,
   ) as EnvironmentThreadState;
 }
+
+type KeptThreads = ReadonlyMap<EnvironmentId, ReadonlySet<ThreadId>>;
+
+// True once a thread's own stream no longer needs to stay open: it is in sync
+// and shows a settled session, or it cannot progress (deleted or failed). A
+// stream that is still loading or reconnecting keeps waiting for the stop.
+function isDetailDone<E>(result: AsyncResult.AsyncResult<EnvironmentThreadState, E>): boolean {
+  if (!AsyncResult.isSuccess(result)) return true;
+  const { status, data, error } = result.value;
+  if (status === "deleted" || Option.isSome(error)) return true;
+  return (
+    status === "live" && !Option.exists(data, (thread) => isThreadSessionRunning(thread.session))
+  );
+}
+
+/**
+ * Keeps the thread state atom mounted for each running thread in the listed
+ * environments. Mount the result; its value is only bookkeeping.
+ *
+ * The shell and detail streams are independent, so the shell can report a
+ * stop before the detail loads or catches up. A stopped thread stays mounted
+ * until its own detail is live and shows the stop too. Then the stream closes
+ * and saves the settled state to disk.
+ */
+export function createRunningThreadKeepAliveAtom<E>(input: {
+  readonly environmentIdsAtom: Atom.Atom<ReadonlyArray<EnvironmentId>>;
+  readonly threadsAtom: (
+    environmentId: EnvironmentId,
+  ) => Atom.Atom<ReadonlyArray<Pick<OrchestrationThreadShell, "id" | "session">>>;
+  readonly stateAtom: (
+    environmentId: EnvironmentId,
+    threadId: ThreadId,
+  ) => Atom.Atom<AsyncResult.AsyncResult<EnvironmentThreadState, E>>;
+}) {
+  // Keeps its identity until a thread starts or stops, so ordinary shell
+  // updates do not rebuild the keep-alive set.
+  const runningThreadIdsAtom = Atom.family((environmentId: EnvironmentId) => {
+    let previous: ReadonlyArray<ThreadId> = [];
+    return Atom.make((get) => {
+      const running = get(input.threadsAtom(environmentId)).flatMap((thread) =>
+        isThreadSessionRunning(thread.session) ? [thread.id] : [],
+      );
+      if (arrayElementsEqual(previous, running)) return previous;
+      previous = running;
+      return running;
+    }).pipe(Atom.withLabel(`web-running-thread-ids:${environmentId}`));
+  });
+
+  return Atom.make((get): KeptThreads => {
+    const previous = Option.getOrUndefined(get.self<KeptThreads>());
+    const kept = new Map<EnvironmentId, ReadonlySet<ThreadId>>();
+    // An environment that leaves the list is not visited, so its mounts drop.
+    for (const environmentId of get(input.environmentIdsAtom)) {
+      const threadIds = new Set(get(runningThreadIdsAtom(environmentId)));
+      for (const threadId of previous?.get(environmentId) ?? []) {
+        if (threadIds.has(threadId)) continue;
+        const stateAtom = input.stateAtom(environmentId, threadId);
+        // `once`, not `get`: a dependency on a stopped thread would hold its
+        // stream open until some other change rebuilds this atom.
+        if (isDetailDone(get.once(stateAtom))) continue;
+        threadIds.add(threadId);
+        // Rebuild when this detail is done, not on each update.
+        get.subscribe(stateAtom, (state) => {
+          if (isDetailDone(state)) get.refreshSelf();
+        });
+      }
+      for (const threadId of threadIds) get.mount(input.stateAtom(environmentId, threadId));
+      kept.set(environmentId, threadIds);
+    }
+    return kept;
+  }).pipe(Atom.withLabel("web-running-thread-keep-alive"));
+}
+
+/** Mounted by `RunningThreadKeepAlive` on desktop, for every enabled environment. */
+export const runningThreadKeepAliveAtom = createRunningThreadKeepAliveAtom({
+  environmentIdsAtom: Atom.map(environmentCatalog.catalogValueAtom, (catalog) => [
+    ...enabledEnvironmentIds(catalog),
+  ]),
+  threadsAtom: environmentThreadShells.environmentThreadsAtom,
+  stateAtom: environmentThreads.stateAtom,
+});
diff --git a/apps/web/src/state/usage.test.tsx b/apps/web/src/state/usage.test.tsx
index e01478e6a71a..c80b642b76b7 100644
--- a/apps/web/src/state/usage.test.tsx
+++ b/apps/web/src/state/usage.test.tsx
@@ -23,6 +23,7 @@ function environment(id: string, cost: number | null, hostId = id): EnvironmentU
     label: id,
     isPending: cost === null,
     error: null,
+    needsCursorKeychainAccess: false,
     summary:
       cost === null
         ? null
diff --git a/apps/web/src/state/usage.ts b/apps/web/src/state/usage.ts
index 617ac93e4b7c..f61bb9060384 100644
--- a/apps/web/src/state/usage.ts
+++ b/apps/web/src/state/usage.ts
@@ -13,7 +13,7 @@ import {
   type UsageSummary,
   type UsageSummaryInput,
 } from "@t3tools/contracts";
-import { refreshUsage } from "@t3tools/client-runtime/state/usage";
+import { needsCursorKeychainAccess, refreshUsage } from "@t3tools/client-runtime/state/usage";
 import * as Option from "effect/Option";
 import { AsyncResult, Atom } from "effect/unstable/reactivity";
 import { useCallback, useMemo } from "react";
@@ -29,6 +29,7 @@ export interface EnvironmentUsageStatus {
   readonly isPending: boolean;
   readonly error: string | null;
   readonly summary: UsageSummary | null;
+  readonly needsCursorKeychainAccess: boolean;
 }
 
 /**
@@ -46,12 +47,17 @@ const usageByWindowAtom = Atom.family((windowKey: string) =>
     const statuses: EnvironmentUsageStatus[] = [];
     for (const [environmentId, presentation] of presentations) {
       const result = get(serverEnvironment.usageSummary({ environmentId, input }));
+      const summary = Option.getOrNull(AsyncResult.value(result));
       statuses.push({
         environmentId,
         label: presentation.entry.target.label,
         isPending: result.waiting,
         error: result._tag === "Failure" ? "This environment could not report usage." : null,
-        summary: Option.getOrNull(AsyncResult.value(result)),
+        summary,
+        needsCursorKeychainAccess: needsCursorKeychainAccess(
+          summary,
+          get(serverEnvironment.providersValueAtom(environmentId)),
+        ),
       });
     }
     return statuses;
diff --git a/apps/web/src/terminal-links.test.ts b/apps/web/src/terminal-links.test.ts
index 3c466378ba8b..5cb2ad915827 100644
--- a/apps/web/src/terminal-links.test.ts
+++ b/apps/web/src/terminal-links.test.ts
@@ -97,6 +97,24 @@ describe("extractTerminalLinks", () => {
       },
     ]);
   });
+
+  it("keeps a trailing colon on URLs", () => {
+    expect(extractTerminalLinks("GET https://example.test/items/foo:")).toEqual([
+      { kind: "url", text: "https://example.test/items/foo:", start: 4, end: 35 },
+    ]);
+  });
+
+  it.each([
+    ["./main.go:10:5: undefined: x", "./main.go:10:5"],
+    ["/home/dev/app/src/main.c:10:5: error: expected ';'", "/home/dev/app/src/main.c:10:5"],
+    ["C:\\dev\\app\\src\\main.c:10:5: error: expected ';'", "C:\\dev\\app\\src\\main.c:10:5"],
+    ["wrote ./out/report.txt:", "./out/report.txt"],
+  ])("drops the colon that ends a compiler diagnostic location in %s", (line, text) => {
+    const start = line.indexOf(text);
+    expect(extractTerminalLinks(line)).toEqual([
+      { kind: "path", text, start, end: start + text.length },
+    ]);
+  });
 });
 
 describe("collectWrappedTerminalLinkLine", () => {
@@ -173,6 +191,13 @@ describe("resolvePathLinkTarget", () => {
       resolvePathLinkTarget("C:/Users/julius/project/src/main.ts:12", "C:\\Users\\julius\\project"),
     ).toBe("C:/Users/julius/project/src/main.ts:12");
   });
+
+  it("keeps the line and column of a compiler diagnostic", () => {
+    const [link] = extractTerminalLinks("/Users/julius/project/main.c:10:5: error: expected ';'");
+    expect(resolvePathLinkTarget(link?.text ?? "", "/Users/julius/project")).toBe(
+      "/Users/julius/project/main.c:10:5",
+    );
+  });
 });
 
 describe("isTerminalLinkActivation", () => {
diff --git a/apps/web/src/terminal-links.ts b/apps/web/src/terminal-links.ts
index 59e2082a7359..0f253588b700 100644
--- a/apps/web/src/terminal-links.ts
+++ b/apps/web/src/terminal-links.ts
@@ -35,9 +35,14 @@ const URL_PATTERN = /https?:\/\/[^\s"'`<>]+/giu;
 const FILE_PATH_PATTERN =
   /(?:~\/|\.{1,2}\/|\/|[A-Za-z]:[\\/]|\\\\)[^\s"'`<>]+|[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)+(?::\d+){0,2}/g;
 const TRAILING_PUNCTUATION_PATTERN = /[.,;!?]+$/;
-
-function trimClosingDelimiters(value: string): string {
-  let output = value.replace(TRAILING_PUNCTUATION_PATTERN, "");
+// Paths also drop a trailing colon: compilers end `file:line:col:` with one.
+const TRAILING_PATH_PUNCTUATION_PATTERN = /[.,;:!?]+$/;
+
+function trimClosingDelimiters(value: string, kind: TerminalLinkKind): string {
+  let output = value.replace(
+    kind === "path" ? TRAILING_PATH_PUNCTUATION_PATTERN : TRAILING_PUNCTUATION_PATTERN,
+    "",
+  );
   if (output.length === 0) return output;
 
   const trimUnbalanced = (open: string, close: string) => {
@@ -73,7 +78,7 @@ function collectMatches(
     const start = rawMatch.index ?? -1;
     if (start < 0 || raw.length === 0) continue;
 
-    const trimmed = trimClosingDelimiters(raw);
+    const trimmed = trimClosingDelimiters(raw, kind);
     if (trimmed.length === 0) continue;
     if (kind === "path" && isTerminalUrl(trimmed)) continue;
 
diff --git a/apps/web/src/turbo/chatPanes/ChatPaneControl.tsx b/apps/web/src/turbo/chatPanes/ChatPaneControl.tsx
index 597dc9e7f985..fe03d9a70e69 100644
--- a/apps/web/src/turbo/chatPanes/ChatPaneControl.tsx
+++ b/apps/web/src/turbo/chatPanes/ChatPaneControl.tsx
@@ -32,7 +32,7 @@ export function ChatPaneControl() {
               type="button"
               size="xs"
               variant="outline"
-              className="w-7 px-0 sm:w-6 @3xl/header-actions:w-auto! @3xl/header-actions:px-[calc(--spacing(2)-1px)]"
+              className="w-7 sm:w-6 @3xl/header-actions:w-auto!"
               aria-label="Start a new chat"
               // The tooltip wrapper replaces data-slot="button", so themed
               // toolbar styling needs its own hook.
diff --git a/apps/web/src/turbo/chatPanes/ChatPaneWorkspace.tsx b/apps/web/src/turbo/chatPanes/ChatPaneWorkspace.tsx
index 110129d20cc0..275c141d6668 100644
--- a/apps/web/src/turbo/chatPanes/ChatPaneWorkspace.tsx
+++ b/apps/web/src/turbo/chatPanes/ChatPaneWorkspace.tsx
@@ -247,7 +247,7 @@ export function ChatPaneWorkspace({ fallback }: { readonly fallback: ReactNode }
 
   return (
     <DiffWorkerPoolProvider>
-      <SidebarInset className="h-svh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground md:h-dvh">
+      <SidebarInset className="h-svh min-h-0 overflow-hidden overscroll-y-none md:h-dvh">
         <div className="flex min-h-0 min-w-0 flex-1 overflow-hidden" data-chat-pane-workspace="">
           {layout.panes.map((pane, index) => {
             const isFocused = pane.id === layout.focusedPaneId;
diff --git a/apps/web/src/turbo/sortOrderEquivalence.test.ts b/apps/web/src/turbo/sortOrderEquivalence.test.ts
index fa3d10317d77..db282b8914d3 100644
--- a/apps/web/src/turbo/sortOrderEquivalence.test.ts
+++ b/apps/web/src/turbo/sortOrderEquivalence.test.ts
@@ -19,7 +19,7 @@ import {
   sortSettledThreadsForSidebar,
   sortSnoozedThreadsForSidebar,
 } from "../components/Sidebar.logic";
-import { resolveSettledThreadTimestamp as resolveSettledTimestamp } from "../lib/threadSort";
+import { resolveSettledThreadTimestamp as resolveSettledTimestamp } from "@t3tools/client-runtime/state/thread-sort";
 import { compareIsoTimestamps } from "@t3tools/client-runtime/state/thread-activity-order";
 
 /** Deterministic LCG: the corpora must be identical on every machine.
diff --git a/apps/web/src/workspaceBasenameLookup.test.ts b/apps/web/src/workspaceBasenameLookup.test.ts
index b4a1376e79c3..afe159dd402b 100644
--- a/apps/web/src/workspaceBasenameLookup.test.ts
+++ b/apps/web/src/workspaceBasenameLookup.test.ts
@@ -15,6 +15,8 @@ describe("needsWorkspaceBasenameLookup", () => {
   it("leaves anything with a directory alone", () => {
     expect(needsWorkspaceBasenameLookup("apps/web/src/components/ChatView.tsx")).toBe(false);
     expect(needsWorkspaceBasenameLookup("apps\\web\\ChatView.tsx")).toBe(false);
+    expect(needsWorkspaceBasenameLookup(".")).toBe(false);
+    expect(needsWorkspaceBasenameLookup("..")).toBe(false);
     expect(needsWorkspaceBasenameLookup("   ")).toBe(false);
   });
 });
diff --git a/apps/web/src/workspaceBasenameLookup.ts b/apps/web/src/workspaceBasenameLookup.ts
index b99d3ba4ded9..0efdfcf3a44d 100644
--- a/apps/web/src/workspaceBasenameLookup.ts
+++ b/apps/web/src/workspaceBasenameLookup.ts
@@ -25,7 +25,13 @@ function basenameOfPath(path: string): string {
 
 export function needsWorkspaceBasenameLookup(relativePath: string): boolean {
   const trimmed = relativePath.trim();
-  return trimmed.length > 0 && !trimmed.includes("/") && !trimmed.includes("\\");
+  return (
+    trimmed !== "." &&
+    trimmed !== ".." &&
+    trimmed.length > 0 &&
+    !trimmed.includes("/") &&
+    !trimmed.includes("\\")
+  );
 }
 
 export function pickWorkspaceBasenameMatch(
diff --git a/docs/internals/connection-runtime.md b/docs/internals/connection-runtime.md
index 797ff8fe31fe..301e1e0ffecb 100644
--- a/docs/internals/connection-runtime.md
+++ b/docs/internals/connection-runtime.md
@@ -61,6 +61,15 @@ stream, which stops when the last consumer unmounts; hidden mounted routes still
 count. A registry-local cache retains state and its replay cursor for five idle
 minutes so back navigation can resume without another snapshot download.
 
+The desktop app adds one consumer: a
+[keep-alive](../../apps/web/src/state/threads.ts) mounts every thread whose
+session is starting or running, in each enabled environment. Opening a running
+thread then needs no replay. The shell and detail streams are independent, so
+the shell can report a stop before the detail loads or catches up. A stopped
+thread stays mounted until its own stream is live and shows the stop, and the
+stream then closes and saves the settled state.
+Web and mobile do not keep threads alive.
+
 Retain state and cursor together only after an update finishes. Cancellation must
 not advance the cached cursor beyond the applied data, and an old scope must not
 overwrite its successor's cache. Preserve pagination data on reuse, but clear
diff --git a/docs/internals/devices.md b/docs/internals/devices.md
index 9b34851439ca..0d37f4c379f9 100644
--- a/docs/internals/devices.md
+++ b/docs/internals/devices.md
@@ -69,7 +69,8 @@ already-running agent without the CLI.
 How to drive a device is returned from `device_open`, not kept in an
 always-loaded prompt or skill: it costs nothing in threads that never open a
 device and cannot drift from the pinned CLI version. The always-on prompt block
-is a few lines that point at the tools and forbid raw `simctl` and `adb`.
+is a few lines that point at the tools and prefer them over raw `simctl` and
+`adb`, which stay available for what the tools do not cover.
 
 ## The viewer decodes both vendored protocols
 
diff --git a/docs/internals/providers.md b/docs/internals/providers.md
index cd7a68c3c2a0..bdc31bfdceff 100644
--- a/docs/internals/providers.md
+++ b/docs/internals/providers.md
@@ -48,6 +48,13 @@ loopback listener may be on another machine. Forward only the callback for the o
 a successful callback HTTP request is not proof that provider authentication finished. The native
 process owns token exchange and storage.
 
+Managed ChatGPT sign-in for a remote environment can finish on a local primary. The
+[primary handoff](../../apps/server/src/provider/CodexChatGptHandoff.ts) uses an ephemeral
+credential store and the destination's environment ID. It exchanges and verifies the code before
+transferring the issued client registration and tokens. Only the destination persists and refreshes
+that session; retaining a primary refresh session would race refresh-token rotation. Without a local
+primary, the client uses the remote callback completion flow.
+
 Antigravity sign-out closes admission to new processes and stops existing processes before clearing account
 metadata. Otherwise a helper or resumed session could retain the old account. Cached model lists
 do not establish current access, and an authoritative empty catalog must clear the old list.
@@ -64,7 +71,9 @@ it. Homebrew and npm are proven by the real path (symlinks followed): a versione
 `brew --prefix`, or `<prefix>/lib/node_modules/<pkg>/` (Windows: the shim beside `node_modules`).
 Native installer layouts and the global bin directories of pnpm, Bun, and Vite+ may match on either
 the resolved path or its real target, since those installers place real files or their own symlinks
-there. Anything unproven stays manual-only but still reports the version gap. npm updates pin
+there. Cursor and Grok are the exception: their only updater is the CLI itself, which detects its
+own installer, so any resolved executable runs `<binary> update`. Anything unproven stays
+manual-only but still reports the version gap. npm updates pin
 `--prefix` because the `npm` on `PATH` can belong to a different Node than the one that owns the
 provider. Homebrew
 compares against `brew info` since casks trail npm by hours; native installs share npm's version
diff --git a/docs/internals/t3-connect.md b/docs/internals/t3-connect.md
index d0329295f4b4..367d9116e92e 100644
--- a/docs/internals/t3-connect.md
+++ b/docs/internals/t3-connect.md
@@ -65,6 +65,47 @@ teardown, because a database failure must leave the active link usable. Failed
 teardown retains enough state to retry. See the
 [managed endpoint lifecycle](../../infra/relay/src/environments/ManagedEndpointProvider.ts).
 
+## Idle tunnels are reclaimed and recovered
+
+Cloudflare bills a tunnel whether or not a connector is attached, so a laptop
+that sleeps with a linked environment leaves a paid tunnel behind. The relay's
+five-minute maintenance job can reclaim those tunnels. `RELAY_TUNNEL_CLEANUP_MODE`
+selects `off`, `dry-run`, or `enabled`, with `off` as the default. The mode is
+read at deploy time, so changing it means a relay deploy, not a variable flip.
+A candidate is a same-stage tunnel that Cloudflare reports down for at least
+five minutes, or one that never connected and is at least an hour old. The
+longer grace for never-connected tunnels covers a pairing still in progress.
+
+Cleanup deletes only tunnels whose host has registered recovery. Allocations
+without recovery registration belong to hosts that cannot replace a deleted
+tunnel and are left alone. Allocations with no recorded tunnel ID, or a
+different tunnel ID, are skipped because a provision may own them. A tunnel with
+no allocation row at all is counted as `skippedOrphan` and never deleted: there
+is no row to lock, so a relink that adopts it by name could race the delete.
+Clear those by hand. Each sweep is bounded: at most ten list requests, 100 deletions, a
+two-minute deadline, and an early stop on a Cloudflare rate limit. Each sweep
+starts one budget further along the candidate list, so a block of deletes that
+keep failing cannot starve the tunnels listed after them. See the
+[reaper](../../infra/relay/src/environments/ManagedEndpointReaper.ts).
+
+A host registers recovery at startup by sending its tunnel ID and loopback
+origin with a short-lived signature from the environment key. Registration
+touches Cloudflare only when the local host or port changed, and once per
+existing allocation on the first registration after the upgrade because the
+stored origin is empty. First registrations are jittered so an auto-update wave
+does not hit the relay at once. The host stores a confirmed-origin marker with
+the connector config, and a later boot starts the connector before registration
+only when that marker matches the current config and port. If registration
+cannot reach the relay for ten minutes, the host starts its stored config anyway
+and keeps registering in the background until it can reconcile the origin.
+If the connector exits, or `cloudflared` reports repeated tunnel
+rejections, the host asks the relay for a replacement, at most once every two
+minutes. The relay
+provisions under the same allocation, so the hostname and DNS record survive
+and clients keep their bindings. Every mutation on an allocation bumps its
+`generation`, and deletion locks the row at the generation it claimed, so a
+host that reconnects mid-sweep wins.
+
 ## OAuth traps
 
 Interactive clients and the headless CLI use the same Clerk application but
diff --git a/docs/operations/development.md b/docs/operations/development.md
index 1cbf09c16008..b7e1b257d0b2 100644
--- a/docs/operations/development.md
+++ b/docs/operations/development.md
@@ -76,8 +76,7 @@ Put that value in the main checkout's gitignored `.env`:
 T3CODE_DEV_AUTH_TOKEN=<the value generated above>
 ```
 
-The `t3.json` Setup Worktree commands on Unix and Windows link that file to each worktree's
-`.env`. The dev runner reads repository env files at startup. `.env.local` and inherited process
+The `t3.json` Setup Worktree action links that file to each worktree's `.env`. The dev runner reads repository env files at startup. `.env.local` and inherited process
 environment values override `.env`, so no per-worktree export is needed after setup.
 
 For a manual worktree or launcher without that link, export the same fixed value instead:
diff --git a/docs/operations/mobile-app-store-screenshots.md b/docs/operations/mobile-app-store-screenshots.md
index 0e3c1784429b..0078754ad9c2 100644
--- a/docs/operations/mobile-app-store-screenshots.md
+++ b/docs/operations/mobile-app-store-screenshots.md
@@ -52,8 +52,8 @@ verify process ownership. Concurrent screenshot harnesses in different worktrees
 collide or attach to the wrong Metro process.
 
 Every configured device defaults to dark appearance and the `t3-code` palette, so plain
-`pnpm screenshots:mobile` produces 30 dark PNGs. Pass `--appearance light`, `--appearance dark`, or
-`--appearance both` to override the configured appearance; `both` produces 60 PNGs.
+`pnpm screenshots:mobile` produces 35 dark PNGs. Pass `--appearance light`, `--appearance dark`, or
+`--appearance both` to override the configured appearance; `both` produces 70 PNGs.
 
 Pass `--theme <id>` (repeatable) or `--theme all` to capture the app's other palettes: `t3-code`,
 `t3-chat`, `grove`, `ocean`, `ember`, and `iris`. The runner hands the palette to the app as a launch
@@ -63,32 +63,41 @@ multiplies the run by six; only the native build is shared.
 
 The default matrix is:
 
-| Output folder                         | Capture target            | Upload dimensions | Store slot                                |
-| ------------------------------------- | ------------------------- | ----------------- | ----------------------------------------- |
-| `apple/iphone-6.9/dark/t3-code/`      | iPhone 17 Pro Max         | 1320×2868         | App Store Connect iPhone 6.9-inch         |
-| `apple/iphone-6.5/dark/t3-code/`      | disposable iPhone 14 Plus | 1284×2778         | App Store Connect iPhone 6.5-inch         |
-| `apple/ipad-13/dark/t3-code/`         | iPad Pro 13-inch (M5)     | 2752×2064         | App Store Connect iPad 13-inch, landscape |
-| `google-play/phone/dark/t3-code/`     | Pixel AVD at 420 dpi      | 1080×1920         | Google Play phone, portrait 9:16          |
-| `google-play/tablet-7/dark/t3-code/`  | Pixel AVD at 600dp width  | 1080×1920         | Google Play 7-inch tablet, portrait 9:16  |
-| `google-play/tablet-10/dark/t3-code/` | Pixel AVD at 800dp width  | 1440×2560         | Google Play 10-inch tablet, portrait 9:16 |
-
-Each target captures thread, terminal, review, thread list, and environments. Each palette folder's
-five screenshots satisfy the configured Apple limit of 1–10, Google
+| Output folder                         | Capture target               | Upload dimensions | Store slot                                |
+| ------------------------------------- | ---------------------------- | ----------------- | ----------------------------------------- |
+| `apple/iphone-6.9/dark/t3-code/`      | disposable iPhone 17 Pro Max | 1320×2868         | App Store Connect iPhone 6.9-inch         |
+| `apple/iphone-6.5/dark/t3-code/`      | disposable iPhone 14 Plus    | 1284×2778         | App Store Connect iPhone 6.5-inch         |
+| `apple/ipad-13/dark/t3-code/`         | iPad Pro 13-inch (M5)        | 2752×2064         | App Store Connect iPad 13-inch, landscape |
+| `google-play/phone/dark/t3-code/`     | Pixel AVD at 420 dpi         | 1080×1920         | Google Play phone, portrait 9:16          |
+| `google-play/tablet-7/dark/t3-code/`  | Pixel AVD at 600dp width     | 1080×1920         | Google Play 7-inch tablet, portrait 9:16  |
+| `google-play/tablet-10/dark/t3-code/` | Pixel AVD at 800dp width     | 1440×2560         | Google Play 10-inch tablet, portrait 9:16 |
+
+Each target captures thread, terminal, review, thread list, and environments, and every target but
+the iPad also captures agent activity. Each palette folder's five or six screenshots satisfy the configured Apple limit of 1–10, Google
 phone requirement of 2–8, and Google tablet recommendation/slot minimum of 4 with a maximum of 8.
 Every palette gets its own leaf folder so one upload slot never mixes themes and each folder keeps a
 store-legal screenshot count.
 
+The agent-activity scene shows what a user sees away from the app. The app stages the same Live
+Activity (iOS) or ongoing Live Update (Android) the relay would publish for four seeded threads. On
+iOS the runner then locks the simulator and pushes the matching approval alert with `simctl push`;
+on Android the staged update carries the alert and the runner opens the notification shade. Locking
+the simulator and answering the notification permission prompt use
+[AXe](https://github.com/cameroncooke/AXe), so install it (`brew tap cameroncooke/axe && brew
+install axe`) or set `AXE_PATH` before capturing iOS. The iPad skips the scene because the lock
+screen does not follow the app's landscape self-rotation.
+
 The generated tree is deliberately aligned with the store upload fields:
 
     artifacts/app-store/screenshots/
     ├── apple/
-    │   ├── iphone-6.9/dark/t3-code/{thread,terminal,review,threads,environments}.png
-    │   ├── iphone-6.5/dark/t3-code/{thread,terminal,review,threads,environments}.png
+    │   ├── iphone-6.9/dark/t3-code/{thread,terminal,review,threads,environments,agent-activity}.png
+    │   ├── iphone-6.5/dark/t3-code/{thread,terminal,review,threads,environments,agent-activity}.png
     │   └── ipad-13/dark/t3-code/{thread,terminal,review,threads,environments}.png
     └── google-play/
-        ├── phone/dark/t3-code/{thread,terminal,review,threads,environments}.png
-        ├── tablet-7/dark/t3-code/{thread,terminal,review,threads,environments}.png
-        └── tablet-10/dark/t3-code/{thread,terminal,review,threads,environments}.png
+        ├── phone/dark/t3-code/{thread,terminal,review,threads,environments,agent-activity}.png
+        ├── tablet-7/dark/t3-code/{thread,terminal,review,threads,environments,agent-activity}.png
+        └── tablet-10/dark/t3-code/{thread,terminal,review,threads,environments,agent-activity}.png
 
 A light-only run writes the same tree under `light/`; `--appearance both` writes both appearance
 folders, and each requested theme adds a sibling folder next to `t3-code/`.
diff --git a/docs/operations/observability.md b/docs/operations/observability.md
index adeb983d1bc7..910bd018bcc7 100644
--- a/docs/operations/observability.md
+++ b/docs/operations/observability.md
@@ -62,6 +62,21 @@ far in the future for the environment server's allowed window. It can point to
 a date or time problem on either device, but it can also result from a delayed
 request.
 
+#### Summarize the trace file
+
+`t3 trace summary` reads the trace file and its rotated backups directly, so it works while the
+server is stalled or stopped. It prints counts, rates, and latency percentiles per span name. Use
+it to measure background work or to compare two builds.
+
+```bash
+t3 trace summary --since 30m --limit 40
+```
+
+It reads `T3CODE_TRACE_FILE` if set, else `<home>/userdata/logs/server.trace.ndjson` for
+`--base-dir` or `T3CODE_HOME`, plus the `T3CODE_TRACE_MAX_FILES` rotated backups. For a dev run or
+a copied file, set `T3CODE_TRACE_FILE`. `--since 30m` keeps spans that ended in the last 30
+minutes. The rate is per minute between the first and last span end.
+
 ### Metrics
 
 Metrics are not written to a local file.
@@ -72,6 +87,38 @@ Metrics are not written to a local file.
 
 If OTLP is not configured, metrics still exist in-process, but you will not have a local artifact to inspect.
 
+### Event Loop Stalls
+
+`apps/server/src/observability/EventLoopMonitor.ts` samples the server's event loop every 30 s. When
+the loop stalled for more than 2 s since the previous sample, it records a root
+`server.eventLoop.stall` span with a warning. The span has trace level `Warn`, so it stays when
+`T3CODE_TRACE_MIN_LEVEL` is `Warn`. The warning shows in Settings > Diagnostics unless OTLP logs are
+on. The span time is when the sample ran, not when the stall happened.
+
+Some delay is not recorded:
+
+- `delayMaxMs` is the longest stall, and can undercount it by up to 1 s. The 2 s threshold applies to
+  this value, so a stall over 3 s is normally recorded, and a shorter one can be missed. A stall
+  that ends just as a sample runs can be missed too.
+- Time the computer spends asleep reads as delay on macOS and Windows. So a sample only counts when
+  the loop was busy, not waiting for events, for at least `delayMaxMs`. Busy time covers the whole
+  window, so a short sleep in an otherwise busy window can still record a false stall. The span then
+  shows CPU time far below `delayMaxMs`.
+- The first sample after launch is skipped. Startup work such as migrations and projection bootstrap
+  can block the loop for seconds on a large database.
+
+CPU times and page faults cover the whole process over the whole window since the previous sample.
+The window is nominally 30 s, but a long stall delays the sample and makes the window longer. Other
+work in the window can hide a wait, so only CPU time far below `delayMaxMs` proves the thread was
+waiting. Read CPU together with page faults:
+
+- High `cpuSystemMs` with many page faults means memory pressure. Major faults are reads from disk or swap.
+  On macOS, reads from compressed memory are minor faults plus system CPU.
+- High `cpuUserMs` with few page faults means JavaScript work or garbage collection.
+- Low CPU with few major page faults points at synchronous disk I/O, such as SQLite reads or trace
+  file writes.
+- Many `involuntaryContextSwitches` mean other processes were competing for the CPU.
+
 ### Related Artifacts
 
 Provider event NDJSON files still exist for provider runtime streams. Those are separate from the main server trace file.
@@ -129,7 +176,7 @@ Default Grafana login:
 export T3CODE_OTLP_TRACES_URL=http://localhost:4318/v1/traces
 export T3CODE_OTLP_METRICS_URL=http://localhost:4318/v1/metrics
 export T3CODE_OTLP_LOGS_URL=http://localhost:4318/v1/logs
-export T3CODE_OTLP_SERVICE_NAME=t3-local
+export OTEL_RESOURCE_ATTRIBUTES=deployment.environment.name=development
 ```
 
 Optional:
@@ -169,7 +216,6 @@ macOS app bundle example:
 T3CODE_OTLP_TRACES_URL=http://localhost:4318/v1/traces \
 T3CODE_OTLP_METRICS_URL=http://localhost:4318/v1/metrics \
 T3CODE_OTLP_LOGS_URL=http://localhost:4318/v1/logs \
-T3CODE_OTLP_SERVICE_NAME=t3-desktop \
 "/Applications/T3 Code.app/Contents/MacOS/T3 Code"
 ```
 
@@ -179,7 +225,6 @@ Direct binary example:
 T3CODE_OTLP_TRACES_URL=http://localhost:4318/v1/traces \
 T3CODE_OTLP_METRICS_URL=http://localhost:4318/v1/metrics \
 T3CODE_OTLP_LOGS_URL=http://localhost:4318/v1/logs \
-T3CODE_OTLP_SERVICE_NAME=t3-desktop \
 ./path/to/your/desktop-app-binary
 ```
 
@@ -311,11 +356,13 @@ Recommended flow in Grafana:
 2. Pick the `Tempo` data source.
 3. Set the time range to something recent like `Last 15 minutes`.
 4. Start broad. Do not begin with a very narrow query.
-5. Look for spans from your configured service name, then narrow by span name or attributes.
+5. Look for spans from the `t3code-server` or `t3code-desktop` service, then narrow by span name or
+   attributes.
 
 Good first searches:
 
-- service name such as `t3-local`, `t3-dev`, or `t3-desktop`
+- service name `t3code-server` or `t3code-desktop`, plus a resource attribute such as
+  `deployment.environment.name`
 - span names like `sendTurn` or a Git operation such as `GitVcsDriver.statusDetails.status`
 - Git spans whose `git.operation` attribute identifies the operation
 - orchestration spans with attributes like `orchestration.command_type`
@@ -525,10 +572,10 @@ It provides:
 The desktop main process is a second producer, assembled in
 `apps/desktop/src/app/DesktopObservability.ts`. It reads the same `T3CODE_OTLP_*` names and the same
 Settings entries as the backend it supervises, and covers work the backend cannot see: app startup,
-window and menu handling, backend supervision, and updates. It reports as service `desktop`
-regardless of `T3CODE_OTLP_SERVICE_NAME`, so a collector shows it alongside the backend rather than
-mixed into it. It exports traces and logs only; the main process records no metrics, so the metrics
-endpoint applies to the backend alone.
+window and menu handling, backend supervision, and updates. It reports as service
+`t3code-desktop`, so a collector shows it alongside the backend rather than mixed into it. It
+exports traces and logs only; the main process records no metrics, so the metrics endpoint applies
+to the backend alone.
 
 ### Env Vars
 
@@ -547,14 +594,48 @@ OTLP export:
 - `T3CODE_OTLP_METRICS_URL`: OTLP metric endpoint
 - `T3CODE_OTLP_LOGS_URL`: OTLP log endpoint
 - `T3CODE_OTLP_EXPORT_INTERVAL_MS`: export interval, default `10000`
-- `T3CODE_OTLP_SERVICE_NAME`: service name, default `t3-server`
 - `T3CODE_OTLP_HEADERS`: extra headers for all three exporters, same format as
   `OTEL_EXPORTER_OTLP_HEADERS`: comma-separated `key=value` pairs with percent-encoded values.
 - `T3CODE_OTLP_PROTOCOL`: `http/json` (default) or `http/protobuf`
 
+The server and the desktop app also read the standard
+`OTEL_EXPORTER_OTLP_{TRACES,METRICS,LOGS}_ENDPOINT` and generic `OTEL_EXPORTER_OTLP_ENDPOINT` (with
+`/v1/traces`, `/v1/metrics`, or `/v1/logs` appended), for a collector expecting those instead. A
+non-blank `T3CODE_OTLP_*_URL` wins over either, and a per-signal endpoint wins over the generic one
+for its signal. A blank value counts as unset. A signal with an OTEL endpoint takes its headers from
+`OTEL_EXPORTER_OTLP_HEADERS` and its protocol from `OTEL_EXPORTER_OTLP_PROTOCOL` (default
+`http/protobuf`, read case-insensitively), and a per-signal
+`OTEL_EXPORTER_OTLP_{TRACES,METRICS,LOGS}_HEADERS` or `_PROTOCOL` wins over the generic one for its
+signal. `T3CODE_OTLP_HEADERS` and `T3CODE_OTLP_PROTOCOL` never apply to it. An endpoint that is not
+an `http` or `https` URL, a protocol other than `http/protobuf` or `http/json` such as `grpc`, or
+headers that are not `key=value` pairs with percent-encoded values turn that signal's export off
+with a startup warning, rather than sending it to the Settings endpoint.
+
+Service names are fixed: `t3code-server` for the backend and `t3code-desktop` for the desktop main
+process, both in `service.namespace` `t3code`. `OTEL_SERVICE_NAME` and a `service.name` or
+`service.namespace` in `OTEL_RESOURCE_ATTRIBUTES` are ignored. Tell installations apart with other
+resource attributes, such as `OTEL_RESOURCE_ATTRIBUTES=deployment.environment.name=development`.
+
 If the OTLP URLs are unset, local tracing still works, metrics stay in-process only, and logs stay
 on stdout only.
 
+### The Kill Switch
+
+`T3CODE_OTEL_SDK_DISABLED` and `OTEL_SDK_DISABLED` turn off every OTLP export in both the server and
+the desktop main process, overriding any endpoint from the environment or Settings. Local trace
+files and stdout logs are unaffected.
+
+`T3CODE_OTEL_SDK_DISABLED` wins when set, so `T3CODE_OTEL_SDK_DISABLED=false` re-enables export on a
+machine that sets `OTEL_SDK_DISABLED` for everything else. It accepts the usual boolean spellings
+(`true`/`false`, `yes`/`no`, `on`/`off`, `1`/`0`, `y`/`n`). `OTEL_SDK_DISABLED` follows the
+OpenTelemetry specification and only `true` disables export, so `OTEL_SDK_DISABLED=1` does not.
+Values are case-insensitive and trimmed. An unrecognized value is ignored with a startup warning.
+
+`OTEL_TRACES_EXPORTER`, `OTEL_METRICS_EXPORTER`, or `OTEL_LOGS_EXPORTER` set to `none` turns off
+just that signal, overriding an OTEL endpoint and the Settings endpoint. A `T3CODE_OTLP_*_URL` still
+wins for its signal. `otlp` is the default, and any other exporter name, such as `console` or
+`prometheus`, is ignored with a startup warning.
+
 ### What Is Instrumented Today
 
 Current high-value span and metric boundaries include:
@@ -568,11 +649,47 @@ Current high-value span and metric boundaries include:
 - git command execution and git hook events
 - terminal session lifecycle
 - sqlite query execution
+- event loop stalls (`server.eventLoop.stall`)
 
 ### Current Constraints
 
 - logs outside spans are not persisted in the trace file; SSH-managed launch stdout/stderr is still
   captured in its launcher log
 - metrics are not snapshotted locally
-- the old `serverLogPath` still exists in config for compatibility, but the trace file is the primary
-  structured persisted artifact
+
+## Heap Snapshots
+
+To see what a long-running server holds in memory, send it `SIGUSR2`. The server writes a V8 heap
+snapshot to its logs dir and logs the path. This works for desktop, `npx t3`, and service installs
+on macOS and Linux. Windows has no `SIGUSR2`.
+
+Send the signal to the server pid in `server-runtime.json`, which sits in the server's state dir
+next to the `logs` dir. For a dev server or a `--home-dir` launch, use that server's state dir from
+[Traces](#traces). Do not send it to the desktop app or the service launcher: a process without the
+handler exits on `SIGUSR2`. After a crash the file can keep a stale pid that now belongs to a
+different process, so check the pid first.
+
+```bash
+pid="$(jq .pid "${T3CODE_HOME:-$HOME/.t3}/userdata/server-runtime.json")"
+ps -p "$pid" -o command=
+```
+
+If `ps` shows the T3 Code server, send the signal:
+
+```bash
+kill -USR2 "$pid"
+```
+
+The file is `<logsDir>/server-<pid>-<timestamp>.heapsnapshot`, next to `server.trace.ndjson`. To
+open it, use the Memory tab in Chrome DevTools and select Load.
+
+Before you take one:
+
+- The server stops while it writes the file. For a large heap this can take a minute or more.
+  Connected clients can reconnect during the pause, and an event loop monitor, if the server has
+  one, records the pause as a stall. Send the signal once. A second signal sent during a write
+  takes another snapshot after the first one finishes.
+- The write needs about as much free memory as the heap uses. On a machine that is already
+  swapping, it can make the problem worse or crash the server.
+- The file contains everything in server memory, including tokens, secrets, and thread content. Do
+  not share it publicly. Delete it when you are done, because storage cleanup does not remove it.
diff --git a/docs/operations/release.md b/docs/operations/release.md
index ff5e1c917e20..a3c09bb6b679 100644
--- a/docs/operations/release.md
+++ b/docs/operations/release.md
@@ -30,7 +30,7 @@ This document covers the unified release workflow for stable and nightly desktop
 - Builds six desktop artifacts in parallel for both channels, each as its own job (`desktop_<platform>_<arch>`, one call of `release-desktop.yml`) on hardware of its own architecture, gated only on the bundle (the Windows jobs also wait for the same-arch Linux job, whose CLI archive they embed as the WSL runtime):
   - macOS `arm64` DMG
   - macOS `x64` DMG
-  - Linux `x64` and `arm64` AppImage
+  - Linux `x64` and `arm64` AppImage and `.deb`, from one electron-builder run. The `.deb` updates in the app through electron-updater, which installs it with `dpkg`.
   - Windows `x64` and `arm64` NSIS installer
 - Publishes one GitHub Release with all produced files.
   - Stable tags with a suffix after `X.Y.Z` (for example `1.2.3-alpha.1`) are published as GitHub prereleases.
@@ -138,12 +138,19 @@ Required `production` environment variables:
 Optional `production` environment variables:
 
 - `RELAY_DOMAIN` when overriding the derived `relay.<RELAY_API_ZONE_NAME>` domain
+- `RELAY_TUNNEL_CLEANUP_MODE` with `off`, `dry-run`, or `enabled`. Missing and blank values use
+  `off`.
 
 Required `production` environment secrets:
 
 - `CLERK_SECRET_KEY`
 - `APNS_PRIVATE_KEY`
 
+The relay Worker reads these variables and secrets when it is deployed. Alchemy does not redeploy the
+Worker when only one of these values changes ([alchemy-run/alchemy#1831](https://github.com/alchemy-run/alchemy/issues/1831)),
+so a push to `main` without relay code changes leaves the old value in place. After changing one, run
+the **Deploy T3 Connect relay** workflow manually from `main` with **force** checked.
+
 The account-scoped repository credentials are consumed by Alchemy while provisioning relay stages; they
 are not bound into the relay Worker. The production deployment uses an Axiom personal access token,
 so `AXIOM_ORG_ID` must accompany `AXIOM_TOKEN`. The `prod` stage owns the retained PlanetScale
@@ -157,6 +164,57 @@ Developers deploy personal stages locally rather than through pull-request autom
 vp run --filter t3code-relay deploy -- --stage "$USER" --env-file .env.local
 ```
 
+### Managed tunnel cleanup rollout
+
+Keep `RELAY_TUNNEL_CLEANUP_MODE=off` for the first production deploy. That deploy applies the
+nullable allocation migration and adds the recovery endpoints. Web and mobile clients need no
+coordinated release. CLI and desktop server builds must reach users before cleanup is enabled,
+because those builds register recovery and replace a deleted tunnel after wake.
+
+1. Deploy the relay and migration with cleanup `off`.
+2. Release the server build and confirm current hosts register recovery. Older hosts stay marked
+   legacy and are never candidates.
+3. Set `dry-run`, run a forced relay deploy, and read the sweep counters (`scanned`, `wouldDelete`,
+   `skippedLegacy`, `skippedOrphan`, `failed`, `truncated`) across several sweeps. Each sweep records
+   them, and the active `mode`, as `relay.managed_endpoint_reaper.*` attributes on its
+   `relay.managed_endpoint_reaper.sweep` span in Axiom.
+4. Run the disposable-host canary below.
+5. Set `enabled` only after the canary recovers without a server restart.
+
+The job runs every five minutes with a five-minute grace period for tunnels that lost their
+connector, so a candidate is usually removed five to ten minutes after it goes down. Tunnels that
+never connected wait an hour. One sweep attempts at most 100 deletions, so a backlog takes longer.
+Changing `RELAY_TUNNEL_CLEANUP_MODE`, including turning cleanup off during an incident, needs a forced
+relay deploy. Confirm the new `mode` on the next sweep span.
+
+To roll back, set cleanup to `off` and run a forced relay deploy before downgrading any host. Keep the
+recovery endpoints deployed while current server builds are in use. The nullable columns can stay.
+
+### Disposable-host canary
+
+This test has not been run against a real Cloudflare account. Run it against a disposable relay
+stage, test Cloudflare account, disposable host, and disposable T3 home. Keep production cleanup at
+`off` or `dry-run` until it passes. Do not stop a daily-use T3 server.
+
+1. Deploy the disposable stage with cleanup `dry-run`. Link a first disposable environment through
+   web or mobile settings and confirm its tunnel is healthy and recovery is registered.
+2. Stop that host and restart the same T3 home on a different local port. Confirm the public
+   hostname reaches the new port and sends nothing to the old one.
+3. Link a second disposable environment with a server build that predates recovery registration.
+   Capture its managed `cloudflared` child PID, confirm it belongs to that host, and pause only that
+   child with `kill -STOP <legacy-pid>`. Wait until Cloudflare reports it down for over five minutes.
+4. Capture the first environment's `cloudflared` child PID from its server logs, confirm ownership,
+   and pause it with `kill -STOP <first-pid>`. Wait until Cloudflare reports it down for over five
+   minutes.
+5. Confirm dry-run counts the first tunnel in `wouldDelete` and the second in `skippedLegacy`.
+6. Set cleanup `enabled` on the disposable stage and deploy it with `--force`. Confirm in the test
+   Cloudflare account that the first tunnel is deleted and the legacy tunnel still exists.
+7. Resume the first child with `kill -CONT <first-pid>`. Confirm the running server detects the
+   repeated rejection, requests recovery, and becomes reachable at the same hostname without a
+   restart.
+8. Resume the legacy child with `kill -CONT <legacy-pid>` and confirm its tunnel reconnects.
+9. Repeat with a physical sleep and wake cycle on a disposable laptop before broad rollout.
+
 ## Marketing site deployment
 
 After a nightly release is published, the release workflow deploys the same commit
@@ -284,7 +342,7 @@ available.
   - `T3CODE_DESKTOP_UPDATE_REPOSITORY` (format `owner/repo`), if set.
   - otherwise `GITHUB_REPOSITORY` from GitHub Actions.
 - Required release assets for updater:
-  - platform installers (`.exe`, `.dmg`, `.AppImage`, plus macOS `.zip` for Squirrel.Mac update payloads)
+  - platform installers (`.exe`, `.dmg`, `.AppImage`, `.deb`, plus macOS `.zip` for Squirrel.Mac update payloads)
   - channel metadata: `latest*.yml` for stable releases, `nightly*.yml` for nightly releases
   - `*.blockmap` files (used for differential downloads)
 - macOS metadata note:
diff --git a/docs/operations/turbo-changelog.md b/docs/operations/turbo-changelog.md
index cce4a2e1e994..5b06032f1308 100644
--- a/docs/operations/turbo-changelog.md
+++ b/docs/operations/turbo-changelog.md
@@ -8,6 +8,24 @@ per-commit — the ingestion PR entry records the upstream range instead.
 
 ## Unreleased — on `turbo`, not yet in a shipped build
 
+- **0.0.54: ingest upstream main `0fcd5f906` (f25a8e4b7..0fcd5f906, 243 commits, past
+  v0.0.44 and v0.0.44-nightly.20260929.2456).** Codex plan types are now free strings, so
+  ChatGPT Pro Max and self-serve business plans no longer mark Codex "Unavailable" (#14304), with
+  Codex 0.159 protocol bindings (#14311) and managed ChatGPT authentication (#14290); the local
+  `codex-planfix` wrapper on the PC and T3 Cloud can be removed once this build is installed.
+  Also: Claude Sonnet 5.5, per-thread auto-settle switch (new `thread.auto-settle-set` event —
+  the fork's official-import planner now remaps it), chat width setting, run shell commands from
+  chat, background thread sync on desktop, Linux `.deb` that updates itself, idle-wakeup and
+  thread-list perf batch, background git fetches no longer fill the disk. Relay: tunnels are
+  removed after hosts go offline (#9386) with one new Postgres migration,
+  `20260919015455_managed_endpoint_recovery` — apply it on the Supabase host before the relay
+  deploy — and a new `RELAY_TUNNEL_CLEANUP_MODE` variable (unset = off). Seam changes: RETIRED
+  `restyle-ceiling-fork-delta` (upstream #13210 deleted the ceiling script and made the shadcn
+  restyle rules hard errors; the fork's chat panes, environment switcher, and OpenRouter icon now
+  conform — one scoped inline disable remains on the OpenRouter icon); `shell-snapshot-budget`
+  kept (upstream raised its timeout from 6 s to 20 s, fork keeps 30 s and the 12 h identity
+  cache); settled-thread sort marked as a retire candidate (upstream #13759 does the same).
+  Seams 30 / 179 checks. Fork `main` gets its own merge PR.
 - **Relay: no public API reference.** `relay.t3turbo.pro/docs`, `/openapi.json`, and the `/`
   redirect now return 404 (new seam `relay-no-public-api-docs`). Relay-only change; ships with
   the next `deploy-relay.yml` run.
diff --git a/docs/user/composer.md b/docs/user/composer.md
index 6e699d0669c1..7ee8edcbb121 100644
--- a/docs/user/composer.md
+++ b/docs/user/composer.md
@@ -19,8 +19,7 @@ Attach up to 100 files per message. Each image can be up to 10 MiB, with at most
 50 MiB each, subject to the environment's upload support and limit. The agent
 receives them on the environment's machine. Provider and model limits still
 apply, including images already in the conversation. A video attachment gives
-the agent a file path; it does not enable native video input. Antigravity does
-not accept video attachments.
+the agent a file path; it does not enable native video input.
 
 Uploads begin when you add an attachment. All uploads must finish before the
 message can send. Retry or remove a failed upload. On web and desktop, reloading
@@ -37,7 +36,7 @@ See [images and videos](#images-and-videos-in-messages) for previewing and savin
 
 On web and desktop, a message sent during a running turn waits at the end of the conversation as a
 dashed bubble. It goes out on its own when the agent finishes its next tool
-call, or when the turn ends. Use the arrow under the bubble to send it right
+call, or when the turn ends, even while you have another thread open. Use the arrow under the bubble to send it right
 away, or the X to move it back into the composer. Stop returns every queued
 message to the composer.
 
diff --git a/docs/user/devices.md b/docs/user/devices.md
index 02e06d2bdffa..a87770853a2d 100644
--- a/docs/user/devices.md
+++ b/docs/user/devices.md
@@ -39,6 +39,14 @@ iOS, and power off. Close the tab to stop watching; the device keeps running
 unless you power it off. Closed tabs stay closed after a reload. To watch the
 device again, choose it from **+ → Device**.
 
+Choose **3D view** to inspect supported devices while the live screen stays
+interactive. On iPhone Duo, use the fold and stance controls to change its
+physical pose, or pinch over the device to adjust the hinge. Turning the model
+to the other screen switches the live display and touch input to that screen.
+**Restore 3D view** returns the device to a screen-facing position.
+On supported Android foldables, use **Fold device** and **Unfold device** beside
+the screen to change its posture in either view.
+
 ## Tools
 
 The toolbar's **Tools** button opens a drawer for the open device. It shows the
diff --git a/docs/user/install.md b/docs/user/install.md
index 36aa695a10f4..9282c62908c0 100644
--- a/docs/user/install.md
+++ b/docs/user/install.md
@@ -58,12 +58,17 @@ update it with `git pull` and a rebuild.
 Download a release from [GitHub Releases](https://github.com/pingdotgg/t3code/releases),
 or use a package manager:
 
-| Platform           | Install                         |
-| ------------------ | ------------------------------- |
-| Windows            | `winget install T3Tools.T3Code` |
-| macOS              | `brew install --cask t3-code`   |
-| Arch Linux         | `yay -S t3code-bin`             |
-| Arch Linux nightly | `yay -S t3code-nightly-bin`     |
+| Platform           | Install                            |
+| ------------------ | ---------------------------------- |
+| Windows            | `winget install T3Tools.T3Code`    |
+| macOS              | `brew install --cask t3-code`      |
+| Debian, Ubuntu     | `sudo apt install ./T3-Code-*.deb` |
+| Arch Linux         | `yay -S t3code-bin`                |
+| Arch Linux nightly | `yay -S t3code-nightly-bin`        |
+
+The `.deb` updates itself like the other desktop builds. It asks for your
+password to install each update. If your desktop has no password prompt, the
+update fails. Download the new `.deb` and install it the same way.
 
 ### Windows Subsystem for Linux
 
@@ -106,19 +111,26 @@ and enable the provider you want. Installation, login, and configuration belong
 to that environment's machine, even when you connect from a phone or another
 computer.
 
-| Provider    | Install and authenticate                                                                     |
-| ----------- | -------------------------------------------------------------------------------------------- |
-| Codex       | Install [Codex CLI](https://developers.openai.com/codex/cli), then run `codex login`.        |
-| Claude      | Install [Claude Code](https://claude.com/product/claude-code), then run `claude auth login`. |
-| Cursor      | Install [Cursor CLI](https://cursor.com/cli), then run `agent login`.                        |
-| Grok Build  | Install [Grok Build CLI](https://x.ai/cli), then run `grok login`.                           |
-| OpenCode    | Install [OpenCode](https://opencode.ai), then run `opencode auth login`.                     |
-| Antigravity | Install and sign in with Google from T3 Code's provider settings.                            |
+| Provider    | Install and authenticate                                                                                                                                  |
+| ----------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Codex       | [Connect with ChatGPT](./providers-codex.md#connect-with-chatgpt), or install [Codex CLI](https://developers.openai.com/codex/cli) and run `codex login`. |
+| Claude      | Install [Claude Code](https://claude.com/product/claude-code), then run `claude auth login`.                                                              |
+| Cursor      | Install [Cursor CLI](https://cursor.com/cli), then run `agent login`.                                                                                     |
+| Grok Build  | Install [Grok Build CLI](https://x.ai/cli), then run `grok login`.                                                                                        |
+| OpenCode    | Install [OpenCode](https://opencode.ai), then run `opencode auth login`.                                                                                  |
+| Antigravity | Install and sign in with Google from T3 Code's provider settings.                                                                                         |
 
 Provider CLIs must be on the server's `PATH`. If T3 Code cannot find one, set its
 **Binary path** in provider settings, especially when using a version manager.
 Cursor's executable is `cursor-agent`, although its login command is
-`agent login`. Antigravity can use its managed runtime without a `PATH` entry.
+`agent login`. Codex connected through ChatGPT and Antigravity can use their
+managed runtimes without a `PATH` entry.
+
+T3 Code warns when a provider version has known compatibility problems with your
+release. Check **Settings → Providers** on that environment for the recommended
+version or range. When its package manager supports installing a specific version,
+you can install the recommendation there. Otherwise use the provider's installer
+on the environment's machine. An unlisted version is unverified.
 
 When a provider CLI is behind its latest release, its provider card shows the
 available version. **Update now** appears only when T3 Code can tell which
diff --git a/docs/user/keybindings.md b/docs/user/keybindings.md
index 548b03fd1a73..2525fed64d94 100644
--- a/docs/user/keybindings.md
+++ b/docs/user/keybindings.md
@@ -84,7 +84,7 @@ Join modifiers and a key with `+`, such as `mod+shift+d` or `ctrl+l`.
 ## When conditions
 
 Available context keys are `terminalFocus`, `terminalOpen`, `previewFocus`,
-`previewOpen`, `modelPickerOpen`, `editableFocus`, `isWeb`, and `isDesktop`.
+`previewOpen`, `modelPickerOpen`, `usagePageOpen`, `editableFocus`, `isWeb`, and `isDesktop`.
 `editableFocus` is true while a text field, the composer, or another editor has
 the keyboard. `isWeb` is true in a browser tab. `isDesktop` is true in the
 desktop app. Unknown keys evaluate to `false`.
@@ -117,6 +117,9 @@ actions of the same kind undo together. The notice remains available for five
 seconds after the latest action. The default shortcut skips text fields and
 terminals so native undo keeps working there.
 
+`navigation.back` (`mod+[` by default) and `navigation.forward` (`mod+]`) move
+through the pages you have visited, like a browser's back and forward buttons.
+
 `chat.new` may ask you to choose a project when there is more than one.
 `chat.newLocal` skips that chooser. Both use your
 [new-thread defaults](./thread-sidebar.md#start-a-thread).
diff --git a/docs/user/project-settings.md b/docs/user/project-settings.md
index b5ad7c6514d1..fe3d96ba472c 100644
--- a/docs/user/project-settings.md
+++ b/docs/user/project-settings.md
@@ -1,8 +1,9 @@
 # Settings and project overrides
 
-On web and desktop, the Settings breadcrumb ends with the environment and project a change applies to. They start
-at **All environments** and **All projects** and stay selected as you move between categories or
-search for a setting.
+On web and desktop, the "Applying settings for …" sentence at the top of Settings pages picks
+the project and environment a change applies to. Pages that only hold device preferences, such as
+Appearance, don't show it. They start at **All projects** and **All environments**
+and stay selected as you move between categories or search for a setting.
 
 Preferences saved on this device, such as appearance, confirmations and browser profiles, always
 show and ignore the selection. Everything else is stored on a server. Choose one environment to
diff --git a/docs/user/providers-antigravity.md b/docs/user/providers-antigravity.md
index fe5010abf1f4..bdf4548cf29f 100644
--- a/docs/user/providers-antigravity.md
+++ b/docs/user/providers-antigravity.md
@@ -94,9 +94,12 @@ so a skill there only appears when the project itself is your home directory.
 
 Antigravity accepts images, PDFs, text files, and supported audio formats directly.
 Its limits are 1 MiB per text file, 10 MiB per image, 20 MiB per audio clip, and
-50 MiB total attachments per message. Unsupported formats are rejected. These
-limits can be lower than the general upload limit; uploading a file does not
-mean this provider can use it.
+50 MiB total native attachments per message. PDFs, text, and audio that exceed
+their native limits or the remaining native budget are passed as file paths
+for the agent to inspect with tools. ZIP archives and videos also use file paths.
+These files do not count toward the native attachment budget or enable native video input.
+Unsupported image formats are rejected. The native limits can be lower than
+the general upload limit.
 
 ### Subagents
 
diff --git a/docs/user/providers-codex.md b/docs/user/providers-codex.md
index 06c59c6f6aee..bdc87902a63b 100644
--- a/docs/user/providers-codex.md
+++ b/docs/user/providers-codex.md
@@ -1,11 +1,38 @@
 # Codex
 
-For one account, use the default Codex provider with your normal Codex login.
-[Provider setup](./install.md#providers) covers installation, Settings > Providers,
-and custom binaries or environment variables.
+Use your ChatGPT plan or an existing Codex CLI login to code in T3 Code.
+
+## Connect with ChatGPT
+
+Connect during onboarding or in **Settings → Providers**. For a remote machine,
+select that environment first. T3 Code handles Codex installation; sign in on
+OpenAI and allow sharing of your ChatGPT plan.
+
+Manage shared usage and credits in ChatGPT through **Manage usage** in T3 Code.
+If a request uses a feature that ChatGPT sharing does not support, use another
+provider for that request.
+
+When reconnecting, choose the same account in T3 Code and on OpenAI's sign-in
+page. Disconnecting stops running threads but keeps their history and lets you
+reconnect later.
+
+If remote sign-in cannot return automatically, paste the full URL from the final
+localhost page into the sign-in panel, even if that page could not load.
+
+## Use an existing Codex login
+
+T3 Code can use your installed Codex and its existing login. Run `codex login`
+on the environment's machine to sign in. [Provider setup](./install.md#providers)
+covers installation and custom configuration.
 
 ## Use multiple accounts
 
+Add another ChatGPT account in **Settings → Providers**, then select the account
+from the thread's model picker. Compatible accounts can continue the same thread.
+Connecting accounts through T3 Code leaves your CLI login unchanged.
+
+### Multiple CLI logins
+
 A shared Codex home with a shadow home lets work and personal accounts continue
 the same threads. The accounts share Codex sessions and configuration while keeping
 their own login and available models.
diff --git a/docs/user/remote-access.md b/docs/user/remote-access.md
index f1f81272cdf9..d3859e5985e6 100644
--- a/docs/user/remote-access.md
+++ b/docs/user/remote-access.md
@@ -161,7 +161,14 @@ expires.
 To remove an environment from T3 Connect, open your account menu's **T3 Connect**
 page, or **Settings → T3 Connect** on mobile, and choose **Deregister**. This
 revokes its cloud access and frees its host space even when the environment is
-offline or has been wiped.
+offline or has been wiped. Removing an environment from a device's connection
+settings only forgets it on that device; it stays registered to your account.
+
+When idle tunnel cleanup is enabled, T3 Connect removes a linked environment's
+tunnel after it stays offline for several minutes. The environment stays linked
+and keeps the same address. When the host starts again or wakes, T3 Connect
+creates a replacement tunnel on its own. You do not need to pair again. Cleanup
+usually runs five to ten minutes after the tunnel goes down.
 
 On a command-line host, `t3 connect unlink` disables exposure while retaining
 your login; `t3 connect logout` also clears that login. Background-service
diff --git a/docs/user/source-control.md b/docs/user/source-control.md
index 408810571632..306632d9ca64 100644
--- a/docs/user/source-control.md
+++ b/docs/user/source-control.md
@@ -47,23 +47,29 @@ glab auth login
 
 ### Bitbucket
 
-Set an access token in the server's environment:
+Open **Settings → Source Control**, expand **Bitbucket**, and choose how to sign in:
 
-```bash
-export T3CODE_BITBUCKET_ACCESS_TOKEN="your-access-token"
-```
+- **Access token**: a token created for one repository, project, or workspace. It can only reach
+  what it was created for.
+- **API token**: an Atlassian API token for your account, used with your account email. It can
+  reach every repository you can. Give it read/write access to repositories and pull requests, plus
+  user read access (`read:user:bitbucket`).
 
-Or use an Atlassian account email and API token with read/write access to repositories and pull
-requests, plus user read access (`read:user:bitbucket`):
+Choose **Save**; the change applies right away, and replaces any credential saved with the other
+method. Credentials are saved on the environment's server, so select a remote environment to
+configure it. Saved tokens can't be viewed again; enter a new one to replace it, or choose
+**Remove**.
+
+If no credentials are saved, T3 Code falls back to these variables in the server's environment.
+Restart the server after changing them:
 
 ```bash
+export T3CODE_BITBUCKET_ACCESS_TOKEN="your-access-token"
+# or
 export T3CODE_BITBUCKET_EMAIL="you@example.com"
 export T3CODE_BITBUCKET_API_TOKEN="your-token"
 ```
 
-The access token takes precedence if both are configured. Restart the server after changing these
-variables.
-
 ### Azure DevOps
 
 Install [Azure CLI](https://learn.microsoft.com/en-us/cli/azure/), add the DevOps extension, and sign in:
@@ -138,7 +144,8 @@ does not show its diff, so marks are made and read on web and desktop.
 ## Troubleshooting
 
 - **Not authenticated:** run the provider's login command on the server, then rescan. For Bitbucket,
-  confirm the running server received the environment variables.
+  check the credentials saved in Settings → Source Control, or confirm the running server received
+  the environment variables.
 - **GitHub sign-in cannot be verified:** update GitHub CLI to at least 2.81.0.
 - **Push fails despite a connected account:** check the Git remote's credentials. SSH and HTTPS
   remotes can require separate setup from the hosting provider's API access.
@@ -157,7 +164,7 @@ on the Pull Requests page, **Link to thread** lets you search for an active thre
 also lists the threads that link to it, including archived threads, so you can return to their context.
 
 Thread badges show a stack's layer count or the current review number with a count of additional
-links. On mobile, the Git overview lists linked reviews and their stacks; tap a review to open it.
+links. Clicking a badge with more than one review opens the **Linked pull requests** panel. On mobile, the Git overview lists linked reviews and their stacks; tap a review to open it.
 Linking and unlinking are available in the web and desktop clients.
 
 The **Linked pull requests** panel lists every review and groups stacks. Unlink a review from its
diff --git a/docs/user/thread-sidebar.md b/docs/user/thread-sidebar.md
index 3d3215a193f6..4a19bac401b9 100644
--- a/docs/user/thread-sidebar.md
+++ b/docs/user/thread-sidebar.md
@@ -90,7 +90,9 @@ Choose **Settle thread** from its menu to move finished work out of the active l
 without deleting the conversation. **Un-settle thread** restores it to active work
 and prevents automatic settlement until new activity resumes the usual rules.
 Manually settling an idle thread dismisses unanswered async questions without
-sending an answer or restarting the agent.
+sending an answer or restarting the agent. Settling also closes the thread's
+terminals that wait at an idle prompt, and keeps their output. A terminal that
+runs a command, such as a dev server, stays open.
 
 By default, environments settle inactive threads after three days and settle
 threads whose pull request merged. A closed pull request can also settle an idle
@@ -99,6 +101,11 @@ prevent automatic settlement. An open pull request does not prevent inactivity
 settlement, but an old closed or merged pull request does not settle work you
 resumed after it closed.
 
+To keep one thread out of the settled shelf no matter how long it sits idle, open its menu,
+choose **Auto-settle behavior**, and pick **Disabled**. The current option is checked. Pick
+**Enabled** to return to the usual rules. Manual settle, snooze, and archive still work while it
+is disabled.
+
 Change these rules in **Settings → General** on web and desktop, or **Settings → Thread behavior** on mobile.
 They continue to run when your apps are closed. On web and desktop, choose an environment at the
 top to change only its rules, or **All environments** to update connected environments together.
diff --git a/docs/user/updating.md b/docs/user/updating.md
index 876de7ae93a5..80127317e4fa 100644
--- a/docs/user/updating.md
+++ b/docs/user/updating.md
@@ -58,6 +58,18 @@ update can roll back to the previous version. If the update still fails:
 
 ## Mobile updates
 
+To update an environment from your phone, open **Settings → Environments** and
+select it. **Check for updates** finds the latest release on that environment's
+current release channel. Keep the app open while the environment updates and
+reconnects. Hosts that cannot update remotely show instructions for updating on
+the machine instead.
+
+The same page lets you refresh provider status and update supported providers.
+These controls require a connected environment and permission to operate it.
+Provider update checks and restart continuation preferences are in
+**Settings → Maintenance**. If provider update checks are disabled, enable them
+there before refreshing to find newer versions.
+
 Install App Store or Google Play releases as usual. The mobile app can also
 download updates in the background and apply them when you next leave the app.
 It saves drafts and queued messages before restarting. If you keep the app open
diff --git a/docs/user/usage.md b/docs/user/usage.md
index 2e6b4acd9e4c..64f392d6e941 100644
--- a/docs/user/usage.md
+++ b/docs/user/usage.md
@@ -1,20 +1,39 @@
 # Usage and limits
 
+Open **Usage** from the sidebar or the command palette, or press `mod+u` on web and
+desktop when the terminal is not focused. Customize `usage.open` in
+**Settings → Keybindings**.
+
 ## Understand your usage
 
-**Usage** combines Codex, Claude Code, and Grok Build session history from your connected
+**Usage** combines Codex, Claude Code, Grok Build, OpenCode, Antigravity, and Cursor history from your connected
 environments. It shows token use, cache savings, model breakdowns, and estimated API-equivalent
 cost. These estimates are not your subscription bill.
 
 Totals depend on the history available on each server. Grok turns without a saved completed-turn
 record are missing from the totals.
 
+OpenCode reads its SQLite database and older JSON history. Antigravity reads local conversation
+databases, including T3-managed profiles. Set `OPENCODE_DATA_DIR` or `ANTIGRAVITY_DATA_DIR` on the
+server to read a different data directory; comma-separated paths read multiple directories.
+
+Cursor reads account usage from Cursor's dashboard API using the CLI login saved on the server.
+This includes headless T3 sessions and desktop usage across machines; the same account counts
+once across connected environments. Without an accessible CLI login, T3 shows a
+notice instead of incomplete local totals. T3 does not estimate missing tokens from conversation text.
+On macOS, choose **Enable Cursor usage** on Usage to allow T3 to read your existing CLI login
+from Keychain. You can turn it off in **Settings → Providers → Usage providers**. macOS may ask
+you to allow access on the server Mac.
+
 Usage includes each configured account's history, including disabled accounts. Custom homes follow
 the account's home setting or its `CODEX_HOME`, `CLAUDE_CONFIG_DIR`, or `GROK_HOME` environment
 variable. Use absolute paths or `~/` paths in the account's environment settings; relative
 environment paths depend on each project's working directory and cannot be reliably discovered
 by Usage. Accounts sharing a history directory count once.
 
+When your app and server support different providers, usage totals may cover only the providers
+your app understands. Update the app to include newly supported providers.
+
 On web and desktop, use the environment dropdown to filter costs, tokens, and limits. All
 environments are selected by default. The dropdown shows which environments are still scanning;
 results appear as each one responds.
@@ -53,8 +72,10 @@ first, or by the first available window when no account reports a 5-hour limit.
 account does not report that window. When the provider reports reset times, the card also says
 when the next reset lands and how much it hands back. The hatched
 part of a segment is what that reset restores. Tap a segment or account row for the account's plan,
-where it is signed in, and its reset time. On web, you can hover too. Codex accounts with banked
-reset credits show a ticket count and the **Use reset** action in the account details. On narrow screens, numbered rows below
+where it is signed in, and its reset time. On web, you can hover too. Codex and Claude accounts
+with banked reset credits show a ticket count and the **Use reset** action in the account details.
+Claude resets are not available when the server runs on macOS, where Claude keeps its login in the
+Keychain. On narrow screens, numbered rows below
 the bar show each account's quota, countdown, and credits. Tap a row to open its details.
 
 The same account signed in on more than one environment, or reported by a hub as well, counts once.
@@ -72,10 +93,10 @@ anything. The command is offered only for providers that appear under **Usage 
 OpenCode Go reports its session, weekly, and monthly allowance when OpenCode runs locally in
 the environment. T3 cannot report limits for external OpenCode servers because their credentials
 belong to the remote server. Cursor reports
-its monthly allowance, including separate Auto and API usage, using a file-based CLI login or
-`CURSOR_AUTH_TOKEN`. Cursor's default macOS keychain login does not currently report limits.
-On macOS, use `AGENT_CLI_CREDENTIAL_STORE=file` when signing in and in the provider's environment
-to use a file-based login.
+its monthly allowance, including separate Auto and API usage, using the CLI login or
+`CURSOR_AUTH_TOKEN`. On macOS, this includes the default Keychain login after you enable Cursor
+usage. Keychain login is used for limits only with Cursor's default API endpoint. If you configure
+a custom Cursor endpoint, use an explicit token or file-based CLI login for limits.
 
 Grok reports the remaining subscription allowance and reset time for its current billing period
 after signing in with `grok login`. Explicit `XAI_API_KEY` connections and custom authentication
@@ -100,4 +121,14 @@ settings section when you no longer need it.
 
 Add **Subscription usage** from your iOS or Android widget gallery to see remaining Codex and
 Claude quotas. Tap it to open **Usage → Limits**. On iOS, use **Edit Widget** to choose Session,
-Weekly, or both for each provider. Reopen T3 to refresh expired readings.
+Weekly, or both for each provider. Reopen T3 to refresh expired readings. The Android widget
+requires Android 12L or later.
+
+## Keyboard shortcuts
+
+On web and desktop, open Usage from the command palette. While on Usage,
+press `C`, `T`, or `L` for Cost, Tokens, or Limits while not typing in a field.
+Use `Ctrl+Shift+1/2/3/4` (`Cmd+Shift+1/2/3/4` on macOS) for the past
+24 hours, 7 days, 30 days, or 90 days. Period shortcuts do nothing on Limits.
+Press `Escape` to return to the previous page. Customize these shortcuts in
+**Settings → Keybindings**.
diff --git a/infra/relay/.env.example b/infra/relay/.env.example
index a55e979646ee..9033f8d2305e 100644
--- a/infra/relay/.env.example
+++ b/infra/relay/.env.example
@@ -5,6 +5,10 @@
 RELAY_API_ZONE_NAME=example.com
 RELAY_TUNNEL_ZONE_NAME=tunnels.example.com
 
+# Optional: inactive tunnel cleanup. Start with dry-run, verify the cleanup
+# logs, then set enabled. Unset and off both disable cleanup.
+# RELAY_TUNNEL_CLEANUP_MODE=off
+
 # Optional: Relay domain override
 # Set this only when the derived relay hostname should not be used.
 # RELAY_DOMAIN=relay.example.com
diff --git a/infra/relay/migrations/postgres/20260919015455_managed_endpoint_recovery/migration.sql b/infra/relay/migrations/postgres/20260919015455_managed_endpoint_recovery/migration.sql
new file mode 100644
index 000000000000..f2bbc5bba592
--- /dev/null
+++ b/infra/relay/migrations/postgres/20260919015455_managed_endpoint_recovery/migration.sql
@@ -0,0 +1,4 @@
+ALTER TABLE "relay_managed_endpoint_allocations" ADD COLUMN "recovery_enabled_at" varchar(64);--> statement-breakpoint
+ALTER TABLE "relay_managed_endpoint_allocations" ADD COLUMN "recovery_environment_public_key" text;--> statement-breakpoint
+ALTER TABLE "relay_managed_endpoint_allocations" ADD COLUMN "origin" jsonb;--> statement-breakpoint
+ALTER TABLE "relay_managed_endpoint_allocations" ADD COLUMN "generation" integer DEFAULT 0 NOT NULL;
diff --git a/infra/relay/migrations/postgres/20260919015455_managed_endpoint_recovery/snapshot.json b/infra/relay/migrations/postgres/20260919015455_managed_endpoint_recovery/snapshot.json
new file mode 100644
index 000000000000..c0660307197d
--- /dev/null
+++ b/infra/relay/migrations/postgres/20260919015455_managed_endpoint_recovery/snapshot.json
@@ -0,0 +1,1568 @@
+{
+  "dialect": "postgres",
+  "id": "3809c51e-3821-4a08-818d-e5d28dd3e9b4",
+  "prevIds": ["4b6d0d21-8d78-4499-9dde-b42bcf633d05"],
+  "version": "8",
+  "ddl": [
+    {
+      "isRlsEnabled": false,
+      "name": "relay_agent_activity_rows",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_delivery_attempts",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_dpop_proofs",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_environment_credentials",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_environment_links",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_live_activities",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_managed_endpoint_allocations",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_managed_tunnel_limits",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "isRlsEnabled": false,
+      "name": "relay_mobile_devices",
+      "entityType": "tables",
+      "schema": "public"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_public_key",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "type": "varchar(512)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "thread_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "type": "jsonb",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "state_json",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "updated_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "type": "varchar(36)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "user_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(512)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "thread_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "device_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "kind",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "source_job_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(16)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "token_suffix",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "integer",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "apns_status",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "apns_reason",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(128)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "apns_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "transport_error",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "type": "varchar(128)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "thumbprint",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_dpop_proofs"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "jti",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_dpop_proofs"
+    },
+    {
+      "type": "integer",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "iat",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_dpop_proofs"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "expires_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_dpop_proofs"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_dpop_proofs"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "credential_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_public_key",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "credential_hash",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "revoked_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "updated_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "user_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": "'T3 Environment'",
+      "generated": null,
+      "identity": null,
+      "name": "environment_label",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_public_key",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "endpoint_http_base_url",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "endpoint_ws_base_url",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "varchar(32)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "endpoint_provider_kind",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "boolean",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": "true",
+      "generated": null,
+      "identity": null,
+      "name": "notifications_enabled",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "boolean",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": "true",
+      "generated": null,
+      "identity": null,
+      "name": "live_activities_enabled",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "boolean",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": "false",
+      "generated": null,
+      "identity": null,
+      "name": "managed_tunnels_enabled",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_by_device_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "revoked_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "updated_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "user_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "device_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "activity_push_token",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "remote_start_queued_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "remote_started_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "ended_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "jsonb",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "last_aggregate_json",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "last_live_activity_delivery_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "updated_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "user_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "environment_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "hostname",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "tunnel_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "tunnel_name",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "dns_record_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "ready_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "recovery_enabled_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "recovery_environment_public_key",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "jsonb",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "origin",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "integer",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": "0",
+      "generated": null,
+      "identity": null,
+      "name": "generation",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "updated_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "type": "varchar(191)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "user_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_tunnel_limits"
+    },
+    {
+      "type": "integer",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "max_tunnels",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_tunnel_limits"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_tunnel_limits"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "updated_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_managed_tunnel_limits"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "user_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "device_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": "'iOS device'",
+      "generated": null,
+      "identity": null,
+      "name": "label",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "varchar(16)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "platform",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "integer",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "ios_major_version",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "integer",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "android_api_level",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "app_version",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "varchar(255)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "bundle_id",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "varchar(16)",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "aps_environment",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "push_token",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "text",
+      "typeSchema": null,
+      "notNull": false,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "push_to_start_token",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "jsonb",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "preferences_json",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "created_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "type": "varchar(64)",
+      "typeSchema": null,
+      "notNull": true,
+      "dimensions": 0,
+      "default": null,
+      "generated": null,
+      "identity": null,
+      "name": "updated_at",
+      "entityType": "columns",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "updated_at",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_agent_activity_rows_updated",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "environment_id",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        },
+        {
+          "value": "thread_id",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        },
+        {
+          "value": "created_at",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_delivery_attempts_environment",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "source_job_id",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": true,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_delivery_attempts_source_job",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_delivery_attempts"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "expires_at",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_dpop_proofs_expires_at",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_dpop_proofs"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "credential_hash",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": true,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_environment_credentials_hash",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "environment_id",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        },
+        {
+          "value": "revoked_at",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_environment_credentials_environment",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "environment_id",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        },
+        {
+          "value": "environment_public_key",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        },
+        {
+          "value": "revoked_at",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_environment_credentials_environment_key",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_environment_credentials"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "environment_id",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        },
+        {
+          "value": "revoked_at",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_environment_links_environment",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "activity_push_token",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": true,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_live_activities_activity_push_token",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "hostname",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": true,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_managed_endpoint_allocations_hostname",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "tunnel_name",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": true,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_managed_endpoint_allocations_tunnel_name",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "push_token",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": true,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_mobile_devices_push_token",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "nameExplicit": true,
+      "columns": [
+        {
+          "value": "push_to_start_token",
+          "isExpression": false,
+          "asc": true,
+          "nullsFirst": false,
+          "opclass": null
+        }
+      ],
+      "isUnique": true,
+      "where": null,
+      "with": "",
+      "method": "btree",
+      "concurrently": false,
+      "name": "idx_relay_mobile_devices_push_to_start_token",
+      "entityType": "indexes",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "columns": ["environment_id", "environment_public_key", "thread_id"],
+      "nameExplicit": false,
+      "name": "relay_agent_activity_rows_pkey",
+      "entityType": "pks",
+      "schema": "public",
+      "table": "relay_agent_activity_rows"
+    },
+    {
+      "columns": ["thumbprint", "jti"],
+      "nameExplicit": false,
+      "name": "relay_dpop_proofs_pkey",
+      "entityType": "pks",
+      "schema": "public",
+      "table": "relay_dpop_proofs"
+    },
+    {
+      "columns": ["user_id", "environment_id"],
+      "nameExplicit": false,
+      "name": "relay_environment_links_pkey",
+      "entityType": "pks",
+      "schema": "public",
+      "table": "relay_environment_links"
+    },
+    {
+      "columns": ["user_id", "device_id"],
+      "nameExplicit": false,
+      "name": "relay_live_activities_pkey",
+      "entityType": "pks",
+      "schema": "public",
+      "table": "relay_live_activities"
+    },
+    {
+      "columns": ["user_id", "environment_id"],
+      "nameExplicit": false,
+      "name": "relay_managed_endpoint_allocations_pkey",
+      "entityType": "pks",
+      "schema": "public",
+      "table": "relay_managed_endpoint_allocations"
+    },
+    {
+      "columns": ["user_id", "device_id"],
+      "nameExplicit": false,
+      "name": "relay_mobile_devices_pkey",
+      "entityType": "pks",
+      "schema": "public",
+      "table": "relay_mobile_devices"
+    },
+    {
+      "columns": ["id"],
+      "nameExplicit": false,
+      "name": "relay_delivery_attempts_pkey",
+      "schema": "public",
+      "table": "relay_delivery_attempts",
+      "entityType": "pks"
+    },
+    {
+      "columns": ["credential_id"],
+      "nameExplicit": false,
+      "name": "relay_environment_credentials_pkey",
+      "schema": "public",
+      "table": "relay_environment_credentials",
+      "entityType": "pks"
+    },
+    {
+      "columns": ["user_id"],
+      "nameExplicit": false,
+      "name": "relay_managed_tunnel_limits_pkey",
+      "schema": "public",
+      "table": "relay_managed_tunnel_limits",
+      "entityType": "pks"
+    }
+  ],
+  "renames": []
+}
diff --git a/infra/relay/src/Config.test.ts b/infra/relay/src/Config.test.ts
new file mode 100644
index 000000000000..e37d605d0644
--- /dev/null
+++ b/infra/relay/src/Config.test.ts
@@ -0,0 +1,35 @@
+import { expect, it } from "@effect/vitest";
+import * as ConfigProvider from "effect/ConfigProvider";
+import * as Effect from "effect/Effect";
+
+import { managedEndpointCleanupModeConfig } from "./Config.ts";
+
+it.effect.each([
+  { name: "missing", env: {}, expected: "off" },
+  { name: "empty", env: { RELAY_TUNNEL_CLEANUP_MODE: "" }, expected: "off" },
+  { name: "whitespace", env: { RELAY_TUNNEL_CLEANUP_MODE: "  \t" }, expected: "off" },
+  { name: "off", env: { RELAY_TUNNEL_CLEANUP_MODE: "off" }, expected: "off" },
+  {
+    name: "dry-run",
+    env: { RELAY_TUNNEL_CLEANUP_MODE: "dry-run" },
+    expected: "dry-run",
+  },
+  { name: "enabled", env: { RELAY_TUNNEL_CLEANUP_MODE: "enabled" }, expected: "enabled" },
+] as const)("loads $name cleanup mode as $expected", ({ env, expected }) =>
+  Effect.gen(function* () {
+    const provider = ConfigProvider.fromEnv({ env });
+    expect(yield* managedEndpointCleanupModeConfig.parse(provider)).toBe(expected);
+  }),
+);
+
+it.effect("rejects an invalid cleanup mode", () =>
+  Effect.gen(function* () {
+    const provider = ConfigProvider.fromEnv({
+      env: { RELAY_TUNNEL_CLEANUP_MODE: "delete-everything" },
+    });
+    const error = yield* Effect.flip(managedEndpointCleanupModeConfig.parse(provider));
+
+    expect(error._tag).toBe("ConfigError");
+    expect(error.message).toContain('Expected "off" | "dry-run" | "enabled"');
+  }),
+);
diff --git a/infra/relay/src/Config.ts b/infra/relay/src/Config.ts
index 8944a7c32659..d1d179e5b75d 100644
--- a/infra/relay/src/Config.ts
+++ b/infra/relay/src/Config.ts
@@ -1,5 +1,6 @@
 import * as Config from "effect/Config";
 import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
@@ -8,6 +9,20 @@ import * as Schema from "effect/Schema";
 export const ApnsEnvironment = Schema.Literals(["sandbox", "production"]);
 export type ApnsEnvironment = typeof ApnsEnvironment.Type;
 
+export const ManagedEndpointCleanupMode = Schema.Literals(["off", "dry-run", "enabled"]);
+export type ManagedEndpointCleanupMode = typeof ManagedEndpointCleanupMode.Type;
+const decodeManagedEndpointCleanupMode = Schema.decodeUnknownEffect(ManagedEndpointCleanupMode);
+
+export const managedEndpointCleanupModeConfig = Config.String("RELAY_TUNNEL_CLEANUP_MODE").pipe(
+  Config.withDefault("off"),
+  Config.map((value) => value.trim() || "off"),
+  Config.mapEffect((value) =>
+    decodeManagedEndpointCleanupMode(value).pipe(
+      Effect.mapError((error) => new Config.ConfigError(error)),
+    ),
+  ),
+);
+
 export interface ApnsCredentials {
   readonly teamId: string;
   readonly keyId: string;
@@ -46,6 +61,7 @@ export class RelayConfiguration extends Context.Service<
     readonly cloudMintPublicKey: string;
     readonly managedEndpointBaseDomain: string | undefined;
     readonly managedEndpointNamespace: string | undefined;
+    readonly managedEndpointCleanupMode?: ManagedEndpointCleanupMode;
   }
 >()("t3code-relay/Config/RelayConfiguration") {}
 
diff --git a/infra/relay/src/agentActivity/LiveActivities.test.ts b/infra/relay/src/agentActivity/LiveActivities.test.ts
index f05d3df72af8..5ae64c08c9ad 100644
--- a/infra/relay/src/agentActivity/LiveActivities.test.ts
+++ b/infra/relay/src/agentActivity/LiveActivities.test.ts
@@ -276,7 +276,7 @@ describe("LiveActivities", () => {
         liveActivities.register({ userId: "user-1", registration }),
       );
       const targetListError = yield* Effect.flip(liveActivities.listTargets({ userId: "user-1" }));
-      const deliveryErrors = yield* Effect.all(
+      const deliveryErrors = yield* Effect.forEach(
         [
           liveActivities.markDelivery({
             userId: "user-1",
@@ -297,7 +297,8 @@ describe("LiveActivities", () => {
             kind: "push_notification",
             invalidatedAt: "2026-05-25T00:00:10.000Z",
           }),
-        ].map(Effect.flip),
+        ],
+        (effect) => Effect.flip(effect),
         { concurrency: 1 },
       );
 
diff --git a/infra/relay/src/clientConfig.test.ts b/infra/relay/src/clientConfig.test.ts
index 6fd28dcd948c..cfc5e665f0b6 100644
--- a/infra/relay/src/clientConfig.test.ts
+++ b/infra/relay/src/clientConfig.test.ts
@@ -82,13 +82,7 @@ describe("PublishClientConfig", () => {
         ),
       );
 
-      yield* stack
-        .deploy(
-          Effect.gen(function* () {
-            return yield* PublishClientConfig(clientConfig("v1"));
-          }),
-        )
-        .pipe(configured);
+      yield* stack.deploy(PublishClientConfig(clientConfig("v1"))).pipe(configured);
       const first = yield* fs.readFileString(target);
       expect(first).toContain("KEEP=yes\n");
       expect(first).toContain("T3CODE_RELAY_URL=https://relay.example.com\n");
@@ -97,23 +91,11 @@ describe("PublishClientConfig", () => {
 
       // Same input: the action is skipped, so a change made by hand survives.
       yield* fs.writeFileString(target, `${first}MANUAL=1\n`);
-      yield* stack
-        .deploy(
-          Effect.gen(function* () {
-            return yield* PublishClientConfig(clientConfig("v1"));
-          }),
-        )
-        .pipe(configured);
+      yield* stack.deploy(PublishClientConfig(clientConfig("v1"))).pipe(configured);
       expect(yield* fs.readFileString(target)).toContain("MANUAL=1\n");
 
       // A rotated token changes the input, so it runs again and replaces the line.
-      yield* stack
-        .deploy(
-          Effect.gen(function* () {
-            return yield* PublishClientConfig(clientConfig("v2"));
-          }),
-        )
-        .pipe(configured);
+      yield* stack.deploy(PublishClientConfig(clientConfig("v2"))).pipe(configured);
       const third = yield* fs.readFileString(target);
       expect(third).toContain("T3CODE_RELAY_CLIENT_OTLP_TRACES_TOKEN=client-v2\n");
       expect(third).not.toContain("client-v1");
@@ -128,11 +110,7 @@ describe("PublishClientConfig", () => {
       const dir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-relay-client-config-" });
       const target = path.join(dir, "client.env");
       const exit = yield* stack
-        .deploy(
-          Effect.gen(function* () {
-            return yield* PublishClientConfig({ ...clientConfig("v1"), url: undefined });
-          }),
-        )
+        .deploy(PublishClientConfig({ ...clientConfig("v1"), url: undefined }))
         .pipe(
           Effect.provide(
             ConfigProvider.layer(
@@ -155,11 +133,9 @@ describe("PublishClientConfig", () => {
       const target = path.join(dir, "client.env");
       const exit = yield* stack
         .deploy(
-          Effect.gen(function* () {
-            return yield* PublishClientConfig({
-              ...clientConfig("v1"),
-              clientTracingDataset: "relay-traces\nINJECTED=1",
-            });
+          PublishClientConfig({
+            ...clientConfig("v1"),
+            clientTracingDataset: "relay-traces\nINJECTED=1",
           }),
         )
         .pipe(
diff --git a/infra/relay/src/dbConfig.test.ts b/infra/relay/src/dbConfig.test.ts
deleted file mode 100644
index e97b29a742de..000000000000
--- a/infra/relay/src/dbConfig.test.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { describe, expect, it } from "vite-plus/test";
-
-import { relayDatabaseMode } from "./dbConfig.ts";
-
-describe("relayDatabaseMode", () => {
-  it("uses the shared database only for production", () => {
-    expect(relayDatabaseMode("prod")).toBe("shared-database");
-    expect(relayDatabaseMode("dev_julius")).toBe("stage-branch");
-    expect(relayDatabaseMode("preview")).toBe("stage-branch");
-  });
-});
diff --git a/infra/relay/src/deploymentConfig.test.ts b/infra/relay/src/deploymentConfig.test.ts
index f090c70ee22b..30682d65ba1f 100644
--- a/infra/relay/src/deploymentConfig.test.ts
+++ b/infra/relay/src/deploymentConfig.test.ts
@@ -7,6 +7,7 @@ import {
   managedEndpointHostname,
   isManagedEndpointHostname,
   managedEndpointTunnelName,
+  managedEndpointTunnelNamePrefix,
   relayOwnsManagedEndpointZone,
   RelayPublicDomainLabelTooLongError,
   relayPublicDomainForStage,
@@ -84,6 +85,9 @@ describe("managed endpoint names", () => {
     expect(managedEndpointTunnelName("dev_julius", hash)).toBe(
       "t3coderelay-managedendpoint-dev-julius-abcdef0123456789",
     );
+    expect(managedEndpointTunnelNamePrefix("dev_julius")).toBe(
+      "t3coderelay-managedendpoint-dev-julius-",
+    );
   });
 
   it("keeps the DNS label within the provider limit for long stage names", () => {
diff --git a/infra/relay/src/deploymentConfig.ts b/infra/relay/src/deploymentConfig.ts
index 1a3a332acc5a..961c6f1b2f4a 100644
--- a/infra/relay/src/deploymentConfig.ts
+++ b/infra/relay/src/deploymentConfig.ts
@@ -117,6 +117,10 @@ export function managedEndpointForHostname(hostname: string): RelayManagedEndpoi
   };
 }
 
+export function managedEndpointTunnelNamePrefix(stage: string): string {
+  return `${MANAGED_ENDPOINT_TUNNEL_PREFIX}-${relayStageSlug(stage)}-`;
+}
+
 export function managedEndpointTunnelName(stage: string, hash: string): string {
-  return `${MANAGED_ENDPOINT_TUNNEL_PREFIX}-${relayStageSlug(stage)}-${stableSuffix(hash)}`;
+  return `${managedEndpointTunnelNamePrefix(stage)}${stableSuffix(hash)}`;
 }
diff --git a/infra/relay/src/environments/EnvironmentConnector.test.ts b/infra/relay/src/environments/EnvironmentConnector.test.ts
index da6f4acc192e..379aff123d43 100644
--- a/infra/relay/src/environments/EnvironmentConnector.test.ts
+++ b/infra/relay/src/environments/EnvironmentConnector.test.ts
@@ -188,7 +188,9 @@ function makeAllocations(
     tunnelName: "tunnel-name",
     dnsRecordId: "dns-record-id",
     readyAt: "2026-05-25T00:00:00.000Z",
+    origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
     updatedAt: "2026-05-25T00:00:00.000Z",
+    generation: 1,
   },
 ): ManagedEndpointAllocations.ManagedEndpointAllocations["Service"] {
   return {
@@ -197,7 +199,10 @@ function makeAllocations(
     recordTunnel: () => Effect.die("unused"),
     recordDns: () => Effect.die("unused"),
     markReady: () => Effect.die("unused"),
+    enableRecovery: () => Effect.die("unused"),
+    listByTunnelNames: () => Effect.die("unused"),
     claimRelease: () => Effect.die("unused"),
+    withClaimedTunnel: () => Effect.die("unused"),
     claimDeprovision: () => Effect.die("unused"),
     remove: () => Effect.die("unused"),
     removeClaimed: () => Effect.die("unused"),
@@ -469,7 +474,9 @@ describe("EnvironmentConnector", () => {
             tunnelName: "tunnel-name",
             dnsRecordId: "dns-record-id",
             readyAt: null,
+            origin: null,
             updatedAt: "2026-05-25T00:00:00.000Z",
+            generation: 1,
           }),
         }),
       ),
diff --git a/infra/relay/src/environments/EnvironmentLinker.test.ts b/infra/relay/src/environments/EnvironmentLinker.test.ts
index 78412e6c138e..67928c25f09c 100644
--- a/infra/relay/src/environments/EnvironmentLinker.test.ts
+++ b/infra/relay/src/environments/EnvironmentLinker.test.ts
@@ -134,8 +134,9 @@ function testLayer(input?: {
           revokeForEnvironmentPublicKey: () => Effect.succeed(false),
         }),
         Layer.succeed(ManagedEndpointProvider.ManagedEndpointProvider, {
+          reconcileOrigin: () => Effect.succeed("ready"),
           prepareDeprovision: () => Effect.succeed(null),
-          deprovision: input?.deprovision ?? (() => Effect.void),
+          deprovision: input?.deprovision ?? (() => Effect.succeed(true)),
           release: () => Effect.succeed(true),
           provision: () =>
             Effect.succeed({
@@ -241,6 +242,7 @@ describe("EnvironmentLinker", () => {
           deprovision: (input) =>
             Effect.sync(() => {
               deprovisionedEnvironmentId = input.environmentId;
+              return true;
             }),
         }),
       ),
diff --git a/infra/relay/src/environments/ManagedEndpointAllocations.test.ts b/infra/relay/src/environments/ManagedEndpointAllocations.test.ts
index ebf51de100c1..105b10cc6a9e 100644
--- a/infra/relay/src/environments/ManagedEndpointAllocations.test.ts
+++ b/infra/relay/src/environments/ManagedEndpointAllocations.test.ts
@@ -1,6 +1,8 @@
 import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import { PgDialect } from "drizzle-orm/pg-core";
 
 import * as RelayDb from "../db.ts";
 import { relayManagedEndpointAllocations } from "../persistence/schema.ts";
@@ -10,17 +12,253 @@ const layerWithDb = (db: RelayDb.RelayDb["Service"]) =>
   ManagedEndpointAllocations.layer.pipe(Layer.provide(Layer.succeed(RelayDb.RelayDb, db)));
 
 describe("ManagedEndpointAllocations", () => {
+  it.effect("clears endpoint readiness and recovery only when the recorded tunnel changes", () => {
+    let updated:
+      | {
+          readonly tunnelId: string;
+          readonly readyAt: unknown;
+          readonly recoveryEnabledAt: unknown;
+          readonly recoveryEnvironmentPublicKey: unknown;
+        }
+      | undefined;
+    const fakeDb = {
+      update: (table: unknown) => {
+        expect(table).toBe(relayManagedEndpointAllocations);
+        return {
+          set: (values: {
+            readonly tunnelId: string;
+            readonly readyAt: unknown;
+            readonly recoveryEnabledAt: unknown;
+            readonly recoveryEnvironmentPublicKey: unknown;
+          }) => {
+            updated = values;
+            return {
+              where: () => ({
+                returning: () => Effect.succeed([{ generation: 8 }]),
+              }),
+            };
+          },
+        };
+      },
+    } as unknown as RelayDb.RelayDb["Service"];
+
+    return Effect.gen(function* () {
+      const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+      expect(
+        yield* allocations.recordTunnel({
+          userId: "user-1",
+          environmentId: "environment-1",
+          tunnelId: "replacement-tunnel",
+          generation: 7,
+        }),
+      ).toBe(8);
+      expect(updated?.tunnelId).toBe("replacement-tunnel");
+      const query = new PgDialect().sqlToQuery(updated?.readyAt as never);
+      expect(query.sql).toBe(
+        'case when "relay_managed_endpoint_allocations"."tunnel_id" = $1 then "relay_managed_endpoint_allocations"."ready_at" else null end',
+      );
+      expect(query.params).toEqual(["replacement-tunnel"]);
+      for (const [column, value] of [
+        ["recovery_enabled_at", updated?.recoveryEnabledAt],
+        ["recovery_environment_public_key", updated?.recoveryEnvironmentPublicKey],
+      ] as const) {
+        const recoveryQuery = new PgDialect().sqlToQuery(value as never);
+        expect(recoveryQuery.sql).toBe(
+          `case when "relay_managed_endpoint_allocations"."tunnel_id" = $1 then "relay_managed_endpoint_allocations"."${column}" else null end`,
+        );
+        expect(recoveryQuery.params).toEqual(["replacement-tunnel"]);
+      }
+    }).pipe(Effect.provide(layerWithDb(fakeDb)));
+  });
+
+  it.effect("records recovery support and advances the allocation generation", () => {
+    let updated:
+      | {
+          readonly recoveryEnabledAt: string;
+          readonly recoveryEnvironmentPublicKey: string;
+          readonly updatedAt: string;
+        }
+      | undefined;
+    let condition: unknown;
+    const fakeDb = {
+      update: (table: unknown) => {
+        expect(table).toBe(relayManagedEndpointAllocations);
+        return {
+          set: (values: {
+            readonly recoveryEnabledAt: string;
+            readonly recoveryEnvironmentPublicKey: string;
+            readonly updatedAt: string;
+          }) => {
+            updated = values;
+            return {
+              where: (where: unknown) => {
+                condition = where;
+                return {
+                  returning: () => Effect.succeed([{ environmentId: "environment-1" }]),
+                };
+              },
+            };
+          },
+        };
+      },
+    } as unknown as RelayDb.RelayDb["Service"];
+
+    return Effect.gen(function* () {
+      const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+      expect(
+        yield* allocations.enableRecovery({
+          userId: "user-1",
+          environmentId: "environment-1",
+          tunnelId: "tunnel-1",
+          environmentPublicKey: "public-key",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      ).toBe(true);
+
+      expect(updated?.recoveryEnabledAt).toBe(updated?.updatedAt);
+      expect(updated?.recoveryEnabledAt).toBeDefined();
+      expect(updated?.recoveryEnvironmentPublicKey).toBe("public-key");
+      const query = new PgDialect().sqlToQuery(condition as never);
+      expect(query.sql).toContain('"relay_managed_endpoint_allocations"."tunnel_id"');
+      expect(query.sql).toContain('"relay_environment_links"."environment_public_key"');
+      expect(query.sql).toContain('"relay_environment_links"."endpoint_provider_kind"');
+      expect(query.sql).toContain('"relay_environment_links"."revoked_at" is null');
+      expect(query.sql).toContain("for update");
+      expect(query.params).toContain("tunnel-1");
+      expect(query.params).toContain("public-key");
+      expect(query.params).toContain("cloudflare_tunnel");
+    }).pipe(Effect.provide(layerWithDb(fakeDb)));
+  });
+
+  it.effect("rejects recovery when the tunnel or active link no longer matches", () => {
+    const fakeDb = {
+      update: () => ({
+        set: () => ({
+          where: () => ({
+            returning: () => Effect.succeed([]),
+          }),
+        }),
+      }),
+    } as unknown as RelayDb.RelayDb["Service"];
+
+    return Effect.gen(function* () {
+      const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+      expect(
+        yield* allocations.enableRecovery({
+          userId: "user-1",
+          environmentId: "environment-1",
+          tunnelId: "missing-tunnel",
+          environmentPublicKey: "public-key",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      ).toBe(false);
+    }).pipe(Effect.provide(layerWithDb(fakeDb)));
+  });
+
+  it.effect("returns recovery support with tunnel allocation lookups", () => {
+    const base = {
+      userId: "user-1",
+      hostname: "environment.example.test",
+      tunnelName: "managed-tunnel",
+      dnsRecordId: "dns-1",
+      readyAt: "2026-08-25T12:00:00.000Z",
+      updatedAt: "2026-08-25T12:00:00.000Z",
+      generation: 1,
+    };
+    const fakeDb = {
+      select: () => ({
+        from: (table: unknown) => {
+          expect(table).toBe(relayManagedEndpointAllocations);
+          return {
+            leftJoin: () => ({
+              where: () =>
+                Effect.succeed([
+                  {
+                    ...base,
+                    environmentId: "environment-1",
+                    tunnelId: "tunnel-1",
+                    recoveryEnabledAt: "2026-08-25T12:00:00.000Z",
+                    recoveryEnvironmentPublicKey: "current-key",
+                    linkedEnvironmentPublicKey: "current-key",
+                  },
+                  {
+                    ...base,
+                    environmentId: "environment-2",
+                    tunnelId: "tunnel-2",
+                    recoveryEnabledAt: null,
+                    recoveryEnvironmentPublicKey: null,
+                    linkedEnvironmentPublicKey: "current-key",
+                  },
+                  {
+                    ...base,
+                    environmentId: "environment-3",
+                    tunnelId: "tunnel-3",
+                    recoveryEnabledAt: "2026-08-25T12:00:00.000Z",
+                    recoveryEnvironmentPublicKey: "old-key",
+                    linkedEnvironmentPublicKey: "new-key",
+                  },
+                ]),
+            }),
+          };
+        },
+      }),
+    } as unknown as RelayDb.RelayDb["Service"];
+
+    return Effect.gen(function* () {
+      const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+      const result = yield* allocations.listByTunnelNames([
+        "first-tunnel",
+        "second-tunnel",
+        "third-tunnel",
+      ]);
+
+      expect(result.map((entry) => [entry.tunnelId, entry.recoveryEnabled])).toEqual([
+        ["tunnel-1", true],
+        ["tunnel-2", false],
+        ["tunnel-3", false],
+      ]);
+    }).pipe(Effect.provide(layerWithDb(fakeDb)));
+  });
+
+  it.effect("skips the database for an empty tunnel lookup", () =>
+    Effect.gen(function* () {
+      const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+      expect(yield* allocations.listByTunnelNames([])).toEqual([]);
+    }).pipe(Effect.provide(layerWithDb({} as RelayDb.RelayDb["Service"]))),
+  );
+
+  it.effect("splits large tunnel lookups into bounded database queries", () => {
+    const batchSizes: number[] = [];
+    const fakeDb = {
+      select: () => ({
+        from: () => ({
+          leftJoin: () => ({
+            where: (condition: unknown) => {
+              batchSizes.push(new PgDialect().sqlToQuery(condition as never).params.length);
+              return Effect.succeed([]);
+            },
+          }),
+        }),
+      }),
+    } as unknown as RelayDb.RelayDb["Service"];
+
+    return Effect.gen(function* () {
+      const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+      const names = Array.from({ length: 1_001 }, (_, index) => `tunnel-${index}`);
+      expect(yield* allocations.listByTunnelNames(names)).toEqual([]);
+      expect(batchSizes).toEqual([500, 500, 1]);
+    }).pipe(Effect.provide(layerWithDb(fakeDb)));
+  });
+
   it.effect("returns a claim generation only when deprovision wins the allocation CAS", () => {
-    let claimedAt: string | undefined;
     const fakeDb = {
       update: (table: unknown) => {
         expect(table).toBe(relayManagedEndpointAllocations);
         return {
-          set: (values: { readonly updatedAt: string }) => {
-            claimedAt = values.updatedAt;
+          set: (_values: { readonly updatedAt: string }) => {
             return {
               where: () => ({
-                returning: () => Effect.succeed([{ userId: "user-1" }]),
+                returning: () => Effect.succeed([{ generation: 8 }]),
               }),
             };
           },
@@ -33,14 +271,58 @@ describe("ManagedEndpointAllocations", () => {
       const generation = yield* allocations.claimDeprovision({
         userId: "user-1",
         environmentId: "environment-1",
-        updatedAt: "captured-generation",
+        generation: 7,
       });
 
-      expect(generation).toBe(claimedAt);
+      expect(generation).toBe(8);
       expect(generation).not.toBeNull();
     }).pipe(Effect.provide(layerWithDb(fakeDb)));
   });
 
+  it.effect("holds the claimed allocation row while deleting its tunnel", () => {
+    const operations: string[] = [];
+    const fakeDb = {
+      $client: {
+        withTransaction: <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+          Effect.sync(() => {
+            operations.push("transaction");
+          }).pipe(Effect.andThen(effect)),
+      },
+      select: () => ({
+        from: () => ({
+          where: () => ({
+            limit: () => ({
+              for: (strength: string) =>
+                Effect.sync(() => {
+                  operations.push(`lock:${strength}`);
+                  return [{ generation: 7 }];
+                }),
+            }),
+          }),
+        }),
+      }),
+    } as unknown as RelayDb.RelayDb["Service"];
+
+    return Effect.gen(function* () {
+      const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+      const result = yield* allocations.withClaimedTunnel(
+        {
+          userId: "user-1",
+          environmentId: "environment-1",
+          tunnelId: "tunnel-1",
+          generation: 7,
+        },
+        Effect.sync(() => {
+          operations.push("delete");
+          return true;
+        }),
+      );
+
+      expect(Option.getOrNull(result)).toBe(true);
+      expect(operations).toEqual(["transaction", "lock:update", "delete"]);
+    }).pipe(Effect.provide(layerWithDb(fakeDb)));
+  });
+
   it.effect("does not remove an allocation superseded after a deprovision claim", () => {
     const fakeDb = {
       delete: (table: unknown) => {
@@ -59,7 +341,7 @@ describe("ManagedEndpointAllocations", () => {
         yield* allocations.removeClaimed({
           userId: "user-1",
           environmentId: "environment-1",
-          updatedAt: "outdated-claim-generation",
+          generation: 7,
         }),
       ).toBe(false);
     }).pipe(Effect.provide(layerWithDb(fakeDb)));
diff --git a/infra/relay/src/environments/ManagedEndpointAllocations.ts b/infra/relay/src/environments/ManagedEndpointAllocations.ts
index a8b5ecde62c0..588333d3e15a 100644
--- a/infra/relay/src/environments/ManagedEndpointAllocations.ts
+++ b/infra/relay/src/environments/ManagedEndpointAllocations.ts
@@ -1,14 +1,17 @@
-import type { RelayManagedEndpoint } from "@t3tools/contracts/relay";
-import { and, eq } from "drizzle-orm";
+import type { RelayManagedEndpoint, RelayManagedEndpointOrigin } from "@t3tools/contracts/relay";
+import { and, eq, exists, inArray, isNull, sql } from "drizzle-orm";
+import { QueryBuilder } from "drizzle-orm/pg-core";
 import * as Context from "effect/Context";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
+import * as SqlError from "effect/unstable/sql/SqlError";
 
 import * as RelayDb from "../db.ts";
 import { isManagedEndpointHostname, managedEndpointForHostname } from "../deploymentConfig.ts";
-import { relayManagedEndpointAllocations } from "../persistence/schema.ts";
+import { relayEnvironmentLinks, relayManagedEndpointAllocations } from "../persistence/schema.ts";
 
 export interface ManagedEndpointAllocation {
   readonly userId: string;
@@ -18,13 +21,17 @@ export interface ManagedEndpointAllocation {
   readonly tunnelName: string;
   readonly dnsRecordId: string | null;
   readonly readyAt: string | null;
-  /**
-   * Doubles as the allocation's generation marker: every mutation rewrites it,
-   * so `claimRelease` can detect a provision that raced a release.
-   */
+  readonly origin: RelayManagedEndpointOrigin | null;
   readonly updatedAt: string;
+  readonly generation: number;
 }
 
+export interface ManagedEndpointTunnelAllocation extends ManagedEndpointAllocation {
+  readonly recoveryEnabled: boolean;
+}
+
+export const MANAGED_ENDPOINT_ALLOCATION_LOOKUP_BATCH_SIZE = 500;
+
 export function resolveReadyManagedEndpoint(input: {
   readonly allocation: ManagedEndpointAllocation;
   readonly baseDomain: string | undefined;
@@ -50,6 +57,9 @@ export class ManagedEndpointAllocationPersistenceError extends Schema.TaggedErro
       "record-tunnel",
       "record-dns",
       "mark-ready",
+      "enable-recovery",
+      "list-tunnels",
+      "lock-tunnel",
       "claim-release",
       "claim-deprovision",
       "remove",
@@ -82,23 +92,38 @@ interface ReserveManagedEndpointAllocationInput extends ManagedEndpointAllocatio
 
 interface RecordManagedEndpointTunnelInput extends ManagedEndpointAllocationKey {
   readonly tunnelId: string;
+  readonly generation: number;
 }
 
 interface RecordManagedEndpointDnsInput extends ManagedEndpointAllocationKey {
   readonly dnsRecordId: string;
+  readonly tunnelId: string;
+  readonly generation: number;
+}
+
+interface MarkManagedEndpointReadyInput extends ManagedEndpointAllocationKey {
+  readonly tunnelId: string;
+  readonly generation: number;
+  readonly origin: RelayManagedEndpointOrigin;
 }
 
 interface ClaimManagedEndpointReleaseInput extends ManagedEndpointAllocationKey {
   readonly tunnelId: string;
-  readonly updatedAt: string;
+  readonly generation: number;
+}
+
+interface EnableManagedEndpointRecoveryInput extends ManagedEndpointAllocationKey {
+  readonly tunnelId: string;
+  readonly environmentPublicKey: string;
+  readonly origin: RelayManagedEndpointOrigin;
 }
 
 interface ClaimManagedEndpointDeprovisionInput extends ManagedEndpointAllocationKey {
-  readonly updatedAt: string;
+  readonly generation: number;
 }
 
 interface RemoveClaimedManagedEndpointAllocationInput extends ManagedEndpointAllocationKey {
-  readonly updatedAt: string;
+  readonly generation: number;
 }
 
 export class ManagedEndpointAllocations extends Context.Service<
@@ -112,23 +137,36 @@ export class ManagedEndpointAllocations extends Context.Service<
     ) => Effect.Effect<ManagedEndpointAllocation, ManagedEndpointAllocationPersistenceError>;
     readonly recordTunnel: (
       input: RecordManagedEndpointTunnelInput,
-    ) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
+    ) => Effect.Effect<number | null, ManagedEndpointAllocationPersistenceError>;
     readonly recordDns: (
       input: RecordManagedEndpointDnsInput,
-    ) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
+    ) => Effect.Effect<number | null, ManagedEndpointAllocationPersistenceError>;
     readonly markReady: (
-      input: ManagedEndpointAllocationKey,
-    ) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
+      input: MarkManagedEndpointReadyInput,
+    ) => Effect.Effect<boolean, ManagedEndpointAllocationPersistenceError>;
+    readonly enableRecovery: (
+      input: EnableManagedEndpointRecoveryInput,
+    ) => Effect.Effect<boolean, ManagedEndpointAllocationPersistenceError>;
+    readonly listByTunnelNames: (
+      tunnelNames: ReadonlyArray<string>,
+    ) => Effect.Effect<
+      ReadonlyArray<ManagedEndpointTunnelAllocation>,
+      ManagedEndpointAllocationPersistenceError
+    >;
     /**
      * Atomically claims the right to delete the allocation's tunnel: succeeds
      * only while the recorded tunnel and generation still match what the
-     * caller loaded. A concurrent provision rewrites `updatedAt` when it
+     * caller loaded. A concurrent provision increments `generation` when it
      * records its tunnel, which makes a stale claim fail and keeps the freshly
      * issued tunnel alive.
      */
     readonly claimRelease: (
       input: ClaimManagedEndpointReleaseInput,
-    ) => Effect.Effect<boolean, ManagedEndpointAllocationPersistenceError>;
+    ) => Effect.Effect<number | null, ManagedEndpointAllocationPersistenceError>;
+    readonly withClaimedTunnel: <A, E, R>(
+      input: ClaimManagedEndpointReleaseInput,
+      effect: Effect.Effect<A, E, R>,
+    ) => Effect.Effect<Option.Option<A>, E | ManagedEndpointAllocationPersistenceError, R>;
     /**
      * Claims the complete allocation for teardown only if its generation still
      * matches the snapshot captured by the unlink operation.
@@ -138,7 +176,7 @@ export class ManagedEndpointAllocations extends Context.Service<
      */
     readonly claimDeprovision: (
       input: ClaimManagedEndpointDeprovisionInput,
-    ) => Effect.Effect<string | null, ManagedEndpointAllocationPersistenceError>;
+    ) => Effect.Effect<number | null, ManagedEndpointAllocationPersistenceError>;
     readonly remove: (
       input: ManagedEndpointAllocationKey,
     ) => Effect.Effect<void, ManagedEndpointAllocationPersistenceError>;
@@ -156,7 +194,9 @@ const allocationSelection = {
   tunnelName: relayManagedEndpointAllocations.tunnelName,
   dnsRecordId: relayManagedEndpointAllocations.dnsRecordId,
   readyAt: relayManagedEndpointAllocations.readyAt,
+  origin: relayManagedEndpointAllocations.origin,
   updatedAt: relayManagedEndpointAllocations.updatedAt,
+  generation: relayManagedEndpointAllocations.generation,
 };
 
 const whereAllocation = (input: ManagedEndpointAllocationKey) =>
@@ -248,14 +288,28 @@ export const make = Effect.gen(function* () {
     recordTunnel: Effect.fn("relay.managed_endpoint_allocations.record_tunnel")(function* (
       input: RecordManagedEndpointTunnelInput,
     ) {
-      yield* db
+      return yield* db
         .update(relayManagedEndpointAllocations)
         .set({
           tunnelId: input.tunnelId,
+          readyAt: sql`case when ${relayManagedEndpointAllocations.tunnelId} = ${input.tunnelId} then ${relayManagedEndpointAllocations.readyAt} else null end`,
+          origin: sql`case when ${relayManagedEndpointAllocations.tunnelId} = ${input.tunnelId} then ${relayManagedEndpointAllocations.origin} else null end`,
+          // Recovery registration is per tunnel: a replacement must register
+          // again before the reaper may treat it as recoverable.
+          recoveryEnabledAt: sql`case when ${relayManagedEndpointAllocations.tunnelId} = ${input.tunnelId} then ${relayManagedEndpointAllocations.recoveryEnabledAt} else null end`,
+          recoveryEnvironmentPublicKey: sql`case when ${relayManagedEndpointAllocations.tunnelId} = ${input.tunnelId} then ${relayManagedEndpointAllocations.recoveryEnvironmentPublicKey} else null end`,
           updatedAt: DateTime.formatIso(yield* DateTime.now),
+          generation: sql`${relayManagedEndpointAllocations.generation} + 1`,
         })
-        .where(whereAllocation(input))
+        .where(
+          and(
+            whereAllocation(input),
+            eq(relayManagedEndpointAllocations.generation, input.generation),
+          ),
+        )
+        .returning({ generation: relayManagedEndpointAllocations.generation })
         .pipe(
+          Effect.map((rows) => rows[0]?.generation ?? null),
           Effect.mapError(
             (cause) =>
               new ManagedEndpointAllocationPersistenceError({
@@ -270,14 +324,23 @@ export const make = Effect.gen(function* () {
     recordDns: Effect.fn("relay.managed_endpoint_allocations.record_dns")(function* (
       input: RecordManagedEndpointDnsInput,
     ) {
-      yield* db
+      return yield* db
         .update(relayManagedEndpointAllocations)
         .set({
           dnsRecordId: input.dnsRecordId,
           updatedAt: DateTime.formatIso(yield* DateTime.now),
+          generation: sql`${relayManagedEndpointAllocations.generation} + 1`,
         })
-        .where(whereAllocation(input))
+        .where(
+          and(
+            whereAllocation(input),
+            eq(relayManagedEndpointAllocations.tunnelId, input.tunnelId),
+            eq(relayManagedEndpointAllocations.generation, input.generation),
+          ),
+        )
+        .returning({ generation: relayManagedEndpointAllocations.generation })
         .pipe(
+          Effect.map((rows) => rows[0]?.generation ?? null),
           Effect.mapError(
             (cause) =>
               new ManagedEndpointAllocationPersistenceError({
@@ -290,17 +353,27 @@ export const make = Effect.gen(function* () {
         );
     }),
     markReady: Effect.fn("relay.managed_endpoint_allocations.mark_ready")(function* (
-      input: ManagedEndpointAllocationKey,
+      input: MarkManagedEndpointReadyInput,
     ) {
       const now = DateTime.formatIso(yield* DateTime.now);
-      yield* db
+      return yield* db
         .update(relayManagedEndpointAllocations)
         .set({
           readyAt: now,
+          origin: input.origin,
           updatedAt: now,
+          generation: sql`${relayManagedEndpointAllocations.generation} + 1`,
         })
-        .where(whereAllocation(input))
+        .where(
+          and(
+            whereAllocation(input),
+            eq(relayManagedEndpointAllocations.tunnelId, input.tunnelId),
+            eq(relayManagedEndpointAllocations.generation, input.generation),
+          ),
+        )
+        .returning({ environmentId: relayManagedEndpointAllocations.environmentId })
         .pipe(
+          Effect.map((rows) => rows.length > 0),
           Effect.mapError(
             (cause) =>
               new ManagedEndpointAllocationPersistenceError({
@@ -312,6 +385,124 @@ export const make = Effect.gen(function* () {
           ),
         );
     }),
+    enableRecovery: Effect.fn("relay.managed_endpoint_allocations.enable_recovery")(function* (
+      input: EnableManagedEndpointRecoveryInput,
+    ) {
+      const now = DateTime.formatIso(yield* DateTime.now);
+      return yield* db
+        .update(relayManagedEndpointAllocations)
+        .set({
+          recoveryEnabledAt: now,
+          recoveryEnvironmentPublicKey: input.environmentPublicKey,
+          updatedAt: now,
+          generation: sql`${relayManagedEndpointAllocations.generation} + 1`,
+        })
+        .where(
+          and(
+            whereAllocation(input),
+            eq(relayManagedEndpointAllocations.tunnelId, input.tunnelId),
+            eq(relayManagedEndpointAllocations.origin, input.origin),
+            exists(
+              new QueryBuilder()
+                .select({ userId: relayEnvironmentLinks.userId })
+                .from(relayEnvironmentLinks)
+                .where(
+                  and(
+                    eq(relayEnvironmentLinks.userId, input.userId),
+                    eq(relayEnvironmentLinks.environmentId, input.environmentId),
+                    eq(relayEnvironmentLinks.environmentPublicKey, input.environmentPublicKey),
+                    eq(relayEnvironmentLinks.endpointProviderKind, "cloudflare_tunnel"),
+                    isNull(relayEnvironmentLinks.revokedAt),
+                  ),
+                )
+                .for("update"),
+            ),
+          ),
+        )
+        .returning({ environmentId: relayManagedEndpointAllocations.environmentId })
+        .pipe(
+          Effect.map((rows) => rows.length > 0),
+          Effect.mapError(
+            (cause) =>
+              new ManagedEndpointAllocationPersistenceError({
+                operation: "enable-recovery",
+                stage: "database-request",
+                ...input,
+                cause,
+              }),
+          ),
+        );
+    }),
+    listByTunnelNames: Effect.fn("relay.managed_endpoint_allocations.list_by_tunnel_names")(
+      function* (tunnelNames: ReadonlyArray<string>) {
+        if (tunnelNames.length === 0) {
+          return [];
+        }
+        const batches = Array.from(
+          { length: Math.ceil(tunnelNames.length / MANAGED_ENDPOINT_ALLOCATION_LOOKUP_BATCH_SIZE) },
+          (_, index) =>
+            tunnelNames.slice(
+              index * MANAGED_ENDPOINT_ALLOCATION_LOOKUP_BATCH_SIZE,
+              (index + 1) * MANAGED_ENDPOINT_ALLOCATION_LOOKUP_BATCH_SIZE,
+            ),
+        );
+        const results = yield* Effect.forEach(
+          batches,
+          (batch) =>
+            db
+              .select({
+                ...allocationSelection,
+                recoveryEnabledAt: relayManagedEndpointAllocations.recoveryEnabledAt,
+                recoveryEnvironmentPublicKey:
+                  relayManagedEndpointAllocations.recoveryEnvironmentPublicKey,
+                linkedEnvironmentPublicKey: relayEnvironmentLinks.environmentPublicKey,
+              })
+              .from(relayManagedEndpointAllocations)
+              .leftJoin(
+                relayEnvironmentLinks,
+                and(
+                  eq(relayEnvironmentLinks.userId, relayManagedEndpointAllocations.userId),
+                  eq(
+                    relayEnvironmentLinks.environmentId,
+                    relayManagedEndpointAllocations.environmentId,
+                  ),
+                  isNull(relayEnvironmentLinks.revokedAt),
+                ),
+              )
+              .where(inArray(relayManagedEndpointAllocations.tunnelName, batch))
+              .pipe(
+                Effect.map((rows) =>
+                  rows.map(
+                    ({
+                      recoveryEnabledAt,
+                      recoveryEnvironmentPublicKey,
+                      linkedEnvironmentPublicKey,
+                      ...allocation
+                    }) => ({
+                      ...allocation,
+                      recoveryEnabled:
+                        recoveryEnabledAt !== null &&
+                        recoveryEnvironmentPublicKey !== null &&
+                        recoveryEnvironmentPublicKey === linkedEnvironmentPublicKey,
+                    }),
+                  ),
+                ),
+                Effect.mapError(
+                  (cause) =>
+                    new ManagedEndpointAllocationPersistenceError({
+                      operation: "list-tunnels",
+                      stage: "database-request",
+                      userId: "*",
+                      environmentId: "*",
+                      cause,
+                    }),
+                ),
+              ),
+          { concurrency: 1 },
+        );
+        return results.flat();
+      },
+    ),
     claimRelease: Effect.fn("relay.managed_endpoint_allocations.claim_release")(function* (
       input: ClaimManagedEndpointReleaseInput,
     ) {
@@ -319,17 +510,18 @@ export const make = Effect.gen(function* () {
         .update(relayManagedEndpointAllocations)
         .set({
           updatedAt: DateTime.formatIso(yield* DateTime.now),
+          generation: sql`${relayManagedEndpointAllocations.generation} + 1`,
         })
         .where(
           and(
             whereAllocation(input),
             eq(relayManagedEndpointAllocations.tunnelId, input.tunnelId),
-            eq(relayManagedEndpointAllocations.updatedAt, input.updatedAt),
+            eq(relayManagedEndpointAllocations.generation, input.generation),
           ),
         )
-        .returning({ userId: relayManagedEndpointAllocations.userId })
+        .returning({ generation: relayManagedEndpointAllocations.generation })
         .pipe(
-          Effect.map((rows) => rows.length > 0),
+          Effect.map((rows) => rows[0]?.generation ?? null),
           Effect.mapError(
             (cause) =>
               new ManagedEndpointAllocationPersistenceError({
@@ -344,22 +536,64 @@ export const make = Effect.gen(function* () {
         );
       return claimed;
     }),
+    withClaimedTunnel: Effect.fn("relay.managed_endpoint_allocations.with_claimed_tunnel")(
+      function* <A, E, R>(
+        input: ClaimManagedEndpointReleaseInput,
+        effect: Effect.Effect<A, E, R>,
+      ): Effect.fn.Return<Option.Option<A>, E | ManagedEndpointAllocationPersistenceError, R> {
+        const lockError = (cause: unknown) =>
+          new ManagedEndpointAllocationPersistenceError({
+            operation: "lock-tunnel",
+            stage: "database-request",
+            userId: input.userId,
+            environmentId: input.environmentId,
+            tunnelId: input.tunnelId,
+            cause,
+          });
+        return yield* db.$client
+          .withTransaction(
+            db
+              .select({ generation: relayManagedEndpointAllocations.generation })
+              .from(relayManagedEndpointAllocations)
+              .where(
+                and(
+                  whereAllocation(input),
+                  eq(relayManagedEndpointAllocations.tunnelId, input.tunnelId),
+                  eq(relayManagedEndpointAllocations.generation, input.generation),
+                ),
+              )
+              .limit(1)
+              .for("update")
+              .pipe(
+                Effect.mapError(lockError),
+                Effect.flatMap((rows) =>
+                  rows.length === 0 ? Effect.succeedNone : Effect.asSome(effect),
+                ),
+              ),
+          )
+          .pipe(
+            Effect.mapError((cause) => (SqlError.isSqlError(cause) ? lockError(cause) : cause)),
+          );
+      },
+    ),
     claimDeprovision: Effect.fn("relay.managed_endpoint_allocations.claim_deprovision")(function* (
       input: ClaimManagedEndpointDeprovisionInput,
     ) {
-      const claimedAt = DateTime.formatIso(yield* DateTime.now);
       const claimed = yield* db
         .update(relayManagedEndpointAllocations)
-        .set({ updatedAt: claimedAt })
+        .set({
+          updatedAt: DateTime.formatIso(yield* DateTime.now),
+          generation: sql`${relayManagedEndpointAllocations.generation} + 1`,
+        })
         .where(
           and(
             whereAllocation(input),
-            eq(relayManagedEndpointAllocations.updatedAt, input.updatedAt),
+            eq(relayManagedEndpointAllocations.generation, input.generation),
           ),
         )
-        .returning({ userId: relayManagedEndpointAllocations.userId })
+        .returning({ generation: relayManagedEndpointAllocations.generation })
         .pipe(
-          Effect.map((rows) => rows.length > 0),
+          Effect.map((rows) => rows[0]?.generation ?? null),
           Effect.mapError(
             (cause) =>
               new ManagedEndpointAllocationPersistenceError({
@@ -371,7 +605,7 @@ export const make = Effect.gen(function* () {
               }),
           ),
         );
-      return claimed ? claimedAt : null;
+      return claimed;
     }),
     remove: Effect.fn("relay.managed_endpoint_allocations.remove")(function* (
       input: ManagedEndpointAllocationKey,
@@ -399,7 +633,7 @@ export const make = Effect.gen(function* () {
         .where(
           and(
             whereAllocation(input),
-            eq(relayManagedEndpointAllocations.updatedAt, input.updatedAt),
+            eq(relayManagedEndpointAllocations.generation, input.generation),
           ),
         )
         .returning({ userId: relayManagedEndpointAllocations.userId })
diff --git a/infra/relay/src/environments/ManagedEndpointProvider.test.ts b/infra/relay/src/environments/ManagedEndpointProvider.test.ts
index 4d136658c8fd..d7cb7d67f9dd 100644
--- a/infra/relay/src/environments/ManagedEndpointProvider.test.ts
+++ b/infra/relay/src/environments/ManagedEndpointProvider.test.ts
@@ -33,7 +33,7 @@ const config = RelayConfiguration.RelayConfiguration.of({
 });
 
 interface TunnelCall {
-  readonly operation: "list" | "create" | "putConfiguration" | "getToken" | "delete";
+  readonly operation: "get" | "list" | "create" | "putConfiguration" | "getToken" | "delete";
   readonly input: unknown;
 }
 
@@ -62,6 +62,16 @@ function allocationKey(input: { readonly userId: string; readonly environmentId:
 
 function makeTunnelClient(calls: TunnelCall[] = []) {
   return ManagedEndpointProvider.ManagedEndpointTunnelClient.of({
+    get: (tunnelId) =>
+      Effect.sync(() => {
+        calls.push({ operation: "get", input: tunnelId });
+        return {
+          id: tunnelId,
+          name: "managed-tunnel",
+          status: "down",
+          connsInactiveAt: "2026-06-01T00:00:00.000Z",
+        };
+      }),
     list: (request) =>
       Effect.sync(() => {
         calls.push({ operation: "list", input: request });
@@ -91,6 +101,23 @@ function makeTunnelClient(calls: TunnelCall[] = []) {
 function makePersistentTunnelClient(calls: TunnelCall[] = []) {
   let tunnel: { readonly id: string; readonly name: string } | null = null;
   return ManagedEndpointProvider.ManagedEndpointTunnelClient.of({
+    get: (tunnelId) =>
+      Effect.suspend(() => {
+        calls.push({ operation: "get", input: tunnelId });
+        return tunnel === null
+          ? Effect.fail(
+              new ManagedEndpointProvider.ManagedEndpointTunnelClientError({
+                operation: "get",
+                tunnelId,
+                cause: { _tag: "NotFound" },
+              }),
+            )
+          : Effect.succeed({
+              ...tunnel,
+              status: "down",
+              connsInactiveAt: "2026-06-01T00:00:00.000Z",
+            });
+      }),
     list: (request) =>
       Effect.sync(() => {
         calls.push({ operation: "list", input: request });
@@ -159,6 +186,7 @@ function makeDnsClient(
 
 function makeAllocations(calls: AllocationCall[] = []) {
   const allocations = new Map<string, ManagedEndpointAllocations.ManagedEndpointAllocation>();
+  const recoveryEnabled = new Set<string>();
   let generation = 0;
   const mutate = (
     key: string,
@@ -168,7 +196,11 @@ function makeAllocations(calls: AllocationCall[] = []) {
   ) => {
     const allocation = allocations.get(key);
     if (allocation !== undefined) {
-      allocations.set(key, { ...change(allocation), updatedAt: `generation-${++generation}` });
+      allocations.set(key, {
+        ...change(allocation),
+        generation: allocation.generation + 1,
+        updatedAt: `generation-${++generation}`,
+      });
     }
   };
   return ManagedEndpointAllocations.ManagedEndpointAllocations.of({
@@ -185,7 +217,9 @@ function makeAllocations(calls: AllocationCall[] = []) {
           tunnelId: null,
           dnsRecordId: null,
           readyAt: null,
+          origin: null,
           updatedAt: `generation-${++generation}`,
+          generation: 0,
         };
         allocations.set(allocationKey(input), allocation);
         return allocation;
@@ -193,27 +227,62 @@ function makeAllocations(calls: AllocationCall[] = []) {
     recordTunnel: (input) =>
       Effect.sync(() => {
         calls.push({ operation: "recordTunnel", input });
+        const current = allocations.get(allocationKey(input));
+        if (current?.generation !== input.generation) {
+          return null;
+        }
         mutate(allocationKey(input), (allocation) => ({
           ...allocation,
           tunnelId: input.tunnelId,
+          readyAt: allocation.tunnelId === input.tunnelId ? allocation.readyAt : null,
         }));
+        return allocations.get(allocationKey(input))?.generation ?? null;
       }),
     recordDns: (input) =>
       Effect.sync(() => {
         calls.push({ operation: "recordDns", input });
+        const current = allocations.get(allocationKey(input));
+        if (current?.generation !== input.generation || current.tunnelId !== input.tunnelId) {
+          return null;
+        }
         mutate(allocationKey(input), (allocation) => ({
           ...allocation,
           dnsRecordId: input.dnsRecordId,
         }));
+        return allocations.get(allocationKey(input))?.generation ?? null;
       }),
     markReady: (input) =>
       Effect.sync(() => {
         calls.push({ operation: "markReady", input });
+        const current = allocations.get(allocationKey(input));
+        if (current?.generation !== input.generation || current.tunnelId !== input.tunnelId) {
+          return false;
+        }
         mutate(allocationKey(input), (allocation) => ({
           ...allocation,
           readyAt: "2026-06-02T00:00:00.000Z",
+          origin: input.origin,
         }));
+        return true;
+      }),
+    enableRecovery: (input) =>
+      Effect.sync(() => {
+        const allocation = allocations.get(allocationKey(input));
+        if (allocation?.tunnelId !== input.tunnelId) {
+          return false;
+        }
+        recoveryEnabled.add(allocationKey(input));
+        return true;
       }),
+    listByTunnelNames: (tunnelNames) =>
+      Effect.sync(() =>
+        [...allocations.values()]
+          .filter((allocation) => tunnelNames.includes(allocation.tunnelName))
+          .map((allocation) => ({
+            ...allocation,
+            recoveryEnabled: recoveryEnabled.has(allocationKey(allocation)),
+          })),
+      ),
     claimRelease: (input) =>
       Effect.sync(() => {
         calls.push({ operation: "claimRelease", input });
@@ -221,22 +290,29 @@ function makeAllocations(calls: AllocationCall[] = []) {
         if (
           allocation === undefined ||
           allocation.tunnelId !== input.tunnelId ||
-          allocation.updatedAt !== input.updatedAt
+          allocation.generation !== input.generation
         ) {
-          return false;
+          return null;
         }
         mutate(allocationKey(input), (current) => current);
-        return true;
+        return allocations.get(allocationKey(input))?.generation ?? null;
+      }),
+    withClaimedTunnel: (input, effect) =>
+      Effect.suspend(() => {
+        const current = allocations.get(allocationKey(input));
+        return current?.tunnelId === input.tunnelId && current.generation === input.generation
+          ? Effect.asSome(effect)
+          : Effect.succeedNone;
       }),
     claimDeprovision: (input) =>
       Effect.sync(() => {
         calls.push({ operation: "claimDeprovision", input });
         const allocation = allocations.get(allocationKey(input));
-        if (allocation === undefined || allocation.updatedAt !== input.updatedAt) {
+        if (allocation === undefined || allocation.generation !== input.generation) {
           return null;
         }
         mutate(allocationKey(input), (current) => current);
-        return allocations.get(allocationKey(input))?.updatedAt ?? null;
+        return allocations.get(allocationKey(input))?.generation ?? null;
       }),
     remove: (input) =>
       Effect.sync(() => {
@@ -247,7 +323,7 @@ function makeAllocations(calls: AllocationCall[] = []) {
       Effect.sync(() => {
         calls.push({ operation: "removeClaimed", input });
         const allocation = allocations.get(allocationKey(input));
-        if (allocation === undefined || allocation.updatedAt !== input.updatedAt) {
+        if (allocation === undefined || allocation.generation !== input.generation) {
           return false;
         }
         allocations.delete(allocationKey(input));
@@ -306,6 +382,7 @@ function expectedManagedTunnelName(environmentId: string, userId = "user_ABC"):
 describe("ManagedEndpointProvider", () => {
   it.effect("does not require the deployment RuntimeContext when building the Worker layer", () => {
     const tunnelClient = {
+      get: () => Effect.succeed({ id: "tunnel-id", name: "managed-tunnel" }),
       list: () => Effect.succeed({ result: [] }),
       create: (request: { readonly name: string }) =>
         Effect.succeed({ id: "tunnel-id", name: request.name }),
@@ -731,7 +808,8 @@ describe("ManagedEndpointProvider", () => {
         }).pipe(Effect.andThen(Effect.fail(failure))),
       deleteRecord: () => Effect.void,
     });
-    const layer = providerLayer(makePersistentTunnelClient(), dnsClient, makeAllocations());
+    const allocations = makeAllocations();
+    const layer = providerLayer(makePersistentTunnelClient(), dnsClient, allocations);
 
     return Effect.gen(function* () {
       const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
@@ -754,6 +832,10 @@ describe("ManagedEndpointProvider", () => {
         "createRecord",
         "updateRecord",
       ]);
+      expect(yield* allocations.get(request)).toMatchObject({
+        tunnelId: "tunnel-id",
+        readyAt: "2026-06-02T00:00:00.000Z",
+      });
     }).pipe(Effect.provide(layer));
   });
 
@@ -914,7 +996,7 @@ describe("ManagedEndpointProvider", () => {
     // longer matches what the release loaded, so the claim fails.
     const outdated = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
       ...allocations,
-      claimRelease: () => Effect.succeed(false),
+      claimRelease: () => Effect.succeed(null),
     });
     const layer = providerLayer(makePersistentTunnelClient(tunnelCalls), makeDnsClient(), outdated);
 
@@ -939,6 +1021,457 @@ describe("ManagedEndpointProvider", () => {
     }).pipe(Effect.provide(layer));
   });
 
+  it.effect("does not release a tunnel when the requested tunnel id is outdated", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const layer = providerLayer(
+      makePersistentTunnelClient(tunnelCalls),
+      makeDnsClient(),
+      makeAllocations(),
+    );
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+
+      expect(yield* provider.release({ ...key, expectedTunnelId: "old-tunnel-id" })).toBe(false);
+      expect(tunnelCalls.map((call) => call.operation)).not.toContain("delete");
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("keeps a tunnel when a provision replaces an ordinary release generation", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const allocations = makeAllocations();
+    let replaceAfterClaim = false;
+    const replaced = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+      ...allocations,
+      claimRelease: (input) =>
+        allocations.claimRelease(input).pipe(
+          Effect.tap((claimedGeneration) => {
+            if (claimedGeneration === null || replaceAfterClaim) return Effect.void;
+            replaceAfterClaim = true;
+            return allocations
+              .recordTunnel({
+                userId: input.userId,
+                environmentId: input.environmentId,
+                tunnelId: "replacement-tunnel",
+                generation: claimedGeneration,
+              })
+              .pipe(Effect.asVoid);
+          }),
+        ),
+    });
+    const layer = providerLayer(makePersistentTunnelClient(tunnelCalls), makeDnsClient(), replaced);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+
+      expect(yield* provider.release(key)).toBe(false);
+      expect(tunnelCalls.map((call) => call.operation)).not.toContain("delete");
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("does no Cloudflare work when the registered origin is unchanged", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const layer = providerLayer(makePersistentTunnelClient(tunnelCalls));
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      const origin = { localHttpHost: "127.0.0.1", localHttpPort: 3773 } as const;
+      const provisioned = yield* provider.provision({ ...key, origin });
+      tunnelCalls.length = 0;
+
+      expect(
+        yield* provider.reconcileOrigin({
+          ...key,
+          tunnelId: provisioned.runtime.tunnelId!,
+          origin,
+          endpoint: provisioned.endpoint,
+        }),
+      ).toBe("ready");
+      expect(tunnelCalls).toEqual([]);
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("updates Cloudflare ingress once when the registered port changes", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const layer = providerLayer(makePersistentTunnelClient(tunnelCalls));
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      const provisioned = yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+      tunnelCalls.length = 0;
+
+      expect(
+        yield* provider.reconcileOrigin({
+          ...key,
+          tunnelId: provisioned.runtime.tunnelId!,
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 4884 },
+          endpoint: provisioned.endpoint,
+        }),
+      ).toBe("ready");
+      expect(tunnelCalls).toEqual([
+        {
+          operation: "putConfiguration",
+          input: {
+            tunnelId: "tunnel-id",
+            tunnelConfig: {
+              ingress: [
+                {
+                  hostname: expectedManagedHostname("env_ABC"),
+                  service: "http://127.0.0.1:4884",
+                },
+                { service: "http_status:404" },
+              ],
+            },
+          },
+        },
+      ]);
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("requires recovery when Cloudflare reports the registered tunnel is missing", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const baseTunnelClient = makePersistentTunnelClient(tunnelCalls);
+    let tunnelMissing = false;
+    const tunnelClient = ManagedEndpointProvider.ManagedEndpointTunnelClient.of({
+      ...baseTunnelClient,
+      putConfiguration: (tunnelId, tunnelConfig) =>
+        tunnelMissing
+          ? Effect.fail(
+              new ManagedEndpointProvider.ManagedEndpointTunnelClientError({
+                operation: "put-configuration",
+                tunnelId,
+                cause: { _tag: "TunnelNotFound" },
+              }),
+            )
+          : baseTunnelClient.putConfiguration(tunnelId, tunnelConfig),
+    });
+    const layer = providerLayer(tunnelClient);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      const provisioned = yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+      tunnelMissing = true;
+
+      expect(
+        yield* provider.reconcileOrigin({
+          ...key,
+          tunnelId: provisioned.runtime.tunnelId!,
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 4884 },
+          endpoint: provisioned.endpoint,
+        }),
+      ).toBe("recovery_required");
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("fails origin sync when the allocation generation changes", () => {
+    const allocations = makeAllocations();
+    let loseClaim = false;
+    const changed = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+      ...allocations,
+      withClaimedTunnel: (input, effect) =>
+        loseClaim ? Effect.succeedNone : allocations.withClaimedTunnel(input, effect),
+    });
+    const layer = providerLayer(makePersistentTunnelClient(), makeDnsClient(), changed);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      const provisioned = yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+      loseClaim = true;
+
+      const error = yield* Effect.flip(
+        provider.reconcileOrigin({
+          ...key,
+          tunnelId: provisioned.runtime.tunnelId!,
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 4884 },
+          endpoint: provisioned.endpoint,
+        }),
+      );
+      expect(error).toMatchObject({
+        _tag: "ManagedEndpointProvisioningFailed",
+        stage: "sync-origin",
+      });
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("rejects an active endpoint that does not match the allocation hostname", () => {
+    const layer = providerLayer(makePersistentTunnelClient());
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      const provisioned = yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+
+      const error = yield* Effect.flip(
+        provider.reconcileOrigin({
+          ...key,
+          tunnelId: provisioned.runtime.tunnelId!,
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+          endpoint: {
+            ...provisioned.endpoint,
+            httpBaseUrl: "https://different-host.t3code.test/",
+          },
+        }),
+      );
+      expect(error).toMatchObject({
+        _tag: "ManagedEndpointProvisioningFailed",
+        stage: "verify-endpoint",
+      });
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect(
+    "keeps a newly created tunnel available for retry after losing its allocation claim",
+    () => {
+      const tunnelCalls: TunnelCall[] = [];
+      const allocations = makeAllocations();
+      let changeGeneration = true;
+      const changed = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+        ...allocations,
+        recordTunnel: (input) =>
+          Effect.gen(function* () {
+            if (changeGeneration) {
+              changeGeneration = false;
+              yield* allocations.claimDeprovision(input);
+            }
+            return yield* allocations.recordTunnel(input);
+          }),
+      });
+      const layer = providerLayer(
+        makePersistentTunnelClient(tunnelCalls),
+        makeDnsClient(),
+        changed,
+      );
+
+      return Effect.gen(function* () {
+        const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+        const input = {
+          userId: "user_ABC",
+          environmentId: "env_ABC",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        };
+        const error = yield* Effect.flip(provider.provision(input));
+
+        expect(error).toMatchObject({
+          _tag: "ManagedEndpointProvisioningFailed",
+          stage: "record-tunnel",
+        });
+        expect(tunnelCalls.map((call) => call.operation)).toEqual(["list", "create"]);
+        expect((yield* provider.provision(input)).runtime.tunnelId).toBe("tunnel-id");
+        expect(tunnelCalls.filter((call) => call.operation === "create")).toHaveLength(1);
+        expect(tunnelCalls.filter((call) => call.operation === "delete")).toEqual([]);
+      }).pipe(Effect.provide(layer));
+    },
+  );
+
+  it.effect("does not overwrite DNS when tunnel ownership changes during provisioning", () => {
+    const allocations = makeAllocations();
+    const changed = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+      ...allocations,
+      recordDns: () => Effect.succeed(null),
+    });
+    const layer = providerLayer(makePersistentTunnelClient(), makeDnsClient(), changed);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const error = yield* Effect.flip(
+        provider.provision({
+          userId: "user_ABC",
+          environmentId: "env_ABC",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+
+      expect(error).toMatchObject({
+        _tag: "ManagedEndpointProvisioningFailed",
+        stage: "record-dns",
+      });
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("does not change tunnel ingress after another provision takes ownership", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const allocations = makeAllocations();
+    const changed = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+      ...allocations,
+      withClaimedTunnel: () => Effect.succeedNone,
+    });
+    const layer = providerLayer(makePersistentTunnelClient(tunnelCalls), makeDnsClient(), changed);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const error = yield* Effect.flip(
+        provider.provision({
+          userId: "user_ABC",
+          environmentId: "env_ABC",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+
+      expect(error).toMatchObject({
+        _tag: "ManagedEndpointProvisioningFailed",
+        stage: "configure-tunnel",
+      });
+      expect(tunnelCalls.map((call) => call.operation)).not.toContain("putConfiguration");
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("does not change DNS after another provision takes ownership", () => {
+    const dnsCalls: DnsCall[] = [];
+    const allocations = makeAllocations();
+    let lockCount = 0;
+    const changed = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+      ...allocations,
+      withClaimedTunnel: (input, effect) =>
+        ++lockCount === 1 ? allocations.withClaimedTunnel(input, effect) : Effect.succeedNone,
+    });
+    const layer = providerLayer(makePersistentTunnelClient(), makeDnsClient(dnsCalls), changed);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const error = yield* Effect.flip(
+        provider.provision({
+          userId: "user_ABC",
+          environmentId: "env_ABC",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+
+      expect(error).toMatchObject({
+        _tag: "ManagedEndpointProvisioningFailed",
+        stage: "record-dns",
+      });
+      expect(dnsCalls).toEqual([]);
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("does not mark a superseded tunnel allocation as ready", () => {
+    const allocations = makeAllocations();
+    const changed = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+      ...allocations,
+      markReady: () => Effect.succeed(false),
+    });
+    const layer = providerLayer(makePersistentTunnelClient(), makeDnsClient(), changed);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const error = yield* Effect.flip(
+        provider.provision({
+          userId: "user_ABC",
+          environmentId: "env_ABC",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+
+      expect(error).toMatchObject({
+        _tag: "ManagedEndpointProvisioningFailed",
+        stage: "mark-allocation-ready",
+      });
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("keeps a tunnel that reconnects before scheduled deletion", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const tunnelClient = ManagedEndpointProvider.ManagedEndpointTunnelClient.of({
+      ...makePersistentTunnelClient(tunnelCalls),
+      get: (tunnelId) =>
+        Effect.succeed({
+          id: tunnelId,
+          name: expectedManagedTunnelName("env_ABC"),
+          status: "healthy",
+          connsInactiveAt: null,
+        }),
+    });
+    const layer = providerLayer(tunnelClient, makeDnsClient(), makeAllocations());
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+
+      expect(
+        yield* provider.release({
+          ...key,
+          expectedTunnelId: "tunnel-id",
+          expectedStatus: "down",
+          expectedInactiveBefore: "2026-06-01T00:05:00.000Z",
+        }),
+      ).toBe(false);
+      expect(tunnelCalls.map((call) => call.operation)).not.toContain("delete");
+    }).pipe(Effect.provide(layer));
+  });
+
+  it.effect("keeps a tunnel when a new provision replaces the release generation", () => {
+    const tunnelCalls: TunnelCall[] = [];
+    const allocations = makeAllocations();
+    const replaced = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+      ...allocations,
+      claimRelease: (input) =>
+        allocations.claimRelease(input).pipe(
+          Effect.tap((claimedGeneration) =>
+            claimedGeneration === null
+              ? Effect.void
+              : allocations
+                  .recordTunnel({
+                    userId: input.userId,
+                    environmentId: input.environmentId,
+                    tunnelId: "replacement-tunnel",
+                    generation: claimedGeneration,
+                  })
+                  .pipe(Effect.asVoid),
+          ),
+        ),
+    });
+    const layer = providerLayer(makePersistentTunnelClient(tunnelCalls), makeDnsClient(), replaced);
+
+    return Effect.gen(function* () {
+      const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+      const key = { userId: "user_ABC", environmentId: "env_ABC" } as const;
+      yield* provider.provision({
+        ...key,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+
+      expect(
+        yield* provider.release({
+          ...key,
+          expectedTunnelId: "tunnel-id",
+          expectedStatus: "down",
+          expectedInactiveBefore: "2026-06-01T00:05:00.000Z",
+        }),
+      ).toBe(false);
+      expect(tunnelCalls.map((call) => call.operation)).not.toContain("delete");
+    }).pipe(Effect.provide(layer));
+  });
+
   it.effect("treats an already deleted tunnel as successfully released", () => {
     const notFound = { _tag: "NotFound" } as const;
     const tunnelClient = ManagedEndpointProvider.ManagedEndpointTunnelClient.of({
diff --git a/infra/relay/src/environments/ManagedEndpointProvider.ts b/infra/relay/src/environments/ManagedEndpointProvider.ts
index 977568c2745c..892ac09a6e50 100644
--- a/infra/relay/src/environments/ManagedEndpointProvider.ts
+++ b/infra/relay/src/environments/ManagedEndpointProvider.ts
@@ -3,6 +3,7 @@ import * as Cloudflare from "alchemy/Cloudflare";
 import * as Arr from "effect/Array";
 import * as Context from "effect/Context";
 import * as Crypto from "effect/Crypto";
+import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Encoding from "effect/Encoding";
 import * as Layer from "effect/Layer";
@@ -52,6 +53,9 @@ const ManagedEndpointProvisioningStage = Schema.Literals([
   "record-dns",
   "get-tunnel-token",
   "mark-allocation-ready",
+  "load-allocation",
+  "verify-endpoint",
+  "sync-origin",
 ]);
 
 export class ManagedEndpointProvisioningFailed extends Schema.TaggedError<ManagedEndpointProvisioningFailed>()(
@@ -76,6 +80,7 @@ export class ManagedEndpointProvisioningFailed extends Schema.TaggedError<Manage
 
 const ManagedEndpointDeprovisioningStage = Schema.Literals([
   "load-allocation",
+  "load-tunnel",
   "claim-release",
   "claim-deprovision",
   "delete-dns-record",
@@ -124,6 +129,8 @@ export interface ManagedEndpointProvisioningResult {
   readonly runtime: RelayManagedEndpointRuntimeConfig;
 }
 
+export type ManagedEndpointOriginSyncResult = "ready" | "recovery_required";
+
 export type ManagedEndpointDeprovisionTarget = ManagedEndpointAllocations.ManagedEndpointAllocation;
 
 export class ManagedEndpointProvider extends Context.Service<
@@ -134,6 +141,13 @@ export class ManagedEndpointProvider extends Context.Service<
       readonly environmentId: string;
       readonly origin: RelayManagedEndpointOrigin;
     }) => Effect.Effect<ManagedEndpointProvisioningResult, ManagedEndpointProviderError>;
+    readonly reconcileOrigin: (input: {
+      readonly userId: string;
+      readonly environmentId: string;
+      readonly tunnelId: string;
+      readonly origin: RelayManagedEndpointOrigin;
+      readonly endpoint: RelayManagedEndpoint;
+    }) => Effect.Effect<ManagedEndpointOriginSyncResult, ManagedEndpointProviderError>;
     /**
      * Captures the allocation generation owned by an unlink before its link
      * revocation commits. Passing this target to `deprovision` prevents a
@@ -150,7 +164,7 @@ export class ManagedEndpointProvider extends Context.Service<
       readonly userId: string;
       readonly environmentId: string;
       readonly target?: ManagedEndpointDeprovisionTarget | null;
-    }) => Effect.Effect<void, ManagedEndpointDeprovisioningFailed>;
+    }) => Effect.Effect<boolean, ManagedEndpointDeprovisioningFailed>;
     /**
      * Deletes the provisioned Cloudflare tunnel while keeping the allocation
      * (hostname + tunnel name reservation) and DNS record. Cloudflare bills per
@@ -166,16 +180,34 @@ export class ManagedEndpointProvider extends Context.Service<
     readonly release: (input: {
       readonly userId: string;
       readonly environmentId: string;
+      readonly expectedTunnelId?: string;
+      readonly expectedInactiveBefore?: string;
+      readonly expectedStatus?: "inactive" | "down";
     }) => Effect.Effect<boolean, ManagedEndpointDeprovisioningFailed>;
   }
 >()("t3code-relay/environments/ManagedEndpointProvider") {}
 
-interface ManagedEndpointTunnel {
+export interface ManagedEndpointTunnel {
   readonly id?: string | null;
   readonly name?: string | null;
+  readonly status?: string | null;
+  readonly createdAt?: string | null;
+  readonly connsInactiveAt?: string | null;
+}
+
+export interface ManagedEndpointTunnelListRequest {
+  readonly isDeleted: false;
+  readonly name?: string;
+  readonly includePrefix?: string;
+  readonly status?: "inactive" | "down";
+  readonly existedAt?: string;
+  readonly wasInactiveAt?: string;
+  readonly page?: number;
+  readonly perPage?: number;
 }
 
 const ManagedEndpointTunnelClientOperation = Schema.Literals([
+  "get",
   "list",
   "create",
   "put-configuration",
@@ -201,11 +233,18 @@ export class ManagedEndpointTunnelClientError extends Schema.TaggedError<Managed
 export class ManagedEndpointTunnelClient extends Context.Service<
   ManagedEndpointTunnelClient,
   {
-    readonly list: (request: {
-      readonly name: string;
-      readonly isDeleted: false;
-    }) => Effect.Effect<
-      { readonly result: ReadonlyArray<ManagedEndpointTunnel> },
+    readonly get: (
+      tunnelId: string,
+    ) => Effect.Effect<ManagedEndpointTunnel, ManagedEndpointTunnelClientError>;
+    readonly list: (request: ManagedEndpointTunnelListRequest) => Effect.Effect<
+      {
+        readonly result: ReadonlyArray<ManagedEndpointTunnel>;
+        readonly resultInfo?: {
+          readonly page?: number | null;
+          readonly perPage?: number | null;
+          readonly totalCount?: number | null;
+        } | null;
+      },
       ManagedEndpointTunnelClientError
     >;
     readonly create: (request: {
@@ -333,17 +372,17 @@ function isLoopbackOrigin(origin: RelayManagedEndpointOrigin): boolean {
   );
 }
 
-function isNotFoundCause(cause: unknown): boolean {
+export function isManagedEndpointNotFound(cause: unknown): boolean {
   if (typeof cause !== "object" || cause === null) {
     return false;
   }
-  if ("_tag" in cause && cause._tag === "NotFound") {
+  if ("_tag" in cause && (cause._tag === "NotFound" || cause._tag === "TunnelNotFound")) {
     return true;
   }
   if ("status" in cause && cause.status === 404) {
     return true;
   }
-  return "cause" in cause && isNotFoundCause(cause.cause);
+  return "cause" in cause && isManagedEndpointNotFound(cause.cause);
 }
 
 type ManagedEndpointClientError = ManagedEndpointTunnelClientError | ManagedEndpointDnsClientError;
@@ -355,9 +394,9 @@ const ignoreNotFound = <A>(
     Effect.asVoid,
     Effect.catchTags({
       ManagedEndpointTunnelClientError: (error) =>
-        isNotFoundCause(error.cause) ? Effect.void : Effect.fail(error),
+        isManagedEndpointNotFound(error.cause) ? Effect.void : Effect.fail(error),
       ManagedEndpointDnsClientError: (error) =>
-        isNotFoundCause(error.cause) ? Effect.void : Effect.fail(error),
+        isManagedEndpointNotFound(error.cause) ? Effect.void : Effect.fail(error),
     }),
   );
 
@@ -399,7 +438,7 @@ export const make = Effect.gen(function* () {
           Effect.as(true),
           Effect.catchTags({
             ManagedEndpointDnsClientError: (error) =>
-              isNotFoundCause(error.cause) ? Effect.succeed(false) : Effect.fail(error),
+              isManagedEndpointNotFound(error.cause) ? Effect.succeed(false) : Effect.fail(error),
           }),
         );
       if (checkpointedRecordUpdated) {
@@ -432,8 +471,9 @@ export const make = Effect.gen(function* () {
                 ? updateExistingDnsRecords(records, preferredDnsRecordId, dnsRecord)
                 : Effect.fail(createError),
             ),
-            Effect.flatMap((dnsRecordId) =>
-              dnsRecordId === null ? Effect.fail(createError) : Effect.succeed(dnsRecordId),
+            Effect.filterOrFail(
+              (dnsRecordId) => dnsRecordId !== null,
+              () => createError,
             ),
           ),
       }),
@@ -455,8 +495,129 @@ export const make = Effect.gen(function* () {
     },
   );
 
+  const reconcileOrigin = Effect.fn("relay.managed_endpoint_provider.reconcile_origin")(
+    function* (input: {
+      readonly userId: string;
+      readonly environmentId: string;
+      readonly tunnelId: string;
+      readonly origin: RelayManagedEndpointOrigin;
+      readonly endpoint: RelayManagedEndpoint;
+    }) {
+      if (!isLoopbackOrigin(input.origin)) {
+        return yield* new ManagedEndpointOriginNotAllowed({
+          userId: input.userId,
+          environmentId: input.environmentId,
+          host: input.origin.localHttpHost,
+          port: input.origin.localHttpPort,
+        });
+      }
+      const allocation = yield* allocations.get(input).pipe(
+        Effect.mapError(
+          (cause) =>
+            new ManagedEndpointProvisioningFailed({
+              ...input,
+              stage: "load-allocation",
+              cause,
+            }),
+        ),
+      );
+      if (
+        allocation === null ||
+        allocation.tunnelId !== input.tunnelId ||
+        allocation.dnsRecordId === null ||
+        allocation.readyAt === null
+      ) {
+        return "recovery_required";
+      }
+      const cf = yield* requireCloudflareSettings(config, input);
+      const recordedEndpoint = ManagedEndpointAllocations.resolveReadyManagedEndpoint({
+        allocation,
+        baseDomain: cf.baseDomain,
+      });
+      if (
+        recordedEndpoint === null ||
+        recordedEndpoint.httpBaseUrl !== input.endpoint.httpBaseUrl ||
+        recordedEndpoint.wsBaseUrl !== input.endpoint.wsBaseUrl ||
+        recordedEndpoint.providerKind !== input.endpoint.providerKind
+      ) {
+        return yield* new ManagedEndpointProvisioningFailed({
+          ...input,
+          stage: "verify-endpoint",
+          hostname: allocation.hostname,
+        });
+      }
+      if (
+        allocation.origin?.localHttpHost === input.origin.localHttpHost &&
+        allocation.origin.localHttpPort === input.origin.localHttpPort
+      ) {
+        return "ready";
+      }
+
+      const updated = yield* allocations
+        .withClaimedTunnel(
+          {
+            userId: input.userId,
+            environmentId: input.environmentId,
+            tunnelId: input.tunnelId,
+            generation: allocation.generation,
+          },
+          tunnels
+            .putConfiguration(input.tunnelId, {
+              ingress: [
+                {
+                  hostname: allocation.hostname,
+                  service: formatOriginService(input.origin),
+                },
+                { service: "http_status:404" },
+              ],
+            })
+            .pipe(
+              Effect.as("configured" as const),
+              Effect.catchTags({
+                ManagedEndpointTunnelClientError: (error) =>
+                  isManagedEndpointNotFound(error.cause)
+                    ? Effect.succeed("missing" as const)
+                    : Effect.fail(error),
+              }),
+              Effect.filterOrElse(
+                (result): result is "missing" => result === "missing",
+                () =>
+                  allocations
+                    .markReady({
+                      ...input,
+                      generation: allocation.generation,
+                    })
+                    .pipe(
+                      Effect.map((updated) =>
+                        updated ? ("configured" as const) : ("stale" as const),
+                      ),
+                    ),
+              ),
+            ),
+        )
+        .pipe(
+          Effect.mapError(
+            (cause) =>
+              new ManagedEndpointProvisioningFailed({
+                ...input,
+                stage: "sync-origin",
+                cause,
+              }),
+          ),
+        );
+      if (Option.isNone(updated) || updated.value === "stale") {
+        return yield* new ManagedEndpointProvisioningFailed({
+          ...input,
+          stage: "sync-origin",
+        });
+      }
+      return updated.value === "configured" ? "ready" : "recovery_required";
+    },
+  );
+
   return ManagedEndpointProvider.of({
     prepareDeprovision,
+    reconcileOrigin,
     deprovision: Effect.fn("relay.managed_endpoint_provider.deprovision")(function* (input) {
       yield* Effect.annotateCurrentSpan({
         "relay.user_id": input.userId,
@@ -465,13 +626,13 @@ export const make = Effect.gen(function* () {
       const allocation =
         input.target === undefined ? yield* prepareDeprovision(input) : input.target;
       if (allocation === null) {
-        return;
+        return true;
       }
-      const claimedAt = yield* allocations
+      const claimedGeneration = yield* allocations
         .claimDeprovision({
           userId: input.userId,
           environmentId: input.environmentId,
-          updatedAt: allocation.updatedAt,
+          generation: allocation.generation,
         })
         .pipe(
           Effect.mapError(
@@ -485,55 +646,86 @@ export const make = Effect.gen(function* () {
               }),
           ),
         );
-      if (claimedAt === null) {
-        return;
-      }
-      const dnsRecordId = allocation.dnsRecordId;
-      if (dnsRecordId !== null) {
-        yield* ignoreNotFound(dns.deleteRecord(dnsRecordId)).pipe(
-          Effect.mapError(
-            (cause) =>
-              new ManagedEndpointDeprovisioningFailed({
-                ...input,
-                stage: "delete-dns-record",
-                dnsRecordId,
-                cause,
-              }),
-          ),
-        );
+      if (claimedGeneration === null) {
+        return false;
       }
       const tunnelId = allocation.tunnelId;
-      if (tunnelId !== null) {
-        yield* ignoreNotFound(tunnels.delete(tunnelId)).pipe(
-          Effect.mapError(
-            (cause) =>
-              new ManagedEndpointDeprovisioningFailed({
-                ...input,
-                stage: "delete-tunnel",
-                tunnelId,
-                cause,
-              }),
-          ),
-        );
+      const deprovision = Effect.gen(function* () {
+        const dnsRecordId = allocation.dnsRecordId;
+        if (dnsRecordId !== null) {
+          yield* ignoreNotFound(dns.deleteRecord(dnsRecordId)).pipe(
+            Effect.mapError(
+              (cause) =>
+                new ManagedEndpointDeprovisioningFailed({
+                  ...input,
+                  stage: "delete-dns-record",
+                  dnsRecordId,
+                  cause,
+                }),
+            ),
+          );
+        }
+        if (tunnelId !== null) {
+          yield* ignoreNotFound(tunnels.delete(tunnelId)).pipe(
+            Effect.mapError(
+              (cause) =>
+                new ManagedEndpointDeprovisioningFailed({
+                  ...input,
+                  stage: "delete-tunnel",
+                  tunnelId,
+                  cause,
+                }),
+            ),
+          );
+        }
+        return yield* allocations
+          .removeClaimed({
+            userId: input.userId,
+            environmentId: input.environmentId,
+            generation: claimedGeneration,
+          })
+          .pipe(
+            Effect.mapError(
+              (cause) =>
+                new ManagedEndpointDeprovisioningFailed({
+                  ...input,
+                  stage: "remove-allocation",
+                  ...(allocation.tunnelId === null ? {} : { tunnelId: allocation.tunnelId }),
+                  ...(allocation.dnsRecordId === null
+                    ? {}
+                    : { dnsRecordId: allocation.dnsRecordId }),
+                  cause,
+                }),
+            ),
+          );
+      });
+      if (tunnelId === null) {
+        return yield* deprovision;
       }
-      yield* allocations
-        .removeClaimed({
-          userId: input.userId,
-          environmentId: input.environmentId,
-          updatedAt: claimedAt,
-        })
+      const removed = yield* allocations
+        .withClaimedTunnel(
+          {
+            userId: input.userId,
+            environmentId: input.environmentId,
+            tunnelId,
+            generation: claimedGeneration,
+          },
+          deprovision,
+        )
         .pipe(
-          Effect.mapError(
-            (cause) =>
-              new ManagedEndpointDeprovisioningFailed({
-                ...input,
-                stage: "remove-allocation",
-                ...(allocation.tunnelId === null ? {} : { tunnelId: allocation.tunnelId }),
-                ...(allocation.dnsRecordId === null ? {} : { dnsRecordId: allocation.dnsRecordId }),
-                cause,
-              }),
-          ),
+          Effect.catchTags({
+            ManagedEndpointAllocationPersistenceError: (cause) =>
+              Effect.fail(
+                new ManagedEndpointDeprovisioningFailed({
+                  ...input,
+                  stage: "claim-deprovision",
+                  tunnelId,
+                  cause,
+                }),
+              ),
+          }),
         );
+      return Option.getOrElse(removed, () => false);
     }),
     release: Effect.fn("relay.managed_endpoint_provider.release")(function* (input) {
       yield* Effect.annotateCurrentSpan({
@@ -554,19 +746,22 @@ export const make = Effect.gen(function* () {
       if (allocation === null || tunnelId === null) {
         return true;
       }
+      if (input.expectedTunnelId !== undefined && input.expectedTunnelId !== tunnelId) {
+        return false;
+      }
       // Claim the release against the allocation's current generation before
       // touching Cloudflare. A provision racing this release (fast environment
-      // restart) rewrites updatedAt when it records its tunnel, so a stale
+      // restart) increments the generation when it records its tunnel, so a stale
       // claim means the recorded tunnel may already back a fresh connector and
       // must be left alive. A provision that starts after the claim instead
       // fails loudly on the deleted tunnel and the client-side retry
       // provisions a replacement.
-      const claimed = yield* allocations
+      const claimedGeneration = yield* allocations
         .claimRelease({
           userId: input.userId,
           environmentId: input.environmentId,
           tunnelId,
-          updatedAt: allocation.updatedAt,
+          generation: allocation.generation,
         })
         .pipe(
           Effect.mapError(
@@ -579,10 +774,10 @@ export const make = Effect.gen(function* () {
               }),
           ),
         );
-      if (!claimed) {
+      if (claimedGeneration === null) {
         return false;
       }
-      yield* ignoreNotFound(tunnels.delete(tunnelId)).pipe(
+      const deleteTunnel = ignoreNotFound(tunnels.delete(tunnelId)).pipe(
         Effect.mapError(
           (cause) =>
             new ManagedEndpointDeprovisioningFailed({
@@ -593,13 +788,103 @@ export const make = Effect.gen(function* () {
             }),
         ),
       );
+      if (input.expectedInactiveBefore !== undefined && input.expectedStatus !== undefined) {
+        const expectedStatus = input.expectedStatus;
+        const inactiveBefore = input.expectedInactiveBefore;
+        const currentTunnel = yield* tunnels.get(tunnelId).pipe(
+          Effect.asSome,
+          Effect.catchTags({
+            ManagedEndpointTunnelClientError: (cause) =>
+              isManagedEndpointNotFound(cause.cause)
+                ? Effect.succeedNone
+                : Effect.fail(
+                    new ManagedEndpointDeprovisioningFailed({
+                      ...input,
+                      stage: "load-tunnel",
+                      tunnelId,
+                      cause,
+                    }),
+                  ),
+          }),
+        );
+        if (Option.isNone(currentTunnel)) {
+          return true;
+        }
+        const inactiveAt =
+          expectedStatus === "down"
+            ? currentTunnel.value.connsInactiveAt
+            : currentTunnel.value.createdAt;
+        if (
+          currentTunnel.value.id !== tunnelId ||
+          currentTunnel.value.status !== expectedStatus ||
+          typeof inactiveAt !== "string"
+        ) {
+          return false;
+        }
+        const inactiveTime = DateTime.make(inactiveAt);
+        const cutoff = DateTime.make(inactiveBefore);
+        if (
+          Option.isNone(inactiveTime) ||
+          Option.isNone(cutoff) ||
+          inactiveTime.value.epochMilliseconds > cutoff.value.epochMilliseconds
+        ) {
+          return false;
+        }
+      }
+      const released = yield* allocations
+        .withClaimedTunnel(
+          {
+            userId: input.userId,
+            environmentId: input.environmentId,
+            tunnelId,
+            generation: claimedGeneration,
+          },
+          Effect.gen(function* () {
+            const finalGeneration = yield* allocations
+              .claimRelease({
+                userId: input.userId,
+                environmentId: input.environmentId,
+                tunnelId,
+                generation: claimedGeneration,
+              })
+              .pipe(
+                Effect.mapError(
+                  (cause) =>
+                    new ManagedEndpointDeprovisioningFailed({
+                      ...input,
+                      stage: "claim-release",
+                      tunnelId,
+                      cause,
+                    }),
+                ),
+              );
+            if (finalGeneration === null) {
+              return false;
+            }
+            yield* deleteTunnel;
+            return true;
+          }),
+        )
+        .pipe(
+          Effect.catchTags({
+            ManagedEndpointAllocationPersistenceError: (cause) =>
+              Effect.fail(
+                new ManagedEndpointDeprovisioningFailed({
+                  ...input,
+                  stage: "claim-release",
+                  tunnelId,
+                  cause,
+                }),
+              ),
+          }),
+        );
       // The recorded tunnelId is now stale, but the allocation row is left
       // untouched deliberately: connect/status authorization requires a fully
       // recorded allocation, and an offline environment must keep reporting
       // "offline" (health probe fails) rather than "not authorized". The next
       // provision lists tunnels by name, finds none, creates a replacement and
       // re-records the fresh id.
-      return true;
+      return Option.getOrElse(released, () => false);
     }),
     provision: Effect.fn("relay.managed_endpoint_provider.provision")(function* (input) {
       yield* Effect.annotateCurrentSpan({
@@ -717,11 +1002,12 @@ export const make = Effect.gen(function* () {
         });
       }
       const tunnel = { id: tunnelResponse.id, name: tunnelResponse.name };
-      yield* allocations
+      const tunnelGeneration = yield* allocations
         .recordTunnel({
           userId: input.userId,
           environmentId: input.environmentId,
           tunnelId: tunnel.id,
+          generation: allocation.generation,
         })
         .pipe(
           Effect.mapError(
@@ -737,31 +1023,78 @@ export const make = Effect.gen(function* () {
               }),
           ),
         );
+      if (tunnelGeneration === null) {
+        // A newer provision can adopt this tunnel by name at any point after
+        // our claim fails. Leave it available for that provision or a retry.
+        return yield* new ManagedEndpointProvisioningFailed({
+          userId: input.userId,
+          environmentId: input.environmentId,
+          stage: "record-tunnel",
+          hostname,
+          tunnelName,
+          tunnelId: tunnel.id,
+        });
+      }
 
-      yield* tunnels
-        .putConfiguration(tunnel.id, {
-          ingress: [
-            {
-              hostname,
-              service: formatOriginService(input.origin),
-            },
-            { service: "http_status:404" },
-          ],
-        })
+      const configured = yield* allocations
+        .withClaimedTunnel(
+          {
+            userId: input.userId,
+            environmentId: input.environmentId,
+            tunnelId: tunnel.id,
+            generation: tunnelGeneration,
+          },
+          tunnels
+            .putConfiguration(tunnel.id, {
+              ingress: [
+                {
+                  hostname,
+                  service: formatOriginService(input.origin),
+                },
+                { service: "http_status:404" },
+              ],
+            })
+            .pipe(
+              Effect.mapError(
+                (cause) =>
+                  new ManagedEndpointProvisioningFailed({
+                    userId: input.userId,
+                    environmentId: input.environmentId,
+                    stage: "configure-tunnel",
+                    hostname,
+                    tunnelName,
+                    tunnelId: tunnel.id,
+                    cause,
+                  }),
+              ),
+            ),
+        )
         .pipe(
-          Effect.mapError(
-            (cause) =>
-              new ManagedEndpointProvisioningFailed({
-                userId: input.userId,
-                environmentId: input.environmentId,
-                stage: "configure-tunnel",
-                hostname,
-                tunnelName,
-                tunnelId: tunnel.id,
-                cause,
-              }),
-          ),
+          Effect.catchTags({
+            ManagedEndpointAllocationPersistenceError: (cause) =>
+              Effect.fail(
+                new ManagedEndpointProvisioningFailed({
+                  userId: input.userId,
+                  environmentId: input.environmentId,
+                  stage: "configure-tunnel",
+                  hostname,
+                  tunnelName,
+                  tunnelId: tunnel.id,
+                  cause,
+                }),
+              ),
+          }),
         );
+      if (Option.isNone(configured)) {
+        return yield* new ManagedEndpointProvisioningFailed({
+          userId: input.userId,
+          environmentId: input.environmentId,
+          stage: "configure-tunnel",
+          hostname,
+          tunnelName,
+          tunnelId: tunnel.id,
+        });
+      }
 
       const dnsRecord = {
         type: "CNAME",
@@ -771,31 +1104,61 @@ export const make = Effect.gen(function* () {
         proxied: true,
       } as const;
 
-      const dnsRecordId = yield* ensureDnsRecord(hostname, allocation.dnsRecordId, dnsRecord).pipe(
-        Effect.mapError(
-          (cause) =>
-            new ManagedEndpointProvisioningFailed({
-              userId: input.userId,
-              environmentId: input.environmentId,
-              stage: "ensure-dns-record",
+      const recordedDns = yield* allocations
+        .withClaimedTunnel(
+          {
+            userId: input.userId,
+            environmentId: input.environmentId,
+            tunnelId: tunnel.id,
+            generation: tunnelGeneration,
+          },
+          Effect.gen(function* () {
+            const dnsRecordId = yield* ensureDnsRecord(
               hostname,
-              tunnelName,
-              tunnelId: tunnel.id,
-              ...(allocation.dnsRecordId === null ? {} : { dnsRecordId: allocation.dnsRecordId }),
-              cause,
-            }),
-        ),
-      );
-      yield* allocations
-        .recordDns({
-          userId: input.userId,
-          environmentId: input.environmentId,
-          dnsRecordId,
-        })
-        .pipe(
-          Effect.mapError(
-            (cause) =>
-              new ManagedEndpointProvisioningFailed({
+              allocation.dnsRecordId,
+              dnsRecord,
+            ).pipe(
+              Effect.mapError(
+                (cause) =>
+                  new ManagedEndpointProvisioningFailed({
+                    userId: input.userId,
+                    environmentId: input.environmentId,
+                    stage: "ensure-dns-record",
+                    hostname,
+                    tunnelName,
+                    tunnelId: tunnel.id,
+                    ...(allocation.dnsRecordId === null
+                      ? {}
+                      : { dnsRecordId: allocation.dnsRecordId }),
+                    cause,
+                  }),
+              ),
+            );
+            const dnsGeneration = yield* allocations
+              .recordDns({
+                userId: input.userId,
+                environmentId: input.environmentId,
+                dnsRecordId,
+                tunnelId: tunnel.id,
+                generation: tunnelGeneration,
+              })
+              .pipe(
+                Effect.mapError(
+                  (cause) =>
+                    new ManagedEndpointProvisioningFailed({
+                      userId: input.userId,
+                      environmentId: input.environmentId,
+                      stage: "record-dns",
+                      hostname,
+                      tunnelName,
+                      tunnelId: tunnel.id,
+                      dnsRecordId,
+                      cause,
+                    }),
+                ),
+              );
+            if (dnsGeneration === null) {
+              return yield* new ManagedEndpointProvisioningFailed({
                 userId: input.userId,
                 environmentId: input.environmentId,
                 stage: "record-dns",
@@ -803,10 +1166,38 @@ export const make = Effect.gen(function* () {
                 tunnelName,
                 tunnelId: tunnel.id,
                 dnsRecordId,
-                cause,
-              }),
-          ),
+              });
+            }
+            return { dnsRecordId, dnsGeneration };
+          }),
+        )
+        .pipe(
+          Effect.catchTags({
+            ManagedEndpointAllocationPersistenceError: (cause) =>
+              Effect.fail(
+                new ManagedEndpointProvisioningFailed({
+                  userId: input.userId,
+                  environmentId: input.environmentId,
+                  stage: "record-dns",
+                  hostname,
+                  tunnelName,
+                  tunnelId: tunnel.id,
+                  cause,
+                }),
+              ),
+          }),
         );
+      if (Option.isNone(recordedDns)) {
+        return yield* new ManagedEndpointProvisioningFailed({
+          userId: input.userId,
+          environmentId: input.environmentId,
+          stage: "record-dns",
+          hostname,
+          tunnelName,
+          tunnelId: tunnel.id,
+        });
+      }
+      const { dnsRecordId, dnsGeneration } = recordedDns.value;
 
       const connectorToken = yield* tunnels.getToken(tunnel.id).pipe(
         Effect.mapError(
@@ -823,10 +1214,13 @@ export const make = Effect.gen(function* () {
             }),
         ),
       );
-      yield* allocations
+      const ready = yield* allocations
         .markReady({
           userId: input.userId,
           environmentId: input.environmentId,
+          tunnelId: tunnel.id,
+          generation: dnsGeneration,
+          origin: input.origin,
         })
         .pipe(
           Effect.mapError(
@@ -843,6 +1237,17 @@ export const make = Effect.gen(function* () {
               }),
           ),
         );
+      if (!ready) {
+        return yield* new ManagedEndpointProvisioningFailed({
+          userId: input.userId,
+          environmentId: input.environmentId,
+          stage: "mark-allocation-ready",
+          hostname,
+          tunnelName,
+          tunnelId: tunnel.id,
+          dnsRecordId,
+        });
+      }
 
       return {
         endpoint: managedEndpointForHostname(hostname),
@@ -865,16 +1270,30 @@ export const layerCloudflareBindings = (
   alchemyRuntimeContext: Alchemy.BaseRuntimeContext,
 ) =>
   layer.pipe(
-    Layer.provide(
+    Layer.provideMerge(
       Layer.mergeAll(
         layerTunnelClient({
+          get: (tunnelId) =>
+            tunnelClient.get(tunnelId).pipe(
+              Effect.timeout("8 seconds"),
+              Effect.mapError(
+                (cause) =>
+                  new ManagedEndpointTunnelClientError({
+                    operation: "get",
+                    tunnelId,
+                    cause,
+                  }),
+              ),
+              Effect.provideService(Alchemy.RuntimeContext, alchemyRuntimeContext),
+            ),
           list: (request) =>
             tunnelClient.list(request).pipe(
+              Effect.timeout("8 seconds"),
               Effect.mapError(
                 (cause) =>
                   new ManagedEndpointTunnelClientError({
                     operation: "list",
-                    tunnelName: request.name,
+                    ...(request.name === undefined ? {} : { tunnelName: request.name }),
                     cause,
                   }),
               ),
@@ -882,6 +1301,7 @@ export const layerCloudflareBindings = (
             ),
           create: (request) =>
             tunnelClient.create(request).pipe(
+              Effect.timeout("8 seconds"),
               Effect.mapError(
                 (cause) =>
                   new ManagedEndpointTunnelClientError({
@@ -894,6 +1314,7 @@ export const layerCloudflareBindings = (
             ),
           putConfiguration: (tunnelId, config) =>
             tunnelClient.putConfiguration(tunnelId, config).pipe(
+              Effect.timeout("8 seconds"),
               Effect.mapError(
                 (cause) =>
                   new ManagedEndpointTunnelClientError({
@@ -906,6 +1327,7 @@ export const layerCloudflareBindings = (
             ),
           getToken: (tunnelId) =>
             tunnelClient.getToken(tunnelId).pipe(
+              Effect.timeout("8 seconds"),
               Effect.mapError(
                 (cause) =>
                   new ManagedEndpointTunnelClientError({
@@ -918,6 +1340,7 @@ export const layerCloudflareBindings = (
             ),
           delete: (tunnelId) =>
             tunnelClient.delete(tunnelId).pipe(
+              Effect.timeout("8 seconds"),
               Effect.mapError(
                 (cause) =>
                   new ManagedEndpointTunnelClientError({
@@ -932,6 +1355,7 @@ export const layerCloudflareBindings = (
         layerDnsClient({
           listRecords: (hostname) =>
             dnsClient.listDnsRecords({ search: hostname }).pipe(
+              Effect.timeout("8 seconds"),
               Effect.map((response) =>
                 response.result.filter(
                   (record): record is typeof record & { readonly id: string } =>
@@ -951,6 +1375,7 @@ export const layerCloudflareBindings = (
             ),
           createRecord: (request) =>
             dnsClient.createDnsRecord(request).pipe(
+              Effect.timeout("8 seconds"),
               Effect.map((response) => ({ id: response.id })),
               Effect.mapError(
                 (cause) =>
@@ -964,6 +1389,7 @@ export const layerCloudflareBindings = (
             ),
           updateRecord: (dnsRecordId, request) =>
             dnsClient.updateDnsRecord(dnsRecordId, request).pipe(
+              Effect.timeout("8 seconds"),
               Effect.mapError(
                 (cause) =>
                   new ManagedEndpointDnsClientError({
@@ -977,6 +1403,7 @@ export const layerCloudflareBindings = (
             ),
           deleteRecord: (dnsRecordId) =>
             dnsClient.deleteDnsRecord(dnsRecordId).pipe(
+              Effect.timeout("8 seconds"),
               Effect.mapError(
                 (cause) =>
                   new ManagedEndpointDnsClientError({
diff --git a/infra/relay/src/environments/ManagedEndpointReaper.test.ts b/infra/relay/src/environments/ManagedEndpointReaper.test.ts
new file mode 100644
index 000000000000..9a2d62e36067
--- /dev/null
+++ b/infra/relay/src/environments/ManagedEndpointReaper.test.ts
@@ -0,0 +1,810 @@
+import { describe, expect, it } from "@effect/vitest";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Redacted from "effect/Redacted";
+import * as TestClock from "effect/testing/TestClock";
+import * as Tracer from "effect/Tracer";
+
+import * as RelayConfiguration from "../Config.ts";
+import * as ManagedEndpointAllocations from "./ManagedEndpointAllocations.ts";
+import * as ManagedEndpointProvider from "./ManagedEndpointProvider.ts";
+import * as ManagedEndpointReaper from "./ManagedEndpointReaper.ts";
+
+const NOW = "2026-08-25T12:00:00.000Z";
+const NOW_MILLIS = DateTime.makeUnsafe(NOW).epochMilliseconds;
+const PREFIX = "t3coderelay-managedendpoint-prod-";
+
+function tunnel(input: {
+  readonly id: string;
+  readonly suffix: string;
+  readonly status: "down" | "inactive" | "healthy" | "degraded";
+  readonly timestamp?: string | null;
+  readonly prefix?: string;
+}): ManagedEndpointProvider.ManagedEndpointTunnel {
+  return {
+    id: input.id,
+    name: `${input.prefix ?? PREFIX}${input.suffix}`,
+    status: input.status,
+    ...(input.timestamp === undefined
+      ? {}
+      : input.status === "inactive"
+        ? { createdAt: input.timestamp }
+        : { connsInactiveAt: input.timestamp }),
+  };
+}
+
+function recoverableOwners(
+  tunnels: ReadonlyArray<ManagedEndpointProvider.ManagedEndpointTunnel>,
+): ReadonlyArray<ManagedEndpointAllocations.ManagedEndpointTunnelAllocation> {
+  return tunnels.map((entry) => allocation({ tunnelId: entry.id!, recoveryEnabled: true }));
+}
+
+function allocation(input: {
+  readonly tunnelId: string | null;
+  readonly recoveryEnabled: boolean;
+}): ManagedEndpointAllocations.ManagedEndpointTunnelAllocation {
+  return {
+    userId: "user-1",
+    environmentId: `environment-${input.tunnelId ?? "pending"}`,
+    hostname: `${input.tunnelId ?? "pending"}.example.test`,
+    tunnelId: input.tunnelId,
+    tunnelName: `${PREFIX}aaaaaaaaaaaaaaaa`,
+    dnsRecordId: "dns-1",
+    readyAt: "2026-08-25T11:00:00.000Z",
+    origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+    updatedAt: "2026-08-25T11:00:00.000Z",
+    generation: 1,
+    recoveryEnabled: input.recoveryEnabled,
+  };
+}
+
+function harness(input?: {
+  readonly tunnels?: ReadonlyArray<ManagedEndpointProvider.ManagedEndpointTunnel>;
+  readonly allocations?: ReadonlyArray<ManagedEndpointAllocations.ManagedEndpointTunnelAllocation>;
+  readonly namespace?: string;
+  readonly failTunnelId?: string;
+  readonly rateLimitedTunnelId?: string;
+  readonly failAllDeletes?: boolean;
+  readonly failDeleteWhen?: (tunnelId: string) => boolean;
+  readonly missingOnDeleteTunnelId?: string;
+  readonly missingOnGetTunnelId?: string;
+  readonly reserveOnGetTunnelId?: string;
+  readonly refreshedTunnels?: ReadonlyMap<string, ManagedEndpointProvider.ManagedEndpointTunnel>;
+  readonly skipTunnelId?: string;
+  readonly cleanupMode?: RelayConfiguration.ManagedEndpointCleanupMode;
+}) {
+  const listRequests: ManagedEndpointProvider.ManagedEndpointTunnelListRequest[] = [];
+  const deleted: string[] = [];
+  const releases: Array<
+    Parameters<ManagedEndpointProvider.ManagedEndpointProvider["Service"]["release"]>[0]
+  > = [];
+  const remaining = [...(input?.tunnels ?? [])];
+  const recorded = (input?.allocations ?? []).map((entry) => {
+    const matching = remaining.find((candidate) => candidate.id === entry.tunnelId);
+    return typeof matching?.name === "string" ? { ...entry, tunnelName: matching.name } : entry;
+  });
+  const tunnelClient = ManagedEndpointProvider.ManagedEndpointTunnelClient.of({
+    get: (tunnelId) =>
+      Effect.suspend(() => {
+        if (tunnelId === input?.missingOnGetTunnelId) {
+          return Effect.fail(
+            new ManagedEndpointProvider.ManagedEndpointTunnelClientError({
+              operation: "get",
+              tunnelId,
+              cause: { _tag: "NotFound" },
+            }),
+          );
+        }
+        const found =
+          input?.refreshedTunnels?.get(tunnelId) ??
+          remaining.find((candidate) => candidate.id === tunnelId);
+        if (found === undefined) {
+          return Effect.fail(
+            new ManagedEndpointProvider.ManagedEndpointTunnelClientError({
+              operation: "get",
+              tunnelId,
+              cause: { _tag: "NotFound" },
+            }),
+          );
+        }
+        if (tunnelId === input?.reserveOnGetTunnelId && typeof found.name === "string") {
+          recorded.push({
+            ...allocation({ tunnelId, recoveryEnabled: false }),
+            tunnelName: found.name,
+          });
+        }
+        return Effect.succeed(found);
+      }),
+    list: (request) =>
+      Effect.sync(() => {
+        listRequests.push(request);
+        const matching = remaining.filter((entry) => entry.status === request.status);
+        const start = ((request.page ?? 1) - 1) * (request.perPage ?? 100);
+        return {
+          result: matching.slice(start, start + (request.perPage ?? 100)),
+          resultInfo: {
+            page: request.page ?? 1,
+            perPage: request.perPage ?? 100,
+            totalCount: matching.length,
+          },
+        };
+      }),
+    create: () => Effect.die("unused"),
+    putConfiguration: () => Effect.die("unused"),
+    getToken: () => Effect.die("unused"),
+    delete: (tunnelId) =>
+      input?.failAllDeletes === true ||
+      input?.failDeleteWhen?.(tunnelId) === true ||
+      tunnelId === input?.failTunnelId ||
+      tunnelId === input?.rateLimitedTunnelId ||
+      tunnelId === input?.missingOnDeleteTunnelId
+        ? Effect.fail(
+            new ManagedEndpointProvider.ManagedEndpointTunnelClientError({
+              operation: "delete",
+              tunnelId,
+              cause:
+                tunnelId === input?.missingOnDeleteTunnelId
+                  ? { _tag: "NotFound" }
+                  : tunnelId === input?.rateLimitedTunnelId
+                    ? {
+                        cause: {
+                          _tag: "TooManyRequests",
+                          message: "Cloudflare rate limit exceeded",
+                          retryAfter: 60,
+                        },
+                      }
+                    : "Cloudflare refused the deletion",
+            }),
+          )
+        : Effect.sync(() => {
+            deleted.push(tunnelId);
+            const index = remaining.findIndex((candidate) => candidate.id === tunnelId);
+            if (index !== -1) {
+              remaining.splice(index, 1);
+            }
+          }),
+  });
+  const allocationService = ManagedEndpointAllocations.ManagedEndpointAllocations.of({
+    get: () => Effect.die("unused"),
+    reserve: () => Effect.die("unused"),
+    recordTunnel: () => Effect.die("unused"),
+    recordDns: () => Effect.die("unused"),
+    markReady: () => Effect.die("unused"),
+    enableRecovery: () => Effect.die("unused"),
+    listByTunnelNames: (tunnelNames) =>
+      Effect.succeed(recorded.filter((entry) => tunnelNames.includes(entry.tunnelName))),
+    claimRelease: () => Effect.die("unused"),
+    withClaimedTunnel: () => Effect.die("unused"),
+    claimDeprovision: () => Effect.die("unused"),
+    remove: () => Effect.die("unused"),
+    removeClaimed: () => Effect.die("unused"),
+  });
+  const provider = ManagedEndpointProvider.ManagedEndpointProvider.of({
+    provision: () => Effect.die("unused"),
+    reconcileOrigin: () => Effect.die("unused"),
+    prepareDeprovision: () => Effect.die("unused"),
+    deprovision: () => Effect.die("unused"),
+    release: (request) =>
+      Effect.gen(function* () {
+        releases.push(request);
+        if (request.expectedTunnelId === input?.skipTunnelId) {
+          return false;
+        }
+        if (request.expectedTunnelId !== undefined) {
+          // Surface Cloudflare failures the same way the real release does.
+          yield* tunnelClient.delete(request.expectedTunnelId).pipe(
+            Effect.mapError(
+              (cause) =>
+                new ManagedEndpointProvider.ManagedEndpointDeprovisioningFailed({
+                  stage: "delete-tunnel",
+                  userId: request.userId,
+                  environmentId: request.environmentId,
+                  tunnelId: request.expectedTunnelId!,
+                  cause,
+                }),
+            ),
+          );
+        }
+        return true;
+      }),
+  });
+  const config = RelayConfiguration.RelayConfiguration.of({
+    relayIssuer: "https://relay.example.test",
+    apns: {
+      environment: "sandbox",
+      teamId: "team-id",
+      keyId: "key-id",
+      privateKey: Redacted.make("private-key"),
+      bundleId: "com.t3tools.t3code.dev",
+    },
+    apnsDeliveryJobSigningSecret: Redacted.make("job-secret"),
+    clerkSecretKey: Redacted.make("clerk-secret"),
+    clerkPublishableKey: "pk_test_test",
+    clerkJwtAudience: "t3-code-relay",
+    cloudMintPrivateKey: Redacted.make("cloud-private-key"),
+    cloudMintPublicKey: "cloud-public-key",
+    managedEndpointBaseDomain: "example.test",
+    managedEndpointNamespace: input?.namespace ?? "prod",
+    managedEndpointCleanupMode: input?.cleanupMode ?? "enabled",
+  });
+
+  return {
+    listRequests,
+    deleted,
+    releases,
+    layer: ManagedEndpointReaper.layer.pipe(
+      Layer.provide(
+        Layer.mergeAll(
+          RelayConfiguration.layer(config),
+          ManagedEndpointProvider.layerTunnelClient(tunnelClient),
+          Layer.succeed(ManagedEndpointProvider.ManagedEndpointProvider, provider),
+          Layer.succeed(ManagedEndpointAllocations.ManagedEndpointAllocations, allocationService),
+        ),
+      ),
+    ),
+  };
+}
+
+describe("ManagedEndpointReaper", () => {
+  it.effect("removes expired down and inactive tunnels from recoverable environments", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "down-1",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "down",
+          timestamp: "2026-08-25T11:55:00.000Z",
+        }),
+        tunnel({
+          id: "inactive-1",
+          suffix: "bbbbbbbbbbbbbbbb",
+          status: "inactive",
+          timestamp: "2026-08-25T10:59:00.000Z",
+        }),
+      ],
+      allocations: [
+        allocation({ tunnelId: "down-1", recoveryEnabled: true }),
+        allocation({ tunnelId: "inactive-1", recoveryEnabled: true }),
+      ],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        scanned: 2,
+        deleted: 2,
+        skippedLegacy: 0,
+        failed: 0,
+      });
+      expect(state.deleted).toEqual(["down-1", "inactive-1"]);
+      expect(state.releases.map((request) => request.expectedTunnelId)).toEqual([
+        "down-1",
+        "inactive-1",
+      ]);
+      expect(state.listRequests).toEqual([
+        {
+          isDeleted: false,
+          includePrefix: PREFIX,
+          status: "down",
+          existedAt: "2026-08-25T11:55:00.000Z",
+          wasInactiveAt: "2026-08-25T11:55:00.000Z",
+          page: 1,
+          perPage: 100,
+        },
+        {
+          isDeleted: false,
+          includePrefix: PREFIX,
+          status: "inactive",
+          existedAt: "2026-08-25T11:00:00.000Z",
+          page: 1,
+          perPage: 100,
+        },
+      ]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("keeps a tunnel that never connected until it is an hour old", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "pairing",
+          suffix: "cccccccccccccccc",
+          status: "inactive",
+          timestamp: "2026-08-25T11:30:00.000Z",
+        }),
+      ],
+      allocations: [allocation({ tunnelId: "pairing", recoveryEnabled: true })],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect((yield* reaper.sweep).deleted).toBe(0);
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("keeps recent tunnels, other stages, and tunnels without valid timestamps", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "recent",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "down",
+          timestamp: "2026-08-25T11:55:01.000Z",
+        }),
+        tunnel({
+          id: "other-stage",
+          prefix: `${PREFIX}julius-`,
+          suffix: "bbbbbbbbbbbbbbbb",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+        tunnel({
+          id: "missing-time",
+          suffix: "cccccccccccccccc",
+          status: "inactive",
+          timestamp: null,
+        }),
+      ],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        scanned: 0,
+        deleted: 0,
+        skippedLegacy: 0,
+        failed: 0,
+      });
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("keeps tunnels owned by environments that cannot recover yet", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "legacy",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+      ],
+      allocations: [allocation({ tunnelId: "legacy", recoveryEnabled: false })],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        scanned: 1,
+        deleted: 0,
+        skippedLegacy: 1,
+        failed: 0,
+      });
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("counts an expired tunnel with no allocation instead of deleting it", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "orphan",
+          suffix: "cccccccccccccccc",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+      ],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        scanned: 1,
+        wouldDelete: 0,
+        deleted: 0,
+        skippedOrphan: 1,
+      });
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+  it.effect("keeps an expired tunnel while its allocation is incomplete", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "unrecorded",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "inactive",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+      ],
+      allocations: [allocation({ tunnelId: null, recoveryEnabled: false })],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect((yield* reaper.sweep).deleted).toBe(0);
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("does not count a tunnel that was replaced before its release", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "replaced",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+      ],
+      allocations: [allocation({ tunnelId: "replaced", recoveryEnabled: true })],
+      skipTunnelId: "replaced",
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect((yield* reaper.sweep).deleted).toBe(0);
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("stops the sweep after a structured Cloudflare rate limit error", () => {
+    const state = harness({
+      tunnels: [
+        tunnel({
+          id: "limited",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+        tunnel({
+          id: "next",
+          suffix: "bbbbbbbbbbbbbbbb",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+      ],
+      allocations: [
+        allocation({ tunnelId: "limited", recoveryEnabled: true }),
+        allocation({ tunnelId: "next", recoveryEnabled: true }),
+      ],
+      rateLimitedTunnelId: "limited",
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        attempted: 1,
+        deleted: 0,
+        failed: 1,
+        truncated: true,
+      });
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("continues past a page of older hosts to find recoverable tunnels", () => {
+    const entries = Array.from({ length: 101 }, (_, index) =>
+      tunnel({
+        id: `tunnel-${index}`,
+        suffix: index.toString(16).padStart(16, "0"),
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+    );
+    const state = harness({
+      tunnels: entries,
+      allocations: entries.map((entry, index) =>
+        allocation({ tunnelId: entry.id!, recoveryEnabled: index === 100 }),
+      ),
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        scanned: 101,
+        deleted: 1,
+        skippedLegacy: 100,
+        failed: 0,
+      });
+      expect(state.deleted).toEqual(["tunnel-100"]);
+      expect(
+        state.listRequests
+          .filter((request) => request.status === "down")
+          .map((request) => request.page),
+      ).toEqual([1, 2]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("collects every page before deletions shift Cloudflare pagination", () => {
+    const entries = Array.from({ length: 120 }, (_, index) =>
+      tunnel({
+        id: `tunnel-${index}`,
+        suffix: index.toString(16).padStart(16, "0"),
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+    );
+    const state = harness({
+      tunnels: entries,
+      allocations: entries.map((entry, index) =>
+        allocation({ tunnelId: entry.id!, recoveryEnabled: index < 50 || index >= 100 }),
+      ),
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        scanned: 120,
+        deleted: 70,
+        skippedLegacy: 50,
+        failed: 0,
+      });
+      expect(state.deleted).toContain("tunnel-119");
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("limits each cleanup run to 100 tunnel deletions", () => {
+    const entries = Array.from({ length: 105 }, (_, index) =>
+      tunnel({
+        id: `tunnel-${index}`,
+        suffix: index.toString(16).padStart(16, "0"),
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+    );
+    const state = harness({ tunnels: entries, allocations: recoverableOwners(entries) });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect((yield* reaper.sweep).deleted).toBe(100);
+      expect(state.deleted).toHaveLength(100);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("records dry-run counters on the sweep span", () => {
+    const spans: Array<Tracer.NativeSpan> = [];
+    const tracer = Tracer.make({
+      span: (options) => {
+        const span = new Tracer.NativeSpan(options);
+        spans.push(span);
+        return span;
+      },
+    });
+    const expired = [
+      tunnel({
+        id: "recoverable",
+        suffix: "aaaaaaaaaaaaaaaa",
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+      tunnel({
+        id: "legacy",
+        suffix: "bbbbbbbbbbbbbbbb",
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+    ];
+    const state = harness({
+      cleanupMode: "dry-run",
+      tunnels: expired,
+      allocations: [
+        allocation({ tunnelId: "recoverable", recoveryEnabled: true }),
+        allocation({ tunnelId: "legacy", recoveryEnabled: false }),
+      ],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      yield* reaper.sweep;
+      const sweepSpan = spans.find((span) => span.name === "relay.managed_endpoint_reaper.sweep");
+      expect(Object.fromEntries(sweepSpan?.attributes ?? [])).toMatchObject({
+        "relay.managed_endpoint_reaper.mode": "dry-run",
+        "relay.managed_endpoint_reaper.scanned": 2,
+        "relay.managed_endpoint_reaper.wouldDelete": 1,
+        "relay.managed_endpoint_reaper.skippedLegacy": 1,
+        "relay.managed_endpoint_reaper.deleted": 0,
+      });
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer), Effect.withTracer(tracer));
+  });
+
+  it.effect("does no Cloudflare work while cleanup is off", () => {
+    const state = harness({
+      cleanupMode: "off",
+      tunnels: [
+        tunnel({
+          id: "expired",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+      ],
+      allocations: [allocation({ tunnelId: "expired", recoveryEnabled: true })],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toEqual({
+        mode: "off",
+        listRequests: 0,
+        scanned: 0,
+        attempted: 0,
+        deleted: 0,
+        wouldDelete: 0,
+        skippedLegacy: 0,
+        skippedOrphan: 0,
+        failed: 0,
+        truncated: false,
+      });
+      expect(state.listRequests).toEqual([]);
+      expect(state.deleted).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("reports candidates without mutating them in dry-run mode", () => {
+    const state = harness({
+      cleanupMode: "dry-run",
+      tunnels: [
+        tunnel({
+          id: "expired",
+          suffix: "aaaaaaaaaaaaaaaa",
+          status: "down",
+          timestamp: "2026-08-25T11:00:00.000Z",
+        }),
+      ],
+      allocations: [allocation({ tunnelId: "expired", recoveryEnabled: true })],
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        mode: "dry-run",
+        scanned: 1,
+        attempted: 0,
+        deleted: 0,
+        wouldDelete: 1,
+      });
+      expect(state.deleted).toEqual([]);
+      expect(state.releases).toEqual([]);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("caps failed deletion attempts and Cloudflare list pages", () => {
+    const entries = Array.from({ length: 250 }, (_, index) =>
+      tunnel({
+        id: `failed-${index}`,
+        suffix: index.toString(16).padStart(16, "0"),
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+    );
+    const state = harness({
+      tunnels: entries,
+      allocations: recoverableOwners(entries),
+      failAllDeletes: true,
+    });
+
+    return Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MILLIS);
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      expect(yield* reaper.sweep).toMatchObject({
+        attempted: 100,
+        deleted: 0,
+        failed: 100,
+        truncated: true,
+      });
+      expect(state.listRequests.length).toBeLessThanOrEqual(
+        ManagedEndpointReaper.MANAGED_ENDPOINT_SWEEP_LIST_REQUEST_LIMIT,
+      );
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("rotates the deletion order so persistent failures do not starve later tunnels", () => {
+    const entries = Array.from({ length: 200 }, (_, index) =>
+      tunnel({
+        id: `tunnel-${index}`,
+        suffix: index.toString(16).padStart(16, "0"),
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+    );
+    // The first 100 candidates always fail to delete.
+    const state = harness({
+      tunnels: entries,
+      allocations: recoverableOwners(entries),
+      failDeleteWhen: (id) => Number(id.split("-")[1]) < 100,
+    });
+
+    return Effect.gen(function* () {
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      yield* TestClock.setTime(NOW_MILLIS);
+      yield* reaper.sweep;
+      yield* TestClock.setTime(NOW_MILLIS + 5 * 60 * 1_000);
+      yield* reaper.sweep;
+      const later = state.deleted.filter((id) => Number(id.split("-")[1]) >= 100);
+      expect(later.length).toBeGreaterThan(0);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("rotates bounded pages across a large legacy prefix", () => {
+    const entries = Array.from({ length: 1_000 }, (_, index) =>
+      tunnel({
+        id: `legacy-${index}`,
+        suffix: index.toString(16).padStart(16, "0"),
+        status: "down",
+        timestamp: "2026-08-25T11:00:00.000Z",
+      }),
+    );
+    const state = harness({
+      cleanupMode: "dry-run",
+      tunnels: entries,
+      allocations: entries.map((entry) =>
+        allocation({ tunnelId: entry.id!, recoveryEnabled: false }),
+      ),
+    });
+
+    return Effect.gen(function* () {
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      yield* TestClock.setTime(NOW_MILLIS);
+      yield* reaper.sweep;
+      const firstPages = state.listRequests
+        .filter((request) => request.status === "down")
+        .map((request) => request.page);
+      state.listRequests.length = 0;
+      yield* TestClock.setTime(NOW_MILLIS + 5 * 60 * 1_000);
+      yield* reaper.sweep;
+      const secondPages = state.listRequests
+        .filter((request) => request.status === "down")
+        .map((request) => request.page);
+      expect(firstPages).not.toEqual(secondPages);
+      expect(firstPages).toHaveLength(5);
+      expect(secondPages).toHaveLength(5);
+    }).pipe(Effect.provide(state.layer));
+  });
+
+  it.effect("rotates the attempt budget across both statuses over consecutive sweeps", () => {
+    const entries = (["down", "inactive"] as const).flatMap((status) =>
+      Array.from({ length: 100 }, (_, index) =>
+        tunnel({
+          id: `${status}-${index}`,
+          suffix: `${status === "down" ? "a" : "b"}${index.toString(16).padStart(15, "0")}`,
+          status,
+          timestamp: "2026-08-25T10:00:00.000Z",
+        }),
+      ),
+    );
+    const state = harness({ tunnels: entries, allocations: recoverableOwners(entries) });
+
+    return Effect.gen(function* () {
+      const reaper = yield* ManagedEndpointReaper.ManagedEndpointReaper;
+      yield* TestClock.setTime(NOW_MILLIS);
+      yield* reaper.sweep;
+      const firstStatus = state.deleted[0]!.split("-")[0];
+      expect(state.deleted).toHaveLength(100);
+      expect(state.deleted.every((id) => id.startsWith(`${firstStatus}-`))).toBe(true);
+
+      state.deleted.length = 0;
+      yield* TestClock.setTime(NOW_MILLIS + 5 * 60 * 1_000);
+      yield* reaper.sweep;
+      expect(state.deleted).toHaveLength(100);
+      expect(state.deleted.every((id) => !id.startsWith(`${firstStatus}-`))).toBe(true);
+    }).pipe(Effect.provide(state.layer));
+  });
+});
diff --git a/infra/relay/src/environments/ManagedEndpointReaper.ts b/infra/relay/src/environments/ManagedEndpointReaper.ts
new file mode 100644
index 000000000000..33524dbf0c5d
--- /dev/null
+++ b/infra/relay/src/environments/ManagedEndpointReaper.ts
@@ -0,0 +1,308 @@
+import * as Context from "effect/Context";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+
+import type { ManagedEndpointCleanupMode } from "../Config.ts";
+import * as RelayConfiguration from "../Config.ts";
+import { managedEndpointTunnelNamePrefix } from "../deploymentConfig.ts";
+import * as ManagedEndpointAllocations from "./ManagedEndpointAllocations.ts";
+import * as ManagedEndpointProvider from "./ManagedEndpointProvider.ts";
+
+export const MANAGED_ENDPOINT_GRACE_PERIOD_MINUTES = 5;
+// A tunnel that never connected is usually a link still being set up: a slow
+// cloudflared download or a user who walked away mid-pairing. Give it an hour.
+export const MANAGED_ENDPOINT_INACTIVE_GRACE_PERIOD_MINUTES = 60;
+export const MANAGED_ENDPOINT_SWEEP_PAGE_SIZE = 100;
+export const MANAGED_ENDPOINT_SWEEP_ATTEMPT_LIMIT = 100;
+export const MANAGED_ENDPOINT_SWEEP_LIST_REQUEST_LIMIT = 10;
+
+export interface ManagedEndpointSweepResult {
+  readonly mode: ManagedEndpointCleanupMode;
+  readonly listRequests: number;
+  readonly scanned: number;
+  readonly attempted: number;
+  readonly deleted: number;
+  readonly wouldDelete: number;
+  readonly skippedLegacy: number;
+  readonly skippedOrphan: number;
+  readonly failed: number;
+  readonly truncated: boolean;
+}
+
+export class ManagedEndpointReaper extends Context.Service<
+  ManagedEndpointReaper,
+  {
+    readonly sweep: Effect.Effect<
+      ManagedEndpointSweepResult,
+      | ManagedEndpointProvider.ManagedEndpointTunnelClientError
+      | ManagedEndpointAllocations.ManagedEndpointAllocationPersistenceError
+    >;
+  }
+>()("t3code-relay/environments/ManagedEndpointReaper") {}
+
+function isExpiredManagedTunnel(input: {
+  readonly tunnel: ManagedEndpointProvider.ManagedEndpointTunnel;
+  readonly status: "down" | "inactive";
+  readonly prefix: string;
+  readonly cutoff: DateTime.Utc;
+}): input is typeof input & {
+  readonly tunnel: ManagedEndpointProvider.ManagedEndpointTunnel & {
+    readonly id: string;
+    readonly name: string;
+  };
+} {
+  const { tunnel, status, prefix, cutoff } = input;
+  if (
+    typeof tunnel.id !== "string" ||
+    typeof tunnel.name !== "string" ||
+    tunnel.status !== status ||
+    !tunnel.name.startsWith(prefix) ||
+    !/^[a-f0-9]{16}$/u.test(tunnel.name.slice(prefix.length))
+  ) {
+    return false;
+  }
+  const inactiveAt = status === "down" ? tunnel.connsInactiveAt : tunnel.createdAt;
+  if (typeof inactiveAt !== "string") {
+    return false;
+  }
+  const timestamp = DateTime.make(inactiveAt);
+  return Option.isSome(timestamp) && timestamp.value.epochMilliseconds <= cutoff.epochMilliseconds;
+}
+
+function isRateLimited(cause: unknown): boolean {
+  if (typeof cause !== "object" || cause === null) {
+    return false;
+  }
+  if ("_tag" in cause && cause._tag === "TooManyRequests") {
+    return true;
+  }
+  if ("status" in cause && cause.status === 429) {
+    return true;
+  }
+  return "cause" in cause && isRateLimited(cause.cause);
+}
+
+function rotatedPages(input: {
+  readonly totalCount: number | undefined;
+  readonly slot: number;
+  readonly limit: number;
+}): ReadonlyArray<number> {
+  if (input.limit <= 0) return [];
+  if (input.totalCount === undefined) {
+    return Array.from({ length: input.limit }, (_, index) => index + 2);
+  }
+  const laterPageCount = Math.max(
+    0,
+    Math.ceil(input.totalCount / MANAGED_ENDPOINT_SWEEP_PAGE_SIZE) - 1,
+  );
+  if (laterPageCount === 0) return [];
+  const count = Math.min(input.limit, laterPageCount);
+  const start = input.slot % laterPageCount;
+  return Array.from({ length: count }, (_, index) => 2 + ((start + index) % laterPageCount));
+}
+
+const emptyResult = (mode: ManagedEndpointCleanupMode): ManagedEndpointSweepResult => ({
+  mode,
+  listRequests: 0,
+  scanned: 0,
+  attempted: 0,
+  deleted: 0,
+  wouldDelete: 0,
+  skippedLegacy: 0,
+  skippedOrphan: 0,
+  failed: 0,
+  truncated: false,
+});
+
+export const make = Effect.gen(function* () {
+  const config = yield* RelayConfiguration.RelayConfiguration;
+  const tunnels = yield* ManagedEndpointProvider.ManagedEndpointTunnelClient;
+  const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+  const provider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+
+  const sweep = Effect.gen(function* () {
+    const mode = config.managedEndpointCleanupMode ?? "off";
+    const namespace = config.managedEndpointNamespace;
+    if (mode === "off" || !namespace) return emptyResult(mode);
+
+    const now = yield* DateTime.now;
+    const cutoffFor = (status: "down" | "inactive") =>
+      DateTime.subtract(now, {
+        minutes:
+          status === "down"
+            ? MANAGED_ENDPOINT_GRACE_PERIOD_MINUTES
+            : MANAGED_ENDPOINT_INACTIVE_GRACE_PERIOD_MINUTES,
+      });
+    const prefix = managedEndpointTunnelNamePrefix(namespace);
+    const slot = Math.floor(
+      now.epochMilliseconds / (MANAGED_ENDPOINT_GRACE_PERIOD_MINUTES * 60 * 1_000),
+    );
+    let listRequests = 0;
+    let truncated = false;
+    const expired: Array<{
+      readonly tunnel: ManagedEndpointProvider.ManagedEndpointTunnel & {
+        readonly id: string;
+        readonly name: string;
+      };
+      readonly status: "down" | "inactive";
+      readonly cutoff: DateTime.Utc;
+    }> = [];
+
+    for (const status of ["down", "inactive"] as const) {
+      const cutoff = cutoffFor(status);
+      const cutoffIso = DateTime.formatIso(cutoff);
+      const listPage = (page: number) => {
+        listRequests += 1;
+        return tunnels.list({
+          isDeleted: false,
+          includePrefix: prefix,
+          status,
+          existedAt: cutoffIso,
+          ...(status === "down" ? { wasInactiveAt: cutoffIso } : {}),
+          page,
+          perPage: MANAGED_ENDPOINT_SWEEP_PAGE_SIZE,
+        });
+      };
+      const first = yield* listPage(1);
+      const totalCount =
+        typeof first.resultInfo?.totalCount === "number" ? first.resultInfo.totalCount : undefined;
+      const pages = rotatedPages({
+        totalCount,
+        slot,
+        limit: Math.floor(MANAGED_ENDPOINT_SWEEP_LIST_REQUEST_LIMIT / 2) - 1,
+      });
+      const responses = [first, ...(yield* Effect.forEach(pages, listPage, { concurrency: 1 }))];
+      if (
+        totalCount !== undefined &&
+        Math.ceil(totalCount / MANAGED_ENDPOINT_SWEEP_PAGE_SIZE) > responses.length
+      ) {
+        truncated = true;
+      } else if (
+        totalCount === undefined &&
+        responses.at(-1)?.result.length === MANAGED_ENDPOINT_SWEEP_PAGE_SIZE
+      ) {
+        truncated = true;
+      }
+      for (const response of responses) {
+        expired.push(
+          ...response.result
+            .map((tunnel) => ({ tunnel, status, prefix, cutoff }))
+            .filter(isExpiredManagedTunnel)
+            .map(({ tunnel }) => ({ tunnel, status, cutoff })),
+        );
+      }
+    }
+
+    const collected = [...new Map(expired.map((entry) => [entry.tunnel.id, entry])).values()];
+    // Start each sweep one attempt budget further along so a run of
+    // candidates whose deletes keep failing cannot hold the budget forever
+    // and starve everything listed after them.
+    const offset =
+      collected.length === 0 ? 0 : (slot * MANAGED_ENDPOINT_SWEEP_ATTEMPT_LIMIT) % collected.length;
+    const uniqueExpired = [...collected.slice(offset), ...collected.slice(0, offset)];
+    const recorded = yield* allocations.listByTunnelNames(
+      uniqueExpired.map(({ tunnel }) => tunnel.name),
+    );
+    const recordedByTunnelName = new Map(
+      recorded.map((allocation) => [allocation.tunnelName, allocation]),
+    );
+    let attempted = 0;
+    let deleted = 0;
+    let wouldDelete = 0;
+    let skippedLegacy = 0;
+    let skippedOrphan = 0;
+    let failed = 0;
+
+    for (const { tunnel, status, cutoff } of uniqueExpired) {
+      const cutoffIso = DateTime.formatIso(cutoff);
+      const allocation = recordedByTunnelName.get(tunnel.name);
+      if (
+        allocation !== undefined &&
+        allocation.tunnelId !== null &&
+        allocation.tunnelId !== tunnel.id
+      ) {
+        continue;
+      }
+      const owner = allocation?.tunnelId === tunnel.id ? allocation : undefined;
+      if (owner !== undefined && !owner.recoveryEnabled) {
+        skippedLegacy += 1;
+        continue;
+      }
+      if (allocation !== undefined && owner === undefined) continue;
+      // A tunnel with no allocation row cannot be claimed, so a relink that
+      // adopts it by name races any delete here. Count it and leave it for a
+      // manual sweep instead.
+      if (owner === undefined) {
+        skippedOrphan += 1;
+        continue;
+      }
+      wouldDelete += 1;
+      if (mode === "dry-run") continue;
+      if (attempted >= MANAGED_ENDPOINT_SWEEP_ATTEMPT_LIMIT) {
+        truncated = true;
+        break;
+      }
+      attempted += 1;
+      const result = yield* provider
+        .release({
+          userId: owner.userId,
+          environmentId: owner.environmentId,
+          expectedTunnelId: tunnel.id,
+          expectedInactiveBefore: cutoffIso,
+          expectedStatus: status,
+        })
+        .pipe(Effect.result);
+      if (result._tag === "Failure") {
+        failed += 1;
+        yield* Effect.logWarning("Failed to delete an inactive managed tunnel", {
+          tunnelId: tunnel.id,
+          tunnelName: tunnel.name,
+          cause: result.failure,
+        });
+        if (isRateLimited(result.failure)) {
+          truncated = true;
+          break;
+        }
+      } else if (result.success) {
+        deleted += 1;
+        yield* Effect.logInfo("Deleted an inactive managed tunnel", {
+          tunnelId: tunnel.id,
+          tunnelName: tunnel.name,
+          status,
+        });
+      }
+    }
+
+    return {
+      mode,
+      listRequests,
+      scanned: uniqueExpired.length,
+      attempted,
+      deleted,
+      wouldDelete,
+      skippedLegacy,
+      skippedOrphan,
+      failed,
+      truncated,
+    };
+  }).pipe(
+    // Dry-run rollout reads these counters from the exported span.
+    Effect.tap((result) =>
+      Effect.annotateCurrentSpan(
+        Object.fromEntries(
+          Object.entries(result).map(([key, value]) => [
+            `relay.managed_endpoint_reaper.${key}`,
+            value,
+          ]),
+        ),
+      ),
+    ),
+    Effect.withSpan("relay.managed_endpoint_reaper.sweep"),
+  );
+
+  return ManagedEndpointReaper.of({ sweep });
+});
+
+export const layer = Layer.effect(ManagedEndpointReaper, make);
diff --git a/infra/relay/src/http/Api.test.ts b/infra/relay/src/http/Api.test.ts
index badce175cdf3..114fb54d1d03 100644
--- a/infra/relay/src/http/Api.test.ts
+++ b/infra/relay/src/http/Api.test.ts
@@ -7,13 +7,15 @@ import {
 import * as EnvironmentLinker from "../environments/EnvironmentLinker.ts";
 import * as RelayTokens from "../auth/RelayTokens.ts";
 import * as Devices from "../agentActivity/Devices.ts";
+import * as NodeCrypto from "node:crypto";
 import { createClerkClient, verifyToken } from "@clerk/backend";
 import * as NodeHttpPlatform from "@effect/platform-node/NodeHttpPlatform";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { describe, expect, it } from "@effect/vitest";
 import { vi } from "vite-plus/test";
 import * as Context from "effect/Context";
-import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
+import * as NodeCryptoLayer from "@effect/platform-node/NodeCrypto";
+import * as DateTime from "effect/DateTime";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
@@ -35,6 +37,7 @@ import {
   RelayEnvironmentPrincipal,
   RelayApi,
 } from "@t3tools/contracts/relay";
+import { RELAY_MANAGED_TUNNEL_RECOVERY_TYP, signRelayJwt } from "@t3tools/shared/relayJwt";
 
 import {
   RELAY_HTTP_ROUTER_CONFIG,
@@ -44,18 +47,22 @@ import {
   relayDocsRedirectRoute,
   relayEnvironmentAuthLayer,
   relayNotFoundRoute,
+  recoverEnvironmentTunnelRecord,
+  registerEnvironmentTunnelRecovery,
   relayDpopFailureReason,
   revokeEnvironmentLinkRecord,
   serverApi,
   traceRelayHttpRequestWith,
   unlinkEnvironmentRecord,
   verifyRelayClientBearerToken,
+  verifyEnvironmentTunnelRecoveryProof,
   withoutCapturedParentSpan,
 } from "./Api.ts";
 import * as RelayConfiguration from "../Config.ts";
 import * as RelayDb from "../db.ts";
 import * as EnvironmentCredentials from "../environments/EnvironmentCredentials.ts";
 import * as EnvironmentLinks from "../environments/EnvironmentLinks.ts";
+import * as ManagedEndpointAllocations from "../environments/ManagedEndpointAllocations.ts";
 import * as ManagedEndpointProvider from "../environments/ManagedEndpointProvider.ts";
 import * as AgentActivityPublisher from "../agentActivity/AgentActivityPublisher.ts";
 import * as EnvironmentPublishSignatures from "../environments/EnvironmentPublishSignatures.ts";
@@ -126,7 +133,7 @@ describe("device listing compatibility", () => {
       Layer.provide(
         Layer.mergeAll(
           Layer.succeed(RelayConfiguration.RelayConfiguration, relaySettings),
-          NodeCrypto.layer,
+          NodeCryptoLayer.layer,
           Layer.mock(RelayTokens.RelayTokens, { resolveDpopAccessTokenScopes: () => null }),
           Layer.mock(EnvironmentLinker.EnvironmentLinker, {}),
           Layer.mock(EnvironmentLinks.EnvironmentLinks, {}),
@@ -311,6 +318,9 @@ function relayUnlinkTestLayer(input?: {
   readonly revokeCredential?: EnvironmentCredentials.EnvironmentCredentials["Service"]["revokeForEnvironmentPublicKey"];
   readonly prepareDeprovision?: ManagedEndpointProvider.ManagedEndpointProvider["Service"]["prepareDeprovision"];
   readonly deprovision?: ManagedEndpointProvider.ManagedEndpointProvider["Service"]["deprovision"];
+  readonly provision?: ManagedEndpointProvider.ManagedEndpointProvider["Service"]["provision"];
+  readonly reconcileOrigin?: ManagedEndpointProvider.ManagedEndpointProvider["Service"]["reconcileOrigin"];
+  readonly release?: ManagedEndpointProvider.ManagedEndpointProvider["Service"]["release"];
 }) {
   return Layer.mergeAll(
     Layer.succeed(
@@ -340,10 +350,11 @@ function relayUnlinkTestLayer(input?: {
     Layer.succeed(
       ManagedEndpointProvider.ManagedEndpointProvider,
       ManagedEndpointProvider.ManagedEndpointProvider.of({
-        provision: () => Effect.die("unused provision"),
+        provision: input?.provision ?? (() => Effect.die("unused provision")),
+        reconcileOrigin: input?.reconcileOrigin ?? (() => Effect.succeed("ready")),
         prepareDeprovision: input?.prepareDeprovision ?? (() => Effect.succeed(null)),
-        deprovision: input?.deprovision ?? (() => Effect.void),
-        release: () => Effect.die("unused release"),
+        deprovision: input?.deprovision ?? (() => Effect.succeed(true)),
+        release: input?.release ?? (() => Effect.die("unused release")),
       }),
     ),
   );
@@ -361,6 +372,502 @@ const linkedEnvironmentRecord = {
   linkedAt: "2026-07-28T00:00:00.000Z",
 } as const;
 
+describe("relay managed tunnel recovery", () => {
+  it.effect("binds recovery requests to the host, cloud user, and T3 service origin", () =>
+    Effect.gen(function* () {
+      const keyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+        privateKeyEncoding: { format: "pem", type: "pkcs8" },
+        publicKeyEncoding: { format: "pem", type: "spki" },
+      });
+      const now = yield* DateTime.now;
+      const issuedAt = Math.floor(now.epochMilliseconds / 1_000);
+      const proof = yield* signRelayJwt({
+        privateKey: keyPair.privateKey,
+        typ: RELAY_MANAGED_TUNNEL_RECOVERY_TYP,
+        payload: {
+          iss: "t3-env:environment-1",
+          aud: "https://relay.example.test",
+          sub: "environment-1",
+          jti: "recovery-proof",
+          iat: issuedAt,
+          exp: issuedAt + 60,
+          action: "recover",
+          environmentId: "environment-1",
+          cloudUserId: "user-1",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        },
+      });
+      const request = {
+        action: "recover" as const,
+        proof,
+        userId: "user-1",
+        environmentId: "environment-1",
+        environmentPublicKey: keyPair.publicKey,
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      };
+
+      yield* verifyEnvironmentTunnelRecoveryProof(request);
+
+      const wrongOwner = yield* Effect.flip(
+        verifyEnvironmentTunnelRecoveryProof({ ...request, userId: "user-2" }),
+      );
+      expect(wrongOwner).toMatchObject({ _tag: "Unauthorized" });
+
+      const wrongOrigin = yield* Effect.flip(
+        verifyEnvironmentTunnelRecoveryProof({
+          ...request,
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 5432 },
+        }),
+      );
+      expect(wrongOrigin).toMatchObject({ _tag: "Unauthorized" });
+
+      const wrongAction = yield* Effect.flip(
+        verifyEnvironmentTunnelRecoveryProof({
+          action: "register",
+          proof,
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: keyPair.publicKey,
+          tunnelId: "existing-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+      expect(wrongAction).toMatchObject({ _tag: "Unauthorized" });
+    }).pipe(Effect.provideService(RelayConfiguration.RelayConfiguration, relaySettings)),
+  );
+
+  it.effect("rejects a signed registration proof for a different origin", () =>
+    Effect.gen(function* () {
+      const keyPair = NodeCrypto.generateKeyPairSync("ed25519", {
+        privateKeyEncoding: { format: "pem", type: "pkcs8" },
+        publicKeyEncoding: { format: "pem", type: "spki" },
+      });
+      const now = yield* DateTime.now;
+      const issuedAt = Math.floor(now.epochMilliseconds / 1_000);
+      const proof = yield* signRelayJwt({
+        privateKey: keyPair.privateKey,
+        typ: RELAY_MANAGED_TUNNEL_RECOVERY_TYP,
+        payload: {
+          iss: "t3-env:environment-1",
+          aud: "https://relay.example.test",
+          sub: "environment-1",
+          jti: "registration-origin-proof",
+          iat: issuedAt,
+          exp: issuedAt + 60,
+          action: "register",
+          environmentId: "environment-1",
+          cloudUserId: "user-1",
+          tunnelId: "existing-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        },
+      });
+
+      const error = yield* Effect.flip(
+        verifyEnvironmentTunnelRecoveryProof({
+          action: "register",
+          proof,
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: keyPair.publicKey,
+          tunnelId: "existing-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 5432 },
+        }),
+      );
+
+      expect(error).toMatchObject({ _tag: "Unauthorized" });
+    }).pipe(Effect.provideService(RelayConfiguration.RelayConfiguration, relaySettings)),
+  );
+
+  it.effect("registers recovery for an existing tunnel without provisioning it", () => {
+    let recoveryEnabledFor: {
+      readonly userId: string;
+      readonly environmentId: string;
+      readonly tunnelId: string;
+      readonly environmentPublicKey: string;
+      readonly origin: { readonly localHttpHost: string; readonly localHttpPort: number };
+    } | null = null;
+
+    return Effect.gen(function* () {
+      expect(
+        yield* registerEnvironmentTunnelRecovery({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "public-key",
+          tunnelId: "existing-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      ).toEqual({ status: "ready" });
+      expect(recoveryEnabledFor).toEqual({
+        userId: "user-1",
+        environmentId: "environment-1",
+        tunnelId: "existing-tunnel",
+        environmentPublicKey: "public-key",
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () => Effect.succeed(linkedEnvironmentRecord),
+            provision: () => Effect.die("registration must not provision a tunnel"),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: (input) =>
+              Effect.sync(() => {
+                recoveryEnabledFor = input;
+                return true;
+              }),
+          }),
+        ),
+      ),
+    );
+  });
+
+  it.effect("requests recovery without enabling a stale tunnel", () => {
+    let recoveryEnabled = false;
+
+    return Effect.gen(function* () {
+      expect(
+        yield* registerEnvironmentTunnelRecovery({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "public-key",
+          tunnelId: "deleted-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      ).toEqual({ status: "recovery_required" });
+      expect(recoveryEnabled).toBe(false);
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () => Effect.succeed(linkedEnvironmentRecord),
+            reconcileOrigin: () => Effect.succeed("recovery_required"),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: () =>
+              Effect.sync(() => {
+                recoveryEnabled = true;
+                return true;
+              }),
+          }),
+        ),
+      ),
+    );
+  });
+
+  it.effect("rejects recovery registration for a different environment key", () => {
+    let recoveryEnabled = false;
+
+    return Effect.gen(function* () {
+      const error = yield* Effect.flip(
+        registerEnvironmentTunnelRecovery({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "different-public-key",
+          tunnelId: "existing-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+
+      expect(error).toMatchObject({ _tag: "Unauthorized" });
+      expect(recoveryEnabled).toBe(false);
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () => Effect.succeed(linkedEnvironmentRecord),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: () =>
+              Effect.sync(() => {
+                recoveryEnabled = true;
+                return true;
+              }),
+          }),
+        ),
+      ),
+    );
+  });
+
+  it.effect("rejects recovery registration when the recorded tunnel changed", () =>
+    Effect.gen(function* () {
+      const error = yield* Effect.flip(
+        registerEnvironmentTunnelRecovery({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "public-key",
+          tunnelId: "stale-tunnel",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+
+      expect(error).toMatchObject({ _tag: "Unauthorized" });
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () => Effect.succeed(linkedEnvironmentRecord),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: () => Effect.succeed(false),
+          }),
+        ),
+      ),
+    ),
+  );
+
+  it.effect("recovers a linked environment and marks its tunnel as recoverable", () => {
+    let recoveryEnabledFor: {
+      readonly userId: string;
+      readonly environmentId: string;
+      readonly tunnelId: string;
+      readonly environmentPublicKey: string;
+    } | null = null;
+    const runtime = {
+      providerKind: "cloudflare_tunnel" as const,
+      connectorToken: "replacement-token",
+      tunnelId: "replacement-tunnel",
+    };
+
+    return Effect.gen(function* () {
+      expect(
+        yield* recoverEnvironmentTunnelRecord({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "public-key",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      ).toEqual({
+        endpoint: linkedEnvironmentRecord.endpoint,
+        endpointRuntime: runtime,
+      });
+      expect(recoveryEnabledFor).toEqual({
+        userId: "user-1",
+        environmentId: "environment-1",
+        tunnelId: "replacement-tunnel",
+        environmentPublicKey: "public-key",
+        origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      });
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () => Effect.succeed(linkedEnvironmentRecord),
+            provision: () =>
+              Effect.succeed({
+                endpoint: linkedEnvironmentRecord.endpoint,
+                runtime,
+              }),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: (input) =>
+              Effect.sync(() => {
+                recoveryEnabledFor = input;
+                return true;
+              }),
+          }),
+        ),
+      ),
+    );
+  });
+
+  it.effect("rejects a credential from a different environment owner", () => {
+    let provisioned = false;
+
+    return Effect.gen(function* () {
+      const error = yield* Effect.flip(
+        recoverEnvironmentTunnelRecord({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "different-public-key",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+      expect(error).toMatchObject({ _tag: "Unauthorized" });
+      expect(provisioned).toBe(false);
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () => Effect.succeed(linkedEnvironmentRecord),
+            provision: () =>
+              Effect.sync(() => {
+                provisioned = true;
+                return {
+                  endpoint: linkedEnvironmentRecord.endpoint,
+                  runtime: { providerKind: "cloudflare_tunnel", connectorToken: "token" },
+                };
+              }),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: () => Effect.die("unused"),
+          }),
+        ),
+      ),
+    );
+  });
+
+  it.effect("does not recover a publish-only environment", () =>
+    Effect.gen(function* () {
+      const error = yield* Effect.flip(
+        recoverEnvironmentTunnelRecord({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "public-key",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+      expect(error).toMatchObject({ _tag: "Unauthorized" });
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () =>
+              Effect.succeed({
+                ...linkedEnvironmentRecord,
+                endpoint: {
+                  ...linkedEnvironmentRecord.endpoint,
+                  providerKind: "manual" as const,
+                },
+              }),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: () => Effect.die("unused"),
+          }),
+        ),
+      ),
+    ),
+  );
+
+  it.effect("rejects a recovered tunnel that changes the linked endpoint", () => {
+    let recoveryEnabled = false;
+    const cleaned: Array<string> = [];
+
+    return Effect.gen(function* () {
+      const error = yield* Effect.flip(
+        recoverEnvironmentTunnelRecord({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "public-key",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+      expect(error).toMatchObject({ _tag: "Unauthorized" });
+      expect(recoveryEnabled).toBe(false);
+      expect(cleaned).toEqual(["replacement-tunnel"]);
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () => Effect.succeed(linkedEnvironmentRecord),
+            provision: () =>
+              Effect.succeed({
+                endpoint: {
+                  httpBaseUrl: "https://different.example.test/",
+                  wsBaseUrl: "wss://different.example.test/ws",
+                  providerKind: "cloudflare_tunnel",
+                },
+                runtime: {
+                  providerKind: "cloudflare_tunnel",
+                  connectorToken: "token",
+                  tunnelId: "replacement-tunnel",
+                },
+              }),
+            prepareDeprovision: () => Effect.die("must keep the active allocation"),
+            deprovision: () => Effect.die("must keep the active link DNS"),
+            release: ({ expectedTunnelId }) =>
+              Effect.sync(() => {
+                if (expectedTunnelId) {
+                  cleaned.push(expectedTunnelId);
+                }
+                return true;
+              }),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: () =>
+              Effect.sync(() => {
+                recoveryEnabled = true;
+                return true;
+              }),
+          }),
+        ),
+      ),
+    );
+  });
+
+  it.effect.each([
+    { state: "removed", currentLink: null },
+    {
+      state: "publish-only",
+      currentLink: {
+        ...linkedEnvironmentRecord,
+        endpoint: {
+          ...linkedEnvironmentRecord.endpoint,
+          providerKind: "manual" as const,
+        },
+      },
+    },
+  ])("removes a recovered tunnel when its link becomes $state", ({ currentLink }) => {
+    let lookups = 0;
+    const cleaned: Array<string> = [];
+    const target = {
+      userId: "user-1",
+      environmentId: "environment-1",
+      hostname: "environment-1.example.test",
+      tunnelId: "replacement-tunnel",
+      tunnelName: "environment-1-tunnel",
+      dnsRecordId: "dns-1",
+      readyAt: "2026-07-28T00:00:00.000Z",
+      origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      updatedAt: "replacement-generation",
+      generation: 3,
+    } satisfies ManagedEndpointProvider.ManagedEndpointDeprovisionTarget;
+
+    return Effect.gen(function* () {
+      const error = yield* Effect.flip(
+        recoverEnvironmentTunnelRecord({
+          userId: "user-1",
+          environmentId: "environment-1",
+          environmentPublicKey: "public-key",
+          origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+        }),
+      );
+      expect(error).toMatchObject({ _tag: "Unauthorized" });
+      expect(cleaned).toEqual(["replacement-tunnel"]);
+    }).pipe(
+      Effect.provide(
+        Layer.merge(
+          relayUnlinkTestLayer({
+            getForUser: () =>
+              Effect.sync(() => (++lookups === 1 ? linkedEnvironmentRecord : currentLink)),
+            provision: () =>
+              Effect.succeed({
+                endpoint: linkedEnvironmentRecord.endpoint,
+                runtime: {
+                  providerKind: "cloudflare_tunnel",
+                  connectorToken: "replacement-token",
+                  tunnelId: "replacement-tunnel",
+                },
+              }),
+            prepareDeprovision: () => Effect.succeed(target),
+            deprovision: ({ target: captured }) =>
+              Effect.sync(() => {
+                if (captured?.tunnelId) {
+                  cleaned.push(captured.tunnelId);
+                }
+                return true;
+              }),
+          }),
+          Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations)({
+            enableRecovery: () => Effect.succeed(false),
+          }),
+        ),
+      ),
+    );
+  });
+});
+
 describe("relay environment unlink", () => {
   it.effect("revokes the link and its credentials in one database transaction", () => {
     const calls: Array<string> = [];
@@ -405,7 +912,9 @@ describe("relay environment unlink", () => {
       tunnelName: "environment-1-tunnel",
       dnsRecordId: "dns-1",
       readyAt: "2026-07-28T00:00:00.000Z",
+      origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
       updatedAt: "generation-before-unlink",
+      generation: 1,
     } satisfies ManagedEndpointProvider.ManagedEndpointDeprovisionTarget;
 
     return Effect.gen(function* () {
@@ -454,6 +963,7 @@ describe("relay environment unlink", () => {
             Effect.sync(() => {
               expect(request.target).toBe(deprovisionTarget);
               calls.push("deprovision");
+              return true;
             }),
         }),
       ),
@@ -502,6 +1012,7 @@ describe("relay environment unlink", () => {
           deprovision: () =>
             Effect.sync(() => {
               calls.push("deprovision");
+              return true;
             }),
         }),
       ),
@@ -529,6 +1040,47 @@ describe("relay environment unlink", () => {
           deprovision: () =>
             Effect.sync(() => {
               calls.push("deprovision");
+              return true;
+            }),
+        }),
+      ),
+    );
+  });
+
+  it.effect("retries unlink cleanup when a concurrent tunnel release wins the first claim", () => {
+    let lookups = 0;
+    const targets: Array<ManagedEndpointProvider.ManagedEndpointDeprovisionTarget | undefined> = [];
+    const target = {
+      userId: "user-1",
+      environmentId: "environment-1",
+      hostname: "environment-1.example.test",
+      tunnelId: "tunnel-1",
+      tunnelName: "environment-1-tunnel",
+      dnsRecordId: "dns-1",
+      readyAt: "2026-07-28T00:00:00.000Z",
+      origin: { localHttpHost: "127.0.0.1", localHttpPort: 3773 },
+      updatedAt: "original-generation",
+      generation: 1,
+    } satisfies ManagedEndpointProvider.ManagedEndpointDeprovisionTarget;
+
+    return Effect.gen(function* () {
+      expect(
+        yield* unlinkEnvironmentRecord({
+          userId: "user-1",
+          environmentId: "environment-1",
+        }),
+      ).toBe(true);
+      expect(targets).toEqual([target, target]);
+    }).pipe(
+      Effect.provide(
+        relayUnlinkTestLayer({
+          getForUser: () => Effect.sync(() => (++lookups === 1 ? linkedEnvironmentRecord : null)),
+          revokeForUser: () => Effect.succeed(true),
+          prepareDeprovision: () => Effect.succeed(target),
+          deprovision: ({ target: captured }) =>
+            Effect.sync(() => {
+              targets.push(captured ?? undefined);
+              return targets.length > 1;
             }),
         }),
       ),
@@ -656,7 +1208,19 @@ describe("relay routing fallback", () => {
       const routes = HttpApiBuilder.layer(
         HttpApi.make("RelayApi").add(RelayApi.groups.server),
       ).pipe(
-        Layer.provide(serverApi.pipe(Layer.provide([publisher, signatures]))),
+        Layer.provide(
+          serverApi.pipe(
+            HttpRouter.provideRequest(
+              Layer.mergeAll(
+                Layer.succeed(RelayConfiguration.RelayConfiguration, relaySettings),
+                Layer.mock(EnvironmentLinks.EnvironmentLinks, {}),
+                Layer.mock(ManagedEndpointAllocations.ManagedEndpointAllocations, {}),
+                Layer.mock(ManagedEndpointProvider.ManagedEndpointProvider, {}),
+              ),
+            ),
+            Layer.provide([publisher, signatures]),
+          ),
+        ),
         Layer.provide(auth),
         Layer.provide([NodeServices.layer, NodeHttpPlatform.layer, Etag.layerWeak]),
       );
diff --git a/infra/relay/src/http/Api.ts b/infra/relay/src/http/Api.ts
index 4abbd0113d37..ee947159ca96 100644
--- a/infra/relay/src/http/Api.ts
+++ b/infra/relay/src/http/Api.ts
@@ -49,10 +49,16 @@ import {
   RelayEnvironmentLinkLimitExceededError,
   RelayEnvironmentPrincipal,
   type RelayEnvironmentConnectRequest,
+  type RelayManagedEndpointOrigin,
+  RelayManagedEndpointRecoveryProofPayload,
   type RelayDpopAccessTokenScope,
   RelayInternalError,
 } from "@t3tools/contracts/relay";
-import { normalizeRelayIssuer } from "@t3tools/shared/relayJwt";
+import {
+  normalizeRelayIssuer,
+  RELAY_MANAGED_TUNNEL_RECOVERY_TYP,
+  verifyRelayJwt,
+} from "@t3tools/shared/relayJwt";
 import { sha256Base64Url } from "@t3tools/shared/turbo/sha256";
 
 import * as DeliveryAttempts from "../agentActivity/DeliveryAttempts.ts";
@@ -103,6 +109,10 @@ const relayCorsPreflightHeaders = {
   "access-control-max-age": "86400",
 } as const;
 
+const decodeManagedTunnelRecoveryProof = Schema.decodeUnknownEffect(
+  RelayManagedEndpointRecoveryProofPayload,
+);
+
 const appendRelayCredentialResponseHeaders = HttpEffect.appendPreResponseHandler(
   (_request, response) =>
     Effect.succeed(
@@ -470,15 +480,207 @@ export const unlinkEnvironmentRecord = Effect.fn("relay.api.client.unlinkEnviron
     // revocation commits so a database failure leaves a fully usable active
     // link. Still run teardown when the link is already revoked, allowing a
     // retry to finish cleanup after an earlier Cloudflare failure.
-    yield* managedEndpointProvider.deprovision({
+    const deprovisioned = yield* managedEndpointProvider.deprovision({
       userId: input.userId,
       environmentId: input.environmentId,
       target: deprovisionTarget,
     });
+    if (!deprovisioned) {
+      const retryTarget = yield* managedEndpointProvider.prepareDeprovision(input);
+      if (retryTarget !== null && (yield* links.getForUser(input)) === null) {
+        yield* managedEndpointProvider.deprovision({ ...input, target: retryTarget });
+      }
+    }
     return unlinked;
   },
 );
 
+type EnvironmentTunnelRecoveryProofInput = {
+  readonly proof: string;
+  readonly userId: string;
+  readonly environmentId: string;
+  readonly environmentPublicKey: string;
+} & (
+  | {
+      readonly action: "register";
+      readonly tunnelId: string;
+      readonly origin: RelayManagedEndpointOrigin;
+    }
+  | { readonly action: "recover"; readonly origin: RelayManagedEndpointOrigin }
+);
+
+export const verifyEnvironmentTunnelRecoveryProof = Effect.fn(
+  "relay.api.server.verifyEnvironmentTunnelRecoveryProof",
+)(function* (input: EnvironmentTunnelRecoveryProofInput) {
+  const config = yield* RelayConfiguration.RelayConfiguration;
+  const now = yield* DateTime.now;
+  const verified = yield* verifyRelayJwt({
+    publicKey: input.environmentPublicKey,
+    token: input.proof,
+    typ: RELAY_MANAGED_TUNNEL_RECOVERY_TYP,
+    issuer: `t3-env:${input.environmentId}`,
+    audience: normalizeRelayIssuer(config.relayIssuer),
+    nowEpochSeconds: Math.floor(now.epochMilliseconds / 1_000),
+  }).pipe(
+    Effect.flatMap(decodeManagedTunnelRecoveryProof),
+    Effect.mapError(() => new HttpApiError.Unauthorized({})),
+  );
+
+  if (
+    verified.environmentId !== input.environmentId ||
+    verified.sub !== input.environmentId ||
+    verified.cloudUserId !== input.userId ||
+    verified.action !== input.action
+  ) {
+    return yield* new HttpApiError.Unauthorized({});
+  }
+  if (input.action === "register") {
+    if (
+      verified.action !== "register" ||
+      verified.tunnelId !== input.tunnelId ||
+      verified.origin.localHttpHost !== input.origin.localHttpHost ||
+      verified.origin.localHttpPort !== input.origin.localHttpPort
+    ) {
+      return yield* new HttpApiError.Unauthorized({});
+    }
+    return;
+  }
+  if (
+    verified.action !== "recover" ||
+    verified.origin.localHttpHost !== input.origin.localHttpHost ||
+    verified.origin.localHttpPort !== input.origin.localHttpPort
+  ) {
+    return yield* new HttpApiError.Unauthorized({});
+  }
+});
+
+export const registerEnvironmentTunnelRecovery = Effect.fn(
+  "relay.api.server.registerEnvironmentTunnelRecovery",
+)(function* (input: {
+  readonly userId: string;
+  readonly environmentId: string;
+  readonly environmentPublicKey: string;
+  readonly tunnelId: string;
+  readonly origin: RelayManagedEndpointOrigin;
+}) {
+  const links = yield* EnvironmentLinks.EnvironmentLinks;
+  const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+  const managedEndpointProvider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+  const link = yield* links.getForUser({
+    userId: input.userId,
+    environmentId: input.environmentId,
+  });
+  if (
+    link === null ||
+    link.environmentPublicKey !== input.environmentPublicKey ||
+    link.endpoint.providerKind !== "cloudflare_tunnel"
+  ) {
+    return yield* new HttpApiError.Unauthorized({});
+  }
+  const status = yield* managedEndpointProvider.reconcileOrigin({
+    userId: input.userId,
+    environmentId: input.environmentId,
+    tunnelId: input.tunnelId,
+    origin: input.origin,
+    endpoint: link.endpoint,
+  });
+  if (status === "recovery_required") {
+    return { status };
+  }
+  if (!(yield* allocations.enableRecovery(input))) {
+    return yield* new HttpApiError.Unauthorized({});
+  }
+  return { status };
+});
+
+export const recoverEnvironmentTunnelRecord = Effect.fn(
+  "relay.api.server.recoverEnvironmentTunnelRecord",
+)(function* (input: {
+  readonly userId: string;
+  readonly environmentId: string;
+  readonly environmentPublicKey: string;
+  readonly origin: RelayManagedEndpointOrigin;
+}) {
+  const links = yield* EnvironmentLinks.EnvironmentLinks;
+  const allocations = yield* ManagedEndpointAllocations.ManagedEndpointAllocations;
+  const managedEndpointProvider = yield* ManagedEndpointProvider.ManagedEndpointProvider;
+  const link = yield* links.getForUser({
+    userId: input.userId,
+    environmentId: input.environmentId,
+  });
+  if (
+    link === null ||
+    link.environmentPublicKey !== input.environmentPublicKey ||
+    link.endpoint.providerKind !== "cloudflare_tunnel"
+  ) {
+    return yield* new HttpApiError.Unauthorized({});
+  }
+
+  const recovered = yield* managedEndpointProvider.provision({
+    userId: input.userId,
+    environmentId: input.environmentId,
+    origin: input.origin,
+  });
+  const recoveredTunnelId = recovered.runtime.tunnelId;
+  if (
+    recoveredTunnelId === undefined ||
+    recovered.endpoint.httpBaseUrl !== link.endpoint.httpBaseUrl ||
+    recovered.endpoint.wsBaseUrl !== link.endpoint.wsBaseUrl
+  ) {
+    if (recoveredTunnelId !== undefined) {
+      yield* managedEndpointProvider
+        .release({
+          userId: input.userId,
+          environmentId: input.environmentId,
+          expectedTunnelId: recoveredTunnelId,
+        })
+        .pipe(
+          Effect.catch((cause) =>
+            Effect.logWarning("Failed to clean up a tunnel with a mismatched endpoint", {
+              userId: input.userId,
+              environmentId: input.environmentId,
+              tunnelId: recoveredTunnelId,
+              cause,
+            }),
+          ),
+        );
+    }
+    return yield* new HttpApiError.Unauthorized({});
+  }
+
+  const enabled = yield* allocations.enableRecovery({
+    userId: input.userId,
+    environmentId: input.environmentId,
+    tunnelId: recoveredTunnelId,
+    environmentPublicKey: input.environmentPublicKey,
+    origin: input.origin,
+  });
+  if (!enabled) {
+    const owner = { userId: input.userId, environmentId: input.environmentId };
+    const target = yield* managedEndpointProvider.prepareDeprovision(owner);
+    const currentLink = target === null ? null : yield* links.getForUser(input);
+    if (
+      target !== null &&
+      (currentLink === null || currentLink.endpoint.providerKind !== "cloudflare_tunnel")
+    ) {
+      yield* managedEndpointProvider.deprovision({ ...owner, target }).pipe(
+        Effect.catch((cause) =>
+          Effect.logWarning("Failed to clean up a tunnel after its managed link was removed", {
+            userId: input.userId,
+            environmentId: input.environmentId,
+            cause,
+          }),
+        ),
+      );
+    }
+    return yield* new HttpApiError.Unauthorized({});
+  }
+  return {
+    endpoint: recovered.endpoint,
+    endpointRuntime: recovered.runtime,
+  };
+});
+
 export const mobileApi = HttpApiBuilder.group(
   RelayApi,
   "mobile",
@@ -887,7 +1089,7 @@ export const serverApi = HttpApiBuilder.group(
   Effect.fnUntraced(function* (handlers) {
     const publisher = yield* AgentActivityPublisher.AgentActivityPublisher;
     const publishSignatures = yield* EnvironmentPublishSignatures.EnvironmentPublishSignatures;
-    return handlers.handle(
+    const activityHandlers = handlers.handle(
       "publishAgentActivity",
       Effect.fn("relay.api.server.publishAgentActivity")(
         function* (args) {
@@ -1021,6 +1223,82 @@ export const serverApi = HttpApiBuilder.group(
         mapRelayCommonApiErrors("not_authorized"),
       ),
     );
+
+    return activityHandlers
+      .handle(
+        "registerManagedEndpointRecovery",
+        Effect.fn("relay.api.server.registerManagedEndpointRecovery")(
+          function* ({ params, payload }) {
+            const principal = yield* RelayEnvironmentPrincipal;
+            if (principal.environmentId !== params.environmentId) {
+              return yield* new HttpApiError.Unauthorized({});
+            }
+            yield* verifyEnvironmentTunnelRecoveryProof({
+              action: "register",
+              proof: payload.proof,
+              userId: payload.cloudUserId,
+              environmentId: params.environmentId,
+              environmentPublicKey: principal.environmentPublicKey,
+              tunnelId: payload.tunnelId,
+              origin: payload.origin,
+            });
+            yield* appendRelayCredentialResponseHeaders;
+            return yield* registerEnvironmentTunnelRecovery({
+              userId: payload.cloudUserId,
+              environmentId: params.environmentId,
+              environmentPublicKey: principal.environmentPublicKey,
+              tunnelId: payload.tunnelId,
+              origin: payload.origin,
+            });
+          },
+          Effect.catchTags({
+            ManagedEndpointOriginNotAllowed: () => Effect.fail(new HttpApiError.Unauthorized({})),
+            ManagedEndpointProvisioningNotConfigured: () =>
+              relayInternalErrorResponse("upstream_unavailable"),
+            ManagedEndpointProvisioningFailed: () =>
+              relayInternalErrorResponse("upstream_unavailable"),
+            ManagedTunnelLimitExceeded: () => relayInternalErrorResponse("upstream_unavailable"),
+          }),
+          mapRelayCommonApiErrors("not_authorized"),
+        ),
+      )
+      .handle(
+        "recoverManagedEndpoint",
+        Effect.fn("relay.api.server.recoverManagedEndpoint")(
+          function* ({ params, payload }) {
+            const principal = yield* RelayEnvironmentPrincipal;
+            if (principal.environmentId !== params.environmentId) {
+              return yield* new HttpApiError.Unauthorized({});
+            }
+            yield* verifyEnvironmentTunnelRecoveryProof({
+              action: "recover",
+              proof: payload.proof,
+              userId: payload.cloudUserId,
+              environmentId: params.environmentId,
+              environmentPublicKey: principal.environmentPublicKey,
+              origin: payload.origin,
+            });
+            yield* appendRelayCredentialResponseHeaders;
+            return yield* recoverEnvironmentTunnelRecord({
+              userId: payload.cloudUserId,
+              environmentId: params.environmentId,
+              environmentPublicKey: principal.environmentPublicKey,
+              origin: payload.origin,
+            });
+          },
+          Effect.catchTags({
+            ManagedEndpointOriginNotAllowed: () => Effect.fail(new HttpApiError.Unauthorized({})),
+            ManagedEndpointProvisioningNotConfigured: () =>
+              relayInternalErrorResponse("upstream_unavailable"),
+            ManagedEndpointProvisioningFailed: () =>
+              relayInternalErrorResponse("upstream_unavailable"),
+            ManagedEndpointDeprovisioningFailed: () =>
+              relayInternalErrorResponse("upstream_unavailable"),
+            ManagedTunnelLimitExceeded: () => relayInternalErrorResponse("upstream_unavailable"),
+          }),
+          mapRelayCommonApiErrors("not_authorized"),
+        ),
+      );
   }),
 );
 
diff --git a/infra/relay/src/observability.test.ts b/infra/relay/src/observability.test.ts
index 3958b28b95dd..d77c01277f1c 100644
--- a/infra/relay/src/observability.test.ts
+++ b/infra/relay/src/observability.test.ts
@@ -62,6 +62,11 @@ it.effect("exports schema error fields as span attributes", () =>
 
     const request = yield* Deferred.await(exportedRequest).pipe(Effect.timeout("1 second"));
     const payload = (yield* decodeJson(request.body)) as OtlpTracer.TraceData;
+    const resourceAttributes = Object.fromEntries(
+      payload.resourceSpans
+        .flatMap((resourceSpan) => resourceSpan.resource.attributes)
+        .map((attribute) => [attribute.key, otlpAttributeValue(attribute.value)]),
+    );
     const span = payload.resourceSpans
       .flatMap((resourceSpan) => resourceSpan.scopeSpans)
       .flatMap((scopeSpan) => scopeSpan.spans)
@@ -75,6 +80,10 @@ it.effect("exports schema error fields as span attributes", () =>
 
     expect(request.authorization).toBe("Bearer test-token");
     expect(request.dataset).toBe("relay-test-traces");
+    expect(resourceAttributes).toMatchObject({
+      "service.name": "t3code-relay",
+      "service.namespace": "t3code",
+    });
     expect(attributes).toMatchObject({
       "error.type": "EnvironmentConnectNotAuthorized",
       "error.environmentId": "environment-1",
diff --git a/infra/relay/src/observability.ts b/infra/relay/src/observability.ts
index 831e6207319a..0837cacecfbe 100644
--- a/infra/relay/src/observability.ts
+++ b/infra/relay/src/observability.ts
@@ -244,8 +244,9 @@ export const makeRelayTraceLayer = (input: {
     OtlpTracer.make({
       url: input.tracesEndpoint,
       resource: {
-        serviceName: "t3-code-relay-worker",
+        serviceName: "t3code-relay",
         attributes: {
+          "service.namespace": "t3code",
           "service.runtime": "cloudflare-worker",
           "service.component": "relay",
         },
diff --git a/infra/relay/src/persistence/schema.ts b/infra/relay/src/persistence/schema.ts
index fd766c758989..1f5d8c4d94e2 100644
--- a/infra/relay/src/persistence/schema.ts
+++ b/infra/relay/src/persistence/schema.ts
@@ -2,6 +2,7 @@ import type {
   RelayAgentActivityAggregateState,
   RelayAgentActivityState,
   RelayAgentAwarenessPreferences,
+  RelayManagedEndpointOrigin,
 } from "@t3tools/contracts/relay";
 import {
   boolean,
@@ -94,6 +95,10 @@ export const relayManagedEndpointAllocations = pgTable(
     tunnelName: text("tunnel_name").notNull(),
     dnsRecordId: varchar("dns_record_id", { length: 191 }),
     readyAt: varchar("ready_at", { length: 64 }),
+    recoveryEnabledAt: varchar("recovery_enabled_at", { length: 64 }),
+    recoveryEnvironmentPublicKey: text("recovery_environment_public_key"),
+    origin: jsonb("origin").$type<RelayManagedEndpointOrigin>(),
+    generation: integer("generation").notNull().default(0),
     createdAt: varchar("created_at", { length: 64 }).notNull(),
     updatedAt: varchar("updated_at", { length: 64 }).notNull(),
   },
diff --git a/infra/relay/src/turbo/environmentLinkWritePath.test.ts b/infra/relay/src/turbo/environmentLinkWritePath.test.ts
index cd11b90f5a1e..b370cdc33f62 100644
--- a/infra/relay/src/turbo/environmentLinkWritePath.test.ts
+++ b/infra/relay/src/turbo/environmentLinkWritePath.test.ts
@@ -79,8 +79,9 @@ function unlinkLayer(
       ManagedEndpointProvider.ManagedEndpointProvider,
       ManagedEndpointProvider.ManagedEndpointProvider.of({
         provision: () => Effect.die("unused provision"),
+        reconcileOrigin: () => Effect.die("unused reconcileOrigin"),
         prepareDeprovision: () => Effect.succeed(null),
-        deprovision: () => Effect.void,
+        deprovision: () => Effect.succeed(true),
         release: () => Effect.die("unused release"),
       }),
     ),
diff --git a/infra/relay/src/worker.ts b/infra/relay/src/worker.ts
index 904b67a8df48..c02e3832a9c7 100644
--- a/infra/relay/src/worker.ts
+++ b/infra/relay/src/worker.ts
@@ -2,6 +2,7 @@ import * as Alchemy from "alchemy";
 import * as Cloudflare from "alchemy/Cloudflare";
 import * as Drizzle from "alchemy/Drizzle/Postgres";
 import * as Config from "effect/Config";
+import * as Cause from "effect/Cause";
 import * as DateTime from "effect/DateTime";
 import * as Crypto from "effect/Crypto";
 import * as Effect from "effect/Effect";
@@ -68,6 +69,7 @@ import * as EnvironmentConnector from "./environments/EnvironmentConnector.ts";
 import * as EnvironmentLinker from "./environments/EnvironmentLinker.ts";
 import * as EnvironmentPublishSignatures from "./environments/EnvironmentPublishSignatures.ts";
 import * as ManagedEndpointProvider from "./environments/ManagedEndpointProvider.ts";
+import * as ManagedEndpointReaper from "./environments/ManagedEndpointReaper.ts";
 import * as ManagedTunnelLimits from "./environments/ManagedTunnelLimits.ts";
 import * as MobileRegistrations from "./agentActivity/MobileRegistrations.ts";
 
@@ -189,6 +191,7 @@ export const ApiLive = Api.make(
     yield* yield* relayApiZone.zoneId;
     const managedEndpointDnsBinding = yield* Cloudflare.DNS.ReadWriteDns(managedEndpointZone);
     const managedEndpointZoneName = yield* managedEndpointZone.name;
+    const managedEndpointCleanupMode = yield* RelayConfiguration.managedEndpointCleanupModeConfig;
 
     //
     // 3. Runtime layers and app construction
@@ -211,6 +214,7 @@ export const ApiLive = Api.make(
         cloudMintPublicKey: yield* cloudMintPublicKey,
         managedEndpointBaseDomain: yield* managedEndpointZoneName,
         managedEndpointNamespace: stage,
+        managedEndpointCleanupMode,
       });
     });
 
@@ -280,7 +284,9 @@ export const ApiLive = Api.make(
       Layer.provideMerge(agentActivityPublisherLayer),
       Layer.provideMerge(EnvironmentConnector.layer),
       Layer.provideMerge(EnvironmentLinker.layer),
-      Layer.provideMerge(EnvironmentPublishSignatures.layer),
+      Layer.provideMerge(
+        Layer.merge(EnvironmentPublishSignatures.layer, ManagedEndpointReaper.layer),
+      ),
       Layer.provideMerge(
         ManagedEndpointProvider.layerCloudflareBindings(
           managedEndpointTunnelBinding,
@@ -363,21 +369,45 @@ export const ApiLive = Api.make(
     }
 
     yield* Cloudflare.Workers.cron("*/5 * * * *", () =>
-      DpopProofs.DpopProofReplay.pipe(
-        Effect.flatMap((dpopProofs) => dpopProofs.pruneExpired),
-        // Terminal thread rows are kept briefly so finished agents show as
-        // Done/Failed in the Live Activity; sweep them once they age out.
-        Effect.andThen(
-          Effect.all([AgentActivityRows.AgentActivityRows, DateTime.now]).pipe(
-            Effect.flatMap(([activityRows, now]) =>
-              activityRows.pruneTerminal({
-                updatedBefore: DateTime.formatIso(DateTime.subtract(now, { minutes: 30 })),
-              }),
+      Effect.all(
+        [
+          DpopProofs.DpopProofReplay.pipe(
+            Effect.flatMap((dpopProofs) => dpopProofs.pruneExpired),
+            // Keep completed thread rows long enough to show their final state.
+            Effect.andThen(
+              Effect.all([AgentActivityRows.AgentActivityRows, DateTime.now]).pipe(
+                Effect.flatMap(([activityRows, now]) =>
+                  activityRows.pruneTerminal({
+                    updatedBefore: DateTime.formatIso(DateTime.subtract(now, { minutes: 30 })),
+                  }),
+                ),
+              ),
+            ),
+            Effect.catchCause((cause) =>
+              Cause.hasInterrupts(cause)
+                ? Effect.interrupt
+                : Effect.logWarning("Failed to prune expired relay state", { cause }),
             ),
           ),
-        ),
+          ManagedEndpointReaper.ManagedEndpointReaper.pipe(
+            Effect.flatMap((reaper) => reaper.sweep.pipe(Effect.timeout("2 minutes"))),
+            Effect.tap((result) =>
+              result.scanned > 0
+                ? Effect.logInfo("Finished managed tunnel cleanup", result)
+                : Effect.void,
+            ),
+            Effect.catchCause((cause) =>
+              Cause.hasInterrupts(cause)
+                ? Effect.interrupt
+                : Effect.logWarning("Failed to clean up inactive managed tunnels", { cause }),
+            ),
+          ),
+        ],
+        { concurrency: 2, discard: true },
+      ).pipe(
         Effect.withSpan("relay.cron.prune_expired_state"),
-        Effect.provide(runtimeLayer),
+        // Export cron spans to Axiom like HTTP spans; the scope flushes them before the run ends.
+        Effect.provide(Layer.merge(runtimeLayer, relayTraceLayer)),
       ),
     );
 
diff --git a/knip.jsonc b/knip.jsonc
index b3e2a3e908bc..21a8f82323a1 100644
--- a/knip.jsonc
+++ b/knip.jsonc
@@ -13,8 +13,9 @@
       "vitest": { "entry": [".github/**/*.test.cjs"] },
     },
     "scripts": {
-      // Knip loads its preprocessor through a CLI option; native verification runs directly.
-      "entry": ["knip-schemas.ts", "mobile-native-client.ts"],
+      // Knip loads its preprocessor through a CLI option; native verification and
+      // worktree setup (from t3.json) run directly.
+      "entry": ["knip-schemas.ts", "mobile-native-client.ts", "setup-worktree.ts"],
     },
     "apps/server": {
       // Vite+ pack entries and the launcher used by installed background services.
@@ -41,6 +42,8 @@
         "src/snapShot/GlobalShiftShortcutWorker.ts!",
         "src/snapShot/RegionSnapShotWorker.ts!",
         "src/snapShot/SnapShotAccessibilityWorker.ts!",
+        "src/boot.ts!",
+        "src/compileCache.ts!",
         "src/main.ts!",
         "src/preload.ts!",
         "src/preview-pick-preload.ts!",
@@ -53,7 +56,9 @@
       "ignoreDependencies": ["playwright-core", "electron-builder"],
     },
     "apps/web": {
-      // Worktree setup invokes this directly from t3.json.
+      // Vitest loads this through the per-file @vitest-environment directive.
+      "ignoreDependencies": ["jsdom"],
+      // Worktree setup (scripts/setup-worktree.ts) runs this directly.
       "entry": ["scripts/warm-dep-cache.ts"],
       // UI component modules are copied and adapted as cohesive sets. Keep their
       // named subcomponents even before they have callers; the file audit still
diff --git a/package.json b/package.json
index 40c557fedec6..8d1484954aa3 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
     "knip:check": "knip --include files,dependencies --no-config-hints && knip --workspace apps/server --workspace apps/desktop --workspace apps/web --workspace packages/client-runtime --workspace packages/contracts --workspace packages/effect-acp --workspace packages/effect-codex-app-server --workspace packages/shared --workspace packages/ssh --workspace packages/tailscale --exports --preprocessor ./scripts/knip-schemas.ts --no-config-hints",
     "knip:production": "knip --production --preprocessor ./scripts/knip-schemas.ts",
     "lint:mobile": "node scripts/mobile-native-static-check.ts",
-    "lint:restyle-ceiling": "node scripts/lint-restyle-ceiling.ts",
     "test": "vp run -r test",
     "test:resource-monitor": "cargo test --locked --manifest-path native/resource-monitor/Cargo.toml",
     "test:desktop-smoke": "vp run --filter @t3tools/desktop smoke-test",
diff --git a/packages/client-runtime/package.json b/packages/client-runtime/package.json
index 3e863b487acc..d8545a4e0b9c 100644
--- a/packages/client-runtime/package.json
+++ b/packages/client-runtime/package.json
@@ -119,6 +119,10 @@
       "types": "./src/textPaste.ts",
       "default": "./src/textPaste.ts"
     },
+    "./delayed-status": {
+      "types": "./src/delayedStatus.ts",
+      "default": "./src/delayedStatus.ts"
+    },
     "./state/connections": {
       "types": "./src/state/connections.ts",
       "default": "./src/state/connections.ts"
@@ -270,6 +274,38 @@
     "./file-preview": {
       "types": "./src/filePreview.ts",
       "default": "./src/filePreview.ts"
+    },
+    "./device/frame": {
+      "types": "./src/device/frame.ts",
+      "default": "./src/device/frame.ts"
+    },
+    "./device/phone-viewer": {
+      "types": "./src/device/phoneViewer.ts",
+      "default": "./src/device/phoneViewer.ts"
+    },
+    "./device/phone-interaction": {
+      "types": "./src/device/phoneInteraction.ts",
+      "default": "./src/device/phoneInteraction.ts"
+    },
+    "./device/shape-profile": {
+      "types": "./src/device/shapeProfile.ts",
+      "default": "./src/device/shapeProfile.ts"
+    },
+    "./device/screenshot": {
+      "types": "./src/device/screenshot.ts",
+      "default": "./src/device/screenshot.ts"
+    },
+    "./device/model": {
+      "types": "./src/device/model.ts",
+      "default": "./src/device/model.ts"
+    },
+    "./device/duo-viewer": {
+      "types": "./src/device/duoViewer.ts",
+      "default": "./src/device/duoViewer.ts"
+    },
+    "./device/duo-control": {
+      "types": "./src/device/duoControl.ts",
+      "default": "./src/device/duoControl.ts"
     }
   },
   "scripts": {
@@ -284,10 +320,12 @@
     "micromark-extension-directive": "^4.0.0",
     "micromark-util-character": "^2.1.1",
     "remark-parse": "^11.0.0",
+    "three": "0.180.0",
     "unified": "^11.0.5"
   },
   "devDependencies": {
     "@effect/vitest": "catalog:",
+    "@types/three": "0.180.0",
     "micromark-util-types": "^2.0.2",
     "vite-plus": "catalog:"
   }
diff --git a/packages/client-runtime/src/authorization/layer.test.ts b/packages/client-runtime/src/authorization/layer.test.ts
index 5cd2d89d1ac2..d31f37db2eb7 100644
--- a/packages/client-runtime/src/authorization/layer.test.ts
+++ b/packages/client-runtime/src/authorization/layer.test.ts
@@ -199,7 +199,7 @@ const makeHarness = Effect.fn("TestRemoteAuthorization.makeHarness")(function* (
           clerkToken: input.clerkToken ?? Effect.succeed("clerk-session"),
         }),
         Layer.succeed(ClientCapabilities.RelayDeviceIdentity, {
-          deviceId: Effect.succeed(Option.some("device-1")),
+          deviceId: Effect.succeedSome("device-1"),
         }),
         Layer.succeed(TokenStore.RemoteDpopAccessTokenStore, tokenStore),
         Layer.succeed(
diff --git a/packages/client-runtime/src/connection/layer.ts b/packages/client-runtime/src/connection/layer.ts
index 46dcdcf569b9..b64e58c4fef1 100644
--- a/packages/client-runtime/src/connection/layer.ts
+++ b/packages/client-runtime/src/connection/layer.ts
@@ -32,11 +32,18 @@ export const watchDiscoveredCompatibility = Effect.fn("connection.watchDiscovere
               if (!current.environments.has(environmentId)) seenChecks.delete(environmentId);
             }
           }
+          const registered = yield* SubscriptionRef.get(registry.entries);
           for (const entry of current.environments.values()) {
             const status = Option.getOrNull(entry.status);
             const descriptor = status?.descriptor;
             if (status === null || descriptor === undefined) continue;
             const environmentId = entry.environment.environmentId;
+            // Discovery describes the server behind the relay route. A direct
+            // connection (the desktop's own server, a saved URL, SSH) can reach
+            // a different server with the same environment id, such as a
+            // preview app that shares the home directory. Its socket handshake
+            // already checks the protocol.
+            if (registered.get(environmentId)?.target._tag !== "RelayConnectionTarget") continue;
             const previous = seenChecks.get(environmentId);
             const fresh =
               previous?.checkedAt !== status.checkedAt ||
diff --git a/packages/client-runtime/src/connection/registry.test.ts b/packages/client-runtime/src/connection/registry.test.ts
index 729d27060187..8a71344ad173 100644
--- a/packages/client-runtime/src/connection/registry.test.ts
+++ b/packages/client-runtime/src/connection/registry.test.ts
@@ -275,12 +275,12 @@ const makeHarness = Effect.fn("TestEnvironmentRegistry.makeHarness")(function* (
         next.set(environmentId, snapshot);
         return next;
       }),
-    loadThread: (_environmentId, _threadId) => Effect.succeed(Option.none()),
+    loadThread: (_environmentId, _threadId) => Effect.succeedNone,
     saveThread: (_environmentId, _thread) => Effect.void,
     removeThread: (_environmentId, _threadId) => Effect.void,
-    loadServerConfig: () => Effect.succeed(Option.none()),
+    loadServerConfig: () => Effect.succeedNone,
     saveServerConfig: () => Effect.void,
-    loadVcsRefs: () => Effect.succeed(Option.none()),
+    loadVcsRefs: () => Effect.succeedNone,
     saveVcsRefs: () => Effect.void,
     removeVcsRefs: () => Effect.void,
     clearVcsRefs: () => Effect.void,
@@ -683,7 +683,7 @@ describe("EnvironmentRegistry", () => {
 
   it.effect("only a fresh health check for the rejected environment unlocks it", () =>
     Effect.gen(function* () {
-      const harness = yield* makeHarness([RELAY_TARGET], [], [], {
+      const harness = yield* makeHarness([RELAY_TARGET, SECOND_RELAY_TARGET], [], [], {
         initialDisabled: [RELAY_TARGET.environmentId],
       });
       const descriptor = (environmentId: EnvironmentId): ExecutionEnvironmentDescriptor => ({
@@ -778,8 +778,8 @@ describe("EnvironmentRegistry", () => {
         yield* SubscriptionRef.update(discoveryState, (state) => ({
           ...state,
           environments: new Map(state.environments).set(
-            SECOND_TARGET.environmentId,
-            discovered(descriptor(SECOND_TARGET.environmentId)),
+            SECOND_RELAY_TARGET.environmentId,
+            discovered(descriptor(SECOND_RELAY_TARGET.environmentId)),
           ),
         }));
         yield* Deferred.await(unrelated);
@@ -798,8 +798,8 @@ describe("EnvironmentRegistry", () => {
           environments: new Map([
             [RELAY_TARGET.environmentId, discovered(descriptor(RELAY_TARGET.environmentId))],
             [
-              SECOND_TARGET.environmentId,
-              discovered(descriptor(SECOND_TARGET.environmentId), "2026-09-15T00:01:00Z"),
+              SECOND_RELAY_TARGET.environmentId,
+              discovered(descriptor(SECOND_RELAY_TARGET.environmentId), "2026-09-15T00:01:00Z"),
             ],
           ]),
         }));
@@ -827,6 +827,92 @@ describe("EnvironmentRegistry", () => {
     }),
   );
 
+  it.effect("discovery leaves direct connections that share an environment id alone", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeHarness([TARGET, RELAY_TARGET]);
+      const discovered = (environmentId: EnvironmentId) => {
+        const endpoint = {
+          httpBaseUrl: "https://relay.example.test",
+          wsBaseUrl: "wss://relay.example.test",
+          providerKind: "manual" as const,
+        };
+        return {
+          environment: {
+            environmentId,
+            label: "Preview server",
+            endpoint,
+            linkedAt: "2026-09-25T00:00:00Z",
+          },
+          availability: "online" as const,
+          status: Option.some<RelayEnvironmentStatusResponse>({
+            environmentId,
+            endpoint,
+            status: "online",
+            checkedAt: "2026-09-25T00:00:00Z",
+            descriptor: {
+              environmentId,
+              label: "Preview server",
+              platform: { os: "darwin", arch: "arm64" },
+              serverVersion: "2.0.0",
+              orchestrationProtocolVersion: ORCHESTRATION_PROTOCOL_VERSION + 1,
+              capabilities: { repositoryIdentity: true },
+            },
+          }),
+          error: Option.none(),
+        };
+      };
+      yield* Effect.gen(function* () {
+        const registry = yield* EnvironmentRegistry.EnvironmentRegistry;
+        yield* registry.start;
+        yield* awaitConnectionState(
+          registry,
+          TARGET.environmentId,
+          (state) => state.phase === "connected",
+        );
+        const relayChecked = yield* Deferred.make<void>();
+        yield* watchDiscoveredCompatibility().pipe(
+          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, {
+            ...registry,
+            setCompatibility: (environmentId, error) =>
+              registry
+                .setCompatibility(environmentId, error)
+                .pipe(
+                  Effect.andThen(
+                    environmentId === RELAY_TARGET.environmentId
+                      ? Deferred.succeed(relayChecked, undefined)
+                      : Effect.void,
+                  ),
+                ),
+          }),
+          Effect.provideService(
+            RelayEnvironmentDiscovery.RelayEnvironmentDiscovery,
+            RelayEnvironmentDiscovery.RelayEnvironmentDiscovery.of({
+              state:
+                yield* SubscriptionRef.make<RelayEnvironmentDiscovery.RelayEnvironmentDiscoveryState>(
+                  {
+                    ...RelayEnvironmentDiscovery.EMPTY_RELAY_ENVIRONMENT_DISCOVERY_STATE,
+                    environments: new Map([
+                      [TARGET.environmentId, discovered(TARGET.environmentId)],
+                      [RELAY_TARGET.environmentId, discovered(RELAY_TARGET.environmentId)],
+                    ]),
+                  },
+                ),
+              refresh: Effect.void,
+            }),
+          ),
+          Effect.forkScoped,
+        );
+        yield* Deferred.await(relayChecked);
+
+        const entries = yield* SubscriptionRef.get(registry.entries);
+        expect(entries.get(RELAY_TARGET.environmentId)).toMatchObject({ enabled: false });
+        expect(entries.get(TARGET.environmentId)).toMatchObject({ enabled: true });
+        expect(entries.get(TARGET.environmentId)?.unsupportedReason).toBeUndefined();
+        expect((yield* registry.state(TARGET.environmentId)).phase).toBe("connected");
+      }).pipe(Effect.provide(harness.layer), Effect.scoped);
+    }),
+  );
+
   it.effect("discovery keeps unsupported environments off until compatibility changes", () =>
     Effect.gen(function* () {
       const harness = yield* makeHarness([RELAY_TARGET], [], [], {
diff --git a/packages/client-runtime/src/connection/resolver.ts b/packages/client-runtime/src/connection/resolver.ts
index af1a417fc594..120f63cc07ef 100644
--- a/packages/client-runtime/src/connection/resolver.ts
+++ b/packages/client-runtime/src/connection/resolver.ts
@@ -110,10 +110,9 @@ const makeBearerBroker = Effect.fn("clientRuntime.connection.broker.makeBearer")
     entry: ConnectionCatalogEntry & { readonly target: BearerConnectionTarget },
   ) {
     const target = entry.target;
-    const profile = yield* Option.match(entry.profile, {
-      onNone: () => Effect.fail(profileMissingError(target.connectionId)),
-      onSome: Effect.succeed,
-    });
+    const profile = yield* Effect.fromOption(entry.profile, () =>
+      profileMissingError(target.connectionId),
+    );
     if (!isBearerProfile(profile)) {
       return yield* new ConnectionBlockedError({
         reason: "configuration",
@@ -186,10 +185,9 @@ const makeSshBroker = Effect.fn("clientRuntime.connection.broker.makeSsh")(funct
     entry: ConnectionCatalogEntry & { readonly target: SshConnectionTarget },
   ) {
     const target = entry.target;
-    const profile = yield* Option.match(entry.profile, {
-      onNone: () => Effect.fail(profileMissingError(target.connectionId)),
-      onSome: Effect.succeed,
-    });
+    const profile = yield* Effect.fromOption(entry.profile, () =>
+      profileMissingError(target.connectionId),
+    );
     if (!isSshProfile(profile)) {
       return yield* new ConnectionBlockedError({
         reason: "configuration",
diff --git a/packages/client-runtime/src/connection/supervisor.test.ts b/packages/client-runtime/src/connection/supervisor.test.ts
index 882e67aac33c..7ad709c3a54b 100644
--- a/packages/client-runtime/src/connection/supervisor.test.ts
+++ b/packages/client-runtime/src/connection/supervisor.test.ts
@@ -1290,11 +1290,11 @@ describe("EnvironmentSupervisor", () => {
             Layer.succeed(ManagedRelayDpopSigner, signer),
             Layer.succeed(ManagedRelayClient, relay),
             Layer.succeed(ClientCapabilities.CloudSession, {
-              identity: Effect.succeed(Option.some({ accountId: "test-account" })),
+              identity: Effect.succeedSome({ accountId: "test-account" }),
               clerkToken: Effect.succeed("clerk-token"),
             }),
             Layer.succeed(ClientCapabilities.RelayDeviceIdentity, {
-              deviceId: Effect.succeed(Option.none()),
+              deviceId: Effect.succeedNone,
             }),
             TokenStore.layer({
               get: () => Ref.get(token),
diff --git a/packages/client-runtime/src/connection/supervisor.ts b/packages/client-runtime/src/connection/supervisor.ts
index 45ef02292056..b75413bbb7de 100644
--- a/packages/client-runtime/src/connection/supervisor.ts
+++ b/packages/client-runtime/src/connection/supervisor.ts
@@ -606,6 +606,7 @@ export const make = Effect.fn("EnvironmentSupervisor.make")(function* (
   }, Effect.ensuring(clearLease));
 
   const waitForRetrySignal = Effect.fnUntraced(function* (delayMs: number) {
+    // @effect-diagnostics-next-line raceFirstWithSleepToTimeout:off - the sleep is the retry delay (false), not a timeout around the signal loop
     return yield* Effect.raceFirst(
       Effect.sleep(delayMs).pipe(Effect.as(false)),
       Effect.gen(function* () {
diff --git a/packages/client-runtime/src/delayedStatus.test.ts b/packages/client-runtime/src/delayedStatus.test.ts
new file mode 100644
index 000000000000..4d48d2fe211f
--- /dev/null
+++ b/packages/client-runtime/src/delayedStatus.test.ts
@@ -0,0 +1,65 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
+
+import {
+  createDelayedStatus,
+  STATUS_MIN_VISIBLE_MS,
+  STATUS_SHOW_DELAY_MS,
+  type ShownStatus,
+} from "./delayedStatus.ts";
+
+function track() {
+  const changes: Array<ShownStatus<string> | null> = [];
+  const status = createDelayedStatus<string>((shown) => changes.push(shown));
+  return { changes, status };
+}
+
+describe("createDelayedStatus", () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+  });
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it("never shows a status that clears before the show delay", () => {
+    const { changes, status } = track();
+    status.update("a", "syncing");
+    vi.advanceTimersByTime(STATUS_SHOW_DELAY_MS - 1);
+    status.update("a", null);
+    vi.runAllTimers();
+
+    expect(changes).toEqual([]);
+  });
+
+  it("holds each shown status for the minimum time, then hides it at once", () => {
+    const { changes, status } = track();
+    status.update("a", "loading");
+    vi.advanceTimersByTime(STATUS_SHOW_DELAY_MS);
+    expect(changes).toEqual([{ key: "a", value: "loading" }]);
+
+    // A new label gets its own full hold, even during the first label's hold.
+    vi.advanceTimersByTime(1);
+    status.update("a", "syncing");
+    status.update("a", null);
+    vi.advanceTimersByTime(STATUS_MIN_VISIBLE_MS - 1);
+    expect(changes.at(-1)).toEqual({ key: "a", value: "syncing" });
+    vi.advanceTimersByTime(1);
+    expect(changes.at(-1)).toBeNull();
+
+    status.update("a", "syncing");
+    vi.advanceTimersByTime(STATUS_SHOW_DELAY_MS + STATUS_MIN_VISIBLE_MS);
+    status.update("a", null);
+    expect(changes.at(-1)).toBeNull();
+  });
+
+  it("drops the shown status at once when the key changes", () => {
+    const { changes, status } = track();
+    status.update("a", "syncing");
+    vi.advanceTimersByTime(STATUS_SHOW_DELAY_MS);
+    status.update("b", "syncing");
+    expect(changes.at(-1)).toBeNull();
+
+    vi.advanceTimersByTime(STATUS_SHOW_DELAY_MS);
+    expect(changes.at(-1)).toEqual({ key: "b", value: "syncing" });
+  });
+});
diff --git a/packages/client-runtime/src/delayedStatus.ts b/packages/client-runtime/src/delayedStatus.ts
new file mode 100644
index 000000000000..faca3d2f9ff5
--- /dev/null
+++ b/packages/client-runtime/src/delayedStatus.ts
@@ -0,0 +1,86 @@
+// @effect-diagnostics globalTimers:off - Display timing for React hooks, outside an Effect runtime.
+
+/** How long a status must last before a client shows it. */
+export const STATUS_SHOW_DELAY_MS = 400;
+/** How long a shown status stays up, so it cannot flash at the show delay. */
+export const STATUS_MIN_VISIBLE_MS = 400;
+
+/** The status a client should show, and the key it belongs to. */
+export interface ShownStatus<A> {
+  readonly key: string;
+  readonly value: A;
+}
+
+export interface DelayedStatus<A> {
+  /** Reports the real status for `key`. A new key drops the shown status at once. */
+  readonly update: (key: string, value: A | null) => void;
+  /** Cancels pending timers. A later `update` starts again from the real status. */
+  readonly dispose: () => void;
+}
+
+/**
+ * Turns a real status (for example the thread sync phase) into the status a
+ * client shows. A status that clears within `STATUS_SHOW_DELAY_MS` is never
+ * shown. A shown status stays for at least `STATUS_MIN_VISIBLE_MS`. Values
+ * compare by identity, so use strings or other stable values.
+ *
+ * Web and mobile wrap this in a small `useDelayedStatus` hook.
+ */
+export function createDelayedStatus<A>(
+  onChange: (shown: ShownStatus<A> | null) => void,
+): DelayedStatus<A> {
+  let key = "";
+  let latest: A | null = null;
+  let shown: A | null = null;
+  // While hidden, this is the show delay. While shown, the minimum visible time.
+  let timer: ReturnType<typeof setTimeout> | undefined;
+
+  const clearTimer = () => {
+    clearTimeout(timer);
+    timer = undefined;
+  };
+  const hide = () => {
+    shown = null;
+    onChange(null);
+  };
+  // Every shown value, including a new label, gets the full minimum visible time.
+  const show = (value: A) => {
+    shown = value;
+    onChange({ key, value });
+    clearTimer();
+    timer = setTimeout(() => {
+      timer = undefined;
+      if (latest === null) hide();
+    }, STATUS_MIN_VISIBLE_MS);
+  };
+
+  return {
+    update: (nextKey, value) => {
+      if (nextKey !== key) {
+        key = nextKey;
+        clearTimer();
+        if (shown !== null) hide();
+      }
+      latest = value;
+
+      if (shown === null) {
+        if (value === null) {
+          clearTimer();
+        } else if (timer === undefined) {
+          timer = setTimeout(() => {
+            timer = undefined;
+            if (latest !== null) show(latest);
+          }, STATUS_SHOW_DELAY_MS);
+        }
+        return;
+      }
+
+      if (value !== null) {
+        if (value !== shown) show(value);
+      } else if (timer === undefined) {
+        hide();
+      }
+    },
+    dispose: clearTimer,
+  };
+}
diff --git a/packages/client-runtime/src/device/androidFoldScene.test.ts b/packages/client-runtime/src/device/androidFoldScene.test.ts
new file mode 100644
index 000000000000..e1e237a9f131
--- /dev/null
+++ b/packages/client-runtime/src/device/androidFoldScene.test.ts
@@ -0,0 +1,78 @@
+import { Box3, Mesh, PerspectiveCamera, Texture, Vector3 } from "three";
+import { describe, expect, it } from "vite-plus/test";
+import { createAndroidFoldScene } from "./androidFoldScene.ts";
+import { phoneDisplayLayout } from "./phoneScene.ts";
+
+describe("Android fold scene", () => {
+  it("moves one physical half around the hinge while preserving both screen halves", () => {
+    const texture = new Texture();
+    const scene = createAndroidFoldScene(
+      texture,
+      phoneDisplayLayout({ width: 2200, height: 1840, orientation: "landscape_left" }, 2200, 1840),
+      180,
+    );
+    const moving = scene.orientation.children[0]!;
+    const fixed = scene.orientation.children[1]!;
+    const openWidth = new Box3().setFromObject(scene.root).getSize(new Vector3()).x;
+    const leftScreen = scene.root.getObjectByName("left-inner-screen") as Mesh;
+    const rightScreen = scene.root.getObjectByName("right-inner-screen") as Mesh;
+    leftScreen.geometry.computeBoundingBox();
+    rightScreen.geometry.computeBoundingBox();
+    const creaseWidth =
+      rightScreen.geometry.boundingBox!.min.x - leftScreen.geometry.boundingBox!.max.x;
+    expect(creaseWidth).toBeLessThan(0.01);
+    const continuousScreen = scene.root.getObjectByName("continuous-inner-screen") as Mesh;
+    const positions = continuousScreen.geometry.getAttribute("position");
+    expect(continuousScreen.geometry.index).not.toBeNull();
+    expect(Array.from({ length: positions.count }, (_, i) => positions.getX(i))).toContain(0);
+    scene.setAngle(90);
+    expect(moving.rotation.y).toBeCloseTo(Math.PI / 2);
+    expect(fixed.rotation.y).toBe(0);
+    scene.setAngle(0);
+    const closedWidth = new Box3().setFromObject(scene.root).getSize(new Vector3()).x;
+    expect(closedWidth).toBeLessThan(openWidth * 0.7);
+    expect(scene.root.getObjectByName("cover-screen")?.visible).toBe(true);
+    scene.dispose();
+    texture.dispose();
+  });
+
+  it("maps touches on each open half and the closed cover to the live frame", () => {
+    const texture = new Texture();
+    const scene = createAndroidFoldScene(texture, phoneDisplayLayout(null, 2200, 1840), 180);
+    const camera = new PerspectiveCamera(32, 1, 0.1, 30);
+    camera.position.z = 6;
+    camera.updateMatrixWorld(true);
+    const project = (x: number) => {
+      const point = new Vector3(x, 0, 0.041).project(camera);
+      return scene.screenPoint((point.x + 1) / 2, (1 - point.y) / 2, camera);
+    };
+    expect(project(-0.52)?.x).toBeCloseTo(0.25, 1);
+    expect(project(0.52)?.x).toBeCloseTo(0.75, 1);
+    expect(scene.screenPoint(0.99, 0.5, camera, true)?.x).toBe(1);
+    scene.setAngle(0);
+    expect(project(0.52)?.x).toBeCloseTo(0.5, 1);
+    scene.dispose();
+    texture.dispose();
+  });
+
+  it("shapes the inner display to the raw frame, portrait or landscape", () => {
+    const texture = new Texture();
+    for (const [width, height] of [
+      [2076, 2152],
+      [2208, 1840],
+    ] as const) {
+      const scene = createAndroidFoldScene(
+        texture,
+        phoneDisplayLayout(null, width, height),
+        180,
+        width / height,
+      );
+      const screen = scene.root.getObjectByName("continuous-inner-screen") as Mesh;
+      screen.geometry.computeBoundingBox();
+      const size = screen.geometry.boundingBox!.getSize(new Vector3());
+      expect(size.x / size.y).toBeCloseTo(width / height, 2);
+      scene.dispose();
+    }
+    texture.dispose();
+  });
+});
diff --git a/packages/client-runtime/src/device/androidFoldScene.ts b/packages/client-runtime/src/device/androidFoldScene.ts
new file mode 100644
index 000000000000..b2c1f84fe038
--- /dev/null
+++ b/packages/client-runtime/src/device/androidFoldScene.ts
@@ -0,0 +1,420 @@
+import {
+  BoxGeometry,
+  CircleGeometry,
+  CylinderGeometry,
+  ExtrudeGeometry,
+  Group,
+  Mesh,
+  MeshBasicMaterial,
+  MeshPhysicalMaterial,
+  MeshStandardMaterial,
+  PlaneGeometry,
+  Raycaster,
+  Shape,
+  ShapeGeometry,
+  Vector2,
+  Vector3,
+  type Camera,
+  type Texture,
+} from "three";
+import type { PhoneDisplayLayout } from "./phoneScene.ts";
+
+const HEIGHT = 2.2;
+const DEPTH = 0.075;
+const INSET = 0.026;
+const CREASE = 0.004;
+const BEVEL = 0.008;
+// The hinge axis sits just above the inner screens so closed halves meet face to face.
+const PIVOT_Z = DEPTH / 2 + 0.005;
+const SPINE_RADIUS = PIVOT_Z + DEPTH / 2 - 0.002;
+/** Width over height of the unfolded inner display until a live frame reports its own. */
+export const DEFAULT_FOLD_INNER_ASPECT = 2076 / 2152;
+/**
+ * Unfolded inner displays are near square in either orientation. Cover displays are
+ * phone shaped (about 0.4-0.5, or 2-2.6 when rotated), so they never retune the body.
+ */
+export const isFoldInnerAspect = (aspect: number) =>
+  Number.isFinite(aspect) && aspect > 0.75 && aspect < 1.5;
+
+function panelPath(
+  halfWidth: number,
+  side: "left" | "right",
+  inset: number,
+  radius: number,
+  hingeInset = 0,
+) {
+  const left = side === "left" ? -halfWidth + inset : CREASE / 2 + hingeInset;
+  const right = side === "left" ? -CREASE / 2 - hingeInset : halfWidth - inset;
+  const bottom = -HEIGHT / 2 + inset;
+  const top = HEIGHT / 2 - inset;
+  const path = new Shape();
+  if (side === "left") {
+    path.moveTo(left + radius, bottom);
+    path.lineTo(right, bottom);
+    path.lineTo(right, top);
+    path.lineTo(left + radius, top);
+    path.quadraticCurveTo(left, top, left, top - radius);
+    path.lineTo(left, bottom + radius);
+    path.quadraticCurveTo(left, bottom, left + radius, bottom);
+  } else {
+    path.moveTo(left, bottom);
+    path.lineTo(right - radius, bottom);
+    path.quadraticCurveTo(right, bottom, right, bottom + radius);
+    path.lineTo(right, top - radius);
+    path.quadraticCurveTo(right, top, right - radius, top);
+    path.lineTo(left, top);
+  }
+  path.closePath();
+  return path;
+}
+
+function roundedRectPath(width: number, height: number, radius: number) {
+  const path = new Shape();
+  path.moveTo(-width / 2 + radius, -height / 2);
+  path.lineTo(width / 2 - radius, -height / 2);
+  path.quadraticCurveTo(width / 2, -height / 2, width / 2, -height / 2 + radius);
+  path.lineTo(width / 2, height / 2 - radius);
+  path.quadraticCurveTo(width / 2, height / 2, width / 2 - radius, height / 2);
+  path.lineTo(-width / 2 + radius, height / 2);
+  path.quadraticCurveTo(-width / 2, height / 2, -width / 2, height / 2 - radius);
+  path.lineTo(-width / 2, -height / 2 + radius);
+  path.quadraticCurveTo(-width / 2, -height / 2, -width / 2 + radius, -height / 2);
+  path.closePath();
+  return path;
+}
+
+function coverPath(halfWidth: number) {
+  return roundedRectPath(halfWidth - INSET * 2 - 0.02, HEIGHT - INSET * 2 - 0.04, 0.07);
+}
+
+/**
+ * A procedural book-style foldable: one fixed half, one half rotating around a shared hinge.
+ * The inner display keeps the raw framebuffer's native aspect, portrait or landscape.
+ */
+export function createAndroidFoldScene(
+  texture: Texture,
+  layout: PhoneDisplayLayout,
+  initialAngle: number,
+  innerAspect = DEFAULT_FOLD_INNER_ASPECT,
+) {
+  const screenHeight = HEIGHT - 2 * INSET;
+  const halfWidth = (innerAspect * screenHeight) / 2 + INSET;
+  const root = new Group();
+  const orientation = new Group();
+  root.add(orientation);
+  const left = new Group();
+  const right = new Group();
+  orientation.add(left, right);
+  const frameMetal = new MeshStandardMaterial({
+    color: 0xa3abb2,
+    metalness: 0.9,
+    roughness: 0.28,
+  });
+  const polishedMetal = new MeshStandardMaterial({
+    color: 0xc4cad0,
+    metalness: 0.95,
+    roughness: 0.16,
+  });
+  const bezel = new MeshPhysicalMaterial({
+    color: 0x0b0d10,
+    metalness: 0.1,
+    roughness: 0.2,
+    clearcoat: 1,
+  });
+  const backGlass = new MeshPhysicalMaterial({
+    color: 0x2c3237,
+    metalness: 0.35,
+    roughness: 0.52,
+    clearcoat: 0.4,
+    clearcoatRoughness: 0.6,
+  });
+  const island = new MeshPhysicalMaterial({
+    color: 0x1a1e22,
+    metalness: 0.55,
+    roughness: 0.3,
+    clearcoat: 1,
+  });
+  const lensMaterial = new MeshPhysicalMaterial({
+    color: 0x061022,
+    metalness: 0.6,
+    roughness: 0.1,
+    clearcoat: 1,
+  });
+  const flashMaterial = new MeshBasicMaterial({ color: 0xf2ead6 });
+  const displayMaterial = new MeshBasicMaterial({ map: texture, toneMapped: false });
+  const hitMaterial = new MeshBasicMaterial({ colorWrite: false, depthWrite: false });
+  const coverMaterial = new MeshBasicMaterial({ map: texture, toneMapped: false });
+  const materials = [
+    frameMetal,
+    polishedMetal,
+    bezel,
+    backGlass,
+    island,
+    lensMaterial,
+    flashMaterial,
+    displayMaterial,
+    hitMaterial,
+    coverMaterial,
+  ];
+
+  // Each half's meshes live in body coordinates; `left` pivots them around the hinge axis.
+  left.position.z = PIVOT_Z;
+  const leftBody = new Group();
+  leftBody.position.z = -PIVOT_Z;
+  left.add(leftBody);
+
+  function half(group: Group, side: "left" | "right", back: MeshPhysicalMaterial) {
+    const body = new Mesh(
+      new ExtrudeGeometry(panelPath(halfWidth, side, BEVEL, 0.1, BEVEL), {
+        depth: DEPTH - BEVEL * 2,
+        bevelEnabled: true,
+        bevelSize: BEVEL,
+        bevelThickness: BEVEL,
+        bevelSegments: 3,
+        curveSegments: 12,
+      }),
+      frameMetal,
+    );
+    body.position.z = -DEPTH / 2 + BEVEL;
+    group.add(body);
+    const frame = new Mesh(
+      new ShapeGeometry(panelPath(halfWidth, side, 0.01, 0.095, 0.002), 12),
+      bezel,
+    );
+    frame.position.z = DEPTH / 2 + 0.001;
+    group.add(frame);
+    // A back-facing shape mirrors X, so it is drawn from the opposite side's outline.
+    const rear = new Mesh(
+      new ShapeGeometry(
+        panelPath(halfWidth, side === "left" ? "right" : "left", 0.01, 0.095, 0.002),
+        12,
+      ),
+      back,
+    );
+    rear.name = `${side}-back`;
+    rear.rotation.y = Math.PI;
+    rear.position.set(0, 0, -DEPTH / 2 - 0.001);
+    group.add(rear);
+    const geometry = new ShapeGeometry(panelPath(halfWidth, side, INSET, 0.076));
+    geometry.computeBoundingBox();
+    const display = new Mesh(geometry, hitMaterial);
+    display.name = `${side}-inner-screen`;
+    display.position.z = DEPTH / 2 + 0.003;
+    group.add(display);
+    return display;
+  }
+
+  const innerLeft = half(leftBody, "left", bezel);
+  const innerRight = half(right, "right", backGlass);
+  // One indexed surface keeps adjacent pixels joined at the crease. The
+  // physical halves move separately underneath it.
+  const screenWidth = 2 * (halfWidth - INSET);
+  const screenGeometry = new PlaneGeometry(screenWidth, screenHeight, 40, 48);
+  const screenPositions = screenGeometry.getAttribute("position");
+  const screenUvs = screenGeometry.getAttribute("uv");
+  const baseX = new Float32Array(screenPositions.count);
+  for (let i = 0; i < screenPositions.count; i++) {
+    const y = screenPositions.getY(i);
+    const outerX = screenWidth / 2;
+    const outerY = screenHeight / 2;
+    const radius = 0.076;
+    const cornerY = Math.max(0, Math.abs(y) - (outerY - radius));
+    const limit = outerX - radius + Math.sqrt(Math.max(0, radius * radius - cornerY * cornerY));
+    const x = Math.max(-limit, Math.min(limit, screenPositions.getX(i)));
+    baseX[i] = x;
+    screenUvs.setXY(i, x / screenWidth + 0.5, y / screenHeight + 0.5);
+  }
+  screenUvs.needsUpdate = true;
+  const innerSurface = new Mesh(screenGeometry, displayMaterial);
+  innerSurface.name = "continuous-inner-screen";
+  orientation.add(innerSurface);
+  // The outer half of the hinge housing. It tucks behind the back glass when
+  // open and becomes the rounded spine when closed.
+  const spineSlack = 0.15;
+  const spine = new Mesh(
+    new CylinderGeometry(
+      SPINE_RADIUS,
+      SPINE_RADIUS,
+      HEIGHT - 0.012,
+      32,
+      1,
+      false,
+      Math.PI / 2 + spineSlack,
+      Math.PI - spineSlack * 2,
+    ),
+    polishedMetal,
+  );
+  spine.name = "hinge-spine";
+  spine.position.z = PIVOT_Z;
+  orientation.add(spine);
+
+  const cover = new Mesh(new ShapeGeometry(coverPath(halfWidth)), coverMaterial);
+  cover.name = "cover-screen";
+  cover.position.set(-halfWidth / 2, 0, -DEPTH / 2 - 0.003);
+  cover.rotation.y = Math.PI;
+  leftBody.add(cover);
+
+  // Rear components use back-surface coordinates, with outward positive Z.
+  const rearCamera = new Group();
+  rearCamera.name = "rear-camera";
+  const islandWidth = 0.46;
+  const islandHeight = 0.2;
+  rearCamera.position.set(
+    halfWidth - 0.07 - islandWidth / 2,
+    HEIGHT / 2 - 0.08 - islandHeight / 2,
+    -DEPTH / 2 - 0.002,
+  );
+  rearCamera.rotation.y = Math.PI;
+  right.add(rearCamera);
+  const plateDepth = 0.02;
+  const plate = new Mesh(
+    new ExtrudeGeometry(roundedRectPath(islandWidth, islandHeight, 0.07), {
+      depth: plateDepth,
+      bevelEnabled: true,
+      bevelSize: 0.008,
+      bevelThickness: 0.006,
+      bevelSegments: 3,
+      curveSegments: 12,
+    }),
+    island,
+  );
+  plate.name = "camera-plate";
+  rearCamera.add(plate);
+  const plateFront = plateDepth + 0.006;
+  for (const [x, radius] of [
+    [-0.14, 0.05],
+    [-0.01, 0.05],
+    [0.105, 0.036],
+  ] as const) {
+    const ring = new Mesh(
+      new CylinderGeometry(radius + 0.012, radius + 0.012, 0.012, 32),
+      frameMetal,
+    );
+    ring.rotation.x = Math.PI / 2;
+    ring.position.set(x, 0, plateFront + 0.004);
+    rearCamera.add(ring);
+    const lens = new Mesh(new CircleGeometry(radius, 32), lensMaterial);
+    lens.name = "camera-lens";
+    lens.position.set(x, 0, plateFront + 0.0105);
+    rearCamera.add(lens);
+  }
+  const flash = new Mesh(new CircleGeometry(0.018, 20), flashMaterial);
+  flash.position.set(0.185, 0.045, plateFront + 0.0005);
+  rearCamera.add(flash);
+
+  // Power and volume keys sit on the fixed half's outer edge.
+  for (const [y, length] of [
+    [0.52, 0.16],
+    [0.2, 0.3],
+  ] as const) {
+    const key = new Mesh(new BoxGeometry(0.02, length, DEPTH * 0.45), frameMetal);
+    key.position.set(halfWidth + 0.008, y, 0);
+    right.add(key);
+  }
+
+  const raycaster = new Raycaster();
+  const pointer = new Vector2();
+  const local = new Vector3();
+  let capturedDisplay: Mesh | null = null;
+  let activeLayout = layout;
+  let angle = initialAngle;
+  const updateVisibleScreen = () => {
+    const innerActive = angle >= 90;
+    innerSurface.visible = innerActive;
+    innerLeft.visible = innerActive;
+    innerRight.visible = innerActive;
+    cover.visible = !innerActive;
+  };
+  const setAngle = (next: number) => {
+    angle = Math.max(0, Math.min(180, next));
+    left.rotation.y = Math.PI * (1 - angle / 180);
+    spine.rotation.y = left.rotation.y / 2;
+    const radians = left.rotation.y;
+    const cosine = Math.cos(radians);
+    const sine = Math.sin(radians);
+    const frontZ = DEPTH / 2 + 0.004 - PIVOT_Z;
+    for (let i = 0; i < screenPositions.count; i++) {
+      const x = baseX[i]!;
+      if (x < 0) {
+        screenPositions.setXYZ(
+          i,
+          x * cosine + frontZ * sine,
+          screenPositions.getY(i),
+          -x * sine + frontZ * cosine + PIVOT_Z,
+        );
+      } else {
+        screenPositions.setXYZ(i, x, screenPositions.getY(i), frontZ + PIVOT_Z);
+      }
+    }
+    screenPositions.needsUpdate = true;
+    screenGeometry.computeBoundingBox();
+    screenGeometry.computeBoundingSphere();
+    updateVisibleScreen();
+  };
+  const setDisplay = (nextTexture: Texture, nextLayout: PhoneDisplayLayout) => {
+    activeLayout = nextLayout;
+    displayMaterial.map = nextTexture;
+    coverMaterial.map = nextTexture;
+    cover.geometry.computeBoundingBox();
+    const bounds = cover.geometry.boundingBox!;
+    const uv = cover.geometry.getAttribute("uv");
+    const position = cover.geometry.getAttribute("position");
+    for (let i = 0; i < uv.count; i++) {
+      const u = (position.getX(i) - bounds.min.x) / (bounds.max.x - bounds.min.x);
+      const v = (position.getY(i) - bounds.min.y) / (bounds.max.y - bounds.min.y);
+      uv.setXY(i, u, v);
+    }
+    uv.needsUpdate = true;
+    updateVisibleScreen();
+  };
+  setAngle(initialAngle);
+  setDisplay(texture, layout);
+
+  return {
+    root,
+    orientation,
+    width: halfWidth * 2,
+    height: HEIGHT,
+    innerAspect,
+    setAngle,
+    setDisplay,
+    screenPoint(x: number, y: number, camera: Camera, captured = false) {
+      orientation.updateWorldMatrix(true, true);
+      camera.updateMatrixWorld(true);
+      pointer.set(x * 2 - 1, 1 - y * 2);
+      raycaster.setFromCamera(pointer, camera);
+      const screens = cover.visible ? [cover] : [innerLeft, innerRight];
+      const hit = raycaster.intersectObjects(screens, false)[0];
+      if (!hit && !captured) {
+        capturedDisplay = null;
+        return null;
+      }
+      const display =
+        (hit?.object as Mesh | undefined) ??
+        (capturedDisplay?.visible ? capturedDisplay : screens[0]);
+      if (!display) return null;
+      if (hit) capturedDisplay = display;
+      if (hit) local.copy(hit.point);
+      else {
+        const plane = new Vector3(0, 0, 1).transformDirection(display.matrixWorld);
+        const point = new Vector3().setFromMatrixPosition(display.matrixWorld);
+        const distance =
+          plane.dot(point.clone().sub(raycaster.ray.origin)) / plane.dot(raycaster.ray.direction);
+        if (!Number.isFinite(distance)) return null;
+        local.copy(raycaster.ray.direction).multiplyScalar(distance).add(raycaster.ray.origin);
+      }
+      display.worldToLocal(local);
+      const bounds = display.geometry.boundingBox!;
+      const u = Math.max(0, Math.min(1, (local.x - bounds.min.x) / (bounds.max.x - bounds.min.x)));
+      const v = Math.max(0, Math.min(1, (bounds.max.y - local.y) / (bounds.max.y - bounds.min.y)));
+      const across = display === cover ? u : (display === innerLeft ? u : 1 + u) / 2;
+      return activeLayout.rotation === Math.PI ? { x: 1 - across, y: 1 - v } : { x: across, y: v };
+    },
+    dispose() {
+      root.traverse((object) => {
+        if (object instanceof Mesh) object.geometry.dispose();
+      });
+      for (const material of materials) material.dispose();
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/deviceFraming.test.ts b/packages/client-runtime/src/device/deviceFraming.test.ts
new file mode 100644
index 000000000000..151a0882a89d
--- /dev/null
+++ b/packages/client-runtime/src/device/deviceFraming.test.ts
@@ -0,0 +1,53 @@
+import { expect, it } from "vite-plus/test";
+import { Box3, Vector3 } from "three";
+import { createDeviceFraming } from "./deviceFraming.ts";
+
+const box = (x: number, width: number) =>
+  new Box3(new Vector3(x - width / 2, -1, -0.2), new Vector3(x + width / 2, 1, 0.2));
+it("fits both axes through a moving pivot, freezes for contact, and stops once framing settles", () => {
+  const framing = createDeviceFraming();
+  framing.setBounds(box(0, 1), Math.PI / 8, 0.7, 0);
+  const initialDistance = framing.distance();
+  const next = box(1.5, 3);
+  framing.setBounds(next, Math.PI / 8, 0.7, 10);
+  framing.advance(50);
+  expect(framing.center.x).toBeGreaterThan(0);
+  expect(framing.center.x).toBeLessThan(1.5);
+  for (const x of [next.min.x, next.max.x])
+    expect(
+      Math.abs(x - framing.center.x) /
+        ((framing.distance() - next.max.z) * Math.tan(Math.PI / 8) * 0.7),
+    ).toBeLessThan(1);
+  framing.hold(true, 50);
+  const center = framing.center.clone(),
+    distance = framing.distance();
+  framing.advance(10000);
+  expect(framing.center.equals(center)).toBe(true);
+  expect(framing.distance()).toBe(distance);
+  expect(framing.needsFrame()).toBe(false);
+  framing.hold(false, 10000);
+  framing.advance(10016);
+  expect(framing.center.x).toBeLessThan(1.5);
+  framing.advance(12000);
+  expect(framing.center.x).toBe(1.5);
+  expect(framing.distance()).toBeGreaterThan(initialDistance);
+  expect(framing.needsFrame()).toBe(false);
+});
+
+it("uses elapsed time independently of frame partitions and fits a changed viewport immediately", () => {
+  const run = (step: number) => {
+    const framing = createDeviceFraming();
+    framing.setBounds(box(0, 1), Math.PI / 8, 1, 0);
+    framing.setBounds(box(-1, 2), Math.PI / 8, 1, 0);
+    for (let time = step; time < 400; time += step) framing.advance(time);
+    framing.advance(400);
+    return framing;
+  };
+  const fast = run(8),
+    slow = run(33);
+  expect(fast.center.distanceTo(slow.center)).toBeLessThan(1e-8);
+  expect(fast.distance()).toBeCloseTo(slow.distance(), 8);
+  fast.setBounds(box(-1, 2), Math.PI / 8, 0.4, 400, true);
+  expect(fast.distance()).toBeGreaterThan(slow.distance());
+  expect(fast.needsFrame()).toBe(false);
+});
diff --git a/packages/client-runtime/src/device/deviceFraming.ts b/packages/client-runtime/src/device/deviceFraming.ts
new file mode 100644
index 000000000000..1d8dddb10eb3
--- /dev/null
+++ b/packages/client-runtime/src/device/deviceFraming.ts
@@ -0,0 +1,82 @@
+import { Box3, Vector3 } from "three";
+
+/** Fit the current assembly, with independent framing dynamics so a leaf pivot does not drag it off-screen. */
+export function createDeviceFraming() {
+  const center = new Vector3();
+  const target = new Vector3();
+  const velocity = new Vector3();
+  const bounds = new Box3();
+  let distance = 1;
+  let targetDistance = 1;
+  let distanceVelocity = 0;
+  let tanX = 1;
+  let tanY = 1;
+  let at = 0;
+  let initialized = false;
+  let moving = false;
+  let held = false;
+  const advance = (now: number, immediate = false) => {
+    if (held) return false;
+    const dt = Math.max(0, (now - at) / 1000);
+    at = now;
+    if (!moving) return false;
+    const omega = 14;
+    const decay = Math.exp(-omega * dt);
+    const error = center.clone().sub(target);
+    const coefficient = velocity.clone().addScaledVector(error, omega);
+    center.copy(error).addScaledVector(coefficient, dt).multiplyScalar(decay).add(target);
+    velocity.addScaledVector(coefficient, -omega * dt).multiplyScalar(decay);
+    const distanceError = distance - targetDistance;
+    const distanceCoefficient = distanceVelocity + omega * distanceError;
+    distance = targetDistance + (distanceError + distanceCoefficient * dt) * decay;
+    distanceVelocity = (distanceVelocity - omega * distanceCoefficient * dt) * decay;
+    moving =
+      center.distanceTo(target) > 0.0005 ||
+      velocity.length() > 0.005 ||
+      Math.abs(distance - targetDistance) > 0.0005 ||
+      Math.abs(distanceVelocity) > 0.005;
+    if (immediate || !moving) {
+      center.copy(target);
+      distance = targetDistance;
+      velocity.set(0, 0, 0);
+      distanceVelocity = 0;
+      moving = false;
+    }
+    return true;
+  };
+  return {
+    center,
+    setBounds(next: Box3, vertical: number, aspect: number, now: number, immediate = false) {
+      if (next.isEmpty()) return;
+      advance(now);
+      bounds.copy(next);
+      tanY = Math.tan(vertical);
+      tanX = tanY * aspect;
+      bounds.getCenter(target);
+      target.z = 0;
+      const size = bounds.getSize(new Vector3());
+      targetDistance = Math.max(1, Math.max(size.x / tanX, size.y / tanY) * 0.565 + bounds.max.z);
+      moving = true;
+      advance(now, immediate || !initialized);
+      initialized = true;
+    },
+    advance,
+    distance() {
+      // Spring lag must never clip the fitted assembly.
+      const clearance = Math.max(
+        Math.abs(bounds.min.x - center.x) / tanX,
+        Math.abs(bounds.max.x - center.x) / tanX,
+        Math.abs(bounds.min.y - center.y) / tanY,
+        Math.abs(bounds.max.y - center.y) / tanY,
+      );
+      return Math.max(distance, clearance * 1.02 + bounds.max.z, 1);
+    },
+    hold(active: boolean, now: number) {
+      held = active;
+      at = now;
+    },
+    needsFrame() {
+      return moving && !held;
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/deviceMotion.test.ts b/packages/client-runtime/src/device/deviceMotion.test.ts
new file mode 100644
index 000000000000..fc777133c351
--- /dev/null
+++ b/packages/client-runtime/src/device/deviceMotion.test.ts
@@ -0,0 +1,175 @@
+import { expect, it, vi } from "vite-plus/test";
+import { Quaternion, Vector3 } from "three";
+import { createDeviceMotion, rotationVector } from "./deviceMotion.ts";
+import { nearestDeviceView } from "./deviceViewSnap.ts";
+
+const snaps = ["portrait", "landscape_left", "portrait_upside_down", "landscape_right"].map(
+  (orientation, index) => ({
+    orientation,
+    rotation: new Quaternion().setFromAxisAngle(new Vector3(0, 0, 1), (-index * Math.PI) / 2),
+    yawLimit: Math.PI / 3,
+  }),
+);
+const rotation = (x: number, y: number, z = 0) =>
+  new Quaternion().setFromAxisAngle(new Vector3(x, y, z).normalize(), Math.hypot(x, y, z));
+
+it("selects the nearest quarter turn, retains a nearby yaw, and treats quaternion signs identically", () => {
+  const side = new Quaternion().setFromAxisAngle(new Vector3(0, 0, 1), -Math.PI / 2);
+  const released = side.clone().premultiply(rotation(0, 0.4));
+  const nearest = nearestDeviceView(released, snaps)!;
+  expect(nearest.orientation).toBe("landscape_left");
+  expect(nearest.rotation.angleTo(released)).toBeLessThan(1e-6);
+  const negative = released.clone().set(-released.x, -released.y, -released.z, -released.w);
+  expect(nearestDeviceView(negative, snaps)!.rotation.angleTo(nearest.rotation)).toBeLessThan(1e-6);
+  expect(
+    nearestDeviceView(rotation(0, 3), snaps)!.rotation.angleTo(new Quaternion()),
+  ).toBeLessThanOrEqual(Math.PI / 3 + 1e-6);
+});
+
+it("springs toward a cumulative drag without teleporting and keeps the same target across event partitions", () => {
+  const run = (parts: number) => {
+    const choose = vi.fn((q: Quaternion) => q);
+    const motion = createDeviceMotion({ choose });
+    motion.dragActive(true, 0);
+    for (let part = 0; part < parts; part++) motion.orbit(160 / parts, 80 / parts, 0);
+    expect(motion.rotation.angleTo(new Quaternion())).toBeLessThan(1e-6);
+    for (let time = 8; time <= 400; time += 8) motion.advance(time);
+    expect(motion.rotation.angleTo(new Quaternion())).toBeGreaterThan(0.5);
+    motion.dragActive(false, 400);
+    for (let time = 408; time <= 2400; time += 8) motion.advance(time);
+    expect(choose).toHaveBeenCalledOnce();
+    expect(motion.needsFrame()).toBe(false);
+    return motion.rotation;
+  };
+  expect(run(1).angleTo(run(20))).toBeLessThan(1e-6);
+});
+
+it("selects the predicted nearest view once and preserves velocity when interrupted", () => {
+  const choose = vi.fn((q: Quaternion) => nearestDeviceView(q, snaps)!.rotation);
+  const motion = createDeviceMotion({ choose });
+  motion.dragActive(true, 0);
+  motion.orbit(0, 240, 0);
+  motion.orbit(0, 20, 20);
+  motion.advance(40);
+  motion.dragActive(false, 40);
+  const before = motion.rotation.clone();
+  motion.advance(80);
+  expect(motion.rotation.angleTo(before)).toBeGreaterThan(0.01);
+  const interrupted = motion.rotation.clone();
+  motion.dragActive(true, 80);
+  expect(motion.rotation.angleTo(interrupted)).toBeLessThan(1e-6);
+  motion.orbit(30, -30, 80);
+  motion.advance(96);
+  motion.dragActive(false, 100);
+  for (let time = 116; time <= 2500; time += 16) motion.advance(time);
+  expect(choose).toHaveBeenCalledTimes(2);
+  expect(motion.needsFrame()).toBe(false);
+});
+
+it("lets a hard flick coast through multiple turns before settling on a visible view", () => {
+  const choose = vi.fn(() => new Quaternion());
+  const motion = createDeviceMotion({ choose });
+  motion.dragActive(true, 0);
+  motion.orbit(0, 80, 16);
+  motion.advance(16);
+  motion.orbit(0, 80, 32);
+  motion.advance(32);
+  motion.dragActive(false, 32);
+
+  let previous = motion.rotation.clone();
+  let travel = 0;
+  let lateSpeed = 0;
+  for (let time = 40; time <= 8500; time += 8) {
+    motion.advance(time);
+    const distance = motion.rotation.angleTo(previous);
+    travel += distance;
+    if (time >= 2500) lateSpeed = Math.max(lateSpeed, distance / 0.008);
+    previous = motion.rotation.clone();
+  }
+  expect(travel).toBeGreaterThan(4 * Math.PI);
+  expect(lateSpeed).toBeLessThan(2.5);
+  expect(choose).toHaveBeenCalledOnce();
+  expect(motion.rotation.angleTo(new Quaternion())).toBeLessThan(1e-6);
+  expect(motion.needsFrame()).toBe(false);
+});
+
+it("release uses elapsed time equally at different frame rates and a captured contact freezes projection", () => {
+  const run = (step: number) => {
+    const motion = createDeviceMotion({ choose: () => new Quaternion() });
+    motion.dragActive(true, 0);
+    motion.orbit(160, 80, 0);
+    motion.advance(50);
+    motion.dragActive(false, 50);
+    for (let time = 50; time < 450; time += step) motion.advance(time);
+    motion.advance(450);
+    return motion;
+  };
+  const fast = run(8),
+    slow = run(33),
+    throttled = run(1000);
+  expect(fast.rotation.angleTo(slow.rotation)).toBeLessThan(1e-6);
+  expect(fast.rotation.angleTo(throttled.rotation)).toBeLessThan(1e-6);
+  fast.hold(true, 450);
+  const contact = fast.rotation.clone();
+  fast.orbit(100, 100, 500);
+  fast.advance(10000);
+  expect(fast.rotation.angleTo(contact)).toBeLessThan(1e-6);
+  fast.hold(false, 10000);
+  fast.advance(12000);
+  expect(fast.needsFrame()).toBe(false);
+});
+
+it("holds a trackpad orbit through a pause and snaps only when the gesture ends", () => {
+  const choose = vi.fn(() => new Quaternion());
+  const motion = createDeviceMotion({ choose });
+  motion.orbit(NaN, 0, 0);
+  expect(motion.needsFrame()).toBe(false);
+  motion.orbit(200, 100, 0);
+  motion.advance(100);
+  expect(choose).not.toHaveBeenCalled();
+  expect(motion.rotation.angleTo(new Quaternion())).toBeGreaterThan(0);
+  motion.advance(140, true);
+  expect(choose).not.toHaveBeenCalled();
+  const held = motion.rotation.clone();
+  expect(held.angleTo(new Quaternion())).toBeGreaterThan(0.5);
+  expect(motion.needsFrame()).toBe(false);
+  motion.orbit(80, 0, 200);
+  motion.advance(340, true);
+  expect(motion.rotation.angleTo(held)).toBeGreaterThan(0.1);
+  expect(choose).not.toHaveBeenCalled();
+  expect(motion.needsFrame()).toBe(false);
+  motion.dragActive(false, 340);
+  motion.advance(2500);
+  expect(choose).toHaveBeenCalledOnce();
+  expect(motion.rotation.angleTo(new Quaternion())).toBeLessThan(1e-6);
+  expect(motion.needsFrame()).toBe(false);
+  expect(rotationVector(rotation(0, Math.PI)).length()).toBeCloseTo(Math.PI);
+});
+
+it("keeps release angular speed bounded even across a back-facing half turn", () => {
+  const motion = createDeviceMotion({ choose: () => rotation(0, Math.PI) });
+  motion.setPose(rotation(0, Math.PI), 0);
+  let previous = motion.rotation.clone();
+  for (let time = 8; time <= 1600; time += 8) {
+    motion.advance(time);
+    expect(motion.rotation.angleTo(previous)).toBeLessThanOrEqual(9 * 0.008 + 1e-5);
+    previous = motion.rotation.clone();
+  }
+  expect(motion.rotation.angleTo(rotation(0, Math.PI))).toBeLessThan(1e-6);
+  expect(motion.needsFrame()).toBe(false);
+});
+
+it("a click without dragging resumes the interrupted resting view instead of stranding the device", () => {
+  const choose = vi.fn(() => new Quaternion());
+  const motion = createDeviceMotion({ choose });
+  const rest = rotation(0, 0.8);
+  motion.setPose(rest, 0);
+  motion.advance(50);
+  motion.dragActive(true, 50);
+  motion.advance(60);
+  motion.dragActive(false, 60);
+  motion.advance(2100);
+  expect(motion.rotation.angleTo(rest)).toBeLessThan(1e-6);
+  expect(choose).not.toHaveBeenCalled();
+  expect(motion.needsFrame()).toBe(false);
+});
diff --git a/packages/client-runtime/src/device/deviceMotion.ts b/packages/client-runtime/src/device/deviceMotion.ts
new file mode 100644
index 000000000000..d2383c65665a
--- /dev/null
+++ b/packages/client-runtime/src/device/deviceMotion.ts
@@ -0,0 +1,279 @@
+import { Quaternion, Vector3 } from "three";
+
+/** Shortest rotation vector. q and -q represent the same orientation. */
+export function rotationVector(rotation: Quaternion) {
+  const q = rotation.clone().normalize();
+  if (q.w < 0) q.set(-q.x, -q.y, -q.z, -q.w);
+  const length = Math.hypot(q.x, q.y, q.z);
+  return length < 1e-8
+    ? new Vector3()
+    : new Vector3(q.x, q.y, q.z).multiplyScalar((2 * Math.atan2(length, q.w)) / length);
+}
+function fromVector(vector: Vector3) {
+  const angle = vector.length();
+  return angle < 1e-8
+    ? new Quaternion()
+    : new Quaternion().setFromAxisAngle(vector.clone().divideScalar(angle), angle);
+}
+
+// Recovered from Bitrig 0.25's rotation dynamics: point gain, drag force limit,
+// velocity limits, release prediction/blend, and the 0.5 / 0.78 release spring.
+const gain = 0.006;
+const response = 0.5;
+const damping = 0.78;
+const frequency = (2 * Math.PI) / response;
+const decay = frequency * damping;
+const stepSeconds = 1 / 120;
+// Fast releases combine exponential friction with a critically damped correction.
+const flickThreshold = 4.5;
+const flickLimit = 22;
+const spinDecay = 1.1;
+const settleFrequency = 2;
+
+/** A moving spring target follows cumulative camera-space gestures; release latches the nearest useful view. */
+export function createDeviceMotion(options: { choose: (rotation: Quaternion) => Quaternion }) {
+  const rotation = new Quaternion();
+  const target = new Quaternion();
+  const velocity = new Vector3();
+  const gestureVelocity = new Vector3();
+  let spring: { at: number; rotation: Quaternion; velocity: Vector3; steps: number } | null = null;
+  let spin: { at: number; rotation: Quaternion; velocity: Vector3; correction: Vector3 } | null =
+    null;
+  let drag: {
+    start: Quaternion;
+    rest: Quaternion;
+    x: number;
+    y: number;
+    error: Vector3;
+    at: number;
+  } | null = null;
+  let held = false;
+  let interruptedDrag = false;
+  let lastInput = -Infinity;
+  const beginSpring = (next: Quaternion, now: number) => {
+    target.copy(next).normalize();
+    spring = {
+      at: now,
+      rotation: rotation.clone(),
+      velocity: velocity.clone(),
+      steps: 0,
+    };
+  };
+  const release = (now: number) => {
+    if (!drag) return;
+    // A pause before lifting a pointer should not resurrect an old flick.
+    if (now - lastInput > 100) gestureVelocity.set(0, 0, 0);
+    const prediction = target
+      .clone()
+      .premultiply(fromVector(gestureVelocity.clone().multiplyScalar(0.085)));
+    velocity.multiplyScalar(0.2).addScaledVector(gestureVelocity, 0.8).clampLength(0, flickLimit);
+    const moved = drag.x !== 0 || drag.y !== 0;
+    const rest = drag.rest;
+    drag = null;
+    if (moved && velocity.length() >= flickThreshold) {
+      // Choose where the free spin would finish, then correct toward that view
+      // throughout the coast rather than handing off to a spring at low speed.
+      const projected = rotation
+        .clone()
+        .premultiply(fromVector(velocity.clone().multiplyScalar(1 / spinDecay)));
+      target.copy(options.choose(projected)).normalize();
+      spin = {
+        at: now,
+        rotation: rotation.clone(),
+        velocity: velocity.clone(),
+        correction: rotationVector(target.clone().multiply(projected.invert())),
+      };
+      return;
+    }
+    if (moved) beginSpring(options.choose(prediction), now);
+    else beginSpring(rest, now);
+  };
+  const advance = (now: number, reduced = false) => {
+    if (held || !Number.isFinite(now)) return false;
+    if (spin) {
+      const seconds = Math.max(0, (now - spin.at) / 1000);
+      const coast = Math.exp(-spinDecay * seconds);
+      const settle = Math.exp(-settleFrequency * seconds);
+      const correction = fromVector(
+        spin.correction.clone().multiplyScalar(1 - (1 + settleFrequency * seconds) * settle),
+      );
+      rotation
+        .copy(spin.rotation)
+        .premultiply(fromVector(spin.velocity.clone().multiplyScalar((1 - coast) / spinDecay)))
+        .premultiply(correction)
+        .normalize();
+      velocity
+        .copy(spin.velocity)
+        .multiplyScalar(coast)
+        .applyQuaternion(correction)
+        .addScaledVector(spin.correction, settleFrequency ** 2 * seconds * settle);
+      if (reduced || (rotation.angleTo(target) < 0.01 && velocity.length() < 0.08)) {
+        spin = null;
+        rotation.copy(target);
+        velocity.set(0, 0, 0);
+      }
+      return true;
+    }
+    if (drag) {
+      // Follow the target during the gesture. Retain the logarithm's winding so
+      // a long drag cannot reverse its spring force when crossing a half turn.
+      const seconds = Math.min(0.05, Math.max(0, (now - drag.at) / 1000));
+      drag.at = now;
+      const steps = Math.ceil(seconds * 120);
+      const dt = steps ? seconds / steps : 0;
+      for (let step = 0; step < steps; step++) {
+        const error = rotationVector(target.clone().multiply(rotation.clone().invert()));
+        if (error.lengthSq() > 1e-10) {
+          const axis = error.clone().normalize();
+          const turns = Math.round((drag.error.dot(axis) - error.length()) / (2 * Math.PI));
+          error.addScaledVector(axis, turns * 2 * Math.PI);
+        }
+        drag.error.copy(error);
+        const omega = (2 * Math.PI) / 0.68;
+        const acceleration = error
+          .clampLength(0, 1.2)
+          .multiplyScalar(omega * omega)
+          .addScaledVector(velocity, -2 * 1.12 * omega);
+        velocity.addScaledVector(acceleration, dt).clampLength(0, 9);
+        rotation.premultiply(fromVector(velocity.clone().multiplyScalar(dt))).normalize();
+      }
+      if (reduced) {
+        rotation.copy(target);
+        velocity.set(0, 0, 0);
+      }
+      return steps > 0 || reduced;
+    }
+    if (!spring) return false;
+    const seconds = Math.max(0, (now - spring.at) / 1000);
+    const steps = Math.min(240, Math.floor(seconds / stepSeconds));
+    const integrate = (q: Quaternion, speed: Vector3, dt: number) => {
+      const error = rotationVector(target.clone().multiply(q.clone().invert()));
+      const acceleration = error
+        .multiplyScalar(frequency * frequency)
+        .addScaledVector(speed, -2 * decay);
+      speed.addScaledVector(acceleration, dt).clampLength(0, 9);
+      q.premultiply(fromVector(speed.clone().multiplyScalar(dt))).normalize();
+    };
+    // Fixed ticks make release independent of display refresh rate. The final
+    // partial tick interpolates the next tick without committing it. This also
+    // keeps displayed angular speed bounded between tick boundaries.
+    for (; spring.steps < steps; spring.steps++)
+      integrate(spring.rotation, spring.velocity, stepSeconds);
+    rotation.copy(spring.rotation);
+    velocity.copy(spring.velocity);
+    const nextRotation = spring.rotation.clone();
+    const nextVelocity = spring.velocity.clone();
+    integrate(nextRotation, nextVelocity, stepSeconds);
+    const fraction = Math.min(1, (seconds - steps * stepSeconds) / stepSeconds);
+    rotation.slerp(nextRotation, fraction);
+    velocity.lerp(nextVelocity, fraction);
+    if (
+      reduced ||
+      steps === 240 ||
+      (rotation.angleTo(target) < 0.0005 && velocity.length() < 0.005)
+    ) {
+      rotation.copy(target);
+      velocity.set(0, 0, 0);
+      spring = null;
+    }
+    return true;
+  };
+  const beginDrag = (now: number) => {
+    if (held || drag) return;
+    advance(now);
+    drag = {
+      start: rotation.clone(),
+      rest: target.clone(),
+      x: 0,
+      y: 0,
+      error: new Vector3(),
+      at: now,
+    };
+    target.copy(rotation);
+    gestureVelocity.set(0, 0, 0);
+    lastInput = -Infinity;
+    spring = null;
+    spin = null;
+  };
+  return {
+    rotation,
+    setPose(next: Quaternion, now: number, immediate = false) {
+      advance(now);
+      drag = null;
+      spin = null;
+      beginSpring(next, now);
+      if (immediate) {
+        rotation.copy(target);
+        velocity.set(0, 0, 0);
+        spring = null;
+      }
+    },
+    dragActive(active: boolean, now: number) {
+      if (active) {
+        // A pointer takes over at the displayed pose, even if a wheel gesture
+        // was paused with its target still ahead of the spring.
+        if (drag || spin) {
+          advance(now);
+          drag = null;
+          spin = null;
+        }
+        beginDrag(now);
+      } else {
+        advance(now);
+        release(now);
+      }
+    },
+    /** Deltas are CSS pixels, independent of panel size and event partitioning. */
+    orbit(x: number, y: number, now: number) {
+      if (held || ![x, y, now].every(Number.isFinite) || (!x && !y)) return;
+      advance(now);
+      beginDrag(now);
+      if (!drag) return;
+      const previous = target.clone();
+      drag.x += x;
+      drag.y += y;
+      target
+        .copy(fromVector(new Vector3(drag.y * gain, drag.x * gain, 0)))
+        .multiply(drag.start)
+        .normalize();
+      const seconds = (now - lastInput) / 1000;
+      gestureVelocity.copy(rotationVector(target.clone().multiply(previous.invert())));
+      if (seconds > 0 && seconds < 0.1)
+        gestureVelocity.divideScalar(seconds).clampLength(0, flickLimit);
+      else gestureVelocity.set(0, 0, 0);
+      lastInput = now;
+    },
+    /** Captured device touches and hinge edits freeze projection, independently of orbit dragging. */
+    hold(active: boolean, now: number) {
+      if (held === active) return;
+      if (active) {
+        interruptedDrag = drag !== null || spin !== null;
+        drag = null;
+        spin = null;
+        spring = null;
+        velocity.set(0, 0, 0);
+      }
+      held = active;
+      if (!active) {
+        if (interruptedDrag) beginSpring(options.choose(rotation.clone()), now);
+        else if (rotation.angleTo(target) > 0.0005) beginSpring(target, now);
+        interruptedDrag = false;
+      }
+    },
+    advance,
+    needsFrame() {
+      return (
+        !held &&
+        (spring !== null ||
+          spin !== null ||
+          (drag !== null && (rotation.angleTo(target) > 0.0005 || velocity.length() > 0.005)))
+      );
+    },
+    reset(next: Quaternion, now: number) {
+      advance(now);
+      drag = null;
+      spin = null;
+      beginSpring(next, now);
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/deviceViewSnap.ts b/packages/client-runtime/src/device/deviceViewSnap.ts
new file mode 100644
index 000000000000..20402a80a35e
--- /dev/null
+++ b/packages/client-runtime/src/device/deviceViewSnap.ts
@@ -0,0 +1,26 @@
+import { Quaternion, Vector3 } from "three";
+const y = new Vector3(0, 1, 0);
+
+/** Each useful view permits a small yaw. Pick the closest member of each family, then the closest family. */
+export function nearestDeviceView<T extends { rotation: Quaternion; yawLimit: number }>(
+  rotation: Quaternion,
+  snaps: readonly T[],
+) {
+  let closest: T | null = null;
+  let distance = Infinity;
+  for (const snap of snaps) {
+    const relative = rotation.clone().multiply(snap.rotation.clone().invert());
+    const turn = 2 * Math.atan2(relative.y, relative.w);
+    const yaw = Math.max(
+      -snap.yawLimit,
+      Math.min(snap.yawLimit, Math.atan2(Math.sin(turn), Math.cos(turn))),
+    );
+    const candidate = snap.rotation.clone().premultiply(new Quaternion().setFromAxisAngle(y, yaw));
+    const nextDistance = candidate.angleTo(rotation);
+    if (nextDistance < distance - 1e-8) {
+      distance = nextDistance;
+      closest = { ...snap, rotation: candidate };
+    }
+  }
+  return closest;
+}
diff --git a/packages/client-runtime/src/device/duoControl.test.ts b/packages/client-runtime/src/device/duoControl.test.ts
new file mode 100644
index 000000000000..019c383a56dd
--- /dev/null
+++ b/packages/client-runtime/src/device/duoControl.test.ts
@@ -0,0 +1,109 @@
+import { afterEach, expect, it, vi } from "vite-plus/test";
+import { createDuoControl, createDuoPinch, type DuoCommand } from "./duoControl.ts";
+afterEach(() => vi.useRealTimers());
+
+it("keeps a failed send visible, including a disconnect while draining queued motion", () => {
+  const send = vi.fn((_request: { requestId: number; command: DuoCommand }) => false);
+  const onChange = vi.fn();
+  const queue = createDuoControl({ send, onChange });
+  queue.enqueue({ control: "angle", value: 40 });
+  expect(onChange).toHaveBeenLastCalledWith({
+    pending: false,
+    requested: null,
+    error: "Device is disconnected.",
+  });
+  send.mockReturnValueOnce(true);
+  queue.enqueue({ control: "pose", value: "book" });
+  queue.enqueue({ control: "angle", value: 60 });
+  queue.receive({ requestId: 2, ok: true });
+  expect(onChange).toHaveBeenLastCalledWith({
+    pending: false,
+    requested: null,
+    error: "Device is disconnected.",
+  });
+});
+
+it("coalesces hinge edits behind acknowledgements and lets a preset replace queued edits", () => {
+  const send = vi.fn((_request: { requestId: number; command: DuoCommand }) => true);
+  const onChange = vi.fn();
+  const queue = createDuoControl({ send, onChange });
+  queue.enqueue({ control: "angle", value: 40 });
+  queue.enqueue({ control: "angle", value: 50 });
+  queue.enqueue({ control: "angle", value: 60 });
+  expect(send).toHaveBeenCalledTimes(1);
+  queue.receive({ requestId: 1, ok: true });
+  expect(send.mock.calls[1]?.[0]).toEqual({
+    requestId: 2,
+    command: { control: "angle", value: 60 },
+  });
+  queue.enqueue({ control: "angle", value: 100 });
+  queue.enqueue({ control: "pose", value: "tent" });
+  queue.receive({ requestId: 2, ok: true });
+  expect(send.mock.calls[2]?.[0]).toEqual({
+    requestId: 3,
+    command: { control: "pose", value: "tent" },
+  });
+  queue.receive({ requestId: 3, ok: true });
+  expect(onChange).toHaveBeenLastCalledWith({ pending: false, requested: null, error: null });
+  queue.clear();
+});
+
+it("drops queued commands on failure, timeout and disconnect; late replies cannot acknowledge later work", () => {
+  vi.useFakeTimers();
+  const send = vi.fn((_request: { requestId: number; command: DuoCommand }) => true);
+  const onChange = vi.fn();
+  const queue = createDuoControl({ send, onChange, timeoutMs: 100 });
+  queue.enqueue({ control: "angle", value: 90 });
+  queue.enqueue({ control: "angle", value: 100 });
+  vi.advanceTimersByTime(100);
+  expect(onChange.mock.lastCall?.[0].error).toContain("timed out");
+  queue.enqueue({ control: "pose", value: "open" });
+  queue.receive({ requestId: 1, ok: true });
+  expect(onChange.mock.lastCall?.[0].pending).toBe(true);
+  queue.enqueue({ control: "angle", value: 130 });
+  queue.receive({ requestId: 2, ok: false, error: "native refused" });
+  expect(onChange.mock.lastCall?.[0]).toEqual({
+    pending: false,
+    requested: null,
+    error: "native refused",
+  });
+  queue.enqueue({ control: "pose", value: "book" });
+  queue.enqueue({ control: "pose", value: "closed" });
+  queue.clear();
+  queue.receive({ requestId: 3, ok: true });
+  expect(send).toHaveBeenCalledTimes(3);
+  queue.enqueue({ control: "angle", value: Infinity });
+  expect(send).toHaveBeenCalledTimes(3);
+  queue.clear();
+});
+
+it("pinches only a hit device, accumulates independently of native readback, clamps and cancels", () => {
+  let confirmed = 90;
+  const change = vi.fn();
+  const pinch = createDuoPinch({
+    angle: () => confirmed,
+    contains: (x, y) => x > 0.2 && y > 0.2,
+    change,
+  });
+  expect(pinch.begin(0.1, 0.5)).toBe(false);
+  pinch.move(1);
+  expect(change).not.toHaveBeenCalled();
+  expect(pinch.begin(0.5, 0.5)).toBe(true);
+  pinch.move(0.25);
+  expect(change).toHaveBeenLastCalledWith(120);
+  confirmed = 100;
+  pinch.move(0.25);
+  expect(change).toHaveBeenLastCalledWith(150);
+  pinch.move(2);
+  expect(change).toHaveBeenLastCalledWith(180);
+  pinch.move(-3);
+  expect(change).toHaveBeenLastCalledWith(0);
+  pinch.move(NaN);
+  pinch.end();
+  expect(change).toHaveBeenLastCalledWith(null);
+  const count = change.mock.calls.length;
+  pinch.move(1);
+  pinch.end();
+  expect(change).toHaveBeenCalledTimes(count);
+  expect(pinch.active).toBe(false);
+});
diff --git a/packages/client-runtime/src/device/duoControl.ts b/packages/client-runtime/src/device/duoControl.ts
new file mode 100644
index 000000000000..b9f61ec997d9
--- /dev/null
+++ b/packages/client-runtime/src/device/duoControl.ts
@@ -0,0 +1,113 @@
+// @effect-diagnostics globalTimers:off - The stream owns this browser control queue and its timeout.
+export const DUO_POSES = [
+  { id: "closed", label: "Closed", angle: 0 },
+  { id: "book", label: "Book", angle: 90 },
+  { id: "open", label: "Open", angle: 180 },
+  { id: "laptop", label: "Laptop", angle: 90 },
+  { id: "tent", label: "Tent", angle: 80 },
+] as const;
+export type DuoPose = (typeof DUO_POSES)[number]["id"];
+export type DuoOrientation =
+  | "portrait"
+  | "landscape_left"
+  | "portrait_upside_down"
+  | "landscape_right";
+export type DuoCommand =
+  | { control: "angle"; value: number }
+  | { control: "pose"; value: DuoPose }
+  | { control: "table"; value: boolean }
+  | { control: "physical"; value: "faceup" | "facedown" }
+  | { control: "orientation"; value: DuoOrientation };
+export type DuoControlState = {
+  pending: boolean;
+  requested: DuoCommand | null;
+  error: string | null;
+};
+
+/** One in-flight native transaction. Hinge motion coalesces; presets replace queued motion. Nothing replays after reconnect. */
+export function createDuoControl(options: {
+  send: (request: { requestId: number; command: DuoCommand }) => boolean;
+  onChange: (state: DuoControlState) => void;
+  timeoutMs?: number;
+}) {
+  let nextId = 1;
+  let active: { requestId: number; command: DuoCommand } | null = null;
+  let queued: DuoCommand | null = null;
+  let timer: ReturnType<typeof setTimeout> | null = null;
+  const publish = (error: string | null = null) =>
+    options.onChange({ pending: !!active, requested: queued ?? active?.command ?? null, error });
+  const clear = (error: string | null = null) => {
+    if (timer) clearTimeout(timer);
+    timer = null;
+    active = null;
+    queued = null;
+    publish(error);
+  };
+  const drain = () => {
+    if (active || !queued) return;
+    active = { requestId: nextId++, command: queued };
+    queued = null;
+    const id = active.requestId;
+    timer = setTimeout(() => {
+      if (active?.requestId === id) clear("Device control timed out. Its position is unknown.");
+    }, options.timeoutMs ?? 5_000);
+    publish();
+    if (!options.send(active)) clear("Device is disconnected.");
+  };
+  return {
+    enqueue(command: DuoCommand) {
+      if (
+        command.control === "angle" &&
+        (!Number.isFinite(command.value) || command.value < 0 || command.value > 180)
+      )
+        return;
+      queued = command;
+      if (active) publish();
+      else drain();
+    },
+    receive(reply: { requestId: number; ok: boolean; error?: string }) {
+      if (!active || reply.requestId !== active.requestId) return;
+      if (timer) clearTimeout(timer);
+      timer = null;
+      active = null;
+      if (!reply.ok) {
+        clear(reply.error ?? "Device control failed. Its position is unknown.");
+        return;
+      }
+      if (queued) drain();
+      else publish();
+    },
+    clear,
+  };
+}
+
+/** A pinch keeps its own accumulator across asynchronous native acknowledgements. */
+export function createDuoPinch(options: {
+  angle: () => number;
+  contains: (x: number, y: number) => boolean;
+  change: (angle: number | null) => void;
+}) {
+  let angle: number | null = null;
+  return {
+    begin(x: number, y: number) {
+      if (!options.contains(x, y)) return false;
+      angle = Math.max(0, Math.min(180, options.angle()));
+      return true;
+    },
+    move(logScale: number) {
+      if (angle === null || !Number.isFinite(logScale)) return;
+      const next = Math.max(0, Math.min(180, angle + logScale * 120));
+      if (next === angle) return;
+      angle = next;
+      options.change(next);
+    },
+    end() {
+      if (angle === null) return;
+      angle = null;
+      options.change(null);
+    },
+    get active() {
+      return angle !== null;
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/duoScene.test.ts b/packages/client-runtime/src/device/duoScene.test.ts
new file mode 100644
index 000000000000..4837bb6b71c3
--- /dev/null
+++ b/packages/client-runtime/src/device/duoScene.test.ts
@@ -0,0 +1,108 @@
+import {
+  BoxGeometry,
+  Group,
+  Mesh,
+  MeshBasicMaterial,
+  PerspectiveCamera,
+  PlaneGeometry,
+  Texture,
+  Vector3,
+} from "three";
+import { expect, it } from "vite-plus/test";
+import { createDuoScene, duoDisplayKey, duoRawPoint } from "./duoScene.ts";
+
+function fixture() {
+  const asset = new Group();
+  const left = new Group();
+  left.name = "left-half";
+  const right = new Group();
+  right.name = "right-half";
+  const screen = (name: string, x: number, z: number, rear = false) => {
+    const mesh = new Mesh(new PlaneGeometry(1, 2), new MeshBasicMaterial());
+    if (rear) mesh.geometry.rotateY(Math.PI);
+    mesh.geometry.translate(x, 0, z);
+    mesh.name = name;
+    return mesh;
+  };
+  const innerLeft = screen("inner-display-left", -0.5, 0.06);
+  const innerRight = screen("inner-display-right", 0.5, 0.06);
+  const cover = screen("cover-display", -0.5, -0.06, true);
+  left.add(innerLeft, cover);
+  right.add(innerRight);
+  for (const [group, x] of [
+    [left, -0.5],
+    [right, 0.5],
+  ] as const) {
+    const body = new Mesh(new BoxGeometry(1, 2, 0.1), new MeshBasicMaterial());
+    body.geometry.translate(x, 0, 0);
+    group.add(body);
+  }
+  asset.add(left, right);
+  const scene = createDuoScene(asset, { 1: new Texture(), 3: new Texture() });
+  const camera = new PerspectiveCamera(36, 1, 0.1, 50);
+  camera.position.z = 6;
+  camera.updateMatrixWorld();
+  return { scene, camera, left, right, innerLeft, innerRight };
+}
+
+it("keeps one continuous inner UV map across the hinge and folds opposite leaves", () => {
+  const { scene, left, right, innerLeft, innerRight } = fixture();
+  scene.setAngle(90);
+  expect(left.rotation.y).toBeCloseTo(Math.PI / 4);
+  expect(right.rotation.y).toBeCloseTo(-Math.PI / 4);
+  const values = (mesh: Mesh) =>
+    Array.from({ length: mesh.geometry.getAttribute("uv").count }, (_, i) =>
+      mesh.geometry.getAttribute("uv").getX(i),
+    );
+  expect(Math.max(...values(innerLeft))).toBe(0.5);
+  expect(Math.min(...values(innerRight))).toBe(0.5);
+  scene.dispose();
+});
+
+it("derives resting views from the hinged display planes independently of the inspection orbit", () => {
+  const { scene } = fixture();
+  scene.setAngle(90);
+  const frames = scene.restFrames(3);
+  expect(frames.map((frame) => frame.face)).toEqual(["inside", "left", "right"]);
+  expect(frames[1]!.normal.x).toBeGreaterThan(0.5);
+  expect(frames[2]!.normal.x).toBeLessThan(-0.5);
+  scene.root.rotation.set(0.5, 1.2, -0.7);
+  scene.root.position.set(3, -2, 1);
+  const rotated = scene.restFrames(3);
+  for (let index = 0; index < frames.length; index++) {
+    expect(rotated[index]!.normal.distanceTo(frames[index]!.normal)).toBeLessThan(1e-6);
+    expect(rotated[index]!.center.distanceTo(frames[index]!.center)).toBeLessThan(1e-6);
+  }
+  scene.setAngle(180);
+  expect(scene.restFrames(3).map((frame) => frame.face)).toEqual(["inside"]);
+  expect(scene.restFrames(1).map((frame) => frame.face)).toEqual(["cover"]);
+  scene.dispose();
+});
+
+it("maps active display input through hardware mounting and blocks rear, inactive and stale surfaces", () => {
+  const { scene, camera, innerLeft } = fixture();
+  scene.setAngle(180);
+  const screen = { width: 2007, height: 2853, orientation: "portrait" as const, screenId: 3 };
+  const key = duoDisplayKey(screen);
+  scene.root.updateMatrixWorld();
+  const world = innerLeft.localToWorld(new Vector3(-0.5, -0.5, 0.06)).project(camera);
+  const x = (world.x + 1) / 2,
+    y = (1 - world.y) / 2;
+  const hit = scene.screenPoint(x, y, camera, screen, key);
+  expect(hit?.x).toBeCloseTo(0.75);
+  expect(hit?.y).toBeCloseTo(0.75);
+  expect(
+    scene.screenPoint(
+      x,
+      y,
+      camera,
+      { ...screen, screenId: 1 },
+      duoDisplayKey({ ...screen, screenId: 1 }),
+    ),
+  ).toBeNull();
+  expect(scene.screenPoint(x, y, camera, screen, "old")).toBeNull();
+  expect(scene.screenPoint(x, y, camera, screen, key)).not.toBeNull();
+  expect(scene.screenPoint(x, 1.1, camera, screen, key, true)?.x).toBeGreaterThan(1);
+  expect(duoRawPoint(1, 0.2, 0.7)).toEqual({ x: 0.2, y: 0.7 });
+  scene.dispose();
+});
diff --git a/packages/client-runtime/src/device/duoScene.ts b/packages/client-runtime/src/device/duoScene.ts
new file mode 100644
index 000000000000..eada17e5a8fc
--- /dev/null
+++ b/packages/client-runtime/src/device/duoScene.ts
@@ -0,0 +1,244 @@
+import {
+  Box3,
+  BufferAttribute,
+  Group,
+  Mesh,
+  MeshBasicMaterial,
+  Matrix4,
+  Quaternion,
+  Plane,
+  Raycaster,
+  Triangle,
+  Vector2,
+  Vector3,
+  type PerspectiveCamera,
+  type Texture,
+} from "three";
+import type { DuoRestFrame } from "./duoSnap.ts";
+import type { DeviceScreenSize } from "./stream.ts";
+
+export type DuoPanelId = 1 | 3;
+export type DuoHingeLeaf = "left" | "right";
+export type DuoFrameLayout = { width: number; height: number };
+
+/** Hardware mounting is independent of app orientation and the model's orbit. The inverse is shared by taps and drags. */
+export function duoRawPoint(panel: DuoPanelId, x: number, y: number) {
+  return panel === 1 ? { x, y } : { x: y, y: 1 - x };
+}
+export function duoFrameMatches(frame: DuoFrameLayout, screen: DeviceScreenSize) {
+  return (
+    frame.width > 0 &&
+    frame.height > 0 &&
+    Math.abs(frame.width / frame.height - screen.width / screen.height) <=
+      1 / frame.height + 1 / screen.height
+  );
+}
+export function duoDisplayKey(screen: DeviceScreenSize | null) {
+  return screen ? `${screen.screenId}:${screen.width}:${screen.height}:${screen.orientation}` : "";
+}
+
+/** Asset resources belong to its model slot; this scene owns only live-screen replacement materials. */
+export function createDuoScene(asset: Group, textures: Record<DuoPanelId, Texture>) {
+  const left = asset.getObjectByName("left-half");
+  const right = asset.getObjectByName("right-half");
+  const cover = asset.getObjectByName("cover-display");
+  const innerLeft = asset.getObjectByName("inner-display-left");
+  const innerRight = asset.getObjectByName("inner-display-right");
+  if (
+    !left ||
+    !right ||
+    !(cover instanceof Mesh) ||
+    !(innerLeft instanceof Mesh) ||
+    !(innerRight instanceof Mesh)
+  )
+    throw new Error("Duo model must have two hinge groups and all three display meshes");
+  const surfaces = { 1: [cover], 3: [innerLeft, innerRight] };
+  const boundsByPanel = ([1, 3] as const).map((id) => {
+    const bounds = new Box3();
+    for (const mesh of surfaces[id]) {
+      mesh.geometry.computeBoundingBox();
+      bounds.union(mesh.geometry.boundingBox!);
+    }
+    const size = bounds.getSize(new Vector3());
+    if (![size.x, size.y].every((value) => Number.isFinite(value) && value > 0))
+      throw new Error("Invalid Duo display bounds");
+    return { bounds, size };
+  });
+  const root = new Group();
+  const content = new Group();
+  content.add(asset);
+  root.add(content);
+  let currentAngle = Number.NaN;
+  const localBounds = new Box3();
+  const relative = new Matrix4();
+  const inverse = new Matrix4();
+  const materials = {
+    1: new MeshBasicMaterial({ map: textures[1], toneMapped: false }),
+    3: new MeshBasicMaterial({ map: textures[3], toneMapped: false }),
+  };
+  const originals = new Map<Mesh, Mesh["material"]>();
+  // The two inner meshes sample halves of one framebuffer. Cover UVs face outward on the rear leaf.
+  for (const id of [1, 3] as const) {
+    const { bounds, size } = boundsByPanel[id === 1 ? 0 : 1]!;
+    for (const mesh of surfaces[id]) {
+      const position = mesh.geometry.getAttribute("position");
+      const uv = new Float32Array(position.count * 2);
+      for (let i = 0; i < position.count; i++) {
+        const x = (position.getX(i) - bounds.min.x) / size.x;
+        uv[i * 2] = id === 1 ? 1 - x : x;
+        uv[i * 2 + 1] = (position.getY(i) - bounds.min.y) / size.y;
+      }
+      mesh.geometry.setAttribute("uv", new BufferAttribute(uv, 2));
+      originals.set(mesh, mesh.material);
+      mesh.material = materials[id];
+    }
+  }
+  const ray = new Raycaster();
+  let captured: {
+    panel: DuoPanelId;
+    plane: Plane;
+    triangle: Triangle;
+    uv: [Vector2, Vector2, Vector2];
+    key: string;
+  } | null = null;
+  return {
+    root,
+    setAngle(angle: number) {
+      if (angle === currentAngle) return;
+      currentAngle = angle;
+      const radians = ((180 - Math.min(180, Math.max(0, angle))) * Math.PI) / 360;
+      left.rotation.y = radians;
+      right.rotation.y = -radians;
+      // Orbit the folded body's center, while retaining the authored hinge pivots.
+      content.position.set(0, 0, 0);
+      root.updateWorldMatrix(true, true);
+      inverse.copy(root.matrixWorld).invert();
+      localBounds.makeEmpty();
+      asset.traverse((object) => {
+        if (!(object instanceof Mesh)) return;
+        if (!object.geometry.boundingBox) object.geometry.computeBoundingBox();
+        if (!object.geometry.boundingBox) return;
+        relative.multiplyMatrices(inverse, object.matrixWorld);
+        localBounds.union(object.geometry.boundingBox.clone().applyMatrix4(relative));
+      });
+      content.position.copy(localBounds.getCenter(new Vector3())).negate();
+    },
+    restFrames(panel: DuoPanelId): DuoRestFrame[] {
+      root.updateWorldMatrix(true, true);
+      inverse.copy(root.matrixWorld).invert();
+      const frame = (meshes: Mesh[], face: DuoRestFrame["face"]): DuoRestFrame => {
+        const bounds = new Box3();
+        const normal = new Vector3();
+        const up = new Vector3();
+        for (const mesh of meshes) {
+          if (!mesh.geometry.boundingBox) mesh.geometry.computeBoundingBox();
+          relative.multiplyMatrices(inverse, mesh.matrixWorld);
+          bounds.union(mesh.geometry.boundingBox!.clone().applyMatrix4(relative));
+          normal.add(
+            new Vector3()
+              .fromBufferAttribute(mesh.geometry.getAttribute("normal"), 0)
+              .transformDirection(relative),
+          );
+          up.add(new Vector3(0, 1, 0).transformDirection(relative));
+        }
+        return {
+          face,
+          center: bounds.getCenter(new Vector3()),
+          normal: normal.normalize(),
+          up: up.normalize(),
+        };
+      };
+      if (panel === 1) return [frame([cover], "cover")];
+      const inside = frame([innerLeft, innerRight], "inside");
+      // Leaf views only make sense when both displays form a useful open fold.
+      return currentAngle > 20 && currentAngle < 165
+        ? [inside, frame([innerLeft], "left"), frame([innerRight], "right")]
+        : [inside];
+    },
+    leafRotation(leaf: DuoHingeLeaf) {
+      root.updateWorldMatrix(true, true);
+      relative.multiplyMatrices(
+        root.matrixWorld.clone().invert(),
+        (leaf === "left" ? left : right).matrixWorld,
+      );
+      return new Quaternion().setFromRotationMatrix(relative.extractRotation(relative));
+    },
+    hingeLeafAt(x: number, y: number, camera: PerspectiveCamera): DuoHingeLeaf | null {
+      if (!Number.isFinite(x) || !Number.isFinite(y)) return null;
+      root.updateMatrixWorld(true);
+      camera.updateMatrixWorld(true);
+      ray.setFromCamera(new Vector2(x * 2 - 1, 1 - y * 2), camera);
+      let object = ray.intersectObject(root, true)[0]?.object;
+      while (object) {
+        if (object === left) return "left";
+        if (object === right) return "right";
+        object = object.parent ?? undefined;
+      }
+      return null;
+    },
+    cancelInput() {
+      captured = null;
+    },
+    screenPoint(
+      x: number,
+      y: number,
+      camera: PerspectiveCamera,
+      screen: DeviceScreenSize | null,
+      readyKey: string,
+      extend = false,
+    ) {
+      const key = duoDisplayKey(screen);
+      if (!screen || !readyKey || key !== readyKey) {
+        captured = null;
+        return null;
+      }
+      root.updateMatrixWorld(true);
+      camera.updateMatrixWorld(true);
+      ray.setFromCamera(new Vector2(x * 2 - 1, 1 - y * 2), camera);
+      if (extend && captured?.key === key) {
+        const point = ray.ray.intersectPlane(captured.plane, new Vector3());
+        const bary = point ? captured.triangle.getBarycoord(point, new Vector3()) : null;
+        if (!bary) return null;
+        const uv = captured.uv[0]
+          .clone()
+          .multiplyScalar(bary.x)
+          .addScaledVector(captured.uv[1], bary.y)
+          .addScaledVector(captured.uv[2], bary.z);
+        return duoRawPoint(captured.panel, uv.x, 1 - uv.y);
+      }
+      // The chassis occludes rear displays. Only the first visible hit can own a contact.
+      const hit = ray.intersectObject(root, true)[0];
+      if (!hit?.uv || !hit.face || !(hit.object instanceof Mesh)) return null;
+      const panel: DuoPanelId | null = surfaces[1].includes(hit.object)
+        ? 1
+        : surfaces[3].includes(hit.object)
+          ? 3
+          : null;
+      if (!panel || panel !== screen.screenId) return null;
+      const indices = [hit.face.a, hit.face.b, hit.face.c] as const;
+      const positions = hit.object.geometry.getAttribute("position");
+      const triangle = new Triangle(
+        ...(indices.map((index) =>
+          new Vector3().fromBufferAttribute(positions, index).applyMatrix4(hit.object.matrixWorld),
+        ) as [Vector3, Vector3, Vector3]),
+      );
+      const hitUvs = hit.object.geometry.getAttribute("uv");
+      const uv = indices.map((index) => new Vector2().fromBufferAttribute(hitUvs, index)) as [
+        Vector2,
+        Vector2,
+        Vector2,
+      ];
+      captured = { panel, triangle, uv, plane: triangle.getPlane(new Plane()), key };
+      return duoRawPoint(panel, hit.uv.x, 1 - hit.uv.y);
+    },
+    dispose() {
+      for (const [mesh, material] of originals) mesh.material = material;
+      for (const material of Object.values(materials)) {
+        material.map = null;
+        material.dispose();
+      }
+      content.remove(asset);
+      captured = null;
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/duoSnap.test.ts b/packages/client-runtime/src/device/duoSnap.test.ts
new file mode 100644
index 000000000000..9b312a4fb45e
--- /dev/null
+++ b/packages/client-runtime/src/device/duoSnap.test.ts
@@ -0,0 +1,54 @@
+import { expect, it } from "vite-plus/test";
+import { Quaternion, Vector3 } from "three";
+import { duoViewSnaps, nearestDuoView } from "./duoSnap.ts";
+
+const frames = [
+  {
+    face: "inside" as const,
+    normal: new Vector3(0, 0, 1),
+    up: new Vector3(0, 1, 0),
+    center: new Vector3(),
+  },
+];
+const rotation = (x: number, y: number, z = 0) =>
+  new Quaternion().setFromAxisAngle(new Vector3(x, y, z).normalize(), Math.hypot(x, y, z));
+
+it("chooses a leaf-focused seated view when it is closer than the middle of the fold", () => {
+  const leaf = {
+    face: "right" as const,
+    normal: new Vector3(0.6, 0, 0.8),
+    up: new Vector3(0, 1, 0),
+    center: new Vector3(1, 0, 0),
+  };
+  const candidates = duoViewSnaps([...frames, leaf], 3);
+  const seat = candidates.find(
+    (candidate) => candidate.face === "right" && candidate.orientation === "portrait",
+  )!;
+  const released = seat.rotation.clone().premultiply(rotation(0.04, 0.05));
+  const chosen = nearestDuoView(released, candidates)!;
+  expect(chosen.face).toBe("right");
+  expect(chosen.orientation).toBe("portrait");
+  expect(chosen.center.x).toBe(1);
+});
+
+it("a seated view exposes the base, and upright yaw keeps both inner displays facing the camera", () => {
+  const folded = [
+    frames[0]!,
+    ...(["left", "right"] as const).map((face) => ({
+      face,
+      normal: new Vector3(face === "left" ? Math.SQRT1_2 : -Math.SQRT1_2, 0, Math.SQRT1_2),
+      up: new Vector3(0, 1, 0),
+      center: new Vector3(face === "left" ? -1 : 1, 0, 0),
+    })),
+  ];
+  const candidates = duoViewSnaps(folded, 3);
+  expect(candidates.filter((candidate) => candidate.face === "right")).toHaveLength(1);
+  for (const candidate of candidates) {
+    for (const frame of folded.slice(1))
+      expect(frame.normal.clone().applyQuaternion(candidate.rotation).z).toBeGreaterThan(0.2);
+    const side = candidate.rotation.clone().premultiply(rotation(0, 1.5));
+    const chosen = nearestDuoView(side, [candidate])!;
+    for (const frame of folded.slice(1))
+      expect(frame.normal.clone().applyQuaternion(chosen.rotation).z).toBeGreaterThan(0.02);
+  }
+});
diff --git a/packages/client-runtime/src/device/duoSnap.ts b/packages/client-runtime/src/device/duoSnap.ts
new file mode 100644
index 000000000000..1e0e3f46fd0c
--- /dev/null
+++ b/packages/client-runtime/src/device/duoSnap.ts
@@ -0,0 +1,86 @@
+import { Matrix4, Quaternion, Vector3 } from "three";
+import { nearestDeviceView } from "./deviceViewSnap.ts";
+import type { DeviceScreenSize } from "./stream.ts";
+
+export type DuoRestFace = "cover" | "inside" | "left" | "right";
+export type DuoRestFrame = { face: DuoRestFace; normal: Vector3; up: Vector3; center: Vector3 };
+export type DuoViewSnap = {
+  rotation: Quaternion;
+  face: DuoRestFace;
+  orientation: DeviceScreenSize["orientation"];
+  center: Vector3;
+  yawLimit: number;
+};
+const orientations = [
+  "portrait",
+  "landscape_left",
+  "portrait_upside_down",
+  "landscape_right",
+] as const;
+const z = new Vector3(0, 0, 1);
+const y = new Vector3(0, 1, 0);
+
+/** Build views from the actual hinged display planes, rather than model-specific Euler offsets. */
+export function duoViewSnaps(frames: readonly DuoRestFrame[], panel: 1 | 3) {
+  const snaps: DuoViewSnap[] = [];
+  for (const frame of frames) {
+    const normal = frame.normal.clone().normalize();
+    if (normal.lengthSq() < 0.5) continue;
+    const right = frame.up.clone().cross(normal).normalize();
+    const up = normal.clone().cross(right).normalize();
+    const faceRotation = new Quaternion()
+      .setFromRotationMatrix(new Matrix4().makeBasis(right, up, normal))
+      .invert();
+    for (let index = 0; index < orientations.length; index++) {
+      // Only these rolls put the partner below the focused lid. Other quarter
+      // turns belong to the upright, whole-display family.
+      if (frame.face === "right" && index !== 0) continue;
+      if (frame.face === "left" && index !== 2) continue;
+      const roll = (panel === 3 ? Math.PI / 2 : 0) - (index * Math.PI) / 2;
+      const rotation = faceRotation.clone().premultiply(new Quaternion().setFromAxisAngle(z, roll));
+      // A leaf-focused view looks slightly down onto its partner, as in a seated laptop.
+      if (frame.face === "left" || frame.face === "right")
+        rotation.premultiply(new Quaternion().setFromAxisAngle(new Vector3(1, 0, 0), Math.PI / 12));
+      if (
+        panel === 3 &&
+        frames.some(
+          (leaf) =>
+            (leaf.face === "left" || leaf.face === "right") &&
+            leaf.normal.clone().applyQuaternion(rotation).z < 0.04,
+        )
+      )
+        continue;
+      // Bound yaw using both real leaf normals. A narrow fold cannot tolerate
+      // the same side view as a fully open display.
+      let yawLimit = frame.face === "cover" ? Math.PI / 9 : Math.PI / 3;
+      if (panel === 3) {
+        for (const sign of [-1, 1]) {
+          for (let step = 1; step <= 60; step++) {
+            const turn = new Quaternion().setFromAxisAngle(y, (sign * step * Math.PI) / 180);
+            if (
+              frames.some(
+                (leaf) =>
+                  (leaf.face === "left" || leaf.face === "right") &&
+                  leaf.normal.clone().applyQuaternion(rotation).applyQuaternion(turn).z < 0.04,
+              )
+            ) {
+              yawLimit = Math.min(yawLimit, ((step - 1) * Math.PI) / 180);
+              break;
+            }
+          }
+        }
+      }
+      snaps.push({
+        rotation,
+        face: frame.face,
+        orientation: orientations[index]!,
+        center: frame.center.clone(),
+        yawLimit,
+      });
+    }
+  }
+  return snaps;
+}
+
+/** Fold-specific candidates use the base viewer's nearest-family selection. */
+export const nearestDuoView = nearestDeviceView<DuoViewSnap>;
diff --git a/packages/client-runtime/src/device/duoStream.test.ts b/packages/client-runtime/src/device/duoStream.test.ts
new file mode 100644
index 000000000000..f290bef1712d
--- /dev/null
+++ b/packages/client-runtime/src/device/duoStream.test.ts
@@ -0,0 +1,285 @@
+import { afterEach, expect, it, vi } from "vite-plus/test";
+import { createDeviceStreamClient, type DeviceScreenSize } from "./stream.ts";
+afterEach(() => vi.unstubAllGlobals());
+
+it("switches to fixed authenticated feeds while retaining one HID socket, routes the active panel and rejects superseded decoded output", async () => {
+  const feeds: {
+    url: string;
+    signal: AbortSignal;
+    controller: ReadableStreamDefaultController<Uint8Array>;
+  }[] = [];
+  const outputs: VideoFrameOutputCallback[] = [];
+  const errors: VideoDecoderInit["error"][] = [];
+  let supported = true;
+  let panelHttpStatus = 200;
+  let expected = 0;
+  let decoderReady = () => {};
+  const waitDecoders = (count: number) => {
+    expected = count;
+    return new Promise<void>((resolve) => {
+      decoderReady = resolve;
+    });
+  };
+  class Decoder {
+    static isConfigSupported = async () => ({ supported });
+    static instances: Decoder[] = [];
+    state = "unconfigured";
+    constructor(options: VideoDecoderInit) {
+      outputs.push(options.output);
+      errors.push(options.error);
+      Decoder.instances.push(this);
+      if (outputs.length === expected) decoderReady();
+    }
+    configure() {
+      this.state = "configured";
+    }
+    close() {
+      this.state = "closed";
+    }
+  }
+  let socketReady = () => {};
+  const socketConstructed = new Promise<void>((resolve) => {
+    socketReady = resolve;
+  });
+  class Socket {
+    static OPEN = 1;
+    static instances: Socket[] = [];
+    readyState = 1;
+    binaryType = "arraybuffer";
+    onopen?: () => void;
+    onmessage?: (event: { data: ArrayBuffer }) => void;
+    onclose?: (event: { code: number; reason: string }) => void;
+    send = vi.fn();
+    close = vi.fn();
+    constructor() {
+      Socket.instances.push(this);
+      socketReady();
+    }
+  }
+  vi.stubGlobal("VideoDecoder", Decoder);
+  vi.stubGlobal("EncodedVideoChunk", vi.fn());
+  vi.stubGlobal("WebSocket", Socket);
+  vi.stubGlobal(
+    "fetch",
+    vi.fn(async (url: string, options: { signal: AbortSignal }) => {
+      if (!url.includes("avcc")) return new Response("prime");
+      if (url.includes("/panel/") && panelHttpStatus !== 200)
+        return new Response("unsupported panel", { status: panelHttpStatus });
+      const stream = new ReadableStream<Uint8Array>({
+        start(controller) {
+          feeds.push({ url, signal: options.signal, controller });
+          options.signal.addEventListener("abort", () =>
+            controller.error(new DOMException("Aborted", "AbortError")),
+          );
+        },
+      });
+      return new Response(stream);
+    }),
+  );
+  const present = vi.fn((_source: CanvasImageSource, _width: number, _height: number) => true),
+    cover = vi.fn((_source: CanvasImageSource, _width: number, _height: number) => true),
+    inner = vi.fn((_source: CanvasImageSource, _width: number, _height: number) => true);
+  let panelFailed = () => {};
+  const panelFailure = new Promise<void>((resolve) => {
+    panelFailed = resolve;
+  });
+  const onStatus = vi.fn();
+  const onDuoControl = vi.fn();
+  const onDuoUnavailable = vi.fn((_detail?: string) => panelFailed());
+  const client = createDeviceStreamClient(
+    {
+      platform: "ios",
+      deviceId: "duo",
+      access: {
+        httpBase: "https://t3.test/api/device-hub",
+        wsBase: "wss://t3.test/api/device-hub",
+        credentials: true,
+        query: { hostId: "remote", wsTicket: "ticket" },
+      },
+    },
+    { present },
+    {
+      onStatus,
+      onDuoControl,
+      onDuoUnavailable,
+      onScreen: vi.fn(),
+      onInputConnected: vi.fn(),
+      onUnauthorized: vi.fn(),
+      onMjpegFallback: vi.fn(),
+    },
+  );
+  client.start();
+  await socketConstructed;
+  const ws = Socket.instances[0]!;
+  const config = (
+    id: number,
+    orientation: DeviceScreenSize["orientation"] = "portrait",
+    physical = false,
+  ) => {
+    const json = new TextEncoder().encode(
+      JSON.stringify({
+        width: id === 1 ? 1398 : 2007,
+        height: id === 1 ? 2034 : 2853,
+        orientation,
+        screenId: id,
+        supportsHingeAngle: true,
+        supportsPhysicalOrientation: physical,
+        hingePose: "open",
+      }),
+    );
+    const packet = new Uint8Array(json.length + 1);
+    packet[0] = 0x82;
+    packet.set(json, 1);
+    ws.onmessage?.({ data: packet.buffer });
+  };
+  config(3);
+  const requestedOrientation = () =>
+    JSON.parse(new TextDecoder().decode(ws.send.mock.lastCall?.[0].subarray(1))).orientation;
+  client.rotate();
+  expect(requestedOrientation()).toBe("landscape_left");
+  config(3); // An orientation-locked app keeps its framebuffer orientation after the sensor rotates.
+  expect(onDuoControl.mock.lastCall?.[0].error).toBeNull();
+  client.rotate();
+  expect(requestedOrientation()).toBe("portrait_upside_down");
+  config(3, "portrait_upside_down");
+  client.rotate();
+  expect(requestedOrientation()).toBe("landscape_right");
+  config(3); // An external native orientation change becomes authoritative again.
+  client.rotate();
+  expect(requestedOrientation()).toBe("landscape_left");
+  config(3, "landscape_left");
+  expect(onDuoControl.mock.lastCall?.[0].pending).toBe(false);
+  client.controlDuo({ control: "angle", value: 40 });
+  const angleRequest = JSON.parse(new TextDecoder().decode(ws.send.mock.lastCall?.[0].subarray(1)));
+  const before = ws.send.mock.calls.length;
+  client.controlDuo({ control: "orientation", value: "portrait" });
+  expect(ws.send.mock.calls.length).toBe(before);
+  config(3, "landscape_left"); // The angle's config precedes its receipt; it cannot acknowledge a queued rotation.
+  const reply = new TextEncoder().encode(
+    JSON.stringify({ requestId: angleRequest.requestId, ok: true }),
+  );
+  const receipt = new Uint8Array(reply.length + 1);
+  receipt[0] = 0x90;
+  receipt.set(reply, 1);
+  ws.onmessage?.({ data: receipt.buffer });
+  expect(requestedOrientation()).toBe("portrait");
+  expect(ws.send.mock.lastCall?.[0][0]).toBe(0x07);
+  client.controlDuo({ control: "angle", value: 55 });
+  const orientationSends = ws.send.mock.calls.length;
+  expect(onDuoControl.mock.lastCall?.[0].pending).toBe(true);
+  config(3);
+  expect(ws.send.mock.calls.length).toBe(orientationSends + 1);
+  const after = JSON.parse(new TextDecoder().decode(ws.send.mock.lastCall?.[0].subarray(1)));
+  expect(after.command).toEqual({ control: "angle", value: 55 });
+  const finalReply = new TextEncoder().encode(
+    JSON.stringify({ requestId: after.requestId, ok: true }),
+  );
+  const finalReceipt = new Uint8Array(finalReply.length + 1);
+  finalReceipt[0] = 0x90;
+  finalReceipt.set(finalReply, 1);
+  ws.onmessage?.({ data: finalReceipt.buffer });
+  expect(onDuoControl.mock.lastCall?.[0].pending).toBe(false);
+  const description = new Uint8Array([0, 0, 0, 5, 1, 1, 0x64, 0, 0x1f]);
+  let ready = waitDecoders(1);
+  feeds[0]!.controller.enqueue(description);
+  await ready;
+  client.setDuoPanels({ cover: { present: cover }, inner: { present: inner } });
+  expect(feeds[0]!.signal.aborted).toBe(true);
+  expect(Socket.instances).toHaveLength(1);
+  for (const [index, id] of [
+    [1, 1],
+    [2, 3],
+  ]) {
+    const url = new URL(feeds[index!]!.url);
+    expect(url.pathname.endsWith(`/panel/${id}/stream.avcc`)).toBe(true);
+    expect(url.searchParams.get("hostId")).toBe("remote");
+    expect(url.searchParams.get("wsTicket")).toBe("ticket");
+  }
+  ready = waitDecoders(3);
+  feeds[1]!.controller.enqueue(description);
+  feeds[2]!.controller.enqueue(description);
+  await ready;
+  const frame = {
+    displayWidth: 2007,
+    displayHeight: 2853,
+    close: vi.fn(),
+  } as unknown as VideoFrame;
+  outputs[0]!(frame);
+  expect(present).not.toHaveBeenCalled();
+  outputs[1]!(frame);
+  expect(cover).not.toHaveBeenCalled();
+  outputs[2]!(frame);
+  expect(inner).toHaveBeenCalledOnce();
+  expect(present).toHaveBeenCalledOnce();
+  config(1);
+  outputs[2]!(frame);
+  expect(inner).toHaveBeenCalledOnce();
+  outputs[1]!(frame);
+  expect(cover).toHaveBeenCalledOnce();
+  client.setDuoPanels(null);
+  expect(feeds[1]!.signal.aborted).toBe(true);
+  expect(feeds[2]!.signal.aborted).toBe(true);
+  expect(feeds[3]!.url).not.toContain("/panel/");
+  outputs[1]!(frame);
+  expect(cover).toHaveBeenCalledOnce();
+  ready = waitDecoders(4);
+  feeds[3]!.controller.enqueue(description);
+  await ready;
+  errors[0]!(new DOMException("Late decoder failure"));
+  expect(Decoder.instances[3]!.state).toBe("configured");
+  config(1, "portrait", true);
+  client.setDuoPanels({ cover: { present: cover }, inner: { present: inner } });
+  expect(feeds).toHaveLength(5); // One active feed replaces the two fixed feeds.
+  expect(feeds[4]!.url).not.toContain("/panel/");
+  expect(new URL(feeds[4]!.url).searchParams.get("hostId")).toBe("remote");
+  ready = waitDecoders(5);
+  feeds[4]!.controller.enqueue(description);
+  await ready;
+  const primary = { ...frame, displayWidth: 1398, displayHeight: 2034 } as VideoFrame;
+  const painted = present.mock.calls.length;
+  outputs[4]!(primary);
+  expect(present).toHaveBeenCalledTimes(painted + 1);
+  expect(present.mock.lastCall?.[0]).toBe(primary);
+  expect(cover).toHaveBeenCalledOnce(); // The main sink owns primary texture delivery.
+  config(3, "portrait", true);
+  expect(feeds[4]!.signal.aborted).toBe(true);
+  expect(feeds).toHaveLength(6);
+  ready = waitDecoders(6);
+  feeds[5]!.controller.enqueue(description);
+  await ready;
+  outputs[4]!(primary); // The old elected display cannot paint after handoff.
+  expect(present).toHaveBeenCalledTimes(painted + 1);
+  outputs[5]!(frame);
+  expect(present).toHaveBeenCalledTimes(painted + 2);
+  expect(present.mock.lastCall?.[0]).toBe(frame);
+  config(3, "portrait", true);
+  expect(feeds).toHaveLength(6); // Duplicate native readback does not reconnect.
+  supported = false;
+  client.setDuoPanels(null);
+  client.setDuoPanels({ cover: { present: cover }, inner: { present: inner } });
+  expect(feeds[7]!.url).not.toContain("/panel/");
+  feeds[7]!.controller.enqueue(description);
+  await panelFailure;
+  expect(onDuoUnavailable.mock.lastCall?.[0]).toContain("cannot decode");
+  config(3);
+  const fixedPanelFailure = new Promise<void>((resolve) => {
+    panelFailed = resolve;
+  });
+  client.setDuoPanels({ cover: { present: cover }, inner: { present: inner } });
+  feeds[8]!.controller.enqueue(description);
+  await fixedPanelFailure;
+  expect(onDuoUnavailable).toHaveBeenCalled();
+  expect(onStatus.mock.calls.some(([status]) => status === "error")).toBe(false);
+  panelHttpStatus = 404;
+  const missingPanel = new Promise<void>((resolve) => {
+    panelFailed = resolve;
+  });
+  client.setDuoPanels({ cover: { present: cover }, inner: { present: inner } });
+  await missingPanel;
+  expect(onDuoUnavailable.mock.lastCall?.[0]).toContain("does not provide fixed Duo");
+  expect(Socket.instances).toHaveLength(1);
+  client.stop();
+  expect(feeds[3]!.signal.aborted).toBe(true);
+  expect(ws.close).toHaveBeenCalledOnce();
+  expect(frame.close).toHaveBeenCalledTimes(9);
+});
diff --git a/packages/client-runtime/src/device/duoViewer.test.ts b/packages/client-runtime/src/device/duoViewer.test.ts
new file mode 100644
index 000000000000..b85d306bcfd6
--- /dev/null
+++ b/packages/client-runtime/src/device/duoViewer.test.ts
@@ -0,0 +1,703 @@
+import { afterEach, expect, it, vi } from "vite-plus/test";
+import type { Scene, PerspectiveCamera, Box3, Quaternion } from "three";
+
+const gpu = vi.hoisted(() => ({
+  instances: [] as {
+    blank: boolean;
+    allocations: number;
+    frames: Scene[];
+    views: { camera: PerspectiveCamera; bounds: Box3; quaternion: Quaternion }[];
+    dispose: ReturnType<typeof vi.fn>;
+    forceContextLoss: ReturnType<typeof vi.fn>;
+  }[],
+  environmentDispose: vi.fn(),
+}));
+vi.mock("three", async () => {
+  const actual = await vi.importActual<typeof import("three")>("three");
+  return {
+    ...actual,
+    WebGLRenderer: class {
+      state = {
+        blank: true,
+        allocations: 0,
+        frames: [] as Scene[],
+        views: [] as { camera: PerspectiveCamera; bounds: Box3; quaternion: Quaternion }[],
+        dispose: vi.fn(),
+        forceContextLoss: vi.fn(),
+      };
+      constructor() {
+        gpu.instances.push(this.state);
+      }
+      setDrawingBufferSize() {
+        this.state.blank = true;
+        this.state.allocations++;
+      }
+      render(scene: Scene, camera: PerspectiveCamera) {
+        this.state.blank = false;
+        this.state.frames.push(scene);
+        const root = scene.children.find((child) => child instanceof actual.Group)!;
+        root.updateMatrixWorld(true);
+        camera.updateMatrixWorld(true);
+        this.state.views.push({
+          camera: camera.clone(),
+          bounds: new actual.Box3().setFromObject(root),
+          quaternion: root.quaternion.clone(),
+        });
+      }
+      dispose() {
+        this.state.dispose();
+      }
+      forceContextLoss() {
+        this.state.forceContextLoss();
+      }
+    },
+    PMREMGenerator: class {
+      fromScene() {
+        return { texture: new actual.Texture(), dispose: gpu.environmentDispose };
+      }
+      dispose() {}
+    },
+  };
+});
+const models = vi.hoisted(() => ({
+  resolve: (_model: { asset: import("three").Group; dispose: () => void }) => {},
+  signal: null as AbortSignal | null,
+}));
+vi.mock("./modelScene.ts", () => ({
+  loadDeviceModel: (_source: unknown, signal: AbortSignal) => {
+    models.signal = signal;
+    return new Promise((resolve) => {
+      models.resolve = resolve;
+    });
+  },
+}));
+import {
+  Group,
+  Mesh,
+  MeshBasicMaterial,
+  PlaneGeometry,
+  Vector3,
+  Euler,
+  Quaternion as Rotation,
+} from "three";
+import { createDuoViewer } from "./duoViewer.ts";
+
+afterEach(() => {
+  vi.useRealTimers();
+  vi.unstubAllGlobals();
+  gpu.instances.length = 0;
+  gpu.environmentDispose.mockClear();
+});
+
+function fixture(
+  reduced = true,
+  onOrientationRequested = vi.fn(),
+  onPanelRequested?: (panel: 1 | 3) => void,
+) {
+  const pending = new Map<number, FrameRequestCallback>();
+  let id = 0;
+  vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => {
+    pending.set(++id, callback);
+    return id;
+  });
+  vi.stubGlobal("cancelAnimationFrame", (id: number) => pending.delete(id));
+  vi.stubGlobal("matchMedia", () => ({ matches: reduced }));
+  const drawImage = vi.fn();
+  vi.stubGlobal("document", {
+    createElement: () => ({
+      width: 0,
+      height: 0,
+      getContext: () => ({
+        fillRect() {},
+        save() {},
+        restore() {},
+        translate() {},
+        rotate() {},
+        drawImage,
+        getImageData: () => ({ data: new Uint8ClampedArray(8 * 8 * 4).fill(255) }),
+      }),
+    }),
+  });
+  const canvas = new EventTarget() as HTMLCanvasElement;
+  const viewer = createDuoViewer({
+    canvas,
+    sources: {
+      1: { width: 1398, height: 2034 } as HTMLCanvasElement,
+      3: { width: 2007, height: 2853 } as HTMLCanvasElement,
+    },
+    model: { id: "iphone-duo", url: "/duo.glb" },
+    onUnavailable: vi.fn(),
+    onOrientationRequested,
+    ...(onPanelRequested ? { onPanelRequested } : {}),
+  });
+  const draw = () => {
+    const callbacks = [...pending.values()];
+    pending.clear();
+    callbacks.forEach((callback) => callback(0));
+  };
+  return { viewer, draw, pending, state: gpu.instances[0]!, onOrientationRequested, drawImage };
+}
+
+function asset() {
+  const group = new Group();
+  for (const [name, names] of [
+    ["left-half", ["cover-display", "inner-display-left"]],
+    ["right-half", ["inner-display-right"]],
+  ] as const) {
+    const leaf = new Group();
+    leaf.name = name;
+    for (const name of names) {
+      const mesh = new Mesh(new PlaneGeometry(1, 2), new MeshBasicMaterial());
+      if (name === "cover-display") mesh.geometry.rotateY(Math.PI);
+      mesh.geometry.translate(
+        name === "inner-display-right" ? 0.5 : -0.5,
+        0,
+        name === "cover-display" ? -0.05 : 0.05,
+      );
+      mesh.name = name;
+      leaf.add(mesh);
+    }
+    group.add(leaf);
+  }
+  return group;
+}
+
+it("coalesces resize with redraw, retains the renderer and scene, and settles without an idle animation loop", async () => {
+  let now = 0;
+  vi.stubGlobal("performance", { now: () => now });
+  const { viewer, draw, pending, state } = fixture();
+  const dispose = vi.fn();
+  models.resolve({ asset: asset(), dispose });
+  await Promise.resolve();
+  viewer.setScreen({
+    width: 1398,
+    height: 2034,
+    orientation: "portrait",
+    screenId: 1,
+    hingeAngle: 0,
+  });
+  viewer.resize(500, 700, 2);
+  draw();
+  const scene = state.frames.at(-1);
+  viewer.resize(450, 700, 2);
+  viewer.resize(400, 700, 2);
+  viewer.orbit(0.1, 0.04);
+  expect(state.blank).toBe(false);
+  expect(state.allocations).toBe(1);
+  expect(pending.size).toBe(1);
+  draw();
+  expect(state.blank).toBe(false);
+  expect(state.allocations).toBe(2);
+  expect(state.frames.at(-1)).toBe(scene);
+  expect(gpu.instances).toHaveLength(1);
+  now += 1000;
+  draw();
+  draw();
+  expect(pending.size).toBe(0);
+  viewer.dispose();
+  viewer.dispose();
+  expect(dispose).toHaveBeenCalledOnce();
+  expect(state.dispose).toHaveBeenCalledOnce();
+  expect(gpu.environmentDispose).toHaveBeenCalledOnce();
+  expect(pending.size).toBe(0);
+});
+
+it("cancels loading and disposes a late model after unmount without installing or rendering it", async () => {
+  const { viewer, draw, state } = fixture();
+  viewer.resize(400, 700, 2);
+  viewer.dispose();
+  expect(models.signal?.aborted).toBe(true);
+  const dispose = vi.fn();
+  models.resolve({ asset: asset(), dispose });
+  await Promise.resolve();
+  draw();
+  expect(dispose).toHaveBeenCalledOnce();
+  expect(state.frames).toHaveLength(0);
+});
+
+it("keeps the chosen release view when an app locks orientation, freezes it during contact, and stops drawing after release", async () => {
+  let now = 0;
+  vi.stubGlobal("performance", { now: () => now });
+  const { viewer, draw, state, pending, onOrientationRequested } = fixture();
+  models.resolve({ asset: asset(), dispose: vi.fn() });
+  await Promise.resolve();
+  const screen = {
+    width: 1398,
+    height: 2034,
+    orientation: "portrait" as const,
+    screenId: 1,
+    hingeAngle: 0,
+  };
+  viewer.setScreen(screen);
+  viewer.resize(500, 700, 2);
+  draw();
+  const initial = state.views.at(-1)!.quaternion.clone();
+  viewer.setInteractionActive(true, "orbit");
+  viewer.orbit(0, Math.PI / 3);
+  draw();
+  const held = state.views.at(-1)!.quaternion.clone();
+  now = 1000;
+  viewer.frameUpdated(1);
+  draw();
+  expect(state.views.at(-1)!.quaternion.angleTo(held)).toBeLessThan(1e-6);
+  expect(onOrientationRequested).not.toHaveBeenCalled();
+  viewer.setInteractionActive(false, "orbit");
+  draw();
+  expect(onOrientationRequested).toHaveBeenCalledOnce();
+  const chosen = state.views.at(-1)!.quaternion.clone();
+  expect(chosen.angleTo(initial)).toBeGreaterThan(1);
+  viewer.setScreen({ ...screen }); // Native config confirms the sensor command, even if the app stays portrait.
+  draw();
+  expect(state.views.at(-1)!.quaternion.angleTo(chosen)).toBeLessThan(1e-6);
+  expect(pending.size).toBe(0);
+  viewer.resetPose();
+  draw();
+  expect(onOrientationRequested).toHaveBeenCalledTimes(2);
+  expect(onOrientationRequested.mock.lastCall?.[0]).toBe("portrait");
+  viewer.setScreen({ ...screen });
+  draw();
+  expect(pending.size).toBe(0);
+  viewer.dispose();
+});
+
+it("settles a hinge transition after a throttled frame instead of stretching time", async () => {
+  let now = 100;
+  vi.stubGlobal("performance", { now: () => now });
+  const { viewer, draw, pending } = fixture(false);
+  models.resolve({ asset: asset(), dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(400, 700, 2);
+  viewer.setScreen({
+    width: 1398,
+    height: 2034,
+    orientation: "portrait",
+    screenId: 1,
+    hingeAngle: 0,
+  });
+  draw();
+  viewer.setScreen({
+    width: 2007,
+    height: 2853,
+    orientation: "portrait",
+    screenId: 3,
+    hingeAngle: 180,
+  });
+  now += 1_000;
+  draw();
+  draw();
+  expect(pending.size).toBe(0);
+  viewer.dispose();
+});
+
+it("faces a display handed off by native rotation without requesting another sensor rotation", async () => {
+  let now = 0;
+  vi.stubGlobal("performance", { now: () => now });
+  const { viewer, draw, pending, onOrientationRequested } = fixture();
+  const loaded = asset();
+  models.resolve({ asset: loaded, dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(500, 700, 2);
+  viewer.setScreen({
+    width: 2007,
+    height: 2853,
+    orientation: "portrait",
+    screenId: 3,
+    hingeAngle: 90,
+  });
+  draw();
+  viewer.setInteractionActive(true, "orbit");
+  viewer.orbit(0, Math.PI / 6);
+  viewer.setInteractionActive(false, "orbit");
+  now = 1000;
+  draw();
+  const requests = onOrientationRequested.mock.calls.length;
+  expect(requests).toBe(1);
+  viewer.setScreen({
+    width: 1398,
+    height: 2034,
+    orientation: "landscape_left",
+    screenId: 1,
+    hingeAngle: 90,
+  });
+  draw();
+  draw();
+  const cover = loaded.getObjectByName("cover-display") as Mesh;
+  const normal = new Vector3()
+    .fromBufferAttribute(cover.geometry.getAttribute("normal"), 0)
+    .transformDirection(cover.matrixWorld);
+  expect(normal.z).toBeGreaterThan(0.45);
+  expect(onOrientationRequested).toHaveBeenCalledTimes(requests);
+  expect(pending.size).toBe(0);
+  viewer.dispose();
+});
+
+it.each(["book", "laptop", "open"] as const)(
+  "faces native cover readback for %s even when configuration arrives before the model",
+  async (hingePose) => {
+    const { viewer, draw } = fixture();
+    viewer.resize(500, 700, 2);
+    viewer.setScreen({
+      width: 1398,
+      height: 2034,
+      orientation: "landscape_left",
+      screenId: 1,
+      hingeAngle: hingePose === "open" ? 180 : 90,
+      hingePose,
+    });
+    const loaded = asset();
+    models.resolve({ asset: loaded, dispose: vi.fn() });
+    await Promise.resolve();
+    draw();
+    draw();
+    const cover = loaded.getObjectByName("cover-display") as Mesh;
+    const normal = new Vector3()
+      .fromBufferAttribute(cover.geometry.getAttribute("normal"), 0)
+      .transformDirection(cover.matrixWorld);
+    expect(normal.z).toBeGreaterThan(0.45);
+    viewer.dispose();
+  },
+);
+
+it("keeps default-zoom orbits framed across folds and fits the current assembly", async () => {
+  const { viewer, draw, state } = fixture();
+  models.resolve({ asset: asset(), dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(380, 620, 2);
+  viewer.resetPose();
+  viewer.setInteractionActive(true, "orbit");
+  let minimumDistance = Infinity;
+  let maximumDistance = 0;
+  for (const hingeAngle of [0, 30, 90, 127, 180]) {
+    viewer.setScreen({
+      width: 2007,
+      height: 2853,
+      orientation: "portrait",
+      screenId: 3,
+      hingeAngle,
+    });
+    for (let turn = 0; turn < 16; turn++) {
+      viewer.orbit(0.1, turn % 2 ? -0.08 : 0.08);
+      draw();
+      const { camera, bounds } = state.views.at(-1)!;
+      const center = bounds.getCenter(new Vector3()).project(camera);
+      expect(Math.abs(center.x)).toBeLessThan(0.18);
+      expect(Math.abs(center.y)).toBeLessThan(0.18);
+      state.frames.at(-1)!.traverse((object) => {
+        if (!(object instanceof Mesh)) return;
+        const positions = object.geometry.getAttribute("position");
+        for (let index = 0; index < positions.count; index++) {
+          const point = new Vector3()
+            .fromBufferAttribute(positions, index)
+            .applyMatrix4(object.matrixWorld)
+            .project(camera);
+          expect(Math.abs(point.x)).toBeLessThan(1);
+          expect(Math.abs(point.y)).toBeLessThan(1);
+        }
+      });
+      minimumDistance = Math.min(minimumDistance, camera.position.z);
+      maximumDistance = Math.max(maximumDistance, camera.position.z);
+    }
+  }
+  expect(maximumDistance).toBeGreaterThan(minimumDistance);
+  viewer.dispose();
+});
+
+it("previews hinge articulation while preserving the laptop lid orientation and blocking unconfirmed input", async () => {
+  const { viewer, draw, pending } = fixture();
+  const loaded = asset();
+  models.resolve({ asset: loaded, dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(500, 700, 2);
+  viewer.setScreen({
+    width: 2853,
+    height: 2007,
+    orientation: "landscape_left",
+    screenId: 3,
+    hingeAngle: 90,
+    hingePose: "laptop",
+  });
+  draw();
+  const lid = loaded.getObjectByName("right-half")!;
+  const presentation = lid.getWorldQuaternion(new Rotation());
+  for (const value of [127, 50, 170]) {
+    viewer.setHingePreview(value);
+    draw();
+    expect(loaded.getObjectByName("left-half")!.rotation.y).toBeCloseTo(
+      ((180 - value) * Math.PI) / 360,
+    );
+    expect(lid.getWorldQuaternion(new Rotation()).angleTo(presentation)).toBeLessThan(0.00001);
+    expect(viewer.screenPoint(0.5, 0.5)).toBeNull();
+    viewer.setScreen({
+      width: 2007,
+      height: 2853,
+      orientation: "portrait",
+      screenId: 3,
+      hingeAngle: value,
+      hingePose: null,
+    });
+    draw();
+    expect(lid.getWorldQuaternion(new Rotation()).angleTo(presentation)).toBeLessThan(0.00001);
+  }
+  viewer.setHingePreview(null);
+  draw();
+  expect(pending.size).toBe(0);
+  expect(lid.getWorldQuaternion(new Rotation()).angleTo(presentation)).toBeLessThan(0.00001);
+  viewer.dispose();
+});
+
+it("does not restart an animated preset on duplicate native configurations", async () => {
+  let now = 100;
+  vi.stubGlobal("performance", { now: () => now });
+  const { viewer, draw, pending } = fixture(false);
+  models.resolve({ asset: asset(), dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(400, 700, 2);
+  viewer.setScreen({
+    width: 1398,
+    height: 2034,
+    orientation: "portrait",
+    screenId: 1,
+    hingeAngle: 0,
+    hingePose: "closed",
+  });
+  draw();
+  const next = {
+    width: 2007,
+    height: 2853,
+    orientation: "portrait" as const,
+    screenId: 3,
+    hingeAngle: 180,
+    hingePose: "open" as const,
+  };
+  viewer.setScreen(next);
+  now += 1_000;
+  viewer.setScreen(next);
+  draw();
+  now += 1000;
+  draw();
+  draw();
+  expect(pending.size).toBe(0);
+  viewer.dispose();
+});
+
+it("lets standalone rotation leave Laptop and Tent and stand a closed device upright after hinge edits", async () => {
+  const { viewer, draw, state } = fixture();
+  models.resolve({ asset: asset(), dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(500, 700, 2);
+  viewer.resetPose();
+  for (const hingePose of ["laptop", "tent"] as const) {
+    viewer.setScreen({
+      width: 1398,
+      height: 2034,
+      orientation: "landscape_left",
+      screenId: 1,
+      hingeAngle: 90,
+      hingePose,
+    });
+    draw();
+    viewer.setHingePreview(0);
+    viewer.setScreen({
+      width: 1398,
+      height: 2034,
+      orientation: "landscape_left",
+      screenId: 1,
+      hingeAngle: 0,
+      hingePose: null,
+    });
+    viewer.setHingePreview(null);
+    draw();
+    viewer.cancelInput(); // Explicit toolbar rotation ends folding ownership.
+    viewer.setScreen({
+      width: 1398,
+      height: 2034,
+      orientation: "portrait",
+      screenId: 1,
+      hingeAngle: 0,
+      hingePose: null,
+    });
+    draw();
+    const upright = new Rotation().setFromEuler(new Euler(0, Math.PI / 2, 0, "YXZ"));
+    expect(state.views.at(-1)!.quaternion.angleTo(upright)).toBeLessThan(0.00001);
+    const bounds = state.views.at(-1)!.bounds;
+    expect(bounds.max.y - bounds.min.y).toBeGreaterThan(bounds.max.x - bounds.min.x);
+  }
+  viewer.dispose();
+});
+
+it("snaps onto the opposite screen, requests native handoff once and retains the chosen view on readback", async () => {
+  vi.useFakeTimers();
+  let now = 0;
+  vi.stubGlobal("performance", { now: () => now });
+  const onPanelRequested = vi.fn();
+  const { viewer, draw, state, pending, onOrientationRequested } = fixture(
+    true,
+    vi.fn(),
+    onPanelRequested,
+  );
+  models.resolve({ asset: asset(), dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(500, 700, 2);
+  const inner = {
+    width: 2007,
+    height: 2853,
+    orientation: "portrait" as const,
+    screenId: 3,
+    hingeAngle: 90,
+    supportsPhysicalOrientation: true,
+  };
+  viewer.setScreen(inner);
+  draw();
+  viewer.setInteractionActive(true, "orbit");
+  viewer.orbit(Math.PI / 3, 0);
+  draw();
+  viewer.setInteractionActive(false, "orbit");
+  draw();
+  expect(onPanelRequested).toHaveBeenCalledExactlyOnceWith(1);
+  expect(onOrientationRequested).not.toHaveBeenCalled();
+  expect(viewer.screenPoint(0.5, 0.5)).toBeNull();
+  const chosen = state.views.at(-1)!.quaternion.clone();
+  viewer.setScreen({ ...inner, hingePose: null }); // Command acknowledgement precedes sensor readback.
+  draw();
+  expect(state.views.at(-1)!.quaternion.angleTo(chosen)).toBeLessThan(1e-6);
+  viewer.setScreen({ ...inner, width: 1398, height: 2034, screenId: 1 });
+  draw();
+  expect(state.views.at(-1)!.quaternion.angleTo(chosen)).toBeLessThan(1e-6);
+  vi.advanceTimersByTime(5000);
+  expect(onPanelRequested).toHaveBeenCalledTimes(1);
+  expect(pending.size).toBe(0);
+  viewer.setInteractionActive(true, "orbit");
+  viewer.orbit(-Math.PI / 3, 0);
+  draw();
+  viewer.setInteractionActive(false, "orbit");
+  draw();
+  expect(onPanelRequested).toHaveBeenLastCalledWith(3);
+  const reverse = state.views.at(-1)!.quaternion.clone();
+  viewer.setScreen(inner);
+  draw();
+  expect(state.views.at(-1)!.quaternion.angleTo(reverse)).toBeLessThan(1e-6);
+  vi.advanceTimersByTime(5000);
+  draw();
+  expect(pending.size).toBe(0);
+  expect(onPanelRequested).toHaveBeenCalledTimes(2);
+  viewer.dispose();
+  vi.useRealTimers();
+});
+
+it("rolls an unconfirmed opposite-screen snap back to the native active screen after timeout", async () => {
+  vi.useFakeTimers();
+  const request = vi.fn();
+  const { viewer, draw, state, pending } = fixture(true, vi.fn(), request);
+  models.resolve({ asset: asset(), dispose: vi.fn() });
+  await Promise.resolve();
+  viewer.resize(500, 700, 2);
+  viewer.setScreen({
+    width: 2007,
+    height: 2853,
+    orientation: "portrait",
+    screenId: 3,
+    hingeAngle: 90,
+    supportsPhysicalOrientation: true,
+  });
+  draw();
+  viewer.setInteractionActive(true, "orbit");
+  viewer.orbit(Math.PI / 3, 0);
+  draw();
+  viewer.setInteractionActive(false, "orbit");
+  draw();
+  const unconfirmed = state.views.at(-1)!.quaternion.clone();
+  expect(request).toHaveBeenCalledExactlyOnceWith(1);
+  vi.advanceTimersByTime(5000);
+  draw();
+  expect(state.views.at(-1)!.quaternion.angleTo(unconfirmed)).toBeGreaterThan(0.5);
+  expect(request).toHaveBeenCalledOnce();
+  draw();
+  expect(pending.size).toBe(0);
+  viewer.dispose();
+});
+
+it("uses the elected primary frame during handoff and never lets a stale fixed-panel feed overwrite it", async () => {
+  const { viewer, drawImage } = fixture();
+  const cover = {
+    width: 1398,
+    height: 2034,
+    orientation: "portrait" as const,
+    screenId: 1,
+    hingeAngle: 90,
+  };
+  viewer.setScreen(cover);
+  const primary = { width: 1398, height: 2034 } as HTMLCanvasElement;
+  viewer.frameUpdated(1, primary);
+  expect(drawImage.mock.calls.at(-1)?.[0]).toBe(primary);
+  const uploads = drawImage.mock.calls.length;
+  viewer.frameUpdated(1);
+  expect(drawImage).toHaveBeenCalledTimes(uploads);
+  viewer.frameUpdated(3, primary);
+  expect(drawImage).toHaveBeenCalledTimes(uploads);
+  viewer.setScreen({ ...cover, width: 2007, height: 2853, screenId: 3 });
+  const inner = { width: 2007, height: 2853 } as HTMLCanvasElement;
+  viewer.frameUpdated(3, inner);
+  expect(drawImage.mock.calls.at(-1)?.[0]).toBe(inner);
+  viewer.setScreen(cover);
+  viewer.frameUpdated(1);
+  expect(drawImage.mock.calls.length).toBeGreaterThan(uploads + 1);
+  viewer.dispose();
+});
+
+it.each(["left", "right"] as const)(
+  "keeps the primary surface oriented when pinching over the %s half through closure and reopening",
+  async (face) => {
+    const { viewer, draw, state, pending, onOrientationRequested } = fixture();
+    const loaded = asset();
+    models.resolve({ asset: loaded, dispose: vi.fn() });
+    await Promise.resolve();
+    viewer.resize(500, 700, 2);
+    const inner = {
+      width: 2007,
+      height: 2853,
+      orientation: "portrait" as const,
+      screenId: 3,
+      hingeAngle: 180,
+      hingePose: "open" as const,
+    };
+    viewer.setScreen(inner);
+    draw();
+    expect(viewer.beginHinge(-1, -1)).toBe(false);
+    const leaf = loaded.getObjectByName("right-half")!;
+    const mesh = loaded.getObjectByName(`inner-display-${face}`) as Mesh;
+    const center = mesh.geometry.boundingBox!.getCenter(new Vector3());
+    const point = mesh.localToWorld(center).project(state.views.at(-1)!.camera);
+    expect(viewer.beginHinge((point.x + 1) / 2, (1 - point.y) / 2)).toBe(true);
+    const orientation = leaf.getWorldQuaternion(new Rotation());
+    const partner = loaded.getObjectByName("left-half")!;
+    const partnerStart = partner.getWorldQuaternion(new Rotation());
+    for (const value of [150, 90, 30, 0, 30, 90, 180]) {
+      viewer.setHingePreview(value);
+      draw();
+      expect(leaf.getWorldQuaternion(new Rotation()).angleTo(orientation)).toBeLessThan(1e-6);
+      if (value === 90)
+        expect(partner.getWorldQuaternion(new Rotation()).angleTo(partnerStart)).toBeGreaterThan(1);
+      const next =
+        value === 0
+          ? { ...inner, width: 1398, height: 2034, screenId: 1, hingeAngle: value, hingePose: null }
+          : { ...inner, hingeAngle: value, hingePose: null };
+      viewer.setScreen(next);
+      viewer.setHingePreview(null);
+      draw();
+      viewer.setScreen({ ...next }); // Late native readback cannot change the view.
+      draw();
+      expect(leaf.getWorldQuaternion(new Rotation()).angleTo(orientation)).toBeLessThan(1e-6);
+      expect(viewer.screenPoint(0.5, 0.5)).toBeNull(); // No fresh native frame yet.
+      if (value === 0) {
+        const cover = loaded.getObjectByName("cover-display") as Mesh;
+        const center = cover.geometry.boundingBox!.getCenter(new Vector3());
+        const hit = cover.localToWorld(center).project(state.views.at(-1)!.camera);
+        expect(viewer.beginHinge((hit.x + 1) / 2, (1 - hit.y) / 2)).toBe(true);
+      }
+    }
+    expect(onOrientationRequested).not.toHaveBeenCalled();
+    draw();
+    expect(pending.size).toBe(0);
+    viewer.dispose();
+  },
+);
diff --git a/packages/client-runtime/src/device/duoViewer.ts b/packages/client-runtime/src/device/duoViewer.ts
new file mode 100644
index 000000000000..7feca7452e0d
--- /dev/null
+++ b/packages/client-runtime/src/device/duoViewer.ts
@@ -0,0 +1,566 @@
+// @effect-diagnostics globalTimers:off - Native display handoff has a bounded acknowledgement window.
+import {
+  AmbientLight,
+  Box3,
+  CanvasTexture,
+  DirectionalLight,
+  Euler,
+  LinearFilter,
+  PerspectiveCamera,
+  PMREMGenerator,
+  Quaternion,
+  Scene,
+  SRGBColorSpace,
+  Vector3,
+  WebGLRenderer,
+} from "three";
+import { RoomEnvironment } from "three/addons/environments/RoomEnvironment.js";
+import {
+  createDuoScene,
+  duoDisplayKey,
+  duoFrameMatches,
+  type DuoPanelId,
+  type DuoHingeLeaf,
+} from "./duoScene.ts";
+import { loadDeviceModel } from "./modelScene.ts";
+import { createDeviceModelSlot, type DeviceModelSource } from "./model.ts";
+import { createDeviceFraming } from "./deviceFraming.ts";
+import { createDeviceMotion } from "./deviceMotion.ts";
+import { duoViewSnaps, nearestDuoView, type DuoRestFace } from "./duoSnap.ts";
+import { createRenderScheduler } from "./renderScheduler.ts";
+import type { DeviceScreenSize } from "./stream.ts";
+import type { DuoPose } from "./duoControl.ts";
+
+export interface DuoViewer {
+  readonly setScreen: (screen: DeviceScreenSize | null) => void;
+  readonly setHingePreview: (angle: number | null) => void;
+  readonly setInteractionActive: (active: boolean, mode?: "touch" | "orbit") => void;
+  readonly rejectOrientation: () => void;
+  readonly frameUpdated: (panel: DuoPanelId, primary?: HTMLCanvasElement) => void;
+  readonly resize: (width: number, height: number, pixelRatio: number) => void;
+  readonly screenPoint: (
+    x: number,
+    y: number,
+    captured?: boolean,
+  ) => { x: number; y: number } | null;
+  readonly orbit: (x: number, y: number) => void;
+  readonly beginHinge: (x: number, y: number) => boolean;
+  readonly resetPose: () => void;
+  readonly cancelInput: () => void;
+  readonly dispose: () => void;
+}
+
+/** On-demand renderer for the articulated body. One inner framebuffer spans both leaves; HID belongs to the stream. */
+export function createDuoViewer(options: {
+  canvas: HTMLCanvasElement;
+  sources: Record<DuoPanelId, HTMLCanvasElement>;
+  model: DeviceModelSource;
+  onUnavailable: () => void;
+  onModelError?: (cause: unknown) => void;
+  onPanelRequested?: (panel: DuoPanelId) => void;
+  onOrientationRequested?: (orientation: DeviceScreenSize["orientation"]) => void;
+}): DuoViewer {
+  const surfaces = ([1, 3] as const)
+    .map((id) => {
+      const canvas = document.createElement("canvas");
+      canvas.width = id === 1 ? 784 : 1600;
+      canvas.height = id === 1 ? 1140 : 1125;
+      const context = canvas.getContext("2d", { alpha: false });
+      if (!context) throw new Error("Duo display canvas is unavailable");
+      context.fillStyle = "#080a10";
+      context.fillRect(0, 0, canvas.width, canvas.height);
+      return { id, canvas, context };
+    })
+    .map(({ id, canvas, context }) => {
+      const texture = new CanvasTexture(canvas);
+      texture.colorSpace = SRGBColorSpace;
+      texture.minFilter = texture.magFilter = LinearFilter;
+      texture.generateMipmaps = false;
+      return { id, canvas, context, texture };
+    });
+  const renderer = new WebGLRenderer({
+    canvas: options.canvas,
+    alpha: true,
+    antialias: true,
+    powerPreference: "low-power",
+  });
+  renderer.outputColorSpace = SRGBColorSpace;
+  const scene = new Scene();
+  const environment = (() => {
+    const generator = new PMREMGenerator(renderer);
+    const room = new RoomEnvironment();
+    try {
+      return generator.fromScene(room, 0.04);
+    } catch (cause) {
+      for (const surface of surfaces) surface.texture.dispose();
+      renderer.dispose();
+      renderer.forceContextLoss();
+      throw cause;
+    } finally {
+      room.dispose();
+      generator.dispose();
+    }
+  })();
+  scene.environment = environment.texture;
+  const camera = new PerspectiveCamera(36, 1, 0.1, 150);
+  const key = new DirectionalLight(0xffffff, 4);
+  key.position.set(-6, 10, 14);
+  const fill = new DirectionalLight(0xc7dcff, 2);
+  fill.position.set(8, -3, -5);
+  scene.add(new AmbientLight(0xffffff, 2.4), key, fill);
+  let model: ReturnType<typeof createDuoScene> | null = null;
+  let screen: DeviceScreenSize | null = null;
+  let readyKey = "";
+  let primaryKey = "";
+  let activationAt = 0;
+  let disposed = false;
+  let viewport = { width: 0, height: 0, ratio: 1 };
+  let buffer = { width: 0, height: 0, ratio: 0 };
+  let restFace: DuoRestFace = "inside";
+  let requestedOrientation: DeviceScreenSize["orientation"] | null = null;
+  let viewOrientation: DeviceScreenSize["orientation"] | null = null;
+  const pivot = new Vector3();
+  const targetPivot = new Vector3();
+  let requestedPanel: DuoPanelId | null = null;
+  let handoffTimer: ReturnType<typeof setTimeout> | null = null;
+  const clearHandoff = () => {
+    if (handoffTimer) clearTimeout(handoffTimer);
+    handoffTimer = null;
+    requestedPanel = null;
+  };
+  const activeSnaps = () =>
+    model
+      ? duoViewSnaps(
+          model.restFrames(screen?.screenId === 1 ? 1 : 3),
+          screen?.screenId === 1 ? 1 : 3,
+        )
+      : [];
+  const snaps = () => {
+    if (!model || !screen?.supportsPhysicalOrientation || !options.onPanelRequested)
+      return activeSnaps();
+    const cover = duoViewSnaps(model.restFrames(1), 1);
+    // A shut inner display is occluded and cannot become a useful rest view.
+    return angle > 20 && angle < 180
+      ? [...duoViewSnaps(model.restFrames(3), 3), ...cover]
+      : activeSnaps();
+  };
+  const orbit = createDeviceMotion({
+    choose(rotation) {
+      const snap = nearestDuoView(rotation, snaps());
+      if (!snap) return rotation;
+      restFace = snap.face;
+      const panel = snap.face === "cover" ? 1 : 3;
+      if (screen && panel !== (requestedPanel ?? screen.screenId) && options.onPanelRequested) {
+        clearHandoff();
+        requestedPanel = panel;
+        model?.cancelInput();
+        options.onPanelRequested(panel);
+        handoffTimer = setTimeout(() => {
+          clearHandoff();
+          const confirmed = nearestDuoView(orbit.rotation, activeSnaps());
+          if (confirmed) {
+            restFace = confirmed.face;
+            orbit.setPose(confirmed.rotation, performance.now());
+          }
+          scheduler.invalidate();
+        }, 5000);
+      } else if (
+        screen &&
+        requestedPanel === null &&
+        snap.orientation !== viewOrientation &&
+        options.onOrientationRequested
+      ) {
+        viewOrientation = snap.orientation;
+        requestedOrientation = snap.orientation;
+        options.onOrientationRequested(snap.orientation);
+      }
+      return snap.rotation;
+    },
+  });
+  let angle = 180;
+  let targetAngle = 180;
+  let previewAngle: number | null = null;
+  let hingeLeaf: DuoHingeLeaf | null = null;
+  let appliedAngle = Number.NaN;
+  let interactionActive = false;
+  const framing = createDeviceFraming();
+  const framingBounds = new Box3();
+  let firstPose = true;
+  let physicalPose: DuoPose = "open";
+  let presentationAngle = 180;
+  let targetPresentation = new Quaternion();
+  let lastTime = 0;
+  const reduced =
+    typeof matchMedia === "function" && matchMedia("(prefers-reduced-motion: reduce)").matches;
+  const applyPose = () => {
+    if (!model) return;
+    const before = hingeLeaf && appliedAngle !== angle ? model.leafRotation(hingeLeaf) : null;
+    model.setAngle(angle);
+    appliedAngle = angle;
+    if (before && hingeLeaf) {
+      // The primary surface stays in camera space; its partner supplies the fold.
+      // Rebase both the displayed rotation and its rest target so releasing a
+      // pinch cannot resume the pre-fold body rotation.
+      const correction = before.multiply(model.leafRotation(hingeLeaf).invert());
+      if (correction.angleTo(new Quaternion()) > 1e-8)
+        orbit.setPose(orbit.rotation.clone().multiply(correction), performance.now(), true);
+    }
+    model.root.quaternion.copy(orbit.rotation);
+    model.root.position.set(0, 0, 0);
+    const frames = model.restFrames(restFace === "cover" ? 1 : 3);
+    const frame = frames.find((frame) => frame.face === restFace) ?? frames[0];
+    targetPivot.copy(frame?.center ?? new Vector3());
+    model.root.position.copy(pivot).applyQuaternion(model.root.quaternion).negate();
+  };
+  const updateCamera = () => {
+    camera.position.set(framing.center.x, framing.center.y, framing.distance());
+    camera.lookAt(framing.center.x, framing.center.y, 0);
+    camera.updateProjectionMatrix();
+  };
+  const fit = (immediate = false) => {
+    if (!model || !viewport.width || !viewport.height) return;
+    camera.aspect = viewport.width / viewport.height;
+    framing.setBounds(
+      framingBounds.setFromObject(model.root),
+      (camera.fov * Math.PI) / 360,
+      camera.aspect,
+      performance.now(),
+      immediate,
+    );
+    updateCamera();
+  };
+  const moving = () =>
+    Math.abs(angle - targetAngle) > 0.01 || pivot.distanceTo(targetPivot) > 0.001;
+  const scheduler = createRenderScheduler(() => {
+    if (disposed || !model || !viewport.width || !viewport.height) return;
+    try {
+      const now = performance.now();
+      const elapsed = Math.max(0, (now - lastTime) / 1000);
+      const amount = reduced
+        ? 1
+        : 1 - Math.exp(-14 * Math.max(0, (now - lastTime) / 1000 || 0.016));
+      lastTime = now;
+      const inMotion = moving();
+      const orbitChanged = orbit.advance(now, reduced);
+      if (inMotion) {
+        angle += (targetAngle - angle) * amount;
+
+        if (Math.abs(angle - targetAngle) <= 0.01) angle = targetAngle;
+        applyPose();
+        pivot.lerp(targetPivot, amount);
+        if (pivot.distanceTo(targetPivot) <= 0.001) pivot.copy(targetPivot);
+        applyPose();
+        fit(reduced || elapsed > 0.5);
+      }
+      if (orbitChanged) {
+        applyPose();
+        fit(reduced || elapsed > 0.5);
+      }
+      if (framing.advance(now, reduced)) updateCamera();
+      if (
+        buffer.width !== viewport.width ||
+        buffer.height !== viewport.height ||
+        buffer.ratio !== viewport.ratio
+      ) {
+        renderer.setDrawingBufferSize(viewport.width, viewport.height, viewport.ratio);
+        buffer = viewport;
+      }
+      renderer.render(scene, camera);
+      if (inMotion || moving() || orbit.needsFrame() || framing.needsFrame())
+        scheduler.invalidate();
+    } catch {
+      options.onUnavailable();
+    }
+  });
+  const slot = createDeviceModelSlot({
+    load: loadDeviceModel,
+    onError(cause) {
+      options.onModelError?.(cause);
+      options.onUnavailable();
+    },
+    install(loaded) {
+      const next = loaded
+        ? createDuoScene(loaded.asset, { 1: surfaces[0]!.texture, 3: surfaces[1]!.texture })
+        : null;
+      if (model) {
+        scene.remove(model.root);
+        model.dispose();
+      }
+      model = next;
+      appliedAngle = Number.NaN;
+      if (!model || disposed) return;
+      scene.add(model.root);
+      applyPose();
+      if (screen?.screenId === 1) {
+        const snap = nearestDuoView(orbit.rotation, activeSnaps());
+        if (snap) {
+          restFace = snap.face;
+          orbit.setPose(snap.rotation, performance.now(), true);
+          applyPose();
+        }
+      }
+      pivot.copy(targetPivot);
+      applyPose();
+      fit();
+      scheduler.invalidate();
+    },
+  });
+  const lost = (event: Event) => {
+    event.preventDefault();
+    options.onUnavailable();
+  };
+  options.canvas.addEventListener("webglcontextlost", lost);
+  slot.set(options.model);
+  return {
+    setScreen(next) {
+      if (disposed) return;
+      const wasMoving = moving() || orbit.needsFrame();
+      if (duoDisplayKey(screen) !== duoDisplayKey(next)) {
+        readyKey = "";
+        activationAt = performance.now();
+        model?.cancelInput();
+      }
+      const previous = screen;
+      const ownedHandoff = requestedPanel !== null;
+      if (!next || next.screenId === requestedPanel) clearHandoff();
+      const ownedRotation = requestedOrientation !== null && next?.screenId === previous?.screenId;
+      const changedDisplay = next?.screenId !== previous?.screenId;
+      requestedOrientation = null;
+      screen = next;
+      const changedPose = next?.hingePose && next.hingePose !== previous?.hingePose;
+      const folding = hingeLeaf !== null && !changedPose;
+      const rotated =
+        next?.screenId === previous?.screenId &&
+        next?.hingeAngle === previous?.hingeAngle &&
+        next?.orientation !== previous?.orientation;
+      const leftPhysicalPose =
+        rotated &&
+        !ownedRotation &&
+        !ownedHandoff &&
+        !folding &&
+        !next?.hingePose &&
+        previewAngle === null;
+      if (firstPose || changedPose || leftPhysicalPose) {
+        physicalPose = next?.hingePose ?? (next?.screenId === 1 ? "closed" : "open");
+        presentationAngle = next?.hingeAngle ?? (next?.screenId === 1 ? 0 : 180);
+      }
+      // A command reply/config confirms hinge state. Display identity, never an angle heuristic, owns input.
+      targetAngle = previewAngle ?? next?.hingeAngle ?? (next?.screenId === 1 ? 0 : 180);
+      // Native angle commands clear hingePose. They change articulation only;
+      // preserve the viewing pose, including laptop/tent and user orbit. A
+      // separate rotation clears the physical preset and follows panel orientation.
+      if (firstPose || changedPose || (rotated && !ownedRotation && !ownedHandoff && !folding)) {
+        hingeLeaf = null;
+        viewOrientation = next?.orientation ?? null;
+        const poseAngle = presentationAngle;
+        const fold = ((180 - poseAngle) * Math.PI) / 360;
+        let roll = physicalPose === "closed" ? 0 : Math.PI / 2;
+        if (next && next.width < next.height) {
+          if (next.orientation === "landscape_left") roll -= Math.PI / 2;
+          if (next.orientation === "landscape_right") roll += Math.PI / 2;
+        }
+        if (next?.orientation === "portrait_upside_down") roll -= Math.PI;
+        const physical =
+          physicalPose === "laptop"
+            ? new Euler(-fold + Math.PI / 9, -Math.PI / 9, Math.PI / 2, "YXZ")
+            : physicalPose === "tent"
+              ? new Euler(Math.PI / 2 + Math.PI / 18, -Math.PI / 9, -Math.PI / 2, "YXZ")
+              : new Euler(0, (Math.PI / 2) * Math.pow(1 - poseAngle / 180, 3), 0, "YXZ");
+        targetPresentation = new Quaternion().setFromEuler(physical);
+        if (physicalPose !== "laptop" && physicalPose !== "tent")
+          targetPresentation.premultiply(
+            new Quaternion().setFromAxisAngle(new Vector3(0, 0, 1), roll),
+          );
+        if (next?.screenId === 1) {
+          // Native readback can retain the cover even for an open physical preset.
+          // A screen-facing rest must use that display's actual hinged normal.
+          const snap = nearestDuoView(targetPresentation, activeSnaps());
+          if (snap) targetPresentation.copy(snap.rotation);
+        }
+        if (firstPose) angle = targetAngle;
+        restFace = next?.screenId === 1 ? "cover" : physicalPose === "laptop" ? "right" : "inside";
+        orbit.setPose(targetPresentation, performance.now(), firstPose);
+        firstPose = false;
+      } else if (next && changedDisplay && !ownedHandoff && !folding) {
+        // A sensor rotation can hand ownership to the other native display.
+        // Face that display without sending another rotation and creating a feedback loop.
+        const snap = nearestDuoView(orbit.rotation, activeSnaps());
+        if (snap) {
+          restFace = snap.face;
+          orbit.setPose(snap.rotation, performance.now());
+        }
+      }
+      if (!wasMoving) lastTime = performance.now();
+      applyPose();
+      fit();
+      scheduler.invalidate();
+    },
+    setHingePreview(next) {
+      if (disposed || (next !== null && (!Number.isFinite(next) || next < 0 || next > 180))) return;
+      if (!moving()) lastTime = performance.now();
+      previewAngle = next;
+      if (next !== null && !hingeLeaf && model) {
+        clearHandoff();
+        requestedOrientation = null;
+        hingeLeaf = screen?.screenId === 1 && angle > 20 ? "left" : "right";
+        orbit.setPose(orbit.rotation.clone(), performance.now(), true);
+      }
+      orbit.hold(interactionActive || next !== null, performance.now());
+      targetAngle = next ?? screen?.hingeAngle ?? (screen?.screenId === 1 ? 0 : 180);
+      if (next !== null) {
+        angle = next;
+        applyPose();
+        fit();
+      }
+      model?.cancelInput();
+      scheduler.invalidate();
+    },
+    setInteractionActive(active, mode = "touch") {
+      if (disposed) return;
+      if (mode === "orbit") {
+        if (active) hingeLeaf = null;
+        orbit.dragActive(active, performance.now());
+      } else {
+        interactionActive = active;
+        orbit.hold(active || previewAngle !== null, performance.now());
+        framing.hold(active, performance.now());
+      }
+      scheduler.invalidate();
+    },
+    rejectOrientation() {
+      if (disposed || (requestedOrientation === null && requestedPanel === null)) return;
+      clearHandoff();
+      requestedOrientation = null;
+      viewOrientation = screen?.orientation ?? null;
+      const confirmed = activeSnaps().filter((snap) => snap.orientation === screen?.orientation);
+      const snap = nearestDuoView(orbit.rotation, confirmed);
+      if (snap) {
+        restFace = snap.face;
+        orbit.setPose(snap.rotation, performance.now());
+      }
+      scheduler.invalidate();
+    },
+    frameUpdated(id, primary) {
+      if (disposed || screen?.screenId !== id) return;
+      const key = duoDisplayKey(screen);
+      // The elected native feed is authoritative during handoff. Fixed-panel
+      // encoders can retain an inactive blank until that surface changes again.
+      if (!primary && primaryKey === key) return;
+      const source = primary ?? options.sources[id];
+      if (!duoFrameMatches(source, screen)) return;
+      const surface = surfaces[id === 1 ? 0 : 1]!;
+      const { context, canvas } = surface;
+      // Ignore native shutdown blanks only while waiting for an activation. Steady black application content remains valid.
+      if (!primary && !readyKey && performance.now() - activationAt < 1500) {
+        const probe = document.createElement("canvas");
+        probe.width = probe.height = 8;
+        const probeContext = probe.getContext("2d", { willReadFrequently: true });
+        if (probeContext) {
+          probeContext.drawImage(source, 0, 0, 8, 8);
+          if (
+            !probeContext
+              .getImageData(0, 0, 8, 8)
+              .data.some((value, index) => index % 4 !== 3 && value > 3)
+          )
+            return;
+        }
+      }
+      context.save();
+      context.fillStyle = "#080a10";
+      context.fillRect(0, 0, canvas.width, canvas.height);
+      context.translate(canvas.width / 2, canvas.height / 2);
+      // The inner panel is mounted a quarter turn from the native framebuffer.
+      const rotate = id === 3;
+      if (rotate) context.rotate(Math.PI / 2);
+      const scale = Math.min(
+        canvas.width / (rotate ? source.height : source.width),
+        canvas.height / (rotate ? source.width : source.height),
+      );
+      context.drawImage(
+        source,
+        (-source.width * scale) / 2,
+        (-source.height * scale) / 2,
+        source.width * scale,
+        source.height * scale,
+      );
+      context.restore();
+      surface.texture.needsUpdate = true;
+      readyKey = duoDisplayKey(screen);
+      if (primary) primaryKey = readyKey;
+      scheduler.invalidate();
+    },
+    resize(width, height, ratio) {
+      if (disposed || ![width, height, ratio].every(Number.isFinite) || width <= 0 || height <= 0)
+        return;
+      viewport = { width, height, ratio: Math.min(2, Math.max(1, ratio)) };
+      fit(true);
+      scheduler.invalidate();
+    },
+    screenPoint(x, y, captured = false) {
+      if (
+        disposed ||
+        moving() ||
+        previewAngle !== null ||
+        requestedOrientation !== null ||
+        requestedPanel !== null
+      )
+        return null;
+      applyPose();
+      return model?.screenPoint(x, y, camera, screen, readyKey, captured) ?? null;
+    },
+    cancelInput() {
+      hingeLeaf = null;
+      model?.cancelInput();
+    },
+    orbit(x, y) {
+      if (disposed) return;
+      hingeLeaf = null;
+      orbit.orbit(x * viewport.width, y * viewport.height, performance.now());
+      scheduler.invalidate();
+    },
+    beginHinge(x, y) {
+      if (disposed || !model || !screen) return false;
+      applyPose();
+      const leaf = model.hingeLeafAt(x, y, camera);
+      if (!leaf) return false;
+      clearHandoff();
+      requestedOrientation = null;
+      // The right inner leaf and the shut cover share the front-facing plane.
+      // Holding that leaf lets the cover replace the inner image without a
+      // half turn, even when the pinch starts over the moving partner.
+      hingeLeaf = screen.screenId === 1 && angle > 20 ? "left" : "right";
+      orbit.setPose(orbit.rotation.clone(), performance.now(), true);
+      model.cancelInput();
+      return true;
+    },
+    resetPose() {
+      if (disposed) return;
+      hingeLeaf = null;
+      requestedOrientation = null;
+      clearHandoff();
+      const snap = activeSnaps().find((snap) => snap.orientation === screen?.orientation);
+      if (snap && snap.orientation !== viewOrientation && options.onOrientationRequested) {
+        viewOrientation = snap.orientation;
+        requestedOrientation = snap.orientation;
+        options.onOrientationRequested(snap.orientation);
+      }
+      orbit.reset(snap?.rotation ?? targetPresentation, performance.now());
+      applyPose();
+      fit();
+      scheduler.invalidate();
+    },
+    dispose() {
+      clearHandoff();
+      if (disposed) return;
+      disposed = true;
+      scheduler.dispose();
+      slot.dispose();
+      options.canvas.removeEventListener("webglcontextlost", lost);
+      for (const surface of surfaces) surface.texture.dispose();
+      scene.environment = null;
+      environment.dispose();
+      renderer.dispose();
+      renderer.forceContextLoss();
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/frame.test.ts b/packages/client-runtime/src/device/frame.test.ts
new file mode 100644
index 000000000000..b4ace96cd8da
--- /dev/null
+++ b/packages/client-runtime/src/device/frame.test.ts
@@ -0,0 +1,32 @@
+import { expect, it, vi } from "vite-plus/test";
+import { createCanvasFrameSink } from "./frame.ts";
+
+it("retains a borrowed frame at its native size before notifying the viewer", () => {
+  const drawImage = vi.fn();
+  const canvas = {
+    width: 300,
+    height: 150,
+    getContext: () => ({ drawImage }),
+  } as unknown as HTMLCanvasElement;
+  const source = {} as CanvasImageSource;
+  const notify = vi.fn(() => {
+    expect(canvas.width).toBe(1170);
+    expect(canvas.height).toBe(2532);
+    expect(drawImage).toHaveBeenLastCalledWith(source, 0, 0, 1170, 2532);
+  });
+  createCanvasFrameSink(canvas, notify).present(source, 1170, 2532);
+  expect(notify).toHaveBeenCalledOnce();
+});
+
+it("reports when a canvas cannot present a frame", () => {
+  const canvas = {
+    width: 300,
+    height: 150,
+    getContext: () => null,
+  } as unknown as HTMLCanvasElement;
+  const notify = vi.fn();
+  expect(createCanvasFrameSink(canvas, notify).present({} as CanvasImageSource, 1170, 2532)).toBe(
+    false,
+  );
+  expect(notify).not.toHaveBeenCalled();
+});
diff --git a/packages/client-runtime/src/device/frame.ts b/packages/client-runtime/src/device/frame.ts
new file mode 100644
index 000000000000..bb875b0b4a24
--- /dev/null
+++ b/packages/client-runtime/src/device/frame.ts
@@ -0,0 +1,24 @@
+/** A synchronous, borrowed frame. The producer releases its source after present returns. */
+export interface DeviceFrameSink {
+  readonly present: (source: CanvasImageSource, width: number, height: number) => boolean;
+}
+
+/** Retains the latest frame in a canvas; consumers can invalidate textures after each draw. */
+export function createCanvasFrameSink(
+  canvas: HTMLCanvasElement,
+  onFrame?: (width: number, height: number) => void,
+): DeviceFrameSink {
+  return {
+    present(source, width, height) {
+      const context = canvas.getContext("2d");
+      if (!context) return false;
+      if (canvas.width !== width || canvas.height !== height) {
+        canvas.width = width;
+        canvas.height = height;
+      }
+      context.drawImage(source, 0, 0, width, height);
+      onFrame?.(width, height);
+      return true;
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/model.test.ts b/packages/client-runtime/src/device/model.test.ts
new file mode 100644
index 000000000000..7bd1aa231376
--- /dev/null
+++ b/packages/client-runtime/src/device/model.test.ts
@@ -0,0 +1,126 @@
+import { expect, it, vi } from "vite-plus/test";
+import { createDeviceModelSlot, resolveDeviceModelId, type DeviceModelSource } from "./model.ts";
+
+const pro: DeviceModelSource = { id: "iphone-18-pro", url: "/pro.glb" };
+const max: DeviceModelSource = { id: "iphone-18-pro-max", url: "/max.glb" };
+
+function fixture() {
+  const pending: {
+    signal: AbortSignal;
+    resolve: (model: { dispose: () => void }) => void;
+    reject: (error: Error) => void;
+  }[] = [];
+  const install = vi.fn();
+  const load = vi.fn(
+    (_source: DeviceModelSource, signal: AbortSignal) =>
+      new Promise<{ dispose: () => void }>((resolve, reject) =>
+        pending.push({ signal, resolve, reject }),
+      ),
+  );
+  const slot = createDeviceModelSlot({ load, install });
+  return { slot, pending, install, load };
+}
+
+it("matches only exact supported hardware, including iPad size and generation", () => {
+  expect(resolveDeviceModelId("ios", "iPhone 18 Pro")).toBe(pro.id);
+  expect(resolveDeviceModelId("ios", "iPhone 18 Pro Max")).toBe(max.id);
+  expect(resolveDeviceModelId("ios", "iPhone Duo")).toBe("iphone-duo");
+  expect(resolveDeviceModelId("ios", "iPad Pro 13-inch (M5)")).toBe("ipad-pro-13-m5");
+  for (const name of [
+    "iPhone 17 Pro",
+    "iPhone 18",
+    "iPad Pro 11-inch (M5)",
+    "iPad Pro 13-inch (M4)",
+    "Pixel_10_Pro",
+  ]) {
+    expect(resolveDeviceModelId("ios", name)).toBeNull();
+  }
+  expect(resolveDeviceModelId("android", "iPhone 18 Pro")).toBeNull();
+});
+
+it("cancels superseded downloads and releases a late decoded model without installing it", async () => {
+  const { slot, pending, install, load } = fixture();
+  slot.set(pro);
+  slot.set({ ...pro });
+  expect(load).toHaveBeenCalledTimes(1);
+  slot.set(max);
+  expect(pending[0]!.signal.aborted).toBe(true);
+  const latest = { dispose: vi.fn() };
+  const stale = { dispose: vi.fn() };
+  pending[1]!.resolve(latest);
+  await Promise.resolve();
+  pending[0]!.resolve(stale);
+  await Promise.resolve();
+  expect(install).toHaveBeenCalledExactlyOnceWith(latest);
+  expect(stale.dispose).toHaveBeenCalledOnce();
+  slot.set(null);
+  expect(install).toHaveBeenLastCalledWith(null);
+  expect(latest.dispose).toHaveBeenCalledOnce();
+  slot.dispose();
+  expect(latest.dispose).toHaveBeenCalledOnce();
+});
+
+it("keeps the fallback on request failure and disposes results that finish after teardown", async () => {
+  const { slot, pending, install } = fixture();
+  slot.set(pro);
+  pending[0]!.reject(new Error("offline"));
+  await Promise.resolve();
+  expect(install).not.toHaveBeenCalled();
+  slot.set(max);
+  slot.dispose();
+  expect(pending[1]!.signal.aborted).toBe(true);
+  const late = { dispose: vi.fn() };
+  pending[1]!.resolve(late);
+  await Promise.resolve();
+  expect(late.dispose).toHaveBeenCalledOnce();
+  expect(install).not.toHaveBeenCalled();
+});
+
+it("returns the current scene to the fallback before releasing its imported resources", async () => {
+  const { slot, pending, install } = fixture();
+  slot.set(pro);
+  const model = { dispose: vi.fn(() => expect(install).toHaveBeenLastCalledWith(null)) };
+  pending[0]!.resolve(model);
+  await Promise.resolve();
+  slot.dispose();
+  slot.dispose();
+  expect(model.dispose).toHaveBeenCalledOnce();
+});
+
+it("retries a failed source while ignoring rejection of a superseded request", async () => {
+  const { slot, pending, install, load } = fixture();
+  slot.set(pro);
+  pending[0]!.reject(new Error("offline"));
+  await Promise.resolve();
+  slot.set({ ...pro });
+  expect(load).toHaveBeenCalledTimes(2);
+  slot.set(max);
+  pending[1]!.reject(new Error("cancelled"));
+  await Promise.resolve();
+  slot.set({ ...max });
+  expect(load).toHaveBeenCalledTimes(3);
+  const recovered = { dispose: vi.fn() };
+  pending[2]!.resolve(recovered);
+  await Promise.resolve();
+  expect(install).toHaveBeenCalledExactlyOnceWith(recovered);
+  slot.dispose();
+});
+
+it("releases an invalid model and restores the fallback if scene preparation rejects it", async () => {
+  const { slot, pending, install } = fixture();
+  install.mockImplementationOnce(() => {
+    throw new Error("invalid display");
+  });
+  slot.set(pro);
+  const model = { dispose: vi.fn() };
+  pending[0]!.resolve(model);
+  await Promise.resolve();
+  expect(model.dispose).toHaveBeenCalledOnce();
+  expect(install).toHaveBeenLastCalledWith(null);
+  slot.set({ ...pro });
+  const recovered = { dispose: vi.fn() };
+  pending[1]!.resolve(recovered);
+  await Promise.resolve();
+  expect(install).toHaveBeenLastCalledWith(recovered);
+  slot.dispose();
+});
diff --git a/packages/client-runtime/src/device/model.ts b/packages/client-runtime/src/device/model.ts
new file mode 100644
index 000000000000..c1a66f33365e
--- /dev/null
+++ b/packages/client-runtime/src/device/model.ts
@@ -0,0 +1,88 @@
+import type { DevicePlatform } from "@t3tools/contracts";
+
+export type DeviceModelId = "iphone-18-pro" | "iphone-18-pro-max" | "ipad-pro-13-m5" | "iphone-duo";
+
+export interface DeviceModelSource {
+  readonly id: DeviceModelId;
+  readonly url: string;
+}
+
+export interface DeviceAccessorySource {
+  readonly id: "ipad-pro-13-m5-magic-keyboard";
+  readonly modelId: "ipad-pro-13-m5";
+  readonly url: string;
+}
+
+export type DeviceAssetSource = DeviceModelSource | DeviceAccessorySource;
+
+/** Match actual hardware, never stretch an available model to impersonate another device. */
+export function resolveDeviceModelId(platform: DevicePlatform, name: string): DeviceModelId | null {
+  if (platform !== "ios") return null;
+  if (/^iPhone Duo$/i.test(name)) return "iphone-duo";
+  if (/^iPhone 18 Pro Max$/i.test(name)) return "iphone-18-pro-max";
+  if (/^iPhone 18 Pro$/i.test(name)) return "iphone-18-pro";
+  if (/^iPad Pro 13-inch \(M5\)$/i.test(name)) return "ipad-pro-13-m5";
+  return null;
+}
+
+/** Each request owns its result. A cancelled or superseded parse must still release its resources. */
+export function createDeviceModelSlot<
+  T extends { dispose: () => void },
+  Source extends DeviceAssetSource = DeviceModelSource,
+>(options: {
+  load: (source: Source, signal: AbortSignal) => Promise<T>;
+  install: (model: T | null) => void;
+  onError?: ((cause: unknown) => void) | undefined;
+}) {
+  let request: { source: Source; controller: AbortController } | null = null;
+  let current: T | null = null;
+  let disposed = false;
+  const clear = () => {
+    if (current) options.install(null);
+    current?.dispose();
+    current = null;
+  };
+  return {
+    set(source: Source | null) {
+      if (disposed) return;
+      if (source?.id === request?.source.id && source?.url === request?.source.url) return;
+      request?.controller.abort();
+      request = null;
+      clear();
+      if (!source) return;
+      const next = { source, controller: new AbortController() };
+      request = next;
+      void options.load(source, next.controller.signal).then(
+        (model) => {
+          if (disposed || request !== next) {
+            model.dispose();
+            return;
+          }
+          try {
+            options.install(model);
+            current = model;
+          } catch (cause) {
+            options.install(null);
+            model.dispose();
+            request = null;
+            options.onError?.(cause);
+          }
+        },
+        (cause: unknown) => {
+          if (!disposed && request === next) {
+            request = null;
+            options.onError?.(cause);
+          }
+          // The procedural body stays installed on download, decoding or validation failure.
+        },
+      );
+    },
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      request?.controller.abort();
+      request = null;
+      clear();
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/modelScene.test.ts b/packages/client-runtime/src/device/modelScene.test.ts
new file mode 100644
index 000000000000..f58820d0afe1
--- /dev/null
+++ b/packages/client-runtime/src/device/modelScene.test.ts
@@ -0,0 +1,121 @@
+import {
+  BoxGeometry,
+  Group,
+  Mesh,
+  MeshBasicMaterial,
+  PerspectiveCamera,
+  PlaneGeometry,
+  Texture,
+  Vector3,
+} from "three";
+import { expect, it, vi } from "vite-plus/test";
+import { createImportedPhoneScene, disposeDeviceModel } from "./modelScene.ts";
+import { phoneDisplayLayout } from "./phoneScene.ts";
+
+function asset() {
+  const root = new Group();
+  const body = new Mesh(new BoxGeometry(1.15, 2.3, 0.1), new MeshBasicMaterial());
+  body.position.z = -0.02;
+  const screen = new Mesh(new PlaneGeometry(1, 2.2), new MeshBasicMaterial());
+  screen.geometry.translate(0, 0, 0.043);
+  screen.name = "device-screen";
+  root.add(body, screen);
+  return { root, screen, body };
+}
+
+it.each(["portrait", "landscape_left", "landscape_right", "portrait_upside_down"] as const)(
+  "retains the imported geometry while mapping screen input and framebuffer UVs in %s",
+  (orientation) => {
+    const { root, screen } = asset();
+    const texture = new Texture();
+    const original = screen.material;
+    // Optimization strips UVs from the placeholder material; the viewer generates framebuffer UVs.
+    screen.geometry.deleteAttribute("uv");
+    const phone = createImportedPhoneScene(root, texture, phoneDisplayLayout(null, 1206, 2622));
+    const layout = phoneDisplayLayout({ width: 1206, height: 2622, orientation }, 1206, 2622);
+    phone.setDisplay(texture, layout);
+    phone.root.rotation.set(0.2, -0.3, 0, "YXZ");
+    phone.orientation.rotation.z = layout.rotation;
+    phone.root.updateMatrixWorld(true);
+    const camera = new PerspectiveCamera(32, 1, 0.1, 30);
+    camera.position.z = 6;
+    camera.updateMatrixWorld(true);
+    const point = phone.orientation.localToWorld(new Vector3(-0.25, -0.55, 0.043)).project(camera);
+    const hit = phone.screenPoint((point.x + 1) / 2, (1 - point.y) / 2, camera);
+    const expected =
+      orientation === "landscape_left"
+        ? [0.25, 0.25]
+        : orientation === "landscape_right"
+          ? [0.75, 0.75]
+          : orientation === "portrait_upside_down"
+            ? [0.75, 0.25]
+            : [0.25, 0.75];
+    expect(hit?.x).toBeCloseTo(expected[0]!);
+    expect(hit?.y).toBeCloseTo(expected[1]!);
+    const geometry = screen.geometry;
+    const rotated = phoneDisplayLayout(
+      { width: 2622, height: 1206, orientation: "landscape_left" },
+      2622,
+      1206,
+    );
+    phone.setDisplay(texture, rotated);
+    expect(screen.geometry).toBe(geometry);
+    const pos = geometry.getAttribute("position");
+    const uv = geometry.getAttribute("uv");
+    for (let i = 0; i < pos.count; i++) {
+      expect(uv.getX(i)).toBeCloseTo(pos.getY(i) / 2.2 + 0.5);
+      expect(uv.getY(i)).toBeCloseTo(0.5 - pos.getX(i));
+    }
+    phone.dispose();
+    expect(screen.material).toBe(original);
+    disposeDeviceModel(root);
+    texture.dispose();
+  },
+);
+
+it("rejects touches from the rear and preserves borrowed textures when releasing imported resources", () => {
+  const { root, screen, body } = asset();
+  const texture = new Texture();
+  const borrowed = vi.spyOn(texture, "dispose");
+  const ownedTexture = new Texture();
+  const owned = vi.spyOn(ownedTexture, "dispose");
+  body.material.map = ownedTexture;
+  const geometry = vi.spyOn(body.geometry, "dispose");
+  const phone = createImportedPhoneScene(root, texture, phoneDisplayLayout(null, 1206, 2622));
+  const camera = new PerspectiveCamera(32, 1, 0.1, 30);
+  camera.position.z = 6;
+  phone.root.rotation.y = Math.PI;
+  expect(phone.screenPoint(0.5, 0.5, camera)).toBeNull();
+  phone.dispose();
+  expect(borrowed).not.toHaveBeenCalled();
+  expect(geometry).not.toHaveBeenCalled();
+  expect(screen.material.map).toBeNull();
+  disposeDeviceModel(root);
+  expect(owned).toHaveBeenCalledOnce();
+  expect(geometry).toHaveBeenCalledOnce();
+  expect(borrowed).not.toHaveBeenCalled();
+  texture.dispose();
+});
+
+it("rejects missing and incorrectly normalized displays before changing their materials", () => {
+  const { root, screen } = asset();
+  const original = screen.material;
+  const texture = new Texture();
+  screen.geometry.scale(1, 2, 1);
+  expect(() =>
+    createImportedPhoneScene(root, texture, phoneDisplayLayout(null, 1206, 2622)),
+  ).toThrow("not normalized");
+  expect(screen.material).toBe(original);
+  screen.geometry.scale(1, 0.5, 1);
+  root.rotation.y = Math.PI;
+  expect(() =>
+    createImportedPhoneScene(root, texture, phoneDisplayLayout(null, 1206, 2622)),
+  ).toThrow("not normalized");
+  expect(screen.material).toBe(original);
+  screen.name = "wrong-screen";
+  expect(() =>
+    createImportedPhoneScene(root, texture, phoneDisplayLayout(null, 1206, 2622)),
+  ).toThrow("one device-screen");
+  disposeDeviceModel(root);
+  texture.dispose();
+});
diff --git a/packages/client-runtime/src/device/modelScene.ts b/packages/client-runtime/src/device/modelScene.ts
new file mode 100644
index 000000000000..6e1ce6eb82b3
--- /dev/null
+++ b/packages/client-runtime/src/device/modelScene.ts
@@ -0,0 +1,118 @@
+// @effect-diagnostics globalFetch:off - This browser-only renderer owns abortable asset requests without an Effect runtime, like the live stream.
+import { Box3, Group, Mesh, MeshBasicMaterial, Texture, type Material, type Object3D } from "three";
+import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js";
+import type { DeviceAssetSource } from "./model.ts";
+import { createDisplayProjection, updateDisplayUv, type PhoneDisplayLayout } from "./phoneScene.ts";
+
+/** GLB resources belong to one viewer; the live framebuffer texture belongs to its stream presentation. */
+export function disposeDeviceModel(root: Object3D) {
+  const geometries = new Set<Mesh["geometry"]>();
+  const materials = new Set<Material>();
+  const textures = new Set<Texture>();
+  root.traverse((object) => {
+    if (!(object instanceof Mesh)) return;
+    geometries.add(object.geometry);
+    for (const material of Array.isArray(object.material) ? object.material : [object.material]) {
+      materials.add(material);
+      for (const value of Object.values(material)) {
+        if (value instanceof Texture) textures.add(value);
+      }
+    }
+  });
+  for (const geometry of geometries) geometry.dispose();
+  for (const material of materials) material.dispose();
+  const images = new Set<ImageBitmap>();
+  for (const texture of textures) {
+    texture.dispose();
+    if (typeof ImageBitmap !== "undefined" && texture.image instanceof ImageBitmap)
+      images.add(texture.image);
+  }
+  for (const image of images) image.close();
+}
+
+/** Assets are converted offline: portrait, front +Z, centered display, height 2.2 and planar display UVs. */
+export function createImportedPhoneScene(
+  asset: Group,
+  texture: Texture,
+  initial: PhoneDisplayLayout,
+) {
+  const screens: Mesh[] = [];
+  asset.traverse((object) => {
+    if (object instanceof Mesh && object.name === "device-screen") screens.push(object);
+  });
+  const display = screens[0];
+  if (!display || screens.length !== 1)
+    throw new Error("Device model must have one device-screen mesh");
+  asset.updateMatrixWorld(true);
+  const screenBounds = new Box3().setFromObject(display);
+  const screenWidth = screenBounds.max.x - screenBounds.min.x;
+  const screenHeight = screenBounds.max.y - screenBounds.min.y;
+  if (
+    display.matrixWorld.elements.some(
+      (value, index) =>
+        !Number.isFinite(value) || Math.abs(value - (index % 5 === 0 ? 1 : 0)) > 0.001,
+    ) ||
+    !Number.isFinite(screenWidth) ||
+    !Number.isFinite(screenHeight) ||
+    !Number.isFinite(screenBounds.min.z) ||
+    !Number.isFinite(screenBounds.max.z) ||
+    screenWidth <= 0 ||
+    Math.abs(screenHeight - 2.2) > 0.001 ||
+    Math.abs(screenBounds.min.x + screenBounds.max.x) > 0.001 ||
+    Math.abs(screenBounds.min.y + screenBounds.max.y) > 0.001 ||
+    screenBounds.max.z - screenBounds.min.z > 0.001
+  )
+    throw new Error("Device model display is not normalized");
+  updateDisplayUv(display.geometry, screenWidth, screenHeight, initial);
+  const originalMaterial = display.material;
+  const screenMaterial = new MeshBasicMaterial({ map: texture, toneMapped: false });
+  display.material = screenMaterial;
+  const root = new Group();
+  const orientation = new Group();
+  orientation.add(asset);
+  root.add(orientation);
+  const bounds = new Box3().setFromObject(asset);
+  let layout = initial;
+  const projection = createDisplayProjection(
+    display,
+    orientation,
+    screenWidth,
+    screenHeight,
+    () => layout,
+  );
+  return {
+    root,
+    orientation,
+    width: bounds.max.x - bounds.min.x,
+    height: bounds.max.y - bounds.min.y,
+    setDisplay(nextTexture: Texture, nextLayout: PhoneDisplayLayout) {
+      layout = nextLayout;
+      screenMaterial.map = nextTexture;
+      updateDisplayUv(display.geometry, screenWidth, screenHeight, layout);
+    },
+    screenPoint: projection,
+    dispose() {
+      // The model slot owns imported resources. This scene owns only its replacement screen material.
+      display.material = originalMaterial;
+      screenMaterial.map = null;
+      screenMaterial.dispose();
+      orientation.remove(asset);
+    },
+  };
+}
+
+export async function loadDeviceModel(source: DeviceAssetSource, signal: AbortSignal) {
+  const response = await fetch(source.url, { signal });
+  if (!response.ok) throw new Error(`Device model request failed: ${response.status}`);
+  const data = await response.arrayBuffer();
+  signal.throwIfAborted();
+  const gltf = await new GLTFLoader().parseAsync(
+    data,
+    new URL(".", new URL(source.url, globalThis.location.href)).href,
+  );
+  if (signal.aborted) {
+    disposeDeviceModel(gltf.scene);
+    signal.throwIfAborted();
+  }
+  return { asset: gltf.scene, dispose: () => disposeDeviceModel(gltf.scene) };
+}
diff --git a/packages/client-runtime/src/device/phoneInteraction.test.ts b/packages/client-runtime/src/device/phoneInteraction.test.ts
new file mode 100644
index 000000000000..ddd304f66d25
--- /dev/null
+++ b/packages/client-runtime/src/device/phoneInteraction.test.ts
@@ -0,0 +1,105 @@
+import { expect, it, vi } from "vite-plus/test";
+import { createPhoneInteraction, phoneWheelNavigation } from "./phoneInteraction.ts";
+
+it("keeps a captured screen gesture separate from orbit and ends it once on cancellation", () => {
+  const touch = vi.fn();
+  const orbit = vi.fn();
+  const screenPoint = vi
+    .fn()
+    .mockReturnValueOnce({ x: 0.2, y: 0.3 })
+    .mockReturnValueOnce({ x: 1, y: 0.6 });
+  const input = createPhoneInteraction({ screenPoint, touch, orbit, zoomBy: vi.fn() });
+  expect(input.begin(1, { x: 0.4, y: 0.3 })).toBe(true);
+  expect(input.begin(2, { x: 0.2, y: 0.2 })).toBe(false);
+  input.move(2, { x: 0.8, y: 0.8 });
+  input.move(1, { x: 1.3, y: 0.6 });
+  input.end(2);
+  input.end();
+  input.end(1);
+  expect(touch.mock.calls).toEqual([
+    ["begin", { x: 0.2, y: 0.3 }],
+    ["move", { x: 1, y: 0.6 }],
+    ["end", { x: 1, y: 0.6 }],
+  ]);
+  expect(orbit).not.toHaveBeenCalled();
+  expect(screenPoint.mock.calls[1]?.[1]).toBe(true);
+});
+
+it("orbits without sending touches when dragged outside the screen or with the orbit modifier", () => {
+  const touch = vi.fn();
+  const orbit = vi.fn();
+  const input = createPhoneInteraction({ screenPoint: () => null, touch, orbit, zoomBy: vi.fn() });
+  input.begin(1, { x: 0.1, y: 0.2 });
+  input.move(1, { x: 0.4, y: 0.5 });
+  input.end();
+  input.begin(2, { x: 0.5, y: 0.5 }, true);
+  input.move(2, { x: 0.6, y: 0.5 });
+  input.end();
+  expect(orbit).toHaveBeenCalledTimes(2);
+  expect(orbit.mock.calls[0]?.[0]).toBeCloseTo(0.3);
+  expect(touch).not.toHaveBeenCalled();
+});
+
+it("blocks navigation during either captured gesture, then resumes without sending device touches", () => {
+  const touch = vi.fn();
+  const orbit = vi.fn();
+  const zoomBy = vi.fn();
+  const input = createPhoneInteraction({
+    screenPoint: () => ({ x: 0.5, y: 0.5 }),
+    touch,
+    orbit,
+    zoomBy,
+  });
+  input.begin(1, { x: 0.5, y: 0.5 });
+  expect(input.navigate({ type: "zoom", delta: 0.2 })).toBe(false);
+  expect(input.navigate({ type: "orbit", x: 0.1, y: 0.2 })).toBe(false);
+  input.end();
+  input.begin(2, { x: 0.5, y: 0.5 }, true);
+  expect(input.navigate({ type: "zoom", delta: 0.2 })).toBe(false);
+  input.end();
+  expect(input.navigate({ type: "zoom", delta: 0.2 })).toBe(true);
+  expect(input.navigate({ type: "orbit", x: 0.1, y: 0.2 })).toBe(true);
+  expect(zoomBy.mock.calls).toEqual([[0.2]]);
+  expect(orbit.mock.calls).toEqual([[0.1, 0.2]]);
+  expect(touch.mock.calls.map(([phase]) => phase)).toEqual(["begin", "end"]);
+});
+
+it("ends wheel orbit without ending a captured screen touch", () => {
+  const onInteractionActive = vi.fn();
+  const input = createPhoneInteraction({
+    screenPoint: () => ({ x: 0.5, y: 0.5 }),
+    touch: vi.fn(),
+    orbit: vi.fn(),
+    zoomBy: vi.fn(),
+    onInteractionActive,
+  });
+  input.endWheel();
+  expect(onInteractionActive).toHaveBeenCalledWith(false, "orbit");
+  input.begin(1, { x: 0.5, y: 0.5 });
+  onInteractionActive.mockClear();
+  input.endWheel();
+  expect(onInteractionActive).not.toHaveBeenCalled();
+  input.end(1);
+  expect(onInteractionActive).toHaveBeenCalledWith(false, "touch");
+});
+
+it("normalizes wheel units, distinguishes pinch, and bounds jumps from coarse scroll wheels", () => {
+  const wheel = { width: 400, height: 800, deltaX: 16, deltaY: 32, deltaMode: 0, ctrlKey: false };
+  expect(phoneWheelNavigation(wheel)).toEqual({ type: "orbit", x: -0.04, y: -0.04 });
+  expect(phoneWheelNavigation({ ...wheel, deltaX: 1, deltaY: 2, deltaMode: 1 })).toEqual(
+    phoneWheelNavigation(wheel),
+  );
+  expect(phoneWheelNavigation({ ...wheel, deltaX: 1, deltaY: 1, deltaMode: 2 })).toEqual({
+    type: "orbit",
+    x: -0.25,
+    y: -0.25,
+  });
+  expect(phoneWheelNavigation({ ...wheel, ctrlKey: true })).toEqual({ type: "zoom", delta: -0.32 });
+  expect(phoneWheelNavigation({ ...wheel, deltaY: -10000, ctrlKey: true })).toEqual({
+    type: "zoom",
+    delta: 1,
+  });
+  expect(phoneWheelNavigation({ ...wheel, width: 0 })).toBeNull();
+  expect(phoneWheelNavigation({ ...wheel, deltaY: NaN })).toBeNull();
+  expect(phoneWheelNavigation({ ...wheel, deltaMode: 9 })).toBeNull();
+});
diff --git a/packages/client-runtime/src/device/phoneInteraction.ts b/packages/client-runtime/src/device/phoneInteraction.ts
new file mode 100644
index 000000000000..dd701f1a8b57
--- /dev/null
+++ b/packages/client-runtime/src/device/phoneInteraction.ts
@@ -0,0 +1,83 @@
+interface Point {
+  readonly x: number;
+  readonly y: number;
+}
+
+export type PhoneNavigation =
+  | { readonly type: "orbit"; readonly x: number; readonly y: number }
+  | { readonly type: "zoom"; readonly delta: number };
+
+/** Browser wheel units vary by device. Navigation uses viewport fractions and logarithmic zoom. */
+export function phoneWheelNavigation(input: {
+  readonly deltaX: number;
+  readonly deltaY: number;
+  readonly deltaMode: number;
+  readonly ctrlKey: boolean;
+  readonly width: number;
+  readonly height: number;
+}): PhoneNavigation | null {
+  const { deltaX, deltaY, deltaMode, ctrlKey, width, height } = input;
+  if (![deltaX, deltaY, width, height].every(Number.isFinite) || width <= 0 || height <= 0)
+    return null;
+  if (deltaMode !== 0 && deltaMode !== 1 && deltaMode !== 2) return null;
+  const unit = deltaMode === 1 ? 16 : deltaMode === 2 ? height : 1;
+  const clamp = (value: number, limit: number) => Math.min(limit, Math.max(-limit, value));
+  if (ctrlKey) return { type: "zoom", delta: clamp(-deltaY * unit * 0.01, 1) };
+  return {
+    type: "orbit",
+    x: clamp((-deltaX * unit) / width, 0.25),
+    y: clamp((-deltaY * unit) / height, 0.25),
+  };
+}
+
+/** A single pointer owns either a device gesture or an orbit until released or cancelled. */
+export function createPhoneInteraction(options: {
+  readonly screenPoint: (point: Point, captured: boolean) => Point | null;
+  readonly touch: (phase: "begin" | "move" | "end", point: Point) => void;
+  readonly orbit: (deltaX: number, deltaY: number) => void;
+  readonly zoomBy: (logDelta: number) => void;
+  readonly onInteractionActive?: (active: boolean, mode: "touch" | "orbit") => void;
+}) {
+  let active: { id: number; mode: "touch" | "orbit"; last: Point; screen: Point | null } | null =
+    null;
+  return {
+    navigate(gesture: PhoneNavigation) {
+      // Moving the camera during a captured device touch would change its projected coordinates.
+      if (active) return false;
+      if (gesture.type === "zoom") options.zoomBy(gesture.delta);
+      else options.orbit(gesture.x, gesture.y);
+      return true;
+    },
+    endWheel() {
+      if (!active) options.onInteractionActive?.(false, "orbit");
+    },
+    begin(id: number, point: Point, forceOrbit = false) {
+      if (active) return false;
+      const screen = forceOrbit ? null : options.screenPoint(point, false);
+      active = { id, mode: screen ? "touch" : "orbit", last: point, screen };
+      options.onInteractionActive?.(true, active.mode);
+      if (screen) options.touch("begin", screen);
+      return true;
+    },
+    move(id: number, point: Point) {
+      if (active?.id !== id) return;
+      if (active.mode === "touch") {
+        const screen = options.screenPoint(point, true);
+        if (screen) {
+          active.screen = screen;
+          options.touch("move", screen);
+        }
+      } else {
+        options.orbit(point.x - active.last.x, point.y - active.last.y);
+      }
+      active.last = point;
+    },
+    end(id?: number) {
+      if (!active || (id !== undefined && active.id !== id)) return;
+      const previous = active;
+      active = null;
+      if (previous.mode === "touch" && previous.screen) options.touch("end", previous.screen);
+      options.onInteractionActive?.(false, previous.mode);
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/phoneScene.test.ts b/packages/client-runtime/src/device/phoneScene.test.ts
new file mode 100644
index 000000000000..188b8891803f
--- /dev/null
+++ b/packages/client-runtime/src/device/phoneScene.test.ts
@@ -0,0 +1,150 @@
+import { Box3, PerspectiveCamera, Texture, Vector3 } from "three";
+import { describe, expect, it } from "vite-plus/test";
+import { createPhoneScene, phoneDisplayLayout } from "./phoneScene.ts";
+import { IOS_TABLET_SHAPE, IOS_PHONE_SHAPE, ANDROID_PHONE_SHAPE } from "./shapeProfile.ts";
+
+const orientations = [
+  "portrait",
+  "landscape_left",
+  "landscape_right",
+  "portrait_upside_down",
+] as const;
+
+describe("3D phone input", () => {
+  it.each([IOS_TABLET_SHAPE, IOS_PHONE_SHAPE, ANDROID_PHONE_SHAPE])(
+    "preserves input projection for the $id silhouette in every orientation",
+    (profile) => {
+      for (const orientation of orientations) {
+        const texture = new Texture();
+        const aspect = profile.id === "ios-tablet" ? 0.75 : 0.45;
+        const layout = phoneDisplayLayout(
+          { width: 1200 * aspect, height: 1200, orientation },
+          1200 * aspect,
+          1200,
+        );
+        const phone = createPhoneScene(texture, layout, profile);
+        const camera = new PerspectiveCamera(32, 1, 0.1, 30);
+        camera.position.z = 6;
+        camera.updateMatrixWorld(true);
+        phone.root.rotation.set(0.2, -0.3, 0, "YXZ");
+        phone.orientation.rotation.z = layout.rotation;
+        phone.root.updateMatrixWorld(true);
+        const point = new Vector3((-2.2 * aspect) / 4, -2.2 / 4, 0.043);
+        phone.orientation.localToWorld(point);
+        point.project(camera);
+        const hit = phone.screenPoint((point.x + 1) / 2, (1 - point.y) / 2, camera);
+        const expected =
+          orientation === "landscape_left"
+            ? { x: 0.25, y: 0.25 }
+            : orientation === "landscape_right"
+              ? { x: 0.75, y: 0.75 }
+              : orientation === "portrait_upside_down"
+                ? { x: 0.75, y: 0.25 }
+                : { x: 0.25, y: 0.75 };
+        expect(hit?.x).toBeCloseTo(expected.x);
+        expect(hit?.y).toBeCloseTo(expected.y);
+        phone.dispose();
+        texture.dispose();
+      }
+    },
+  );
+  it.each([0.6, 2.2])("keeps device coordinates accurate at %s camera zoom", (zoom) => {
+    const texture = new Texture();
+    const layout = phoneDisplayLayout(null, 900, 1950);
+    const phone = createPhoneScene(texture, layout);
+    const camera = new PerspectiveCamera(32, 0.65, 0.1, 30);
+    camera.position.z = 6 / zoom;
+    camera.updateMatrixWorld(true);
+    phone.root.rotation.set(0.2, -0.3, 0, "YXZ");
+    phone.root.updateMatrixWorld(true);
+    const point = new Vector3((-2.2 * layout.aspect) / 4, -2.2 / 4, 0.043);
+    phone.orientation.localToWorld(point);
+    point.project(camera);
+    const hit = phone.screenPoint((point.x + 1) / 2, (1 - point.y) / 2, camera);
+    expect(hit?.x).toBeCloseTo(0.25);
+    expect(hit?.y).toBeCloseTo(0.75);
+    phone.dispose();
+    texture.dispose();
+  });
+
+  it.each(orientations)("maps perspective hits to displayed coordinates in %s", (orientation) => {
+    const texture = new Texture();
+    const layout = phoneDisplayLayout({ width: 1170, height: 2532, orientation }, 1170, 2532);
+    const phone = createPhoneScene(texture, layout);
+    const camera = new PerspectiveCamera(32, 0.65, 0.1, 30);
+    camera.position.z = 6;
+    camera.updateMatrixWorld(true);
+    phone.root.rotation.set(0.3, -0.45, 0, "YXZ");
+    phone.orientation.rotation.z = layout.rotation;
+    phone.root.updateMatrixWorld(true);
+    // A point one quarter across and three quarters down the portrait display.
+    const point = new Vector3((-2.2 * layout.aspect) / 4, -2.2 / 4, 0.043);
+    phone.orientation.localToWorld(point);
+    point.project(camera);
+    const hit = phone.screenPoint((point.x + 1) / 2, (1 - point.y) / 2, camera);
+    const expected =
+      orientation === "landscape_left"
+        ? { x: 0.25, y: 0.25 }
+        : orientation === "landscape_right"
+          ? { x: 0.75, y: 0.75 }
+          : orientation === "portrait_upside_down"
+            ? { x: 0.75, y: 0.25 }
+            : { x: 0.25, y: 0.75 };
+    expect(hit?.x).toBeCloseTo(expected.x);
+    expect(hit?.y).toBeCloseTo(expected.y);
+    phone.dispose();
+    texture.dispose();
+  });
+
+  it("rejects new gestures outside the display, but clamps captured drags at its edge", () => {
+    const texture = new Texture();
+    const phone = createPhoneScene(texture, phoneDisplayLayout(null, 900, 1950));
+    const camera = new PerspectiveCamera(32, 1, 0.1, 30);
+    camera.position.z = 5;
+    expect(phone.screenPoint(1, 0.5, camera)).toBeNull();
+    expect(phone.screenPoint(1, 0.5, camera, true)).toEqual({ x: 1, y: 0.5 });
+    phone.root.rotation.y = Math.PI;
+    expect(phone.screenPoint(0.5, 0.5, camera)).toBeNull();
+    phone.dispose();
+    texture.dispose();
+  });
+
+  it.each(["landscape_left", "landscape_right"] as const)(
+    "unrotates an already-landscape framebuffer in %s",
+    (orientation) => {
+      const texture = new Texture();
+      const layout = phoneDisplayLayout({ width: 1950, height: 900, orientation }, 1950, 900);
+      const phone = createPhoneScene(texture, layout);
+      phone.orientation.rotation.z = layout.rotation;
+      const camera = new PerspectiveCamera(32, 1, 0.1, 30);
+      camera.position.z = 5;
+      expect(phone.screenPoint(0.5, 0.5, camera)).toEqual({ x: 0.5, y: 0.5 });
+      phone.dispose();
+      texture.dispose();
+    },
+  );
+});
+
+it.each([IOS_PHONE_SHAPE, IOS_TABLET_SHAPE, ANDROID_PHONE_SHAPE])(
+  "attaches the $id rear camera plate to the back and seats its lenses on the housing",
+  (profile) => {
+    const texture = new Texture();
+    const phone = createPhoneScene(texture, phoneDisplayLayout(null, 900, 1950), profile);
+    phone.root.updateMatrixWorld(true);
+    const back = new Box3().setFromObject(phone.root.getObjectByName("device-back")!);
+    const plate = new Box3().setFromObject(phone.root.getObjectByName("camera-plate")!);
+    expect(plate.min.z).toBeLessThan(back.min.z);
+    expect(plate.max.z).toBeGreaterThanOrEqual(back.min.z);
+    const assembly = phone.root.getObjectByName("rear-camera")!;
+    const rings = assembly.children.filter((part) => part.name === "camera-ring");
+    const lenses = assembly.children.filter((part) => part.name === "camera-lens");
+    for (const [index, ring] of rings.entries()) {
+      const ringBounds = new Box3().setFromObject(ring);
+      expect(ringBounds.intersectsBox(plate)).toBe(true);
+      const lensBounds = new Box3().setFromObject(lenses[index]!);
+      expect(Math.abs(lensBounds.max.z - ringBounds.min.z)).toBeLessThan(0.001);
+    }
+    phone.dispose();
+    texture.dispose();
+  },
+);
diff --git a/packages/client-runtime/src/device/phoneScene.ts b/packages/client-runtime/src/device/phoneScene.ts
new file mode 100644
index 000000000000..824288031452
--- /dev/null
+++ b/packages/client-runtime/src/device/phoneScene.ts
@@ -0,0 +1,302 @@
+import {
+  BoxGeometry,
+  CircleGeometry,
+  CylinderGeometry,
+  ExtrudeGeometry,
+  Float32BufferAttribute,
+  Group,
+  Mesh,
+  MeshBasicMaterial,
+  MeshPhysicalMaterial,
+  MeshStandardMaterial,
+  Plane,
+  Raycaster,
+  Shape,
+  ShapeGeometry,
+  Vector2,
+  Vector3,
+  type Camera,
+  type BufferGeometry,
+  type Texture,
+} from "three";
+import type { DeviceScreenSize } from "./stream.ts";
+import { IOS_PHONE_SHAPE, type DeviceShapeProfile } from "./shapeProfile.ts";
+
+const SCREEN_HEIGHT = 2.2;
+
+function roundedPath(width: number, height: number, radius: number, path = new Shape()) {
+  const x = -width / 2;
+  const y = -height / 2;
+  path.moveTo(x + radius, y);
+  path.lineTo(x + width - radius, y);
+  path.quadraticCurveTo(x + width, y, x + width, y + radius);
+  path.lineTo(x + width, y + height - radius);
+  path.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
+  path.lineTo(x + radius, y + height);
+  path.quadraticCurveTo(x, y + height, x, y + height - radius);
+  path.lineTo(x, y + radius);
+  path.quadraticCurveTo(x, y, x + radius, y);
+  return path;
+}
+
+/** Display orientation is independent of orbit. Texture coordinates stay in raw framebuffer space. */
+export function phoneDisplayLayout(
+  screen: DeviceScreenSize | null,
+  rawWidth: number,
+  rawHeight: number,
+) {
+  const width = rawWidth || screen?.width || 900;
+  const height = rawHeight || screen?.height || 1950;
+  const landscape =
+    screen?.orientation === "landscape_left" || screen?.orientation === "landscape_right";
+  const rotation =
+    screen?.orientation === "landscape_left"
+      ? -Math.PI / 2
+      : screen?.orientation === "landscape_right"
+        ? Math.PI / 2
+        : screen?.orientation === "portrait_upside_down"
+          ? Math.PI
+          : 0;
+  return {
+    aspect: Math.min(width, height) / Math.max(width, height),
+    rotation,
+    landscape,
+    rawLandscape: width > height,
+  };
+}
+
+/** An original procedural device body. It makes no claim to reproduce a particular hardware model. */
+export function createPhoneScene(
+  texture: Texture,
+  layout: ReturnType<typeof phoneDisplayLayout>,
+  profile: DeviceShapeProfile = IOS_PHONE_SHAPE,
+) {
+  const { aspect } = layout;
+  const root = new Group();
+  const orientation = new Group();
+  root.add(orientation);
+  const screenWidth = SCREEN_HEIGHT * aspect;
+  const width = screenWidth + profile.bezel * 2;
+  const height = SCREEN_HEIGHT + profile.bezel * 2;
+  const backZ = 0.01 - profile.depth;
+  const metal = new MeshStandardMaterial({ color: 0xb5bcc7, metalness: 0.88, roughness: 0.27 });
+  const glass = new MeshPhysicalMaterial({
+    color: 0x141820,
+    metalness: 0.15,
+    roughness: 0.2,
+    clearcoat: 1,
+  });
+  const backMaterial = new MeshStandardMaterial({
+    color: profile.backColor,
+    metalness: 0.45,
+    roughness: 0.32,
+  });
+  const lensMaterial = new MeshPhysicalMaterial({
+    color: 0x071326,
+    metalness: 0.6,
+    roughness: 0.12,
+    clearcoat: 1,
+  });
+  const materials = [metal, glass, backMaterial, lensMaterial];
+
+  const body = new Mesh(
+    new ExtrudeGeometry(roundedPath(width, height, profile.bodyRadius), {
+      depth: profile.depth,
+      bevelEnabled: true,
+      bevelSize: 0.012,
+      bevelThickness: 0.012,
+      bevelSegments: 3,
+      steps: 1,
+      curveSegments: 12,
+    }),
+    metal,
+  );
+  body.position.z = 0.025 - profile.depth;
+  orientation.add(body);
+  const face = new Mesh(
+    new ShapeGeometry(roundedPath(width - 0.014, height - 0.014, profile.bodyRadius - 0.01), 16),
+    glass,
+  );
+  face.position.z = 0.04;
+  orientation.add(face);
+  const back = new Mesh(
+    new ShapeGeometry(roundedPath(width - 0.012, height - 0.012, profile.bodyRadius - 0.01), 16),
+    backMaterial,
+  );
+  back.name = "device-back";
+  back.rotation.y = Math.PI;
+  back.position.z = backZ;
+  orientation.add(back);
+
+  const screenGeometry = new ShapeGeometry(
+    roundedPath(screenWidth, SCREEN_HEIGHT, profile.screenRadius),
+    20,
+  );
+  updateDisplayUv(screenGeometry, screenWidth, SCREEN_HEIGHT, layout);
+  const screenMaterial = new MeshBasicMaterial({ map: texture, toneMapped: false });
+  const display = new Mesh(screenGeometry, screenMaterial);
+  display.position.z = 0.043;
+  orientation.add(display);
+
+  for (const { edge, offset, length } of profile.buttons) {
+    const button = new Mesh(
+      new BoxGeometry(
+        edge === "top" ? length : 0.026,
+        edge === "top" ? 0.026 : length,
+        profile.depth * 0.65,
+      ),
+      metal,
+    );
+    button.position.set(
+      edge === "top" ? offset : (edge === "left" ? -1 : 1) * (width / 2 + 0.015),
+      edge === "top" ? height / 2 + 0.015 : offset,
+      (0.025 + backZ) / 2,
+    );
+    orientation.add(button);
+  }
+  // Rear components share a surface-relative coordinate system, with outward positive Z.
+  const rearCamera = new Group();
+  rearCamera.name = "rear-camera";
+  rearCamera.position.set(
+    width / 2 - profile.camera.insetX,
+    height / 2 - profile.camera.insetY,
+    back.position.z + 0.001,
+  );
+  rearCamera.rotation.y = Math.PI;
+  orientation.add(rearCamera);
+  const plateFront = 0.025 + 0.007;
+  const ringDepth = 0.025;
+  const cameraPlate = new Mesh(
+    new ExtrudeGeometry(
+      roundedPath(
+        profile.camera.width,
+        profile.camera.height,
+        Math.min(profile.camera.width, profile.camera.height) / 4,
+      ),
+      {
+        depth: 0.025,
+        bevelEnabled: true,
+        bevelSize: 0.009,
+        bevelThickness: 0.007,
+        bevelSegments: 2,
+      },
+    ),
+    backMaterial,
+  );
+  cameraPlate.name = "camera-plate";
+  rearCamera.add(cameraPlate);
+  for (const [x, y] of profile.camera.lenses) {
+    const radius = profile.camera.lensRadius;
+    const ring = new Mesh(new CylinderGeometry(radius + 0.014, radius + 0.014, 0.025, 32), metal);
+    ring.rotation.x = Math.PI / 2;
+    ring.name = "camera-ring";
+    ring.position.set(x, y, plateFront + ringDepth / 2 - 0.003);
+    rearCamera.add(ring);
+    const lens = new Mesh(new CircleGeometry(radius, 32), lensMaterial);
+    lens.name = "camera-lens";
+    lens.position.set(x, y, ring.position.z + ringDepth / 2 + 0.0005);
+    rearCamera.add(lens);
+  }
+  const flashMaterial = new MeshBasicMaterial({ color: 0xf2ead6 });
+  if (profile.camera.flash) {
+    const flash = new Mesh(new CircleGeometry(0.022, 20), flashMaterial);
+    flash.position.set(profile.camera.flash[0], profile.camera.flash[1], plateFront + 0.0005);
+    rearCamera.add(flash);
+  }
+
+  let activeLayout = layout;
+  const screenPoint = createDisplayProjection(
+    display,
+    orientation,
+    screenWidth,
+    SCREEN_HEIGHT,
+    () => activeLayout,
+  );
+  return {
+    root,
+    orientation,
+    width,
+    height,
+    screenPoint,
+    setDisplay(nextTexture: Texture, nextLayout: PhoneDisplayLayout) {
+      activeLayout = nextLayout;
+      screenMaterial.map = nextTexture;
+      updateDisplayUv(screenGeometry, screenWidth, SCREEN_HEIGHT, activeLayout);
+    },
+    dispose() {
+      root.traverse((object) => {
+        if (object instanceof Mesh) object.geometry.dispose();
+      });
+      for (const material of materials) material.dispose();
+      screenMaterial.dispose();
+      flashMaterial.dispose();
+    },
+  };
+}
+
+export type PhoneDisplayLayout = ReturnType<typeof phoneDisplayLayout>;
+
+/** Canonical portrait geometry maps to raw framebuffer coordinates in every OS orientation. */
+export function updateDisplayUv(
+  geometry: BufferGeometry,
+  width: number,
+  height: number,
+  layout: PhoneDisplayLayout,
+) {
+  const position = geometry.getAttribute("position");
+  if (!geometry.hasAttribute("uv")) {
+    geometry.setAttribute(
+      "uv",
+      new Float32BufferAttribute(new Float32Array(position.count * 2), 2),
+    );
+  }
+  const uv = geometry.getAttribute("uv");
+  for (let i = 0; i < position.count; i++) {
+    const u = (position.getX(i) + width / 2) / width;
+    const v = (position.getY(i) + height / 2) / height;
+    uv.setXY(
+      i,
+      layout.rawLandscape ? (layout.rotation > 0 ? 1 - v : v) : u,
+      layout.rawLandscape ? (layout.rotation > 0 ? u : 1 - u) : v,
+    );
+  }
+  uv.needsUpdate = true;
+}
+
+/** New touches hit only the front display; captured drags project onto its plane and clamp. */
+export function createDisplayProjection(
+  display: Mesh,
+  orientation: Group,
+  width: number,
+  height: number,
+  getLayout: () => PhoneDisplayLayout,
+) {
+  const raycaster = new Raycaster();
+  const pointer = new Vector2();
+  const local = new Vector3();
+  display.geometry.computeBoundingBox();
+  const z = display.position.z + (display.geometry.boundingBox?.max.z ?? 0);
+  const plane = new Plane(new Vector3(0, 0, 1), -z);
+  return (x: number, y: number, camera: Camera, captured = false) => {
+    orientation.updateWorldMatrix(true, true);
+    camera.updateMatrixWorld(true);
+    pointer.set(x * 2 - 1, 1 - y * 2);
+    raycaster.setFromCamera(pointer, camera);
+    if (!captured) {
+      const hit = raycaster.intersectObject(display, false)[0];
+      if (!hit) return null;
+      local.copy(hit.point);
+      orientation.worldToLocal(local);
+    } else {
+      const ray = raycaster.ray.clone().applyMatrix4(orientation.matrixWorld.clone().invert());
+      if (!ray.intersectPlane(plane, local)) return null;
+    }
+    const u = Math.min(1, Math.max(0, (local.x + width / 2) / width));
+    const v = Math.min(1, Math.max(0, (local.y + height / 2) / height));
+    const { rotation } = getLayout();
+    if (rotation === -Math.PI / 2) return { x: v, y: u };
+    if (rotation === Math.PI / 2) return { x: 1 - v, y: 1 - u };
+    if (rotation === Math.PI) return { x: 1 - u, y: v };
+    return { x: u, y: 1 - v };
+  };
+}
diff --git a/packages/client-runtime/src/device/phoneViewer.test.ts b/packages/client-runtime/src/device/phoneViewer.test.ts
new file mode 100644
index 000000000000..d40ddc72b39d
--- /dev/null
+++ b/packages/client-runtime/src/device/phoneViewer.test.ts
@@ -0,0 +1,530 @@
+import type { PerspectiveCamera, Scene, Object3D } from "three";
+import { afterEach, expect, it, vi } from "vite-plus/test";
+
+const gpu = vi.hoisted(() => ({
+  instances: [] as {
+    blank: boolean;
+    allocations: number;
+    disposed: boolean;
+    size: { width: number; height: number; pixelRatio: number };
+    frames: {
+      scene: Scene;
+      phone: Object3D | undefined;
+      rotation: Quaternion | undefined;
+      displayAngle: number | undefined;
+      yaw: number | undefined;
+      cameraZ: number;
+    }[];
+  }[],
+}));
+
+vi.mock("three", async () => {
+  const actual = await vi.importActual<typeof import("three")>("three");
+  return {
+    ...actual,
+    WebGLRenderer: class {
+      outputColorSpace = "";
+      state: (typeof gpu.instances)[number] = {
+        blank: true,
+        allocations: 0,
+        disposed: false,
+        size: { width: 0, height: 0, pixelRatio: 1 },
+        frames: [],
+      };
+      constructor() {
+        gpu.instances.push(this.state);
+      }
+      setDrawingBufferSize(width: number, height: number, pixelRatio: number) {
+        this.state.size = { width, height, pixelRatio };
+        this.state.allocations++;
+        this.state.blank = true;
+      }
+      setSize(width: number, height: number) {
+        this.setDrawingBufferSize(width, height, this.state.size.pixelRatio);
+      }
+      setPixelRatio(pixelRatio: number) {
+        this.setDrawingBufferSize(this.state.size.width, this.state.size.height, pixelRatio);
+      }
+      render(scene: Scene, camera: PerspectiveCamera) {
+        const phone = scene.children.find((child) => child.type === "Group");
+        this.state.frames.push({
+          scene,
+          phone,
+          rotation: phone?.quaternion.clone(),
+          displayAngle: phone?.children[0]?.rotation.z,
+          yaw: phone?.rotation.y,
+          cameraZ: camera.position.z,
+        });
+        this.state.blank = false;
+      }
+      dispose() {
+        this.state.disposed = true;
+      }
+      forceContextLoss() {}
+    },
+  };
+});
+
+const models = vi.hoisted(() => ({
+  pending: [] as {
+    signal: AbortSignal;
+    resolve: (model: { asset: import("three").Group; dispose: () => void }) => void;
+  }[],
+}));
+vi.mock("./modelScene.ts", async () => {
+  const actual = await vi.importActual<typeof import("./modelScene.ts")>("./modelScene.ts");
+  return {
+    ...actual,
+    loadDeviceModel: (_source: unknown, signal: AbortSignal) =>
+      new Promise((resolve) => models.pending.push({ signal, resolve })),
+  };
+});
+
+import {
+  Box3,
+  BoxGeometry,
+  Group,
+  Mesh,
+  MeshBasicMaterial,
+  PlaneGeometry,
+  Quaternion,
+  Vector3,
+} from "three";
+import { disposeDeviceModel } from "./modelScene.ts";
+import { createPhoneViewer } from "./phoneViewer.ts";
+import {
+  ANDROID_PHONE_SHAPE,
+  IOS_TABLET_SHAPE,
+  resolveDeviceShape,
+  type DeviceShapeProfile,
+} from "./shapeProfile.ts";
+
+afterEach(() => {
+  vi.restoreAllMocks();
+  vi.unstubAllGlobals();
+  gpu.instances.length = 0;
+  models.pending.length = 0;
+});
+
+function fixture(profile?: DeviceShapeProfile) {
+  const pending = new Map<number, FrameRequestCallback>();
+  let id = 0;
+  let now = 0;
+  vi.spyOn(performance, "now").mockImplementation(() => now);
+  vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => {
+    pending.set(++id, callback);
+    return id;
+  });
+  vi.stubGlobal("cancelAnimationFrame", (id: number) => pending.delete(id));
+  const canvas = Object.assign(new EventTarget(), { width: 0, height: 0 }) as HTMLCanvasElement;
+  const source = { width: 1206, height: 2622 } as HTMLCanvasElement;
+  const onUnavailable = vi.fn();
+  const onFramingAspect = vi.fn();
+  const viewer = createPhoneViewer({
+    canvas,
+    source,
+    onUnavailable,
+    onFramingAspect,
+    ...(profile ? { profile } : {}),
+  });
+  const draw = (time = now) => {
+    now = time;
+    const callbacks = [...pending.values()];
+    pending.clear();
+    callbacks.forEach((callback) => callback(0));
+  };
+  viewer.resize(400, 700, 2);
+  draw();
+  return {
+    viewer,
+    draw,
+    pending,
+    source,
+    onUnavailable,
+    onFramingAspect,
+    state: gpu.instances[0]!,
+  };
+}
+
+it("retains the drawn phone until resize and redraw commit together, without replacing scene or pose", () => {
+  const { viewer, draw, pending, source, state, onUnavailable } = fixture();
+  viewer.orbit(0.08, 0.04);
+  draw();
+  const previous = state.frames.at(-1)!;
+  const allocations = state.allocations;
+  viewer.resize(500, 700, 2);
+  viewer.resize(450, 700, 2);
+  viewer.frameUpdated();
+  // ResizeObserver runs after rAF. A cleared buffer here would reach the browser's next paint.
+  expect(state.blank).toBe(false);
+  expect(state.allocations).toBe(allocations);
+  expect(pending.size).toBe(1);
+  draw();
+  expect(state.size).toEqual({ width: 450, height: 700, pixelRatio: 2 });
+  expect(state.blank).toBe(false);
+  expect(state.allocations).toBe(allocations + 1);
+  expect(state.frames.at(-1)?.scene).toBe(previous.scene);
+  expect(state.frames.at(-1)?.phone).toBe(previous.phone);
+  expect(state.frames.at(-1)?.yaw).toBe(previous.yaw);
+  viewer.resize(400, 700, 2);
+  draw();
+  expect(state.frames.at(-1)?.cameraZ).toBeCloseTo(previous.cameraZ);
+  expect(source).toMatchObject({ width: 1206, height: 2622 });
+  expect(gpu.instances).toHaveLength(1);
+  expect(onUnavailable).not.toHaveBeenCalled();
+  viewer.dispose();
+});
+
+it("ignores redundant and invalid sizes and combines a DPR change into one allocation and draw", () => {
+  const { viewer, draw, pending, state } = fixture();
+  const allocations = state.allocations;
+  viewer.resize(400, 700, 2);
+  viewer.resize(400, 700, 5);
+  viewer.resize(0, 700, 2);
+  viewer.resize(NaN, 700, 2);
+  expect(pending.size).toBe(0);
+  viewer.resize(400, 700, 1);
+  expect(state.blank).toBe(false);
+  draw();
+  expect(state.size.pixelRatio).toBe(1);
+  expect(state.allocations).toBe(allocations + 1);
+  viewer.resize(450, 700, 1);
+  viewer.dispose();
+  draw();
+  expect(state.allocations).toBe(allocations + 1);
+  expect(state.disposed).toBe(true);
+});
+
+it("changes device shape without replacing the renderer, decoded source or pose", () => {
+  const { viewer, draw, source, state } = fixture();
+  viewer.orbit(0.1, 0.05);
+  draw();
+  const previous = state.frames.at(-1)!;
+  const allocations = state.allocations;
+  viewer.setScreen(null, IOS_TABLET_SHAPE);
+  draw();
+  expect(state.frames.at(-1)?.phone).not.toBe(previous.phone);
+  expect(state.frames.at(-1)?.yaw).toBe(previous.yaw);
+  expect(state.frames.at(-1)?.scene).toBe(previous.scene);
+  expect(state.allocations).toBe(allocations);
+  expect(source.width).toBe(1206);
+  expect(gpu.instances).toHaveLength(1);
+  const tablet = state.frames.at(-1)?.phone;
+  viewer.frameUpdated();
+  draw();
+  expect(state.frames.at(-1)?.phone).toBe(tablet);
+  viewer.dispose();
+});
+
+it("keeps the Android viewer while the resized framebuffer turns between fold postures", () => {
+  const openProfile = resolveDeviceShape({ platform: "android", portraitAspect: 0.96 });
+  const { viewer, draw, source, state } = fixture(openProfile);
+  const scene = state.frames.at(-1)!.scene;
+  source.width = 2076;
+  source.height = 2152;
+  viewer.setScreen({ width: 2076, height: 2152, orientation: "landscape_left" });
+  viewer.frameUpdated();
+  draw(0);
+  expect(state.frames.at(-1)!.displayAngle).toBeCloseTo(0);
+  draw(225);
+  expect(state.frames.at(-1)!.displayAngle).toBeCloseTo(-Math.PI / 4);
+  draw(450);
+  expect(state.frames.at(-1)!.displayAngle).toBeCloseTo(-Math.PI / 2);
+  expect(state.frames.at(-1)!.scene).toBe(scene);
+  expect(gpu.instances).toHaveLength(1);
+
+  source.width = 1080;
+  source.height = 2424;
+  viewer.setScreen({ width: 1080, height: 2424, orientation: "portrait" }, ANDROID_PHONE_SHAPE);
+  viewer.frameUpdated();
+  draw(450);
+  expect(state.frames.at(-1)!.displayAngle).toBeCloseTo(-Math.PI / 2);
+  draw(675);
+  expect(state.frames.at(-1)!.displayAngle).toBeCloseTo(-Math.PI / 4);
+  draw(900);
+  expect(state.frames.at(-1)!.displayAngle).toBeCloseTo(0);
+  expect(state.frames.at(-1)!.scene).toBe(scene);
+  viewer.dispose();
+});
+
+it("animates the Android hinge on the same scene through an encoder resize", () => {
+  const openProfile = resolveDeviceShape({ platform: "android", portraitAspect: 0.96 });
+  const { viewer, draw, source, state } = fixture(openProfile);
+  viewer.setFoldAngle(180);
+  draw(0);
+  const shell = state.frames.at(-1)!.phone!;
+  const moving = shell.children[0]!.children[0]!;
+  viewer.setFoldAngle(0);
+  draw(425);
+  expect(moving.rotation.y).toBeCloseTo(Math.PI / 2);
+  source.width = 1080;
+  source.height = 2424;
+  viewer.setScreen({ width: 1080, height: 2424, orientation: "portrait" }, ANDROID_PHONE_SHAPE);
+  viewer.frameUpdated();
+  draw(850);
+  expect(moving.rotation.y).toBeCloseTo(Math.PI);
+  expect(state.frames.at(-1)!.phone).toBe(shell);
+  expect(gpu.instances).toHaveLength(1);
+  viewer.dispose();
+});
+
+it("resizes the fold body for a landscape inner display and keeps it through the cover frame", () => {
+  const openProfile = resolveDeviceShape({ platform: "android", portraitAspect: 0.83 });
+  const { viewer, draw, source, state } = fixture(openProfile);
+  viewer.setFoldAngle(180);
+  draw(0);
+  const portraitWidth = new Box3()
+    .setFromObject(state.frames.at(-1)!.phone!)
+    .getSize(new Vector3()).x;
+  source.width = 2208;
+  source.height = 1840;
+  viewer.setScreen({ width: 2208, height: 1840, orientation: "portrait" });
+  viewer.frameUpdated();
+  draw(10);
+  const landscape = state.frames.at(-1)!.phone!;
+  const landscapeWidth = new Box3().setFromObject(landscape).getSize(new Vector3()).x;
+  expect(landscapeWidth / portraitWidth).toBeGreaterThan(1.15);
+  source.width = 1080;
+  source.height = 2092;
+  viewer.setScreen({ width: 1080, height: 2092, orientation: "portrait" }, ANDROID_PHONE_SHAPE);
+  viewer.frameUpdated();
+  draw(20);
+  expect(state.frames.at(-1)!.phone).toBe(landscape);
+  expect(gpu.instances).toHaveLength(1);
+  viewer.dispose();
+});
+
+it("keeps the fold body through a rotated cover frame and learns the inner shape before fold mode", () => {
+  const { viewer, draw, source, state } = fixture(ANDROID_PHONE_SHAPE);
+  source.width = 2208;
+  source.height = 1840;
+  viewer.setScreen({ width: 2208, height: 1840, orientation: "portrait" });
+  viewer.frameUpdated();
+  draw(0);
+  viewer.setFoldAngle(180);
+  draw(10);
+  const landscape = state.frames.at(-1)!.phone!;
+  const width = new Box3().setFromObject(landscape).getSize(new Vector3()).x;
+  expect(width / new Box3().setFromObject(landscape).getSize(new Vector3()).y).toBeGreaterThan(1.1);
+  source.width = 2092;
+  source.height = 1080;
+  viewer.setScreen({ width: 2092, height: 1080, orientation: "landscape_left" });
+  viewer.frameUpdated();
+  draw(20);
+  expect(state.frames.at(-1)!.phone).toBe(landscape);
+  viewer.dispose();
+});
+
+it("retargets an unfinished hinge turn from its visible angle", () => {
+  const { viewer, draw, state } = fixture(ANDROID_PHONE_SHAPE);
+  viewer.setFoldAngle(180);
+  draw(0);
+  const moving = state.frames.at(-1)!.phone!.children[0]!.children[0]!;
+  viewer.setFoldAngle(0);
+  draw(200);
+  const visibleAngle = moving.rotation.y;
+  viewer.setFoldAngle(180);
+  draw(200);
+  expect(moving.rotation.y).toBeCloseTo(visibleAngle);
+  draw(1050);
+  expect(moving.rotation.y).toBeCloseTo(0);
+  viewer.dispose();
+});
+
+it("stops a hinge turn when a loaded model replaces the fold scene", async () => {
+  const { viewer, draw, pending } = fixture(ANDROID_PHONE_SHAPE);
+  viewer.setFoldAngle(180);
+  draw(0);
+  viewer.setFoldAngle(0);
+  viewer.setModel({ id: "iphone-18-pro", url: "/fold.glb" });
+  const asset = new Group();
+  const body = new Mesh(new BoxGeometry(1, 2, 0.1), new MeshBasicMaterial());
+  const display = new Mesh(new PlaneGeometry(0.9, 1.9), new MeshBasicMaterial());
+  display.name = "device-screen";
+  asset.add(body, display);
+  models.pending[0]!.resolve({ asset, dispose: () => disposeDeviceModel(asset) });
+  await Promise.resolve();
+  draw(200);
+  draw(1050);
+  expect(pending.size).toBe(0);
+  viewer.dispose();
+});
+
+it("keeps a loaded model when the fold angle changes and releases it once", async () => {
+  const { viewer, draw, state } = fixture(ANDROID_PHONE_SHAPE);
+  viewer.setModel({ id: "iphone-18-pro", url: "/pro.glb" });
+  const asset = new Group();
+  const body = new Mesh(new BoxGeometry(1.15, 2.3, 0.1), new MeshBasicMaterial());
+  body.position.z = -0.02;
+  const display = new Mesh(new PlaneGeometry(1, 2.2), new MeshBasicMaterial());
+  display.geometry.translate(0, 0, 0.043);
+  display.name = "device-screen";
+  asset.add(body, display);
+  const dispose = vi.fn(() => disposeDeviceModel(asset));
+  models.pending[0]!.resolve({ asset, dispose });
+  await Promise.resolve();
+  draw();
+  const loaded = state.frames.at(-1)!.phone;
+  expect(loaded?.getObjectByName("device-screen")).toBe(display);
+  viewer.setFoldAngle(180);
+  viewer.setFoldAngle(0);
+  draw();
+  expect(state.frames.at(-1)!.phone).toBe(loaded);
+  viewer.dispose();
+  expect(dispose).toHaveBeenCalledOnce();
+});
+
+it("retains the loaded model and pose through rotation and framebuffer resolution changes, then releases it once", async () => {
+  const { viewer, draw, source, state } = fixture();
+  viewer.orbit(0.08, 0.04);
+  draw();
+  const yaw = state.frames.at(-1)!.yaw;
+  viewer.setModel({ id: "iphone-18-pro", url: "/pro.glb" });
+  const asset = new Group();
+  const body = new Mesh(new BoxGeometry(1.15, 2.3, 0.1), new MeshBasicMaterial());
+  body.position.z = -0.02;
+  const display = new Mesh(new PlaneGeometry(1, 2.2), new MeshBasicMaterial());
+  display.geometry.translate(0, 0, 0.043);
+  display.name = "device-screen";
+  asset.add(body, display);
+  const release = vi.spyOn(body.geometry, "dispose");
+  const dispose = vi.fn(() => disposeDeviceModel(asset));
+  models.pending[0]!.resolve({ asset, dispose });
+  await Promise.resolve();
+  draw();
+  const loaded = state.frames.at(-1)!.phone;
+  expect(loaded?.getObjectByName("device-screen")).toBe(display);
+  expect(state.frames.at(-1)!.yaw).toBe(yaw);
+  source.width = 2622;
+  source.height = 1206;
+  viewer.setScreen({ width: 2622, height: 1206, orientation: "landscape_left" });
+  viewer.frameUpdated();
+  viewer.resize(700, 400, 1);
+  draw();
+  expect(state.frames.at(-1)!.phone).toBe(loaded);
+  expect(state.frames.at(-1)!.yaw).toBe(yaw);
+  expect(display.material.map?.image).toBe(source);
+  expect(release).not.toHaveBeenCalled();
+  expect(gpu.instances).toHaveLength(1);
+  viewer.dispose();
+  viewer.dispose();
+  expect(dispose).toHaveBeenCalledOnce();
+  expect(release).toHaveBeenCalledOnce();
+});
+
+it("attaches and detaches an accessory without replacing the device, stream texture, renderer or pose", async () => {
+  const { viewer, draw, source, state, onFramingAspect } = fixture();
+  viewer.setModel({ id: "ipad-pro-13-m5", url: "/ipad.glb" });
+  const asset = new Group();
+  const body = new Mesh(new BoxGeometry(1.8, 2.3, 0.1), new MeshBasicMaterial());
+  const display = new Mesh(new PlaneGeometry(1.7, 2.2), new MeshBasicMaterial());
+  display.geometry.translate(0, 0, 0.043);
+  display.name = "device-screen";
+  asset.add(body, display);
+  const releaseBody = vi.fn(() => disposeDeviceModel(asset));
+  models.pending[0]!.resolve({ asset, dispose: releaseBody });
+  await Promise.resolve();
+  viewer.orbit(0.1, 0.05);
+  draw();
+  const before = state.frames.at(-1)!;
+  const bareAspect = onFramingAspect.mock.lastCall![0];
+  const keyboard = new Group();
+  const deck = new Mesh(new BoxGeometry(2, 1, 1), new MeshBasicMaterial());
+  deck.position.set(1, 0, 0.5);
+  keyboard.add(deck);
+  const releaseKeyboard = vi.fn(() => disposeDeviceModel(keyboard));
+  viewer.setAccessory({
+    id: "ipad-pro-13-m5-magic-keyboard",
+    modelId: "ipad-pro-13-m5",
+    url: "/keyboard.glb",
+  });
+  models.pending[1]!.resolve({ asset: keyboard, dispose: releaseKeyboard });
+  await Promise.resolve();
+  draw();
+  expect(state.frames.at(-1)!.phone).toBe(before.phone);
+  expect(keyboard.parent).toBe(asset.parent);
+  expect(state.frames.at(-1)!.yaw).toBe(before.yaw);
+  expect(display.material.map?.image).toBe(source);
+  expect(state.frames.at(-1)!.cameraZ).toBeGreaterThan(before.cameraZ);
+  expect(onFramingAspect.mock.lastCall![0]).toBeGreaterThan(bareAspect);
+  const calls = onFramingAspect.mock.calls.length;
+  viewer.orbit(0.1, 0.05);
+  viewer.frameUpdated();
+  draw();
+  expect(onFramingAspect).toHaveBeenCalledTimes(calls);
+  viewer.setAccessory(null);
+  draw();
+  expect(keyboard.parent).toBeNull();
+  expect(onFramingAspect.mock.lastCall![0]).toBeCloseTo(bareAspect);
+  expect(releaseKeyboard).toHaveBeenCalledOnce();
+  expect(releaseBody).not.toHaveBeenCalled();
+  expect(state.frames.at(-1)!.phone).toBe(before.phone);
+  expect(state.frames.at(-1)!.cameraZ).toBeCloseTo(before.cameraZ);
+  expect(gpu.instances).toHaveLength(1);
+  viewer.dispose();
+  expect(releaseBody).toHaveBeenCalledOnce();
+  expect(releaseKeyboard).toHaveBeenCalledOnce();
+});
+
+it("rejects incompatible accessories and releases an accessory that finishes after detaching", async () => {
+  const { viewer } = fixture();
+  const keyboard = {
+    id: "ipad-pro-13-m5-magic-keyboard",
+    modelId: "ipad-pro-13-m5",
+    url: "/keyboard.glb",
+  } as const;
+  viewer.setAccessory(keyboard);
+  expect(models.pending).toHaveLength(0);
+  viewer.setModel({ id: "ipad-pro-13-m5", url: "/ipad.glb" });
+  viewer.setAccessory(keyboard);
+  viewer.setAccessory(null);
+  expect(models.pending[1]!.signal.aborted).toBe(true);
+  const dispose = vi.fn();
+  const asset = new Group();
+  models.pending[1]!.resolve({ asset, dispose });
+  await Promise.resolve();
+  expect(asset.parent).toBeNull();
+  expect(dispose).toHaveBeenCalledOnce();
+  viewer.dispose();
+});
+
+it("springs an ordinary device back toward its screen, freezes captured input, and stops rendering at rest", () => {
+  const { viewer, draw, pending, state } = fixture();
+  const initialYaw = state.frames.at(-1)!.yaw!;
+  viewer.setInteractionActive(true, "orbit");
+  viewer.orbit(0.8, 0.4);
+  draw(80);
+  const dragged = state.frames.at(-1)!;
+  expect(Math.abs(dragged.yaw! - initialYaw)).toBeGreaterThan(0.05);
+  viewer.setInteractionActive(false, "orbit");
+  draw(160);
+  viewer.setInteractionActive(true, "touch");
+  draw(180);
+  const captured = state.frames.at(-1)!;
+  viewer.orbit(1, 1);
+  viewer.frameUpdated();
+  draw(1000);
+  expect(state.frames.at(-1)!.yaw).toBe(captured.yaw);
+  expect(state.frames.at(-1)!.cameraZ).toBe(captured.cameraZ);
+  expect(pending.size).toBe(0);
+  viewer.setInteractionActive(false, "touch");
+  for (let time = 1016; time <= 4000 && pending.size; time += 16) draw(time);
+  expect(pending.size).toBe(0);
+  expect(Math.abs(state.frames.at(-1)!.yaw!)).toBeLessThanOrEqual(Math.PI / 3 + 1e-6);
+  expect(state.frames.at(-1)!.phone).toBe(dragged.phone);
+  viewer.dispose();
+});
+
+it("resets the device to a square front view after orbiting", () => {
+  const { viewer, draw, pending, state } = fixture();
+  const front = state.frames.at(-1)!.rotation!;
+  expect(front.angleTo(new Quaternion())).toBeLessThan(1e-6);
+  viewer.orbit(0.8, 0.4);
+  draw(80);
+  expect(state.frames.at(-1)!.rotation!.angleTo(front)).toBeGreaterThan(0.05);
+  viewer.resetPose();
+  for (let time = 96; time <= 3000 && pending.size; time += 16) draw(time);
+  expect(pending.size).toBe(0);
+  expect(state.frames.at(-1)!.rotation!.angleTo(new Quaternion())).toBeLessThan(1e-6);
+  viewer.dispose();
+});
diff --git a/packages/client-runtime/src/device/phoneViewer.ts b/packages/client-runtime/src/device/phoneViewer.ts
new file mode 100644
index 000000000000..3dfc25048e02
--- /dev/null
+++ b/packages/client-runtime/src/device/phoneViewer.ts
@@ -0,0 +1,444 @@
+import {
+  AmbientLight,
+  Box3,
+  CanvasTexture,
+  DirectionalLight,
+  LinearFilter,
+  Matrix4,
+  PerspectiveCamera,
+  Quaternion,
+  Scene,
+  SRGBColorSpace,
+  Vector3,
+  WebGLRenderer,
+} from "three";
+import {
+  createDeviceModelSlot,
+  type DeviceModelSource,
+  type DeviceAccessorySource,
+} from "./model.ts";
+import { createImportedPhoneScene, loadDeviceModel } from "./modelScene.ts";
+import { createPhoneScene, phoneDisplayLayout } from "./phoneScene.ts";
+import {
+  createAndroidFoldScene,
+  DEFAULT_FOLD_INNER_ASPECT,
+  isFoldInnerAspect,
+} from "./androidFoldScene.ts";
+import { createRenderScheduler } from "./renderScheduler.ts";
+import { createDeviceMotion } from "./deviceMotion.ts";
+import { createDeviceFraming } from "./deviceFraming.ts";
+import { nearestDeviceView } from "./deviceViewSnap.ts";
+import type { DeviceScreenSize } from "./stream.ts";
+import { IOS_PHONE_SHAPE, type DeviceShapeProfile } from "./shapeProfile.ts";
+
+export interface PhoneViewer {
+  readonly setModel: (source: DeviceModelSource | null) => void;
+  readonly setAccessory: (source: DeviceAccessorySource | null) => void;
+  readonly frameUpdated: () => void;
+  readonly setScreen: (screen: DeviceScreenSize | null, profile?: DeviceShapeProfile) => void;
+  readonly setFoldAngle: (angle: number | null) => void;
+  readonly resize: (width: number, height: number, pixelRatio: number) => void;
+  readonly screenPoint: (
+    x: number,
+    y: number,
+    captured?: boolean,
+  ) => { x: number; y: number } | null;
+  readonly orbit: (deltaX: number, deltaY: number) => void;
+  readonly setInteractionActive: (active: boolean, mode: "touch" | "orbit") => void;
+  readonly resetPose: () => void;
+  readonly dispose: () => void;
+}
+
+const ANDROID_ORIENTATION_TURN_MS = 450;
+const ANDROID_FOLD_TURN_MS = 850;
+
+/** Owns only presentation resources. The caller retains the decoded canvas and the stream connection. */
+export function createPhoneViewer(options: {
+  readonly canvas: HTMLCanvasElement;
+  readonly source: HTMLCanvasElement;
+  readonly onUnavailable: () => void;
+  readonly onModelError?: (cause: unknown) => void;
+  readonly onFramingAspect?: (aspect: number) => void;
+  readonly profile?: DeviceShapeProfile;
+  readonly model?: DeviceModelSource | null;
+  readonly accessory?: DeviceAccessorySource | null;
+  readonly foldAngle?: number | null;
+}): PhoneViewer {
+  const renderer = new WebGLRenderer({
+    canvas: options.canvas,
+    alpha: true,
+    antialias: true,
+    powerPreference: "low-power",
+  });
+  renderer.outputColorSpace = SRGBColorSpace;
+  const makeTexture = () => {
+    const next = new CanvasTexture(options.source);
+    next.colorSpace = SRGBColorSpace;
+    next.minFilter = LinearFilter;
+    next.magFilter = LinearFilter;
+    next.generateMipmaps = false;
+    return next;
+  };
+  let texture = makeTexture();
+  let textureWidth = options.source.width;
+  let textureHeight = options.source.height;
+  const scene = new Scene();
+  const camera = new PerspectiveCamera(32, 1, 0.1, 30);
+  camera.position.z = 5.5;
+  const ambient = new AmbientLight(0xffffff, 2.4);
+  const key = new DirectionalLight(0xe4edff, 5);
+  key.position.set(-3, 4, 5);
+  const rim = new DirectionalLight(0xffffff, 4);
+  rim.position.set(3, 1, -3);
+  const fill = new DirectionalLight(0x9facd4, 2);
+  fill.position.set(-2, -2, -4);
+  scene.add(ambient, key, rim, fill);
+
+  let screen: DeviceScreenSize | null = null;
+  let layout = phoneDisplayLayout(screen, options.source.width, options.source.height);
+  let profile = options.profile ?? IOS_PHONE_SHAPE;
+  let foldAngle = options.foldAngle ?? null;
+  let orientationAngle =
+    foldAngle !== null && profile.id.startsWith("android") ? 0 : layout.rotation;
+  let orientationTurn: { from: number; to: number; startedAt: number } | null = null;
+  let imported: Awaited<ReturnType<typeof loadDeviceModel>> | null = null;
+  let modelSource = options.model ?? null;
+  let accessory: Awaited<ReturnType<typeof loadDeviceModel>> | null = null;
+  let accessoryBounds: Box3 | null = null;
+  let foldTurn: { from: number; to: number; startedAt: number } | null = null;
+  // The inner display's raw width over height. Cover frames leave the last unfolded shape.
+  const rawAspect = () => options.source.width / options.source.height;
+  let foldAspect = isFoldInnerAspect(rawAspect()) ? rawAspect() : DEFAULT_FOLD_INNER_ASPECT;
+  const createFoldScene = (angle: number, displayLayout = layout) =>
+    createAndroidFoldScene(texture, displayLayout, angle, foldAspect);
+  /** The hinge angle currently on screen, including an unfinished turn. */
+  const visibleFoldAngle = (fallback: number) => {
+    if (!foldTurn) return fallback;
+    const progress = Math.min(1, (performance.now() - foldTurn.startedAt) / ANDROID_FOLD_TURN_MS);
+    const eased = progress * progress * (3 - 2 * progress);
+    return foldTurn.from + (foldTurn.to - foldTurn.from) * eased;
+  };
+  let phone: ReturnType<typeof createPhoneScene> | ReturnType<typeof createAndroidFoldScene> =
+    foldAngle !== null && profile.id.startsWith("android")
+      ? createFoldScene(foldAngle)
+      : createPhoneScene(texture, layout, profile);
+  scene.add(phone.root);
+  let disposed = false;
+  const rest = new Quaternion();
+  const motion = createDeviceMotion({
+    choose: (rotation) =>
+      nearestDeviceView(rotation, [{ rotation: new Quaternion(), yawLimit: Math.PI / 3 }])!
+        .rotation,
+  });
+  motion.setPose(rest, performance.now(), true);
+  const framing = createDeviceFraming();
+  const reducedMotion = () =>
+    globalThis.matchMedia?.("(prefers-reduced-motion: reduce)").matches ?? false;
+  let viewport = { width: 0, height: 0, pixelRatio: 1 };
+  let drawingBuffer = { width: 0, height: 0, pixelRatio: 0 };
+
+  let framingAspect: number | null = null;
+  const fit = (immediate = false) => {
+    if (!viewport.width || !viewport.height) return;
+    camera.aspect = viewport.width / viewport.height;
+    const bounds = new Box3(
+      new Vector3(-phone.width / 2, -phone.height / 2, 0),
+      new Vector3(phone.width / 2, phone.height / 2, 0),
+    );
+    if (imported && accessoryBounds) bounds.union(accessoryBounds);
+    bounds.applyMatrix4(new Matrix4().makeRotationZ(orientationAngle));
+    const size = bounds.getSize(new Vector3());
+    const aspect = size.x / size.y;
+    if (aspect !== framingAspect) {
+      framingAspect = aspect;
+      options.onFramingAspect?.(aspect);
+    }
+    phone.root.updateMatrixWorld(true);
+    framing.setBounds(
+      new Box3().setFromObject(phone.root),
+      (camera.fov * Math.PI) / 360,
+      camera.aspect,
+      performance.now(),
+      immediate,
+    );
+    applyCamera();
+  };
+  const applyCamera = () => {
+    camera.position.set(framing.center.x, framing.center.y, framing.distance());
+    camera.lookAt(framing.center.x, framing.center.y, 0);
+    camera.updateProjectionMatrix();
+  };
+  const applyPose = () => {
+    phone.root.quaternion.copy(motion.rotation);
+    phone.orientation.rotation.z = orientationAngle;
+  };
+  const scheduler = createRenderScheduler(() => {
+    if (disposed || !viewport.width || !viewport.height) return;
+    try {
+      if (
+        drawingBuffer.width !== viewport.width ||
+        drawingBuffer.height !== viewport.height ||
+        drawingBuffer.pixelRatio !== viewport.pixelRatio
+      ) {
+        // Canvas allocation clears the previous image. Commit it with the redraw,
+        // rather than exposing an empty buffer between ResizeObserver and the next frame.
+        renderer.setDrawingBufferSize(viewport.width, viewport.height, viewport.pixelRatio);
+        drawingBuffer = viewport;
+      }
+      const now = performance.now();
+      if (motion.advance(now, reducedMotion())) {
+        applyPose();
+        fit(reducedMotion());
+      }
+      if (orientationTurn) {
+        const progress = Math.min(
+          1,
+          (now - orientationTurn.startedAt) / ANDROID_ORIENTATION_TURN_MS,
+        );
+        const eased = progress * progress * (3 - 2 * progress);
+        orientationAngle =
+          orientationTurn.from + (orientationTurn.to - orientationTurn.from) * eased;
+        if (progress === 1) orientationTurn = null;
+        applyPose();
+        fit(reducedMotion());
+      }
+      if (foldTurn && "setAngle" in phone) {
+        const progress = Math.min(1, (now - foldTurn.startedAt) / ANDROID_FOLD_TURN_MS);
+        const eased = progress * progress * (3 - 2 * progress);
+        phone.setAngle(foldTurn.from + (foldTurn.to - foldTurn.from) * eased);
+        if (progress === 1) foldTurn = null;
+        fit(reducedMotion());
+      }
+      framing.advance(now, reducedMotion());
+      applyCamera();
+      renderer.render(scene, camera);
+      if (motion.needsFrame() || framing.needsFrame() || orientationTurn || foldTurn)
+        scheduler.invalidate();
+    } catch {
+      options.onUnavailable();
+    }
+  });
+  const updateLayout = (nextProfile = profile) => {
+    const next = phoneDisplayLayout(screen, options.source.width, options.source.height);
+    const resized =
+      textureWidth !== options.source.width || textureHeight !== options.source.height;
+    if (
+      resized ||
+      nextProfile !== profile ||
+      next.aspect !== layout.aspect ||
+      next.rawLandscape !== layout.rawLandscape ||
+      next.rotation !== layout.rotation
+    ) {
+      // The model and renderer survive framebuffer rotation and native resolution changes.
+      if (resized) {
+        const previous = texture;
+        texture = makeTexture();
+        textureWidth = options.source.width;
+        textureHeight = options.source.height;
+        phone.setDisplay(texture, next);
+        previous.dispose();
+      }
+      // Learn the inner display shape from any unfolded frame, including before fold mode.
+      const frameAspect = rawAspect();
+      const innerChanged = isFoldInnerAspect(frameAspect) && frameAspect !== foldAspect;
+      if (innerChanged) foldAspect = frameAspect;
+      if (!imported && "setAngle" in phone && innerChanged) {
+        // A new inner display shape resizes the body; the hinge keeps its visible angle.
+        const angle = visibleFoldAngle(foldAngle ?? 180);
+        scene.remove(phone.root);
+        phone.dispose();
+        phone = createFoldScene(angle, next);
+        scene.add(phone.root);
+      } else if (
+        !imported &&
+        !("setAngle" in phone) &&
+        (nextProfile !== profile || next.aspect !== layout.aspect)
+      ) {
+        scene.remove(phone.root);
+        phone.dispose();
+        phone = createPhoneScene(texture, next, nextProfile);
+        scene.add(phone.root);
+      } else {
+        phone.setDisplay(texture, next);
+      }
+      if (next.rotation !== layout.rotation) {
+        if (nextProfile.id.startsWith("android") && !("setAngle" in phone) && !reducedMotion()) {
+          const difference = Math.atan2(
+            Math.sin(next.rotation - orientationAngle),
+            Math.cos(next.rotation - orientationAngle),
+          );
+          orientationTurn = {
+            from: orientationAngle,
+            to: orientationAngle + difference,
+            startedAt: performance.now(),
+          };
+        } else {
+          orientationTurn = null;
+          orientationAngle = "setAngle" in phone ? 0 : next.rotation;
+        }
+      }
+      layout = next;
+      profile = nextProfile;
+      applyPose();
+      fit(!orientationTurn);
+    }
+    applyPose();
+  };
+  const modelSlot = createDeviceModelSlot({
+    load: loadDeviceModel,
+    onError: options.onModelError,
+    install(model) {
+      // Validate and prepare the next scene before releasing the visible one.
+      const next = disposed
+        ? null
+        : model
+          ? createImportedPhoneScene(model.asset, texture, layout)
+          : foldAngle !== null && profile.id.startsWith("android")
+            ? createFoldScene(foldAngle)
+            : createPhoneScene(texture, layout, profile);
+      foldTurn = null;
+      scene.remove(phone.root);
+      phone.dispose();
+      imported = model;
+      if (!next) return;
+      phone = next;
+      scene.add(phone.root);
+      if (accessory) {
+        if (imported) phone.orientation.add(accessory.asset);
+        else accessory.asset.removeFromParent();
+      }
+      applyPose();
+      fit(true);
+      scheduler.invalidate();
+    },
+  });
+  const accessorySlot = createDeviceModelSlot({
+    load: loadDeviceModel,
+    onError: options.onModelError,
+    install(model) {
+      const bounds = model ? new Box3().setFromObject(model.asset) : null;
+      if (
+        bounds &&
+        (bounds.isEmpty() ||
+          ![...bounds.min.toArray(), ...bounds.max.toArray()].every(Number.isFinite))
+      )
+        throw new Error("Device accessory has invalid bounds");
+      accessory?.asset.removeFromParent();
+      accessory = model;
+      accessoryBounds = bounds;
+      if (disposed) return;
+      if (imported && accessory) phone.orientation.add(accessory.asset);
+      fit(true);
+      scheduler.invalidate();
+    },
+  });
+  const setAccessory = (source: DeviceAccessorySource | null) => {
+    accessorySlot.set(source?.modelId === modelSource?.id ? source : null);
+  };
+  const contextLost = (event: Event) => {
+    event.preventDefault();
+    options.onUnavailable();
+  };
+  options.canvas.addEventListener("webglcontextlost", contextLost);
+  applyPose();
+  modelSlot.set(options.model ?? null);
+  setAccessory(options.accessory ?? null);
+  return {
+    setModel(source) {
+      if (source?.id !== modelSource?.id || source?.url !== modelSource?.url)
+        accessorySlot.set(null);
+      modelSource = source;
+      modelSlot.set(source);
+    },
+    setAccessory,
+    setFoldAngle(next) {
+      if (disposed || next === foldAngle) return;
+      const previous = foldAngle;
+      foldAngle = next;
+      // A loaded model owns the scene; install() reads foldAngle if it is removed.
+      if (imported) return;
+      if (next === null || !("setAngle" in phone)) {
+        scene.remove(phone.root);
+        phone.dispose();
+        phone = next === null ? createPhoneScene(texture, layout, profile) : createFoldScene(next);
+        scene.add(phone.root);
+        orientationTurn = null;
+        orientationAngle = next === null ? layout.rotation : 0;
+        foldTurn = null;
+        applyPose();
+        fit(true);
+      } else {
+        const from = visibleFoldAngle(previous ?? next);
+        if (reducedMotion()) {
+          foldTurn = null;
+          phone.setAngle(next);
+          fit(true);
+        } else {
+          foldTurn = { from, to: next, startedAt: performance.now() };
+        }
+      }
+      scheduler.invalidate();
+    },
+    frameUpdated() {
+      if (disposed) return;
+      updateLayout();
+      texture.needsUpdate = true;
+      scheduler.invalidate();
+    },
+    setScreen(next, nextProfile = profile) {
+      if (disposed) return;
+      screen = next;
+      updateLayout(nextProfile);
+      scheduler.invalidate();
+    },
+    resize(width, height, pixelRatio) {
+      if (disposed) return;
+      if (![width, height, pixelRatio].every(Number.isFinite) || width <= 0 || height <= 0) return;
+      const ratio = Math.min(2, Math.max(1, pixelRatio));
+      if (viewport.width === width && viewport.height === height && viewport.pixelRatio === ratio)
+        return;
+      viewport = { width, height, pixelRatio: ratio };
+      fit(true);
+      scheduler.invalidate();
+    },
+    screenPoint(x, y, captured = false) {
+      if (disposed) return null;
+      applyPose();
+      return phone.screenPoint(x, y, camera, captured);
+    },
+    orbit(deltaX, deltaY) {
+      if (disposed) return;
+      motion.orbit(deltaX * viewport.width, deltaY * viewport.height, performance.now());
+      scheduler.invalidate();
+    },
+    setInteractionActive(active, mode) {
+      if (disposed) return;
+      const now = performance.now();
+      if (mode === "orbit") motion.dragActive(active, now);
+      else {
+        motion.hold(active, now);
+        framing.hold(active, now);
+      }
+      scheduler.invalidate();
+    },
+    resetPose() {
+      if (disposed) return;
+      motion.reset(rest, performance.now());
+      scheduler.invalidate();
+    },
+    dispose() {
+      if (disposed) return;
+      disposed = true;
+      scheduler.dispose();
+      const hadImported = imported !== null;
+      accessorySlot.dispose();
+      modelSlot.dispose();
+      options.canvas.removeEventListener("webglcontextlost", contextLost);
+      scene.remove(phone.root);
+      if (!hadImported) phone.dispose();
+      texture.dispose();
+      renderer.dispose();
+      renderer.forceContextLoss();
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/renderScheduler.test.ts b/packages/client-runtime/src/device/renderScheduler.test.ts
new file mode 100644
index 000000000000..9a3e98db7e42
--- /dev/null
+++ b/packages/client-runtime/src/device/renderScheduler.test.ts
@@ -0,0 +1,27 @@
+import { expect, it, vi } from "vite-plus/test";
+import { createRenderScheduler } from "./renderScheduler.ts";
+
+it("coalesces frame and pointer invalidations, then stops scheduling when idle or disposed", () => {
+  const callbacks: FrameRequestCallback[] = [];
+  const request = vi.fn((callback: FrameRequestCallback) => {
+    callbacks.push(callback);
+    return callbacks.length;
+  });
+  const cancel = vi.fn();
+  const render = vi.fn();
+  const scheduler = createRenderScheduler(render, request, cancel);
+  scheduler.invalidate();
+  scheduler.invalidate();
+  expect(request).toHaveBeenCalledTimes(1);
+  callbacks[0]?.(0);
+  expect(render).toHaveBeenCalledTimes(1);
+  expect(request).toHaveBeenCalledTimes(1);
+  scheduler.invalidate();
+  scheduler.dispose();
+  scheduler.dispose();
+  scheduler.invalidate();
+  callbacks[1]?.(0);
+  expect(cancel).toHaveBeenCalledExactlyOnceWith(2);
+  expect(render).toHaveBeenCalledTimes(1);
+  expect(request).toHaveBeenCalledTimes(2);
+});
diff --git a/packages/client-runtime/src/device/renderScheduler.ts b/packages/client-runtime/src/device/renderScheduler.ts
new file mode 100644
index 000000000000..203b15bfc054
--- /dev/null
+++ b/packages/client-runtime/src/device/renderScheduler.ts
@@ -0,0 +1,23 @@
+/** Coalesces invalidations into one render. No work is scheduled while the view is idle. */
+export function createRenderScheduler(
+  render: () => void,
+  request: (callback: FrameRequestCallback) => number = requestAnimationFrame,
+  cancel: (id: number) => void = cancelAnimationFrame,
+) {
+  let pending: number | null = null;
+  let disposed = false;
+  return {
+    invalidate() {
+      if (disposed || pending !== null) return;
+      pending = request(() => {
+        pending = null;
+        if (!disposed) render();
+      });
+    },
+    dispose() {
+      disposed = true;
+      if (pending !== null) cancel(pending);
+      pending = null;
+    },
+  };
+}
diff --git a/packages/client-runtime/src/device/screenshot.test.ts b/packages/client-runtime/src/device/screenshot.test.ts
new file mode 100644
index 000000000000..b4530837bd36
--- /dev/null
+++ b/packages/client-runtime/src/device/screenshot.test.ts
@@ -0,0 +1,50 @@
+import { afterEach, expect, it, vi } from "vite-plus/test";
+import { captureDeviceScreenshot, DeviceScreenshotError } from "./screenshot.ts";
+
+afterEach(() => vi.unstubAllGlobals());
+const target = {
+  platform: "android" as const,
+  deviceId: "phone with spaces",
+  access: {
+    httpBase: "https://remote.example/api/device-hub/hosts/remote",
+    wsBase: "wss://remote.example",
+    query: { ticket: "capture-ticket" },
+    credentials: false,
+  },
+};
+
+it("captures native bytes from the selected remote host with its media credentials", async () => {
+  const fetch = vi.fn(
+    async () =>
+      new Response(new Uint8Array([137, 80, 78, 71]), { headers: { "Content-Type": "image/png" } }),
+  );
+  vi.stubGlobal("fetch", fetch);
+  const image = await captureDeviceScreenshot(target, new AbortController().signal);
+  expect(image.type).toBe("image/png");
+  expect(Array.from(new Uint8Array(await image.arrayBuffer()))).toEqual([137, 80, 78, 71]);
+  expect(fetch).toHaveBeenCalledWith(
+    "https://remote.example/api/device-hub/hosts/remote/vendor/serve-emu/api/screenshot?device=phone%20with%20spaces&ticket=capture-ticket",
+    expect.objectContaining({ method: "POST", credentials: "omit" }),
+  );
+});
+
+it("preserves authorization failures and cancels an in-flight capture when its owner detaches", async () => {
+  vi.stubGlobal(
+    "fetch",
+    vi.fn(async () => new Response("expired", { status: 401 })),
+  );
+  await expect(captureDeviceScreenshot(target, new AbortController().signal)).rejects.toMatchObject(
+    new DeviceScreenshotError(401),
+  );
+  vi.stubGlobal(
+    "fetch",
+    (_url: string, init: RequestInit) =>
+      new Promise((_resolve, reject) => {
+        init.signal?.addEventListener("abort", () => reject(init.signal?.reason), { once: true });
+      }),
+  );
+  const controller = new AbortController();
+  const capture = captureDeviceScreenshot(target, controller.signal);
+  controller.abort(new Error("detached"));
+  await expect(capture).rejects.toThrow("detached");
+});
diff --git a/packages/client-runtime/src/device/screenshot.ts b/packages/client-runtime/src/device/screenshot.ts
new file mode 100644
index 000000000000..547fabfaa381
--- /dev/null
+++ b/packages/client-runtime/src/device/screenshot.ts
@@ -0,0 +1,30 @@
+// @effect-diagnostics globalFetch:off - This browser transport runs without an Effect runtime, like the live stream.
+import { withDeviceHubQuery } from "./hubAccess.ts";
+import type { DeviceStreamTarget } from "./stream.ts";
+
+export class DeviceScreenshotError extends Error {
+  readonly status: number;
+
+  constructor(status: number) {
+    super(`Screenshot capture failed (${status}). Try again.`);
+    this.status = status;
+  }
+}
+
+/** Captures native pixels through the same host and credentials as the live stream, in either presentation. */
+export async function captureDeviceScreenshot(target: DeviceStreamTarget, signal: AbortSignal) {
+  const vendor = target.platform === "ios" ? "serve-sim" : "serve-emu";
+  const url = withDeviceHubQuery(
+    `${target.access.httpBase}/vendor/${vendor}/api/screenshot?device=${encodeURIComponent(target.deviceId)}`,
+    target.access,
+  );
+  const response = await fetch(url, {
+    method: "POST",
+    credentials: target.access.credentials ? "include" : "omit",
+    signal: AbortSignal.any([signal, AbortSignal.timeout(20_000)]),
+  });
+  if (!response.ok) throw new DeviceScreenshotError(response.status);
+  const image = await response.blob();
+  if (!image.size) throw new Error("The device returned an empty screenshot. Try again.");
+  return image;
+}
diff --git a/packages/client-runtime/src/device/shapeProfile.test.ts b/packages/client-runtime/src/device/shapeProfile.test.ts
new file mode 100644
index 000000000000..7f612769cccf
--- /dev/null
+++ b/packages/client-runtime/src/device/shapeProfile.test.ts
@@ -0,0 +1,27 @@
+import { expect, it } from "vite-plus/test";
+import { resolveDeviceShape } from "./shapeProfile.ts";
+
+it("chooses tablet and phone families without mistaking display rotation for device shape", () => {
+  expect(
+    resolveDeviceShape({ platform: "ios", name: "iPad Pro 11-inch (M5)", portraitAspect: 0.75 }).id,
+  ).toBe("ios-tablet");
+  expect(
+    resolveDeviceShape({ platform: "ios", name: "iPhone 18 Pro", portraitAspect: 0.46 }).id,
+  ).toBe("ios-phone");
+  expect(
+    resolveDeviceShape({ platform: "android", name: "Pixel 9", portraitAspect: 0.45 }).id,
+  ).toBe("android-phone");
+  expect(
+    resolveDeviceShape({ platform: "android", name: "Pixel Tablet", portraitAspect: 0.625 }).id,
+  ).toBe("android-tablet");
+});
+
+it("uses the screen shape for renamed devices and a phone fallback before metadata arrives", () => {
+  expect(resolveDeviceShape({ platform: "ios", name: "Julius", portraitAspect: 0.75 }).id).toBe(
+    "ios-tablet",
+  );
+  expect(resolveDeviceShape({ platform: "android", portraitAspect: 0.45 }).id).toBe(
+    "android-phone",
+  );
+  expect(resolveDeviceShape({ platform: "ios", portraitAspect: Number.NaN }).id).toBe("ios-phone");
+});
diff --git a/packages/client-runtime/src/device/shapeProfile.ts b/packages/client-runtime/src/device/shapeProfile.ts
new file mode 100644
index 000000000000..5ea04778e3ab
--- /dev/null
+++ b/packages/client-runtime/src/device/shapeProfile.ts
@@ -0,0 +1,124 @@
+import type { DevicePlatform } from "@t3tools/contracts";
+
+export interface DeviceShapeProfile {
+  readonly id: "ios-phone" | "ios-tablet" | "android-phone" | "android-tablet";
+  readonly bezel: number;
+  readonly bodyRadius: number;
+  readonly screenRadius: number;
+  readonly depth: number;
+  readonly backColor: number;
+  readonly buttons: ReadonlyArray<{
+    readonly edge: "left" | "right" | "top";
+    readonly offset: number;
+    readonly length: number;
+  }>;
+  readonly camera: {
+    readonly width: number;
+    readonly height: number;
+    readonly insetX: number;
+    readonly insetY: number;
+    readonly lensRadius: number;
+    readonly lenses: ReadonlyArray<readonly [number, number]>;
+    readonly flash: readonly [number, number] | null;
+  };
+}
+
+/** Original family silhouettes, rather than claims to reproduce individual hardware models. */
+export const IOS_PHONE_SHAPE: DeviceShapeProfile = {
+  id: "ios-phone",
+  bezel: 0.055,
+  bodyRadius: 0.15,
+  screenRadius: 0.105,
+  depth: 0.085,
+  backColor: 0x424b5d,
+  buttons: [
+    { edge: "right", offset: 0.35, length: 0.3 },
+    { edge: "left", offset: 0.48, length: 0.18 },
+    { edge: "left", offset: 0.22, length: 0.18 },
+  ],
+  camera: {
+    width: 0.39,
+    height: 0.44,
+    insetX: 0.25,
+    insetY: 0.29,
+    lensRadius: 0.068,
+    lenses: [
+      [-0.08, 0.095],
+      [0.08, -0.095],
+    ],
+    flash: [0.085, 0.11],
+  },
+};
+
+export const IOS_TABLET_SHAPE: DeviceShapeProfile = {
+  id: "ios-tablet",
+  bezel: 0.065,
+  bodyRadius: 0.105,
+  screenRadius: 0.045,
+  depth: 0.055,
+  backColor: 0x9ca5af,
+  buttons: [
+    { edge: "top", offset: 0.5, length: 0.15 },
+    { edge: "right", offset: 0.78, length: 0.13 },
+    { edge: "right", offset: 0.58, length: 0.13 },
+  ],
+  camera: {
+    width: 0.19,
+    height: 0.19,
+    insetX: 0.15,
+    insetY: 0.15,
+    lensRadius: 0.045,
+    lenses: [[0, 0]],
+    flash: null,
+  },
+};
+
+export const ANDROID_PHONE_SHAPE: DeviceShapeProfile = {
+  id: "android-phone",
+  bezel: 0.035,
+  bodyRadius: 0.115,
+  screenRadius: 0.08,
+  depth: 0.085,
+  backColor: 0x344449,
+  buttons: [
+    { edge: "right", offset: 0.2, length: 0.24 },
+    { edge: "right", offset: 0.65, length: 0.32 },
+  ],
+  camera: {
+    width: 0.24,
+    height: 0.47,
+    insetX: 0.18,
+    insetY: 0.29,
+    lensRadius: 0.056,
+    lenses: [
+      [0, 0.11],
+      [0, -0.11],
+    ],
+    flash: [0.1, 0],
+  },
+};
+
+const ANDROID_TABLET_SHAPE: DeviceShapeProfile = {
+  ...IOS_TABLET_SHAPE,
+  id: "android-tablet",
+  backColor: 0x697b80,
+};
+
+/** Names identify a family when available; wide unknown screens get a generic tablet shell. */
+export function resolveDeviceShape(options: {
+  platform: DevicePlatform;
+  name?: string;
+  portraitAspect: number;
+}): DeviceShapeProfile {
+  const name = options.name ?? "";
+  const namedTablet = /\b(ipad|tablet)\b/i.test(name);
+  const namedPhone = /\b(iphone|phone)\b/i.test(name);
+  const tablet = namedTablet || (!namedPhone && options.portraitAspect >= 0.6);
+  return options.platform === "ios"
+    ? tablet
+      ? IOS_TABLET_SHAPE
+      : IOS_PHONE_SHAPE
+    : tablet
+      ? ANDROID_TABLET_SHAPE
+      : ANDROID_PHONE_SHAPE;
+}
diff --git a/packages/client-runtime/src/device/stream.test.ts b/packages/client-runtime/src/device/stream.test.ts
index b947f5c17a74..7ea5aca27abf 100644
--- a/packages/client-runtime/src/device/stream.test.ts
+++ b/packages/client-runtime/src/device/stream.test.ts
@@ -111,6 +111,7 @@ describe("native device stream transport", () => {
     expect(imageUrl.searchParams.get("hostId")).toBe("ssh-host");
     expect(fetch).toHaveBeenCalledTimes(1);
     socket.onopen?.();
+    client.setOrientation("landscape_right");
     client.pressButton("home");
     client.sendTouch("begin", 0.25, 0.75);
     const messages = socket.send.mock.calls.slice(1).map(([bytes]) => {
@@ -121,6 +122,7 @@ describe("native device stream transport", () => {
       };
     });
     expect(messages).toEqual([
+      { tag: 0x07, body: { orientation: "landscape_right" } },
       { tag: 0x04, body: { button: "home" } },
       { tag: 0x03, body: { type: "begin", x: 0.25, y: 0.75 } },
     ]);
@@ -140,6 +142,7 @@ describe("native device stream transport", () => {
     client.sendTouch("begin", 0.2, 0.8);
     client.sendTouch("move", 0.2, 0.4);
     client.sendTouch("end", 0.2, 0.1);
+    client.setOrientation("landscape_right");
     client.pressButton("home");
     client.pressButton("appSwitcher");
     expect(
diff --git a/packages/client-runtime/src/device/stream.ts b/packages/client-runtime/src/device/stream.ts
index 9275f7be464b..6b1ff6158879 100644
--- a/packages/client-runtime/src/device/stream.ts
+++ b/packages/client-runtime/src/device/stream.ts
@@ -19,6 +19,15 @@
  * The decoder only runs while frames arrive and the viewer is attached; a
  * hidden panel calls `stop()` so an idle device costs nothing on the GPU.
  */
+import {
+  createDuoControl,
+  type DuoCommand,
+  type DuoControlState,
+  type DuoPose,
+} from "./duoControl.ts";
+import * as Schema from "effect/Schema";
+import * as Option from "effect/Option";
+import { createCanvasFrameSink, type DeviceFrameSink } from "./frame.ts";
 import { type DeviceHubAccess, withDeviceHubQuery } from "./hubAccess.ts";
 import type { DevicePlatform } from "@t3tools/contracts";
 
@@ -28,9 +37,55 @@ export interface DeviceScreenSize {
   readonly width: number;
   readonly height: number;
   readonly orientation: "portrait" | "portrait_upside_down" | "landscape_left" | "landscape_right";
+  readonly screenId?: number;
+  readonly supportsHingeAngle?: boolean;
+  readonly supportsPhysicalOrientation?: boolean;
+  readonly hingeAngle?: number;
+  readonly hingePose?: DuoPose | null;
+  readonly tableMode?: boolean;
+  readonly tableModeAvailable?: boolean;
+}
+
+const screenConfigSchema = Schema.Struct({
+  width: Schema.Finite.check(Schema.isGreaterThan(0)),
+  height: Schema.Finite.check(Schema.isGreaterThan(0)),
+  orientation: Schema.Literals([
+    "portrait",
+    "portrait_upside_down",
+    "landscape_left",
+    "landscape_right",
+  ]),
+  screenId: Schema.optionalKey(Schema.Number),
+  supportsHingeAngle: Schema.optionalKey(Schema.Boolean),
+  supportsPhysicalOrientation: Schema.optionalKey(Schema.Boolean),
+  hingeAngle: Schema.optionalKey(
+    Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 180 })),
+  ),
+  hingePose: Schema.optionalKey(
+    Schema.NullOr(Schema.Literals(["closed", "book", "open", "laptop", "tent"])),
+  ),
+  tableMode: Schema.optionalKey(Schema.Boolean),
+  tableModeAvailable: Schema.optionalKey(Schema.Boolean),
+});
+const controlReplySchema = Schema.Struct({
+  requestId: Schema.Int,
+  ok: Schema.Boolean,
+  error: Schema.optionalKey(Schema.String),
+});
+const decodeScreenConfig = Schema.decodeUnknownOption(screenConfigSchema);
+const decodeControlReply = Schema.decodeUnknownOption(controlReplySchema);
+
+export interface DuoPanelSinks {
+  readonly cover: DeviceFrameSink;
+  readonly inner: DeviceFrameSink;
+  /** Invalidate captured input synchronously, before React can commit the new layout. */
+  readonly onScreen?: (screen: DeviceScreenSize) => void;
 }
 
 export interface DeviceStreamEvents {
+  readonly onDuoControl?: (state: DuoControlState) => void;
+  /** A fixed panel cannot be decoded; the owner should return to the active flat feed. */
+  readonly onDuoUnavailable?: (detail?: string) => void;
   readonly onStatus: (status: DeviceStreamStatus, detail?: string) => void;
   readonly onScreen: (screen: DeviceScreenSize) => void;
   /** The proxy rejected the credential; the owner should refresh access and reconnect. */
@@ -51,6 +106,9 @@ export interface DeviceStreamTarget {
   readonly access: DeviceHubAccess;
   /** Native iOS WebViews can use MJPEG without cross-origin fetch or secure-context support. */
   readonly preferMjpeg?: boolean;
+  /** Internal fixed-panel feeds share their parent's input session. */
+  readonly panelId?: 1 | 3;
+  readonly videoOnly?: boolean;
 }
 
 export type DeviceHardwareButton = "home" | "back" | "recents" | "power" | "appSwitcher";
@@ -217,6 +275,12 @@ export interface DeviceStreamClient {
   readonly sendKey: (event: KeyboardEvent, phase: "down" | "up") => void;
   readonly pressButton: (button: DeviceHardwareButton) => void;
   readonly rotate: () => void;
+  readonly setOrientation: (orientation: DeviceScreenSize["orientation"]) => void;
+  readonly controlDuo: (command: DuoCommand) => void;
+  /** Switch between one active feed and two fixed-panel feeds without replacing HID. */
+  readonly setDuoPanels: (panels: DuoPanelSinks | null) => void;
+  /** Model UVs already map to the hardware framebuffer. */
+  readonly sendRawTouch: (phase: "begin" | "move" | "end", x: number, y: number) => void;
 }
 
 const HID_USAGE_BY_CODE: Readonly<Record<string, number>> = {
@@ -282,10 +346,11 @@ const IOS_ORIENTATIONS: ReadonlyArray<DeviceScreenSize["orientation"]> = [
 
 export function createDeviceStreamClient(
   target: DeviceStreamTarget,
-  canvas: HTMLCanvasElement,
+  output: HTMLCanvasElement | DeviceFrameSink,
   events: DeviceStreamEvents,
 ): DeviceStreamClient {
   const { access, platform, deviceId } = target;
+  const sink = "present" in output ? output : createCanvasFrameSink(output);
   const vendor = platform === "ios" ? "/vendor/serve-sim" : "/vendor/serve-emu";
   const device = encodeURIComponent(deviceId);
   const httpUrl = (path: string) =>
@@ -311,6 +376,37 @@ export function createDeviceStreamClient(
   let videoReadTimer: ReturnType<typeof setTimeout> | null = null;
   let mjpegImage: HTMLImageElement | null = null;
   let releaseImage: (() => void) | null = null;
+  let videoGeneration = 0;
+  let panelClients: DeviceStreamClient[] = [];
+  let panelSinks: DuoPanelSinks | null = null;
+  let rotationCursor: DeviceScreenSize["orientation"] | null = null;
+  let pendingOrientation: { requestId: number } | null = null;
+  const duoControl = createDuoControl({
+    send(request) {
+      if (socket?.readyState !== WebSocket.OPEN || !screen?.supportsHingeAngle) return false;
+      if (request.command.control === "physical" && !screen.supportsPhysicalOrientation)
+        return false;
+      try {
+        pendingOrientation = null;
+        if (request.command.control === "orientation") {
+          const value = request.command.value;
+          pendingOrientation = { requestId: request.requestId };
+          rotationCursor = value;
+          // Upstream serializes orientation with hinge commands, then broadcasts config.
+          // An orientation-locked app can keep its framebuffer orientation after the sensor rotates.
+          socket.send(taggedJson(IOS_MSG_ORIENTATION, { orientation: value }));
+        } else socket.send(taggedJson(0x10, request));
+        return true;
+      } catch {
+        return false;
+      }
+    },
+    onChange(state) {
+      if (!state.pending) pendingOrientation = null;
+      events.onDuoControl?.(state);
+    },
+  });
+  const videoPath = `/helper/${device}${target.panelId ? `/panel/${target.panelId}` : ""}/stream.avcc`;
 
   const mjpegUrl = () => httpUrl(`/helper/${device}/stream.mjpeg`);
 
@@ -402,17 +498,14 @@ export function createDeviceStreamClient(
 
   const paint = (source: CanvasImageSource, width: number, height: number) => {
     if (stopped) return;
-    if (canvas.width !== width || canvas.height !== height) {
-      canvas.width = width;
-      canvas.height = height;
-      if (platform === "android") {
-        screen = { width, height, orientation: width > height ? "landscape_left" : "portrait" };
-        events.onScreen(screen);
-      }
+    if (platform === "android" && (screen?.width !== width || screen.height !== height)) {
+      screen = { width, height, orientation: width > height ? "landscape_left" : "portrait" };
+      events.onScreen(screen);
+    }
+    if (!sink.present(source, width, height)) {
+      fail("Could not display the device stream. Reconnect to try again.");
+      return;
     }
-    const context = canvas.getContext("2d");
-    if (!context) return fail("Could not display the device stream. Reconnect to try again.");
-    context.drawImage(source, 0, 0, width, height);
     frameReceived();
   };
 
@@ -437,16 +530,26 @@ export function createDeviceStreamClient(
   };
 
   const makeDecoder = () => {
+    const feedGeneration = videoGeneration;
     const decoder = new VideoDecoder({
       output: (frame) => {
         try {
-          if (videoDecoder === decoder) paint(frame, frame.displayWidth, frame.displayHeight);
+          if (
+            videoDecoder === decoder &&
+            (platform !== "ios" || feedGeneration === videoGeneration)
+          )
+            paint(frame, frame.displayWidth, frame.displayHeight);
         } finally {
           frame.close();
         }
       },
       error: () => {
-        if (stopped || videoDecoder !== decoder) return;
+        if (
+          stopped ||
+          videoDecoder !== decoder ||
+          (platform === "ios" && feedGeneration !== videoGeneration)
+        )
+          return;
         recoverDecoder();
       },
     });
@@ -456,7 +559,7 @@ export function createDeviceStreamClient(
   /** iOS can fall back to MJPEG when the stream's H.264 profile is unsupported. */
   const configureDecoder = async (
     config: VideoDecoderConfig,
-    isCurrent: () => boolean,
+    isCurrent = () => !stopped,
   ): Promise<boolean> => {
     const epoch = decoderEpoch;
     const full: VideoDecoderConfig = { ...config, optimizeForLatency: true };
@@ -525,19 +628,32 @@ export function createDeviceStreamClient(
 
   // iOS video: fetch the AVCC body and demux into the decoder.
   const readIosVideo = async () => {
+    const lifecycle = generation;
+    const feedGeneration = ++videoGeneration;
     const demuxer = new AvccDemuxer();
-    const session = generation;
     const videoController = new AbortController();
     controller = videoController;
-    const isCurrent = () => !stopped && generation === session && controller === videoController;
+    const isCurrent = () =>
+      !stopped &&
+      generation === lifecycle &&
+      videoGeneration === feedGeneration &&
+      controller === videoController;
     let retryDetail: string | undefined;
     try {
-      const response = await fetch(httpUrl(`/helper/${device}/stream.avcc`), {
+      const response = await fetch(httpUrl(videoPath), {
         signal: videoController.signal,
         credentials: access.credentials ? "include" : "same-origin",
       });
-      if (!isCurrent()) return;
+      if (!isCurrent()) {
+        await response.body?.cancel();
+        return;
+      }
       if (response.status === 401 || response.status === 403) return handleUnauthorized();
+      if (target.panelId && [400, 404, 405, 410].includes(response.status)) {
+        await response.body?.cancel();
+        setStatus("error", "This Device Hub does not provide fixed Duo display feeds.");
+        return;
+      }
       if (!response.ok || !response.body) throw new Error(`stream ${response.status}`);
       const reader = response.body.getReader();
       for (;;) {
@@ -579,7 +695,12 @@ export function createDeviceStreamClient(
               if (!configured) {
                 await reader.cancel().catch(() => {});
                 if (!isCurrent()) return;
-                fallBackToMjpeg();
+                if (target.videoOnly)
+                  setStatus(
+                    "error",
+                    `This browser cannot decode the Duo panel's ${avcCodecString(chunk.payload)} stream.`,
+                  );
+                else fallBackToMjpeg();
                 return;
               }
               break;
@@ -630,6 +751,42 @@ export function createDeviceStreamClient(
     }
   };
 
+  const startDuoVideo = (panels: DuoPanelSinks) => {
+    for (const panel of panelClients) panel.stop();
+    // Physical handoff elects a native surface. Fixed-panel encoders can keep
+    // an inactive shutdown frame after election, so this build uses one active
+    // feed instead of decoding a third stream alongside the two fixed feeds.
+    const ids = screen?.supportsPhysicalOrientation ? ([null] as const) : ([1, 3] as const);
+    panelClients = ids.map((id) => {
+      const output = id === 1 ? panels.cover : panels.inner;
+      return createDeviceStreamClient(
+        { ...target, ...(id === null ? {} : { panelId: id }), videoOnly: true },
+        {
+          present(source, width, height) {
+            if (id === null) {
+              return sink.present(source, width, height);
+            }
+            // An inactive native LCD can emit its shutdown black frame. Retain its last useful image.
+            if (screen?.screenId !== id) return true;
+            const retained = output.present(source, width, height);
+            const primary = sink.present(source, width, height);
+            return retained && primary;
+          },
+        },
+        {
+          onStatus: (status, detail) => {
+            if (status === "error") events.onDuoUnavailable?.(detail);
+          },
+          onScreen: () => {},
+          onInputConnected: () => {},
+          onMjpegFallback: () => {},
+          onUnauthorized: handleUnauthorized,
+        },
+      );
+    });
+    for (const panel of panelClients) panel.start();
+  };
+
   // iOS input socket; also carries the screen config the helper pushes.
   const connectIosInput = async () => {
     if (stopped) return;
@@ -648,12 +805,42 @@ export function createDeviceStreamClient(
       if (stopped || socket !== ws) return;
       if (!(event.data instanceof ArrayBuffer)) return;
       const bytes = new Uint8Array(event.data);
-      if (bytes.length < 1 || bytes[0] !== IOS_TAG_SCREEN_CONFIG) return;
+      if (socket !== ws || stopped || bytes.length < 1) return;
       try {
-        const config = JSON.parse(decoder.decode(bytes.subarray(1))) as DeviceScreenSize;
-        if (config.width > 0 && config.height > 0) {
-          screen = config;
-          events.onScreen(config);
+        const payload: unknown = JSON.parse(decoder.decode(bytes.subarray(1)));
+        if (bytes[0] === 0x90) {
+          const reply = decodeControlReply(payload);
+          if (Option.isSome(reply)) duoControl.receive(reply.value);
+        } else if (bytes[0] === IOS_TAG_SCREEN_CONFIG) {
+          const config = decodeScreenConfig(payload);
+          if (Option.isSome(config)) {
+            const previous = screen;
+            screen = config.value;
+            if (screen.hingePose && screen.hingePose !== previous?.hingePose)
+              rotationCursor = screen.hingePose === "laptop" ? "landscape_left" : "portrait";
+            else if (screen.orientation !== previous?.orientation)
+              rotationCursor = screen.orientation;
+            panelSinks?.onScreen?.(screen);
+            events.onScreen(screen);
+            // A surface election can leave an existing decoder on the former
+            // encoder description. Reopen only video to acquire the elected
+            // surface's seed and codec configuration; HID and the viewer stay.
+            if (
+              panelSinks &&
+              screen.supportsPhysicalOrientation &&
+              previous &&
+              screen.screenId !== previous.screenId
+            )
+              startDuoVideo(panelSinks);
+            if (pendingOrientation) {
+              const receipt = pendingOrientation;
+              pendingOrientation = null;
+              duoControl.receive({
+                requestId: receipt.requestId,
+                ok: true,
+              });
+            }
+          }
         }
       } catch {
         // Ignore malformed config frames.
@@ -662,6 +849,8 @@ export function createDeviceStreamClient(
     ws.onclose = (event) => {
       if (socket !== ws) return;
       socket = null;
+      duoControl.clear();
+      rotationCursor = null;
       if (stopped) return;
       events.onInputConnected(
         false,
@@ -757,7 +946,7 @@ export function createDeviceStreamClient(
     configuring = false;
     connecting();
     if (platform === "ios") {
-      void connectIosInput();
+      if (!target.videoOnly) void connectIosInput();
       if (useWebCodecs) void readIosVideo();
       else fallBackToMjpeg();
     } else if (useWebCodecs) {
@@ -771,6 +960,12 @@ export function createDeviceStreamClient(
     if (stopped) return;
     stopped = true;
     generation++;
+    videoGeneration++;
+    duoControl.clear();
+    rotationCursor = null;
+    for (const panel of panelClients) panel.stop();
+    panelClients = [];
+    panelSinks = null;
     mjpeg = false;
     clearFrameTimer();
     if (videoReadTimer !== null) clearTimeout(videoReadTimer);
@@ -814,6 +1009,29 @@ export function createDeviceStreamClient(
     start,
     stop,
     setMjpegImage,
+    controlDuo: duoControl.enqueue,
+    sendRawTouch: (phase, x, y) => {
+      if (platform === "ios") send(taggedJson(IOS_MSG_TOUCH, { type: phase, x, y }));
+    },
+    setDuoPanels(panels) {
+      if (platform !== "ios" || target.videoOnly || stopped || panelSinks === panels) return;
+      if (panels && !screen?.supportsHingeAngle) return;
+      panelSinks = panels;
+      videoGeneration++;
+      controller?.abort();
+      controller = null;
+      closeDecoder();
+      const retry = retryTimers.get("video");
+      if (retry) clearTimeout(retry);
+      retryTimers.delete("video");
+      for (const panel of panelClients) panel.stop();
+      panelClients = [];
+      if (!panels) {
+        if (useWebCodecs) void readIosVideo();
+        return;
+      }
+      startDuoVideo(panels);
+    },
     sendTouch: (phase, x, y) => {
       if (platform === "ios") {
         send(taggedJson(IOS_MSG_TOUCH, { type: phase, ...rawPoint(x, y) }));
@@ -856,10 +1074,18 @@ export function createDeviceStreamClient(
     },
     rotate: () => {
       if (platform !== "ios") return;
-      const current = screen?.orientation ?? "portrait";
+      const current = screen?.supportsHingeAngle
+        ? (rotationCursor ?? screen.orientation)
+        : (screen?.orientation ?? "portrait");
       const next =
         IOS_ORIENTATIONS[(IOS_ORIENTATIONS.indexOf(current) + 1) % IOS_ORIENTATIONS.length]!;
-      send(taggedJson(IOS_MSG_ORIENTATION, { orientation: next }));
+      if (screen?.supportsHingeAngle) {
+        rotationCursor = next;
+        duoControl.enqueue({ control: "orientation", value: next });
+      } else send(taggedJson(IOS_MSG_ORIENTATION, { orientation: next }));
+    },
+    setOrientation: (orientation) => {
+      if (platform === "ios") send(taggedJson(IOS_MSG_ORIENTATION, { orientation }));
     },
   };
 }
diff --git a/packages/client-runtime/src/device/streamFrames.test.ts b/packages/client-runtime/src/device/streamFrames.test.ts
new file mode 100644
index 000000000000..8021fe72647a
--- /dev/null
+++ b/packages/client-runtime/src/device/streamFrames.test.ts
@@ -0,0 +1,97 @@
+import { afterEach, expect, it, vi } from "vite-plus/test";
+import { createDeviceStreamClient } from "./stream.ts";
+
+afterEach(() => vi.unstubAllGlobals());
+
+it("delivers borrowed decoded frames, reports presentation failure, and discards late output", async () => {
+  let decoderOutput: VideoFrameOutputCallback | undefined;
+  let resolveOutput!: () => void;
+  const outputReady = new Promise<void>((resolve) => {
+    resolveOutput = resolve;
+  });
+  class Decoder {
+    static isConfigSupported = async () => ({ supported: true });
+    state = "unconfigured";
+    constructor(options: VideoDecoderInit) {
+      decoderOutput = options.output;
+      resolveOutput();
+    }
+    configure() {
+      this.state = "configured";
+    }
+    close() {
+      this.state = "closed";
+    }
+  }
+  vi.stubGlobal("VideoDecoder", Decoder);
+  vi.stubGlobal("EncodedVideoChunk", vi.fn());
+  vi.stubGlobal(
+    "WebSocket",
+    class {
+      close() {}
+    },
+  );
+  const envelope = new Uint8Array([0, 0, 0, 5, 1, 1, 0x64, 0, 0x1f]);
+  vi.stubGlobal(
+    "fetch",
+    vi.fn(
+      async (url: string) =>
+        new Response(
+          url.includes("avcc")
+            ? new ReadableStream({
+                start(controller) {
+                  controller.enqueue(envelope);
+                },
+              })
+            : "seed",
+        ),
+    ),
+  );
+  const present = vi.fn(() => true);
+  const events = {
+    onStatus: vi.fn(),
+    onScreen: vi.fn(),
+    onUnauthorized: vi.fn(),
+    onMjpegFallback: vi.fn(),
+    onInputConnected: vi.fn(),
+  };
+  const client = createDeviceStreamClient(
+    {
+      platform: "ios",
+      deviceId: "phone",
+      access: {
+        httpBase: "https://test",
+        wsBase: "wss://test",
+        credentials: false,
+        query: {},
+      },
+    },
+    { present },
+    events,
+  );
+  client.start();
+  await outputReady;
+  const frame = {
+    displayWidth: 1170,
+    displayHeight: 2532,
+    close: vi.fn(),
+  } as unknown as VideoFrame;
+  decoderOutput?.(frame);
+  expect(present).toHaveBeenCalledExactlyOnceWith(frame, 1170, 2532);
+  expect(frame.close).toHaveBeenCalledOnce();
+  present.mockImplementationOnce(() => {
+    throw new Error("renderer failed");
+  });
+  expect(() => decoderOutput?.(frame)).toThrow("renderer failed");
+  expect(frame.close).toHaveBeenCalledTimes(2);
+  present.mockReturnValueOnce(false);
+  decoderOutput?.(frame);
+  expect(events.onStatus).toHaveBeenLastCalledWith(
+    "error",
+    "Could not display the device stream. Reconnect to try again.",
+  );
+  expect(frame.close).toHaveBeenCalledTimes(3);
+  decoderOutput?.(frame);
+  expect(present).toHaveBeenCalledTimes(3);
+  expect(frame.close).toHaveBeenCalledTimes(4);
+});
diff --git a/packages/client-runtime/src/markdownLinks.test.ts b/packages/client-runtime/src/markdownLinks.test.ts
index 4aea947b87d6..deea6960478e 100644
--- a/packages/client-runtime/src/markdownLinks.test.ts
+++ b/packages/client-runtime/src/markdownLinks.test.ts
@@ -22,6 +22,15 @@ describe("inlineCodeFilePathCandidate", () => {
     ["127.0.0.1:3000", null],
     ["example.com/index.html", null],
     ["example.pl/index.html", null],
+    ["z-ai/glm-5.3", null],
+    ["z-ai/glm-5.3:12", null],
+    ["python/3.12", null],
+    ["Qwen/Qwen2.5-Coder", null],
+    ["meta-llama/Llama-3.1-8B", null],
+    ["share/man/ls.1", "share/man/ls.1"],
+    ["usr/lib/libfoo.so.1", "usr/lib/libfoo.so.1"],
+    ["vendor/jquery-3.6.0.min.js", "vendor/jquery-3.6.0.min.js"],
+    ["./models/glm-5.3", "./models/glm-5.3"],
   ])("distinguishes file paths from code and hostnames in %s", (source, candidate) => {
     expect(inlineCodeFilePathCandidate(source)).toBe(candidate);
   });
@@ -146,6 +155,11 @@ describe("fileBasename", () => {
 
 describe("workspaceRelativeFilePath", () => {
   it.each([
+    ["/repo/project", "/repo/project", "."],
+    ["/repo/project/", "/repo/project/", "."],
+    ["/", "/", "."],
+    ["C:/USERS/mike/project", "c:/users/MIKE/project", "."],
+    ["C:/", "c:/", "."],
     ["/repo/project/src/main.ts", "/repo/project", "src/main.ts"],
     ["/repo/project/src/main.ts", "/repo/project/", "src/main.ts"],
     ["C:\\Users\\mike\\t3code\\apps\\web\\a.ts", "C:/Users/mike/t3code", "apps/web/a.ts"],
diff --git a/packages/client-runtime/src/markdownLinks.ts b/packages/client-runtime/src/markdownLinks.ts
index 29a337e49c42..0a32f5061083 100644
--- a/packages/client-runtime/src/markdownLinks.ts
+++ b/packages/client-runtime/src/markdownLinks.ts
@@ -14,6 +14,9 @@ const POSITION_ONLY_PATTERN = /^\d+(?::\d+)?$/;
 const INLINE_CODE_DISQUALIFIER_PATTERN = /[\s`]/;
 const PATH_SEPARATOR_PATTERN = /[\\/]/;
 const FILE_EXTENSION_PATTERN = /\.[A-Za-z0-9_-]+$/;
+// A final dot between digits marks a version or model id (`glm-5.3`,
+// `Qwen2.5-Coder`), not an extension. `ls.1` and `libfoo.so.1` stay files.
+const VERSION_SUFFIX_PATTERN = /\d\.\d[^.]*$/;
 const NUMERIC_DOTTED_PATTERN = /^\d+(?:\.\d+)+$/;
 // Standard OS and dev-container roots; deliberately excludes app-route-ish
 // prefixes like /app/ or /chat/ so SPA routes never read as files.
@@ -176,6 +179,7 @@ export function inlineCodeFilePathCandidate(codeText: string): string | null {
         .replace(/[/\\]+$/, "")
         .split(/[\\/]/)
         .at(-1) ?? "";
+    if (VERSION_SUFFIX_PATTERN.test(basename)) return null;
     if (!hasPosition && !FILE_EXTENSION_PATTERN.test(basename)) return null;
   }
   return candidate;
@@ -336,6 +340,7 @@ export function workspaceRelativeFilePath(
   const caseInsensitive = isWindowsAbsolutePath(stripSlashPrefixedWindowsDrive(workspaceRoot));
   const pathForCompare = caseInsensitive ? normalizedPath.toLowerCase() : normalizedPath;
   const rootForCompare = caseInsensitive ? normalizedRoot.toLowerCase() : normalizedRoot;
+  if (pathForCompare.replace(/\/+$/, "") === rootForCompare) return ".";
   if (!pathForCompare.startsWith(`${rootForCompare}/`)) return null;
   return normalizedPath.slice(normalizedRoot.length + 1);
 }
diff --git a/packages/client-runtime/src/operations/commands.ts b/packages/client-runtime/src/operations/commands.ts
index 8f313c1632ff..a08adba22949 100644
--- a/packages/client-runtime/src/operations/commands.ts
+++ b/packages/client-runtime/src/operations/commands.ts
@@ -42,6 +42,7 @@ export type UnsnoozeThreadInput = CommandInput<"thread.unsnooze">;
 export type PinThreadInput = CommandInput<"thread.pin">;
 export type UnpinThreadInput = CommandInput<"thread.unpin">;
 export type ReorderPinnedThreadInput = CommandInput<"thread.pin.reorder">;
+export type SetThreadAutoSettleInput = CommandInput<"thread.auto-settle.set">;
 export type ReorderActiveThreadInput = CommandInput<"thread.active.reorder">;
 export type UpdateThreadMetadataInput = CommandInput<"thread.meta.update">;
 export type LinkThreadPullRequestInput = CommandInput<"thread.pull-request.link">;
@@ -226,6 +227,16 @@ export const unpinThread: (input: UnpinThreadInput) => CommandEffect = Effect.fn
   });
 });
 
+export const setThreadAutoSettle: (input: SetThreadAutoSettleInput) => CommandEffect = Effect.fn(
+  "EnvironmentCommands.setThreadAutoSettle",
+)(function* (input) {
+  return yield* dispatch({
+    ...input,
+    type: "thread.auto-settle.set",
+    commandId: yield* commandId(input),
+  });
+});
+
 export const reorderPinnedThread: (input: ReorderPinnedThreadInput) => CommandEffect = Effect.fn(
   "EnvironmentCommands.reorderPinnedThread",
 )(function* (input) {
diff --git a/packages/client-runtime/src/platform/persistence.test.ts b/packages/client-runtime/src/platform/persistence.test.ts
new file mode 100644
index 000000000000..3e856e847976
--- /dev/null
+++ b/packages/client-runtime/src/platform/persistence.test.ts
@@ -0,0 +1,55 @@
+import {
+  OrchestrationProjectShell,
+  OrchestrationShellSnapshot,
+  OrchestrationThreadShell,
+} from "@t3tools/contracts";
+import { describe, expect, it } from "@effect/vitest";
+import * as Arr from "effect/Array";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as Arbitrary from "effect/unstable/arbitrary/Arbitrary";
+
+import { encodeShellSnapshotForCache } from "./persistence.ts";
+
+// Generated values can hold untrimmed strings, which a decoded value never
+// has. One encode and decode gives a value a client can hold; values that
+// fail are dropped. Size 30 makes the generator fill optional fields.
+const sampleDecoded = <S extends Schema.Constraint>(schema: S) =>
+  Effect.gen(function* () {
+    const encode = Schema.encodeEffect(schema);
+    const decode = Schema.decodeEffect(schema);
+    const generated = yield* Arbitrary.sampleEffect(Arbitrary.schema(schema), {
+      count: 1000,
+      size: 30,
+    });
+    const decoded = yield* Effect.forEach(generated, (value) =>
+      encode(value).pipe(Effect.flatMap(decode), Effect.option),
+    );
+    return Arr.getSomes(decoded);
+  });
+const encodeSnapshot = Schema.encodeEffect(OrchestrationShellSnapshot);
+
+describe("encodeShellSnapshotForCache", () => {
+  it.effect("matches the Schema encoding of a generated snapshot", () =>
+    Effect.gen(function* () {
+      const threads = yield* sampleDecoded(OrchestrationThreadShell);
+      const projects = yield* sampleDecoded(OrchestrationProjectShell);
+      const snapshot: OrchestrationShellSnapshot = {
+        snapshotSequence: 1,
+        // The generator rarely makes monogram icons, and they are the one
+        // project field whose encoding differs from the decoded value.
+        projects: projects.map((project, index) =>
+          index % 2 === 0
+            ? { ...project, projectIcon: { kind: "monogram", text: "T3", color: "blue" } }
+            : project,
+        ),
+        threads,
+        updatedAt: "2026-09-25T00:00:00.000Z",
+      };
+
+      expect(threads.length).toBeGreaterThan(0);
+      expect(projects.length).toBeGreaterThan(0);
+      expect(yield* encodeShellSnapshotForCache(snapshot)).toEqual(yield* encodeSnapshot(snapshot));
+    }),
+  );
+});
diff --git a/packages/client-runtime/src/platform/persistence.ts b/packages/client-runtime/src/platform/persistence.ts
index 99469081dc10..b2bc18222250 100644
--- a/packages/client-runtime/src/platform/persistence.ts
+++ b/packages/client-runtime/src/platform/persistence.ts
@@ -1,5 +1,6 @@
 import {
   type EnvironmentId,
+  OrchestrationProjectShell,
   type OrchestrationShellSnapshot,
   type OrchestrationThreadDetailSnapshot,
   type ServerConfig,
@@ -130,6 +131,21 @@ export class EnvironmentCacheStore extends Context.Service<
   }
 >()("@t3tools/client-runtime/platform/persistence/EnvironmentCacheStore") {}
 
+const encodeProjectShells = Schema.encodeEffect(Schema.Array(OrchestrationProjectShell));
+
+/**
+ * Encodes a shell snapshot for `EnvironmentCacheStore.saveShell`. The result
+ * equals `Schema.encode(OrchestrationShellSnapshot)`, so the cache format does
+ * not change. Walking thousands of threads through Schema blocks the UI
+ * thread, and a decoded thread shell is already in its encoded form, so only
+ * the projects go through Schema: their icon has a real encode transform.
+ */
+export const encodeShellSnapshotForCache = (snapshot: OrchestrationShellSnapshot) =>
+  Effect.map(
+    encodeProjectShells(snapshot.projects),
+    (projects) => ({ ...snapshot, projects }) satisfies typeof OrchestrationShellSnapshot.Encoded,
+  );
+
 export class EnvironmentOwnedDataCleanup extends Context.Reference<{
   readonly clear: (environmentId: EnvironmentId) => Effect.Effect<void>;
 }>("@t3tools/client-runtime/platform/persistence/EnvironmentOwnedDataCleanup", {
diff --git a/packages/client-runtime/src/platform/storageDocument.test.ts b/packages/client-runtime/src/platform/storageDocument.test.ts
index a0c7de3d093b..811ad170b6dd 100644
--- a/packages/client-runtime/src/platform/storageDocument.test.ts
+++ b/packages/client-runtime/src/platform/storageDocument.test.ts
@@ -207,7 +207,7 @@ describe("ConnectionCatalogDocument", () => {
       remoteDpopTokens: [token],
     };
     const schema = Schema.fromJsonString(ConnectionCatalogDocument);
-    const restored = Schema.decodeUnknownSync(schema)(Schema.encodeSync(schema)(document));
+    const restored = Schema.decodeSync(schema)(Schema.encodeSync(schema)(document));
 
     expect(restored).toEqual(document);
     expect(restored.remoteDpopTokens[0]?.accountId).toBe(accountId);
diff --git a/packages/client-runtime/src/relay/discovery.test.ts b/packages/client-runtime/src/relay/discovery.test.ts
index fdbcceb7df86..8251b2dc36d9 100644
--- a/packages/client-runtime/src/relay/discovery.test.ts
+++ b/packages/client-runtime/src/relay/discovery.test.ts
@@ -134,15 +134,13 @@ const makeHarness = Effect.fn("RelayDiscoveryTest.makeHarness")(function* () {
               ),
             ),
             clerkToken: Ref.get(clerkToken).pipe(
-              Effect.flatMap((token) =>
-                token === null
-                  ? Effect.fail(
-                      new ConnectionBlockedError({
-                        reason: "authentication",
-                        detail: "Signed out.",
-                      }),
-                    )
-                  : Effect.succeed(token),
+              Effect.filterOrFail(
+                (token) => token !== null,
+                () =>
+                  new ConnectionBlockedError({
+                    reason: "authentication",
+                    detail: "Signed out.",
+                  }),
               ),
             ),
           }),
@@ -289,7 +287,7 @@ describe("RelayEnvironmentDiscovery", () => {
           Layer.mergeAll(
             Layer.succeed(ManagedRelay.ManagedRelayClient, client),
             Layer.succeed(ClientCapabilities.CloudSession, {
-              identity: Effect.succeed(Option.some({ accountId: "account-1" })),
+              identity: Effect.succeedSome({ accountId: "account-1" }),
               clerkToken: Effect.succeed("clerk-token"),
             }),
             Layer.succeed(Connectivity.Connectivity, {
diff --git a/packages/client-runtime/src/relay/discovery.ts b/packages/client-runtime/src/relay/discovery.ts
index 8a8eae1d6cd9..8aee35347e2b 100644
--- a/packages/client-runtime/src/relay/discovery.ts
+++ b/packages/client-runtime/src/relay/discovery.ts
@@ -241,7 +241,7 @@ export const make = Effect.fn("RelayEnvironmentDiscovery.make")(function* () {
           }));
           return;
         }
-        return yield* Effect.fail(failure);
+        return yield* failure;
       }
       const clerkToken = tokenResult.success;
       if ((yield* Ref.get(accountGeneration)) !== generation) {
diff --git a/packages/client-runtime/src/relay/managedRelay.ts b/packages/client-runtime/src/relay/managedRelay.ts
index eadece417681..9c414ad9e605 100644
--- a/packages/client-runtime/src/relay/managedRelay.ts
+++ b/packages/client-runtime/src/relay/managedRelay.ts
@@ -666,11 +666,8 @@ export const make = Effect.fn("ManagedRelayClient.make")(function* (
       authorize(input).pipe(
         Effect.flatMap((authorization) =>
           request(authorization).pipe(
-            Effect.catch((error) => {
-              if (!isRejectedDpopAccessToken(error)) {
-                return Effect.fail(error);
-              }
-              return invalidateAccessToken(authorization.accessToken).pipe(
+            Effect.catchIf(isRejectedDpopAccessToken, (error) =>
+              invalidateAccessToken(authorization.accessToken).pipe(
                 Effect.tap((invalidated) =>
                   Effect.annotateCurrentSpan({
                     "relay.token_cache.invalidated": invalidated,
@@ -686,8 +683,8 @@ export const make = Effect.fn("ManagedRelayClient.make")(function* (
                     : Effect.void,
                 ),
                 Effect.andThen(refreshRejectedToken ? attempt(false) : Effect.fail(error)),
-              );
-            }),
+              ),
+            ),
           ),
         ),
       );
diff --git a/packages/client-runtime/src/relay/managedRelayState.ts b/packages/client-runtime/src/relay/managedRelayState.ts
index cb6d5983d394..cd092689cdd4 100644
--- a/packages/client-runtime/src/relay/managedRelayState.ts
+++ b/packages/client-runtime/src/relay/managedRelayState.ts
@@ -180,14 +180,12 @@ function readSessionClerkToken(
   session: ManagedRelaySession,
 ): Effect.Effect<string, ManagedRelaySessionError> {
   return session.readClerkToken().pipe(
-    Effect.flatMap((token) =>
-      token
-        ? Effect.succeed(token)
-        : Effect.fail(
-            new ManagedRelaySessionError({
-              message: "The T3 Connect session token is unavailable.",
-            }),
-          ),
+    Effect.filterOrFail(
+      (token): token is string => Boolean(token),
+      () =>
+        new ManagedRelaySessionError({
+          message: "The T3 Connect session token is unavailable.",
+        }),
     ),
   );
 }
diff --git a/packages/client-runtime/src/rpc/client.ts b/packages/client-runtime/src/rpc/client.ts
index 9f782296ec0e..1050a2375a9b 100644
--- a/packages/client-runtime/src/rpc/client.ts
+++ b/packages/client-runtime/src/rpc/client.ts
@@ -42,6 +42,7 @@ export type EnvironmentRpcTag = keyof WsRpcProtocolClient & string;
 type RpcMethod<TTag extends EnvironmentRpcTag> = WsRpcProtocolClient[TTag];
 
 export type EnvironmentSubscriptionRpcTag =
+  | typeof WS_METHODS.codexAuthCallbackSubscribe
   | typeof WS_METHODS.providerAuthSubscribe
   | typeof WS_METHODS.providerInstallSubscribe
   | typeof ORCHESTRATION_WS_METHODS.subscribeShell
@@ -63,6 +64,7 @@ export type EnvironmentSubscriptionRpcTag =
   | typeof WS_METHODS.terminalAttach;
 
 export type EnvironmentStreamCommandRpcTag =
+  | typeof WS_METHODS.chatGptHandoffSubscribe
   | typeof WS_METHODS.cloudInstallRelayClient
   | typeof WS_METHODS.serverUpdateServerWithProgress
   | typeof WS_METHODS.gitRunStackedAction;
diff --git a/packages/client-runtime/src/rpc/session.test.ts b/packages/client-runtime/src/rpc/session.test.ts
index 65ecb77c6e2c..011c3e2a73c2 100644
--- a/packages/client-runtime/src/rpc/session.test.ts
+++ b/packages/client-runtime/src/rpc/session.test.ts
@@ -161,7 +161,7 @@ const RpcRequest = Schema.TaggedStruct("Request", {
 });
 const decodeJson = Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown));
 const isRpcRequest = Schema.is(RpcRequest);
-const isPing = Schema.is(Schema.Struct({ _tag: Schema.Literal("Ping") }));
+const isPing = Schema.is(Schema.TaggedStruct("Ping", {}));
 const encodeJson = Schema.encodeUnknownSync(Schema.fromJsonString(Schema.Unknown));
 const encodeServerConfig = Schema.encodeSync(ServerConfig);
 const encodeServerConfigStreamEvent = Schema.encodeSync(ServerConfigStreamEvent);
@@ -976,14 +976,14 @@ describe("RpcSessionFactory", () => {
             retryNow: Effect.void,
           } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
           const cache = Persistence.EnvironmentCacheStore.of({
-            loadShell: () => Effect.succeed(Option.none()),
+            loadShell: () => Effect.succeedNone,
             saveShell: () => Effect.void,
-            loadThread: () => Effect.succeed(Option.none()),
+            loadThread: () => Effect.succeedNone,
             saveThread: () => Effect.void,
             removeThread: () => Effect.void,
-            loadServerConfig: () => Effect.succeed(Option.none()),
+            loadServerConfig: () => Effect.succeedNone,
             saveServerConfig: () => Effect.void,
-            loadVcsRefs: () => Effect.succeed(Option.none()),
+            loadVcsRefs: () => Effect.succeedNone,
             saveVcsRefs: () => Effect.void,
             removeVcsRefs: () => Effect.void,
             clearVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/rpc/session.ts b/packages/client-runtime/src/rpc/session.ts
index 544be5be1116..be482a1401b0 100644
--- a/packages/client-runtime/src/rpc/session.ts
+++ b/packages/client-runtime/src/rpc/session.ts
@@ -322,13 +322,13 @@ export const make = Effect.fn("RpcSessionFactory.make")(function* (
         Effect.flatMap(() => Effect.fail(configSubscriptionEndedError)),
       ),
     ).pipe(
-      Effect.flatMap((config) =>
-        config.environment.environmentId === connection.environmentId
-          ? Effect.succeed(config)
-          : environmentMismatchError({
-              expected: connection.environmentId,
-              actual: config.environment.environmentId,
-            }),
+      Effect.filterOrElse(
+        (config) => config.environment.environmentId === connection.environmentId,
+        (config) =>
+          environmentMismatchError({
+            expected: connection.environmentId,
+            actual: config.environment.environmentId,
+          }),
       ),
       Effect.withSpan("environment.initialSync"),
     );
diff --git a/packages/client-runtime/src/state/pullRequestRouting.ts b/packages/client-runtime/src/state/pullRequestRouting.ts
index af625bbad56e..999c6133f5da 100644
--- a/packages/client-runtime/src/state/pullRequestRouting.ts
+++ b/packages/client-runtime/src/state/pullRequestRouting.ts
@@ -339,15 +339,11 @@ export function createPullRequestRouter() {
         }
         const operation = run(id);
         return yield* (reads.has(tag) ? operation.pipe(readTimeout(id)) : operation).pipe(
-          Effect.catch((error) => {
-            if (
-              (reads.has(tag) || rejectedBeforeDispatch(error)) &&
-              index + 1 < candidates.length
-            ) {
-              return visit(index + 1);
-            }
-            return Effect.fail(error);
-          }),
+          Effect.catchIf(
+            (error) =>
+              (reads.has(tag) || rejectedBeforeDispatch(error)) && index + 1 < candidates.length,
+            () => visit(index + 1),
+          ),
           Effect.map((result) =>
             typeof result === "object" && result !== null && "projectId" in result
               ? {
diff --git a/packages/client-runtime/src/state/pullRequests.test.ts b/packages/client-runtime/src/state/pullRequests.test.ts
index 75e6b38f4a2e..b6d8c1733f1c 100644
--- a/packages/client-runtime/src/state/pullRequests.test.ts
+++ b/packages/client-runtime/src/state/pullRequests.test.ts
@@ -1171,7 +1171,7 @@ it.effect("updates cached labels after successful edits without rereading the ho
             if (failDetail) {
               yield* detailRefreshStarted.open;
               yield* releaseDetailRefresh.await;
-              return yield* Effect.fail(new MutationRefused());
+              return yield* new MutationRefused();
             }
             return { title: "keep this title", labels: [existing] };
           }),
diff --git a/packages/client-runtime/src/state/runtime.ts b/packages/client-runtime/src/state/runtime.ts
index 84946bf9e165..0b9b0006e9fe 100644
--- a/packages/client-runtime/src/state/runtime.ts
+++ b/packages/client-runtime/src/state/runtime.ts
@@ -60,6 +60,7 @@ interface EnvironmentQueryAtomOptions<Input, A, E, R> extends EnvironmentAtomOpt
 }
 
 interface EnvironmentSubscriptionAtomOptions<Input, A, E, R> {
+  readonly sensitiveInput?: boolean;
   readonly label: string;
   readonly subscribe: (input: Input) => Stream.Stream<A, E, R>;
   readonly idleTtlMs?: number;
@@ -581,7 +582,11 @@ export function createEnvironmentSubscriptionAtomFamily<R, ER, Input, A, E>(
       .atom(followStreamInEnvironment(target.environmentId, options.subscribe(target.input)))
       .pipe(
         Atom.setIdleTTL(options.idleTtlMs ?? 5 * 60_000),
-        Atom.withLabel(`${options.label}:${key}`),
+        Atom.withLabel(
+          options.sensitiveInput
+            ? `${options.label}:${target.environmentId}`
+            : `${options.label}:${key}`,
+        ),
       );
   });
   return (target: { readonly environmentId: EnvironmentIdType; readonly input: Input }) =>
diff --git a/packages/client-runtime/src/state/server.test.ts b/packages/client-runtime/src/state/server.test.ts
index 878f8c902f91..7443850b1b5e 100644
--- a/packages/client-runtime/src/state/server.test.ts
+++ b/packages/client-runtime/src/state/server.test.ts
@@ -778,14 +778,14 @@ describe("server state projection", () => {
       } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
       const savedConfigs = yield* Queue.unbounded<ServerConfig>();
       const cache = Persistence.EnvironmentCacheStore.of({
-        loadShell: () => Effect.succeed(Option.none()),
+        loadShell: () => Effect.succeedNone,
         saveShell: () => Effect.void,
-        loadThread: () => Effect.succeed(Option.none()),
+        loadThread: () => Effect.succeedNone,
         saveThread: () => Effect.void,
         removeThread: () => Effect.void,
-        loadServerConfig: () => Effect.succeed(Option.some(CONFIG)),
+        loadServerConfig: () => Effect.succeedSome(CONFIG),
         saveServerConfig: (_environmentId, config) => Queue.offer(savedConfigs, config),
-        loadVcsRefs: () => Effect.succeed(Option.none()),
+        loadVcsRefs: () => Effect.succeedNone,
         saveVcsRefs: () => Effect.void,
         removeVcsRefs: () => Effect.void,
         clearVcsRefs: () => Effect.void,
@@ -839,14 +839,14 @@ describe("server state projection", () => {
       } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
       const savedConfigs = yield* Queue.unbounded<ServerConfig>();
       const cache = Persistence.EnvironmentCacheStore.of({
-        loadShell: () => Effect.succeed(Option.none()),
+        loadShell: () => Effect.succeedNone,
         saveShell: () => Effect.void,
-        loadThread: () => Effect.succeed(Option.none()),
+        loadThread: () => Effect.succeedNone,
         saveThread: () => Effect.void,
         removeThread: () => Effect.void,
-        loadServerConfig: () => Effect.succeed(Option.some(CONFIG)),
+        loadServerConfig: () => Effect.succeedSome(CONFIG),
         saveServerConfig: (_environmentId, config) => Queue.offer(savedConfigs, config),
-        loadVcsRefs: () => Effect.succeed(Option.none()),
+        loadVcsRefs: () => Effect.succeedNone,
         saveVcsRefs: () => Effect.void,
         removeVcsRefs: () => Effect.void,
         clearVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/state/server.ts b/packages/client-runtime/src/state/server.ts
index 18127076ff19..07ac64ebf69d 100644
--- a/packages/client-runtime/src/state/server.ts
+++ b/packages/client-runtime/src/state/server.ts
@@ -29,6 +29,7 @@ import {
   createEnvironmentQueryAtomFamily,
   createEnvironmentRpcQueryAtomFamily,
   createEnvironmentRpcSubscriptionAtomFamily,
+  createEnvironmentSubscriptionAtomFamily,
   createRuntimeCommand,
   scheduleAtomCommandEffect,
 } from "./runtime.ts";
@@ -933,6 +934,14 @@ export function createServerEnvironmentAtoms<R, E>(
       );
     }).pipe(Atom.withLabel(`environment-data:server:usage-prices:${environmentId}`)),
   );
+  const usageScanSettingsAtom = Atom.family((environmentId: EnvironmentId) =>
+    Atom.make((get) =>
+      JSON.stringify([
+        get(usagePricesAtom(environmentId)),
+        get(settingsValueAtom(environmentId))?.cursorKeychainUsageEnabled ?? false,
+      ]),
+    ).pipe(Atom.withLabel(`environment-data:server:usage-scan-settings:${environmentId}`)),
+  );
   const providersValueAtom = Atom.family((environmentId: EnvironmentId) =>
     Atom.make((get) => get(configValueAtom(environmentId))?.providers ?? null).pipe(
       Atom.withLabel(`environment-data:server:providers:${environmentId}`),
@@ -978,10 +987,35 @@ export function createServerEnvironmentAtoms<R, E>(
         key: ({ environmentId, input }) => JSON.stringify([environmentId, input]),
       },
     }),
+    respondProviderAuth: createEnvironmentRpcCommand(runtime, {
+      label: "environment-data:provider:auth-respond",
+      tag: WS_METHODS.providerAuthRespond,
+    }),
     completeProviderAuth: createEnvironmentRpcCommand(runtime, {
       label: "environment-data:provider:auth-complete",
       tag: WS_METHODS.providerAuthComplete,
     }),
+    chatGptReconnectProfile: createEnvironmentRpcCommand(runtime, {
+      label: "environment-data:chatgpt:reconnect-profile",
+      tag: WS_METHODS.chatGptReconnectProfile,
+    }),
+    chatGptImportProfile: createEnvironmentRpcCommand(runtime, {
+      label: "environment-data:chatgpt:import-profile",
+      tag: WS_METHODS.chatGptImportProfile,
+    }),
+    chatGptHandoffState: createEnvironmentSubscriptionAtomFamily(runtime, {
+      label: "environment-data:chatgpt:handoff",
+      sensitiveInput: true,
+      // OAuth must not be replayed when the connection recovers.
+      subscribe: (input: EnvironmentRpcInput<typeof WS_METHODS.chatGptHandoffSubscribe>) =>
+        runStream(WS_METHODS.chatGptHandoffSubscribe, input),
+      idleTtlMs: 0,
+    }),
+    codexAuthCallbackState: createEnvironmentRpcSubscriptionAtomFamily(runtime, {
+      label: "environment-data:codex:auth-callback",
+      tag: WS_METHODS.codexAuthCallbackSubscribe,
+      idleTtlMs: 0,
+    }),
     cancelProviderAuth: createEnvironmentRpcCommand(runtime, {
       label: "environment-data:provider:auth-cancel",
       tag: WS_METHODS.providerAuthCancel,
@@ -1046,7 +1080,7 @@ export function createServerEnvironmentAtoms<R, E>(
       label: "environment-data:server:usage-summary",
       tag: WS_METHODS.serverGetUsageSummary,
       staleTimeMs: 60_000,
-      refreshTrigger: ({ environmentId }) => usagePricesAtom(environmentId),
+      refreshTrigger: ({ environmentId }) => usageScanSettingsAtom(environmentId),
     }),
     configProjection,
     welcome,
diff --git a/packages/client-runtime/src/state/serverUsage.test.ts b/packages/client-runtime/src/state/serverUsage.test.ts
index 9cf2667d8bc2..2df10f7cf860 100644
--- a/packages/client-runtime/src/state/serverUsage.test.ts
+++ b/packages/client-runtime/src/state/serverUsage.test.ts
@@ -125,14 +125,14 @@ const makeHarness = Effect.fn("ServerUsageTest.makeHarness")(function* (
       Stream.provideService(stream, EnvironmentSupervisor, supervisor),
   } as EnvironmentRegistry["Service"]);
   const cache = EnvironmentCacheStore.of({
-    loadShell: () => Effect.succeed(Option.none()),
+    loadShell: () => Effect.succeedNone,
     saveShell: () => Effect.void,
-    loadThread: () => Effect.succeed(Option.none()),
+    loadThread: () => Effect.succeedNone,
     saveThread: () => Effect.void,
     removeThread: () => Effect.void,
-    loadServerConfig: () => Effect.succeed(Option.none()),
+    loadServerConfig: () => Effect.succeedNone,
     saveServerConfig: () => Effect.void,
-    loadVcsRefs: () => Effect.succeed(Option.none()),
+    loadVcsRefs: () => Effect.succeedNone,
     saveVcsRefs: () => Effect.void,
     removeVcsRefs: () => Effect.void,
     clearVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/state/session.ts b/packages/client-runtime/src/state/session.ts
index 9a0a9dfe9a5f..15848d95d965 100644
--- a/packages/client-runtime/src/state/session.ts
+++ b/packages/client-runtime/src/state/session.ts
@@ -20,7 +20,7 @@ function initialConfigOption<E>(
   initialConfig: Effect.Effect<ServerConfig, E>,
 ): Effect.Effect<Option.Option<ServerConfig>> {
   return initialConfig.pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.catch((error) =>
       Effect.logWarning("Could not load the initial environment configuration.").pipe(
         Effect.annotateLogs({ ...safeErrorLogAttributes(error) }),
@@ -30,8 +30,8 @@ function initialConfigOption<E>(
   );
 }
 
-// Bounded like the snapshot fetches: a wedged environment must not pin the
-// permissions check (and with it the settings UI) in a loading state for long.
+// Bounded so a wedged environment cannot pin the permissions check (and with it
+// the settings UI) in a loading state for long.
 const DEFAULT_SESSION_STATE_TIMEOUT_MS = 6_000;
 
 /**
diff --git a/packages/client-runtime/src/state/shell-sync.test.ts b/packages/client-runtime/src/state/shell-sync.test.ts
index 0d933c39f8ba..9483d86de0ff 100644
--- a/packages/client-runtime/src/state/shell-sync.test.ts
+++ b/packages/client-runtime/src/state/shell-sync.test.ts
@@ -80,14 +80,14 @@ describe("environment shell synchronization", () => {
         retryNow: Effect.void,
       } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
       const cache = Persistence.EnvironmentCacheStore.of({
-        loadShell: () => Effect.succeed(Option.none()),
+        loadShell: () => Effect.succeedNone,
         saveShell: () => Effect.never,
-        loadThread: () => Effect.succeed(Option.none()),
+        loadThread: () => Effect.succeedNone,
         saveThread: () => Effect.void,
         removeThread: () => Effect.void,
-        loadServerConfig: () => Effect.succeed(Option.none()),
+        loadServerConfig: () => Effect.succeedNone,
         saveServerConfig: () => Effect.void,
-        loadVcsRefs: () => Effect.succeed(Option.none()),
+        loadVcsRefs: () => Effect.succeedNone,
         saveVcsRefs: () => Effect.void,
         removeVcsRefs: () => Effect.void,
         clearVcsRefs: () => Effect.void,
@@ -96,7 +96,7 @@ describe("environment shell synchronization", () => {
       // Cold cache with no HTTP snapshot available → falls back to the
       // socket-embedded snapshot.
       const snapshotLoader = ShellSnapshotLoader.of({
-        load: () => Effect.succeed(Option.none()),
+        load: () => Effect.succeedNone,
       });
       const shellState = yield* makeEnvironmentShellState().pipe(
         Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
@@ -176,14 +176,14 @@ describe("environment shell synchronization", () => {
         retryNow: Effect.void,
       } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
       const cache = Persistence.EnvironmentCacheStore.of({
-        loadShell: () => Effect.succeed(Option.none()),
+        loadShell: () => Effect.succeedNone,
         saveShell: () => Effect.void,
-        loadThread: () => Effect.succeed(Option.none()),
+        loadThread: () => Effect.succeedNone,
         saveThread: () => Effect.void,
         removeThread: () => Effect.void,
-        loadServerConfig: () => Effect.succeed(Option.none()),
+        loadServerConfig: () => Effect.succeedNone,
         saveServerConfig: () => Effect.void,
-        loadVcsRefs: () => Effect.succeed(Option.none()),
+        loadVcsRefs: () => Effect.succeedNone,
         saveVcsRefs: () => Effect.void,
         removeVcsRefs: () => Effect.void,
         clearVcsRefs: () => Effect.void,
@@ -194,7 +194,7 @@ describe("environment shell synchronization", () => {
         Effect.provideService(Persistence.EnvironmentCacheStore, cache),
         Effect.provideService(
           ShellSnapshotLoader,
-          ShellSnapshotLoader.of({ load: () => Effect.succeed(Option.none()) }),
+          ShellSnapshotLoader.of({ load: () => Effect.succeedNone }),
         ),
       );
       yield* SubscriptionRef.set(supervisorState, {
@@ -284,14 +284,14 @@ describe("environment shell synchronization", () => {
         retryNow: Effect.void,
       } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
       const cache = Persistence.EnvironmentCacheStore.of({
-        loadShell: () => Effect.succeed(Option.some(cachedSnapshot)),
+        loadShell: () => Effect.succeedSome(cachedSnapshot),
         saveShell: () => Effect.void,
-        loadThread: () => Effect.succeed(Option.none()),
+        loadThread: () => Effect.succeedNone,
         saveThread: () => Effect.void,
         removeThread: () => Effect.void,
-        loadServerConfig: () => Effect.succeed(Option.none()),
+        loadServerConfig: () => Effect.succeedNone,
         saveServerConfig: () => Effect.void,
-        loadVcsRefs: () => Effect.succeed(Option.none()),
+        loadVcsRefs: () => Effect.succeedNone,
         saveVcsRefs: () => Effect.void,
         removeVcsRefs: () => Effect.void,
         clearVcsRefs: () => Effect.void,
@@ -364,14 +364,14 @@ describe("environment shell synchronization", () => {
         retryNow: Effect.void,
       } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
       const cache = Persistence.EnvironmentCacheStore.of({
-        loadShell: () => Effect.succeed(Option.some(LIVE_SHELL_SNAPSHOT)),
+        loadShell: () => Effect.succeedSome(LIVE_SHELL_SNAPSHOT),
         saveShell: () => Effect.void,
-        loadThread: () => Effect.succeed(Option.none()),
+        loadThread: () => Effect.succeedNone,
         saveThread: () => Effect.void,
         removeThread: () => Effect.void,
-        loadServerConfig: () => Effect.succeed(Option.none()),
+        loadServerConfig: () => Effect.succeedNone,
         saveServerConfig: () => Effect.void,
-        loadVcsRefs: () => Effect.succeed(Option.none()),
+        loadVcsRefs: () => Effect.succeedNone,
         saveVcsRefs: () => Effect.void,
         removeVcsRefs: () => Effect.void,
         clearVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/state/shellSnapshotHttp.ts b/packages/client-runtime/src/state/shellSnapshotHttp.ts
index 0bfa2cabdf97..750eb2c8df0c 100644
--- a/packages/client-runtime/src/state/shellSnapshotHttp.ts
+++ b/packages/client-runtime/src/state/shellSnapshotHttp.ts
@@ -12,14 +12,18 @@ import { environmentEndpointUrl } from "../environment/endpoint.ts";
 import { ManagedRelayDpopSigner } from "../relay/managedRelay.ts";
 import { executeAuthenticatedEnvironmentHttpRequest } from "./environmentHttpAuth.ts";
 
-// Bounded so a pathologically slow endpoint cannot block the (cheaper) socket
-// fallback for long. The cached shell renders while this runs.
+// Long enough for a slow but alive server to finish. On timeout the socket asks
+// the same server for the same full snapshot, so a short deadline only throws
+// the first build away. The socket fallback is for setups where /api fails but
+// /ws works, such as a proxy that blocks /api. A dead server is caught by the
+// socket ping, which drops the session and interrupts this load. The cached
+// shell renders while this runs.
 //
-// Turbo (shell-snapshot-budget): upstream gives this 6s. On a large install
+// Turbo (shell-snapshot-budget): upstream gives this 20s. On a large install
 // (30 projects, 130+ worktrees) the snapshot spent 7-13s resolving repository
-// identities behind git polling and was cancelled every time, so the sidebar
-// stayed on its cached list and deletes/settles never showed. 30s keeps the
-// authoritative list reachable; the cached shell still renders meanwhile.
+// identities behind git polling, and a busier event loop pushes that further.
+// 30s keeps the authoritative list reachable; the cached shell still renders
+// meanwhile.
 export const DEFAULT_SHELL_SNAPSHOT_TIMEOUT_MS = 30_000;
 
 /**
diff --git a/packages/client-runtime/src/state/sourceControl.test.ts b/packages/client-runtime/src/state/sourceControl.test.ts
index 33c566bf82b6..ff9824106a78 100644
--- a/packages/client-runtime/src/state/sourceControl.test.ts
+++ b/packages/client-runtime/src/state/sourceControl.test.ts
@@ -101,14 +101,14 @@ describe("source control environment atoms", () => {
         } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
         const removed = new Array<string>();
         const cache = Persistence.EnvironmentCacheStore.of({
-          loadShell: () => Effect.succeed(Option.none()),
+          loadShell: () => Effect.succeedNone,
           saveShell: () => Effect.void,
-          loadThread: () => Effect.succeed(Option.none()),
+          loadThread: () => Effect.succeedNone,
           saveThread: () => Effect.void,
           removeThread: () => Effect.void,
-          loadServerConfig: () => Effect.succeed(Option.none()),
+          loadServerConfig: () => Effect.succeedNone,
           saveServerConfig: () => Effect.void,
-          loadVcsRefs: () => Effect.succeed(Option.none()),
+          loadVcsRefs: () => Effect.succeedNone,
           saveVcsRefs: () => Effect.void,
           removeVcsRefs: (environmentId, cwd) =>
             Effect.sync(() => {
diff --git a/packages/client-runtime/src/state/threadCommands.ts b/packages/client-runtime/src/state/threadCommands.ts
index 93e22cfd0c70..bb70356aab6a 100644
--- a/packages/client-runtime/src/state/threadCommands.ts
+++ b/packages/client-runtime/src/state/threadCommands.ts
@@ -29,6 +29,7 @@ import {
   type PinThreadInput,
   type ReorderPinnedThreadInput,
   type ReorderActiveThreadInput,
+  type SetThreadAutoSettleInput,
   type SettleThreadInput,
   type SnoozeThreadInput,
   type StartThreadTurnInput,
@@ -53,6 +54,7 @@ import {
   pinThread,
   reorderPinnedThread,
   reorderActiveThread,
+  setThreadAutoSettle,
   settleThread,
   snoozeThread,
   startThreadTurn,
@@ -81,6 +83,7 @@ export type {
   PinThreadInput,
   ReorderPinnedThreadInput,
   ReorderActiveThreadInput,
+  SetThreadAutoSettleInput,
   SettleThreadInput,
   SnoozeThreadInput,
   StartThreadTurnInput,
@@ -170,6 +173,12 @@ export function createThreadEnvironmentAtoms<R, E>(
       scheduler,
       concurrency,
     }),
+    setAutoSettle: createEnvironmentCommand(runtime, {
+      label: "environment-data:commands:thread:set-auto-settle",
+      execute: (input: SetThreadAutoSettleInput) => setThreadAutoSettle(input),
+      scheduler,
+      concurrency,
+    }),
     reorderActive: createEnvironmentCommand(runtime, {
       label: "environment-data:commands:thread:reorder-active",
       execute: (input: ReorderActiveThreadInput) => reorderActiveThread(input),
diff --git a/packages/client-runtime/src/state/threadDetail.ts b/packages/client-runtime/src/state/threadDetail.ts
index 379985b71243..d32329a741b4 100644
--- a/packages/client-runtime/src/state/threadDetail.ts
+++ b/packages/client-runtime/src/state/threadDetail.ts
@@ -60,6 +60,7 @@ export function mergeEnvironmentThread(
     settledAt: shell.settledAt,
     unsettledAt: shell.unsettledAt,
     activeOrderKey: shell.activeOrderKey,
+    autoSettleDisabledAt: shell.autoSettleDisabledAt,
     snoozedUntil: shell.snoozedUntil,
     snoozedAt: shell.snoozedAt,
     pinnedAt: shell.pinnedAt,
diff --git a/packages/client-runtime/src/state/threadReducer.test.ts b/packages/client-runtime/src/state/threadReducer.test.ts
index dbee48d7808c..0330d3dd8bd9 100644
--- a/packages/client-runtime/src/state/threadReducer.test.ts
+++ b/packages/client-runtime/src/state/threadReducer.test.ts
@@ -290,6 +290,46 @@ describe("applyThreadDetailEvent", () => {
     });
   });
 
+  describe("thread.auto-settle-set", () => {
+    it("stores and clears autoSettleDisabledAt", () => {
+      const disabledAt = "2026-04-01T05:00:00.000Z";
+      const off = applyThreadDetailEvent(baseThread, {
+        ...baseEventFields,
+        sequence: 7,
+        occurredAt: disabledAt,
+        aggregateKind: "thread",
+        aggregateId: ThreadId.make("thread-1"),
+        type: "thread.auto-settle-set",
+        payload: {
+          threadId: ThreadId.make("thread-1"),
+          autoSettleDisabledAt: disabledAt,
+          updatedAt: disabledAt,
+        },
+      });
+      expect(off.kind).toBe("updated");
+      if (off.kind !== "updated") return;
+      expect(off.thread.autoSettleDisabledAt).toBe(disabledAt);
+
+      const on = applyThreadDetailEvent(off.thread, {
+        ...baseEventFields,
+        sequence: 8,
+        occurredAt: "2026-04-01T06:00:00.000Z",
+        aggregateKind: "thread",
+        aggregateId: ThreadId.make("thread-1"),
+        type: "thread.auto-settle-set",
+        payload: {
+          threadId: ThreadId.make("thread-1"),
+          autoSettleDisabledAt: null,
+          updatedAt: "2026-04-01T06:00:00.000Z",
+        },
+      });
+      expect(on.kind).toBe("updated");
+      if (on.kind === "updated") {
+        expect(on.thread.autoSettleDisabledAt).toBeNull();
+      }
+    });
+  });
+
   describe("thread.meta-updated", () => {
     it.each(["f", null] as const)(
       "updates the active key to %s without activity",
diff --git a/packages/client-runtime/src/state/threadReducer.ts b/packages/client-runtime/src/state/threadReducer.ts
index 2d102b6a1f3e..be85f2ec5630 100644
--- a/packages/client-runtime/src/state/threadReducer.ts
+++ b/packages/client-runtime/src/state/threadReducer.ts
@@ -131,6 +131,7 @@ export function applyThreadDetailEvent(
           settledAt: null,
           unsettledAt: null,
           activeOrderKey: null,
+          autoSettleDisabledAt: null,
           snoozedUntil: null,
           snoozedAt: null,
           deletedAt: null,
@@ -249,6 +250,16 @@ export function applyThreadDetailEvent(
         },
       };
 
+    case "thread.auto-settle-set":
+      return {
+        kind: "updated",
+        thread: {
+          ...thread,
+          autoSettleDisabledAt: event.payload.autoSettleDisabledAt,
+          updatedAt: event.payload.updatedAt,
+        },
+      };
+
     // ── Thread metadata ─────────────────────────────────────────────
     case "thread.meta-updated":
       return {
diff --git a/packages/client-runtime/src/state/threadSnapshotHttp.ts b/packages/client-runtime/src/state/threadSnapshotHttp.ts
index 9582ad30567b..da1156cc83e0 100644
--- a/packages/client-runtime/src/state/threadSnapshotHttp.ts
+++ b/packages/client-runtime/src/state/threadSnapshotHttp.ts
@@ -13,10 +13,13 @@ import { ManagedRelayDpopSigner } from "../relay/managedRelay.ts";
 import type { RemoteEnvironmentRequestError } from "../rpc/http.ts";
 import { executeAuthenticatedEnvironmentHttpRequest } from "./environmentHttpAuth.ts";
 
-// Bounded so a pathologically slow endpoint cannot block the (cheaper) socket
-// fallback for long. The cached thread renders while this runs, so the wait only
-// delays the transition to live data on the first open, not the initial paint.
-const DEFAULT_THREAD_SNAPSHOT_TIMEOUT_MS = 6_000;
+// Long enough for a slow but alive server to finish. On a cold open a timeout
+// makes the socket ask the same server for the same snapshot again, and older
+// turn pages have no fallback, so a short deadline only drops work. The socket
+// fallback is for setups where /api fails but /ws works, such as a proxy that
+// blocks /api. A dead server drops the socket session, which interrupts a
+// cold-open load. Older turn pages wait for this deadline.
+const DEFAULT_THREAD_SNAPSHOT_TIMEOUT_MS = 20_000;
 
 /**
  * Load a thread's detail snapshot over HTTP instead of embedding it in the
diff --git a/packages/client-runtime/src/state/threadSort.test.ts b/packages/client-runtime/src/state/threadSort.test.ts
index 0e1fba746cf3..9fe8df570499 100644
--- a/packages/client-runtime/src/state/threadSort.test.ts
+++ b/packages/client-runtime/src/state/threadSort.test.ts
@@ -1,4 +1,4 @@
-import { ProjectId } from "@t3tools/contracts";
+import { ProjectId, TurnId, type OrchestrationLatestTurn } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
 import {
@@ -10,7 +10,9 @@ import {
   resolveSettledThreadTimestamp,
   sortActiveThreadsByOrderKey,
   sortPinnedThreadsByOrderKey,
+  sortSettledThreads,
   sortThreads,
+  type SettledThreadTimestampInput,
   type ThreadSortInput,
 } from "./threadSort.ts";
 
@@ -59,6 +61,109 @@ describe("resolveSettledThreadTimestamp", () => {
   });
 });
 
+describe("sortSettledThreads", () => {
+  const settled = (input: {
+    id: string;
+    settledAt?: string | null;
+    latestUserMessageAt?: string | null;
+    latestTurn?: OrchestrationLatestTurn | null;
+    updatedAt?: string;
+  }) => ({
+    id: input.id,
+    settledAt: input.settledAt ?? null,
+    latestUserMessageAt: input.latestUserMessageAt ?? null,
+    latestTurn: input.latestTurn ?? null,
+    updatedAt: input.updatedAt ?? "2026-03-09T09:00:00.000Z",
+  });
+
+  it("orders by settle time, most recently settled first", () => {
+    const sorted = sortSettledThreads([
+      settled({
+        id: "settled-first",
+        settledAt: "2026-03-09T10:00:00.000Z",
+        // Created/active later than the other thread: settle time must win.
+        latestUserMessageAt: "2026-03-09T09:59:00.000Z",
+      }),
+      settled({
+        id: "settled-last",
+        settledAt: "2026-03-09T12:00:00.000Z",
+        latestUserMessageAt: "2026-03-09T08:00:00.000Z",
+      }),
+    ]);
+
+    expect(sorted.map((thread) => thread.id)).toEqual(["settled-last", "settled-first"]);
+  });
+
+  it("falls back to last activity for auto-settled threads without a settledAt stamp", () => {
+    const sorted = sortSettledThreads([
+      settled({ id: "auto-old", latestUserMessageAt: "2026-03-09T08:00:00.000Z" }),
+      settled({ id: "explicit", settledAt: "2026-03-09T10:00:00.000Z" }),
+      settled({ id: "auto-recent", latestUserMessageAt: "2026-03-09T11:00:00.000Z" }),
+    ]);
+
+    expect(sorted.map((thread) => thread.id)).toEqual(["auto-recent", "explicit", "auto-old"]);
+  });
+
+  it("counts a turn completion as activity for auto-settled threads", () => {
+    // The message came in before the other thread's, but its turn finished
+    // after: completion time is the real "work ended" moment.
+    const sorted = sortSettledThreads([
+      settled({ id: "message-only", latestUserMessageAt: "2026-03-09T10:04:00.000Z" }),
+      settled({
+        id: "completed-later",
+        latestUserMessageAt: "2026-03-09T10:00:00.000Z",
+        latestTurn: {
+          turnId: TurnId.make("turn-1"),
+          state: "completed",
+          assistantMessageId: null,
+          requestedAt: "2026-03-09T10:00:00.000Z",
+          startedAt: "2026-03-09T10:00:00.000Z",
+          completedAt: "2026-03-09T10:30:00.000Z",
+        },
+      }),
+    ]);
+
+    expect(sorted.map((thread) => thread.id)).toEqual(["completed-later", "message-only"]);
+  });
+
+  it("breaks timestamp ties by id so the order is stable", () => {
+    const sorted = sortSettledThreads([
+      settled({ id: "b", settledAt: "2026-03-09T10:00:00.000Z" }),
+      settled({ id: "a", settledAt: "2026-03-09T10:00:00.000Z" }),
+    ]);
+
+    expect(sorted.map((thread) => thread.id)).toEqual(["a", "b"]);
+  });
+
+  it("matches the per-comparison order on a shuffled list with ties", () => {
+    const stamps = [
+      { settledAt: "2026-03-09T10:00:00.000Z" },
+      { settledAt: "invalid", latestUserMessageAt: "2026-03-09T10:00:00.000Z" },
+      { latestUserMessageAt: "2026-03-09T11:00:00.000Z" },
+      { updatedAt: "2026-03-09T09:00:00.000Z" },
+      { updatedAt: "invalid" },
+    ];
+    // Ids repeat every 3 rows and stamps every 5, so rows tie on the time,
+    // on the id, and on both. (index * 7) % 30 scrambles the input order.
+    const threads = Array.from({ length: 30 }, (_, index) => {
+      const row = (index * 7) % 30;
+      return { ...settled({ id: `thread-${row % 3}`, ...stamps[row % 5] }), row };
+    });
+    // The comparator this sort replaced: it resolved both keys on every call.
+    const timestampMs = (thread: SettledThreadTimestampInput) => {
+      const timestamp = resolveSettledThreadTimestamp(thread);
+      return timestamp === null ? 0 : Date.parse(timestamp);
+    };
+    const expected = threads.toSorted(
+      (left, right) => timestampMs(right) - timestampMs(left) || left.id.localeCompare(right.id),
+    );
+
+    expect(sortSettledThreads(threads).map((thread) => thread.row)).toEqual(
+      expected.map((thread) => thread.row),
+    );
+  });
+});
+
 describe("sortThreads", () => {
   it.each(["created_at", "updated_at"] as const)(
     "preserves references, input order and descending id ties for %s",
diff --git a/packages/client-runtime/src/state/threadSort.ts b/packages/client-runtime/src/state/threadSort.ts
index da8aa6e32d42..d862cf887cde 100644
--- a/packages/client-runtime/src/state/threadSort.ts
+++ b/packages/client-runtime/src/state/threadSort.ts
@@ -47,6 +47,24 @@ export function resolveSettledThreadTimestamp(thread: SettledThreadTimestampInpu
   return toSortableTimestamp(thread.updatedAt) === null ? null : thread.updatedAt;
 }
 
+/** Settled rows are history, so they order by when the work ENDED, newest
+    first, with an id tiebreak. Each key resolves once per sort, not once
+    per comparison. Shared by web and mobile so both render the same order. */
+export function sortSettledThreads<T extends SettledThreadTimestampInput & { readonly id: string }>(
+  threads: readonly T[],
+): T[] {
+  return threads
+    .map((thread) => {
+      const timestamp = resolveSettledThreadTimestamp(thread);
+      return { thread, timestampMs: timestamp === null ? 0 : Date.parse(timestamp) };
+    })
+    .sort(
+      (left, right) =>
+        right.timestampMs - left.timestampMs || left.thread.id.localeCompare(right.thread.id),
+    )
+    .map(({ thread }) => thread);
+}
+
 function getFirstSortableTimestamp(...values: Array<string | null | undefined>): number | null {
   for (const value of values) {
     const timestamp = toSortableTimestamp(value ?? undefined);
diff --git a/packages/client-runtime/src/state/threads-atoms.test.ts b/packages/client-runtime/src/state/threads-atoms.test.ts
index 6fd61c8d1cfd..34e6857041d3 100644
--- a/packages/client-runtime/src/state/threads-atoms.test.ts
+++ b/packages/client-runtime/src/state/threads-atoms.test.ts
@@ -200,7 +200,7 @@ const makeHarness = Effect.fn("TestThreadAtoms.makeHarness")(function* (options?
       Layer.succeed(
         EnvironmentCacheStore,
         EnvironmentCacheStore.of({
-          loadShell: () => Effect.succeed(Option.none()),
+          loadShell: () => Effect.succeedNone,
           saveShell: () => Effect.void,
           loadThread: () =>
             Effect.sync(() => {
@@ -209,9 +209,9 @@ const makeHarness = Effect.fn("TestThreadAtoms.makeHarness")(function* (options?
             }),
           saveThread: () => Effect.void,
           removeThread: () => Effect.void,
-          loadServerConfig: () => Effect.succeed(Option.none()),
+          loadServerConfig: () => Effect.succeedNone,
           saveServerConfig: () => Effect.void,
-          loadVcsRefs: () => Effect.succeed(Option.none()),
+          loadVcsRefs: () => Effect.succeedNone,
           saveVcsRefs: () => Effect.void,
           removeVcsRefs: () => Effect.void,
           clearVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/state/threads-pagination.test.ts b/packages/client-runtime/src/state/threads-pagination.test.ts
index a473deb1f97b..4dbc3329994e 100644
--- a/packages/client-runtime/src/state/threads-pagination.test.ts
+++ b/packages/client-runtime/src/state/threads-pagination.test.ts
@@ -197,16 +197,16 @@ const makeHarness = Effect.fn("TestThreadPagination.makeHarness")(function* (opt
     retryNow: Effect.void,
   } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
   const cache = Persistence.EnvironmentCacheStore.of({
-    loadShell: () => Effect.succeed(Option.none()),
+    loadShell: () => Effect.succeedNone,
     saveShell: () => Effect.void,
     loadThread: () =>
       Effect.succeed(options?.cached !== undefined ? Option.some(options.cached) : Option.none()),
     saveThread: (_environmentId, thread) =>
       Ref.update(savedThreads, (current) => [...current, thread]),
     removeThread: () => Effect.void,
-    loadServerConfig: () => Effect.succeed(Option.none()),
+    loadServerConfig: () => Effect.succeedNone,
     saveServerConfig: () => Effect.void,
-    loadVcsRefs: () => Effect.succeed(Option.none()),
+    loadVcsRefs: () => Effect.succeedNone,
     saveVcsRefs: () => Effect.void,
     removeVcsRefs: () => Effect.void,
     clearVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/state/threads-sync.test.ts b/packages/client-runtime/src/state/threads-sync.test.ts
index c41651576dad..848357ec2bef 100644
--- a/packages/client-runtime/src/state/threads-sync.test.ts
+++ b/packages/client-runtime/src/state/threads-sync.test.ts
@@ -216,7 +216,7 @@ const makeHarness = Effect.fn("TestEnvironmentThreads.makeHarness")(function* (o
     retryNow: Ref.update(retryCount, (count) => count + 1),
   } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
   const cache = Persistence.EnvironmentCacheStore.of({
-    loadShell: () => Effect.succeed(Option.none()),
+    loadShell: () => Effect.succeedNone,
     saveShell: () => Effect.void,
     loadThread: (_environmentId, threadId) =>
       options?.loadCached ??
@@ -234,9 +234,9 @@ const makeHarness = Effect.fn("TestEnvironmentThreads.makeHarness")(function* (o
       ),
     removeThread: (_environmentId, threadId) =>
       Ref.update(removedThreads, (current) => [...current, threadId]),
-    loadServerConfig: () => Effect.succeed(Option.none()),
+    loadServerConfig: () => Effect.succeedNone,
     saveServerConfig: () => Effect.void,
-    loadVcsRefs: () => Effect.succeed(Option.none()),
+    loadVcsRefs: () => Effect.succeedNone,
     saveVcsRefs: () => Effect.void,
     removeVcsRefs: () => Effect.void,
     clearVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/state/threads.ts b/packages/client-runtime/src/state/threads.ts
index 9d373f929661..6ff439737db0 100644
--- a/packages/client-runtime/src/state/threads.ts
+++ b/packages/client-runtime/src/state/threads.ts
@@ -127,9 +127,16 @@ function formatThreadError(cause: Cause.Cause<unknown>): string {
     : "Could not synchronize the thread.";
 }
 
+/**
+ * A starting or running session is mid-turn. Its detail can change many times
+ * per second, so the disk cache waits for it to settle.
+ */
+export function isThreadSessionRunning(session: OrchestrationThread["session"]): boolean {
+  return session?.status === "starting" || session?.status === "running";
+}
+
 function shouldPersistThread(thread: OrchestrationThread): boolean {
-  const status = thread.session?.status;
-  return status !== "starting" && status !== "running";
+  return !isThreadSessionRunning(thread.session);
 }
 
 interface ThreadResumeSnapshot {
diff --git a/packages/client-runtime/src/state/usage.test.ts b/packages/client-runtime/src/state/usage.test.ts
index 98eb46e13ca8..86914c768e3b 100644
--- a/packages/client-runtime/src/state/usage.test.ts
+++ b/packages/client-runtime/src/state/usage.test.ts
@@ -1,7 +1,10 @@
 import {
   EnvironmentId,
+  ProviderDriverKind,
+  ProviderInstanceId,
   UsageDay,
   USAGE_CONTRACT_VERSION,
+  type ServerProvider,
   type UsageSummary,
 } from "@t3tools/contracts";
 import * as Effect from "effect/Effect";
@@ -10,7 +13,12 @@ import { afterEach, describe, expect, it, vi } from "vite-plus/test";
 
 import type { EnvironmentPresentation } from "../connection/presentation.ts";
 import { EnvironmentRpcUnavailableError } from "../rpc/client.ts";
-import { refreshUsage, refreshUsageLimits } from "./usage.ts";
+import {
+  cursorKeychainAccessEnvironments,
+  needsCursorKeychainAccess,
+  refreshUsage,
+  refreshUsageLimits,
+} from "./usage.ts";
 
 const input = {
   sinceDay: UsageDay.make("2026-09-05"),
@@ -184,6 +192,19 @@ describe("manual usage refresh", () => {
 });
 
 describe("limits refresh cooldown", () => {
+  it("runs a fresh check after an in-flight check when settings change", async () => {
+    const id = EnvironmentId.make("limits-after-enable");
+    const oldCheck = Promise.withResolvers<string>();
+    const first = refreshUsageLimits(id, () => oldCheck.promise, true);
+    const newCheck = vi.fn(async () => "new limits");
+    const afterEnable = refreshUsageLimits(id, newCheck, false, true);
+    expect(newCheck).not.toHaveBeenCalled();
+    oldCheck.resolve("old limits");
+    expect(await first).toBe("old limits");
+    expect(await afterEnable).toBe("new limits");
+    expect(newCheck).toHaveBeenCalledTimes(1);
+  });
+
   it("joins manual calls and gates automatic refreshes after success or failure", async () => {
     const clock = vi.spyOn(Date, "now").mockReturnValue(1_000);
     try {
@@ -225,3 +246,78 @@ describe("limits refresh cooldown", () => {
     }
   });
 });
+
+describe("needsCursorKeychainAccess", () => {
+  const cursorPrompt: UsageSummary = {
+    ...summary,
+    sources: [
+      {
+        fingerprint: {
+          hostId: "host",
+          provider: "cursor",
+          resolvedHomePath: "/Users/me/.cursor/auth.json",
+          volumeId: "volume",
+        },
+        status: "ok",
+        scannedFiles: 0,
+        skippedFiles: 0,
+        malformedRecords: 0,
+        distinctSessions: 0,
+        message: "Cursor account usage is off on this environment.",
+        action: "enableCursorKeychain",
+      },
+    ],
+  };
+  const cursor = (status: ServerProvider["status"]): ServerProvider => ({
+    instanceId: ProviderInstanceId.make("cursor"),
+    driver: ProviderDriverKind.make("cursor"),
+    enabled: status !== "disabled",
+    installed: status === "ready",
+    version: null,
+    status,
+    auth: { status: "unknown" },
+    checkedAt: "2026-09-05T12:00:00.000Z",
+    models: [],
+    slashCommands: [],
+    skills: [],
+  });
+
+  it("offers access only when Cursor is ready on that environment", () => {
+    expect(needsCursorKeychainAccess(cursorPrompt, [cursor("ready")])).toBe(true);
+    expect(needsCursorKeychainAccess(cursorPrompt, [cursor("error")])).toBe(false);
+    expect(needsCursorKeychainAccess(cursorPrompt, [cursor("disabled")])).toBe(false);
+    expect(needsCursorKeychainAccess(cursorPrompt, [])).toBe(false);
+    expect(needsCursorKeychainAccess(cursorPrompt, null)).toBe(false);
+    expect(needsCursorKeychainAccess(summary, [cursor("ready")])).toBe(false);
+  });
+
+  it("stops offering access once any environment reads the Cursor account", () => {
+    const off = { summary: cursorPrompt, needsCursorKeychainAccess: true };
+    const account: UsageSummary = {
+      ...summary,
+      sources: [
+        {
+          fingerprint: {
+            hostId: "cursor.com",
+            provider: "cursor",
+            resolvedHomePath: "cursor-account:abc",
+            volumeId: "abc",
+          },
+          status: "ok",
+          scannedFiles: 1,
+          skippedFiles: 0,
+          malformedRecords: 0,
+          distinctSessions: 1,
+          message: null,
+        },
+      ],
+    };
+    expect(cursorKeychainAccessEnvironments([off, off])).toEqual([off, off]);
+    expect(
+      cursorKeychainAccessEnvironments([
+        off,
+        { summary: account, needsCursorKeychainAccess: false },
+      ]),
+    ).toEqual([]);
+  });
+});
diff --git a/packages/client-runtime/src/state/usage.ts b/packages/client-runtime/src/state/usage.ts
index 8a2b1a44a951..1f2377a89f42 100644
--- a/packages/client-runtime/src/state/usage.ts
+++ b/packages/client-runtime/src/state/usage.ts
@@ -1,4 +1,9 @@
-import type { EnvironmentId, UsageSummaryInput } from "@t3tools/contracts";
+import type {
+  EnvironmentId,
+  ServerProvider,
+  UsageSummary,
+  UsageSummaryInput,
+} from "@t3tools/contracts";
 import * as Schema from "effect/Schema";
 import type { AtomRegistry } from "effect/unstable/reactivity";
 
@@ -9,6 +14,39 @@ import type { createServerEnvironmentAtoms } from "./server.ts";
 
 const isEnvironmentRpcUnavailable = Schema.is(EnvironmentRpcUnavailableError);
 
+/** Offer the Cursor Keychain prompt only where a working Cursor provider could use it. */
+export function needsCursorKeychainAccess(
+  summary: UsageSummary | null,
+  providers: readonly ServerProvider[] | null,
+): boolean {
+  return (
+    summary?.sources.some((source) => source.action === "enableCursorKeychain") === true &&
+    providers?.some((provider) => provider.driver === "cursor" && provider.status === "ready") ===
+      true
+  );
+}
+
+/**
+ * Environments to offer the Cursor Keychain prompt in the usage summary.
+ *
+ * Any environment reading a Cursor account already reports that account's
+ * history from every machine, so the prompt only adds duplicates there. A
+ * different account on another machine stays reachable from provider settings.
+ */
+export function cursorKeychainAccessEnvironments<
+  E extends { readonly summary: UsageSummary | null; readonly needsCursorKeychainAccess: boolean },
+>(environments: readonly E[]): readonly E[] {
+  const hasCursorAccount = environments.some((environment) =>
+    environment.summary?.sources.some(
+      (source) =>
+        source.fingerprint.provider === "cursor" && source.fingerprint.hostId === "cursor.com",
+    ),
+  );
+  return hasCursorAccount
+    ? []
+    : environments.filter((environment) => environment.needsCursorKeychainAccess);
+}
+
 const limitsRefreshAfter = new Map<EnvironmentId, number>();
 const limitsRefreshes = new Map<EnvironmentId, Promise<unknown>>();
 
@@ -16,9 +54,18 @@ export async function refreshUsageLimits<A>(
   environmentId: EnvironmentId,
   refresh: () => Promise<A>,
   automatic = false,
+  afterPending = false,
 ): Promise<A | undefined> {
   const pending = limitsRefreshes.get(environmentId);
   if (pending !== undefined) {
+    if (afterPending) {
+      try {
+        await pending;
+      } catch {
+        // The new check still needs to run if the earlier one failed.
+      }
+      return refreshUsageLimits(environmentId, refresh, false, true);
+    }
     // Manual refresh waits for the current check; automatic refresh does not repeat it.
     return automatic ? undefined : ((await pending) as A);
   }
diff --git a/packages/client-runtime/src/state/vcs.test.ts b/packages/client-runtime/src/state/vcs.test.ts
index d7a4692fc317..7b11c48f3ca5 100644
--- a/packages/client-runtime/src/state/vcs.test.ts
+++ b/packages/client-runtime/src/state/vcs.test.ts
@@ -98,12 +98,12 @@ function cacheWithRefs(
   overrides: Partial<Persistence.EnvironmentCacheStore["Service"]> = {},
 ) {
   return Persistence.EnvironmentCacheStore.of({
-    loadShell: () => Effect.succeed(Option.none()),
+    loadShell: () => Effect.succeedNone,
     saveShell: () => Effect.void,
-    loadThread: () => Effect.succeed(Option.none()),
+    loadThread: () => Effect.succeedNone,
     saveThread: () => Effect.void,
     removeThread: () => Effect.void,
-    loadServerConfig: () => Effect.succeed(Option.none()),
+    loadServerConfig: () => Effect.succeedNone,
     saveServerConfig: () => Effect.void,
     loadVcsRefs: () => Effect.succeed(refs),
     saveVcsRefs: () => Effect.void,
diff --git a/packages/client-runtime/src/state/vcsAction.test.ts b/packages/client-runtime/src/state/vcsAction.test.ts
index 24aa314b1cff..2d840ba71ff4 100644
--- a/packages/client-runtime/src/state/vcsAction.test.ts
+++ b/packages/client-runtime/src/state/vcsAction.test.ts
@@ -99,14 +99,14 @@ function progress<T extends GitActionProgressEvent>(event: T): T {
 
 function cacheStore(onClearVcsRefs: (environmentId: EnvironmentId) => void) {
   return Persistence.EnvironmentCacheStore.of({
-    loadShell: () => Effect.succeed(Option.none()),
+    loadShell: () => Effect.succeedNone,
     saveShell: () => Effect.void,
-    loadThread: () => Effect.succeed(Option.none()),
+    loadThread: () => Effect.succeedNone,
     saveThread: () => Effect.void,
     removeThread: () => Effect.void,
-    loadServerConfig: () => Effect.succeed(Option.none()),
+    loadServerConfig: () => Effect.succeedNone,
     saveServerConfig: () => Effect.void,
-    loadVcsRefs: () => Effect.succeed(Option.none()),
+    loadVcsRefs: () => Effect.succeedNone,
     saveVcsRefs: () => Effect.void,
     removeVcsRefs: () => Effect.void,
     clearVcsRefs: (environmentId) => Effect.sync(() => onClearVcsRefs(environmentId)),
diff --git a/packages/client-runtime/src/work-log/userInput.test.ts b/packages/client-runtime/src/work-log/userInput.test.ts
new file mode 100644
index 000000000000..bfc7ea75296f
--- /dev/null
+++ b/packages/client-runtime/src/work-log/userInput.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, it } from "vite-plus/test";
+import { ApprovalRequestId, type UserInputAttachmentAnswerPayload } from "@t3tools/contracts";
+import { getQuestionTextPreview } from "./userInput.ts";
+
+function answer(
+  overrides: Partial<UserInputAttachmentAnswerPayload> = {},
+): UserInputAttachmentAnswerPayload {
+  return {
+    requestId: ApprovalRequestId.make("request-1"),
+    questionTextById: { scope: "Which repository?" },
+    answers: { scope: "Use the private repository" },
+    attachmentsByQuestionId: {},
+    ...overrides,
+  };
+}
+
+describe("getQuestionTextPreview", () => {
+  it("joins the question texts", () => {
+    expect(
+      getQuestionTextPreview(
+        answer({ questionTextById: { scope: "Which repository?", name: "What name?" } }),
+      ),
+    ).toBe("Which repository? · What name?");
+  });
+
+  it("normalizes whitespace and skips blank texts", () => {
+    expect(
+      getQuestionTextPreview(
+        answer({ questionTextById: { scope: "Which\nrepository?", x: "  " } }),
+      ),
+    ).toBe("Which repository?");
+  });
+
+  it("returns an empty string without question texts", () => {
+    expect(getQuestionTextPreview(answer({ questionTextById: undefined }))).toBe("");
+  });
+});
diff --git a/packages/client-runtime/src/work-log/userInput.ts b/packages/client-runtime/src/work-log/userInput.ts
index 18dea7dd83c2..d1bb4370efbf 100644
--- a/packages/client-runtime/src/work-log/userInput.ts
+++ b/packages/client-runtime/src/work-log/userInput.ts
@@ -163,6 +163,13 @@ export function getQuestionAnswerText(value: unknown): string {
   return nested ? getQuestionAnswerText(nested.answers) : "";
 }
 
+export function getQuestionTextPreview(answer: UserInputAttachmentAnswerPayload): string {
+  return Object.values(answer.questionTextById ?? {})
+    .map((text) => text.replace(/\s+/g, " ").trim())
+    .filter(Boolean)
+    .join(" · ");
+}
+
 export function getQuestionAnswerPreview(answer: UserInputAttachmentAnswerPayload): string {
   const answers = Object.values(answer.answers).map(getQuestionAnswerText).filter(Boolean);
   const attachments = Object.values(answer.attachmentsByQuestionId)
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index f4025b13bef7..f2172443edae 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/contracts",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "private": true,
   "files": [
     "dist"
diff --git a/packages/contracts/src/desktopBootstrap.ts b/packages/contracts/src/desktopBootstrap.ts
index bc3558aa2962..31c604ffd7fe 100644
--- a/packages/contracts/src/desktopBootstrap.ts
+++ b/packages/contracts/src/desktopBootstrap.ts
@@ -23,3 +23,9 @@ export const DesktopBackendBootstrap = Schema.Struct({
 });
 
 export type DesktopBackendBootstrap = typeof DesktopBackendBootstrap.Type;
+
+/** Written to `<t3Home>/runtime` just before the desktop app stops its
+    backend to install an update. The updated app starts a new backend right
+    away, so a backend that sees a fresh marker at shutdown keeps its managed
+    tunnel. */
+export const DESKTOP_UPDATE_RESTART_MARKER_FILE = "desktop-update-restart";
diff --git a/packages/contracts/src/editor.ts b/packages/contracts/src/editor.ts
index 99c53169d66f..f4561c7f6fd4 100644
--- a/packages/contracts/src/editor.ts
+++ b/packages/contracts/src/editor.ts
@@ -59,7 +59,14 @@ export const EDITORS = [
     launchStyle: "direct-path",
     remoteScheme: "zed",
   },
-  { id: "antigravity", label: "Antigravity", commands: ["agy"], launchStyle: "goto" },
+  {
+    id: "antigravity",
+    label: "Antigravity",
+    // `agy` is the standalone Antigravity CLI, not the IDE. The IDE bundle
+    // ships `antigravity-ide`, so it comes first for install-folder lookups.
+    commands: ["antigravity-ide", "agy-ide"],
+    launchStyle: "goto",
+  },
   { id: "idea", label: "IntelliJ IDEA", commands: ["idea"], launchStyle: "line-column" },
   { id: "aqua", label: "Aqua", commands: ["aqua"], launchStyle: "line-column" },
   { id: "clion", label: "CLion", commands: ["clion"], launchStyle: "line-column" },
diff --git a/packages/contracts/src/environment.ts b/packages/contracts/src/environment.ts
index b5a3290f6314..089133d878a4 100644
--- a/packages/contracts/src/environment.ts
+++ b/packages/contracts/src/environment.ts
@@ -141,6 +141,9 @@ export const ExecutionEnvironmentCapabilities = Schema.Struct({
   threadPinReorder: Schema.optionalKey(Schema.Boolean),
   /** Server persists manual Active order through thread.active.reorder. */
   threadActiveReorder: Schema.optionalKey(Schema.Boolean),
+  /** Server understands thread.auto-settle.set (per-thread auto-settle off).
+      Same version-skew contract as threadSettlement. */
+  threadAutoSettleOptOut: Schema.optionalKey(Schema.Boolean),
   /** Server understands regenerateTitle on thread.meta.update. Absent on
       older servers, so clients hide the action instead of sending it. */
   threadTitleRegeneration: Schema.optionalKey(Schema.Boolean),
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index 5bb47be733c3..6b2a9a9a79f8 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -40,6 +40,8 @@ export interface ContextMenuItem<T extends string = string> {
   icon?: string;
   /** Inserts a visual section divider immediately before this item. */
   separatorBefore?: boolean;
+  /** Shows a check mark. Used to mark the current option inside a submenu. */
+  checked?: boolean;
   children?: readonly ContextMenuItem<T>[];
 }
 
@@ -55,6 +57,7 @@ export interface ContextMenuItemSchemaType {
   readonly header?: boolean;
   readonly icon?: string;
   readonly separatorBefore?: boolean;
+  readonly checked?: boolean;
   readonly children?: readonly ContextMenuItemSchemaType[];
 }
 
@@ -66,6 +69,7 @@ export const ContextMenuItemSchema: Schema.Codec<ContextMenuItemSchemaType> = Sc
   header: Schema.optionalKey(Schema.Boolean),
   icon: Schema.optionalKey(Schema.String),
   separatorBefore: Schema.optionalKey(Schema.Boolean),
+  checked: Schema.optionalKey(Schema.Boolean),
   children: Schema.optionalKey(
     Schema.Array(
       Schema.suspend((): Schema.Codec<ContextMenuItemSchemaType> => ContextMenuItemSchema),
@@ -1173,6 +1177,7 @@ export interface DesktopBridge {
   getClientPlatform?: () => string;
   setNotificationBadge?: (badge: { count: number; image: string | null }) => Promise<void>;
   onNotificationBadgeClear?: (listener: () => void) => () => void;
+  onTrackpadScrollEnd?: (listener: () => void) => () => void;
   /**
    * The OS locale as a BCP-47 tag, which the renderer cannot read for itself:
    * the packaged app ships only the `en-US` Chromium locale pak, so
@@ -1259,6 +1264,9 @@ export interface DesktopBridge {
     items: readonly ContextMenuItem<T>[],
     position?: { x: number; y: number },
   ) => Promise<T | null>;
+  /** Receives a local OAuth code for a sign-in owned by a remote environment. */
+  receiveProviderAuthCallback?: (authorizationUrl: string) => Promise<string>;
+  cancelProviderAuthCallback?: (authorizationUrl: string) => Promise<void>;
   openExternal: (url: string) => Promise<boolean>;
   /**
    * Open a System Settings pane by identifier. Optional: older desktop builds
diff --git a/packages/contracts/src/keybindings.test.ts b/packages/contracts/src/keybindings.test.ts
index 14579c741198..dee46551c224 100644
--- a/packages/contracts/src/keybindings.test.ts
+++ b/packages/contracts/src/keybindings.test.ts
@@ -78,6 +78,12 @@ it.effect("parses keybinding rules", () =>
     });
     assert.strictEqual(parsedProjectSearch.command, "projectSearch.toggle");
 
+    const parsedUsageOpen = yield* decode(KeybindingRule, {
+      key: "mod+u",
+      command: "usage.open",
+    });
+    assert.strictEqual(parsedUsageOpen.command, "usage.open");
+
     const parsedThemeEditor = yield* decode(KeybindingRule, {
       key: "mod+alt+shift+t",
       command: "themeEditor.toggle",
diff --git a/packages/contracts/src/keybindings.ts b/packages/contracts/src/keybindings.ts
index 5093ba9a25ad..239f9905c534 100644
--- a/packages/contracts/src/keybindings.ts
+++ b/packages/contracts/src/keybindings.ts
@@ -57,6 +57,8 @@ export type ModelPickerKeybindingCommand = (typeof MODEL_PICKER_KEYBINDING_COMMA
 
 export const STATIC_KEYBINDING_COMMANDS = [
   "sidebar.toggle",
+  "navigation.back",
+  "navigation.forward",
   "terminal.toggle",
   "terminal.split",
   "terminal.splitVertical",
@@ -76,6 +78,7 @@ export const STATIC_KEYBINDING_COMMANDS = [
   "commandPalette.toggle",
   "filePicker.toggle",
   "projectSearch.toggle",
+  "usage.open",
   "theme.select",
   "appearance.cycle",
   "themeEditor.toggle",
@@ -89,6 +92,13 @@ export const STATIC_KEYBINDING_COMMANDS = [
   "chat.new",
   "chat.newLocal",
   "editor.openFavorite",
+  "usage.cost",
+  "usage.tokens",
+  "usage.limits",
+  "usage.period.day",
+  "usage.period.week",
+  "usage.period.month",
+  "usage.period.quarter",
   ...MODEL_PICKER_KEYBINDING_COMMANDS,
   ...THREAD_KEYBINDING_COMMANDS,
 ] as const;
diff --git a/packages/contracts/src/model.ts b/packages/contracts/src/model.ts
index 840f007f2e97..b5f545ec916f 100644
--- a/packages/contracts/src/model.ts
+++ b/packages/contracts/src/model.ts
@@ -162,7 +162,7 @@ export const PREFERRED_DEFAULT_CODEX_MODELS: ReadonlyArray<string> = [
   "gpt-5.6-sol",
   "gpt-5.6-terra",
 ];
-export const DEFAULT_TEXT_GENERATION_MODEL = "gpt-5.6-luna";
+export const DEFAULT_TEXT_GENERATION_MODEL = "gpt-6-luna";
 /** Keep the official Antigravity session's current model. Never send this ID to ACP. */
 export const ANTIGRAVITY_DEFAULT_MODEL = "antigravity-default";
 export const DEFAULT_TEXT_GENERATION_REASONING_EFFORT = "low";
diff --git a/packages/contracts/src/orchestration.ts b/packages/contracts/src/orchestration.ts
index 3e323e4964d5..1ae704d3f666 100644
--- a/packages/contracts/src/orchestration.ts
+++ b/packages/contracts/src/orchestration.ts
@@ -838,6 +838,10 @@ export const OrchestrationThread = Schema.Struct({
   // Manual Active placement. Keyless threads retain their creation/re-entry
   // order above the arranged run. Settling clears this slot.
   activeOrderKey: Schema.optional(Schema.NullOr(TrimmedNonEmptyString)),
+  // Set while the user has turned automatic settlement off for this thread.
+  // Survives manual settle, un-settle, and activity: only the user clears it.
+  // Optional so payloads from older servers still decode.
+  autoSettleDisabledAt: Schema.optional(Schema.NullOr(IsoDateTime)),
   // Pending-only state. Optional so older servers remain compatible.
   titleRegeneration: Schema.optional(Schema.NullOr(ThreadTitleRegeneration)),
   titleState: Schema.optional(Schema.NullOr(ThreadTitleState)),
@@ -908,6 +912,7 @@ export const OrchestrationThreadShell = Schema.Struct({
   pinnedAt: Schema.optional(Schema.NullOr(IsoDateTime)),
   pinOrderKey: Schema.optional(Schema.NullOr(TrimmedNonEmptyString)),
   activeOrderKey: Schema.optional(Schema.NullOr(TrimmedNonEmptyString)),
+  autoSettleDisabledAt: Schema.optional(Schema.NullOr(IsoDateTime)),
   titleRegeneration: Schema.optional(Schema.NullOr(ThreadTitleRegeneration)),
   titleState: Schema.optional(Schema.NullOr(ThreadTitleState)),
   session: Schema.NullOr(OrchestrationSession),
@@ -1218,6 +1223,14 @@ const ThreadPinReorderCommand = Schema.Struct({
   orderKey: TrimmedNonEmptyString,
 });
 
+const ThreadAutoSettleSetCommand = Schema.Struct({
+  type: Schema.Literal("thread.auto-settle.set"),
+  commandId: CommandId,
+  threadId: ThreadId,
+  // false turns automatic settlement off for this thread, true turns it back on.
+  enabled: Schema.Boolean,
+});
+
 const ThreadActiveReorderCommand = Schema.Struct({
   type: Schema.Literal("thread.active.reorder"),
   commandId: CommandId,
@@ -1426,6 +1439,7 @@ const DispatchableClientOrchestrationCommand = Schema.Union([
   ThreadPinCommand,
   ThreadUnpinCommand,
   ThreadPinReorderCommand,
+  ThreadAutoSettleSetCommand,
   ThreadActiveReorderCommand,
   ThreadMetaUpdateCommand,
   ThreadPullRequestLinkCommand,
@@ -1459,6 +1473,7 @@ export const ClientOrchestrationCommand = Schema.Union([
   ThreadPinCommand,
   ThreadUnpinCommand,
   ThreadPinReorderCommand,
+  ThreadAutoSettleSetCommand,
   ThreadActiveReorderCommand,
   ThreadMetaUpdateCommand,
   ThreadPullRequestLinkCommand,
@@ -1687,6 +1702,7 @@ export const OrchestrationEventType = Schema.Literals([
   "thread.pinned",
   "thread.unpinned",
   "thread.pin-reordered",
+  "thread.auto-settle-set",
   "thread.meta-updated",
   "thread.pull-request-linked",
   "thread.pull-request-unlinked",
@@ -1825,6 +1841,13 @@ export const ThreadPinReorderedPayload = Schema.Struct({
   updatedAt: IsoDateTime,
 });
 
+export const ThreadAutoSettleSetPayload = Schema.Struct({
+  threadId: ThreadId,
+  // Null re-enables automatic settlement.
+  autoSettleDisabledAt: Schema.NullOr(IsoDateTime),
+  updatedAt: IsoDateTime,
+});
+
 export const ThreadMetaUpdatedPayload = Schema.Struct({
   threadId: ThreadId,
   // Order updates use this existing event so older clients can ignore the
@@ -2089,6 +2112,11 @@ export const OrchestrationEvent = Schema.Union([
     type: Schema.Literal("thread.pin-reordered"),
     payload: ThreadPinReorderedPayload,
   }),
+  Schema.Struct({
+    ...EventBaseFields,
+    type: Schema.Literal("thread.auto-settle-set"),
+    payload: ThreadAutoSettleSetPayload,
+  }),
   Schema.Struct({
     ...EventBaseFields,
     type: Schema.Literal("thread.meta-updated"),
diff --git a/packages/contracts/src/previewAutomation.ts b/packages/contracts/src/previewAutomation.ts
index 59387fdacfd9..f87739670f75 100644
--- a/packages/contracts/src/previewAutomation.ts
+++ b/packages/contracts/src/previewAutomation.ts
@@ -590,6 +590,15 @@ export const PreviewAutomationHostFocus = Schema.Struct({
   ...PreviewAutomationHostIdentity.fields,
   connectionId: PreviewAutomationConnectionId,
   focused: Schema.Boolean,
+  liveTabs: Schema.optional(
+    Schema.Array(
+      Schema.Struct({
+        threadId: ThreadId,
+        tabId: PreviewTabId,
+        visible: Schema.optional(Schema.Boolean),
+      }),
+    ),
+  ),
 });
 export type PreviewAutomationHostFocus = typeof PreviewAutomationHostFocus.Type;
 
@@ -640,6 +649,7 @@ const McpCapabilityErrorFields = {
   providerInstanceId: ProviderInstanceId,
 };
 
+/** Agents read this message, so it names the next step and not only the failure. */
 export class PreviewAutomationUnavailableError extends Schema.TaggedError<PreviewAutomationUnavailableError>()(
   "PreviewAutomationUnavailableError",
   {
@@ -648,7 +658,7 @@ export class PreviewAutomationUnavailableError extends Schema.TaggedError<Previe
   },
 ) {
   override get message(): string {
-    return `MCP credential does not grant the ${this.capability} capability.`;
+    return `MCP credential does not grant the ${this.capability} capability: browser preview tools are off for this thread. Do not retry them. To check a page, use a headless browser from the shell, such as Playwright, or curl. The user can turn on "Agent browser access" in Settings; it applies when the agent session next starts.`;
   }
 }
 
@@ -713,8 +723,7 @@ export class PreviewAutomationNoAvailableHostError extends Schema.TaggedError<Pr
   },
 ) {
   override get message(): string {
-    const summary = `No preview automation host is available for ${this.operation} in environment ${this.environmentId}.`;
-    return summary;
+    return `No preview automation host is available for ${this.operation} in environment ${this.environmentId}. Preview tools run in a T3 Code desktop app that is open and connected to this environment; a headless server has no browser of its own. Do not retry. To check a page, use a headless browser from the shell, such as Playwright, or curl, or ask the user to open this thread in the T3 Code desktop app.`;
   }
 }
 
@@ -738,10 +747,9 @@ export class PreviewAutomationTabNotFoundError extends Schema.TaggedError<Previe
   },
 ) {
   override get message(): string {
-    const summary = this.tabId
-      ? `Preview tab ${this.tabId} was not found for ${this.operation}.`
-      : `No active preview tab was found for ${this.operation}.`;
-    return summary;
+    return this.tabId
+      ? `Preview tab ${this.tabId} was not found for ${this.operation}. Omit tabId to use the current tab, or call preview_open.`
+      : `No active preview tab was found for ${this.operation}. Call preview_open first.`;
   }
 }
 
diff --git a/packages/contracts/src/providerRuntime.ts b/packages/contracts/src/providerRuntime.ts
index 309b61935485..aa2b3b7e1580 100644
--- a/packages/contracts/src/providerRuntime.ts
+++ b/packages/contracts/src/providerRuntime.ts
@@ -809,6 +809,7 @@ export type RuntimeWarningPayload = typeof RuntimeWarningPayload.Type;
 
 const RuntimeErrorPayload = Schema.Struct({
   message: TrimmedNonEmptyStringSchema,
+  code: Schema.optional(TrimmedNonEmptyStringSchema),
   class: Schema.optional(RuntimeErrorClass),
   detail: Schema.optional(Schema.Unknown),
 });
diff --git a/packages/contracts/src/providerSetup.test.ts b/packages/contracts/src/providerSetup.test.ts
new file mode 100644
index 000000000000..13fb3fca1f11
--- /dev/null
+++ b/packages/contracts/src/providerSetup.test.ts
@@ -0,0 +1,53 @@
+import { describe, expect, it } from "vite-plus/test";
+import * as Schema from "effect/Schema";
+
+import { ProviderAuthResponse, ProviderAuthState } from "./providerSetup.ts";
+
+const decodeResponse = Schema.decodeUnknownSync(ProviderAuthResponse);
+const decodeState = Schema.decodeUnknownSync(ProviderAuthState);
+
+describe("provider credential responses", () => {
+  it("accepts the advertised field limit and rejects oversized or invalid fields", () => {
+    const values = Object.fromEntries(
+      Array.from({ length: 16 }, (_, i) => [`field_${i}`, "value"]),
+    );
+    expect(decodeResponse({ type: "credentials", values })).toEqual({
+      type: "credentials",
+      values,
+    });
+    expect(() =>
+      decodeResponse({ type: "credentials", values: { ...values, extra: "value" } }),
+    ).toThrow();
+    expect(() => decodeResponse({ type: "credentials", values: { "": "value" } })).toThrow();
+    expect(() =>
+      decodeResponse({ type: "credentials", values: { token: "x".repeat(16_385) } }),
+    ).toThrow();
+  });
+});
+
+describe("provider auth state", () => {
+  it("drops auth variants from newer servers instead of rejecting the state", () => {
+    const method = { id: "browser", name: "Browser", description: null, type: "agent" };
+    expect(
+      decodeState({
+        instanceId: "cursor",
+        phase: "waiting",
+        flowId: null,
+        authorizationUrl: null,
+        expiresAt: null,
+        message: null,
+        methods: [method, { ...method, id: "passkey", type: "passkey" }],
+        interaction: { type: "passkey", id: "passkey" },
+        credentialOwner: "keychain",
+      }),
+    ).toEqual({
+      instanceId: "cursor",
+      phase: "waiting",
+      flowId: null,
+      authorizationUrl: null,
+      expiresAt: null,
+      message: null,
+      methods: [method],
+    });
+  });
+});
diff --git a/packages/contracts/src/providerSetup.ts b/packages/contracts/src/providerSetup.ts
index db6ce1f79aec..985d29c38855 100644
--- a/packages/contracts/src/providerSetup.ts
+++ b/packages/contracts/src/providerSetup.ts
@@ -1,6 +1,12 @@
 import * as Schema from "effect/Schema";
 
-import { IsoDateTime, TrimmedNonEmptyString } from "./baseSchemas.ts";
+import {
+  EnvironmentId,
+  ForwardCompatibleArray,
+  ForwardCompatibleOptional,
+  IsoDateTime,
+  TrimmedNonEmptyString,
+} from "./baseSchemas.ts";
 import { ProviderDriverKind, ProviderInstanceId } from "./providerInstance.ts";
 
 export const ProviderSetupInput = Schema.Struct({
@@ -8,8 +14,109 @@ export const ProviderSetupInput = Schema.Struct({
 });
 export type ProviderSetupInput = typeof ProviderSetupInput.Type;
 
+export const CodexAuthCallbackInput = Schema.Struct({
+  authorizationUrl: Schema.String.check(Schema.isMaxLength(16_384)),
+  returnUrl: Schema.String.check(Schema.isMaxLength(4_096)),
+  environmentId: EnvironmentId,
+  instanceId: ProviderInstanceId,
+  flowId: TrimmedNonEmptyString.check(Schema.isMaxLength(128)),
+});
+export type CodexAuthCallbackInput = typeof CodexAuthCallbackInput.Type;
+export const CodexAuthCallbackState = Schema.Union([
+  Schema.Struct({ phase: Schema.Literal("ready") }),
+  Schema.Struct({
+    phase: Schema.Literal("finished"),
+    callbackUrl: Schema.String.check(Schema.isMaxLength(16_384)),
+  }),
+]);
+
 const SetupOperationId = TrimmedNonEmptyString.check(Schema.isMaxLength(128));
 
+export const ProviderAuthMethod = Schema.Struct({
+  id: SetupOperationId,
+  accountEmail: Schema.optional(TrimmedNonEmptyString),
+  name: TrimmedNonEmptyString,
+  description: Schema.NullOr(Schema.String),
+  type: Schema.Literals(["agent", "terminal", "credentials"]),
+});
+export type ProviderAuthMethod = typeof ProviderAuthMethod.Type;
+
+// These describe client interactions, not OAuth grant types. The provider
+// adapter remains responsible for credentials, callbacks, and refresh.
+export const ProviderAuthInteraction = Schema.Union([
+  Schema.Struct({
+    type: Schema.Literal("browser"),
+    id: SetupOperationId,
+    url: TrimmedNonEmptyString.check(Schema.isMaxLength(16_384)),
+    requiresConsent: Schema.Boolean,
+    acceptsCallback: Schema.optionalKey(Schema.Boolean),
+  }),
+  Schema.Struct({
+    type: Schema.Literal("deviceCode"),
+    id: SetupOperationId,
+    url: TrimmedNonEmptyString.check(Schema.isMaxLength(16_384)),
+    userCode: TrimmedNonEmptyString.check(Schema.isMaxLength(256)),
+  }),
+  Schema.Struct({
+    type: Schema.Literal("terminal"),
+    id: SetupOperationId,
+    output: Schema.String.check(Schema.isMaxLength(16_384)),
+    outputOffset: Schema.optionalKey(Schema.Int.check(Schema.isGreaterThanOrEqualTo(0))),
+  }),
+  Schema.Struct({
+    type: Schema.Literal("credentials"),
+    id: SetupOperationId,
+    fields: Schema.Array(
+      Schema.Struct({
+        name: SetupOperationId,
+        label: TrimmedNonEmptyString,
+        secret: Schema.Boolean,
+      }),
+    ).check(Schema.isMaxLength(16)),
+  }),
+]);
+export type ProviderAuthInteraction = typeof ProviderAuthInteraction.Type;
+
+export const ProviderAuthResponse = Schema.Union([
+  Schema.Struct({
+    type: Schema.Literal("browser"),
+    action: Schema.Literals(["accept", "decline"]),
+  }),
+  Schema.Struct({
+    type: Schema.Literal("terminal"),
+    data: Schema.String.check(Schema.isMaxLength(4_096)),
+    size: Schema.optionalKey(
+      Schema.Struct({
+        cols: Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 500 })),
+        rows: Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 200 })),
+      }),
+    ),
+  }),
+  Schema.Struct({
+    type: Schema.Literal("credentials"),
+    values: Schema.Record(SetupOperationId, Schema.String.check(Schema.isMaxLength(16_384))).check(
+      Schema.isMaxProperties(16),
+    ),
+  }),
+]);
+export type ProviderAuthResponse = typeof ProviderAuthResponse.Type;
+
+export const ProviderAuthStartInput = Schema.Struct({
+  instanceId: ProviderInstanceId,
+  methodId: Schema.optionalKey(SetupOperationId),
+  returnUrl: Schema.optionalKey(Schema.String),
+  callbackMode: Schema.optionalKey(Schema.Literals(["server", "client"])),
+});
+export type ProviderAuthStartInput = typeof ProviderAuthStartInput.Type;
+
+export const ProviderAuthRespondInput = Schema.Struct({
+  instanceId: ProviderInstanceId,
+  flowId: SetupOperationId,
+  interactionId: SetupOperationId,
+  response: ProviderAuthResponse,
+});
+export type ProviderAuthRespondInput = typeof ProviderAuthRespondInput.Type;
+
 export const ProviderAuthState = Schema.Struct({
   instanceId: ProviderInstanceId,
   phase: Schema.Literals([
@@ -25,6 +132,13 @@ export const ProviderAuthState = Schema.Struct({
   authorizationUrl: Schema.NullOr(Schema.String),
   expiresAt: Schema.NullOr(IsoDateTime),
   message: Schema.NullOr(Schema.String),
+  // Newer servers may add method types, interactions, or owners; older
+  // clients drop what they cannot decode instead of rejecting the state.
+  methods: Schema.optionalKey(
+    ForwardCompatibleArray(ProviderAuthMethod).check(Schema.isMaxLength(32)),
+  ),
+  interaction: ForwardCompatibleOptional(Schema.NullOr(ProviderAuthInteraction)),
+  credentialOwner: ForwardCompatibleOptional(Schema.Literals(["provider", "t3"])),
 });
 export type ProviderAuthState = typeof ProviderAuthState.Type;
 
@@ -59,6 +173,8 @@ export const ProviderInstallState = Schema.Struct({
   totalBytes: Schema.NullOr(ByteCount),
   version: Schema.NullOr(TrimmedNonEmptyString),
   installedVersion: Schema.NullOr(TrimmedNonEmptyString),
+  executablePath: Schema.optionalKey(Schema.NullOr(TrimmedNonEmptyString)),
+  source: Schema.optionalKey(Schema.NullOr(Schema.Literals(["managed", "local"]))),
   canRemove: Schema.Boolean,
   message: Schema.NullOr(Schema.String),
 });
@@ -84,3 +200,56 @@ export class ProviderSetupError extends Schema.TaggedError<ProviderSetupError>()
     return this.detail;
   }
 }
+
+// A selected registration is reused on the primary without copying refresh ownership.
+export const ChatGptReconnectProfile = Schema.Struct({
+  clientId: Schema.String.check(Schema.isPattern(/^oaiapp_[\w-]+$/u)),
+  subject: Schema.optionalKey(Schema.String),
+  email: Schema.optionalKey(Schema.NullOr(Schema.String)),
+  redirectUri: Schema.optionalKey(
+    Schema.String.check(
+      Schema.isPattern(/^http:\/\/(?:127\.0\.0\.1|localhost):[1-9]\d{0,4}\/auth\/callback$/u),
+    ),
+  ),
+  connectionLabel: Schema.optionalKey(Schema.String),
+  sharingEnabled: Schema.optionalKey(Schema.Boolean),
+  idTokenHint: Schema.optionalKey(Schema.String.check(Schema.isMaxLength(16_384))),
+});
+export type ChatGptReconnectProfile = typeof ChatGptReconnectProfile.Type;
+export const ChatGptTransferredProfile = Schema.Struct({
+  registration: ChatGptReconnectProfile,
+  credentials: Schema.Struct({
+    clientId: Schema.String,
+    accessToken: Schema.NonEmptyString.check(Schema.isMaxLength(16_384)),
+    refreshToken: Schema.NullOr(Schema.String.check(Schema.isMaxLength(16_384))),
+    idToken: Schema.NonEmptyString.check(Schema.isMaxLength(16_384)),
+    issuer: Schema.String,
+    expiresAt: Schema.Finite,
+    earliestRefreshAt: Schema.NullOr(Schema.Finite),
+    scopes: Schema.Array(Schema.String),
+    subject: Schema.String,
+    email: Schema.NullOr(Schema.String),
+  }),
+});
+export type ChatGptTransferredProfile = typeof ChatGptTransferredProfile.Type;
+export const ChatGptReconnectProfileInput = Schema.Struct({
+  instanceId: ProviderInstanceId,
+  methodId: Schema.String,
+});
+export const ChatGptImportProfileInput = Schema.Struct({
+  instanceId: ProviderInstanceId,
+  profile: ChatGptTransferredProfile,
+});
+export const ChatGptHandoffInput = Schema.Struct({
+  instanceId: ProviderInstanceId,
+  environmentId: EnvironmentId,
+  attemptId: Schema.String.check(Schema.isMaxLength(128)),
+  returnUrl: Schema.String.check(Schema.isMaxLength(4_096)),
+  profile: Schema.NullOr(ChatGptReconnectProfile),
+});
+export type ChatGptHandoffInput = typeof ChatGptHandoffInput.Type;
+export const ChatGptHandoffState = Schema.Union([
+  Schema.Struct({ phase: Schema.Literal("auth"), state: ProviderAuthState }),
+  Schema.Struct({ phase: Schema.Literal("finished"), profile: ChatGptTransferredProfile }),
+]);
+export type ChatGptHandoffState = typeof ChatGptHandoffState.Type;
diff --git a/packages/contracts/src/providerUsageLimits.ts b/packages/contracts/src/providerUsageLimits.ts
index 0f126f291aec..c692a9b7d519 100644
--- a/packages/contracts/src/providerUsageLimits.ts
+++ b/packages/contracts/src/providerUsageLimits.ts
@@ -50,7 +50,16 @@ export type ServerProviderResetCredits = typeof ServerProviderResetCredits.Type;
 export const ServerProviderUsageLimits = Schema.Struct({
   checkedAt: IsoDateTime,
   windows: ForwardCompatibleArray(ServerProviderUsageWindow),
+  /** Opaque credential identity when the provider does not report an account. */
+  credentialFingerprint: Schema.optional(TrimmedNonEmptyString),
   resetCredits: Schema.optional(ServerProviderResetCredits),
+  /** Provider-owned usage settings when quota windows are not available to the client. */
+  externalUsage: Schema.optional(
+    Schema.Struct({
+      label: TrimmedNonEmptyString,
+      url: TrimmedNonEmptyString,
+    }),
+  ),
   unavailable: Schema.optional(
     Schema.Struct({
       reason: Schema.Literals(["unsupported", "probeFailed"]),
diff --git a/packages/contracts/src/pullRequest.test.ts b/packages/contracts/src/pullRequest.test.ts
index 9ea74eb78736..3d979e852abc 100644
--- a/packages/contracts/src/pullRequest.test.ts
+++ b/packages/contracts/src/pullRequest.test.ts
@@ -92,7 +92,7 @@ describe("PullRequestListResult", () => {
   it("round-trips through the JSON codec the RPC serializes with", () => {
     const codec = Schema.toCodecJson(PullRequestListResult);
 
-    const decoded = Schema.decodeUnknownSync(codec)(Schema.encodeUnknownSync(codec)(LIST_RESULT));
+    const decoded = Schema.decodeSync(codec)(Schema.encodeUnknownSync(codec)(LIST_RESULT));
 
     expect(decoded).toStrictEqual(LIST_RESULT);
   });
diff --git a/packages/contracts/src/pullRequest.ts b/packages/contracts/src/pullRequest.ts
index 1a3c2d50b209..7a249cefb373 100644
--- a/packages/contracts/src/pullRequest.ts
+++ b/packages/contracts/src/pullRequest.ts
@@ -1277,9 +1277,9 @@ const PROVIDER_REQUIREMENT: Partial<
   },
   bitbucket: {
     missing:
-      "Bitbucket needs API credentials on the server. Set T3CODE_BITBUCKET_EMAIL and T3CODE_BITBUCKET_API_TOKEN, or T3CODE_BITBUCKET_ACCESS_TOKEN.",
+      "Bitbucket needs API credentials on the server. Add them in Settings → Source Control.",
     unauthenticated:
-      "Bitbucket rejected the configured credentials. Check T3CODE_BITBUCKET_EMAIL and T3CODE_BITBUCKET_API_TOKEN.",
+      "Bitbucket rejected the configured credentials. Check them in Settings → Source Control.",
   },
 };
 
diff --git a/packages/contracts/src/relay.ts b/packages/contracts/src/relay.ts
index 8b6562497681..8b1e310b8b8d 100644
--- a/packages/contracts/src/relay.ts
+++ b/packages/contracts/src/relay.ts
@@ -186,6 +186,34 @@ export const RelayManagedEndpointRuntimeConfig = Schema.Struct({
 });
 export type RelayManagedEndpointRuntimeConfig = typeof RelayManagedEndpointRuntimeConfig.Type;
 
+export const RelayManagedEndpointRecoveryRequest = Schema.Struct({
+  cloudUserId: TrimmedNonEmptyString,
+  origin: RelayManagedEndpointOrigin,
+  proof: TrimmedNonEmptyString,
+});
+export type RelayManagedEndpointRecoveryRequest = typeof RelayManagedEndpointRecoveryRequest.Type;
+
+export const RelayManagedEndpointRecoveryRegistrationRequest = Schema.Struct({
+  cloudUserId: TrimmedNonEmptyString,
+  tunnelId: TrimmedNonEmptyString,
+  origin: RelayManagedEndpointOrigin,
+  proof: TrimmedNonEmptyString,
+});
+export type RelayManagedEndpointRecoveryRegistrationRequest =
+  typeof RelayManagedEndpointRecoveryRegistrationRequest.Type;
+
+export const RelayManagedEndpointRecoveryRegistrationResponse = Schema.Struct({
+  status: Schema.Literals(["ready", "recovery_required"]),
+});
+export type RelayManagedEndpointRecoveryRegistrationResponse =
+  typeof RelayManagedEndpointRecoveryRegistrationResponse.Type;
+
+export const RelayManagedEndpointRecoveryResponse = Schema.Struct({
+  endpoint: RelayManagedEndpoint,
+  endpointRuntime: RelayManagedEndpointRuntimeConfig,
+});
+export type RelayManagedEndpointRecoveryResponse = typeof RelayManagedEndpointRecoveryResponse.Type;
+
 export const RelayLinkProofRequest = Schema.Struct({
   challenge: Schema.String,
   relayIssuer: Schema.String,
@@ -213,6 +241,26 @@ const RelaySignedJwtRegisteredClaims = {
   exp: Schema.Int,
 } as const;
 
+export const RelayManagedEndpointRecoveryProofPayload = Schema.Union([
+  Schema.Struct({
+    ...RelaySignedJwtRegisteredClaims,
+    action: Schema.Literal("register"),
+    environmentId: EnvironmentId,
+    cloudUserId: TrimmedNonEmptyString,
+    tunnelId: TrimmedNonEmptyString,
+    origin: RelayManagedEndpointOrigin,
+  }),
+  Schema.Struct({
+    ...RelaySignedJwtRegisteredClaims,
+    action: Schema.Literal("recover"),
+    environmentId: EnvironmentId,
+    cloudUserId: TrimmedNonEmptyString,
+    origin: RelayManagedEndpointOrigin,
+  }),
+]);
+export type RelayManagedEndpointRecoveryProofPayload =
+  typeof RelayManagedEndpointRecoveryProofPayload.Type;
+
 export const RelayAgentActivityPublishProofPayload = Schema.Struct({
   ...RelaySignedJwtRegisteredClaims,
   environmentId: EnvironmentId,
@@ -1090,6 +1138,26 @@ const RelayDpopClientGroup = HttpApiGroup.make("dpopClient")
 
 const RelayServerGroup = HttpApiGroup.make("server")
   .add(
+    HttpApiEndpoint.post(
+      "registerManagedEndpointRecovery",
+      "/v1/environments/:environmentId/tunnel/recovery",
+      {
+        params: Schema.Struct({
+          environmentId: EnvironmentId,
+        }),
+        payload: RelayManagedEndpointRecoveryRegistrationRequest,
+        success: RelayManagedEndpointRecoveryRegistrationResponse,
+        error: RelayAuthAndInternalErrors,
+      },
+    ).annotate(OpenApi.Summary, "Register managed tunnel recovery without provisioning"),
+    HttpApiEndpoint.post("recoverManagedEndpoint", "/v1/environments/:environmentId/tunnel", {
+      params: Schema.Struct({
+        environmentId: EnvironmentId,
+      }),
+      payload: RelayManagedEndpointRecoveryRequest,
+      success: RelayManagedEndpointRecoveryResponse,
+      error: RelayAuthAndInternalErrors,
+    }).annotate(OpenApi.Summary, "Recover an environment's managed tunnel"),
     HttpApiEndpoint.post(
       "publishAgentActivity",
       "/v1/environments/:environmentId/threads/:threadId/agent-activity",
diff --git a/packages/contracts/src/rpc.test.ts b/packages/contracts/src/rpc.test.ts
index 6a9adebd85d6..bdc3448b8563 100644
--- a/packages/contracts/src/rpc.test.ts
+++ b/packages/contracts/src/rpc.test.ts
@@ -13,19 +13,19 @@ import { WsSubscribeServerConfigRpc } from "./rpc.ts";
 describe("subscribeServerConfig payload compatibility", () => {
   it("is accepted by a server whose schema predates the field", () => {
     const oldServerPayload = Schema.Struct({});
-    const decoded = Schema.decodeUnknownExit(oldServerPayload)({ environmentThemes: true });
+    const decoded = Schema.decodeExit(oldServerPayload)({ environmentThemes: true });
     expect(Exit.isSuccess(decoded)).toBe(true);
   });
 
   it("is carried by a server that declares it", () => {
-    const decoded = Schema.decodeUnknownSync(WsSubscribeServerConfigRpc.payloadSchema)({
+    const decoded = Schema.decodeSync(WsSubscribeServerConfigRpc.payloadSchema)({
       environmentThemes: true,
     });
     expect(decoded).toEqual({ environmentThemes: true });
   });
 
   it("stays optional, so a client that never sends it still subscribes", () => {
-    const decoded = Schema.decodeUnknownSync(WsSubscribeServerConfigRpc.payloadSchema)({});
+    const decoded = Schema.decodeSync(WsSubscribeServerConfigRpc.payloadSchema)({});
     expect(decoded).toEqual({});
   });
 });
diff --git a/packages/contracts/src/rpc.ts b/packages/contracts/src/rpc.ts
index 75252ff6a7ae..0e60f571a48a 100644
--- a/packages/contracts/src/rpc.ts
+++ b/packages/contracts/src/rpc.ts
@@ -1,11 +1,22 @@
+import {
+  ChatGptReconnectProfileInput,
+  ChatGptReconnectProfile,
+  ChatGptImportProfileInput,
+  ChatGptHandoffInput,
+  ChatGptHandoffState,
+} from "./providerSetup.ts";
 import * as Schema from "effect/Schema";
 import * as Rpc from "effect/unstable/rpc/Rpc";
 import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
 import { NonNegativeInt, TrimmedNonEmptyString } from "./baseSchemas.ts";
 import {
+  CodexAuthCallbackInput,
+  CodexAuthCallbackState,
   ProviderAuthCancelInput,
   ProviderAuthCompleteInput,
   ProviderAuthState,
+  ProviderAuthStartInput,
+  ProviderAuthRespondInput,
   ProviderInstallCancelInput,
   ProviderInstallState,
   ProviderSetupError,
@@ -317,6 +328,11 @@ export const WS_METHODS = {
   providerAuthStart: "provider.auth.start",
   providerConsumeResetCredit: "provider.consumeResetCredit",
   providerAuthComplete: "provider.auth.complete",
+  chatGptReconnectProfile: "provider.chatgpt.reconnect-profile",
+  chatGptImportProfile: "provider.chatgpt.import-profile",
+  chatGptHandoffSubscribe: "provider.chatgpt.handoff.subscribe",
+  codexAuthCallbackSubscribe: "provider.codex.auth-callback.subscribe",
+  providerAuthRespond: "provider.auth.respond",
   providerAuthCancel: "provider.auth.cancel",
   providerAuthLogout: "provider.auth.logout",
   providerAuthSubscribe: "provider.auth.subscribe",
@@ -494,7 +510,8 @@ const WsServerRefreshProvidersRpc = Rpc.make(WS_METHODS.serverRefreshProviders,
      */
     instanceId: Schema.optional(ProviderInstanceId),
     cwd: Schema.optional(TrimmedNonEmptyString),
-    /** Explicit user request. Background status refreshes must not open agent sessions. */
+    /** Explicit user request: bypass T3-owned caches and rediscover models.
+     * Background status refreshes must not open agent sessions. */
     refreshModels: Schema.optional(Schema.Boolean),
   }),
   success: ServerProviderUpdatedPayload,
@@ -516,7 +533,13 @@ const WsProviderConsumeResetCreditRpc = Rpc.make(WS_METHODS.providerConsumeReset
 });
 
 const WsProviderAuthStartRpc = Rpc.make(WS_METHODS.providerAuthStart, {
-  payload: ProviderSetupInput,
+  payload: ProviderAuthStartInput,
+  success: ProviderAuthState,
+  error: ProviderSetupRpcError,
+});
+
+const WsProviderAuthRespondRpc = Rpc.make(WS_METHODS.providerAuthRespond, {
+  payload: ProviderAuthRespondInput,
   success: ProviderAuthState,
   error: ProviderSetupRpcError,
 });
@@ -527,6 +550,29 @@ const WsProviderAuthCompleteRpc = Rpc.make(WS_METHODS.providerAuthComplete, {
   error: ProviderSetupRpcError,
 });
 
+const WsChatGptReconnectProfileRpc = Rpc.make(WS_METHODS.chatGptReconnectProfile, {
+  payload: ChatGptReconnectProfileInput,
+  success: Schema.NullOr(ChatGptReconnectProfile),
+  error: ProviderSetupRpcError,
+});
+const WsChatGptImportProfileRpc = Rpc.make(WS_METHODS.chatGptImportProfile, {
+  payload: ChatGptImportProfileInput,
+  success: ProviderAuthState,
+  error: ProviderSetupRpcError,
+});
+const WsChatGptHandoffSubscribeRpc = Rpc.make(WS_METHODS.chatGptHandoffSubscribe, {
+  payload: ChatGptHandoffInput,
+  success: ChatGptHandoffState,
+  error: ProviderSetupRpcError,
+  stream: true,
+});
+const WsCodexAuthCallbackSubscribeRpc = Rpc.make(WS_METHODS.codexAuthCallbackSubscribe, {
+  payload: CodexAuthCallbackInput,
+  success: CodexAuthCallbackState,
+  error: ProviderSetupRpcError,
+  stream: true,
+});
+
 const WsProviderAuthCancelRpc = Rpc.make(WS_METHODS.providerAuthCancel, {
   payload: ProviderAuthCancelInput,
   success: ProviderAuthState,
@@ -1431,6 +1477,11 @@ export const WsRpcGroup = RpcGroup.make(
   WsProviderConsumeResetCreditRpc,
   WsProviderAuthStartRpc,
   WsProviderAuthCompleteRpc,
+  WsChatGptReconnectProfileRpc,
+  WsChatGptImportProfileRpc,
+  WsChatGptHandoffSubscribeRpc,
+  WsCodexAuthCallbackSubscribeRpc,
+  WsProviderAuthRespondRpc,
   WsProviderAuthCancelRpc,
   WsProviderAuthLogoutRpc,
   WsProviderAuthSubscribeRpc,
diff --git a/packages/contracts/src/server.ts b/packages/contracts/src/server.ts
index 49a377208799..0c2498ef6471 100644
--- a/packages/contracts/src/server.ts
+++ b/packages/contracts/src/server.ts
@@ -63,6 +63,8 @@ export const ServerProviderAuth = Schema.Struct({
   type: Schema.optional(TrimmedNonEmptyString),
   label: Schema.optional(TrimmedNonEmptyString),
   email: Schema.optional(TrimmedNonEmptyString),
+  subscriptionSharing: Schema.optional(Schema.Boolean),
+  profileId: Schema.optional(TrimmedNonEmptyString),
 });
 export type ServerProviderAuth = typeof ServerProviderAuth.Type;
 
@@ -148,6 +150,22 @@ export const ServerProviderContinuation = Schema.Struct({
 });
 export type ServerProviderContinuation = typeof ServerProviderContinuation.Type;
 
+export const ServerProviderCompatibilityStatus = Schema.Literals([
+  "unknown",
+  "supported",
+  "graceful",
+  "unsupported",
+  "broken",
+]);
+export const ServerProviderCompatibilityAdvisory = Schema.Struct({
+  status: ServerProviderCompatibilityStatus,
+  latestVersionStatus: Schema.optionalKey(ServerProviderCompatibilityStatus),
+  message: Schema.NullOr(TrimmedNonEmptyString),
+  recommendedVersion: Schema.NullOr(TrimmedNonEmptyString),
+  recommendedRange: Schema.NullOr(TrimmedNonEmptyString),
+});
+export type ServerProviderCompatibilityAdvisory = typeof ServerProviderCompatibilityAdvisory.Type;
+
 export const ServerProviderVersionAdvisoryStatus = Schema.Literals([
   "unknown",
   "current",
@@ -161,6 +179,7 @@ export const ServerProviderVersionAdvisory = Schema.Struct({
   latestVersion: Schema.NullOr(TrimmedNonEmptyString),
   updateCommand: Schema.NullOr(TrimmedNonEmptyString),
   canUpdate: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
+  canInstallVersion: Schema.optionalKey(Schema.Boolean),
   checkedAt: Schema.NullOr(IsoDateTime),
   message: Schema.NullOr(TrimmedNonEmptyString),
 });
@@ -209,6 +228,12 @@ export const ServerProvider = Schema.Struct({
       canInstall: Schema.Boolean,
     }),
   ),
+  runtimePaths: Schema.optionalKey(
+    Schema.Struct({
+      homePath: TrimmedNonEmptyString,
+      shadowHomePath: Schema.NullOr(TrimmedNonEmptyString),
+    }),
+  ),
   enabled: Schema.Boolean,
   installed: Schema.Boolean,
   version: Schema.NullOr(TrimmedNonEmptyString),
@@ -234,6 +259,7 @@ export const ServerProvider = Schema.Struct({
   // Absent when the driver has no notion of subscription usage.
   usageLimits: Schema.optional(ServerProviderUsageLimits),
   versionAdvisory: Schema.optionalKey(ServerProviderVersionAdvisory),
+  compatibilityAdvisory: Schema.optionalKey(ServerProviderCompatibilityAdvisory),
   updateState: Schema.optionalKey(ServerProviderUpdateState),
 });
 export type ServerProvider = typeof ServerProvider.Type;
@@ -799,6 +825,7 @@ export type ServerProviderUpdatedPayload = typeof ServerProviderUpdatedPayload.T
 
 export const ServerProviderUpdateInput = Schema.Struct({
   provider: ProviderDriverKind,
+  targetVersion: Schema.optionalKey(TrimmedNonEmptyString),
   instanceId: Schema.optionalKey(ProviderInstanceId),
 });
 export type ServerProviderUpdateInput = typeof ServerProviderUpdateInput.Type;
diff --git a/packages/contracts/src/settings.test.ts b/packages/contracts/src/settings.test.ts
index fe0fb9165cb3..446e6db8193c 100644
--- a/packages/contracts/src/settings.test.ts
+++ b/packages/contracts/src/settings.test.ts
@@ -301,6 +301,23 @@ describe("ClientSettings diff colors", () => {
   });
 });
 
+describe("ClientSettings chat width", () => {
+  it("keeps the comfortable width for existing settings without a saved width", () => {
+    expect(decodeClientSettings({}).chatWidth).toBe("comfortable");
+  });
+
+  it.each(["comfortable", "wide", "full"])("round-trips the %s width", (chatWidth) => {
+    const settings = decodeClientSettings({ chatWidth });
+    expect(encodeClientSettings(settings).chatWidth).toBe(chatWidth);
+    expect(decodeClientSettingsPatch({ chatWidth }).chatWidth).toBe(chatWidth);
+  });
+
+  it("rejects unsupported widths", () => {
+    expect(() => decodeClientSettings({ chatWidth: "huge" })).toThrow();
+    expect(() => decodeClientSettingsPatch({ chatWidth: "huge" })).toThrow();
+  });
+});
+
 describe("ClientSettings load balancing", () => {
   it("requires opt-in when settings are new or omit load balancing", () => {
     expect(decodeClientSettings({}).loadBalancingEnabled).toBe(false);
@@ -754,14 +771,6 @@ describe("ClientSettings pull request merge methods", () => {
 });
 
 describe("ServerSettings.providerInstances (slice-2 invariant)", () => {
-  it("defaults text generation to Luna at low reasoning effort", () => {
-    expect(DEFAULT_SERVER_SETTINGS.textGenerationModelSelection).toEqual({
-      instanceId: ProviderInstanceId.make("codex"),
-      model: "gpt-5.6-luna",
-      options: [{ id: "reasoningEffort", value: "low" }],
-    });
-  });
-
   it("defaults to an empty record so legacy configs without the key still decode", () => {
     expect(DEFAULT_SERVER_SETTINGS.providerInstances).toEqual({});
   });
diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts
index 3ed610cbd112..10ab9d0cca89 100644
--- a/packages/contracts/src/settings.ts
+++ b/packages/contracts/src/settings.ts
@@ -64,7 +64,9 @@ export const DEFAULT_SIDEBAR_PROJECT_SORT_ORDER: SidebarProjectSortOrder = "upda
 
 export const SidebarThreadSortOrder = Schema.Literals(["updated_at", "created_at"]);
 export type SidebarThreadSortOrder = typeof SidebarThreadSortOrder.Type;
-export const DEFAULT_SIDEBAR_THREAD_SORT_ORDER: SidebarThreadSortOrder = "updated_at";
+// Not exported: mobile was the last consumer of the value itself; the
+// wire field keeps its decoding default below.
+const DEFAULT_SIDEBAR_THREAD_SORT_ORDER: SidebarThreadSortOrder = "updated_at";
 
 export const SidebarProjectGroupingMode = Schema.Literals([
   "repository",
@@ -366,6 +368,10 @@ export const LoadBalancingWeights = Schema.Record(
 
 export const DiffColorScheme = Schema.Literals(["red-green", "blue-orange"]);
 
+/** Maximum width of the chat timeline and composer on wide screens. */
+export const ChatWidth = Schema.Literals(["comfortable", "wide", "full"]);
+export type ChatWidth = typeof ChatWidth.Type;
+
 export const ClientSettingsSchema = Schema.Struct({
   notificationMode: NotificationMode.pipe(
     Schema.withDecodingDefault(Effect.succeed("off" as const)),
@@ -374,6 +380,7 @@ export const ClientSettingsSchema = Schema.Struct({
   diffColorScheme: DiffColorScheme.pipe(
     Schema.withDecodingDefault(Effect.succeed("red-green" as const)),
   ),
+  chatWidth: ChatWidth.pipe(Schema.withDecodingDefault(Effect.succeed("comfortable" as const))),
   loadBalancingEnabled: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
   loadBalancingWeights: LoadBalancingWeights.pipe(Schema.withDecodingDefault(Effect.succeed({}))),
   appearanceContrast: AppearanceContrast.pipe(
@@ -649,6 +656,9 @@ function makeProviderSettingsSchema<const Fields extends Schema.Struct.Fields>(
 
 export const CodexSettings = makeProviderSettingsSchema(
   {
+    setupMode: Schema.optionalKey(Schema.Literals(["managed", "existing"])).pipe(
+      Schema.annotateKey({ providerSettingsForm: { hidden: true } }),
+    ),
     enabled: Schema.Boolean.pipe(
       Schema.withDecodingDefault(Effect.succeed(true)),
       Schema.annotateKey({ providerSettingsForm: { hidden: true } }),
@@ -1043,6 +1053,19 @@ export const UsageLimitSourceConfig = Schema.Struct({
 });
 export type UsageLimitSourceConfig = typeof UsageLimitSourceConfig.Type;
 
+/**
+ * Bitbucket API credentials for this environment, used before the
+ * `T3CODE_BITBUCKET_*` environment variables. The tokens live in the server's
+ * secret store; settings and clients only see a redaction marker when one is
+ * set. The access token wins when both kinds are configured.
+ */
+export const BitbucketSettings = Schema.Struct({
+  email: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))),
+  accessToken: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))),
+  apiToken: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))),
+});
+export type BitbucketSettings = typeof BitbucketSettings.Type;
+
 export const ObservabilitySettings = Schema.Struct({
   otlpTracesUrl: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))),
   otlpMetricsUrl: TrimmedString.pipe(Schema.withDecodingDefault(Effect.succeed(""))),
@@ -1229,9 +1252,7 @@ export type StorageCleanupSettings = typeof StorageCleanupSettings.Type;
 export const ServerSettings = Schema.Struct({
   worktreeCleanup: WorktreeCleanup.pipe(Schema.withDecodingDefault(Effect.succeed(null))),
   storageCleanup: StorageCleanupSettings.pipe(
-    Schema.withDecodingDefault(
-      Effect.succeed(Schema.decodeUnknownSync(StorageCleanupSettings)({})),
-    ),
+    Schema.withDecodingDefault(Effect.succeed(Schema.decodeSync(StorageCleanupSettings)({}))),
   ),
   // How assistant text reaches clients during a turn. Deliberately a fresh
   // key (was `enableLegacyTokenStreaming`, before that
@@ -1422,11 +1443,16 @@ export const ServerSettings = Schema.Struct({
     Schema.withDecodingDefault(Effect.succeed({})),
   ),
   observability: ObservabilitySettings.pipe(Schema.withDecodingDefault(Effect.succeed({}))),
+  bitbucket: BitbucketSettings.pipe(Schema.withDecodingDefault(Effect.succeed({}))),
   // Keyed by a user-chosen id so a source keeps its rows across edits. Entries
   // this build cannot decode round-trip untouched, as provider instances do.
   usageLimitSources: Schema.Record(UsageLimitSourceId, UsageLimitSourceConfig).pipe(
     Schema.withDecodingDefault(Effect.succeed({})),
   ),
+  /** Allows this server to read the Cursor CLI's macOS Keychain login for account usage. */
+  cursorKeychainUsageEnabled: Schema.Boolean.pipe(
+    Schema.withDecodingDefault(Effect.succeed(false)),
+  ),
   /** Exact model IDs, applied to past and future usage on this environment. */
   usagePriceOverrides: Schema.Record(TrimmedNonEmptyString, UsageModelPriceOverride).pipe(
     Schema.withDecodingDefault(Effect.succeed({})),
@@ -1689,6 +1715,14 @@ export const ServerSettingsPatch = Schema.Struct({
       otlpLogsUrl: Schema.optionalKey(TrimmedString),
     }),
   ),
+  /** An empty token clears it; an omitted one keeps what the server has. */
+  bitbucket: Schema.optionalKey(
+    Schema.Struct({
+      email: Schema.optionalKey(TrimmedString),
+      accessToken: Schema.optionalKey(TrimmedString),
+      apiToken: Schema.optionalKey(TrimmedString),
+    }),
+  ),
   providers: Schema.optionalKey(
     Schema.Struct({
       codex: Schema.optionalKey(CodexSettingsPatch),
@@ -1711,6 +1745,7 @@ export const ServerSettingsPatch = Schema.Struct({
   usageLimitSources: Schema.optionalKey(
     Schema.Record(UsageLimitSourceId, Schema.NullOr(UsageLimitSourceConfig)),
   ),
+  cursorKeychainUsageEnabled: Schema.optionalKey(Schema.Boolean),
   /** Each entry replaces one model's rates; `null` restores automatic pricing. */
   usagePriceOverrides: Schema.optionalKey(
     Schema.Record(TrimmedNonEmptyString, Schema.NullOr(UsageModelPriceOverride)),
@@ -1722,6 +1757,7 @@ export const ClientSettingsPatch = Schema.Struct({
   notificationMode: Schema.optionalKey(NotificationMode),
   inAppNotificationsEnabled: Schema.optionalKey(Schema.Boolean),
   diffColorScheme: Schema.optionalKey(DiffColorScheme),
+  chatWidth: Schema.optionalKey(ChatWidth),
   loadBalancingEnabled: Schema.optionalKey(Schema.Boolean),
   loadBalancingWeights: Schema.optionalKey(LoadBalancingWeights),
   appearanceContrast: Schema.optionalKey(AppearanceContrast),
diff --git a/packages/contracts/src/usage.ts b/packages/contracts/src/usage.ts
index 29fb75bf949c..97db8594379a 100644
--- a/packages/contracts/src/usage.ts
+++ b/packages/contracts/src/usage.ts
@@ -1,38 +1,43 @@
 /**
  * Usage reporting contract.
  *
- * Each environment scans the provider CLIs' own on-disk session transcripts
- * (`~/.claude/projects/**\/*.jsonl`, `~/.codex/sessions/**\/*.jsonl`,
- * `~/.grok/sessions/**\/updates.jsonl`) rather than relying on T3 Code's own
- * orchestration projections, so usage stays complete even for turns that were
- * never driven through T3 Code. This mirrors the approach `ccusage` takes.
+ * Each environment scans native session files and databases, including work
+ * driven outside T3 Code. Source status describes gaps in local coverage.
  *
- * Environments return pre-aggregated `(day, hourStart?, provider, model)`
+ * Environments return pre-aggregated `(day, hourStart?, provider, model, sourcePath?)`
  * buckets. Raw transcript records never cross the wire.
  *
  * @module usage
  */
 import * as Schema from "effect/Schema";
 
-import { NonNegativeInt, TrimmedNonEmptyString } from "./baseSchemas.ts";
+import { ForwardCompatibleArray, NonNegativeInt, TrimmedNonEmptyString } from "./baseSchemas.ts";
 
 /**
  * Bumped whenever the shape of {@link UsageSummary} changes incompatibly. The
  * client renders partial coverage when an environment reports an older version
  * rather than failing the whole page.
+ * Adding providers or other array-element variants is additive: unknown
+ * entries are skipped on decode and do not require a version bump.
  */
-export const USAGE_CONTRACT_VERSION = 5 as const;
+export const USAGE_CONTRACT_VERSION = 6 as const;
 
 /**
  * Oldest {@link UsageSummary} version a current client will still merge.
  *
- * v5 only adds `grok` to {@link UsageProviderKind}; v4 Claude/Codex buckets
- * remain valid, so mixed-version environments keep those totals instead of
- * treating every older server as stale.
+ * v5/v6 add providers and optional source attribution; v4 Claude/Codex
+ * buckets remain valid in mixed-version environments.
  */
 export const USAGE_MERGE_COMPATIBLE_SINCE = 4 as const;
 
-export const UsageProviderKind = Schema.Literals(["claude", "codex", "grok"]);
+export const UsageProviderKind = Schema.Literals([
+  "claude",
+  "codex",
+  "grok",
+  "cursor",
+  "opencode",
+  "antigravity",
+]);
 export type UsageProviderKind = typeof UsageProviderKind.Type;
 
 /**
@@ -93,6 +98,8 @@ export const UsageBucket = Schema.Struct({
   hourStart: Schema.optional(TrimmedNonEmptyString),
   provider: UsageProviderKind,
   model: TrimmedNonEmptyString,
+  /** Source directory, so overlapping multi-home environments merge once per source. */
+  sourcePath: Schema.optional(TrimmedNonEmptyString),
   totals: UsageTokenTotals,
   costUsd: Schema.Number,
   /**
@@ -151,6 +158,8 @@ export const UsageSource = Schema.Struct({
    */
   distinctSessions: NonNegativeInt,
   message: Schema.NullOr(TrimmedNonEmptyString),
+  /** An action the client can offer to make this source available. */
+  action: Schema.optionalKey(Schema.Literal("enableCursorKeychain")),
 });
 export type UsageSource = typeof UsageSource.Type;
 
@@ -194,8 +203,8 @@ export const UsageSummary = Schema.Struct({
   timeZone: TrimmedNonEmptyString,
   sinceDay: UsageDay,
   untilDay: UsageDay,
-  buckets: Schema.Array(UsageBucket),
-  sources: Schema.Array(UsageSource),
+  buckets: ForwardCompatibleArray(UsageBucket),
+  sources: ForwardCompatibleArray(UsageSource),
   pricing: UsagePricing,
   /** Wall-clock cost of the scan, surfaced in diagnostics. */
   scanDurationMs: NonNegativeInt,
diff --git a/packages/effect-acp/src/client.ts b/packages/effect-acp/src/client.ts
index 27203c20c627..c3f4e7644fc9 100644
--- a/packages/effect-acp/src/client.ts
+++ b/packages/effect-acp/src/client.ts
@@ -346,11 +346,9 @@ export const make = Effect.fn("effect-acp/AcpClient.make")(function* (
     registration: BufferedNotificationHandler<A>,
     notification: A,
   ) =>
-    Effect.forEach(
-      registration.handlers,
-      (handler) => handler(notification).pipe(Effect.catch(() => Effect.void)),
-      { discard: true },
-    );
+    Effect.forEach(registration.handlers, (handler) => handler(notification).pipe(Effect.ignore), {
+      discard: true,
+    });
 
   const flushBufferedNotifications = <A>(registration: BufferedNotificationHandler<A>) =>
     Effect.suspend(() => {
diff --git a/packages/effect-acp/src/protocol.ts b/packages/effect-acp/src/protocol.ts
index f74a8ea29e37..a84c2f5a57b4 100644
--- a/packages/effect-acp/src/protocol.ts
+++ b/packages/effect-acp/src/protocol.ts
@@ -216,7 +216,7 @@ export const makeAcpPatchedProtocol = Effect.fn("makeAcpPatchedProtocol")(functi
     Queue.offer(notificationQueue, notification).pipe(
       Effect.andThen(
         options.onNotification
-          ? options.onNotification(notification).pipe(Effect.catch(() => Effect.void))
+          ? options.onNotification(notification).pipe(Effect.ignore)
           : Effect.void,
       ),
       Effect.asVoid,
diff --git a/packages/effect-codex-app-server/scripts/generate.ts b/packages/effect-codex-app-server/scripts/generate.ts
index 48509db8cc21..f7cab8e59b93 100644
--- a/packages/effect-codex-app-server/scripts/generate.ts
+++ b/packages/effect-codex-app-server/scripts/generate.ts
@@ -17,7 +17,7 @@ import {
 } from "effect/unstable/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process";
 
-const UPSTREAM_REF = "678157acaa819d5510adfe359abb5d0392cfe461";
+const UPSTREAM_REF = "687a119f0fcaace47e1f1abcc77cec6c813fd6da";
 const USER_AGENT = "effect-codex-app-server-generator";
 const GITHUB_API_BASE =
   "https://api.github.com/repos/openai/codex/contents/codex-rs/app-server-protocol";
@@ -145,112 +145,13 @@ const ManualSchemas: Record<string, Schema.Json> = {
   },
 };
 
-// Codex 0.150 added these multi-agent values before our next full protocol
-// refresh. Keep every generated response namespace compatible with them.
-const Codex0150DefinitionSchemas: Record<string, Schema.Json> = {
-  CollabAgentTool: {
-    type: "string",
-    enum: [
-      "spawnAgent",
-      "sendInput",
-      "resumeAgent",
-      "wait",
-      "closeAgent",
-      "sendMessage",
-      "followupTask",
-      "interruptAgent",
-      "listAgents",
-    ],
-  },
-  CollabAgentToolCallStatus: {
-    type: "string",
-    enum: ["inProgress", "completed", "failed", "interrupted"],
-  },
-  PlanType: {
-    type: "string",
-    enum: [
-      "free",
-      "go",
-      "plus",
-      "pro",
-      "prolite",
-      "team",
-      "self_serve_business_prolite",
-      "self_serve_business_usage_based",
-      "business",
-      "ent26",
-      "enterprise_cbp_automation",
-      "enterprise_cbp_usage_based",
-      "enterprise",
-      "edu",
-      "edu_plus",
-      "edu_pro",
-      "unknown",
-    ],
-  },
-  SubAgentActivityKind: {
-    type: "string",
-    enum: ["started", "interacted", "interrupted", "completed"],
-  },
+// Codex adds plan slugs between our protocol refreshes (0.159 added `promax`).
+// T3 Code only uses the plan for labels, so an unknown slug must not fail the
+// whole `account/read` decode and take the provider down with it.
+const DefinitionOverrides: Record<string, Schema.Json> = {
+  PlanType: { type: "string" },
 };
 
-// Pinned protocol JSON omits later CodexErrorInfo variants. Keep historical
-// thread payloads decodable; do not fold unknown values into "other".
-const CodexErrorInfoCompatibilityValues = [
-  "rateLimitExceeded",
-  "misalignmentPolicyViolation",
-] as const;
-
-const CodexErrorInfoCompatibilityExports = new Set([
-  "V2ThreadReadResponse",
-  "V2ThreadResumeResponse",
-  "V2ThreadRollbackResponse",
-  "V2ThreadForkResponse",
-  "V2TurnCompletedNotification",
-]);
-
-function applyCodex0151DefinitionCompatibility(
-  exportName: string,
-  definitionName: string,
-  definitionSchema: Schema.Json,
-): Schema.Json {
-  if (
-    !CodexErrorInfoCompatibilityExports.has(exportName) ||
-    definitionName !== "CodexErrorInfo" ||
-    typeof definitionSchema !== "object"
-  ) {
-    return definitionSchema;
-  }
-
-  const schema = definitionSchema as {
-    readonly oneOf?: ReadonlyArray<{ readonly enum?: ReadonlyArray<string> }>;
-  };
-  const [firstVariant, ...remainingVariants] = schema.oneOf ?? [];
-  const currentEnum = firstVariant?.enum;
-  if (!currentEnum) {
-    return definitionSchema;
-  }
-
-  const missingValues = CodexErrorInfoCompatibilityValues.filter(
-    (value) => !currentEnum.includes(value),
-  );
-  if (missingValues.length === 0) {
-    return definitionSchema;
-  }
-
-  const enumValues = [...currentEnum];
-  const otherIndex = enumValues.indexOf("other");
-  const nextEnum =
-    otherIndex === -1
-      ? [...enumValues, ...missingValues]
-      : [...enumValues.slice(0, otherIndex), ...missingValues, ...enumValues.slice(otherIndex)];
-
-  return {
-    ...definitionSchema,
-    oneOf: [{ ...firstVariant, enum: nextEnum }, ...remainingVariants],
-  };
-}
-
 const getGeneratedPaths = Effect.fn("getGeneratedPaths")(function* () {
   const path = yield* Path.Path;
   const generatedDir = path.join(import.meta.dirname, "..", "src", "_generated");
@@ -269,8 +170,13 @@ const ensureGeneratedDir = Effect.fn("ensureGeneratedDir")(function* () {
 });
 
 const fetchText = Effect.fn("fetchText")(function* (url: string) {
+  // Unauthenticated GitHub API calls are capped at 60/hour; set GITHUB_TOKEN to lift that.
+  const token = process.env.GITHUB_TOKEN;
   return yield* HttpClientRequest.get(url).pipe(
     HttpClientRequest.setHeader("user-agent", USER_AGENT),
+    token && url.startsWith("https://api.github.com/")
+      ? HttpClientRequest.bearerToken(token)
+      : (request) => request,
     HttpClient.execute,
     Effect.flatMap(HttpClientResponse.filterStatusOk),
     Effect.flatMap((okResponse) => okResponse.text),
@@ -387,59 +293,82 @@ function stripNullDefaults(value: Schema.Json): Schema.Json {
   ) as Schema.Json;
 }
 
-// Codex 0.153 adds async questions to agent messages. Keep older protocol
-// fields until the next full refresh, including every thread history namespace.
-function addAsyncQuestionFields(value: Schema.Json): Schema.Json {
-  if (Array.isArray(value)) {
-    return value.map(addAsyncQuestionFields);
-  }
-  if (value === null || typeof value !== "object") {
+type JsonSchemaNode = { readonly [key: string]: Schema.Json };
+
+function isJsonSchemaNode(value: Schema.Json | undefined): value is JsonSchemaNode {
+  return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+
+// Adapts Codex's JSON Schema to Effect's importer, visiting only schema
+// positions so a field literally named "properties" is left alone:
+// - Effect imports an object without additionalProperties as an open record.
+//   Codex omits it for plain structs, so close objects that list properties.
+// - Effect cannot intersect shared object fields with object alternatives,
+//   which Codex uses for "one of these keys plus shared fields"
+//   (image_url | file_id). Fold the shared fields into each alternative.
+function adaptSchemaForEffect(value: Schema.Json): Schema.Json {
+  if (!isJsonSchemaNode(value)) {
     return value;
   }
-  const properties = "properties" in value ? value.properties : undefined;
-  const itemType =
-    properties && typeof properties === "object" && "type" in properties
-      ? properties.type
-      : undefined;
+  const node: Record<string, Schema.Json> = { ...value };
+  for (const key of ["items", "additionalProperties"]) {
+    const child = node[key];
+    if (isJsonSchemaNode(child)) node[key] = adaptSchemaForEffect(child);
+  }
+  for (const key of ["anyOf", "oneOf", "allOf"]) {
+    const child = node[key];
+    if (Array.isArray(child)) node[key] = child.map(adaptSchemaForEffect);
+  }
+  for (const key of ["properties", "definitions"]) {
+    const child = node[key];
+    if (isJsonSchemaNode(child)) {
+      node[key] = Object.fromEntries(
+        Object.entries(child).map(([name, schema]) => [name, adaptSchemaForEffect(schema)]),
+      );
+    }
+  }
+
+  const { properties } = node;
   if (
-    properties &&
-    typeof properties === "object" &&
-    itemType &&
-    typeof itemType === "object" &&
-    "enum" in itemType &&
-    Array.isArray(itemType.enum) &&
-    itemType.enum.includes("agentMessage")
+    isJsonSchemaNode(properties) &&
+    Object.keys(properties).length > 0 &&
+    !("additionalProperties" in node)
   ) {
-    return {
-      ...value,
-      properties: {
-        ...Object.fromEntries(Object.entries(properties).filter(([key]) => key !== "type")),
-        delivery: { anyOf: [{ type: "string", enum: ["async"] }, { type: "null" }] },
-        questions: {
-          anyOf: [
-            {
-              type: "array",
-              items: {
-                type: "object",
-                properties: {
-                  title: { type: "string" },
-                  options: {
-                    anyOf: [{ type: "array", items: { type: "string" } }, { type: "null" }],
-                  },
-                },
-                required: ["title"],
-              },
-            },
-            { type: "null" },
-          ],
-        },
-        type: itemType,
-      },
-    };
+    node.additionalProperties = false;
   }
-  return Object.fromEntries(
-    Object.entries(value).map(([key, child]) => [key, addAsyncQuestionFields(child)]),
-  );
+
+  const alternativesKey = "anyOf" in node ? "anyOf" : "oneOf";
+  const alternatives = node[alternativesKey];
+  if (
+    !isJsonSchemaNode(properties) ||
+    !Array.isArray(alternatives) ||
+    !alternatives.every(
+      (alternative) => isJsonSchemaNode(alternative) && alternative.type === "object",
+    )
+  ) {
+    return node;
+  }
+  const {
+    properties: _shared,
+    required,
+    type: _type,
+    additionalProperties: _closed,
+    ...rest
+  } = node;
+  const sharedRequired = Array.isArray(required) ? required : [];
+  return {
+    ...rest,
+    [alternativesKey]: alternatives.map((alternative) => {
+      const branch = alternative as JsonSchemaNode;
+      const branchProperties = isJsonSchemaNode(branch.properties) ? branch.properties : {};
+      const branchRequired = Array.isArray(branch.required) ? branch.required : [];
+      return {
+        ...branch,
+        properties: { ...properties, ...branchProperties },
+        required: [...new Set([...sharedRequired, ...branchRequired])],
+      };
+    }),
+  };
 }
 
 function toPascalCaseMethod(method: string) {
@@ -453,13 +382,14 @@ function toPascalCaseMethod(method: string) {
 }
 
 function parseRequestEntries(fileContents: string): ReadonlyArray<MethodEntry> {
-  const entryPattern = /\{\s*"method":\s*"([^"]+)",\s*id:\s*RequestId,\s*params:\s*([^,}]+)/g;
+  // Optional params render as `params?: Foo | undefined`; their JSON schema is `NullableFoo`.
+  const entryPattern = /\{\s*"method":\s*"([^"]+)",\s*id:\s*RequestId,\s*params(\??):\s*([^,}|]+)/g;
   const entries: Array<MethodEntry> = [];
   let match: RegExpExecArray | null;
   while ((match = entryPattern.exec(fileContents)) !== null) {
     entries.push({
       method: match[1]!,
-      paramsType: match[2]!.trim(),
+      paramsType: `${match[2] ? "Nullable" : ""}${match[3]!.trim()}`,
     });
   }
   return entries;
@@ -507,6 +437,9 @@ function resolveResponseTypeName(
   generatedSchemaNames: ReadonlySet<string>,
 ): string {
   const overrides: Record<string, string> = {
+    "account/gatewayOAuth/cancel": "GatewayOAuthCancelResponse",
+    "account/gatewayOAuth/login": "GatewayOAuthLoginResponse",
+    "account/gatewayOAuth/read": "GatewayOAuthReadResponse",
     "account/logout": "LogoutAccountResponse",
     "account/rateLimits/read": "GetAccountRateLimitsResponse",
     "account/usage/read": "GetAccountTokenUsageResponse",
@@ -649,7 +582,7 @@ function rewriteExternalRefs(
         const definitionName = child.slice("#/definitions/".length);
         const localRewrite = localDefinitionNames.get(definitionName);
         if (localRewrite) {
-          return [key, `#/definitions/${localRewrite}`];
+          return [key, `#/components/schemas/${localRewrite}`];
         }
 
         const candidates = [
@@ -670,7 +603,7 @@ function rewriteExternalRefs(
           throw new Error(`Missing rewritten definition for ref: ${child}`);
         }
 
-        return [key, `#/definitions/${rewritten}`];
+        return [key, `#/components/schemas/${rewritten}`];
       }
 
       return [
@@ -717,13 +650,10 @@ const generateFiles = Effect.fn("generateFiles")(function* () {
     );
 
     for (const [definitionName, definitionSchema] of Object.entries(parsed.definitions ?? {})) {
-      const compatibleDefinitionSchema =
-        Codex0150DefinitionSchemas[definitionName] ??
-        applyCodex0151DefinitionCompatibility(file.exportName, definitionName, definitionSchema);
       aggregateSchemas[localDefinitionNames.get(definitionName)!] = stripNullDefaults(
         normalizeNullableTypes(
           rewriteExternalRefs(
-            compatibleDefinitionSchema,
+            DefinitionOverrides[definitionName] ?? definitionSchema,
             localDefinitionNames,
             file.namespace,
             exportNameByQualifiedName,
@@ -761,7 +691,7 @@ const generateFiles = Effect.fn("generateFiles")(function* () {
   for (const [name, schema] of Object.entries(aggregateSchemas).toSorted(([left], [right]) =>
     left.localeCompare(right),
   )) {
-    aggregateSchemas[name] = addAsyncQuestionFields(schema);
+    aggregateSchemas[name] = adaptSchemaForEffect(schema);
     generator.addSchema(name, aggregateSchemas[name] as never);
   }
 
diff --git a/packages/effect-codex-app-server/src/_generated/meta.gen.ts b/packages/effect-codex-app-server/src/_generated/meta.gen.ts
index 24452e881f66..1c9d47e58523 100644
--- a/packages/effect-codex-app-server/src/_generated/meta.gen.ts
+++ b/packages/effect-codex-app-server/src/_generated/meta.gen.ts
@@ -1,5 +1,5 @@
 // This file is generated by the effect-codex-app-server package. Do not edit manually.
-// Upstream protocol ref: 678157acaa819d5510adfe359abb5d0392cfe461
+// Upstream protocol ref: 687a119f0fcaace47e1f1abcc77cec6c813fd6da
 
 import * as CodexSchema from "./schema.gen.ts";
 
@@ -16,14 +16,24 @@ export const CLIENT_REQUEST_METHODS = {
   "thread/goal/get": "thread/goal/get",
   "thread/goal/clear": "thread/goal/clear",
   "thread/metadata/update": "thread/metadata/update",
+  "thread/attachment/add": "thread/attachment/add",
+  "thread/attachment/list": "thread/attachment/list",
+  "thread/attachment/remove": "thread/attachment/remove",
+  "thread/section/move": "thread/section/move",
   "thread/unarchive": "thread/unarchive",
   "thread/compact/start": "thread/compact/start",
   "thread/shellCommand": "thread/shellCommand",
   "thread/approveGuardianDeniedAction": "thread/approveGuardianDeniedAction",
-  "thread/rollback": "thread/rollback",
+  "thread/revert": "thread/revert",
   "thread/list": "thread/list",
+  "threadSection/list": "threadSection/list",
+  "threadSection/create": "threadSection/create",
+  "threadSection/update": "threadSection/update",
+  "threadSection/delete": "threadSection/delete",
   "thread/loaded/list": "thread/loaded/list",
   "thread/read": "thread/read",
+  "thread/turns/list": "thread/turns/list",
+  "thread/items/list": "thread/items/list",
   "thread/inject_items": "thread/inject_items",
   "skills/list": "skills/list",
   "skills/extraRoots/set": "skills/extraRoots/set",
@@ -33,6 +43,7 @@ export const CLIENT_REQUEST_METHODS = {
   "marketplace/upgrade": "marketplace/upgrade",
   "plugin/list": "plugin/list",
   "plugin/installed": "plugin/installed",
+  "plugin/reconcile": "plugin/reconcile",
   "plugin/read": "plugin/read",
   "plugin/skill/read": "plugin/skill/read",
   "plugin/share/save": "plugin/share/save",
@@ -60,6 +71,9 @@ export const CLIENT_REQUEST_METHODS = {
   "turn/interrupt": "turn/interrupt",
   "review/start": "review/start",
   "model/list": "model/list",
+  "account/gatewayOAuth/read": "account/gatewayOAuth/read",
+  "account/gatewayOAuth/login": "account/gatewayOAuth/login",
+  "account/gatewayOAuth/cancel": "account/gatewayOAuth/cancel",
   "modelProvider/capabilities/read": "modelProvider/capabilities/read",
   "experimentalFeature/list": "experimentalFeature/list",
   "permissionProfile/list": "permissionProfile/list",
@@ -87,6 +101,7 @@ export const CLIENT_REQUEST_METHODS = {
   "config/read": "config/read",
   "externalAgentConfig/detect": "externalAgentConfig/detect",
   "externalAgentConfig/import": "externalAgentConfig/import",
+  "externalAgentConfig/import/recordHistory": "externalAgentConfig/import/recordHistory",
   "externalAgentConfig/import/readHistories": "externalAgentConfig/import/readHistories",
   "config/value/write": "config/value/write",
   "config/batchWrite": "config/batchWrite",
@@ -123,10 +138,15 @@ export const SERVER_NOTIFICATION_METHODS = {
   "thread/deleted": "thread/deleted",
   "thread/unarchived": "thread/unarchived",
   "thread/closed": "thread/closed",
+  "thread/reverted": "thread/reverted",
   "skills/changed": "skills/changed",
   "thread/name/updated": "thread/name/updated",
+  "thread/attachment/updated": "thread/attachment/updated",
   "thread/goal/updated": "thread/goal/updated",
   "thread/goal/cleared": "thread/goal/cleared",
+  "thread/queue/changed": "thread/queue/changed",
+  "project/changed": "project/changed",
+  "thread/project/updated": "thread/project/updated",
   "thread/environment/connected": "thread/environment/connected",
   "thread/environment/disconnected": "thread/environment/disconnected",
   "thread/settings/updated": "thread/settings/updated",
@@ -140,6 +160,7 @@ export const SERVER_NOTIFICATION_METHODS = {
   "item/started": "item/started",
   "item/autoApprovalReview/started": "item/autoApprovalReview/started",
   "item/autoApprovalReview/completed": "item/autoApprovalReview/completed",
+  "autoApprovalReview/strictReviewRequired": "autoApprovalReview/strictReviewRequired",
   "item/completed": "item/completed",
   "rawResponseItem/completed": "rawResponseItem/completed",
   "rawResponse/completed": "rawResponse/completed",
@@ -156,7 +177,9 @@ export const SERVER_NOTIFICATION_METHODS = {
   "item/mcpToolCall/progress": "item/mcpToolCall/progress",
   "mcpServer/oauthLogin/completed": "mcpServer/oauthLogin/completed",
   "mcpServer/startupStatus/updated": "mcpServer/startupStatus/updated",
+  "mcpServer/event/stream/notification": "mcpServer/event/stream/notification",
   "account/updated": "account/updated",
+  "account/gatewayOAuth/changed": "account/gatewayOAuth/changed",
   "account/rateLimits/updated": "account/rateLimits/updated",
   "app/list/updated": "app/list/updated",
   "remoteControl/status/changed": "remoteControl/status/changed",
@@ -169,6 +192,8 @@ export const SERVER_NOTIFICATION_METHODS = {
   "thread/compacted": "thread/compacted",
   "model/rerouted": "model/rerouted",
   "model/verification": "model/verification",
+  "modelProvider/authRecoveryStarted": "modelProvider/authRecoveryStarted",
+  "modelProvider/authRecoveryCompleted": "modelProvider/authRecoveryCompleted",
   "turn/moderationMetadata": "turn/moderationMetadata",
   "model/safetyBuffering/updated": "model/safetyBuffering/updated",
   warning: "warning",
@@ -179,6 +204,9 @@ export const SERVER_NOTIFICATION_METHODS = {
   "fuzzyFileSearch/sessionCompleted": "fuzzyFileSearch/sessionCompleted",
   "thread/realtime/started": "thread/realtime/started",
   "thread/realtime/itemAdded": "thread/realtime/itemAdded",
+  "thread/realtime/item/started": "thread/realtime/item/started",
+  "thread/realtime/item/transcript/delta": "thread/realtime/item/transcript/delta",
+  "thread/realtime/item/completed": "thread/realtime/item/completed",
   "thread/realtime/transcript/delta": "thread/realtime/transcript/delta",
   "thread/realtime/transcript/done": "thread/realtime/transcript/done",
   "thread/realtime/outputAudio/delta": "thread/realtime/outputAudio/delta",
@@ -208,14 +236,24 @@ export interface ClientRequestParamsByMethod {
   readonly "thread/goal/get": CodexSchema.V2ThreadGoalGetParams;
   readonly "thread/goal/clear": CodexSchema.V2ThreadGoalClearParams;
   readonly "thread/metadata/update": CodexSchema.V2ThreadMetadataUpdateParams;
+  readonly "thread/attachment/add": CodexSchema.V2ThreadAttachmentAddParams;
+  readonly "thread/attachment/list": CodexSchema.V2ThreadAttachmentListParams;
+  readonly "thread/attachment/remove": CodexSchema.V2ThreadAttachmentRemoveParams;
+  readonly "thread/section/move": CodexSchema.V2ThreadSectionMoveParams;
   readonly "thread/unarchive": CodexSchema.V2ThreadUnarchiveParams;
   readonly "thread/compact/start": CodexSchema.V2ThreadCompactStartParams;
   readonly "thread/shellCommand": CodexSchema.V2ThreadShellCommandParams;
   readonly "thread/approveGuardianDeniedAction": CodexSchema.V2ThreadApproveGuardianDeniedActionParams;
-  readonly "thread/rollback": CodexSchema.V2ThreadRollbackParams;
+  readonly "thread/revert": CodexSchema.V2ThreadRevertParams;
   readonly "thread/list": CodexSchema.V2ThreadListParams;
+  readonly "threadSection/list": CodexSchema.V2ThreadSectionListParams;
+  readonly "threadSection/create": CodexSchema.V2ThreadSectionCreateParams;
+  readonly "threadSection/update": CodexSchema.V2ThreadSectionUpdateParams;
+  readonly "threadSection/delete": CodexSchema.V2ThreadSectionDeleteParams;
   readonly "thread/loaded/list": CodexSchema.V2ThreadLoadedListParams;
   readonly "thread/read": CodexSchema.V2ThreadReadParams;
+  readonly "thread/turns/list": CodexSchema.V2ThreadTurnsListParams;
+  readonly "thread/items/list": CodexSchema.V2ThreadItemsListParams;
   readonly "thread/inject_items": CodexSchema.V2ThreadInjectItemsParams;
   readonly "skills/list": CodexSchema.V2SkillsListParams;
   readonly "skills/extraRoots/set": CodexSchema.V2SkillsExtraRootsSetParams;
@@ -225,6 +263,7 @@ export interface ClientRequestParamsByMethod {
   readonly "marketplace/upgrade": CodexSchema.V2MarketplaceUpgradeParams;
   readonly "plugin/list": CodexSchema.V2PluginListParams;
   readonly "plugin/installed": CodexSchema.V2PluginInstalledParams;
+  readonly "plugin/reconcile": CodexSchema.V2PluginReconcileParams;
   readonly "plugin/read": CodexSchema.V2PluginReadParams;
   readonly "plugin/skill/read": CodexSchema.V2PluginSkillReadParams;
   readonly "plugin/share/save": CodexSchema.V2PluginShareSaveParams;
@@ -252,6 +291,9 @@ export interface ClientRequestParamsByMethod {
   readonly "turn/interrupt": CodexSchema.V2TurnInterruptParams;
   readonly "review/start": CodexSchema.V2ReviewStartParams;
   readonly "model/list": CodexSchema.V2ModelListParams;
+  readonly "account/gatewayOAuth/read": undefined;
+  readonly "account/gatewayOAuth/login": undefined;
+  readonly "account/gatewayOAuth/cancel": undefined;
   readonly "modelProvider/capabilities/read": CodexSchema.V2ModelProviderCapabilitiesReadParams;
   readonly "experimentalFeature/list": CodexSchema.V2ExperimentalFeatureListParams;
   readonly "permissionProfile/list": CodexSchema.V2PermissionProfileListParams;
@@ -266,9 +308,9 @@ export interface ClientRequestParamsByMethod {
   readonly "account/login/start": CodexSchema.V2LoginAccountParams;
   readonly "account/login/cancel": CodexSchema.V2CancelLoginAccountParams;
   readonly "account/logout": undefined;
-  readonly "account/rateLimits/read": undefined;
+  readonly "account/rateLimits/read": CodexSchema.V2NullableGetAccountRateLimitsParams;
   readonly "account/rateLimitResetCredit/consume": CodexSchema.V2ConsumeAccountRateLimitResetCreditParams;
-  readonly "account/usage/read": undefined;
+  readonly "account/usage/read": CodexSchema.V2NullableGetAccountTokenUsageParams;
   readonly "account/workspaceMessages/read": undefined;
   readonly "account/sendAddCreditsNudgeEmail": CodexSchema.V2SendAddCreditsNudgeEmailParams;
   readonly "feedback/upload": CodexSchema.V2FeedbackUploadParams;
@@ -279,6 +321,7 @@ export interface ClientRequestParamsByMethod {
   readonly "config/read": CodexSchema.V2ConfigReadParams;
   readonly "externalAgentConfig/detect": CodexSchema.V2ExternalAgentConfigDetectParams;
   readonly "externalAgentConfig/import": CodexSchema.V2ExternalAgentConfigImportParams;
+  readonly "externalAgentConfig/import/recordHistory": CodexSchema.V2ExternalAgentConfigImportHistoryRecordParams;
   readonly "externalAgentConfig/import/readHistories": undefined;
   readonly "config/value/write": CodexSchema.V2ConfigValueWriteParams;
   readonly "config/batchWrite": CodexSchema.V2ConfigBatchWriteParams;
@@ -303,14 +346,24 @@ export interface ClientRequestResponsesByMethod {
   readonly "thread/goal/get": CodexSchema.V2ThreadGoalGetResponse;
   readonly "thread/goal/clear": CodexSchema.V2ThreadGoalClearResponse;
   readonly "thread/metadata/update": CodexSchema.V2ThreadMetadataUpdateResponse;
+  readonly "thread/attachment/add": CodexSchema.V2ThreadAttachmentAddResponse;
+  readonly "thread/attachment/list": CodexSchema.V2ThreadAttachmentListResponse;
+  readonly "thread/attachment/remove": CodexSchema.V2ThreadAttachmentRemoveResponse;
+  readonly "thread/section/move": CodexSchema.V2ThreadSectionMoveResponse;
   readonly "thread/unarchive": CodexSchema.V2ThreadUnarchiveResponse;
   readonly "thread/compact/start": CodexSchema.V2ThreadCompactStartResponse;
   readonly "thread/shellCommand": CodexSchema.V2ThreadShellCommandResponse;
   readonly "thread/approveGuardianDeniedAction": CodexSchema.V2ThreadApproveGuardianDeniedActionResponse;
-  readonly "thread/rollback": CodexSchema.V2ThreadRollbackResponse;
+  readonly "thread/revert": CodexSchema.V2ThreadRevertResponse;
   readonly "thread/list": CodexSchema.V2ThreadListResponse;
+  readonly "threadSection/list": CodexSchema.V2ThreadSectionListResponse;
+  readonly "threadSection/create": CodexSchema.V2ThreadSectionCreateResponse;
+  readonly "threadSection/update": CodexSchema.V2ThreadSectionUpdateResponse;
+  readonly "threadSection/delete": CodexSchema.V2ThreadSectionDeleteResponse;
   readonly "thread/loaded/list": CodexSchema.V2ThreadLoadedListResponse;
   readonly "thread/read": CodexSchema.V2ThreadReadResponse;
+  readonly "thread/turns/list": CodexSchema.V2ThreadTurnsListResponse;
+  readonly "thread/items/list": CodexSchema.V2ThreadItemsListResponse;
   readonly "thread/inject_items": CodexSchema.V2ThreadInjectItemsResponse;
   readonly "skills/list": CodexSchema.V2SkillsListResponse;
   readonly "skills/extraRoots/set": CodexSchema.V2SkillsExtraRootsSetResponse;
@@ -320,6 +373,7 @@ export interface ClientRequestResponsesByMethod {
   readonly "marketplace/upgrade": CodexSchema.V2MarketplaceUpgradeResponse;
   readonly "plugin/list": CodexSchema.V2PluginListResponse;
   readonly "plugin/installed": CodexSchema.V2PluginInstalledResponse;
+  readonly "plugin/reconcile": CodexSchema.V2PluginReconcileResponse;
   readonly "plugin/read": CodexSchema.V2PluginReadResponse;
   readonly "plugin/skill/read": CodexSchema.V2PluginSkillReadResponse;
   readonly "plugin/share/save": CodexSchema.V2PluginShareSaveResponse;
@@ -347,6 +401,9 @@ export interface ClientRequestResponsesByMethod {
   readonly "turn/interrupt": CodexSchema.V2TurnInterruptResponse;
   readonly "review/start": CodexSchema.V2ReviewStartResponse;
   readonly "model/list": CodexSchema.V2ModelListResponse;
+  readonly "account/gatewayOAuth/read": CodexSchema.V2GatewayOAuthReadResponse;
+  readonly "account/gatewayOAuth/login": CodexSchema.V2GatewayOAuthLoginResponse;
+  readonly "account/gatewayOAuth/cancel": CodexSchema.V2GatewayOAuthCancelResponse;
   readonly "modelProvider/capabilities/read": CodexSchema.V2ModelProviderCapabilitiesReadResponse;
   readonly "experimentalFeature/list": CodexSchema.V2ExperimentalFeatureListResponse;
   readonly "permissionProfile/list": CodexSchema.V2PermissionProfileListResponse;
@@ -374,6 +431,7 @@ export interface ClientRequestResponsesByMethod {
   readonly "config/read": CodexSchema.V2ConfigReadResponse;
   readonly "externalAgentConfig/detect": CodexSchema.V2ExternalAgentConfigDetectResponse;
   readonly "externalAgentConfig/import": CodexSchema.V2ExternalAgentConfigImportResponse;
+  readonly "externalAgentConfig/import/recordHistory": CodexSchema.V2ExternalAgentConfigImportHistoryRecordResponse;
   readonly "externalAgentConfig/import/readHistories": CodexSchema.V2ExternalAgentConfigImportHistoriesReadResponse;
   readonly "config/value/write": CodexSchema.V2ConfigWriteResponse;
   readonly "config/batchWrite": CodexSchema.V2ConfigWriteResponse;
@@ -423,10 +481,15 @@ export interface ServerNotificationParamsByMethod {
   readonly "thread/deleted": CodexSchema.V2ThreadDeletedNotification;
   readonly "thread/unarchived": CodexSchema.V2ThreadUnarchivedNotification;
   readonly "thread/closed": CodexSchema.V2ThreadClosedNotification;
+  readonly "thread/reverted": CodexSchema.V2ThreadRevertedNotification;
   readonly "skills/changed": CodexSchema.V2SkillsChangedNotification;
   readonly "thread/name/updated": CodexSchema.V2ThreadNameUpdatedNotification;
+  readonly "thread/attachment/updated": CodexSchema.V2ThreadAttachmentUpdatedNotification;
   readonly "thread/goal/updated": CodexSchema.V2ThreadGoalUpdatedNotification;
   readonly "thread/goal/cleared": CodexSchema.V2ThreadGoalClearedNotification;
+  readonly "thread/queue/changed": CodexSchema.V2ThreadQueueChangedNotification;
+  readonly "project/changed": CodexSchema.V2ProjectChangedNotification;
+  readonly "thread/project/updated": CodexSchema.V2ThreadProjectUpdatedNotification;
   readonly "thread/environment/connected": CodexSchema.V2EnvironmentConnectionNotification;
   readonly "thread/environment/disconnected": CodexSchema.V2EnvironmentConnectionNotification;
   readonly "thread/settings/updated": CodexSchema.V2ThreadSettingsUpdatedNotification;
@@ -440,6 +503,7 @@ export interface ServerNotificationParamsByMethod {
   readonly "item/started": CodexSchema.V2ItemStartedNotification;
   readonly "item/autoApprovalReview/started": CodexSchema.V2ItemGuardianApprovalReviewStartedNotification;
   readonly "item/autoApprovalReview/completed": CodexSchema.V2ItemGuardianApprovalReviewCompletedNotification;
+  readonly "autoApprovalReview/strictReviewRequired": CodexSchema.V2StrictReviewRequiredNotification;
   readonly "item/completed": CodexSchema.V2ItemCompletedNotification;
   readonly "rawResponseItem/completed": CodexSchema.V2RawResponseItemCompletedNotification;
   readonly "rawResponse/completed": CodexSchema.V2RawResponseCompletedNotification;
@@ -456,7 +520,9 @@ export interface ServerNotificationParamsByMethod {
   readonly "item/mcpToolCall/progress": CodexSchema.V2McpToolCallProgressNotification;
   readonly "mcpServer/oauthLogin/completed": CodexSchema.V2McpServerOauthLoginCompletedNotification;
   readonly "mcpServer/startupStatus/updated": CodexSchema.V2McpServerStatusUpdatedNotification;
+  readonly "mcpServer/event/stream/notification": CodexSchema.V2McpServerEventStreamNotification;
   readonly "account/updated": CodexSchema.V2AccountUpdatedNotification;
+  readonly "account/gatewayOAuth/changed": CodexSchema.V2GatewayOAuthChangedNotification;
   readonly "account/rateLimits/updated": CodexSchema.V2AccountRateLimitsUpdatedNotification;
   readonly "app/list/updated": CodexSchema.V2AppListUpdatedNotification;
   readonly "remoteControl/status/changed": CodexSchema.V2RemoteControlStatusChangedNotification;
@@ -469,6 +535,8 @@ export interface ServerNotificationParamsByMethod {
   readonly "thread/compacted": CodexSchema.V2ContextCompactedNotification;
   readonly "model/rerouted": CodexSchema.V2ModelReroutedNotification;
   readonly "model/verification": CodexSchema.V2ModelVerificationNotification;
+  readonly "modelProvider/authRecoveryStarted": CodexSchema.V2AuthRecoveryNotification;
+  readonly "modelProvider/authRecoveryCompleted": CodexSchema.V2AuthRecoveryNotification;
   readonly "turn/moderationMetadata": CodexSchema.V2TurnModerationMetadataNotification;
   readonly "model/safetyBuffering/updated": CodexSchema.V2ModelSafetyBufferingUpdatedNotification;
   readonly warning: CodexSchema.V2WarningNotification;
@@ -479,6 +547,9 @@ export interface ServerNotificationParamsByMethod {
   readonly "fuzzyFileSearch/sessionCompleted": CodexSchema.FuzzyFileSearchSessionCompletedNotification;
   readonly "thread/realtime/started": CodexSchema.V2ThreadRealtimeStartedNotification;
   readonly "thread/realtime/itemAdded": CodexSchema.V2ThreadRealtimeItemAddedNotification;
+  readonly "thread/realtime/item/started": CodexSchema.V2ThreadRealtimeItemStartedNotification;
+  readonly "thread/realtime/item/transcript/delta": CodexSchema.V2ThreadRealtimeItemTranscriptDeltaNotification;
+  readonly "thread/realtime/item/completed": CodexSchema.V2ThreadRealtimeItemCompletedNotification;
   readonly "thread/realtime/transcript/delta": CodexSchema.V2ThreadRealtimeTranscriptDeltaNotification;
   readonly "thread/realtime/transcript/done": CodexSchema.V2ThreadRealtimeTranscriptDoneNotification;
   readonly "thread/realtime/outputAudio/delta": CodexSchema.V2ThreadRealtimeOutputAudioDeltaNotification;
@@ -503,14 +574,24 @@ export const CLIENT_REQUEST_PARAMS = {
   "thread/goal/get": CodexSchema.V2ThreadGoalGetParams,
   "thread/goal/clear": CodexSchema.V2ThreadGoalClearParams,
   "thread/metadata/update": CodexSchema.V2ThreadMetadataUpdateParams,
+  "thread/attachment/add": CodexSchema.V2ThreadAttachmentAddParams,
+  "thread/attachment/list": CodexSchema.V2ThreadAttachmentListParams,
+  "thread/attachment/remove": CodexSchema.V2ThreadAttachmentRemoveParams,
+  "thread/section/move": CodexSchema.V2ThreadSectionMoveParams,
   "thread/unarchive": CodexSchema.V2ThreadUnarchiveParams,
   "thread/compact/start": CodexSchema.V2ThreadCompactStartParams,
   "thread/shellCommand": CodexSchema.V2ThreadShellCommandParams,
   "thread/approveGuardianDeniedAction": CodexSchema.V2ThreadApproveGuardianDeniedActionParams,
-  "thread/rollback": CodexSchema.V2ThreadRollbackParams,
+  "thread/revert": CodexSchema.V2ThreadRevertParams,
   "thread/list": CodexSchema.V2ThreadListParams,
+  "threadSection/list": CodexSchema.V2ThreadSectionListParams,
+  "threadSection/create": CodexSchema.V2ThreadSectionCreateParams,
+  "threadSection/update": CodexSchema.V2ThreadSectionUpdateParams,
+  "threadSection/delete": CodexSchema.V2ThreadSectionDeleteParams,
   "thread/loaded/list": CodexSchema.V2ThreadLoadedListParams,
   "thread/read": CodexSchema.V2ThreadReadParams,
+  "thread/turns/list": CodexSchema.V2ThreadTurnsListParams,
+  "thread/items/list": CodexSchema.V2ThreadItemsListParams,
   "thread/inject_items": CodexSchema.V2ThreadInjectItemsParams,
   "skills/list": CodexSchema.V2SkillsListParams,
   "skills/extraRoots/set": CodexSchema.V2SkillsExtraRootsSetParams,
@@ -520,6 +601,7 @@ export const CLIENT_REQUEST_PARAMS = {
   "marketplace/upgrade": CodexSchema.V2MarketplaceUpgradeParams,
   "plugin/list": CodexSchema.V2PluginListParams,
   "plugin/installed": CodexSchema.V2PluginInstalledParams,
+  "plugin/reconcile": CodexSchema.V2PluginReconcileParams,
   "plugin/read": CodexSchema.V2PluginReadParams,
   "plugin/skill/read": CodexSchema.V2PluginSkillReadParams,
   "plugin/share/save": CodexSchema.V2PluginShareSaveParams,
@@ -547,6 +629,9 @@ export const CLIENT_REQUEST_PARAMS = {
   "turn/interrupt": CodexSchema.V2TurnInterruptParams,
   "review/start": CodexSchema.V2ReviewStartParams,
   "model/list": CodexSchema.V2ModelListParams,
+  "account/gatewayOAuth/read": undefined,
+  "account/gatewayOAuth/login": undefined,
+  "account/gatewayOAuth/cancel": undefined,
   "modelProvider/capabilities/read": CodexSchema.V2ModelProviderCapabilitiesReadParams,
   "experimentalFeature/list": CodexSchema.V2ExperimentalFeatureListParams,
   "permissionProfile/list": CodexSchema.V2PermissionProfileListParams,
@@ -561,9 +646,9 @@ export const CLIENT_REQUEST_PARAMS = {
   "account/login/start": CodexSchema.V2LoginAccountParams,
   "account/login/cancel": CodexSchema.V2CancelLoginAccountParams,
   "account/logout": undefined,
-  "account/rateLimits/read": undefined,
+  "account/rateLimits/read": CodexSchema.V2NullableGetAccountRateLimitsParams,
   "account/rateLimitResetCredit/consume": CodexSchema.V2ConsumeAccountRateLimitResetCreditParams,
-  "account/usage/read": undefined,
+  "account/usage/read": CodexSchema.V2NullableGetAccountTokenUsageParams,
   "account/workspaceMessages/read": undefined,
   "account/sendAddCreditsNudgeEmail": CodexSchema.V2SendAddCreditsNudgeEmailParams,
   "feedback/upload": CodexSchema.V2FeedbackUploadParams,
@@ -574,6 +659,8 @@ export const CLIENT_REQUEST_PARAMS = {
   "config/read": CodexSchema.V2ConfigReadParams,
   "externalAgentConfig/detect": CodexSchema.V2ExternalAgentConfigDetectParams,
   "externalAgentConfig/import": CodexSchema.V2ExternalAgentConfigImportParams,
+  "externalAgentConfig/import/recordHistory":
+    CodexSchema.V2ExternalAgentConfigImportHistoryRecordParams,
   "externalAgentConfig/import/readHistories": undefined,
   "config/value/write": CodexSchema.V2ConfigValueWriteParams,
   "config/batchWrite": CodexSchema.V2ConfigBatchWriteParams,
@@ -598,14 +685,24 @@ export const CLIENT_REQUEST_RESPONSES = {
   "thread/goal/get": CodexSchema.V2ThreadGoalGetResponse,
   "thread/goal/clear": CodexSchema.V2ThreadGoalClearResponse,
   "thread/metadata/update": CodexSchema.V2ThreadMetadataUpdateResponse,
+  "thread/attachment/add": CodexSchema.V2ThreadAttachmentAddResponse,
+  "thread/attachment/list": CodexSchema.V2ThreadAttachmentListResponse,
+  "thread/attachment/remove": CodexSchema.V2ThreadAttachmentRemoveResponse,
+  "thread/section/move": CodexSchema.V2ThreadSectionMoveResponse,
   "thread/unarchive": CodexSchema.V2ThreadUnarchiveResponse,
   "thread/compact/start": CodexSchema.V2ThreadCompactStartResponse,
   "thread/shellCommand": CodexSchema.V2ThreadShellCommandResponse,
   "thread/approveGuardianDeniedAction": CodexSchema.V2ThreadApproveGuardianDeniedActionResponse,
-  "thread/rollback": CodexSchema.V2ThreadRollbackResponse,
+  "thread/revert": CodexSchema.V2ThreadRevertResponse,
   "thread/list": CodexSchema.V2ThreadListResponse,
+  "threadSection/list": CodexSchema.V2ThreadSectionListResponse,
+  "threadSection/create": CodexSchema.V2ThreadSectionCreateResponse,
+  "threadSection/update": CodexSchema.V2ThreadSectionUpdateResponse,
+  "threadSection/delete": CodexSchema.V2ThreadSectionDeleteResponse,
   "thread/loaded/list": CodexSchema.V2ThreadLoadedListResponse,
   "thread/read": CodexSchema.V2ThreadReadResponse,
+  "thread/turns/list": CodexSchema.V2ThreadTurnsListResponse,
+  "thread/items/list": CodexSchema.V2ThreadItemsListResponse,
   "thread/inject_items": CodexSchema.V2ThreadInjectItemsResponse,
   "skills/list": CodexSchema.V2SkillsListResponse,
   "skills/extraRoots/set": CodexSchema.V2SkillsExtraRootsSetResponse,
@@ -615,6 +712,7 @@ export const CLIENT_REQUEST_RESPONSES = {
   "marketplace/upgrade": CodexSchema.V2MarketplaceUpgradeResponse,
   "plugin/list": CodexSchema.V2PluginListResponse,
   "plugin/installed": CodexSchema.V2PluginInstalledResponse,
+  "plugin/reconcile": CodexSchema.V2PluginReconcileResponse,
   "plugin/read": CodexSchema.V2PluginReadResponse,
   "plugin/skill/read": CodexSchema.V2PluginSkillReadResponse,
   "plugin/share/save": CodexSchema.V2PluginShareSaveResponse,
@@ -642,6 +740,9 @@ export const CLIENT_REQUEST_RESPONSES = {
   "turn/interrupt": CodexSchema.V2TurnInterruptResponse,
   "review/start": CodexSchema.V2ReviewStartResponse,
   "model/list": CodexSchema.V2ModelListResponse,
+  "account/gatewayOAuth/read": CodexSchema.V2GatewayOAuthReadResponse,
+  "account/gatewayOAuth/login": CodexSchema.V2GatewayOAuthLoginResponse,
+  "account/gatewayOAuth/cancel": CodexSchema.V2GatewayOAuthCancelResponse,
   "modelProvider/capabilities/read": CodexSchema.V2ModelProviderCapabilitiesReadResponse,
   "experimentalFeature/list": CodexSchema.V2ExperimentalFeatureListResponse,
   "permissionProfile/list": CodexSchema.V2PermissionProfileListResponse,
@@ -669,6 +770,8 @@ export const CLIENT_REQUEST_RESPONSES = {
   "config/read": CodexSchema.V2ConfigReadResponse,
   "externalAgentConfig/detect": CodexSchema.V2ExternalAgentConfigDetectResponse,
   "externalAgentConfig/import": CodexSchema.V2ExternalAgentConfigImportResponse,
+  "externalAgentConfig/import/recordHistory":
+    CodexSchema.V2ExternalAgentConfigImportHistoryRecordResponse,
   "externalAgentConfig/import/readHistories":
     CodexSchema.V2ExternalAgentConfigImportHistoriesReadResponse,
   "config/value/write": CodexSchema.V2ConfigWriteResponse,
@@ -719,10 +822,15 @@ export const SERVER_NOTIFICATION_PARAMS = {
   "thread/deleted": CodexSchema.V2ThreadDeletedNotification,
   "thread/unarchived": CodexSchema.V2ThreadUnarchivedNotification,
   "thread/closed": CodexSchema.V2ThreadClosedNotification,
+  "thread/reverted": CodexSchema.V2ThreadRevertedNotification,
   "skills/changed": CodexSchema.V2SkillsChangedNotification,
   "thread/name/updated": CodexSchema.V2ThreadNameUpdatedNotification,
+  "thread/attachment/updated": CodexSchema.V2ThreadAttachmentUpdatedNotification,
   "thread/goal/updated": CodexSchema.V2ThreadGoalUpdatedNotification,
   "thread/goal/cleared": CodexSchema.V2ThreadGoalClearedNotification,
+  "thread/queue/changed": CodexSchema.V2ThreadQueueChangedNotification,
+  "project/changed": CodexSchema.V2ProjectChangedNotification,
+  "thread/project/updated": CodexSchema.V2ThreadProjectUpdatedNotification,
   "thread/environment/connected": CodexSchema.V2EnvironmentConnectionNotification,
   "thread/environment/disconnected": CodexSchema.V2EnvironmentConnectionNotification,
   "thread/settings/updated": CodexSchema.V2ThreadSettingsUpdatedNotification,
@@ -737,6 +845,7 @@ export const SERVER_NOTIFICATION_PARAMS = {
   "item/autoApprovalReview/started": CodexSchema.V2ItemGuardianApprovalReviewStartedNotification,
   "item/autoApprovalReview/completed":
     CodexSchema.V2ItemGuardianApprovalReviewCompletedNotification,
+  "autoApprovalReview/strictReviewRequired": CodexSchema.V2StrictReviewRequiredNotification,
   "item/completed": CodexSchema.V2ItemCompletedNotification,
   "rawResponseItem/completed": CodexSchema.V2RawResponseItemCompletedNotification,
   "rawResponse/completed": CodexSchema.V2RawResponseCompletedNotification,
@@ -753,7 +862,9 @@ export const SERVER_NOTIFICATION_PARAMS = {
   "item/mcpToolCall/progress": CodexSchema.V2McpToolCallProgressNotification,
   "mcpServer/oauthLogin/completed": CodexSchema.V2McpServerOauthLoginCompletedNotification,
   "mcpServer/startupStatus/updated": CodexSchema.V2McpServerStatusUpdatedNotification,
+  "mcpServer/event/stream/notification": CodexSchema.V2McpServerEventStreamNotification,
   "account/updated": CodexSchema.V2AccountUpdatedNotification,
+  "account/gatewayOAuth/changed": CodexSchema.V2GatewayOAuthChangedNotification,
   "account/rateLimits/updated": CodexSchema.V2AccountRateLimitsUpdatedNotification,
   "app/list/updated": CodexSchema.V2AppListUpdatedNotification,
   "remoteControl/status/changed": CodexSchema.V2RemoteControlStatusChangedNotification,
@@ -768,6 +879,8 @@ export const SERVER_NOTIFICATION_PARAMS = {
   "thread/compacted": CodexSchema.V2ContextCompactedNotification,
   "model/rerouted": CodexSchema.V2ModelReroutedNotification,
   "model/verification": CodexSchema.V2ModelVerificationNotification,
+  "modelProvider/authRecoveryStarted": CodexSchema.V2AuthRecoveryNotification,
+  "modelProvider/authRecoveryCompleted": CodexSchema.V2AuthRecoveryNotification,
   "turn/moderationMetadata": CodexSchema.V2TurnModerationMetadataNotification,
   "model/safetyBuffering/updated": CodexSchema.V2ModelSafetyBufferingUpdatedNotification,
   warning: CodexSchema.V2WarningNotification,
@@ -778,6 +891,10 @@ export const SERVER_NOTIFICATION_PARAMS = {
   "fuzzyFileSearch/sessionCompleted": CodexSchema.FuzzyFileSearchSessionCompletedNotification,
   "thread/realtime/started": CodexSchema.V2ThreadRealtimeStartedNotification,
   "thread/realtime/itemAdded": CodexSchema.V2ThreadRealtimeItemAddedNotification,
+  "thread/realtime/item/started": CodexSchema.V2ThreadRealtimeItemStartedNotification,
+  "thread/realtime/item/transcript/delta":
+    CodexSchema.V2ThreadRealtimeItemTranscriptDeltaNotification,
+  "thread/realtime/item/completed": CodexSchema.V2ThreadRealtimeItemCompletedNotification,
   "thread/realtime/transcript/delta": CodexSchema.V2ThreadRealtimeTranscriptDeltaNotification,
   "thread/realtime/transcript/done": CodexSchema.V2ThreadRealtimeTranscriptDoneNotification,
   "thread/realtime/outputAudio/delta": CodexSchema.V2ThreadRealtimeOutputAudioDeltaNotification,
diff --git a/packages/effect-codex-app-server/src/_generated/namespaces.gen.ts b/packages/effect-codex-app-server/src/_generated/namespaces.gen.ts
index 8665ad6f436d..47474330d286 100644
--- a/packages/effect-codex-app-server/src/_generated/namespaces.gen.ts
+++ b/packages/effect-codex-app-server/src/_generated/namespaces.gen.ts
@@ -1,5 +1,5 @@
 // This file is generated by the effect-codex-app-server package. Do not edit manually.
-// Upstream protocol ref: 678157acaa819d5510adfe359abb5d0392cfe461
+// Upstream protocol ref: 687a119f0fcaace47e1f1abcc77cec6c813fd6da
 
 import * as CodexSchema from "./schema.gen.ts";
 
@@ -20,6 +20,7 @@ export const v2 = {
   AppsListResponse: CodexSchema.V2AppsListResponse,
   AppsReadParams: CodexSchema.V2AppsReadParams,
   AppsReadResponse: CodexSchema.V2AppsReadResponse,
+  AuthRecoveryNotification: CodexSchema.V2AuthRecoveryNotification,
   CancelLoginAccountParams: CodexSchema.V2CancelLoginAccountParams,
   CancelLoginAccountResponse: CodexSchema.V2CancelLoginAccountResponse,
   CommandExecOutputDeltaNotification: CodexSchema.V2CommandExecOutputDeltaNotification,
@@ -56,6 +57,10 @@ export const v2 = {
     CodexSchema.V2ExternalAgentConfigImportCompletedNotification,
   ExternalAgentConfigImportHistoriesReadResponse:
     CodexSchema.V2ExternalAgentConfigImportHistoriesReadResponse,
+  ExternalAgentConfigImportHistoryRecordParams:
+    CodexSchema.V2ExternalAgentConfigImportHistoryRecordParams,
+  ExternalAgentConfigImportHistoryRecordResponse:
+    CodexSchema.V2ExternalAgentConfigImportHistoryRecordResponse,
   ExternalAgentConfigImportParams: CodexSchema.V2ExternalAgentConfigImportParams,
   ExternalAgentConfigImportProgressNotification:
     CodexSchema.V2ExternalAgentConfigImportProgressNotification,
@@ -83,6 +88,10 @@ export const v2 = {
   FsWatchResponse: CodexSchema.V2FsWatchResponse,
   FsWriteFileParams: CodexSchema.V2FsWriteFileParams,
   FsWriteFileResponse: CodexSchema.V2FsWriteFileResponse,
+  GatewayOAuthCancelResponse: CodexSchema.V2GatewayOAuthCancelResponse,
+  GatewayOAuthChangedNotification: CodexSchema.V2GatewayOAuthChangedNotification,
+  GatewayOAuthLoginResponse: CodexSchema.V2GatewayOAuthLoginResponse,
+  GatewayOAuthReadResponse: CodexSchema.V2GatewayOAuthReadResponse,
   GetAccountParams: CodexSchema.V2GetAccountParams,
   GetAccountRateLimitsResponse: CodexSchema.V2GetAccountRateLimitsResponse,
   GetAccountResponse: CodexSchema.V2GetAccountResponse,
@@ -112,6 +121,7 @@ export const v2 = {
   MarketplaceUpgradeResponse: CodexSchema.V2MarketplaceUpgradeResponse,
   McpResourceReadParams: CodexSchema.V2McpResourceReadParams,
   McpResourceReadResponse: CodexSchema.V2McpResourceReadResponse,
+  McpServerEventStreamNotification: CodexSchema.V2McpServerEventStreamNotification,
   McpServerOauthLoginCompletedNotification: CodexSchema.V2McpServerOauthLoginCompletedNotification,
   McpServerOauthLoginParams: CodexSchema.V2McpServerOauthLoginParams,
   McpServerOauthLoginResponse: CodexSchema.V2McpServerOauthLoginResponse,
@@ -127,6 +137,8 @@ export const v2 = {
   ModelReroutedNotification: CodexSchema.V2ModelReroutedNotification,
   ModelSafetyBufferingUpdatedNotification: CodexSchema.V2ModelSafetyBufferingUpdatedNotification,
   ModelVerificationNotification: CodexSchema.V2ModelVerificationNotification,
+  NullableGetAccountRateLimitsParams: CodexSchema.V2NullableGetAccountRateLimitsParams,
+  NullableGetAccountTokenUsageParams: CodexSchema.V2NullableGetAccountTokenUsageParams,
   PermissionProfileListParams: CodexSchema.V2PermissionProfileListParams,
   PermissionProfileListResponse: CodexSchema.V2PermissionProfileListResponse,
   PlanDeltaNotification: CodexSchema.V2PlanDeltaNotification,
@@ -138,6 +150,8 @@ export const v2 = {
   PluginListResponse: CodexSchema.V2PluginListResponse,
   PluginReadParams: CodexSchema.V2PluginReadParams,
   PluginReadResponse: CodexSchema.V2PluginReadResponse,
+  PluginReconcileParams: CodexSchema.V2PluginReconcileParams,
+  PluginReconcileResponse: CodexSchema.V2PluginReconcileResponse,
   PluginShareCheckoutParams: CodexSchema.V2PluginShareCheckoutParams,
   PluginShareCheckoutResponse: CodexSchema.V2PluginShareCheckoutResponse,
   PluginShareDeleteParams: CodexSchema.V2PluginShareDeleteParams,
@@ -154,6 +168,7 @@ export const v2 = {
   PluginUninstallResponse: CodexSchema.V2PluginUninstallResponse,
   ProcessExitedNotification: CodexSchema.V2ProcessExitedNotification,
   ProcessOutputDeltaNotification: CodexSchema.V2ProcessOutputDeltaNotification,
+  ProjectChangedNotification: CodexSchema.V2ProjectChangedNotification,
   RawResponseCompletedNotification: CodexSchema.V2RawResponseCompletedNotification,
   RawResponseItemCompletedNotification: CodexSchema.V2RawResponseItemCompletedNotification,
   ReasoningSummaryPartAddedNotification: CodexSchema.V2ReasoningSummaryPartAddedNotification,
@@ -172,6 +187,7 @@ export const v2 = {
   SkillsExtraRootsSetResponse: CodexSchema.V2SkillsExtraRootsSetResponse,
   SkillsListParams: CodexSchema.V2SkillsListParams,
   SkillsListResponse: CodexSchema.V2SkillsListResponse,
+  StrictReviewRequiredNotification: CodexSchema.V2StrictReviewRequiredNotification,
   TerminalInteractionNotification: CodexSchema.V2TerminalInteractionNotification,
   ThreadApproveGuardianDeniedActionParams: CodexSchema.V2ThreadApproveGuardianDeniedActionParams,
   ThreadApproveGuardianDeniedActionResponse:
@@ -179,6 +195,13 @@ export const v2 = {
   ThreadArchivedNotification: CodexSchema.V2ThreadArchivedNotification,
   ThreadArchiveParams: CodexSchema.V2ThreadArchiveParams,
   ThreadArchiveResponse: CodexSchema.V2ThreadArchiveResponse,
+  ThreadAttachmentAddParams: CodexSchema.V2ThreadAttachmentAddParams,
+  ThreadAttachmentAddResponse: CodexSchema.V2ThreadAttachmentAddResponse,
+  ThreadAttachmentListParams: CodexSchema.V2ThreadAttachmentListParams,
+  ThreadAttachmentListResponse: CodexSchema.V2ThreadAttachmentListResponse,
+  ThreadAttachmentRemoveParams: CodexSchema.V2ThreadAttachmentRemoveParams,
+  ThreadAttachmentRemoveResponse: CodexSchema.V2ThreadAttachmentRemoveResponse,
+  ThreadAttachmentUpdatedNotification: CodexSchema.V2ThreadAttachmentUpdatedNotification,
   ThreadClosedNotification: CodexSchema.V2ThreadClosedNotification,
   ThreadCompactStartParams: CodexSchema.V2ThreadCompactStartParams,
   ThreadCompactStartResponse: CodexSchema.V2ThreadCompactStartResponse,
@@ -197,6 +220,8 @@ export const v2 = {
   ThreadGoalUpdatedNotification: CodexSchema.V2ThreadGoalUpdatedNotification,
   ThreadInjectItemsParams: CodexSchema.V2ThreadInjectItemsParams,
   ThreadInjectItemsResponse: CodexSchema.V2ThreadInjectItemsResponse,
+  ThreadItemsListParams: CodexSchema.V2ThreadItemsListParams,
+  ThreadItemsListResponse: CodexSchema.V2ThreadItemsListResponse,
   ThreadListParams: CodexSchema.V2ThreadListParams,
   ThreadListResponse: CodexSchema.V2ThreadListResponse,
   ThreadLoadedListParams: CodexSchema.V2ThreadLoadedListParams,
@@ -204,11 +229,17 @@ export const v2 = {
   ThreadMetadataUpdateParams: CodexSchema.V2ThreadMetadataUpdateParams,
   ThreadMetadataUpdateResponse: CodexSchema.V2ThreadMetadataUpdateResponse,
   ThreadNameUpdatedNotification: CodexSchema.V2ThreadNameUpdatedNotification,
+  ThreadProjectUpdatedNotification: CodexSchema.V2ThreadProjectUpdatedNotification,
+  ThreadQueueChangedNotification: CodexSchema.V2ThreadQueueChangedNotification,
   ThreadReadParams: CodexSchema.V2ThreadReadParams,
   ThreadReadResponse: CodexSchema.V2ThreadReadResponse,
   ThreadRealtimeClosedNotification: CodexSchema.V2ThreadRealtimeClosedNotification,
   ThreadRealtimeErrorNotification: CodexSchema.V2ThreadRealtimeErrorNotification,
   ThreadRealtimeItemAddedNotification: CodexSchema.V2ThreadRealtimeItemAddedNotification,
+  ThreadRealtimeItemCompletedNotification: CodexSchema.V2ThreadRealtimeItemCompletedNotification,
+  ThreadRealtimeItemStartedNotification: CodexSchema.V2ThreadRealtimeItemStartedNotification,
+  ThreadRealtimeItemTranscriptDeltaNotification:
+    CodexSchema.V2ThreadRealtimeItemTranscriptDeltaNotification,
   ThreadRealtimeOutputAudioDeltaNotification:
     CodexSchema.V2ThreadRealtimeOutputAudioDeltaNotification,
   ThreadRealtimeSdpNotification: CodexSchema.V2ThreadRealtimeSdpNotification,
@@ -218,8 +249,19 @@ export const v2 = {
   ThreadRealtimeTranscriptDoneNotification: CodexSchema.V2ThreadRealtimeTranscriptDoneNotification,
   ThreadResumeParams: CodexSchema.V2ThreadResumeParams,
   ThreadResumeResponse: CodexSchema.V2ThreadResumeResponse,
-  ThreadRollbackParams: CodexSchema.V2ThreadRollbackParams,
-  ThreadRollbackResponse: CodexSchema.V2ThreadRollbackResponse,
+  ThreadRevertedNotification: CodexSchema.V2ThreadRevertedNotification,
+  ThreadRevertParams: CodexSchema.V2ThreadRevertParams,
+  ThreadRevertResponse: CodexSchema.V2ThreadRevertResponse,
+  ThreadSectionCreateParams: CodexSchema.V2ThreadSectionCreateParams,
+  ThreadSectionCreateResponse: CodexSchema.V2ThreadSectionCreateResponse,
+  ThreadSectionDeleteParams: CodexSchema.V2ThreadSectionDeleteParams,
+  ThreadSectionDeleteResponse: CodexSchema.V2ThreadSectionDeleteResponse,
+  ThreadSectionListParams: CodexSchema.V2ThreadSectionListParams,
+  ThreadSectionListResponse: CodexSchema.V2ThreadSectionListResponse,
+  ThreadSectionMoveParams: CodexSchema.V2ThreadSectionMoveParams,
+  ThreadSectionMoveResponse: CodexSchema.V2ThreadSectionMoveResponse,
+  ThreadSectionUpdateParams: CodexSchema.V2ThreadSectionUpdateParams,
+  ThreadSectionUpdateResponse: CodexSchema.V2ThreadSectionUpdateResponse,
   ThreadSetNameParams: CodexSchema.V2ThreadSetNameParams,
   ThreadSetNameResponse: CodexSchema.V2ThreadSetNameResponse,
   ThreadSettingsUpdatedNotification: CodexSchema.V2ThreadSettingsUpdatedNotification,
@@ -230,6 +272,8 @@ export const v2 = {
   ThreadStartResponse: CodexSchema.V2ThreadStartResponse,
   ThreadStatusChangedNotification: CodexSchema.V2ThreadStatusChangedNotification,
   ThreadTokenUsageUpdatedNotification: CodexSchema.V2ThreadTokenUsageUpdatedNotification,
+  ThreadTurnsListParams: CodexSchema.V2ThreadTurnsListParams,
+  ThreadTurnsListResponse: CodexSchema.V2ThreadTurnsListResponse,
   ThreadUnarchivedNotification: CodexSchema.V2ThreadUnarchivedNotification,
   ThreadUnarchiveParams: CodexSchema.V2ThreadUnarchiveParams,
   ThreadUnarchiveResponse: CodexSchema.V2ThreadUnarchiveResponse,
diff --git a/packages/effect-codex-app-server/src/_generated/schema.gen.ts b/packages/effect-codex-app-server/src/_generated/schema.gen.ts
index f4b186147705..38b46712257a 100644
--- a/packages/effect-codex-app-server/src/_generated/schema.gen.ts
+++ b/packages/effect-codex-app-server/src/_generated/schema.gen.ts
@@ -1,8 +1,13 @@
 // This file is generated by the effect-codex-app-server package. Do not edit manually.
-// Upstream protocol ref: 678157acaa819d5510adfe359abb5d0392cfe461
+// Upstream protocol ref: 687a119f0fcaace47e1f1abcc77cec6c813fd6da
 
 import * as Schema from "effect/Schema";
 
+export type ApplyPatchApprovalParams__ThreadId = string;
+export const ApplyPatchApprovalParams__ThreadId = Schema.String.annotate({
+  identifier: "ApplyPatchApprovalParams__ThreadId",
+});
+
 export type ApplyPatchApprovalParams__FileChange =
   | { readonly content: string; readonly type: "add" }
   | { readonly content: string; readonly type: "delete" }
@@ -24,143 +29,97 @@ export const ApplyPatchApprovalParams__FileChange = Schema.Union(
     }).annotate({ title: "UpdateFileChange" }),
   ],
   { mode: "oneOf" },
-);
-
-export type ApplyPatchApprovalParams__ThreadId = string;
-export const ApplyPatchApprovalParams__ThreadId = Schema.String;
+).annotate({ identifier: "ApplyPatchApprovalParams__FileChange" });
 
 export type ApplyPatchApprovalResponse__NetworkPolicyRuleAction = "allow" | "deny";
 export const ApplyPatchApprovalResponse__NetworkPolicyRuleAction = Schema.Literals([
   "allow",
   "deny",
-]);
+]).annotate({ identifier: "ApplyPatchApprovalResponse__NetworkPolicyRuleAction" });
 
 export type ChatgptAuthTokensRefreshParams__ChatgptAuthTokensRefreshReason = "unauthorized";
-export const ChatgptAuthTokensRefreshParams__ChatgptAuthTokensRefreshReason =
-  Schema.Literal("unauthorized");
-
-export type ClientRequest__AbsolutePathBuf = string;
-export const ClientRequest__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type ClientRequest__AddCreditsNudgeCreditType = "credits" | "usage_limit";
-export const ClientRequest__AddCreditsNudgeCreditType = Schema.Literals(["credits", "usage_limit"]);
-
-export type ClientRequest__AdditionalContextKind = "untrusted" | "application";
-export const ClientRequest__AdditionalContextKind = Schema.Literals(["untrusted", "application"]);
-
-export type ClientRequest__AgentMessageInputContent =
-  | { readonly text: string; readonly type: "input_text" }
-  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
-export const ClientRequest__AgentMessageInputContent = Schema.Union(
+export const ChatgptAuthTokensRefreshParams__ChatgptAuthTokensRefreshReason = Schema.Union(
   [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("input_text").annotate({
-        title: "InputTextAgentMessageInputContentType",
-      }),
-    }).annotate({ title: "InputTextAgentMessageInputContent" }),
-    Schema.Struct({
-      encrypted_content: Schema.String,
-      type: Schema.Literal("encrypted_content").annotate({
-        title: "EncryptedContentAgentMessageInputContentType",
-      }),
-    }).annotate({ title: "EncryptedContentAgentMessageInputContent" }),
+    Schema.Literal("unauthorized").annotate({
+      description: "Codex attempted a backend request and received `401 Unauthorized`.",
+    }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ChatgptAuthTokensRefreshParams__ChatgptAuthTokensRefreshReason" });
 
-export type ClientRequest__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const ClientRequest__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
+export type ClientRequest__RequestId = string | number;
+export const ClientRequest__RequestId = Schema.Union([
+  Schema.String,
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "ClientRequest__RequestId" });
 
-export type ClientRequest__AppsInstalledParams = {
-  readonly forceRefresh?: boolean;
-  readonly threadId?: string | null;
+export type ClientRequest__InitializeCapabilities = {
+  readonly experimentalApi?: boolean;
+  readonly explicitGatewayOauth?: boolean;
+  readonly extensions?: { readonly [x: string]: Schema.Json } | null;
+  readonly mcpServerOpenaiFormElicitation?: boolean;
+  readonly optOutNotificationMethods?: ReadonlyArray<string> | null;
+  readonly requestAttestation?: boolean;
 };
-export const ClientRequest__AppsInstalledParams = Schema.Struct({
-  forceRefresh: Schema.optionalKey(
+export const ClientRequest__InitializeCapabilities = Schema.Struct({
+  experimentalApi: Schema.optionalKey(
     Schema.Boolean.annotate({
-      description:
-        "When true and Apps are permitted, refresh and publish the hosted connector runtime tool snapshot first.",
+      description: "Opt into receiving experimental API methods and fields.",
+      default: false,
     }),
   ),
-  threadId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional loaded thread id used to evaluate effective app configuration.",
-      }),
-      Schema.Null,
-    ]),
+  explicitGatewayOauth: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Use explicit gateway OAuth login instead of automatic browser authorization. Applies to this app-server's gateway runtime; later connections cannot undo it.",
+    }),
   ),
-}).annotate({ description: "Read the committed installed connector runtime snapshot." });
-
-export type ClientRequest__AppsListParams = {
-  readonly cursor?: string | null;
-  readonly forceRefetch?: boolean;
-  readonly limit?: number | null;
-  readonly threadId?: string | null;
-};
-export const ClientRequest__AppsListParams = Schema.Struct({
-  cursor: Schema.optionalKey(
+  extensions: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({
-        description: "Opaque pagination cursor returned by a previous call.",
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })).annotate({
+        description: "MCP extension settings declared by the app-server client.",
       }),
       Schema.Null,
     ]),
   ),
-  forceRefetch: Schema.optionalKey(
+  mcpServerOpenaiFormElicitation: Schema.optionalKey(
     Schema.Boolean.annotate({
-      description: "When true, bypass app caches and fetch the latest data from sources.",
+      description:
+        "Legacy opt-in for the `openai/form` MCP extension.\n\nNew clients should declare `openai/form` in [`Self::extensions`].",
     }),
   ),
-  limit: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
-        description: "Optional page size; defaults to a reasonable server-side value.",
-        format: "uint32",
-      })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  threadId: Schema.optionalKey(
+  optOutNotificationMethods: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({
+      Schema.Array(Schema.String).annotate({
         description:
-          "Optional thread id used to evaluate app feature gating from that thread's config.",
+          "Exact notification method names that should be suppressed for this connection (for example `thread/started`).",
       }),
       Schema.Null,
     ]),
   ),
-}).annotate({ description: "EXPERIMENTAL - list available apps/connectors." });
-
-export type ClientRequest__AppsReadParams = {
-  readonly appIds: ReadonlyArray<string>;
-  readonly includeTools?: boolean;
-};
-export const ClientRequest__AppsReadParams = Schema.Struct({
-  appIds: Schema.Array(Schema.String).annotate({
-    description:
-      "App ids to read. The server accepts at most 100 ids and deduplicates repeated ids while preserving their first-request order.",
-  }),
-  includeTools: Schema.optionalKey(
+  requestAttestation: Schema.optionalKey(
     Schema.Boolean.annotate({
-      description:
-        "When true, include display-only public tool summaries in the returned metadata.",
+      description: "Opt into `attestation/generate` requests for upstream `x-oai-attestation`.",
+      default: false,
     }),
   ),
-}).annotate({ description: "EXPERIMENTAL - read metadata for specific apps/connectors." });
+}).annotate({
+  description: "Client-declared capabilities negotiated during initialize.",
+  identifier: "ClientRequest__InitializeCapabilities",
+});
+
+export type ClientRequest__ClientInfo = {
+  readonly name: string;
+  readonly title?: string | null;
+  readonly version: string;
+};
+export const ClientRequest__ClientInfo = Schema.Struct({
+  name: Schema.String,
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  version: Schema.String,
+}).annotate({ identifier: "ClientRequest__ClientInfo" });
 
 export type ClientRequest__AskForApproval =
   | "untrusted"
@@ -189,182 +148,326 @@ export const ClientRequest__AskForApproval = Schema.Union(
     }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ClientRequest__AskForApproval" });
 
-export type ClientRequest__CancelLoginAccountParams = { readonly loginId: string };
-export const ClientRequest__CancelLoginAccountParams = Schema.Struct({ loginId: Schema.String });
+export type ClientRequest__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const ClientRequest__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "ClientRequest__ApprovalsReviewer",
+});
 
-export type ClientRequest__ClientInfo = {
+export type ClientRequest__Personality = "none" | "friendly" | "pragmatic";
+export const ClientRequest__Personality = Schema.Literals([
+  "none",
+  "friendly",
+  "pragmatic",
+]).annotate({
+  description: "Deprecated: `friendly` and `pragmatic` no longer select a style.",
+  identifier: "ClientRequest__Personality",
+});
+
+export type ClientRequest__SandboxMode = "read-only" | "workspace-write" | "danger-full-access";
+export const ClientRequest__SandboxMode = Schema.Literals([
+  "read-only",
+  "workspace-write",
+  "danger-full-access",
+]).annotate({ identifier: "ClientRequest__SandboxMode" });
+
+export type ClientRequest__ThreadStartSource = "startup" | "clear";
+export const ClientRequest__ThreadStartSource = Schema.Literals(["startup", "clear"]).annotate({
+  identifier: "ClientRequest__ThreadStartSource",
+});
+
+export type ClientRequest__ThreadSource = string;
+export const ClientRequest__ThreadSource = Schema.String.annotate({
+  identifier: "ClientRequest__ThreadSource",
+});
+
+export type ClientRequest__ThreadArchiveParams = { readonly threadId: string };
+export const ClientRequest__ThreadArchiveParams = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadArchiveParams" });
+
+export type ClientRequest__ThreadDeleteParams = { readonly threadId: string };
+export const ClientRequest__ThreadDeleteParams = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadDeleteParams" });
+
+export type ClientRequest__ThreadUnsubscribeParams = { readonly threadId: string };
+export const ClientRequest__ThreadUnsubscribeParams = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadUnsubscribeParams" });
+
+export type ClientRequest__ThreadSetNameParams = {
   readonly name: string;
-  readonly title?: string | null;
-  readonly version: string;
+  readonly threadId: string;
 };
-export const ClientRequest__ClientInfo = Schema.Struct({
+export const ClientRequest__ThreadSetNameParams = Schema.Struct({
   name: Schema.String,
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  version: Schema.String,
-});
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadSetNameParams" });
 
-export type ClientRequest__CommandExecResizeParams = {
-  readonly processId: string;
-  readonly size: { readonly cols: number; readonly rows: number };
-};
-export const ClientRequest__CommandExecResizeParams = Schema.Struct({
-  processId: Schema.String.annotate({
-    description:
-      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-  }),
-  size: Schema.Struct({
-    cols: Schema.Number.annotate({
-      description: "Terminal width in character cells.",
-      format: "uint16",
-    })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    rows: Schema.Number.annotate({
-      description: "Terminal height in character cells.",
-      format: "uint16",
-    })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({ description: "PTY size in character cells for `command/exec` PTY sessions." }),
-}).annotate({ description: "Resize a running PTY-backed `command/exec` session." });
+export type ClientRequest__ThreadGoalStatus =
+  | "active"
+  | "paused"
+  | "blocked"
+  | "usageLimited"
+  | "budgetLimited"
+  | "complete";
+export const ClientRequest__ThreadGoalStatus = Schema.Literals([
+  "active",
+  "paused",
+  "blocked",
+  "usageLimited",
+  "budgetLimited",
+  "complete",
+]).annotate({ identifier: "ClientRequest__ThreadGoalStatus" });
 
-export type ClientRequest__CommandExecTerminalSize = {
-  readonly cols: number;
-  readonly rows: number;
-};
-export const ClientRequest__CommandExecTerminalSize = Schema.Struct({
-  cols: Schema.Number.annotate({
-    description: "Terminal width in character cells.",
-    format: "uint16",
-  })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  rows: Schema.Number.annotate({
-    description: "Terminal height in character cells.",
-    format: "uint16",
-  })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-}).annotate({ description: "PTY size in character cells for `command/exec` PTY sessions." });
+export type ClientRequest__ThreadGoalGetParams = { readonly threadId: string };
+export const ClientRequest__ThreadGoalGetParams = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadGoalGetParams" });
 
-export type ClientRequest__CommandExecTerminateParams = { readonly processId: string };
-export const ClientRequest__CommandExecTerminateParams = Schema.Struct({
-  processId: Schema.String.annotate({
-    description:
-      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-  }),
-}).annotate({ description: "Terminate a running `command/exec` session." });
+export type ClientRequest__ThreadGoalClearParams = { readonly threadId: string };
+export const ClientRequest__ThreadGoalClearParams = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadGoalClearParams" });
 
-export type ClientRequest__CommandExecWriteParams = {
-  readonly closeStdin?: boolean;
-  readonly deltaBase64?: string | null;
-  readonly processId: string;
+export type ClientRequest__ThreadMetadataGitInfoUpdateParams = {
+  readonly branch?: string | null;
+  readonly originUrl?: string | null;
+  readonly sha?: string | null;
 };
-export const ClientRequest__CommandExecWriteParams = Schema.Struct({
-  closeStdin: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "Close stdin after writing `deltaBase64`, if present.",
-    }),
+export const ClientRequest__ThreadMetadataGitInfoUpdateParams = Schema.Struct({
+  branch: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Omit to leave the stored branch unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
+      }),
+      Schema.Null,
+    ]),
   ),
-  deltaBase64: Schema.optionalKey(
+  originUrl: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Optional base64-encoded stdin bytes to write." }),
+      Schema.String.annotate({
+        description:
+          "Omit to leave the stored origin URL unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
+      }),
       Schema.Null,
     ]),
   ),
-  processId: Schema.String.annotate({
-    description:
-      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-  }),
+  sha: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Omit to leave the stored commit unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__ThreadMetadataGitInfoUpdateParams" });
+
+export type ClientRequest__ThreadAttachmentAddParams = {
+  readonly attachmentType: string;
+  readonly identityKey: string;
+  readonly payload: Schema.Json;
+  readonly threadId: string;
+};
+export const ClientRequest__ThreadAttachmentAddParams = Schema.Struct({
+  attachmentType: Schema.String,
+  identityKey: Schema.String,
+  payload: Schema.Json.annotate({ expected: "JSON value" }),
+  threadId: Schema.String,
 }).annotate({
-  description: "Write stdin bytes to a running `command/exec` session, close stdin, or both.",
+  description: "Parameters for creating or locating an attachment on its owning thread.",
+  identifier: "ClientRequest__ThreadAttachmentAddParams",
 });
 
-export type ClientRequest__CommandMigration = { readonly name: string };
-export const ClientRequest__CommandMigration = Schema.Struct({ name: Schema.String });
-
-export type ClientRequest__ConfigReadParams = {
-  readonly cwd?: string | null;
-  readonly includeLayers?: boolean;
+export type ClientRequest__ThreadAttachmentListParams = {
+  readonly cursor?: string | null;
+  readonly limit?: number | null;
+  readonly threadId: string;
 };
-export const ClientRequest__ConfigReadParams = Schema.Struct({
-  cwd: Schema.optionalKey(
+export const ClientRequest__ThreadAttachmentListParams = Schema.Struct({
+  cursor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  limit: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Optional working directory to resolve project config layers. If specified, return the effective config as seen from that directory (i.e., including any project layers between `cwd` and the project/repo root).",
-      }),
+      Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
-  includeLayers: Schema.optionalKey(Schema.Boolean),
+  threadId: Schema.String,
+}).annotate({
+  description: "Parameters for listing attachments from one thread.",
+  identifier: "ClientRequest__ThreadAttachmentListParams",
 });
 
-export type ClientRequest__ConsumeAccountRateLimitResetCreditParams = {
-  readonly creditId?: string | null;
-  readonly idempotencyKey: string;
+export type ClientRequest__ThreadAttachmentRemoveParams = {
+  readonly attachmentType: string;
+  readonly identityKey: string;
+  readonly threadId: string;
 };
-export const ClientRequest__ConsumeAccountRateLimitResetCreditParams = Schema.Struct({
-  creditId: Schema.optionalKey(
+export const ClientRequest__ThreadAttachmentRemoveParams = Schema.Struct({
+  attachmentType: Schema.String,
+  identityKey: Schema.String,
+  threadId: Schema.String,
+}).annotate({
+  description: "Parameters for deleting an attachment by its stable thread-local identity.",
+  identifier: "ClientRequest__ThreadAttachmentRemoveParams",
+});
+
+export type ClientRequest__ThreadSectionMoveParams = {
+  readonly beforeThreadId?: string | null;
+  readonly sectionId: string | null;
+  readonly threadId: string;
+};
+export const ClientRequest__ThreadSectionMoveParams = Schema.Struct({
+  beforeThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description:
-          "Opaque reset-credit identifier to redeem. When omitted, the backend selects the next available credit.",
+        description: "Existing thread to insert before; omission or null appends to the section.",
       }),
       Schema.Null,
     ]),
   ),
-  idempotencyKey: Schema.String.annotate({
-    description:
-      "Identifies one logical reset attempt. A UUID is recommended; reuse the same value when retrying that attempt.",
+  sectionId: Schema.Union([
+    Schema.String.annotate({
+      description: "Destination section, or `null` to remove the thread from its section.",
+    }),
+    Schema.Null,
+  ]),
+  threadId: Schema.String.annotate({
+    description: "Thread to move into, within, or out of a section.",
   }),
+}).annotate({
+  description: "Parameters for moving a thread within a server-owned section ordering.",
+  identifier: "ClientRequest__ThreadSectionMoveParams",
 });
 
-export type ClientRequest__ConversationTextRole = "user" | "developer" | "assistant";
-export const ClientRequest__ConversationTextRole = Schema.Literals([
-  "user",
-  "developer",
-  "assistant",
-]);
+export type ClientRequest__ThreadUnarchiveParams = { readonly threadId: string };
+export const ClientRequest__ThreadUnarchiveParams = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadUnarchiveParams" });
 
-export type ClientRequest__DynamicToolNamespaceTool = {
-  readonly deferLoading?: boolean;
-  readonly description: string;
-  readonly inputSchema: unknown;
-  readonly name: string;
-  readonly type: "function";
-};
-export const ClientRequest__DynamicToolNamespaceTool = Schema.Union(
-  [
-    Schema.Struct({
-      deferLoading: Schema.optionalKey(Schema.Boolean),
-      description: Schema.String,
-      inputSchema: Schema.Unknown,
-      name: Schema.String,
-      type: Schema.Literal("function").annotate({ title: "FunctionDynamicToolNamespaceToolType" }),
-    }).annotate({ title: "FunctionDynamicToolNamespaceTool" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ClientRequest__ThreadCompactStartParams = { readonly threadId: string };
+export const ClientRequest__ThreadCompactStartParams = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadCompactStartParams" });
 
-export type ClientRequest__ExperimentalFeatureEnablementSetParams = {
-  readonly enablement: { readonly [x: string]: boolean };
+export type ClientRequest__ThreadShellCommandParams = {
+  readonly command: string;
+  readonly threadId: string;
+  readonly timeoutMs?: number | null;
 };
-export const ClientRequest__ExperimentalFeatureEnablementSetParams = Schema.Struct({
-  enablement: Schema.Record(Schema.String, Schema.Boolean).annotate({
+export const ClientRequest__ThreadShellCommandParams = Schema.Struct({
+  command: Schema.String.annotate({
     description:
-      "Process-wide runtime feature enablement keyed by canonical feature name.\n\nOnly named features are updated. Omitted features are left unchanged. Send an empty map for a no-op.",
+      "Shell command string evaluated by the thread's configured shell. Unlike `command/exec`, this intentionally preserves shell syntax such as pipes, redirects, and quoting. This runs unsandboxed with full access rather than inheriting the thread sandbox policy.",
+  }),
+  threadId: Schema.String,
+  timeoutMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Maximum execution time in milliseconds. Defaults to one hour when omitted or null. Must be non-negative; zero requests an immediate timeout, not unlimited execution. Does not affect the immediate RPC acknowledgement.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__ThreadShellCommandParams" });
+
+export type ClientRequest__ThreadApproveGuardianDeniedActionParams = {
+  readonly event: Schema.Json;
+  readonly threadId: string;
+};
+export const ClientRequest__ThreadApproveGuardianDeniedActionParams = Schema.Struct({
+  event: Schema.Json.annotate({
+    expected: "JSON value",
+    description: "Serialized `codex_protocol::protocol::GuardianAssessmentEvent`.",
+  }),
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadApproveGuardianDeniedActionParams" });
+
+export type ClientRequest__ThreadRevertParams = {
+  readonly beforeTurnId: string;
+  readonly threadId: string;
+};
+export const ClientRequest__ThreadRevertParams = Schema.Struct({
+  beforeTurnId: Schema.String.annotate({
+    description: "Turn excluded from the replacement history, together with every later turn.",
   }),
+  threadId: Schema.String,
+}).annotate({
+  description:
+    "Replace a paginated thread's durable history with the prefix before one turn.\n\nThis only changes persisted conversation history. It does not revert local file changes.",
+  identifier: "ClientRequest__ThreadRevertParams",
 });
 
-export type ClientRequest__ExperimentalFeatureListParams = {
+export type ClientRequest__ThreadListCwdFilter = string | ReadonlyArray<string>;
+export const ClientRequest__ThreadListCwdFilter = Schema.Union([
+  Schema.String,
+  Schema.Array(Schema.String),
+]).annotate({ identifier: "ClientRequest__ThreadListCwdFilter" });
+
+export type ClientRequest__SortDirection = "asc" | "desc";
+export const ClientRequest__SortDirection = Schema.Literals(["asc", "desc"]).annotate({
+  identifier: "ClientRequest__SortDirection",
+});
+
+export type ClientRequest__ThreadSortKey =
+  | "created_at"
+  | "updated_at"
+  | "recency_at"
+  | "section_position";
+export const ClientRequest__ThreadSortKey = Schema.Literals([
+  "created_at",
+  "updated_at",
+  "recency_at",
+  "section_position",
+]).annotate({ identifier: "ClientRequest__ThreadSortKey" });
+
+export type ClientRequest__ThreadSourceKind =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "subAgent"
+  | "subAgentReview"
+  | "subAgentCompact"
+  | "subAgentThreadSpawn"
+  | "subAgentOther"
+  | "unknown";
+export const ClientRequest__ThreadSourceKind = Schema.Literals([
+  "cli",
+  "vscode",
+  "exec",
+  "appServer",
+  "subAgent",
+  "subAgentReview",
+  "subAgentCompact",
+  "subAgentThreadSpawn",
+  "subAgentOther",
+  "unknown",
+]).annotate({ identifier: "ClientRequest__ThreadSourceKind" });
+
+export type ClientRequest__ThreadSectionListParams = {
   readonly cursor?: string | null;
   readonly limit?: number | null;
-  readonly threadId?: string | null;
 };
-export const ClientRequest__ExperimentalFeatureListParams = Schema.Struct({
+export const ClientRequest__ThreadSectionListParams = Schema.Struct({
   cursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -376,253 +479,157 @@ export const ClientRequest__ExperimentalFeatureListParams = Schema.Struct({
   limit: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
-        description: "Optional page size; defaults to a reasonable server-side value.",
+        description: "Maximum number of sections to return.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  threadId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Optional loaded thread id. Pass this when showing feature state for an existing thread so enablement is computed from that thread's refreshed config, including project-local config for the thread's cwd.",
-      }),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
+}).annotate({
+  description: "Parameters for listing independently persisted thread sections.",
+  identifier: "ClientRequest__ThreadSectionListParams",
 });
 
-export type ClientRequest__ExternalAgentConfigDetectParams = {
-  readonly cwds?: ReadonlyArray<string> | null;
-  readonly includeHome?: boolean;
-  readonly migrationSource?: string | null;
-  readonly source?: string | null;
+export type ClientRequest__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const ClientRequest__ExternalAgentConfigDetectParams = Schema.Struct({
-  cwds: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(Schema.String).annotate({
-        description: "Zero or more working directories to include for repo-scoped detection.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  includeHome: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "If true, include detection under the user's home directory.",
-    }),
-  ),
-  migrationSource: Schema.optionalKey(
+export const ClientRequest__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "ClientRequest__ThreadSectionAppearance",
+});
+
+export type ClientRequest__ThreadSectionDeleteParams = { readonly sectionId: string };
+export const ClientRequest__ThreadSectionDeleteParams = Schema.Struct({
+  sectionId: Schema.String.annotate({
+    description: "The stable, server-generated identity of the section to delete.",
+  }),
+}).annotate({
+  description: "Parameters for deleting an independently persisted thread section.",
+  identifier: "ClientRequest__ThreadSectionDeleteParams",
+});
+
+export type ClientRequest__ThreadLoadedListParams = {
+  readonly cursor?: string | null;
+  readonly limit?: number | null;
+};
+export const ClientRequest__ThreadLoadedListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description:
-          "Optional migration-source selector. Missing or unrecognized values use the default source.",
+        description: "Opaque pagination cursor returned by a previous call.",
       }),
       Schema.Null,
     ]),
   ),
-  source: Schema.optionalKey(
+  limit: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Deprecated field retained for compatibility. This field is ignored; use `migrationSource` to select the migration source.",
-      }),
+      Schema.Number.annotate({
+        description: "Optional page size; defaults to no limit.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
+}).annotate({ identifier: "ClientRequest__ThreadLoadedListParams" });
+
+export type ClientRequest__ThreadReadParams = {
+  readonly includeTurns?: boolean;
+  readonly threadId: string;
+};
+export const ClientRequest__ThreadReadParams = Schema.Struct({
+  includeTurns: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, include turns and their items from rollout history. Full-history hydration is deprecated for paginated threads; prefer a metadata-only read and page with `thread/turns/list` and `thread/items/list`.",
+    }),
+  ),
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadReadParams" });
+
+export type ClientRequest__TurnItemsView = "notLoaded" | "summary" | "full";
+export const ClientRequest__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__TurnItemsView" });
+
+export type ClientRequest__ThreadItemsListAnchor = {
+  readonly itemId: string;
+  readonly type: "item";
+};
+export const ClientRequest__ThreadItemsListAnchor = Schema.Union(
+  [
+    Schema.Struct({
+      itemId: Schema.String,
+      type: Schema.Literal("item").annotate({ title: "ItemThreadItemsListAnchorType" }),
+    }).annotate({ title: "ItemThreadItemsListAnchor" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "An exclusive item position within the requested visible turn.",
+  identifier: "ClientRequest__ThreadItemsListAnchor",
 });
 
-export type ClientRequest__ExternalAgentConfigMigrationItemType =
-  | "AGENTS_MD"
-  | "CONFIG"
-  | "SKILLS"
-  | "PLUGINS"
-  | "MCP_SERVER_CONFIG"
-  | "SUBAGENTS"
-  | "HOOKS"
-  | "COMMANDS"
-  | "MEMORY"
-  | "SESSIONS";
-export const ClientRequest__ExternalAgentConfigMigrationItemType = Schema.Literals([
-  "AGENTS_MD",
-  "CONFIG",
-  "SKILLS",
-  "PLUGINS",
-  "MCP_SERVER_CONFIG",
-  "SUBAGENTS",
-  "HOOKS",
-  "COMMANDS",
-  "MEMORY",
-  "SESSIONS",
-]);
-
-export type ClientRequest__FeedbackUploadParams = {
-  readonly classification: string;
-  readonly extraLogFiles?: ReadonlyArray<string> | null;
-  readonly includeLogs?: boolean;
-  readonly reason?: string | null;
-  readonly tags?: { readonly [x: string]: string } | null;
-  readonly threadId?: string | null;
-};
-export const ClientRequest__FeedbackUploadParams = Schema.Struct({
-  classification: Schema.String,
-  extraLogFiles: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  includeLogs: Schema.optionalKey(Schema.Boolean),
-  reason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  tags: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type ClientRequest__FsCopyParams = {
-  readonly destinationPath: string;
-  readonly recursive?: boolean;
-  readonly sourcePath: string;
-};
-export const ClientRequest__FsCopyParams = Schema.Struct({
-  destinationPath: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-  recursive: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "Required for directory copies; ignored for file copies.",
-    }),
-  ),
-  sourcePath: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-}).annotate({ description: "Copy a file or directory tree on the host filesystem." });
-
-export type ClientRequest__FsCreateDirectoryParams = {
-  readonly path: string;
-  readonly recursive?: boolean | null;
+export type ClientRequest__ThreadInjectItemsParams = {
+  readonly items: ReadonlyArray<Schema.Json>;
+  readonly threadId: string;
 };
-export const ClientRequest__FsCreateDirectoryParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-  recursive: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description: "Whether parent directories should also be created. Defaults to `true`.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-}).annotate({ description: "Create a directory on the host filesystem." });
-
-export type ClientRequest__FsGetMetadataParams = { readonly path: string };
-export const ClientRequest__FsGetMetadataParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-}).annotate({ description: "Request metadata for an absolute path." });
-
-export type ClientRequest__FsReadDirectoryParams = { readonly path: string };
-export const ClientRequest__FsReadDirectoryParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-}).annotate({ description: "List direct child names for a directory." });
-
-export type ClientRequest__FsReadFileParams = { readonly path: string };
-export const ClientRequest__FsReadFileParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+export const ClientRequest__ThreadInjectItemsParams = Schema.Struct({
+  items: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
+    description: "Raw Responses API items to append to the thread's model-visible history.",
   }),
-}).annotate({ description: "Read a file from the host filesystem." });
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadInjectItemsParams" });
 
-export type ClientRequest__FsRemoveParams = {
-  readonly force?: boolean | null;
-  readonly path: string;
-  readonly recursive?: boolean | null;
+export type ClientRequest__SkillsListParams = {
+  readonly cwds?: ReadonlyArray<string>;
+  readonly forceReload?: boolean;
 };
-export const ClientRequest__FsRemoveParams = Schema.Struct({
-  force: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description: "Whether missing paths should be ignored. Defaults to `true`.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-  recursive: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description: "Whether directory removal should recurse. Defaults to `true`.",
-      }),
-      Schema.Null,
-    ]),
+export const ClientRequest__SkillsListParams = Schema.Struct({
+  cwds: Schema.optionalKey(
+    Schema.Array(Schema.String).annotate({
+      description: "When empty, defaults to the current session working directory.",
+    }),
   ),
-}).annotate({ description: "Remove a file or directory tree from the host filesystem." });
-
-export type ClientRequest__FsUnwatchParams = { readonly watchId: string };
-export const ClientRequest__FsUnwatchParams = Schema.Struct({
-  watchId: Schema.String.annotate({
-    description: "Watch identifier previously provided to `fs/watch`.",
-  }),
-}).annotate({ description: "Stop filesystem watch notifications for a prior `fs/watch`." });
-
-export type ClientRequest__FsWatchParams = { readonly path: string; readonly watchId: string };
-export const ClientRequest__FsWatchParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-  watchId: Schema.String.annotate({
-    description: "Connection-scoped watch identifier used for `fs/unwatch` and `fs/changed`.",
-  }),
-}).annotate({ description: "Start filesystem watch notifications for an absolute path." });
-
-export type ClientRequest__FsWriteFileParams = {
-  readonly dataBase64: string;
-  readonly path: string;
-};
-export const ClientRequest__FsWriteFileParams = Schema.Struct({
-  dataBase64: Schema.String.annotate({ description: "File contents encoded as base64." }),
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-}).annotate({ description: "Write a file on the host filesystem." });
-
-export type ClientRequest__FuzzyFileSearchParams = {
-  readonly cancellationToken?: string | null;
-  readonly query: string;
-  readonly roots: ReadonlyArray<string>;
-};
-export const ClientRequest__FuzzyFileSearchParams = Schema.Struct({
-  cancellationToken: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  query: Schema.String,
-  roots: Schema.Array(Schema.String),
-});
-
-export type ClientRequest__GetAccountParams = { readonly refreshToken?: boolean };
-export const ClientRequest__GetAccountParams = Schema.Struct({
-  refreshToken: Schema.optionalKey(
+  forceReload: Schema.optionalKey(
     Schema.Boolean.annotate({
-      description:
-        "When `true`, requests a proactive token refresh before returning.\n\nIn managed auth mode this triggers the normal refresh-token flow. In external auth mode this flag is ignored. Clients should refresh tokens themselves and call `account/login/start` with `chatgptAuthTokens`.",
+      description: "When true, bypass the skills cache and re-scan skills from disk.",
     }),
   ),
-});
+}).annotate({ identifier: "ClientRequest__SkillsListParams" });
 
-export type ClientRequest__HookMigration = { readonly name: string };
-export const ClientRequest__HookMigration = Schema.Struct({ name: Schema.String });
+export type ClientRequest__AbsolutePathBuf = string;
+export const ClientRequest__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "ClientRequest__AbsolutePathBuf",
+});
 
 export type ClientRequest__HooksListParams = { readonly cwds?: ReadonlyArray<string> };
 export const ClientRequest__HooksListParams = Schema.Struct({
@@ -631,99 +638,7 @@ export const ClientRequest__HooksListParams = Schema.Struct({
       description: "When empty, defaults to the current session working directory.",
     }),
   ),
-});
-
-export type ClientRequest__ImageDetail = "auto" | "low" | "high" | "original";
-export const ClientRequest__ImageDetail = Schema.Literals(["auto", "low", "high", "original"]);
-
-export type ClientRequest__InitializeCapabilities = {
-  readonly experimentalApi?: boolean;
-  readonly mcpServerOpenaiFormElicitation?: boolean;
-  readonly optOutNotificationMethods?: ReadonlyArray<string> | null;
-  readonly requestAttestation?: boolean;
-};
-export const ClientRequest__InitializeCapabilities = Schema.Struct({
-  experimentalApi: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "Opt into receiving experimental API methods and fields.",
-      default: false,
-    }),
-  ),
-  mcpServerOpenaiFormElicitation: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "Allow downstream MCP servers to request OpenAI extended form elicitations.",
-    }),
-  ),
-  optOutNotificationMethods: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(Schema.String).annotate({
-        description:
-          "Exact notification method names that should be suppressed for this connection (for example `thread/started`).",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  requestAttestation: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "Opt into `attestation/generate` requests for upstream `x-oai-attestation`.",
-      default: false,
-    }),
-  ),
-}).annotate({ description: "Client-declared capabilities negotiated during initialize." });
-
-export type ClientRequest__InternalChatMessageMetadataPassthrough = {
-  readonly turn_id?: string | null;
-};
-export const ClientRequest__InternalChatMessageMetadataPassthrough = Schema.Struct({
-  turn_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({
-  description:
-    "Internal Responses API passthrough metadata copied into underlying chat messages.\n\nResponses API strongly types this payload. Do not modify it without first getting API approval and making the corresponding Responses API change.",
-});
-
-export type ClientRequest__LegacyAppPathString = string;
-export const ClientRequest__LegacyAppPathString = Schema.String;
-
-export type ClientRequest__LocalShellAction = {
-  readonly command: ReadonlyArray<string>;
-  readonly env?: { readonly [x: string]: string } | null;
-  readonly timeout_ms?: number | null;
-  readonly type: "exec";
-  readonly user?: string | null;
-  readonly working_directory?: string | null;
-};
-export const ClientRequest__LocalShellAction = Schema.Union(
-  [
-    Schema.Struct({
-      command: Schema.Array(Schema.String),
-      env: Schema.optionalKey(
-        Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-      ),
-      timeout_ms: Schema.optionalKey(
-        Schema.Union([
-          Schema.Number.annotate({ format: "uint64" })
-            .check(Schema.isInt())
-            .check(Schema.isGreaterThanOrEqualTo(0)),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("exec").annotate({ title: "ExecLocalShellActionType" }),
-      user: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      working_directory: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "ExecLocalShellAction" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type ClientRequest__LocalShellStatus = "completed" | "in_progress" | "incomplete";
-export const ClientRequest__LocalShellStatus = Schema.Literals([
-  "completed",
-  "in_progress",
-  "incomplete",
-]);
-
-export type ClientRequest__LoginAppBrand = "codex" | "chatgpt";
-export const ClientRequest__LoginAppBrand = Schema.Literals(["codex", "chatgpt"]);
+}).annotate({ identifier: "ClientRequest__HooksListParams" });
 
 export type ClientRequest__MarketplaceAddParams = {
   readonly refName?: string | null;
@@ -734,87 +649,133 @@ export const ClientRequest__MarketplaceAddParams = Schema.Struct({
   refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   source: Schema.String,
   sparsePaths: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-});
+}).annotate({ identifier: "ClientRequest__MarketplaceAddParams" });
 
 export type ClientRequest__MarketplaceRemoveParams = { readonly marketplaceName: string };
 export const ClientRequest__MarketplaceRemoveParams = Schema.Struct({
   marketplaceName: Schema.String,
-});
+}).annotate({ identifier: "ClientRequest__MarketplaceRemoveParams" });
 
 export type ClientRequest__MarketplaceUpgradeParams = { readonly marketplaceName?: string | null };
 export const ClientRequest__MarketplaceUpgradeParams = Schema.Struct({
   marketplaceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "ClientRequest__MarketplaceUpgradeParams" });
 
-export type ClientRequest__McpResourceReadParams = {
-  readonly server: string;
-  readonly threadId?: string | null;
-  readonly uri: string;
-};
-export const ClientRequest__McpResourceReadParams = Schema.Struct({
-  server: Schema.String,
-  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  uri: Schema.String,
-});
+export type ClientRequest__PluginListMarketplaceKind =
+  | "local"
+  | "vertical"
+  | "workspace-directory"
+  | "shared-with-me"
+  | "created-by-me-remote";
+export const ClientRequest__PluginListMarketplaceKind = Schema.Literals([
+  "local",
+  "vertical",
+  "workspace-directory",
+  "shared-with-me",
+  "created-by-me-remote",
+]).annotate({ identifier: "ClientRequest__PluginListMarketplaceKind" });
 
-export type ClientRequest__McpServerMigration = { readonly name: string };
-export const ClientRequest__McpServerMigration = Schema.Struct({ name: Schema.String });
+export type ClientRequest__PluginReconcileParams = { readonly reason?: string | null };
+export const ClientRequest__PluginReconcileParams = Schema.Struct({
+  reason: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional client-provided reason recorded with the reconciliation attempt.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__PluginReconcileParams" });
 
-export type ClientRequest__McpServerOauthLoginParams = {
-  readonly name: string;
-  readonly scopes?: ReadonlyArray<string> | null;
-  readonly threadId?: string | null;
-  readonly timeoutSecs?: number | null;
+export type ClientRequest__PluginSkillReadParams = {
+  readonly remoteMarketplaceName: string;
+  readonly remotePluginId: string;
+  readonly skillName: string;
 };
-export const ClientRequest__McpServerOauthLoginParams = Schema.Struct({
-  name: Schema.String,
-  scopes: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  timeoutSecs: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-});
+export const ClientRequest__PluginSkillReadParams = Schema.Struct({
+  remoteMarketplaceName: Schema.String,
+  remotePluginId: Schema.String,
+  skillName: Schema.String,
+}).annotate({ identifier: "ClientRequest__PluginSkillReadParams" });
 
-export type ClientRequest__McpServerStatusDetail = "full" | "toolsAndAuthOnly";
-export const ClientRequest__McpServerStatusDetail = Schema.Literals(["full", "toolsAndAuthOnly"]);
+export type ClientRequest__PluginShareDiscoverability = "LISTED" | "UNLISTED" | "PRIVATE";
+export const ClientRequest__PluginShareDiscoverability = Schema.Literals([
+  "LISTED",
+  "UNLISTED",
+  "PRIVATE",
+]).annotate({ identifier: "ClientRequest__PluginShareDiscoverability" });
 
-export type ClientRequest__McpServerToolCallParams = {
-  readonly _meta?: unknown;
-  readonly arguments?: unknown;
-  readonly server: string;
-  readonly threadId: string;
-  readonly tool: string;
-};
-export const ClientRequest__McpServerToolCallParams = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  arguments: Schema.optionalKey(Schema.Unknown),
-  server: Schema.String,
-  threadId: Schema.String,
-  tool: Schema.String,
+export type ClientRequest__PluginSharePrincipalType = "user" | "group" | "workspace";
+export const ClientRequest__PluginSharePrincipalType = Schema.Literals([
+  "user",
+  "group",
+  "workspace",
+]).annotate({ identifier: "ClientRequest__PluginSharePrincipalType" });
+
+export type ClientRequest__PluginShareTargetRole = "reader" | "editor";
+export const ClientRequest__PluginShareTargetRole = Schema.Literals(["reader", "editor"]).annotate({
+  identifier: "ClientRequest__PluginShareTargetRole",
 });
 
-export type ClientRequest__MergeStrategy = "replace" | "upsert";
-export const ClientRequest__MergeStrategy = Schema.Literals(["replace", "upsert"]);
+export type ClientRequest__PluginShareUpdateDiscoverability = "UNLISTED" | "PRIVATE" | "LISTED";
+export const ClientRequest__PluginShareUpdateDiscoverability = Schema.Literals([
+  "UNLISTED",
+  "PRIVATE",
+  "LISTED",
+]).annotate({ identifier: "ClientRequest__PluginShareUpdateDiscoverability" });
 
-export type ClientRequest__MessagePhase = "commentary" | "final_answer";
-export const ClientRequest__MessagePhase = Schema.Literals(["commentary", "final_answer"]).annotate(
-  {
-    description:
-      'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-  },
-);
+export type ClientRequest__PluginShareListParams = { readonly [x: string]: Schema.Json };
+export const ClientRequest__PluginShareListParams = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ identifier: "ClientRequest__PluginShareListParams" });
 
-export type ClientRequest__ModeKind = "plan" | "default";
-export const ClientRequest__ModeKind = Schema.Literals(["plan", "default"]).annotate({
-  description: "Initial collaboration mode to use when the TUI starts.",
+export type ClientRequest__PluginShareCheckoutParams = { readonly remotePluginId: string };
+export const ClientRequest__PluginShareCheckoutParams = Schema.Struct({
+  remotePluginId: Schema.String,
+}).annotate({ identifier: "ClientRequest__PluginShareCheckoutParams" });
+
+export type ClientRequest__PluginShareDeleteParams = { readonly remotePluginId: string };
+export const ClientRequest__PluginShareDeleteParams = Schema.Struct({
+  remotePluginId: Schema.String,
+}).annotate({ identifier: "ClientRequest__PluginShareDeleteParams" });
+
+export type ClientRequest__AppsReadParams = {
+  readonly appIds: ReadonlyArray<string>;
+  readonly includeTools?: boolean;
+  readonly threadId?: string | null;
+};
+export const ClientRequest__AppsReadParams = Schema.Struct({
+  appIds: Schema.Array(Schema.String).annotate({
+    description:
+      "App ids to read. The server accepts at most 100 ids and deduplicates repeated ids while preserving their first-request order.",
+  }),
+  includeTools: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, include display-only public tool summaries in the returned metadata.",
+    }),
+  ),
+  threadId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional loaded thread id used to evaluate effective app configuration.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({
+  description: "EXPERIMENTAL - read metadata for specific apps/connectors.",
+  identifier: "ClientRequest__AppsReadParams",
 });
 
-export type ClientRequest__ModelListParams = {
+export type ClientRequest__AppsListParams = {
   readonly cursor?: string | null;
-  readonly includeHidden?: boolean | null;
+  readonly forceRefetch?: boolean;
   readonly limit?: number | null;
+  readonly threadId?: string | null;
 };
-export const ClientRequest__ModelListParams = Schema.Struct({
+export const ClientRequest__AppsListParams = Schema.Struct({
   cursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -823,13 +784,10 @@ export const ClientRequest__ModelListParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
-  includeHidden: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description: "When true, include models that are hidden from the default picker list.",
-      }),
-      Schema.Null,
-    ]),
+  forceRefetch: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "When true, bypass app caches and fetch the latest data from sources.",
+    }),
   ),
   limit: Schema.optionalKey(
     Schema.Union([
@@ -837,167 +795,104 @@ export const ClientRequest__ModelListParams = Schema.Struct({
         description: "Optional page size; defaults to a reasonable server-side value.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
-});
-
-export type ClientRequest__ModelProviderCapabilitiesReadParams = {};
-export const ClientRequest__ModelProviderCapabilitiesReadParams = Schema.Struct({});
-
-export type ClientRequest__PermissionProfileListParams = {
-  readonly cursor?: string | null;
-  readonly cwd?: string | null;
-  readonly limit?: number | null;
-};
-export const ClientRequest__PermissionProfileListParams = Schema.Struct({
-  cursor: Schema.optionalKey(
+  threadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Opaque pagination cursor returned by a previous call.",
+        description:
+          "Optional thread id used to evaluate app feature gating from that thread's config.",
       }),
       Schema.Null,
     ]),
   ),
-  cwd: Schema.optionalKey(
+}).annotate({
+  description: "EXPERIMENTAL - list available apps/connectors.",
+  identifier: "ClientRequest__AppsListParams",
+});
+
+export type ClientRequest__AppsInstalledParams = {
+  readonly forceRefresh?: boolean;
+  readonly threadId?: string | null;
+};
+export const ClientRequest__AppsInstalledParams = Schema.Struct({
+  forceRefresh: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true and Apps are permitted, refresh and publish the hosted connector runtime tool snapshot first.",
+    }),
+  ),
+  threadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional working directory to resolve project config layers.",
+        description: "Optional loaded thread id used to evaluate effective app configuration.",
       }),
       Schema.Null,
     ]),
   ),
-  limit: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
-        description: "Optional page size; defaults to the full result set.",
-        format: "uint32",
-      })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
+}).annotate({
+  description: "Read the committed installed connector runtime snapshot.",
+  identifier: "ClientRequest__AppsInstalledParams",
 });
 
-export type ClientRequest__Personality = "none" | "friendly" | "pragmatic";
-export const ClientRequest__Personality = Schema.Literals(["none", "friendly", "pragmatic"]);
-
-export type ClientRequest__PluginListMarketplaceKind =
-  | "local"
-  | "vertical"
-  | "workspace-directory"
-  | "shared-with-me"
-  | "created-by-me-remote";
-export const ClientRequest__PluginListMarketplaceKind = Schema.Literals([
-  "local",
-  "vertical",
-  "workspace-directory",
-  "shared-with-me",
-  "created-by-me-remote",
-]);
-
-export type ClientRequest__PluginShareCheckoutParams = { readonly remotePluginId: string };
-export const ClientRequest__PluginShareCheckoutParams = Schema.Struct({
-  remotePluginId: Schema.String,
+export type ClientRequest__FsUnwatchParams = { readonly watchId: string };
+export const ClientRequest__FsUnwatchParams = Schema.Struct({
+  watchId: Schema.String.annotate({
+    description: "Watch identifier previously provided to `fs/watch`.",
+  }),
+}).annotate({
+  description: "Stop filesystem watch notifications for a prior `fs/watch`.",
+  identifier: "ClientRequest__FsUnwatchParams",
 });
 
-export type ClientRequest__PluginShareDeleteParams = { readonly remotePluginId: string };
-export const ClientRequest__PluginShareDeleteParams = Schema.Struct({
-  remotePluginId: Schema.String,
-});
+export type ClientRequest__PluginUninstallParams = { readonly pluginId: string };
+export const ClientRequest__PluginUninstallParams = Schema.Struct({
+  pluginId: Schema.String,
+}).annotate({ identifier: "ClientRequest__PluginUninstallParams" });
 
-export type ClientRequest__PluginShareDiscoverability = "LISTED" | "UNLISTED" | "PRIVATE";
-export const ClientRequest__PluginShareDiscoverability = Schema.Literals([
-  "LISTED",
-  "UNLISTED",
-  "PRIVATE",
-]);
+export type ClientRequest__ReasoningEffort = string;
+export const ClientRequest__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "ClientRequest__ReasoningEffort",
+  }),
+);
 
-export type ClientRequest__PluginShareListParams = {};
-export const ClientRequest__PluginShareListParams = Schema.Struct({});
+export type ClientRequest__ByteRange = { readonly end: number; readonly start: number };
+export const ClientRequest__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "ClientRequest__ByteRange" });
 
-export type ClientRequest__PluginSharePrincipalType = "user" | "group" | "workspace";
-export const ClientRequest__PluginSharePrincipalType = Schema.Literals([
-  "user",
-  "group",
-  "workspace",
-]);
+export type ClientRequest__ImageDetail = "auto" | "low" | "high" | "original";
+export const ClientRequest__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "ClientRequest__ImageDetail" });
 
-export type ClientRequest__PluginShareTargetRole = "reader" | "editor";
-export const ClientRequest__PluginShareTargetRole = Schema.Literals(["reader", "editor"]);
-
-export type ClientRequest__PluginShareUpdateDiscoverability = "UNLISTED" | "PRIVATE" | "LISTED";
-export const ClientRequest__PluginShareUpdateDiscoverability = Schema.Literals([
-  "UNLISTED",
-  "PRIVATE",
-  "LISTED",
-]);
-
-export type ClientRequest__PluginSkillReadParams = {
-  readonly remoteMarketplaceName: string;
-  readonly remotePluginId: string;
-  readonly skillName: string;
-};
-export const ClientRequest__PluginSkillReadParams = Schema.Struct({
-  remoteMarketplaceName: Schema.String,
-  remotePluginId: Schema.String,
-  skillName: Schema.String,
-});
-
-export type ClientRequest__PluginUninstallParams = { readonly pluginId: string };
-export const ClientRequest__PluginUninstallParams = Schema.Struct({ pluginId: Schema.String });
-
-export type ClientRequest__PluginsMigration = {
-  readonly marketplaceName: string;
-  readonly pluginNames: ReadonlyArray<string>;
-};
-export const ClientRequest__PluginsMigration = Schema.Struct({
-  marketplaceName: Schema.String,
-  pluginNames: Schema.Array(Schema.String),
-});
-
-export type ClientRequest__ReasoningEffort = string;
-export const ClientRequest__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
-
-export type ClientRequest__ReasoningItemContent =
-  | { readonly text: string; readonly type: "reasoning_text" }
-  | { readonly text: string; readonly type: "text" };
-export const ClientRequest__ReasoningItemContent = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("reasoning_text").annotate({
-        title: "ReasoningTextReasoningItemContentType",
-      }),
-    }).annotate({ title: "ReasoningTextReasoningItemContent" }),
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("text").annotate({ title: "TextReasoningItemContentType" }),
-    }).annotate({ title: "TextReasoningItemContent" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type ClientRequest__ReasoningItemReasoningSummary = {
-  readonly text: string;
-  readonly type: "summary_text";
-};
-export const ClientRequest__ReasoningItemReasoningSummary = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("summary_text").annotate({
-        title: "SummaryTextReasoningItemReasoningSummaryType",
-      }),
-    }).annotate({ title: "SummaryTextReasoningItemReasoningSummary" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ClientRequest__NetworkAccess = "restricted" | "enabled";
+export const ClientRequest__NetworkAccess = Schema.Literals(["restricted", "enabled"]).annotate({
+  identifier: "ClientRequest__NetworkAccess",
+});
 
 export type ClientRequest__ReasoningSummary = "auto" | "concise" | "detailed" | "none";
 export const ClientRequest__ReasoningSummary = Schema.Union(
@@ -1009,56 +904,22 @@ export const ClientRequest__ReasoningSummary = Schema.Union(
 ).annotate({
   description:
     "A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#reasoning-summaries",
+  identifier: "ClientRequest__ReasoningSummary",
 });
 
-export type ClientRequest__RequestId = string | number;
-export const ClientRequest__RequestId = Schema.Union([
-  Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
-
-export type ClientRequest__ResponsesApiWebSearchAction =
-  | {
-      readonly queries?: ReadonlyArray<string> | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly type: "open_page"; readonly url?: string | null }
-  | {
-      readonly pattern?: string | null;
-      readonly type: "find_in_page";
-      readonly url?: string | null;
-    }
-  | { readonly type: "other" };
-export const ClientRequest__ResponsesApiWebSearchAction = Schema.Union(
-  [
-    Schema.Struct({
-      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchResponsesApiWebSearchActionType" }),
-    }).annotate({ title: "SearchResponsesApiWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("open_page").annotate({
-        title: "OpenPageResponsesApiWebSearchActionType",
-      }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageResponsesApiWebSearchAction" }),
-    Schema.Struct({
-      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("find_in_page").annotate({
-        title: "FindInPageResponsesApiWebSearchActionType",
-      }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageResponsesApiWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherResponsesApiWebSearchActionType" }),
-    }).annotate({ title: "OtherResponsesApiWebSearchAction" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ClientRequest__TurnInterruptParams = {
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ClientRequest__TurnInterruptParams = Schema.Struct({
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ClientRequest__TurnInterruptParams" });
 
 export type ClientRequest__ReviewDelivery = "inline" | "detached";
-export const ClientRequest__ReviewDelivery = Schema.Literals(["inline", "detached"]);
+export const ClientRequest__ReviewDelivery = Schema.Literals(["inline", "detached"]).annotate({
+  identifier: "ClientRequest__ReviewDelivery",
+});
 
 export type ClientRequest__ReviewTarget =
   | { readonly type: "uncommittedChanges" }
@@ -1106,141 +967,61 @@ export const ClientRequest__ReviewTarget = Schema.Union(
     }),
   ],
   { mode: "oneOf" },
-);
-
-export type ClientRequest__SandboxMode = "read-only" | "workspace-write" | "danger-full-access";
-export const ClientRequest__SandboxMode = Schema.Literals([
-  "read-only",
-  "workspace-write",
-  "danger-full-access",
-]);
-
-export type ClientRequest__SessionMigration = {
-  readonly cwd: string;
-  readonly path: string;
-  readonly title?: string | null;
-};
-export const ClientRequest__SessionMigration = Schema.Struct({
-  cwd: Schema.String,
-  path: Schema.String,
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type ClientRequest__SkillMigration = { readonly name: string };
-export const ClientRequest__SkillMigration = Schema.Struct({ name: Schema.String });
-
-export type ClientRequest__SkillsListParams = {
-  readonly cwds?: ReadonlyArray<string>;
-  readonly forceReload?: boolean;
-};
-export const ClientRequest__SkillsListParams = Schema.Struct({
-  cwds: Schema.optionalKey(
-    Schema.Array(Schema.String).annotate({
-      description: "When empty, defaults to the current session working directory.",
-    }),
-  ),
-  forceReload: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "When true, bypass the skills cache and re-scan skills from disk.",
-    }),
-  ),
-});
+).annotate({ identifier: "ClientRequest__ReviewTarget" });
 
-export type ClientRequest__SortDirection = "asc" | "desc";
-export const ClientRequest__SortDirection = Schema.Literals(["asc", "desc"]);
-
-export type ClientRequest__SubagentMigration = { readonly name: string };
-export const ClientRequest__SubagentMigration = Schema.Struct({ name: Schema.String });
-
-export type ClientRequest__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type ClientRequest__ModelListParams = {
+  readonly cursor?: string | null;
+  readonly includeHidden?: boolean | null;
+  readonly limit?: number | null;
 };
-export const ClientRequest__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
+export const ClientRequest__ModelListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+        description: "Opaque pagination cursor returned by a previous call.",
       }),
       Schema.Null,
     ]),
   ),
-});
-
-export type ClientRequest__ThreadApproveGuardianDeniedActionParams = {
-  readonly event: unknown;
-  readonly threadId: string;
-};
-export const ClientRequest__ThreadApproveGuardianDeniedActionParams = Schema.Struct({
-  event: Schema.Unknown.annotate({
-    description: "Serialized `codex_protocol::protocol::GuardianAssessmentEvent`.",
-  }),
-  threadId: Schema.String,
-});
-
-export type ClientRequest__ThreadArchiveParams = { readonly threadId: string };
-export const ClientRequest__ThreadArchiveParams = Schema.Struct({ threadId: Schema.String });
-
-export type ClientRequest__ThreadCompactStartParams = { readonly threadId: string };
-export const ClientRequest__ThreadCompactStartParams = Schema.Struct({ threadId: Schema.String });
-
-export type ClientRequest__ThreadDeleteParams = { readonly threadId: string };
-export const ClientRequest__ThreadDeleteParams = Schema.Struct({ threadId: Schema.String });
-
-export type ClientRequest__ThreadGoalClearParams = { readonly threadId: string };
-export const ClientRequest__ThreadGoalClearParams = Schema.Struct({ threadId: Schema.String });
-
-export type ClientRequest__ThreadGoalGetParams = { readonly threadId: string };
-export const ClientRequest__ThreadGoalGetParams = Schema.Struct({ threadId: Schema.String });
-
-export type ClientRequest__ThreadGoalStatus =
-  | "active"
-  | "paused"
-  | "blocked"
-  | "usageLimited"
-  | "budgetLimited"
-  | "complete";
-export const ClientRequest__ThreadGoalStatus = Schema.Literals([
-  "active",
-  "paused",
-  "blocked",
-  "usageLimited",
-  "budgetLimited",
-  "complete",
-]);
+  includeHidden: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description: "When true, include models that are hidden from the default picker list.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  limit: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Optional page size; defaults to a reasonable server-side value.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__ModelListParams" });
 
-export type ClientRequest__ThreadInjectItemsParams = {
-  readonly items: ReadonlyArray<unknown>;
-  readonly threadId: string;
+export type ClientRequest__ModelProviderCapabilitiesReadParams = {
+  readonly [x: string]: Schema.Json;
 };
-export const ClientRequest__ThreadInjectItemsParams = Schema.Struct({
-  items: Schema.Array(Schema.Unknown).annotate({
-    description: "Raw Responses API items to append to the thread's model-visible history.",
-  }),
-  threadId: Schema.String,
-});
-
-export type ClientRequest__ThreadListCwdFilter = string | ReadonlyArray<string>;
-export const ClientRequest__ThreadListCwdFilter = Schema.Union([
+export const ClientRequest__ModelProviderCapabilitiesReadParams = Schema.Record(
   Schema.String,
-  Schema.Array(Schema.String),
-]);
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ identifier: "ClientRequest__ModelProviderCapabilitiesReadParams" });
 
-export type ClientRequest__ThreadLoadedListParams = {
+export type ClientRequest__ExperimentalFeatureListParams = {
   readonly cursor?: string | null;
   readonly limit?: number | null;
+  readonly threadId?: string | null;
 };
-export const ClientRequest__ThreadLoadedListParams = Schema.Struct({
+export const ClientRequest__ExperimentalFeatureListParams = Schema.Struct({
   cursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -1252,180 +1033,717 @@ export const ClientRequest__ThreadLoadedListParams = Schema.Struct({
   limit: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
-        description: "Optional page size; defaults to no limit.",
+        description: "Optional page size; defaults to a reasonable server-side value.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
-});
-
-export type ClientRequest__ThreadMetadataGitInfoUpdateParams = {
-  readonly branch?: string | null;
-  readonly originUrl?: string | null;
-  readonly sha?: string | null;
-};
-export const ClientRequest__ThreadMetadataGitInfoUpdateParams = Schema.Struct({
-  branch: Schema.optionalKey(
+  threadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
         description:
-          "Omit to leave the stored branch unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
+          "Optional loaded thread id. Pass this when showing feature state for an existing thread so enablement is computed from that thread's refreshed config, including project-local config for the thread's cwd.",
       }),
       Schema.Null,
     ]),
   ),
-  originUrl: Schema.optionalKey(
+}).annotate({ identifier: "ClientRequest__ExperimentalFeatureListParams" });
+
+export type ClientRequest__PermissionProfileListParams = {
+  readonly cursor?: string | null;
+  readonly cwd?: string | null;
+  readonly limit?: number | null;
+};
+export const ClientRequest__PermissionProfileListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description:
-          "Omit to leave the stored origin URL unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
+        description: "Opaque pagination cursor returned by a previous call.",
       }),
       Schema.Null,
     ]),
   ),
-  sha: Schema.optionalKey(
+  cwd: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description:
-          "Omit to leave the stored commit unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
+        description: "Optional working directory to resolve project config layers.",
       }),
       Schema.Null,
     ]),
   ),
-});
-
-export type ClientRequest__ThreadReadParams = {
-  readonly includeTurns?: boolean;
-  readonly threadId: string;
-};
-export const ClientRequest__ThreadReadParams = Schema.Struct({
-  includeTurns: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "When true, include turns and their items from rollout history.",
-    }),
+  limit: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Optional page size; defaults to the full result set.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
   ),
-  threadId: Schema.String,
-});
+}).annotate({ identifier: "ClientRequest__PermissionProfileListParams" });
 
-export type ClientRequest__ThreadRollbackParams = {
-  readonly numTurns: number;
-  readonly threadId: string;
+export type ClientRequest__ExperimentalFeatureEnablementSetParams = {
+  readonly enablement: { readonly [x: string]: boolean };
 };
-export const ClientRequest__ThreadRollbackParams = Schema.Struct({
-  numTurns: Schema.Number.annotate({
+export const ClientRequest__ExperimentalFeatureEnablementSetParams = Schema.Struct({
+  enablement: Schema.Record(Schema.String, Schema.Boolean).annotate({
     description:
-      "The number of turns to drop from the end of the thread. Must be >= 1.\n\nThis only modifies the thread's history and does not revert local file changes that have been made by the agent. Clients are responsible for reverting these changes.",
-    format: "uint32",
-  })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  threadId: Schema.String,
-}).annotate({ description: "DEPRECATED: `thread/rollback` will be removed soon." });
+      "Process-wide runtime feature enablement keyed by canonical feature name.\n\nOnly named features are updated. Omitted features are left unchanged. Send an empty map for a no-op.",
+  }),
+}).annotate({ identifier: "ClientRequest__ExperimentalFeatureEnablementSetParams" });
 
-export type ClientRequest__ThreadSetNameParams = {
-  readonly name: string;
-  readonly threadId: string;
+export type ClientRequest__McpServerOauthClientRegistration = "auto" | "cimd" | "dcr";
+export const ClientRequest__McpServerOauthClientRegistration = Schema.Literals([
+  "auto",
+  "cimd",
+  "dcr",
+]).annotate({ identifier: "ClientRequest__McpServerOauthClientRegistration" });
+
+export type ClientRequest__McpServerStatusDetail = "full" | "toolsAndAuthOnly";
+export const ClientRequest__McpServerStatusDetail = Schema.Literals([
+  "full",
+  "toolsAndAuthOnly",
+]).annotate({ identifier: "ClientRequest__McpServerStatusDetail" });
+
+export type ClientRequest__McpResourceReadTarget = {
+  readonly connectorId: string;
+  readonly linkId: string | null;
 };
-export const ClientRequest__ThreadSetNameParams = Schema.Struct({
-  name: Schema.String,
-  threadId: Schema.String,
-});
+export const ClientRequest__McpResourceReadTarget = Schema.Struct({
+  connectorId: Schema.String,
+  linkId: Schema.Union([
+    Schema.String.annotate({
+      description: "Null explicitly requests no-auth access, subject to the app's resource policy.",
+    }),
+    Schema.Null,
+  ]),
+}).annotate({ identifier: "ClientRequest__McpResourceReadTarget" });
 
-export type ClientRequest__ThreadShellCommandParams = {
-  readonly command: string;
+export type ClientRequest__McpServerToolCallParams = {
+  readonly _meta?: Schema.Json;
+  readonly arguments?: Schema.Json;
+  readonly server: string;
   readonly threadId: string;
+  readonly tool: string;
 };
-export const ClientRequest__ThreadShellCommandParams = Schema.Struct({
-  command: Schema.String.annotate({
-    description:
-      "Shell command string evaluated by the thread's configured shell. Unlike `command/exec`, this intentionally preserves shell syntax such as pipes, redirects, and quoting. This runs unsandboxed with full access rather than inheriting the thread sandbox policy.",
-  }),
+export const ClientRequest__McpServerToolCallParams = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  arguments: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  server: Schema.String,
   threadId: Schema.String,
+  tool: Schema.String,
+}).annotate({ identifier: "ClientRequest__McpServerToolCallParams" });
+
+export type ClientRequest__WindowsSandboxSetupMode = "elevated" | "unelevated";
+export const ClientRequest__WindowsSandboxSetupMode = Schema.Literals([
+  "elevated",
+  "unelevated",
+]).annotate({ identifier: "ClientRequest__WindowsSandboxSetupMode" });
+
+export type ClientRequest__LoginAppBrand = "codex" | "chatgpt";
+export const ClientRequest__LoginAppBrand = Schema.Literals(["codex", "chatgpt"]).annotate({
+  identifier: "ClientRequest__LoginAppBrand",
 });
 
-export type ClientRequest__ThreadSortKey = "created_at" | "updated_at" | "recency_at";
-export const ClientRequest__ThreadSortKey = Schema.Literals([
-  "created_at",
-  "updated_at",
-  "recency_at",
-]);
+export type ClientRequest__CancelLoginAccountParams = { readonly loginId: string };
+export const ClientRequest__CancelLoginAccountParams = Schema.Struct({
+  loginId: Schema.String,
+}).annotate({ identifier: "ClientRequest__CancelLoginAccountParams" });
 
-export type ClientRequest__ThreadSource = string;
-export const ClientRequest__ThreadSource = Schema.String;
+export type ClientRequest__GetAccountRateLimitsParams = {
+  readonly excludeResetCreditDetails?: boolean;
+  readonly supportsLunaReserve?: boolean;
+};
+export const ClientRequest__GetAccountRateLimitsParams = Schema.Struct({
+  excludeResetCreditDetails: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Skip the separate reset-credit detail lookup for background usage polls. The usage response still includes the available count; omitted/false preserves detailed reads.",
+    }),
+  ),
+  supportsLunaReserve: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "The client supports automatic Luna Reserve fallback. For eligible ChatGPT CLI users, allow the backend to record experiment exposure after ordinary usage is blocked.",
+    }),
+  ),
+}).annotate({
+  description:
+    "Usage-read capabilities of the requesting client, never inferred from its experiment arm.",
+  identifier: "ClientRequest__GetAccountRateLimitsParams",
+});
 
-export type ClientRequest__ThreadSourceKind =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "subAgent"
-  | "subAgentReview"
-  | "subAgentCompact"
-  | "subAgentThreadSpawn"
-  | "subAgentOther"
-  | "unknown";
-export const ClientRequest__ThreadSourceKind = Schema.Literals([
-  "cli",
-  "vscode",
-  "exec",
-  "appServer",
-  "subAgent",
-  "subAgentReview",
-  "subAgentCompact",
-  "subAgentThreadSpawn",
-  "subAgentOther",
-  "unknown",
-]);
+export type ClientRequest__ConsumeAccountRateLimitResetCreditParams = {
+  readonly creditId?: string | null;
+  readonly idempotencyKey: string;
+};
+export const ClientRequest__ConsumeAccountRateLimitResetCreditParams = Schema.Struct({
+  creditId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Opaque reset-credit identifier to redeem. When omitted, the backend selects the next available credit.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  idempotencyKey: Schema.String.annotate({
+    description:
+      "Identifies one logical reset attempt. A UUID is recommended; reuse the same value when retrying that attempt.",
+  }),
+}).annotate({ identifier: "ClientRequest__ConsumeAccountRateLimitResetCreditParams" });
 
-export type ClientRequest__ThreadStartSource = "startup" | "clear";
-export const ClientRequest__ThreadStartSource = Schema.Literals(["startup", "clear"]);
+export type ClientRequest__GetAccountTokenUsageParams = { readonly threadId?: string | null };
+export const ClientRequest__GetAccountTokenUsageParams = Schema.Struct({
+  threadId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "When present, read estimated usage for this thread instead of account-wide token activity.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__GetAccountTokenUsageParams" });
 
-export type ClientRequest__ThreadUnarchiveParams = { readonly threadId: string };
-export const ClientRequest__ThreadUnarchiveParams = Schema.Struct({ threadId: Schema.String });
+export type ClientRequest__AddCreditsNudgeCreditType = "credits" | "usage_limit";
+export const ClientRequest__AddCreditsNudgeCreditType = Schema.Literals([
+  "credits",
+  "usage_limit",
+]).annotate({ identifier: "ClientRequest__AddCreditsNudgeCreditType" });
 
-export type ClientRequest__ThreadUnsubscribeParams = { readonly threadId: string };
-export const ClientRequest__ThreadUnsubscribeParams = Schema.Struct({ threadId: Schema.String });
+export type ClientRequest__FeedbackUploadParams = {
+  readonly classification: string;
+  readonly extraLogFiles?: ReadonlyArray<string> | null;
+  readonly includeLogs?: boolean;
+  readonly reason?: string | null;
+  readonly tags?: { readonly [x: string]: string } | null;
+  readonly threadId?: string | null;
+};
+export const ClientRequest__FeedbackUploadParams = Schema.Struct({
+  classification: Schema.String,
+  extraLogFiles: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  includeLogs: Schema.optionalKey(Schema.Boolean),
+  reason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  tags: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ClientRequest__FeedbackUploadParams" });
 
-export type ClientRequest__TurnInterruptParams = {
-  readonly threadId: string;
-  readonly turnId: string;
+export type ClientRequest__CommandExecTerminalSize = {
+  readonly cols: number;
+  readonly rows: number;
 };
-export const ClientRequest__TurnInterruptParams = Schema.Struct({
-  threadId: Schema.String,
-  turnId: Schema.String,
+export const ClientRequest__CommandExecTerminalSize = Schema.Struct({
+  cols: Schema.Number.annotate({
+    description: "Terminal width in character cells.",
+    format: "uint16",
+  })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  rows: Schema.Number.annotate({
+    description: "Terminal height in character cells.",
+    format: "uint16",
+  })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({
+  description: "PTY size in character cells for `command/exec` PTY sessions.",
+  identifier: "ClientRequest__CommandExecTerminalSize",
 });
 
-export type ClientRequest__TurnItemsView = "notLoaded" | "summary" | "full";
-export const ClientRequest__TurnItemsView = Schema.Literals(["notLoaded", "summary", "full"]);
-
-export type ClientRequest__WindowsSandboxSetupMode = "elevated" | "unelevated";
-export const ClientRequest__WindowsSandboxSetupMode = Schema.Literals(["elevated", "unelevated"]);
+export type ClientRequest__CommandExecWriteParams = {
+  readonly closeStdin?: boolean;
+  readonly deltaBase64?: string | null;
+  readonly processId: string;
+};
+export const ClientRequest__CommandExecWriteParams = Schema.Struct({
+  closeStdin: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "Close stdin after writing `deltaBase64`, if present.",
+    }),
+  ),
+  deltaBase64: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Optional base64-encoded stdin bytes to write." }),
+      Schema.Null,
+    ]),
+  ),
+  processId: Schema.String.annotate({
+    description:
+      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
+  }),
+}).annotate({
+  description: "Write stdin bytes to a running `command/exec` session, close stdin, or both.",
+  identifier: "ClientRequest__CommandExecWriteParams",
+});
 
-export type CommandExecutionRequestApprovalParams__AbsolutePathBuf = string;
-export const CommandExecutionRequestApprovalParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+export type ClientRequest__CommandExecTerminateParams = { readonly processId: string };
+export const ClientRequest__CommandExecTerminateParams = Schema.Struct({
+  processId: Schema.String.annotate({
+    description:
+      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
+  }),
+}).annotate({
+  description: "Terminate a running `command/exec` session.",
+  identifier: "ClientRequest__CommandExecTerminateParams",
 });
 
-export type CommandExecutionRequestApprovalParams__AdditionalNetworkPermissions = {
-  readonly enabled?: boolean | null;
+export type ClientRequest__ConfigReadParams = {
+  readonly cwd?: string | null;
+  readonly includeLayers?: boolean;
 };
-export const CommandExecutionRequestApprovalParams__AdditionalNetworkPermissions = Schema.Struct({
-  enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-});
+export const ClientRequest__ConfigReadParams = Schema.Struct({
+  cwd: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional working directory to resolve project config layers. If specified, return the effective config as seen from that directory (i.e., including any project layers between `cwd` and the project/repo root).",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  includeLayers: Schema.optionalKey(Schema.Boolean),
+}).annotate({ identifier: "ClientRequest__ConfigReadParams" });
 
-export type CommandExecutionRequestApprovalParams__FileSystemAccessMode = "read" | "write" | "deny";
-export const CommandExecutionRequestApprovalParams__FileSystemAccessMode = Schema.Literals([
-  "read",
-  "write",
-  "deny",
-]);
+export type ClientRequest__ExternalAgentConfigDetectParams = {
+  readonly cwds?: ReadonlyArray<string> | null;
+  readonly includeHome?: boolean;
+  readonly maxSessionAgeDays?: number | null;
+  readonly maxSessions?: number | null;
+  readonly migrationSource?: string | null;
+  readonly source?: string | null;
+};
+export const ClientRequest__ExternalAgentConfigDetectParams = Schema.Struct({
+  cwds: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description: "Zero or more working directories to include for repo-scoped detection.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  includeHome: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "If true, include detection under the user's home directory.",
+    }),
+  ),
+  maxSessionAgeDays: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Maximum age in days for detected sessions. Missing values use the default limit.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  maxSessions: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Maximum number of sessions to detect. Missing values use the default limit.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  migrationSource: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional migration-source selector. Missing or unrecognized values use the default source.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  source: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Deprecated field retained for compatibility. This field is ignored; use `migrationSource` to select the migration source.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__ExternalAgentConfigDetectParams" });
+
+export type ClientRequest__CommandMigration = { readonly name: string };
+export const ClientRequest__CommandMigration = Schema.Struct({ name: Schema.String }).annotate({
+  identifier: "ClientRequest__CommandMigration",
+});
+
+export type ClientRequest__HookMigration = { readonly name: string };
+export const ClientRequest__HookMigration = Schema.Struct({ name: Schema.String }).annotate({
+  identifier: "ClientRequest__HookMigration",
+});
+
+export type ClientRequest__McpServerMigration = { readonly name: string };
+export const ClientRequest__McpServerMigration = Schema.Struct({ name: Schema.String }).annotate({
+  identifier: "ClientRequest__McpServerMigration",
+});
+
+export type ClientRequest__PluginsMigration = {
+  readonly marketplaceName: string;
+  readonly pluginNames: ReadonlyArray<string>;
+};
+export const ClientRequest__PluginsMigration = Schema.Struct({
+  marketplaceName: Schema.String,
+  pluginNames: Schema.Array(Schema.String),
+}).annotate({ identifier: "ClientRequest__PluginsMigration" });
+
+export type ClientRequest__SessionMigration = {
+  readonly cwd: string;
+  readonly path: string;
+  readonly title?: string | null;
+};
+export const ClientRequest__SessionMigration = Schema.Struct({
+  cwd: Schema.String,
+  path: Schema.String,
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ClientRequest__SessionMigration" });
+
+export type ClientRequest__SkillMigration = { readonly name: string };
+export const ClientRequest__SkillMigration = Schema.Struct({ name: Schema.String }).annotate({
+  identifier: "ClientRequest__SkillMigration",
+});
+
+export type ClientRequest__SubagentMigration = { readonly name: string };
+export const ClientRequest__SubagentMigration = Schema.Struct({ name: Schema.String }).annotate({
+  identifier: "ClientRequest__SubagentMigration",
+});
+
+export type ClientRequest__ExternalAgentConfigMigrationItemType =
+  | "AGENTS_MD"
+  | "CONFIG"
+  | "SKILLS"
+  | "PLUGINS"
+  | "MCP_SERVER_CONFIG"
+  | "SUBAGENTS"
+  | "HOOKS"
+  | "COMMANDS"
+  | "MEMORY"
+  | "SESSIONS";
+export const ClientRequest__ExternalAgentConfigMigrationItemType = Schema.Literals([
+  "AGENTS_MD",
+  "CONFIG",
+  "SKILLS",
+  "PLUGINS",
+  "MCP_SERVER_CONFIG",
+  "SUBAGENTS",
+  "HOOKS",
+  "COMMANDS",
+  "MEMORY",
+  "SESSIONS",
+]).annotate({ identifier: "ClientRequest__ExternalAgentConfigMigrationItemType" });
+
+export type ClientRequest__MergeStrategy = "replace" | "upsert";
+export const ClientRequest__MergeStrategy = Schema.Literals(["replace", "upsert"]).annotate({
+  identifier: "ClientRequest__MergeStrategy",
+});
+
+export type ClientRequest__GetAccountParams = { readonly refreshToken?: boolean };
+export const ClientRequest__GetAccountParams = Schema.Struct({
+  refreshToken: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When `true`, requests a proactive token refresh before returning.\n\nIn managed auth mode this triggers the normal refresh-token flow. In external auth mode this flag is ignored. Clients should refresh tokens themselves and call `account/login/start` with `chatgptAuthTokens`.",
+    }),
+  ),
+}).annotate({ identifier: "ClientRequest__GetAccountParams" });
+
+export type ClientRequest__FuzzyFileSearchParams = {
+  readonly cancellationToken?: string | null;
+  readonly query: string;
+  readonly roots: ReadonlyArray<string>;
+};
+export const ClientRequest__FuzzyFileSearchParams = Schema.Struct({
+  cancellationToken: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  query: Schema.String,
+  roots: Schema.Array(Schema.String),
+}).annotate({ identifier: "ClientRequest__FuzzyFileSearchParams" });
+
+export type ClientRequest__AdditionalContextKind = "untrusted" | "application";
+export const ClientRequest__AdditionalContextKind = Schema.Literals([
+  "untrusted",
+  "application",
+]).annotate({ identifier: "ClientRequest__AdditionalContextKind" });
+
+export type ClientRequest__ModeKind = "plan" | "default";
+export const ClientRequest__ModeKind = Schema.Literals(["plan", "default"]).annotate({
+  description: "Initial collaboration mode to use when the TUI starts.",
+  identifier: "ClientRequest__ModeKind",
+});
+
+export type ClientRequest__DynamicToolNamespaceTool = {
+  readonly deferLoading?: boolean;
+  readonly description: string;
+  readonly inputSchema: Schema.Json;
+  readonly name: string;
+  readonly type: "function";
+};
+export const ClientRequest__DynamicToolNamespaceTool = Schema.Union(
+  [
+    Schema.Struct({
+      deferLoading: Schema.optionalKey(Schema.Boolean),
+      description: Schema.String,
+      inputSchema: Schema.Json.annotate({ expected: "JSON value" }),
+      name: Schema.String,
+      type: Schema.Literal("function").annotate({ title: "FunctionDynamicToolNamespaceToolType" }),
+    }).annotate({ title: "FunctionDynamicToolNamespaceTool" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__DynamicToolNamespaceTool" });
+
+export type ClientRequest__InternalChatMessageMetadataPassthrough = {
+  readonly turn_id?: string | null;
+};
+export const ClientRequest__InternalChatMessageMetadataPassthrough = Schema.Struct({
+  turn_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description:
+    "Internal Responses API passthrough metadata copied into underlying chat messages.\n\nResponses API strongly types this payload. Do not modify it without first getting API approval and making the corresponding Responses API change.",
+  identifier: "ClientRequest__InternalChatMessageMetadataPassthrough",
+});
+
+export type ClientRequest__MessagePhase = "commentary" | "final_answer";
+export const ClientRequest__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "ClientRequest__MessagePhase",
+});
+
+export type ClientRequest__AgentMessageInputContent =
+  | { readonly text: string; readonly type: "input_text" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const ClientRequest__AgentMessageInputContent = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextAgentMessageInputContentType",
+      }),
+    }).annotate({ title: "InputTextAgentMessageInputContent" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentAgentMessageInputContentType",
+      }),
+    }).annotate({ title: "EncryptedContentAgentMessageInputContent" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__AgentMessageInputContent" });
+
+export type ClientRequest__ReasoningItemContent =
+  | { readonly text: string; readonly type: "reasoning_text" }
+  | { readonly text: string; readonly type: "text" };
+export const ClientRequest__ReasoningItemContent = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("reasoning_text").annotate({
+        title: "ReasoningTextReasoningItemContentType",
+      }),
+    }).annotate({ title: "ReasoningTextReasoningItemContent" }),
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("text").annotate({ title: "TextReasoningItemContentType" }),
+    }).annotate({ title: "TextReasoningItemContent" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__ReasoningItemContent" });
+
+export type ClientRequest__ReasoningItemReasoningSummary = {
+  readonly text: string;
+  readonly type: "summary_text";
+};
+export const ClientRequest__ReasoningItemReasoningSummary = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("summary_text").annotate({
+        title: "SummaryTextReasoningItemReasoningSummaryType",
+      }),
+    }).annotate({ title: "SummaryTextReasoningItemReasoningSummary" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__ReasoningItemReasoningSummary" });
+
+export type ClientRequest__LocalShellAction = {
+  readonly command: ReadonlyArray<string>;
+  readonly env?: { readonly [x: string]: string } | null;
+  readonly timeout_ms?: number | null;
+  readonly type: "exec";
+  readonly user?: string | null;
+  readonly working_directory?: string | null;
+};
+export const ClientRequest__LocalShellAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.Array(Schema.String),
+      env: Schema.optionalKey(
+        Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+      ),
+      timeout_ms: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "uint64" })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("exec").annotate({ title: "ExecLocalShellActionType" }),
+      user: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      working_directory: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "ExecLocalShellAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__LocalShellAction" });
+
+export type ClientRequest__LocalShellStatus = "completed" | "in_progress" | "incomplete";
+export const ClientRequest__LocalShellStatus = Schema.Literals([
+  "completed",
+  "in_progress",
+  "incomplete",
+]).annotate({ identifier: "ClientRequest__LocalShellStatus" });
+
+export type ClientRequest__ResponsesApiWebSearchAction =
+  | {
+      readonly queries?: ReadonlyArray<string> | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly type: "open_page"; readonly url?: string | null }
+  | {
+      readonly pattern?: string | null;
+      readonly type: "find_in_page";
+      readonly url?: string | null;
+    }
+  | { readonly type: "other" };
+export const ClientRequest__ResponsesApiWebSearchAction = Schema.Union(
+  [
+    Schema.Struct({
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchResponsesApiWebSearchActionType" }),
+    }).annotate({ title: "SearchResponsesApiWebSearchAction" }),
+    Schema.Struct({
+      type: Schema.Literal("open_page").annotate({
+        title: "OpenPageResponsesApiWebSearchActionType",
+      }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageResponsesApiWebSearchAction" }),
+    Schema.Struct({
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("find_in_page").annotate({
+        title: "FindInPageResponsesApiWebSearchActionType",
+      }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageResponsesApiWebSearchAction" }),
+    Schema.Struct({
+      type: Schema.Literal("other").annotate({ title: "OtherResponsesApiWebSearchActionType" }),
+    }).annotate({ title: "OtherResponsesApiWebSearchAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__ResponsesApiWebSearchAction" });
+
+export type ClientRequest__CapabilityRootLocation = {
+  readonly environmentId: string;
+  readonly path: string;
+  readonly type: "environment";
+};
+export const ClientRequest__CapabilityRootLocation = Schema.Union(
+  [
+    Schema.Struct({
+      environmentId: Schema.String,
+      path: Schema.String.annotate({
+        description: "Absolute path for the root in the selected environment.",
+      }),
+      type: Schema.Literal("environment").annotate({
+        title: "EnvironmentCapabilityRootLocationType",
+      }),
+    }).annotate({
+      title: "EnvironmentCapabilityRootLocation",
+      description: "A path owned by an execution environment.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Location used to resolve a selected capability root.",
+  identifier: "ClientRequest__CapabilityRootLocation",
+});
+
+export type ClientRequest__ConversationTextRole = "user" | "developer" | "assistant";
+export const ClientRequest__ConversationTextRole = Schema.Literals([
+  "user",
+  "developer",
+  "assistant",
+]).annotate({ identifier: "ClientRequest__ConversationTextRole" });
+
+export type ClientRequest__LegacyAppPathString = string;
+export const ClientRequest__LegacyAppPathString = Schema.String.annotate({
+  identifier: "ClientRequest__LegacyAppPathString",
+});
 
 export type CommandExecutionRequestApprovalParams__LegacyAppPathString = string;
-export const CommandExecutionRequestApprovalParams__LegacyAppPathString = Schema.String;
+export const CommandExecutionRequestApprovalParams__LegacyAppPathString = Schema.String.annotate({
+  identifier: "CommandExecutionRequestApprovalParams__LegacyAppPathString",
+});
+
+export type CommandExecutionRequestApprovalParams__CommandExecutionApprovalKind =
+  | "command"
+  | "writeStdin";
+export const CommandExecutionRequestApprovalParams__CommandExecutionApprovalKind = Schema.Literals([
+  "command",
+  "writeStdin",
+]).annotate({
+  description: "Distinguishes a command approval from input sent to an existing terminal.",
+  identifier: "CommandExecutionRequestApprovalParams__CommandExecutionApprovalKind",
+});
 
 export type CommandExecutionRequestApprovalParams__NetworkApprovalProtocol =
   | "http"
@@ -1437,19 +1755,33 @@ export const CommandExecutionRequestApprovalParams__NetworkApprovalProtocol = Sc
   "https",
   "socks5Tcp",
   "socks5Udp",
-]);
+]).annotate({ identifier: "CommandExecutionRequestApprovalParams__NetworkApprovalProtocol" });
 
 export type CommandExecutionRequestApprovalParams__NetworkPolicyRuleAction = "allow" | "deny";
 export const CommandExecutionRequestApprovalParams__NetworkPolicyRuleAction = Schema.Literals([
   "allow",
   "deny",
-]);
+]).annotate({ identifier: "CommandExecutionRequestApprovalParams__NetworkPolicyRuleAction" });
+
+export type CommandExecutionRequestApprovalParams__FileSystemAccessMode = "read" | "write" | "deny";
+export const CommandExecutionRequestApprovalParams__FileSystemAccessMode = Schema.Literals([
+  "read",
+  "write",
+  "deny",
+]).annotate({ identifier: "CommandExecutionRequestApprovalParams__FileSystemAccessMode" });
+
+export type CommandExecutionRequestApprovalParams__AdditionalNetworkPermissions = {
+  readonly enabled?: boolean | null;
+};
+export const CommandExecutionRequestApprovalParams__AdditionalNetworkPermissions = Schema.Struct({
+  enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+}).annotate({ identifier: "CommandExecutionRequestApprovalParams__AdditionalNetworkPermissions" });
 
 export type CommandExecutionRequestApprovalResponse__NetworkPolicyRuleAction = "allow" | "deny";
 export const CommandExecutionRequestApprovalResponse__NetworkPolicyRuleAction = Schema.Literals([
   "allow",
   "deny",
-]);
+]).annotate({ identifier: "CommandExecutionRequestApprovalResponse__NetworkPolicyRuleAction" });
 
 export type DynamicToolCallResponse__DynamicToolCallOutputContentItem =
   | { readonly text: string; readonly type: "inputText" }
@@ -1477,7 +1809,12 @@ export const DynamicToolCallResponse__DynamicToolCallOutputContentItem = Schema.
     }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "DynamicToolCallResponse__DynamicToolCallOutputContentItem" });
+
+export type ExecCommandApprovalParams__ThreadId = string;
+export const ExecCommandApprovalParams__ThreadId = Schema.String.annotate({
+  identifier: "ExecCommandApprovalParams__ThreadId",
+});
 
 export type ExecCommandApprovalParams__ParsedCommand =
   | { readonly cmd: string; readonly name: string; readonly path: string; readonly type: "read" }
@@ -1517,34 +1854,41 @@ export const ExecCommandApprovalParams__ParsedCommand = Schema.Union(
     }).annotate({ title: "UnknownParsedCommand" }),
   ],
   { mode: "oneOf" },
-);
-
-export type ExecCommandApprovalParams__ThreadId = string;
-export const ExecCommandApprovalParams__ThreadId = Schema.String;
+).annotate({ identifier: "ExecCommandApprovalParams__ParsedCommand" });
 
 export type ExecCommandApprovalResponse__NetworkPolicyRuleAction = "allow" | "deny";
 export const ExecCommandApprovalResponse__NetworkPolicyRuleAction = Schema.Literals([
   "allow",
   "deny",
-]);
+]).annotate({ identifier: "ExecCommandApprovalResponse__NetworkPolicyRuleAction" });
 
 export type FileChangeRequestApprovalResponse__FileChangeApprovalDecision =
   | "accept"
   | "acceptForSession"
   | "decline"
   | "cancel";
-export const FileChangeRequestApprovalResponse__FileChangeApprovalDecision = Schema.Literals([
-  "accept",
-  "acceptForSession",
-  "decline",
-  "cancel",
-]);
+export const FileChangeRequestApprovalResponse__FileChangeApprovalDecision = Schema.Union(
+  [
+    Schema.Literal("accept").annotate({ description: "User approved the file changes." }),
+    Schema.Literal("acceptForSession").annotate({
+      description:
+        "User approved the file changes and future changes to the same files should run without prompting.",
+    }),
+    Schema.Literal("decline").annotate({
+      description: "User denied the file changes. The agent will continue the turn.",
+    }),
+    Schema.Literal("cancel").annotate({
+      description: "User denied the file changes. The turn will also be immediately interrupted.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "FileChangeRequestApprovalResponse__FileChangeApprovalDecision" });
 
 export type FuzzyFileSearchResponse__FuzzyFileSearchMatchType = "file" | "directory";
 export const FuzzyFileSearchResponse__FuzzyFileSearchMatchType = Schema.Literals([
   "file",
   "directory",
-]);
+]).annotate({ identifier: "FuzzyFileSearchResponse__FuzzyFileSearchMatchType" });
 
 export type FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType =
   | "file"
@@ -1552,50 +1896,36 @@ export type FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType
 export const FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType = Schema.Literals([
   "file",
   "directory",
-]);
+]).annotate({ identifier: "FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType" });
 
 export type JSONRPCError__JSONRPCErrorError = {
   readonly code: number;
-  readonly data?: unknown;
+  readonly data?: Schema.Json;
   readonly message: string;
 };
 export const JSONRPCError__JSONRPCErrorError = Schema.Struct({
-  code: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  data: Schema.optionalKey(Schema.Unknown),
+  code: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  data: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   message: Schema.String,
-});
+}).annotate({ identifier: "JSONRPCError__JSONRPCErrorError" });
 
 export type JSONRPCError__RequestId = string | number;
 export const JSONRPCError__RequestId = Schema.Union([
   Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
-
-export type JSONRPCMessage__JSONRPCErrorError = {
-  readonly code: number;
-  readonly data?: unknown;
-  readonly message: string;
-};
-export const JSONRPCMessage__JSONRPCErrorError = Schema.Struct({
-  code: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  data: Schema.optionalKey(Schema.Unknown),
-  message: Schema.String,
-});
-
-export type JSONRPCMessage__JSONRPCNotification = {
-  readonly method: string;
-  readonly params?: unknown;
-};
-export const JSONRPCMessage__JSONRPCNotification = Schema.Struct({
-  method: Schema.String,
-  params: Schema.optionalKey(Schema.Unknown),
-}).annotate({ description: "A notification which does not expect a response." });
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "JSONRPCError__RequestId" });
 
 export type JSONRPCMessage__RequestId = string | number;
 export const JSONRPCMessage__RequestId = Schema.Union([
   Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "JSONRPCMessage__RequestId" });
 
 export type JSONRPCMessage__W3cTraceContext = {
   readonly traceparent?: string | null;
@@ -1604,13 +1934,40 @@ export type JSONRPCMessage__W3cTraceContext = {
 export const JSONRPCMessage__W3cTraceContext = Schema.Struct({
   traceparent: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   tracestate: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "JSONRPCMessage__W3cTraceContext" });
+
+export type JSONRPCMessage__JSONRPCNotification = {
+  readonly method: string;
+  readonly params?: Schema.Json;
+};
+export const JSONRPCMessage__JSONRPCNotification = Schema.Struct({
+  method: Schema.String,
+  params: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({
+  description: "A notification which does not expect a response.",
+  identifier: "JSONRPCMessage__JSONRPCNotification",
 });
 
+export type JSONRPCMessage__JSONRPCErrorError = {
+  readonly code: number;
+  readonly data?: Schema.Json;
+  readonly message: string;
+};
+export const JSONRPCMessage__JSONRPCErrorError = Schema.Struct({
+  code: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  data: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  message: Schema.String,
+}).annotate({ identifier: "JSONRPCMessage__JSONRPCErrorError" });
+
 export type JSONRPCRequest__RequestId = string | number;
 export const JSONRPCRequest__RequestId = Schema.Union([
   Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "JSONRPCRequest__RequestId" });
 
 export type JSONRPCRequest__W3cTraceContext = {
   readonly traceparent?: string | null;
@@ -1619,20 +1976,20 @@ export type JSONRPCRequest__W3cTraceContext = {
 export const JSONRPCRequest__W3cTraceContext = Schema.Struct({
   traceparent: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   tracestate: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "JSONRPCRequest__W3cTraceContext" });
 
 export type JSONRPCResponse__RequestId = string | number;
 export const JSONRPCResponse__RequestId = Schema.Union([
   Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
-
-export type McpServerElicitationRequestParams__McpElicitationArrayType = "array";
-export const McpServerElicitationRequestParams__McpElicitationArrayType = Schema.Literal("array");
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "JSONRPCResponse__RequestId" });
 
-export type McpServerElicitationRequestParams__McpElicitationBooleanType = "boolean";
-export const McpServerElicitationRequestParams__McpElicitationBooleanType =
-  Schema.Literal("boolean");
+export type McpServerElicitationRequestParams__McpElicitationStringType = "string";
+export const McpServerElicitationRequestParams__McpElicitationStringType = Schema.Literal(
+  "string",
+).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationStringType" });
 
 export type McpServerElicitationRequestParams__McpElicitationConstOption = {
   readonly const: string;
@@ -1641,16 +1998,12 @@ export type McpServerElicitationRequestParams__McpElicitationConstOption = {
 export const McpServerElicitationRequestParams__McpElicitationConstOption = Schema.Struct({
   const: Schema.String,
   title: Schema.String,
-});
-
-export type McpServerElicitationRequestParams__McpElicitationNumberType = "number" | "integer";
-export const McpServerElicitationRequestParams__McpElicitationNumberType = Schema.Literals([
-  "number",
-  "integer",
-]);
+}).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationConstOption" });
 
-export type McpServerElicitationRequestParams__McpElicitationObjectType = "object";
-export const McpServerElicitationRequestParams__McpElicitationObjectType = Schema.Literal("object");
+export type McpServerElicitationRequestParams__McpElicitationArrayType = "array";
+export const McpServerElicitationRequestParams__McpElicitationArrayType = Schema.Literal(
+  "array",
+).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationArrayType" });
 
 export type McpServerElicitationRequestParams__McpElicitationStringFormat =
   | "email"
@@ -1662,10 +2015,23 @@ export const McpServerElicitationRequestParams__McpElicitationStringFormat = Sch
   "uri",
   "date",
   "date-time",
-]);
+]).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationStringFormat" });
 
-export type McpServerElicitationRequestParams__McpElicitationStringType = "string";
-export const McpServerElicitationRequestParams__McpElicitationStringType = Schema.Literal("string");
+export type McpServerElicitationRequestParams__McpElicitationNumberType = "number" | "integer";
+export const McpServerElicitationRequestParams__McpElicitationNumberType = Schema.Literals([
+  "number",
+  "integer",
+]).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationNumberType" });
+
+export type McpServerElicitationRequestParams__McpElicitationBooleanType = "boolean";
+export const McpServerElicitationRequestParams__McpElicitationBooleanType = Schema.Literal(
+  "boolean",
+).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationBooleanType" });
+
+export type McpServerElicitationRequestParams__McpElicitationObjectType = "object";
+export const McpServerElicitationRequestParams__McpElicitationObjectType = Schema.Literal(
+  "object",
+).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationObjectType" });
 
 export type McpServerElicitationRequestResponse__McpServerElicitationAction =
   | "accept"
@@ -1675,256 +2041,231 @@ export const McpServerElicitationRequestResponse__McpServerElicitationAction = S
   "accept",
   "decline",
   "cancel",
-]);
+]).annotate({ identifier: "McpServerElicitationRequestResponse__McpServerElicitationAction" });
 
-export type PermissionsRequestApprovalParams__AbsolutePathBuf = string;
-export const PermissionsRequestApprovalParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+export type PermissionsRequestApprovalParams__LegacyAppPathString = string;
+export const PermissionsRequestApprovalParams__LegacyAppPathString = Schema.String.annotate({
+  identifier: "PermissionsRequestApprovalParams__LegacyAppPathString",
 });
 
+export type PermissionsRequestApprovalParams__FileSystemAccessMode = "read" | "write" | "deny";
+export const PermissionsRequestApprovalParams__FileSystemAccessMode = Schema.Literals([
+  "read",
+  "write",
+  "deny",
+]).annotate({ identifier: "PermissionsRequestApprovalParams__FileSystemAccessMode" });
+
 export type PermissionsRequestApprovalParams__AdditionalNetworkPermissions = {
   readonly enabled?: boolean | null;
 };
 export const PermissionsRequestApprovalParams__AdditionalNetworkPermissions = Schema.Struct({
   enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-});
+}).annotate({ identifier: "PermissionsRequestApprovalParams__AdditionalNetworkPermissions" });
 
-export type PermissionsRequestApprovalParams__FileSystemAccessMode = "read" | "write" | "deny";
-export const PermissionsRequestApprovalParams__FileSystemAccessMode = Schema.Literals([
+export type PermissionsRequestApprovalResponse__FileSystemAccessMode = "read" | "write" | "deny";
+export const PermissionsRequestApprovalResponse__FileSystemAccessMode = Schema.Literals([
   "read",
   "write",
   "deny",
-]);
+]).annotate({ identifier: "PermissionsRequestApprovalResponse__FileSystemAccessMode" });
 
-export type PermissionsRequestApprovalParams__LegacyAppPathString = string;
-export const PermissionsRequestApprovalParams__LegacyAppPathString = Schema.String;
+export type PermissionsRequestApprovalResponse__LegacyAppPathString = string;
+export const PermissionsRequestApprovalResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "PermissionsRequestApprovalResponse__LegacyAppPathString",
+});
 
 export type PermissionsRequestApprovalResponse__AdditionalNetworkPermissions = {
   readonly enabled?: boolean | null;
 };
 export const PermissionsRequestApprovalResponse__AdditionalNetworkPermissions = Schema.Struct({
   enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-});
+}).annotate({ identifier: "PermissionsRequestApprovalResponse__AdditionalNetworkPermissions" });
 
-export type PermissionsRequestApprovalResponse__FileSystemAccessMode = "read" | "write" | "deny";
-export const PermissionsRequestApprovalResponse__FileSystemAccessMode = Schema.Literals([
-  "read",
-  "write",
-  "deny",
-]);
+export type PermissionsRequestApprovalResponse__PermissionGrantScope = "turn" | "session";
+export const PermissionsRequestApprovalResponse__PermissionGrantScope = Schema.Literals([
+  "turn",
+  "session",
+]).annotate({ identifier: "PermissionsRequestApprovalResponse__PermissionGrantScope" });
 
-export type PermissionsRequestApprovalResponse__LegacyAppPathString = string;
-export const PermissionsRequestApprovalResponse__LegacyAppPathString = Schema.String;
+export type ServerNotification__NonSteerableTurnKind = "review" | "compact";
+export const ServerNotification__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "ServerNotification__NonSteerableTurnKind" });
+
+export type ServerNotification__MisalignmentSteer = { readonly message: string };
+export const ServerNotification__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "ServerNotification__MisalignmentSteer" });
 
 export type ServerNotification__AbsolutePathBuf = string;
 export const ServerNotification__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "ServerNotification__AbsolutePathBuf",
 });
 
-export type ServerNotification__AccountLoginCompletedNotification = {
-  readonly error?: string | null;
-  readonly loginId?: string | null;
-  readonly success: boolean;
+export type ServerNotification__GitInfo = {
+  readonly branch?: string | null;
+  readonly originUrl?: string | null;
+  readonly sha?: string | null;
 };
-export const ServerNotification__AccountLoginCompletedNotification = Schema.Struct({
-  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  loginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  success: Schema.Boolean,
-});
+export const ServerNotification__GitInfo = Schema.Struct({
+  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__GitInfo" });
 
-export type ServerNotification__ActivePermissionProfile = {
-  readonly extends?: string | null;
-  readonly id: string;
-};
-export const ServerNotification__ActivePermissionProfile = Schema.Struct({
-  extends: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  id: Schema.String.annotate({
-    description:
-      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-  }),
-});
+export type ServerNotification__ThreadHistoryMode = "legacy" | "paginated";
+export const ServerNotification__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "ServerNotification__ThreadHistoryMode" });
 
-export type ServerNotification__AdditionalNetworkPermissions = {
-  readonly enabled?: boolean | null;
-};
-export const ServerNotification__AdditionalNetworkPermissions = Schema.Struct({
-  enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-});
+export type ServerNotification__ReasoningEffort = string;
+export const ServerNotification__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "ServerNotification__ReasoningEffort",
+  }),
+);
 
-export type ServerNotification__AgentMessageDeltaNotification = {
-  readonly delta: string;
-  readonly itemId: string;
-  readonly threadId: string;
-  readonly turnId: string;
+export type ServerNotification__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const ServerNotification__AgentMessageDeltaNotification = Schema.Struct({
-  delta: Schema.String,
-  itemId: Schema.String,
-  threadId: Schema.String,
-  turnId: Schema.String,
+export const ServerNotification__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "ServerNotification__ThreadSectionAppearance",
 });
 
 export type ServerNotification__AgentPath = string;
-export const ServerNotification__AgentPath = Schema.String;
+export const ServerNotification__AgentPath = Schema.String.annotate({
+  identifier: "ServerNotification__AgentPath",
+});
 
-export type ServerNotification__AppBranding = {
-  readonly category?: string | null;
-  readonly developer?: string | null;
-  readonly isDiscoverableApp: boolean;
-  readonly privacyPolicy?: string | null;
-  readonly termsOfService?: string | null;
-  readonly website?: string | null;
-};
-export const ServerNotification__AppBranding = Schema.Struct({
-  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  isDiscoverableApp: Schema.Boolean,
-  privacyPolicy: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  termsOfService: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  website: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({ description: "EXPERIMENTAL - app metadata returned by app-list APIs." });
+export type ServerNotification__ThreadId = string;
+export const ServerNotification__ThreadId = Schema.String.annotate({
+  identifier: "ServerNotification__ThreadId",
+});
 
-export type ServerNotification__AppReview = { readonly status: string };
-export const ServerNotification__AppReview = Schema.Struct({ status: Schema.String });
+export type ServerNotification__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
+export const ServerNotification__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "ServerNotification__ThreadActiveFlag" });
 
-export type ServerNotification__AppScreenshot = {
-  readonly fileId?: string | null;
-  readonly url?: string | null;
-  readonly userPrompt: string;
-};
-export const ServerNotification__AppScreenshot = Schema.Struct({
-  fileId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  userPrompt: Schema.String,
+export type ServerNotification__ThreadSource = string;
+export const ServerNotification__ThreadSource = Schema.String.annotate({
+  identifier: "ServerNotification__ThreadSource",
 });
 
-export type ServerNotification__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const ServerNotification__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
+export type ServerNotification__ByteRange = { readonly end: number; readonly start: number };
+export const ServerNotification__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "ServerNotification__ByteRange" });
 
-export type ServerNotification__AskForApproval =
-  | "untrusted"
-  | "on-request"
-  | "never"
-  | {
-      readonly granular: {
-        readonly mcp_elicitations: boolean;
-        readonly request_permissions?: boolean;
-        readonly rules: boolean;
-        readonly sandbox_approval: boolean;
-        readonly skill_approval?: boolean;
-      };
-    };
-export const ServerNotification__AskForApproval = Schema.Union(
-  [
-    Schema.Literals(["untrusted", "on-request", "never"]),
-    Schema.Struct({
-      granular: Schema.Struct({
-        mcp_elicitations: Schema.Boolean,
-        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        rules: Schema.Boolean,
-        sandbox_approval: Schema.Boolean,
-        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      }),
-    }).annotate({ title: "GranularAskForApproval" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ServerNotification__ImageDetail = "auto" | "low" | "high" | "original";
+export const ServerNotification__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "ServerNotification__ImageDetail" });
 
-export type ServerNotification__AuthMode =
-  | "apikey"
-  | "chatgpt"
-  | "chatgptAuthTokens"
-  | "headers"
-  | "agentIdentity"
-  | "personalAccessToken"
-  | "bedrockApiKey";
-export const ServerNotification__AuthMode = Schema.Literals([
-  "apikey",
-  "chatgpt",
-  "chatgptAuthTokens",
-  "headers",
-  "agentIdentity",
-  "personalAccessToken",
-  "bedrockApiKey",
-]).annotate({ description: "Authentication mode for OpenAI-backed providers." });
+export type ServerNotification__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
+};
+export const ServerNotification__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "ServerNotification__HookPromptFragment" });
 
-export type ServerNotification__AutoReviewDecisionSource = "agent";
-export const ServerNotification__AutoReviewDecisionSource = Schema.Literal("agent").annotate({
-  description: "[UNSTABLE] Source that produced a terminal approval auto-review decision.",
+export type ServerNotification__AgentMessageDelivery = "async";
+export const ServerNotification__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "ServerNotification__AgentMessageDelivery",
 });
 
-export type ServerNotification__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const ServerNotification__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
-
-export type ServerNotification__CommandExecOutputDeltaNotification = {
-  readonly capReached: boolean;
-  readonly deltaBase64: string;
-  readonly processId: string;
-  readonly stream: "stdout" | "stderr";
+export type ServerNotification__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
 };
-export const ServerNotification__CommandExecOutputDeltaNotification = Schema.Struct({
-  capReached: Schema.Boolean.annotate({
-    description:
-      "`true` on the final streamed chunk for a stream when `outputBytesCap` truncated later output on that stream.",
-  }),
-  deltaBase64: Schema.String.annotate({ description: "Base64-encoded output bytes." }),
-  processId: Schema.String.annotate({
-    description:
-      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
-  }),
-  stream: Schema.Literals(["stdout", "stderr"]).annotate({
-    description: "Stream label for `command/exec/outputDelta` notifications.",
-  }),
-}).annotate({
+export const ServerNotification__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "ServerNotification__MemoryCitationEntry" });
+
+export type ServerNotification__MessagePhase = "commentary" | "final_answer";
+export const ServerNotification__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
-    "Base64-encoded output chunk emitted for a streaming `command/exec` request.\n\nThese notifications are connection-scoped. If the originating connection closes, the server terminates the process.",
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "ServerNotification__MessagePhase",
 });
 
-export type ServerNotification__CommandExecutionOutputDeltaNotification = {
-  readonly delta: string;
-  readonly itemId: string;
-  readonly threadId: string;
-  readonly turnId: string;
+export type ServerNotification__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
 };
-export const ServerNotification__CommandExecutionOutputDeltaNotification = Schema.Struct({
-  delta: Schema.String,
-  itemId: Schema.String,
-  threadId: Schema.String,
-  turnId: Schema.String,
+export const ServerNotification__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "ServerNotification__AsyncUserInputQuestion" });
+
+export type ServerNotification__LegacyAppPathString = string;
+export const ServerNotification__LegacyAppPathString = Schema.String.annotate({
+  identifier: "ServerNotification__LegacyAppPathString",
 });
 
+export type ServerNotification__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const ServerNotification__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "ServerNotification__CommandExecutionSource" });
+
 export type ServerNotification__CommandExecutionStatus =
   | "inProgress"
   | "completed"
@@ -1935,43 +2276,83 @@ export const ServerNotification__CommandExecutionStatus = Schema.Literals([
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "ServerNotification__CommandExecutionStatus" });
 
-export type ServerNotification__ContextCompactedNotification = {
-  readonly threadId: string;
-  readonly turnId: string;
-};
-export const ServerNotification__ContextCompactedNotification = Schema.Struct({
-  threadId: Schema.String,
-  turnId: Schema.String,
-}).annotate({ description: "Deprecated: Use `ContextCompaction` item type instead." });
+export type ServerNotification__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const ServerNotification__PatchChangeKind = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
+    Schema.Struct({
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
+    Schema.Struct({
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__PatchChangeKind" });
 
-export type ServerNotification__CreditsSnapshot = {
-  readonly balance?: string | null;
-  readonly hasCredits: boolean;
-  readonly unlimited: boolean;
+export type ServerNotification__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const ServerNotification__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "ServerNotification__PatchApplyStatus" });
+
+export type ServerNotification__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const ServerNotification__CreditsSnapshot = Schema.Struct({
-  balance: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  hasCredits: Schema.Boolean,
-  unlimited: Schema.Boolean,
-});
+export const ServerNotification__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__McpToolCallAppContext" });
 
-export type ServerNotification__DeprecationNoticeNotification = {
-  readonly details?: string | null;
-  readonly summary: string;
+export type ServerNotification__McpToolCallError = { readonly message: string };
+export const ServerNotification__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "ServerNotification__McpToolCallError" });
+
+export type ServerNotification__McpAppDisplayMode = "inline" | "fullscreen";
+export const ServerNotification__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "ServerNotification__McpAppDisplayMode" });
+
+export type ServerNotification__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
-export const ServerNotification__DeprecationNoticeNotification = Schema.Struct({
-  details: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional extra guidance, such as migration steps or rationale.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  summary: Schema.String.annotate({ description: "Concise summary of what is deprecated." }),
-});
+export const ServerNotification__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "ServerNotification__McpToolCallResult" });
+
+export type ServerNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const ServerNotification__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "ServerNotification__McpToolCallStatus" });
 
 export type ServerNotification__DynamicToolCallOutputContentItem =
   | { readonly text: string; readonly type: "inputText" }
@@ -1999,132 +2380,405 @@ export const ServerNotification__DynamicToolCallOutputContentItem = Schema.Union
     }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ServerNotification__DynamicToolCallOutputContentItem" });
 
 export type ServerNotification__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
 export const ServerNotification__DynamicToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
+]).annotate({ identifier: "ServerNotification__DynamicToolCallStatus" });
 
-export type ServerNotification__EnvironmentConnectionNotification = {
-  readonly environmentId: string;
-  readonly threadId: string;
-};
-export const ServerNotification__EnvironmentConnectionNotification = Schema.Struct({
-  environmentId: Schema.String,
-  threadId: Schema.String,
-});
+export type ServerNotification__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const ServerNotification__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "ServerNotification__CollabAgentStatus" });
 
-export type ServerNotification__ExternalAgentConfigMigrationItemType =
-  | "AGENTS_MD"
-  | "CONFIG"
-  | "SKILLS"
-  | "PLUGINS"
-  | "MCP_SERVER_CONFIG"
-  | "SUBAGENTS"
-  | "HOOKS"
-  | "COMMANDS"
-  | "MEMORY"
-  | "SESSIONS";
-export const ServerNotification__ExternalAgentConfigMigrationItemType = Schema.Literals([
-  "AGENTS_MD",
-  "CONFIG",
-  "SKILLS",
-  "PLUGINS",
-  "MCP_SERVER_CONFIG",
-  "SUBAGENTS",
-  "HOOKS",
-  "COMMANDS",
-  "MEMORY",
-  "SESSIONS",
-]);
+export type ServerNotification__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const ServerNotification__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "ServerNotification__CollabAgentToolCallStatus" });
 
-export type ServerNotification__FileChangeOutputDeltaNotification = {
-  readonly delta: string;
-  readonly itemId: string;
-  readonly threadId: string;
-  readonly turnId: string;
-};
-export const ServerNotification__FileChangeOutputDeltaNotification = Schema.Struct({
-  delta: Schema.String,
-  itemId: Schema.String,
-  threadId: Schema.String,
-  turnId: Schema.String,
-}).annotate({
-  description:
-    "Deprecated legacy notification for `apply_patch` textual output.\n\nThe server no longer emits this notification.",
-});
+export type ServerNotification__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const ServerNotification__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "ServerNotification__CollabAgentTool" });
 
-export type ServerNotification__FileSystemAccessMode = "read" | "write" | "deny";
-export const ServerNotification__FileSystemAccessMode = Schema.Literals(["read", "write", "deny"]);
+export type ServerNotification__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const ServerNotification__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "ServerNotification__SubAgentActivityKind" });
 
-export type ServerNotification__FuzzyFileSearchMatchType = "file" | "directory";
-export const ServerNotification__FuzzyFileSearchMatchType = Schema.Literals(["file", "directory"]);
+export type ServerNotification__WebSearchAction =
+  | {
+      readonly queries?: ReadonlyArray<string> | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const ServerNotification__WebSearchAction = Schema.Union(
+  [
+    Schema.Struct({
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
+    Schema.Struct({
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
+    Schema.Struct({
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
+    Schema.Struct({
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__WebSearchAction" });
 
-export type ServerNotification__FuzzyFileSearchSessionCompletedNotification = {
-  readonly sessionId: string;
+export type ServerNotification__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const ServerNotification__FuzzyFileSearchSessionCompletedNotification = Schema.Struct({
-  sessionId: Schema.String,
-});
+export const ServerNotification__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__ImageGenerationFailure" });
 
-export type ServerNotification__GitInfo = {
-  readonly branch?: string | null;
-  readonly originUrl?: string | null;
-  readonly sha?: string | null;
-};
-export const ServerNotification__GitInfo = Schema.Struct({
-  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export type ServerNotification__TurnItemsView = "notLoaded" | "summary" | "full";
+export const ServerNotification__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__TurnItemsView" });
 
-export type ServerNotification__GuardianApprovalReviewStatus =
-  | "inProgress"
-  | "approved"
-  | "denied"
-  | "timedOut"
-  | "aborted";
-export const ServerNotification__GuardianApprovalReviewStatus = Schema.Literals([
+export type ServerNotification__TurnStatus = "completed" | "interrupted" | "failed" | "inProgress";
+export const ServerNotification__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
   "inProgress",
-  "approved",
-  "denied",
-  "timedOut",
-  "aborted",
-]).annotate({ description: "[UNSTABLE] Lifecycle state for an approval auto-review." });
+]).annotate({ identifier: "ServerNotification__TurnStatus" });
 
-export type ServerNotification__GuardianCommandSource = "shell" | "unifiedExec";
-export const ServerNotification__GuardianCommandSource = Schema.Literals(["shell", "unifiedExec"]);
+export type ServerNotification__ThreadArchivedNotification = { readonly threadId: string };
+export const ServerNotification__ThreadArchivedNotification = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadArchivedNotification" });
 
-export type ServerNotification__GuardianRiskLevel = "low" | "medium" | "high" | "critical";
-export const ServerNotification__GuardianRiskLevel = Schema.Literals([
-  "low",
-  "medium",
-  "high",
-  "critical",
-]).annotate({ description: "[UNSTABLE] Risk level assigned by approval auto-review." });
+export type ServerNotification__ThreadDeletedNotification = { readonly threadId: string };
+export const ServerNotification__ThreadDeletedNotification = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadDeletedNotification" });
 
-export type ServerNotification__GuardianUserAuthorization = "unknown" | "low" | "medium" | "high";
-export const ServerNotification__GuardianUserAuthorization = Schema.Literals([
-  "unknown",
-  "low",
-  "medium",
-  "high",
-]).annotate({ description: "[UNSTABLE] Authorization level assigned by approval auto-review." });
+export type ServerNotification__ThreadUnarchivedNotification = { readonly threadId: string };
+export const ServerNotification__ThreadUnarchivedNotification = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadUnarchivedNotification" });
 
-export type ServerNotification__GuardianWarningNotification = {
-  readonly message: string;
+export type ServerNotification__ThreadClosedNotification = { readonly threadId: string };
+export const ServerNotification__ThreadClosedNotification = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadClosedNotification" });
+
+export type ServerNotification__ThreadRevertedNotification = { readonly threadId: string };
+export const ServerNotification__ThreadRevertedNotification = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadRevertedNotification" });
+
+export type ServerNotification__SkillsChangedNotification = { readonly [x: string]: Schema.Json };
+export const ServerNotification__SkillsChangedNotification = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
+  description:
+    "Notification emitted when watched local skill files change.\n\nTreat this as an invalidation signal and re-run `skills/list` with the client's current parameters when refreshed skill metadata is needed.",
+  identifier: "ServerNotification__SkillsChangedNotification",
+});
+
+export type ServerNotification__ThreadNameUpdatedNotification = {
   readonly threadId: string;
+  readonly threadName?: string | null;
 };
-export const ServerNotification__GuardianWarningNotification = Schema.Struct({
-  message: Schema.String.annotate({
-    description: "Concise guardian warning message for the user.",
+export const ServerNotification__ThreadNameUpdatedNotification = Schema.Struct({
+  threadId: Schema.String,
+  threadName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__ThreadNameUpdatedNotification" });
+
+export type ServerNotification__ThreadAttachmentOperation = "created" | "deleted";
+export const ServerNotification__ThreadAttachmentOperation = Schema.Literals([
+  "created",
+  "deleted",
+]).annotate({
+  description: "The persisted attachment change represented by a notification.",
+  identifier: "ServerNotification__ThreadAttachmentOperation",
+});
+
+export type ServerNotification__ThreadGoalStatus =
+  | "active"
+  | "paused"
+  | "blocked"
+  | "usageLimited"
+  | "budgetLimited"
+  | "complete";
+export const ServerNotification__ThreadGoalStatus = Schema.Literals([
+  "active",
+  "paused",
+  "blocked",
+  "usageLimited",
+  "budgetLimited",
+  "complete",
+]).annotate({ identifier: "ServerNotification__ThreadGoalStatus" });
+
+export type ServerNotification__ThreadGoalClearedNotification = { readonly threadId: string };
+export const ServerNotification__ThreadGoalClearedNotification = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadGoalClearedNotification" });
+
+export type ServerNotification__ThreadQueueChangedNotification = { readonly threadId: string };
+export const ServerNotification__ThreadQueueChangedNotification = Schema.Struct({
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadQueueChangedNotification" });
+
+export type ServerNotification__ProjectChangeType = "created" | "updated" | "deleted";
+export const ServerNotification__ProjectChangeType = Schema.Literals([
+  "created",
+  "updated",
+  "deleted",
+]).annotate({ identifier: "ServerNotification__ProjectChangeType" });
+
+export type ServerNotification__ThreadProjectUpdatedNotification = {
+  readonly projectId: string | null;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadProjectUpdatedNotification = Schema.Struct({
+  projectId: Schema.Union([Schema.String, Schema.Null]),
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadProjectUpdatedNotification" });
+
+export type ServerNotification__EnvironmentConnectionNotification = {
+  readonly environmentId: string;
+  readonly threadId: string;
+};
+export const ServerNotification__EnvironmentConnectionNotification = Schema.Struct({
+  environmentId: Schema.String,
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__EnvironmentConnectionNotification" });
+
+export type ServerNotification__ActivePermissionProfile = {
+  readonly extends?: string | null;
+  readonly id: string;
+};
+export const ServerNotification__ActivePermissionProfile = Schema.Struct({
+  extends: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  id: Schema.String.annotate({
+    description:
+      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
   }),
-  threadId: Schema.String.annotate({ description: "Thread target for the guardian warning." }),
+}).annotate({ identifier: "ServerNotification__ActivePermissionProfile" });
+
+export type ServerNotification__AskForApproval =
+  | "untrusted"
+  | "on-request"
+  | "never"
+  | {
+      readonly granular: {
+        readonly mcp_elicitations: boolean;
+        readonly request_permissions?: boolean;
+        readonly rules: boolean;
+        readonly sandbox_approval: boolean;
+        readonly skill_approval?: boolean;
+      };
+    };
+export const ServerNotification__AskForApproval = Schema.Union(
+  [
+    Schema.Literals(["untrusted", "on-request", "never"]),
+    Schema.Struct({
+      granular: Schema.Struct({
+        mcp_elicitations: Schema.Boolean,
+        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+        rules: Schema.Boolean,
+        sandbox_approval: Schema.Boolean,
+        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      }),
+    }).annotate({ title: "GranularAskForApproval" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__AskForApproval" });
+
+export type ServerNotification__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const ServerNotification__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "ServerNotification__ApprovalsReviewer",
+});
+
+export type ServerNotification__ModeKind = "plan" | "default";
+export const ServerNotification__ModeKind = Schema.Literals(["plan", "default"]).annotate({
+  description: "Initial collaboration mode to use when the TUI starts.",
+  identifier: "ServerNotification__ModeKind",
+});
+
+export type ServerNotification__Personality = "none" | "friendly" | "pragmatic";
+export const ServerNotification__Personality = Schema.Literals([
+  "none",
+  "friendly",
+  "pragmatic",
+]).annotate({
+  description: "Deprecated: `friendly` and `pragmatic` no longer select a style.",
+  identifier: "ServerNotification__Personality",
+});
+
+export type ServerNotification__NetworkAccess = "restricted" | "enabled";
+export const ServerNotification__NetworkAccess = Schema.Literals([
+  "restricted",
+  "enabled",
+]).annotate({ identifier: "ServerNotification__NetworkAccess" });
+
+export type ServerNotification__ReasoningSummary = "auto" | "concise" | "detailed" | "none";
+export const ServerNotification__ReasoningSummary = Schema.Union(
+  [
+    Schema.Literals(["auto", "concise", "detailed"]),
+    Schema.Literal("none").annotate({ description: "Option to disable reasoning summaries." }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#reasoning-summaries",
+  identifier: "ServerNotification__ReasoningSummary",
 });
 
+export type ServerNotification__TokenUsageBreakdown = {
+  readonly cacheWriteInputTokens?: number;
+  readonly cachedInputTokens: number;
+  readonly inputTokens: number;
+  readonly outputTokens: number;
+  readonly reasoningOutputTokens: number;
+  readonly totalTokens: number;
+};
+export const ServerNotification__TokenUsageBreakdown = Schema.Struct({
+  cacheWriteInputTokens: Schema.optionalKey(
+    Schema.Number.annotate({ default: 0, format: "int64" }).check(
+      Schema.isInt().annotate({ expected: "an integer" }),
+    ),
+  ),
+  cachedInputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  inputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  outputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  reasoningOutputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  totalTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "ServerNotification__TokenUsageBreakdown" });
+
+export type ServerNotification__HookOutputEntryKind =
+  | "warning"
+  | "stop"
+  | "feedback"
+  | "context"
+  | "error";
+export const ServerNotification__HookOutputEntryKind = Schema.Literals([
+  "warning",
+  "stop",
+  "feedback",
+  "context",
+  "error",
+]).annotate({ identifier: "ServerNotification__HookOutputEntryKind" });
+
 export type ServerNotification__HookEventName =
   | "preToolUse"
   | "permissionRequest"
@@ -2136,7 +2790,8 @@ export type ServerNotification__HookEventName =
   | "userPromptSubmit"
   | "subagentStart"
   | "subagentStop"
-  | "stop";
+  | "stop"
+  | "interrupt";
 export const ServerNotification__HookEventName = Schema.Literals([
   "preToolUse",
   "permissionRequest",
@@ -2149,37 +2804,53 @@ export const ServerNotification__HookEventName = Schema.Literals([
   "subagentStart",
   "subagentStop",
   "stop",
-]);
+  "interrupt",
+]).annotate({ identifier: "ServerNotification__HookEventName" });
 
 export type ServerNotification__HookExecutionMode = "sync" | "async";
-export const ServerNotification__HookExecutionMode = Schema.Literals(["sync", "async"]);
-
-export type ServerNotification__HookHandlerType = "command" | "prompt" | "agent";
-export const ServerNotification__HookHandlerType = Schema.Literals(["command", "prompt", "agent"]);
+export const ServerNotification__HookExecutionMode = Schema.Literals(["sync", "async"]).annotate({
+  identifier: "ServerNotification__HookExecutionMode",
+});
 
-export type ServerNotification__HookOutputEntryKind =
-  | "warning"
-  | "stop"
-  | "feedback"
-  | "context"
-  | "error";
-export const ServerNotification__HookOutputEntryKind = Schema.Literals([
-  "warning",
-  "stop",
-  "feedback",
-  "context",
-  "error",
-]);
+export type ServerNotification__HookHandlerType = "command" | "mcpTool" | "prompt" | "agent";
+export const ServerNotification__HookHandlerType = Schema.Literals([
+  "command",
+  "mcpTool",
+  "prompt",
+  "agent",
+]).annotate({ identifier: "ServerNotification__HookHandlerType" });
 
-export type ServerNotification__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const ServerNotification__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
+export type ServerNotification__HookScope = "thread" | "turn";
+export const ServerNotification__HookScope = Schema.Literals(["thread", "turn"]).annotate({
+  identifier: "ServerNotification__HookScope",
 });
 
+export type ServerNotification__HookSource =
+  | "system"
+  | "user"
+  | "project"
+  | "mdm"
+  | "sessionFlags"
+  | "plugin"
+  | "cloudRequirements"
+  | "cloudManagedConfig"
+  | "legacyManagedConfigFile"
+  | "legacyManagedConfigMdm"
+  | "unknown";
+export const ServerNotification__HookSource = Schema.Literals([
+  "system",
+  "user",
+  "project",
+  "mdm",
+  "sessionFlags",
+  "plugin",
+  "cloudRequirements",
+  "cloudManagedConfig",
+  "legacyManagedConfigFile",
+  "legacyManagedConfigMdm",
+  "unknown",
+]).annotate({ identifier: "ServerNotification__HookSource" });
+
 export type ServerNotification__HookRunStatus =
   | "running"
   | "completed"
@@ -2192,151 +2863,35 @@ export const ServerNotification__HookRunStatus = Schema.Literals([
   "failed",
   "blocked",
   "stopped",
-]);
-
-export type ServerNotification__HookScope = "thread" | "turn";
-export const ServerNotification__HookScope = Schema.Literals(["thread", "turn"]);
-
-export type ServerNotification__ImageDetail = "auto" | "low" | "high" | "original";
-export const ServerNotification__ImageDetail = Schema.Literals(["auto", "low", "high", "original"]);
-
-export type ServerNotification__LegacyAppPathString = string;
-export const ServerNotification__LegacyAppPathString = Schema.String;
-
-export type ServerNotification__McpServerOauthLoginCompletedNotification = {
-  readonly error?: string | null;
-  readonly name: string;
-  readonly success: boolean;
-  readonly threadId?: string | null;
-};
-export const ServerNotification__McpServerOauthLoginCompletedNotification = Schema.Struct({
-  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  name: Schema.String,
-  success: Schema.Boolean,
-  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type ServerNotification__McpServerStartupFailureReason = "reauthenticationRequired";
-export const ServerNotification__McpServerStartupFailureReason = Schema.Literal(
-  "reauthenticationRequired",
-);
-
-export type ServerNotification__McpServerStartupState =
-  | "starting"
-  | "ready"
-  | "failed"
-  | "cancelled";
-export const ServerNotification__McpServerStartupState = Schema.Literals([
-  "starting",
-  "ready",
-  "failed",
-  "cancelled",
-]);
-
-export type ServerNotification__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
-};
-export const ServerNotification__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type ServerNotification__McpToolCallError = { readonly message: string };
-export const ServerNotification__McpToolCallError = Schema.Struct({ message: Schema.String });
+]).annotate({ identifier: "ServerNotification__HookRunStatus" });
 
-export type ServerNotification__McpToolCallProgressNotification = {
-  readonly itemId: string;
-  readonly message: string;
+export type ServerNotification__TurnDiffUpdatedNotification = {
+  readonly diff: string;
   readonly threadId: string;
   readonly turnId: string;
 };
-export const ServerNotification__McpToolCallProgressNotification = Schema.Struct({
-  itemId: Schema.String,
-  message: Schema.String,
+export const ServerNotification__TurnDiffUpdatedNotification = Schema.Struct({
+  diff: Schema.String,
   threadId: Schema.String,
   turnId: Schema.String,
+}).annotate({
+  description:
+    "Notification that the turn-level unified diff has changed. Contains the latest aggregated diff across all file changes in the turn.",
+  identifier: "ServerNotification__TurnDiffUpdatedNotification",
 });
 
-export type ServerNotification__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const ServerNotification__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
-
-export type ServerNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const ServerNotification__McpToolCallStatus = Schema.Literals([
+export type ServerNotification__TurnPlanStepStatus = "pending" | "inProgress" | "completed";
+export const ServerNotification__TurnPlanStepStatus = Schema.Literals([
+  "pending",
   "inProgress",
   "completed",
-  "failed",
-]);
-
-export type ServerNotification__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
-};
-export const ServerNotification__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
-});
-
-export type ServerNotification__MessagePhase = "commentary" | "final_answer";
-export const ServerNotification__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
-
-export type ServerNotification__ModeKind = "plan" | "default";
-export const ServerNotification__ModeKind = Schema.Literals(["plan", "default"]).annotate({
-  description: "Initial collaboration mode to use when the TUI starts.",
-});
-
-export type ServerNotification__ModelRerouteReason = "highRiskCyberActivity";
-export const ServerNotification__ModelRerouteReason = Schema.Literal("highRiskCyberActivity");
-
-export type ServerNotification__ModelSafetyBufferingUpdatedNotification = {
-  readonly fasterModel?: string | null;
-  readonly model: string;
-  readonly reasons: ReadonlyArray<string>;
-  readonly showBufferingUi: boolean;
-  readonly threadId: string;
-  readonly turnId: string;
-  readonly useCases: ReadonlyArray<string>;
-};
-export const ServerNotification__ModelSafetyBufferingUpdatedNotification = Schema.Struct({
-  fasterModel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  model: Schema.String,
-  reasons: Schema.Array(Schema.String),
-  showBufferingUi: Schema.Boolean,
-  threadId: Schema.String,
-  turnId: Schema.String,
-  useCases: Schema.Array(Schema.String),
-});
+]).annotate({ identifier: "ServerNotification__TurnPlanStepStatus" });
 
-export type ServerNotification__ModelVerification = "trustedAccessForCyber";
-export const ServerNotification__ModelVerification = Schema.Literal("trustedAccessForCyber");
+export type ServerNotification__GuardianCommandSource = "shell" | "unifiedExec";
+export const ServerNotification__GuardianCommandSource = Schema.Literals([
+  "shell",
+  "unifiedExec",
+]).annotate({ identifier: "ServerNotification__GuardianCommandSource" });
 
 export type ServerNotification__NetworkApprovalProtocol =
   | "http"
@@ -2348,45 +2903,93 @@ export const ServerNotification__NetworkApprovalProtocol = Schema.Literals([
   "https",
   "socks5Tcp",
   "socks5Udp",
-]);
+]).annotate({ identifier: "ServerNotification__NetworkApprovalProtocol" });
 
-export type ServerNotification__NonSteerableTurnKind = "review" | "compact";
-export const ServerNotification__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type ServerNotification__FileSystemAccessMode = "read" | "write" | "deny";
+export const ServerNotification__FileSystemAccessMode = Schema.Literals([
+  "read",
+  "write",
+  "deny",
+]).annotate({ identifier: "ServerNotification__FileSystemAccessMode" });
 
-export type ServerNotification__PatchApplyStatus =
+export type ServerNotification__AdditionalNetworkPermissions = {
+  readonly enabled?: boolean | null;
+};
+export const ServerNotification__AdditionalNetworkPermissions = Schema.Struct({
+  enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__AdditionalNetworkPermissions" });
+
+export type ServerNotification__GuardianRiskLevel = "low" | "medium" | "high" | "critical";
+export const ServerNotification__GuardianRiskLevel = Schema.Literals([
+  "low",
+  "medium",
+  "high",
+  "critical",
+]).annotate({
+  description: "[UNSTABLE] Risk level assigned by approval auto-review.",
+  identifier: "ServerNotification__GuardianRiskLevel",
+});
+
+export type ServerNotification__GuardianApprovalReviewStatus =
   | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const ServerNotification__PatchApplyStatus = Schema.Literals([
+  | "approved"
+  | "denied"
+  | "timedOut"
+  | "aborted";
+export const ServerNotification__GuardianApprovalReviewStatus = Schema.Literals([
   "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
+  "approved",
+  "denied",
+  "timedOut",
+  "aborted",
+]).annotate({
+  description: "[UNSTABLE] Lifecycle state for an approval auto-review.",
+  identifier: "ServerNotification__GuardianApprovalReviewStatus",
+});
 
-export type ServerNotification__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const ServerNotification__PatchChangeKind = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ServerNotification__GuardianUserAuthorization = "unknown" | "low" | "medium" | "high";
+export const ServerNotification__GuardianUserAuthorization = Schema.Literals([
+  "unknown",
+  "low",
+  "medium",
+  "high",
+]).annotate({
+  description: "[UNSTABLE] Authorization level assigned by approval auto-review.",
+  identifier: "ServerNotification__GuardianUserAuthorization",
+});
 
-export type ServerNotification__Personality = "none" | "friendly" | "pragmatic";
-export const ServerNotification__Personality = Schema.Literals(["none", "friendly", "pragmatic"]);
+export type ServerNotification__AutoReviewDecisionSource = "agent";
+export const ServerNotification__AutoReviewDecisionSource = Schema.Literal("agent").annotate({
+  description: "[UNSTABLE] Source that produced a terminal approval auto-review decision.",
+  identifier: "ServerNotification__AutoReviewDecisionSource",
+});
+
+export type ServerNotification__StrictReviewRequiredNotification = {
+  readonly startedAtMs: number;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__StrictReviewRequiredNotification = Schema.Struct({
+  startedAtMs: Schema.Number.annotate({
+    description: "Unix timestamp (in milliseconds) when this review started.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__StrictReviewRequiredNotification" });
+
+export type ServerNotification__AgentMessageDeltaNotification = {
+  readonly delta: string;
+  readonly itemId: string;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__AgentMessageDeltaNotification = Schema.Struct({
+  delta: Schema.String,
+  itemId: Schema.String,
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__AgentMessageDeltaNotification" });
 
 export type ServerNotification__PlanDeltaNotification = {
   readonly delta: string;
@@ -2402,45 +3005,36 @@ export const ServerNotification__PlanDeltaNotification = Schema.Struct({
 }).annotate({
   description:
     "EXPERIMENTAL - proposed plan streaming deltas for plan items. Clients should not assume concatenated deltas match the completed plan item content.",
+  identifier: "ServerNotification__PlanDeltaNotification",
 });
 
-export type ServerNotification__PlanType =
-  | "free"
-  | "go"
-  | "plus"
-  | "pro"
-  | "prolite"
-  | "team"
-  | "self_serve_business_prolite"
-  | "self_serve_business_usage_based"
-  | "business"
-  | "ent26"
-  | "enterprise_cbp_automation"
-  | "enterprise_cbp_usage_based"
-  | "enterprise"
-  | "edu"
-  | "edu_plus"
-  | "edu_pro"
-  | "unknown";
-export const ServerNotification__PlanType = Schema.Literals([
-  "free",
-  "go",
-  "plus",
-  "pro",
-  "prolite",
-  "team",
-  "self_serve_business_prolite",
-  "self_serve_business_usage_based",
-  "business",
-  "ent26",
-  "enterprise_cbp_automation",
-  "enterprise_cbp_usage_based",
-  "enterprise",
-  "edu",
-  "edu_plus",
-  "edu_pro",
-  "unknown",
-]);
+export type ServerNotification__CommandExecOutputStream = "stdout" | "stderr";
+export const ServerNotification__CommandExecOutputStream = Schema.Union(
+  [
+    Schema.Literal("stdout").annotate({
+      description: "stdout stream. PTY mode multiplexes terminal output here.",
+    }),
+    Schema.Literal("stderr").annotate({ description: "stderr stream." }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Stream label for `command/exec/outputDelta` notifications.",
+  identifier: "ServerNotification__CommandExecOutputStream",
+});
+
+export type ServerNotification__ProcessOutputStream = "stdout" | "stderr";
+export const ServerNotification__ProcessOutputStream = Schema.Union(
+  [
+    Schema.Literal("stdout").annotate({
+      description: "stdout stream. PTY mode multiplexes terminal output here.",
+    }),
+    Schema.Literal("stderr").annotate({ description: "stderr stream." }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Stream label for `process/outputDelta` notifications.",
+  identifier: "ServerNotification__ProcessOutputStream",
+});
 
 export type ServerNotification__ProcessExitedNotification = {
   readonly exitCode: number;
@@ -2452,7 +3046,7 @@ export type ServerNotification__ProcessExitedNotification = {
 };
 export const ServerNotification__ProcessExitedNotification = Schema.Struct({
   exitCode: Schema.Number.annotate({ description: "Process exit code.", format: "int32" }).check(
-    Schema.isInt(),
+    Schema.isInt().annotate({ expected: "an integer" }),
   ),
   processHandle: Schema.String.annotate({
     description: "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
@@ -2473,146 +3067,187 @@ export const ServerNotification__ProcessExitedNotification = Schema.Struct({
     description:
       "Whether stdout reached `outputBytesCap`.\n\nIn streaming mode, stdout is empty and cap state is also reported on the final stdout `process/outputDelta` notification.",
   }),
-}).annotate({ description: "Final process exit notification for `process/spawn`." });
-
-export type ServerNotification__ProcessOutputDeltaNotification = {
-  readonly capReached: boolean;
-  readonly deltaBase64: string;
-  readonly processHandle: string;
-  readonly stream: "stdout" | "stderr";
-};
-export const ServerNotification__ProcessOutputDeltaNotification = Schema.Struct({
-  capReached: Schema.Boolean.annotate({
-    description:
-      "True on the final streamed chunk for this stream when output was truncated by `outputBytesCap`.",
-  }),
-  deltaBase64: Schema.String.annotate({ description: "Base64-encoded output bytes." }),
-  processHandle: Schema.String.annotate({
-    description: "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
-  }),
-  stream: Schema.Literals(["stdout", "stderr"]).annotate({
-    description: "Stream label for `process/outputDelta` notifications.",
-  }),
 }).annotate({
-  description: "Base64-encoded output chunk emitted for a streaming `process/spawn` request.",
+  description: "Final process exit notification for `process/spawn`.",
+  identifier: "ServerNotification__ProcessExitedNotification",
 });
 
-export type ServerNotification__RateLimitReachedType =
-  | "rate_limit_reached"
-  | "workspace_owner_credits_depleted"
-  | "workspace_member_credits_depleted"
-  | "workspace_owner_usage_limit_reached"
-  | "workspace_member_usage_limit_reached";
-export const ServerNotification__RateLimitReachedType = Schema.Literals([
-  "rate_limit_reached",
-  "workspace_owner_credits_depleted",
-  "workspace_member_credits_depleted",
-  "workspace_owner_usage_limit_reached",
-  "workspace_member_usage_limit_reached",
-]);
-
-export type ServerNotification__RateLimitWindow = {
-  readonly resetsAt?: number | null;
-  readonly usedPercent: number;
-  readonly windowDurationMins?: number | null;
+export type ServerNotification__CommandExecutionOutputDeltaNotification = {
+  readonly delta: string;
+  readonly itemId: string;
+  readonly threadId: string;
+  readonly turnId: string;
 };
-export const ServerNotification__RateLimitWindow = Schema.Struct({
-  resetsAt: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  usedPercent: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-  windowDurationMins: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-});
-
-export type ServerNotification__RealtimeConversationVersion = "v1" | "v2" | "v3";
-export const ServerNotification__RealtimeConversationVersion = Schema.Literals(["v1", "v2", "v3"]);
-
-export type ServerNotification__ReasoningEffort = string;
-export const ServerNotification__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
-
-export type ServerNotification__ReasoningSummary = "auto" | "concise" | "detailed" | "none";
-export const ServerNotification__ReasoningSummary = Schema.Union(
-  [
-    Schema.Literals(["auto", "concise", "detailed"]),
-    Schema.Literal("none").annotate({ description: "Option to disable reasoning summaries." }),
-  ],
-  { mode: "oneOf" },
-).annotate({
-  description:
-    "A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#reasoning-summaries",
-});
+export const ServerNotification__CommandExecutionOutputDeltaNotification = Schema.Struct({
+  delta: Schema.String,
+  itemId: Schema.String,
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__CommandExecutionOutputDeltaNotification" });
 
-export type ServerNotification__ReasoningSummaryPartAddedNotification = {
+export type ServerNotification__TerminalInteractionNotification = {
   readonly itemId: string;
-  readonly summaryIndex: number;
+  readonly processId: string;
+  readonly stdin: string;
   readonly threadId: string;
   readonly turnId: string;
 };
-export const ServerNotification__ReasoningSummaryPartAddedNotification = Schema.Struct({
+export const ServerNotification__TerminalInteractionNotification = Schema.Struct({
   itemId: Schema.String,
-  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  processId: Schema.String,
+  stdin: Schema.String,
   threadId: Schema.String,
   turnId: Schema.String,
-});
+}).annotate({ identifier: "ServerNotification__TerminalInteractionNotification" });
 
-export type ServerNotification__ReasoningSummaryTextDeltaNotification = {
+export type ServerNotification__FileChangeOutputDeltaNotification = {
   readonly delta: string;
   readonly itemId: string;
-  readonly summaryIndex: number;
   readonly threadId: string;
   readonly turnId: string;
 };
-export const ServerNotification__ReasoningSummaryTextDeltaNotification = Schema.Struct({
+export const ServerNotification__FileChangeOutputDeltaNotification = Schema.Struct({
   delta: Schema.String,
   itemId: Schema.String,
-  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
   threadId: Schema.String,
   turnId: Schema.String,
+}).annotate({
+  description:
+    "Deprecated legacy notification for `apply_patch` textual output.\n\nThe server no longer emits this notification.",
+  identifier: "ServerNotification__FileChangeOutputDeltaNotification",
 });
 
-export type ServerNotification__ReasoningTextDeltaNotification = {
-  readonly contentIndex: number;
-  readonly delta: string;
+export type ServerNotification__RequestId = string | number;
+export const ServerNotification__RequestId = Schema.Union([
+  Schema.String,
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "ServerNotification__RequestId" });
+
+export type ServerNotification__McpToolCallProgressNotification = {
   readonly itemId: string;
+  readonly message: string;
   readonly threadId: string;
   readonly turnId: string;
 };
-export const ServerNotification__ReasoningTextDeltaNotification = Schema.Struct({
-  contentIndex: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  delta: Schema.String,
+export const ServerNotification__McpToolCallProgressNotification = Schema.Struct({
   itemId: Schema.String,
+  message: Schema.String,
   threadId: Schema.String,
   turnId: Schema.String,
-});
+}).annotate({ identifier: "ServerNotification__McpToolCallProgressNotification" });
 
-export type ServerNotification__RemoteControlConnectionStatus =
-  | "disabled"
-  | "connecting"
-  | "connected"
-  | "errored";
-export const ServerNotification__RemoteControlConnectionStatus = Schema.Literals([
-  "disabled",
-  "connecting",
-  "connected",
-  "errored",
-]);
+export type ServerNotification__McpServerOauthLoginCompletedNotification = {
+  readonly error?: string | null;
+  readonly name: string;
+  readonly success: boolean;
+  readonly threadId?: string | null;
+};
+export const ServerNotification__McpServerOauthLoginCompletedNotification = Schema.Struct({
+  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  name: Schema.String,
+  success: Schema.Boolean,
+  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__McpServerOauthLoginCompletedNotification" });
 
-export type ServerNotification__RequestId = string | number;
-export const ServerNotification__RequestId = Schema.Union([
-  Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
+export type ServerNotification__McpServerStartupFailureReason = "reauthenticationRequired";
+export const ServerNotification__McpServerStartupFailureReason = Schema.Literal(
+  "reauthenticationRequired",
+).annotate({ identifier: "ServerNotification__McpServerStartupFailureReason" });
 
-export type ServerNotification__SkillsChangedNotification = {};
-export const ServerNotification__SkillsChangedNotification = Schema.Struct({}).annotate({
-  description:
-    "Notification emitted when watched local skill files change.\n\nTreat this as an invalidation signal and re-run `skills/list` with the client's current parameters when refreshed skill metadata is needed.",
+export type ServerNotification__McpServerStartupState =
+  | "starting"
+  | "ready"
+  | "failed"
+  | "cancelled";
+export const ServerNotification__McpServerStartupState = Schema.Literals([
+  "starting",
+  "ready",
+  "failed",
+  "cancelled",
+]).annotate({ identifier: "ServerNotification__McpServerStartupState" });
+
+export type ServerNotification__McpServerEventNotification = {
+  readonly method: string;
+  readonly params: Schema.Json;
+};
+export const ServerNotification__McpServerEventNotification = Schema.Struct({
+  method: Schema.String,
+  params: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({ identifier: "ServerNotification__McpServerEventNotification" });
+
+export type ServerNotification__AuthMode =
+  | "apikey"
+  | "chatgpt"
+  | "chatgptAuthTokens"
+  | "headers"
+  | "agentIdentity"
+  | "personalAccessToken"
+  | "bedrockApiKey"
+  | "bedrockAccessKeys";
+export const ServerNotification__AuthMode = Schema.Union(
+  [
+    Schema.Literal("apikey").annotate({
+      description: "OpenAI API key provided by the caller and stored by Codex.",
+    }),
+    Schema.Literal("chatgpt").annotate({
+      description: "ChatGPT OAuth managed by Codex (tokens persisted and refreshed by Codex).",
+    }),
+    Schema.Literal("chatgptAuthTokens").annotate({
+      description:
+        "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE.\n\nChatGPT auth tokens are supplied by an external host app and are only stored in memory. Token refresh must be handled by the external host app.",
+    }),
+    Schema.Literal("headers").annotate({
+      description: "Backend auth supplied as request headers.",
+    }),
+    Schema.Literal("agentIdentity").annotate({
+      description: "Programmatic Codex auth backed by a registered Agent Identity.",
+    }),
+    Schema.Literal("personalAccessToken").annotate({
+      description: "Programmatic Codex auth backed by a personal access token.",
+    }),
+    Schema.Literal("bedrockApiKey").annotate({
+      description: "Amazon Bedrock bearer token managed by Codex.",
+    }),
+    Schema.Literal("bedrockAccessKeys").annotate({
+      description: "Amazon Bedrock AWS access keys managed by Codex.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Authentication mode for OpenAI-backed providers.",
+  identifier: "ServerNotification__AuthMode",
 });
 
+export type ServerNotification__PlanType = string;
+export const ServerNotification__PlanType = Schema.String.annotate({
+  identifier: "ServerNotification__PlanType",
+});
+
+export type ServerNotification__GatewayOAuthStatus =
+  | "notReady"
+  | "started"
+  | "succeeded"
+  | "failed";
+export const ServerNotification__GatewayOAuthStatus = Schema.Literals([
+  "notReady",
+  "started",
+  "succeeded",
+  "failed",
+]).annotate({ identifier: "ServerNotification__GatewayOAuthStatus" });
+
+export type ServerNotification__CreditsSnapshot = {
+  readonly balance?: string | null;
+  readonly hasCredits: boolean;
+  readonly unlimited: boolean;
+};
+export const ServerNotification__CreditsSnapshot = Schema.Struct({
+  balance: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  hasCredits: Schema.Boolean,
+  unlimited: Schema.Boolean,
+}).annotate({ identifier: "ServerNotification__CreditsSnapshot" });
+
 export type ServerNotification__SpendControlLimitSnapshot = {
   readonly limit: string;
   readonly remainingPercent: number;
@@ -2621,62 +3256,284 @@ export type ServerNotification__SpendControlLimitSnapshot = {
 };
 export const ServerNotification__SpendControlLimitSnapshot = Schema.Struct({
   limit: Schema.String,
-  remainingPercent: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-  resetsAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  remainingPercent: Schema.Number.annotate({ format: "int32" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  resetsAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
   used: Schema.String,
+}).annotate({ identifier: "ServerNotification__SpendControlLimitSnapshot" });
+
+export type ServerNotification__RateLimitWindow = {
+  readonly resetsAt?: number | null;
+  readonly usedPercent: number;
+  readonly windowDurationMins?: number | null;
+};
+export const ServerNotification__RateLimitWindow = Schema.Struct({
+  resetsAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  usedPercent: Schema.Number.annotate({ format: "int32" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  windowDurationMins: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerNotification__RateLimitWindow" });
+
+export type ServerNotification__RateLimitReachedType =
+  | "rate_limit_reached"
+  | "workspace_owner_credits_depleted"
+  | "workspace_member_credits_depleted"
+  | "workspace_owner_usage_limit_reached"
+  | "workspace_member_usage_limit_reached";
+export const ServerNotification__RateLimitReachedType = Schema.Literals([
+  "rate_limit_reached",
+  "workspace_owner_credits_depleted",
+  "workspace_member_credits_depleted",
+  "workspace_owner_usage_limit_reached",
+  "workspace_member_usage_limit_reached",
+]).annotate({ identifier: "ServerNotification__RateLimitReachedType" });
+
+export type ServerNotification__AppReview = { readonly status: string };
+export const ServerNotification__AppReview = Schema.Struct({ status: Schema.String }).annotate({
+  identifier: "ServerNotification__AppReview",
 });
 
-export type ServerNotification__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const ServerNotification__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
-  "completed",
-]);
+export type ServerNotification__AppScreenshot = {
+  readonly fileId?: string | null;
+  readonly url?: string | null;
+  readonly userPrompt: string;
+};
+export const ServerNotification__AppScreenshot = Schema.Struct({
+  fileId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  userPrompt: Schema.String,
+}).annotate({ identifier: "ServerNotification__AppScreenshot" });
 
-export type ServerNotification__TerminalInteractionNotification = {
+export type ServerNotification__AppBranding = {
+  readonly category?: string | null;
+  readonly developer?: string | null;
+  readonly isDiscoverableApp: boolean;
+  readonly privacyPolicy?: string | null;
+  readonly termsOfService?: string | null;
+  readonly website?: string | null;
+};
+export const ServerNotification__AppBranding = Schema.Struct({
+  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  isDiscoverableApp: Schema.Boolean,
+  privacyPolicy: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  termsOfService: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  website: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "EXPERIMENTAL - app metadata returned by app-list APIs.",
+  identifier: "ServerNotification__AppBranding",
+});
+
+export type ServerNotification__RemoteControlConnectionStatus =
+  | "disabled"
+  | "connecting"
+  | "connected"
+  | "errored";
+export const ServerNotification__RemoteControlConnectionStatus = Schema.Literals([
+  "disabled",
+  "connecting",
+  "connected",
+  "errored",
+]).annotate({ identifier: "ServerNotification__RemoteControlConnectionStatus" });
+
+export type ServerNotification__ExternalAgentConfigMigrationItemType =
+  | "AGENTS_MD"
+  | "CONFIG"
+  | "SKILLS"
+  | "PLUGINS"
+  | "MCP_SERVER_CONFIG"
+  | "SUBAGENTS"
+  | "HOOKS"
+  | "COMMANDS"
+  | "MEMORY"
+  | "SESSIONS";
+export const ServerNotification__ExternalAgentConfigMigrationItemType = Schema.Literals([
+  "AGENTS_MD",
+  "CONFIG",
+  "SKILLS",
+  "PLUGINS",
+  "MCP_SERVER_CONFIG",
+  "SUBAGENTS",
+  "HOOKS",
+  "COMMANDS",
+  "MEMORY",
+  "SESSIONS",
+]).annotate({ identifier: "ServerNotification__ExternalAgentConfigMigrationItemType" });
+
+export type ServerNotification__ReasoningSummaryTextDeltaNotification = {
+  readonly delta: string;
   readonly itemId: string;
-  readonly processId: string;
-  readonly stdin: string;
+  readonly summaryIndex: number;
   readonly threadId: string;
   readonly turnId: string;
 };
-export const ServerNotification__TerminalInteractionNotification = Schema.Struct({
+export const ServerNotification__ReasoningSummaryTextDeltaNotification = Schema.Struct({
+  delta: Schema.String,
+  itemId: Schema.String,
+  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ReasoningSummaryTextDeltaNotification" });
+
+export type ServerNotification__ReasoningSummaryPartAddedNotification = {
+  readonly itemId: string;
+  readonly summaryIndex: number;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__ReasoningSummaryPartAddedNotification = Schema.Struct({
+  itemId: Schema.String,
+  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ReasoningSummaryPartAddedNotification" });
+
+export type ServerNotification__ReasoningTextDeltaNotification = {
+  readonly contentIndex: number;
+  readonly delta: string;
+  readonly itemId: string;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__ReasoningTextDeltaNotification = Schema.Struct({
+  contentIndex: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  delta: Schema.String,
   itemId: Schema.String,
-  processId: Schema.String,
-  stdin: Schema.String,
   threadId: Schema.String,
   turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ReasoningTextDeltaNotification" });
+
+export type ServerNotification__ContextCompactedNotification = {
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__ContextCompactedNotification = Schema.Struct({
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({
+  description: "Deprecated: Use `ContextCompaction` item type instead.",
+  identifier: "ServerNotification__ContextCompactedNotification",
 });
 
-export type ServerNotification__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type ServerNotification__ModelRerouteReason = "highRiskCyberActivity";
+export const ServerNotification__ModelRerouteReason = Schema.Literal(
+  "highRiskCyberActivity",
+).annotate({ identifier: "ServerNotification__ModelRerouteReason" });
+
+export type ServerNotification__ModelVerification = "trustedAccessForCyber";
+export const ServerNotification__ModelVerification = Schema.Literal(
+  "trustedAccessForCyber",
+).annotate({ identifier: "ServerNotification__ModelVerification" });
+
+export type ServerNotification__AuthRecoveryNotification = {
+  readonly message: string;
+  readonly provider: string;
+  readonly threadId: string;
+  readonly turnId: string;
 };
-export const ServerNotification__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
+export const ServerNotification__AuthRecoveryNotification = Schema.Struct({
+  message: Schema.String,
+  provider: Schema.String,
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__AuthRecoveryNotification" });
+
+export type ServerNotification__TurnModerationMetadataNotification = {
+  readonly metadata: Schema.Json;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__TurnModerationMetadataNotification = Schema.Struct({
+  metadata: Schema.Json.annotate({ expected: "JSON value" }),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__TurnModerationMetadataNotification" });
+
+export type ServerNotification__ModelSafetyBufferingUpdatedNotification = {
+  readonly fasterModel?: string | null;
+  readonly model: string;
+  readonly reasons: ReadonlyArray<string>;
+  readonly showBufferingUi: boolean;
+  readonly threadId: string;
+  readonly turnId: string;
+  readonly useCases: ReadonlyArray<string>;
+};
+export const ServerNotification__ModelSafetyBufferingUpdatedNotification = Schema.Struct({
+  fasterModel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  model: Schema.String,
+  reasons: Schema.Array(Schema.String),
+  showBufferingUi: Schema.Boolean,
+  threadId: Schema.String,
+  turnId: Schema.String,
+  useCases: Schema.Array(Schema.String),
+}).annotate({ identifier: "ServerNotification__ModelSafetyBufferingUpdatedNotification" });
+
+export type ServerNotification__WarningNotification = {
+  readonly message: string;
+  readonly threadId?: string | null;
+};
+export const ServerNotification__WarningNotification = Schema.Struct({
+  message: Schema.String.annotate({ description: "Concise warning message for the user." }),
+  threadId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional thread target when the warning applies to a specific thread.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerNotification__WarningNotification" });
+
+export type ServerNotification__GuardianWarningNotification = {
+  readonly message: string;
+  readonly threadId: string;
+};
+export const ServerNotification__GuardianWarningNotification = Schema.Struct({
+  message: Schema.String.annotate({
+    description: "Concise guardian warning message for the user.",
   }),
-  placeholder: Schema.optionalKey(
+  threadId: Schema.String.annotate({ description: "Thread target for the guardian warning." }),
+}).annotate({ identifier: "ServerNotification__GuardianWarningNotification" });
+
+export type ServerNotification__DeprecationNoticeNotification = {
+  readonly details?: string | null;
+  readonly summary: string;
+};
+export const ServerNotification__DeprecationNoticeNotification = Schema.Struct({
+  details: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+        description: "Optional extra guidance, such as migration steps or rationale.",
       }),
       Schema.Null,
     ]),
   ),
-});
+  summary: Schema.String.annotate({ description: "Concise summary of what is deprecated." }),
+}).annotate({ identifier: "ServerNotification__DeprecationNoticeNotification" });
 
 export type ServerNotification__TextPosition = { readonly column: number; readonly line: number };
 export const ServerNotification__TextPosition = Schema.Struct({
@@ -2684,65 +3541,138 @@ export const ServerNotification__TextPosition = Schema.Struct({
     description: "1-based column number (in Unicode scalar values).",
     format: "uint",
   })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   line: Schema.Number.annotate({ description: "1-based line number.", format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "ServerNotification__TextPosition" });
 
-export type ServerNotification__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
-export const ServerNotification__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
+export type ServerNotification__FuzzyFileSearchMatchType = "file" | "directory";
+export const ServerNotification__FuzzyFileSearchMatchType = Schema.Literals([
+  "file",
+  "directory",
+]).annotate({ identifier: "ServerNotification__FuzzyFileSearchMatchType" });
 
-export type ServerNotification__ThreadArchivedNotification = { readonly threadId: string };
-export const ServerNotification__ThreadArchivedNotification = Schema.Struct({
+export type ServerNotification__FuzzyFileSearchSessionCompletedNotification = {
+  readonly sessionId: string;
+};
+export const ServerNotification__FuzzyFileSearchSessionCompletedNotification = Schema.Struct({
+  sessionId: Schema.String,
+}).annotate({ identifier: "ServerNotification__FuzzyFileSearchSessionCompletedNotification" });
+
+export type ServerNotification__RealtimeConversationVersion = "v1" | "v2" | "v3";
+export const ServerNotification__RealtimeConversationVersion = Schema.Literals([
+  "v1",
+  "v2",
+  "v3",
+]).annotate({ identifier: "ServerNotification__RealtimeConversationVersion" });
+
+export type ServerNotification__ThreadRealtimeItemAddedNotification = {
+  readonly item: Schema.Json;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadRealtimeItemAddedNotification = Schema.Struct({
+  item: Schema.Json.annotate({ expected: "JSON value" }),
   threadId: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL - raw non-audio thread realtime item emitted by the backend.",
+  identifier: "ServerNotification__ThreadRealtimeItemAddedNotification",
 });
 
-export type ServerNotification__ThreadClosedNotification = { readonly threadId: string };
-export const ServerNotification__ThreadClosedNotification = Schema.Struct({
-  threadId: Schema.String,
+export type ServerNotification__ThreadRealtimeTranscriptRole = "user" | "assistant";
+export const ServerNotification__ThreadRealtimeTranscriptRole = Schema.Literals([
+  "user",
+  "assistant",
+]).annotate({ identifier: "ServerNotification__ThreadRealtimeTranscriptRole" });
+
+export type ServerNotification__ThreadRealtimeBemItemPresentation =
+  | { readonly type: "wholeItem" }
+  | { readonly type: "inlineMarkdown" }
+  | { readonly index: number; readonly type: "inlineVisualization" };
+export const ServerNotification__ThreadRealtimeBemItemPresentation = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("wholeItem").annotate({
+        title: "WholeItemThreadRealtimeBemItemPresentationType",
+      }),
+    }).annotate({ title: "WholeItemThreadRealtimeBemItemPresentation" }),
+    Schema.Struct({
+      type: Schema.Literal("inlineMarkdown").annotate({
+        title: "InlineMarkdownThreadRealtimeBemItemPresentationType",
+      }),
+    }).annotate({ title: "InlineMarkdownThreadRealtimeBemItemPresentation" }),
+    Schema.Struct({
+      index: Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      type: Schema.Literal("inlineVisualization").annotate({
+        title: "InlineVisualizationThreadRealtimeBemItemPresentationType",
+      }),
+    }).annotate({ title: "InlineVisualizationThreadRealtimeBemItemPresentation" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "EXPERIMENTAL - how an existing agent item appears in a realtime conversation.",
+  identifier: "ServerNotification__ThreadRealtimeBemItemPresentation",
 });
 
-export type ServerNotification__ThreadDeletedNotification = { readonly threadId: string };
-export const ServerNotification__ThreadDeletedNotification = Schema.Struct({
+export type ServerNotification__ThreadRealtimeSessionOutcome = "ended" | "failed";
+export const ServerNotification__ThreadRealtimeSessionOutcome = Schema.Literals([
+  "ended",
+  "failed",
+]).annotate({ identifier: "ServerNotification__ThreadRealtimeSessionOutcome" });
+
+export type ServerNotification__ThreadRealtimeItemTranscriptDeltaNotification = {
+  readonly delta: string;
+  readonly itemId: string;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadRealtimeItemTranscriptDeltaNotification = Schema.Struct({
+  delta: Schema.String,
+  itemId: Schema.String,
   threadId: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL - text appended to an active realtime transcript item.",
+  identifier: "ServerNotification__ThreadRealtimeItemTranscriptDeltaNotification",
 });
 
-export type ServerNotification__ThreadGoalClearedNotification = { readonly threadId: string };
-export const ServerNotification__ThreadGoalClearedNotification = Schema.Struct({
+export type ServerNotification__ThreadRealtimeTranscriptDeltaNotification = {
+  readonly delta: string;
+  readonly role: string;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadRealtimeTranscriptDeltaNotification = Schema.Struct({
+  delta: Schema.String.annotate({ description: "Live transcript delta from the realtime event." }),
+  role: Schema.String,
   threadId: Schema.String,
+}).annotate({
+  description:
+    "EXPERIMENTAL - flat transcript delta emitted whenever realtime transcript text changes.",
+  identifier: "ServerNotification__ThreadRealtimeTranscriptDeltaNotification",
 });
 
-export type ServerNotification__ThreadGoalStatus =
-  | "active"
-  | "paused"
-  | "blocked"
-  | "usageLimited"
-  | "budgetLimited"
-  | "complete";
-export const ServerNotification__ThreadGoalStatus = Schema.Literals([
-  "active",
-  "paused",
-  "blocked",
-  "usageLimited",
-  "budgetLimited",
-  "complete",
-]);
-
-export type ServerNotification__ThreadId = string;
-export const ServerNotification__ThreadId = Schema.String;
-
-export type ServerNotification__ThreadNameUpdatedNotification = {
+export type ServerNotification__ThreadRealtimeTranscriptDoneNotification = {
+  readonly role: string;
+  readonly text: string;
   readonly threadId: string;
-  readonly threadName?: string | null;
 };
-export const ServerNotification__ThreadNameUpdatedNotification = Schema.Struct({
+export const ServerNotification__ThreadRealtimeTranscriptDoneNotification = Schema.Struct({
+  role: Schema.String,
+  text: Schema.String.annotate({ description: "Final complete text for the transcript part." }),
   threadId: Schema.String,
-  threadName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description:
+    "EXPERIMENTAL - final transcript text emitted when realtime completes a transcript part.",
+  identifier: "ServerNotification__ThreadRealtimeTranscriptDoneNotification",
 });
 
 export type ServerNotification__ThreadRealtimeAudioChunk = {
@@ -2756,29 +3686,43 @@ export const ServerNotification__ThreadRealtimeAudioChunk = Schema.Struct({
   data: Schema.String,
   itemId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   numChannels: Schema.Number.annotate({ format: "uint16" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   sampleRate: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   samplesPerChannel: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({ format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
-}).annotate({ description: "EXPERIMENTAL - thread realtime audio chunk." });
+}).annotate({
+  description: "EXPERIMENTAL - thread realtime audio chunk.",
+  identifier: "ServerNotification__ThreadRealtimeAudioChunk",
+});
 
-export type ServerNotification__ThreadRealtimeClosedNotification = {
-  readonly reason?: string | null;
+export type ServerNotification__ThreadRealtimeSdpNotification = {
+  readonly sdp: string;
   readonly threadId: string;
 };
-export const ServerNotification__ThreadRealtimeClosedNotification = Schema.Struct({
-  reason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export const ServerNotification__ThreadRealtimeSdpNotification = Schema.Struct({
+  sdp: Schema.String,
   threadId: Schema.String,
-}).annotate({ description: "EXPERIMENTAL - emitted when thread realtime transport closes." });
+}).annotate({
+  description: "EXPERIMENTAL - emitted with the remote SDP for a WebRTC realtime session.",
+  identifier: "ServerNotification__ThreadRealtimeSdpNotification",
+});
 
 export type ServerNotification__ThreadRealtimeErrorNotification = {
   readonly message: string;
@@ -2787,179 +3731,23 @@ export type ServerNotification__ThreadRealtimeErrorNotification = {
 export const ServerNotification__ThreadRealtimeErrorNotification = Schema.Struct({
   message: Schema.String,
   threadId: Schema.String,
-}).annotate({ description: "EXPERIMENTAL - emitted when thread realtime encounters an error." });
-
-export type ServerNotification__ThreadRealtimeItemAddedNotification = {
-  readonly item: unknown;
-  readonly threadId: string;
-};
-export const ServerNotification__ThreadRealtimeItemAddedNotification = Schema.Struct({
-  item: Schema.Unknown,
-  threadId: Schema.String,
 }).annotate({
-  description: "EXPERIMENTAL - raw non-audio thread realtime item emitted by the backend.",
+  description: "EXPERIMENTAL - emitted when thread realtime encounters an error.",
+  identifier: "ServerNotification__ThreadRealtimeErrorNotification",
 });
 
-export type ServerNotification__ThreadRealtimeSdpNotification = {
-  readonly sdp: string;
+export type ServerNotification__ThreadRealtimeClosedNotification = {
+  readonly reason?: string | null;
   readonly threadId: string;
 };
-export const ServerNotification__ThreadRealtimeSdpNotification = Schema.Struct({
-  sdp: Schema.String,
+export const ServerNotification__ThreadRealtimeClosedNotification = Schema.Struct({
+  reason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   threadId: Schema.String,
 }).annotate({
-  description: "EXPERIMENTAL - emitted with the remote SDP for a WebRTC realtime session.",
-});
-
-export type ServerNotification__ThreadRealtimeTranscriptDeltaNotification = {
-  readonly delta: string;
-  readonly role: string;
-  readonly threadId: string;
-};
-export const ServerNotification__ThreadRealtimeTranscriptDeltaNotification = Schema.Struct({
-  delta: Schema.String.annotate({ description: "Live transcript delta from the realtime event." }),
-  role: Schema.String,
-  threadId: Schema.String,
-}).annotate({
-  description:
-    "EXPERIMENTAL - flat transcript delta emitted whenever realtime transcript text changes.",
-});
-
-export type ServerNotification__ThreadRealtimeTranscriptDoneNotification = {
-  readonly role: string;
-  readonly text: string;
-  readonly threadId: string;
-};
-export const ServerNotification__ThreadRealtimeTranscriptDoneNotification = Schema.Struct({
-  role: Schema.String,
-  text: Schema.String.annotate({ description: "Final complete text for the transcript part." }),
-  threadId: Schema.String,
-}).annotate({
-  description:
-    "EXPERIMENTAL - final transcript text emitted when realtime completes a transcript part.",
-});
-
-export type ServerNotification__ThreadSource = string;
-export const ServerNotification__ThreadSource = Schema.String;
-
-export type ServerNotification__ThreadUnarchivedNotification = { readonly threadId: string };
-export const ServerNotification__ThreadUnarchivedNotification = Schema.Struct({
-  threadId: Schema.String,
-});
-
-export type ServerNotification__TokenUsageBreakdown = {
-  readonly cacheWriteInputTokens?: number;
-  readonly cachedInputTokens: number;
-  readonly inputTokens: number;
-  readonly outputTokens: number;
-  readonly reasoningOutputTokens: number;
-  readonly totalTokens: number;
-};
-export const ServerNotification__TokenUsageBreakdown = Schema.Struct({
-  cacheWriteInputTokens: Schema.optionalKey(
-    Schema.Number.annotate({ default: 0, format: "int64" }).check(Schema.isInt()),
-  ),
-  cachedInputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  inputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  outputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  reasoningOutputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  totalTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-});
-
-export type ServerNotification__TurnDiffUpdatedNotification = {
-  readonly diff: string;
-  readonly threadId: string;
-  readonly turnId: string;
-};
-export const ServerNotification__TurnDiffUpdatedNotification = Schema.Struct({
-  diff: Schema.String,
-  threadId: Schema.String,
-  turnId: Schema.String,
-}).annotate({
-  description:
-    "Notification that the turn-level unified diff has changed. Contains the latest aggregated diff across all file changes in the turn.",
-});
-
-export type ServerNotification__TurnModerationMetadataNotification = {
-  readonly metadata: unknown;
-  readonly threadId: string;
-  readonly turnId: string;
-};
-export const ServerNotification__TurnModerationMetadataNotification = Schema.Struct({
-  metadata: Schema.Unknown,
-  threadId: Schema.String,
-  turnId: Schema.String,
-});
-
-export type ServerNotification__TurnPlanStepStatus = "pending" | "inProgress" | "completed";
-export const ServerNotification__TurnPlanStepStatus = Schema.Literals([
-  "pending",
-  "inProgress",
-  "completed",
-]);
-
-export type ServerNotification__TurnStatus = "completed" | "interrupted" | "failed" | "inProgress";
-export const ServerNotification__TurnStatus = Schema.Literals([
-  "completed",
-  "interrupted",
-  "failed",
-  "inProgress",
-]);
-
-export type ServerNotification__WarningNotification = {
-  readonly message: string;
-  readonly threadId?: string | null;
-};
-export const ServerNotification__WarningNotification = Schema.Struct({
-  message: Schema.String.annotate({ description: "Concise warning message for the user." }),
-  threadId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional thread target when the warning applies to a specific thread.",
-      }),
-      Schema.Null,
-    ]),
-  ),
+  description: "EXPERIMENTAL - emitted when thread realtime transport closes.",
+  identifier: "ServerNotification__ThreadRealtimeClosedNotification",
 });
 
-export type ServerNotification__WebSearchAction =
-  | {
-      readonly queries?: ReadonlyArray<string> | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly type: "openPage"; readonly url?: string | null }
-  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
-  | { readonly type: "other" };
-export const ServerNotification__WebSearchAction = Schema.Union(
-  [
-    Schema.Struct({
-      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
-    }).annotate({ title: "SearchWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageWebSearchAction" }),
-    Schema.Struct({
-      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
-    }).annotate({ title: "OtherWebSearchAction" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type ServerNotification__WindowsSandboxSetupMode = "elevated" | "unelevated";
-export const ServerNotification__WindowsSandboxSetupMode = Schema.Literals([
-  "elevated",
-  "unelevated",
-]);
-
 export type ServerNotification__WindowsWorldWritableWarningNotification = {
   readonly extraCount: number;
   readonly failedScan: boolean;
@@ -2967,68 +3755,59 @@ export type ServerNotification__WindowsWorldWritableWarningNotification = {
 };
 export const ServerNotification__WindowsWorldWritableWarningNotification = Schema.Struct({
   extraCount: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   failedScan: Schema.Boolean,
   samplePaths: Schema.Array(Schema.String),
-});
+}).annotate({ identifier: "ServerNotification__WindowsWorldWritableWarningNotification" });
 
-export type ServerRequest__AbsolutePathBuf = string;
-export const ServerRequest__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+export type ServerNotification__WindowsSandboxSetupMode = "elevated" | "unelevated";
+export const ServerNotification__WindowsSandboxSetupMode = Schema.Literals([
+  "elevated",
+  "unelevated",
+]).annotate({ identifier: "ServerNotification__WindowsSandboxSetupMode" });
 
-export type ServerRequest__AdditionalNetworkPermissions = { readonly enabled?: boolean | null };
-export const ServerRequest__AdditionalNetworkPermissions = Schema.Struct({
-  enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-});
+export type ServerNotification__DesktopOnboardingEntrypoint = "life_sciences";
+export const ServerNotification__DesktopOnboardingEntrypoint = Schema.Literal(
+  "life_sciences",
+).annotate({ identifier: "ServerNotification__DesktopOnboardingEntrypoint" });
 
-export type ServerRequest__AttestationGenerateParams = {};
-export const ServerRequest__AttestationGenerateParams = Schema.Struct({});
+export type ServerRequest__RequestId = string | number;
+export const ServerRequest__RequestId = Schema.Union([
+  Schema.String,
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "ServerRequest__RequestId" });
 
-export type ServerRequest__ChatgptAuthTokensRefreshReason = "unauthorized";
-export const ServerRequest__ChatgptAuthTokensRefreshReason = Schema.Literal("unauthorized");
+export type ServerRequest__LegacyAppPathString = string;
+export const ServerRequest__LegacyAppPathString = Schema.String.annotate({
+  identifier: "ServerRequest__LegacyAppPathString",
+});
 
-export type ServerRequest__DynamicToolCallParams = {
-  readonly arguments: unknown;
-  readonly callId: string;
-  readonly namespace?: string | null;
-  readonly threadId: string;
-  readonly tool: string;
-  readonly turnId: string;
-};
-export const ServerRequest__DynamicToolCallParams = Schema.Struct({
-  arguments: Schema.Unknown,
-  callId: Schema.String,
-  namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  threadId: Schema.String,
-  tool: Schema.String,
-  turnId: Schema.String,
+export type ServerRequest__CommandExecutionApprovalKind = "command" | "writeStdin";
+export const ServerRequest__CommandExecutionApprovalKind = Schema.Literals([
+  "command",
+  "writeStdin",
+]).annotate({
+  description: "Distinguishes a command approval from input sent to an existing terminal.",
+  identifier: "ServerRequest__CommandExecutionApprovalKind",
 });
 
-export type ServerRequest__FileChange =
-  | { readonly content: string; readonly type: "add" }
-  | { readonly content: string; readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update"; readonly unified_diff: string };
-export const ServerRequest__FileChange = Schema.Union(
-  [
-    Schema.Struct({
-      content: Schema.String,
-      type: Schema.Literal("add").annotate({ title: "AddFileChangeType" }),
-    }).annotate({ title: "AddFileChange" }),
-    Schema.Struct({
-      content: Schema.String,
-      type: Schema.Literal("delete").annotate({ title: "DeleteFileChangeType" }),
-    }).annotate({ title: "DeleteFileChange" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdateFileChangeType" }),
-      unified_diff: Schema.String,
-    }).annotate({ title: "UpdateFileChange" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ServerRequest__NetworkApprovalProtocol = "http" | "https" | "socks5Tcp" | "socks5Udp";
+export const ServerRequest__NetworkApprovalProtocol = Schema.Literals([
+  "http",
+  "https",
+  "socks5Tcp",
+  "socks5Udp",
+]).annotate({ identifier: "ServerRequest__NetworkApprovalProtocol" });
+
+export type ServerRequest__NetworkPolicyRuleAction = "allow" | "deny";
+export const ServerRequest__NetworkPolicyRuleAction = Schema.Literals(["allow", "deny"]).annotate({
+  identifier: "ServerRequest__NetworkPolicyRuleAction",
+});
 
 export type ServerRequest__FileChangeRequestApprovalParams = {
   readonly grantRoot?: string | null;
@@ -3060,22 +3839,27 @@ export const ServerRequest__FileChangeRequestApprovalParams = Schema.Struct({
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this approval request started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   threadId: Schema.String,
   turnId: Schema.String,
-});
+}).annotate({ identifier: "ServerRequest__FileChangeRequestApprovalParams" });
 
-export type ServerRequest__FileSystemAccessMode = "read" | "write" | "deny";
-export const ServerRequest__FileSystemAccessMode = Schema.Literals(["read", "write", "deny"]);
-
-export type ServerRequest__LegacyAppPathString = string;
-export const ServerRequest__LegacyAppPathString = Schema.String;
-
-export type ServerRequest__McpElicitationArrayType = "array";
-export const ServerRequest__McpElicitationArrayType = Schema.Literal("array");
+export type ServerRequest__ToolRequestUserInputOption = {
+  readonly description: string;
+  readonly label: string;
+};
+export const ServerRequest__ToolRequestUserInputOption = Schema.Struct({
+  description: Schema.String,
+  label: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL. Defines a single selectable option for request_user_input.",
+  identifier: "ServerRequest__ToolRequestUserInputOption",
+});
 
-export type ServerRequest__McpElicitationBooleanType = "boolean";
-export const ServerRequest__McpElicitationBooleanType = Schema.Literal("boolean");
+export type ServerRequest__McpElicitationStringType = "string";
+export const ServerRequest__McpElicitationStringType = Schema.Literal("string").annotate({
+  identifier: "ServerRequest__McpElicitationStringType",
+});
 
 export type ServerRequest__McpElicitationConstOption = {
   readonly const: string;
@@ -3084,13 +3868,12 @@ export type ServerRequest__McpElicitationConstOption = {
 export const ServerRequest__McpElicitationConstOption = Schema.Struct({
   const: Schema.String,
   title: Schema.String,
-});
-
-export type ServerRequest__McpElicitationNumberType = "number" | "integer";
-export const ServerRequest__McpElicitationNumberType = Schema.Literals(["number", "integer"]);
+}).annotate({ identifier: "ServerRequest__McpElicitationConstOption" });
 
-export type ServerRequest__McpElicitationObjectType = "object";
-export const ServerRequest__McpElicitationObjectType = Schema.Literal("object");
+export type ServerRequest__McpElicitationArrayType = "array";
+export const ServerRequest__McpElicitationArrayType = Schema.Literal("array").annotate({
+  identifier: "ServerRequest__McpElicitationArrayType",
+});
 
 export type ServerRequest__McpElicitationStringFormat = "email" | "uri" | "date" | "date-time";
 export const ServerRequest__McpElicitationStringFormat = Schema.Literals([
@@ -3098,21 +3881,96 @@ export const ServerRequest__McpElicitationStringFormat = Schema.Literals([
   "uri",
   "date",
   "date-time",
-]);
+]).annotate({ identifier: "ServerRequest__McpElicitationStringFormat" });
 
-export type ServerRequest__McpElicitationStringType = "string";
-export const ServerRequest__McpElicitationStringType = Schema.Literal("string");
+export type ServerRequest__McpElicitationNumberType = "number" | "integer";
+export const ServerRequest__McpElicitationNumberType = Schema.Literals([
+  "number",
+  "integer",
+]).annotate({ identifier: "ServerRequest__McpElicitationNumberType" });
 
-export type ServerRequest__NetworkApprovalProtocol = "http" | "https" | "socks5Tcp" | "socks5Udp";
-export const ServerRequest__NetworkApprovalProtocol = Schema.Literals([
-  "http",
-  "https",
-  "socks5Tcp",
-  "socks5Udp",
-]);
+export type ServerRequest__McpElicitationBooleanType = "boolean";
+export const ServerRequest__McpElicitationBooleanType = Schema.Literal("boolean").annotate({
+  identifier: "ServerRequest__McpElicitationBooleanType",
+});
 
-export type ServerRequest__NetworkPolicyRuleAction = "allow" | "deny";
-export const ServerRequest__NetworkPolicyRuleAction = Schema.Literals(["allow", "deny"]);
+export type ServerRequest__McpElicitationObjectType = "object";
+export const ServerRequest__McpElicitationObjectType = Schema.Literal("object").annotate({
+  identifier: "ServerRequest__McpElicitationObjectType",
+});
+
+export type ServerRequest__FileSystemAccessMode = "read" | "write" | "deny";
+export const ServerRequest__FileSystemAccessMode = Schema.Literals([
+  "read",
+  "write",
+  "deny",
+]).annotate({ identifier: "ServerRequest__FileSystemAccessMode" });
+
+export type ServerRequest__AdditionalNetworkPermissions = { readonly enabled?: boolean | null };
+export const ServerRequest__AdditionalNetworkPermissions = Schema.Struct({
+  enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+}).annotate({ identifier: "ServerRequest__AdditionalNetworkPermissions" });
+
+export type ServerRequest__DynamicToolCallParams = {
+  readonly arguments: Schema.Json;
+  readonly callId: string;
+  readonly namespace?: string | null;
+  readonly threadId: string;
+  readonly tool: string;
+  readonly turnId: string;
+};
+export const ServerRequest__DynamicToolCallParams = Schema.Struct({
+  arguments: Schema.Json.annotate({ expected: "JSON value" }),
+  callId: Schema.String,
+  namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  threadId: Schema.String,
+  tool: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerRequest__DynamicToolCallParams" });
+
+export type ServerRequest__ChatgptAuthTokensRefreshReason = "unauthorized";
+export const ServerRequest__ChatgptAuthTokensRefreshReason = Schema.Union(
+  [
+    Schema.Literal("unauthorized").annotate({
+      description: "Codex attempted a backend request and received `401 Unauthorized`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerRequest__ChatgptAuthTokensRefreshReason" });
+
+export type ServerRequest__AttestationGenerateParams = { readonly [x: string]: Schema.Json };
+export const ServerRequest__AttestationGenerateParams = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ identifier: "ServerRequest__AttestationGenerateParams" });
+
+export type ServerRequest__ThreadId = string;
+export const ServerRequest__ThreadId = Schema.String.annotate({
+  identifier: "ServerRequest__ThreadId",
+});
+
+export type ServerRequest__FileChange =
+  | { readonly content: string; readonly type: "add" }
+  | { readonly content: string; readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update"; readonly unified_diff: string };
+export const ServerRequest__FileChange = Schema.Union(
+  [
+    Schema.Struct({
+      content: Schema.String,
+      type: Schema.Literal("add").annotate({ title: "AddFileChangeType" }),
+    }).annotate({ title: "AddFileChange" }),
+    Schema.Struct({
+      content: Schema.String,
+      type: Schema.Literal("delete").annotate({ title: "DeleteFileChangeType" }),
+    }).annotate({ title: "DeleteFileChange" }),
+    Schema.Struct({
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdateFileChangeType" }),
+      unified_diff: Schema.String,
+    }).annotate({ title: "UpdateFileChange" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerRequest__FileChange" });
 
 export type ServerRequest__ParsedCommand =
   | { readonly cmd: string; readonly name: string; readonly path: string; readonly type: "read" }
@@ -3152,27 +4010,7 @@ export const ServerRequest__ParsedCommand = Schema.Union(
     }).annotate({ title: "UnknownParsedCommand" }),
   ],
   { mode: "oneOf" },
-);
-
-export type ServerRequest__RequestId = string | number;
-export const ServerRequest__RequestId = Schema.Union([
-  Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
-
-export type ServerRequest__ThreadId = string;
-export const ServerRequest__ThreadId = Schema.String;
-
-export type ServerRequest__ToolRequestUserInputOption = {
-  readonly description: string;
-  readonly label: string;
-};
-export const ServerRequest__ToolRequestUserInputOption = Schema.Struct({
-  description: Schema.String,
-  label: Schema.String,
-}).annotate({
-  description: "EXPERIMENTAL. Defines a single selectable option for request_user_input.",
-});
+).annotate({ identifier: "ServerRequest__ParsedCommand" });
 
 export type ToolRequestUserInputParams__ToolRequestUserInputOption = {
   readonly description: string;
@@ -3183,6 +4021,7 @@ export const ToolRequestUserInputParams__ToolRequestUserInputOption = Schema.Str
   label: Schema.String,
 }).annotate({
   description: "EXPERIMENTAL. Defines a single selectable option for request_user_input.",
+  identifier: "ToolRequestUserInputParams__ToolRequestUserInputOption",
 });
 
 export type ToolRequestUserInputResponse__ToolRequestUserInputAnswer = {
@@ -3192,21 +4031,13 @@ export const ToolRequestUserInputResponse__ToolRequestUserInputAnswer = Schema.S
   answers: Schema.Array(Schema.String),
 }).annotate({
   description: "EXPERIMENTAL. Captures a user's answer to a request_user_input question.",
-});
-
-export type V1InitializeParams__ClientInfo = {
-  readonly name: string;
-  readonly title?: string | null;
-  readonly version: string;
-};
-export const V1InitializeParams__ClientInfo = Schema.Struct({
-  name: Schema.String,
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  version: Schema.String,
+  identifier: "ToolRequestUserInputResponse__ToolRequestUserInputAnswer",
 });
 
 export type V1InitializeParams__InitializeCapabilities = {
   readonly experimentalApi?: boolean;
+  readonly explicitGatewayOauth?: boolean;
+  readonly extensions?: { readonly [x: string]: Schema.Json } | null;
   readonly mcpServerOpenaiFormElicitation?: boolean;
   readonly optOutNotificationMethods?: ReadonlyArray<string> | null;
   readonly requestAttestation?: boolean;
@@ -3218,9 +4049,24 @@ export const V1InitializeParams__InitializeCapabilities = Schema.Struct({
       default: false,
     }),
   ),
+  explicitGatewayOauth: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Use explicit gateway OAuth login instead of automatic browser authorization. Applies to this app-server's gateway runtime; later connections cannot undo it.",
+    }),
+  ),
+  extensions: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })).annotate({
+        description: "MCP extension settings declared by the app-server client.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   mcpServerOpenaiFormElicitation: Schema.optionalKey(
     Schema.Boolean.annotate({
-      description: "Allow downstream MCP servers to request OpenAI extended form elicitations.",
+      description:
+        "Legacy opt-in for the `openai/form` MCP extension.\n\nNew clients should declare `openai/form` in [`Self::extensions`].",
     }),
   ),
   optOutNotificationMethods: Schema.optionalKey(
@@ -3238,7 +4084,33 @@ export const V1InitializeParams__InitializeCapabilities = Schema.Struct({
       default: false,
     }),
   ),
-}).annotate({ description: "Client-declared capabilities negotiated during initialize." });
+}).annotate({
+  description: "Client-declared capabilities negotiated during initialize.",
+  identifier: "V1InitializeParams__InitializeCapabilities",
+});
+
+export type V1InitializeParams__ClientInfo = {
+  readonly name: string;
+  readonly title?: string | null;
+  readonly version: string;
+};
+export const V1InitializeParams__ClientInfo = Schema.Struct({
+  name: Schema.String,
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  version: Schema.String,
+}).annotate({ identifier: "V1InitializeParams__ClientInfo" });
+
+export type V1InitializeResponse__AbsolutePathBuf = string;
+export const V1InitializeResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V1InitializeResponse__AbsolutePathBuf",
+});
+
+export type V2AccountLoginCompletedNotification__DesktopOnboardingEntrypoint = "life_sciences";
+export const V2AccountLoginCompletedNotification__DesktopOnboardingEntrypoint = Schema.Literal(
+  "life_sciences",
+).annotate({ identifier: "V2AccountLoginCompletedNotification__DesktopOnboardingEntrypoint" });
 
 export type V2AccountRateLimitsUpdatedNotification__CreditsSnapshot = {
   readonly balance?: string | null;
@@ -3249,45 +4121,56 @@ export const V2AccountRateLimitsUpdatedNotification__CreditsSnapshot = Schema.St
   balance: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   hasCredits: Schema.Boolean,
   unlimited: Schema.Boolean,
+}).annotate({ identifier: "V2AccountRateLimitsUpdatedNotification__CreditsSnapshot" });
+
+export type V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot = {
+  readonly limit: string;
+  readonly remainingPercent: number;
+  readonly resetsAt: number;
+  readonly used: string;
+};
+export const V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot = Schema.Struct({
+  limit: Schema.String,
+  remainingPercent: Schema.Number.annotate({ format: "int32" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  resetsAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  used: Schema.String,
+}).annotate({ identifier: "V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot" });
+
+export type V2AccountRateLimitsUpdatedNotification__PlanType = string;
+export const V2AccountRateLimitsUpdatedNotification__PlanType = Schema.String.annotate({
+  identifier: "V2AccountRateLimitsUpdatedNotification__PlanType",
 });
 
-export type V2AccountRateLimitsUpdatedNotification__PlanType =
-  | "free"
-  | "go"
-  | "plus"
-  | "pro"
-  | "prolite"
-  | "team"
-  | "self_serve_business_prolite"
-  | "self_serve_business_usage_based"
-  | "business"
-  | "ent26"
-  | "enterprise_cbp_automation"
-  | "enterprise_cbp_usage_based"
-  | "enterprise"
-  | "edu"
-  | "edu_plus"
-  | "edu_pro"
-  | "unknown";
-export const V2AccountRateLimitsUpdatedNotification__PlanType = Schema.Literals([
-  "free",
-  "go",
-  "plus",
-  "pro",
-  "prolite",
-  "team",
-  "self_serve_business_prolite",
-  "self_serve_business_usage_based",
-  "business",
-  "ent26",
-  "enterprise_cbp_automation",
-  "enterprise_cbp_usage_based",
-  "enterprise",
-  "edu",
-  "edu_plus",
-  "edu_pro",
-  "unknown",
-]);
+export type V2AccountRateLimitsUpdatedNotification__RateLimitWindow = {
+  readonly resetsAt?: number | null;
+  readonly usedPercent: number;
+  readonly windowDurationMins?: number | null;
+};
+export const V2AccountRateLimitsUpdatedNotification__RateLimitWindow = Schema.Struct({
+  resetsAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  usedPercent: Schema.Number.annotate({ format: "int32" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  windowDurationMins: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2AccountRateLimitsUpdatedNotification__RateLimitWindow" });
 
 export type V2AccountRateLimitsUpdatedNotification__RateLimitReachedType =
   | "rate_limit_reached"
@@ -3301,35 +4184,7 @@ export const V2AccountRateLimitsUpdatedNotification__RateLimitReachedType = Sche
   "workspace_member_credits_depleted",
   "workspace_owner_usage_limit_reached",
   "workspace_member_usage_limit_reached",
-]);
-
-export type V2AccountRateLimitsUpdatedNotification__RateLimitWindow = {
-  readonly resetsAt?: number | null;
-  readonly usedPercent: number;
-  readonly windowDurationMins?: number | null;
-};
-export const V2AccountRateLimitsUpdatedNotification__RateLimitWindow = Schema.Struct({
-  resetsAt: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  usedPercent: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-  windowDurationMins: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-});
-
-export type V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot = {
-  readonly limit: string;
-  readonly remainingPercent: number;
-  readonly resetsAt: number;
-  readonly used: string;
-};
-export const V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot = Schema.Struct({
-  limit: Schema.String,
-  remainingPercent: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-  resetsAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  used: Schema.String,
-});
+]).annotate({ identifier: "V2AccountRateLimitsUpdatedNotification__RateLimitReachedType" });
 
 export type V2AccountUpdatedNotification__AuthMode =
   | "apikey"
@@ -3338,54 +4193,62 @@ export type V2AccountUpdatedNotification__AuthMode =
   | "headers"
   | "agentIdentity"
   | "personalAccessToken"
-  | "bedrockApiKey";
-export const V2AccountUpdatedNotification__AuthMode = Schema.Literals([
-  "apikey",
-  "chatgpt",
-  "chatgptAuthTokens",
-  "headers",
-  "agentIdentity",
-  "personalAccessToken",
-  "bedrockApiKey",
-]).annotate({ description: "Authentication mode for OpenAI-backed providers." });
-
-export type V2AccountUpdatedNotification__PlanType =
-  | "free"
-  | "go"
-  | "plus"
-  | "pro"
-  | "prolite"
-  | "team"
-  | "self_serve_business_prolite"
-  | "self_serve_business_usage_based"
-  | "business"
-  | "ent26"
-  | "enterprise_cbp_automation"
-  | "enterprise_cbp_usage_based"
-  | "enterprise"
-  | "edu"
-  | "edu_plus"
-  | "edu_pro"
-  | "unknown";
-export const V2AccountUpdatedNotification__PlanType = Schema.Literals([
-  "free",
-  "go",
-  "plus",
-  "pro",
-  "prolite",
-  "team",
-  "self_serve_business_prolite",
-  "self_serve_business_usage_based",
-  "business",
-  "ent26",
-  "enterprise_cbp_automation",
-  "enterprise_cbp_usage_based",
-  "enterprise",
-  "edu",
-  "edu_plus",
-  "edu_pro",
-  "unknown",
-]);
+  | "bedrockApiKey"
+  | "bedrockAccessKeys";
+export const V2AccountUpdatedNotification__AuthMode = Schema.Union(
+  [
+    Schema.Literal("apikey").annotate({
+      description: "OpenAI API key provided by the caller and stored by Codex.",
+    }),
+    Schema.Literal("chatgpt").annotate({
+      description: "ChatGPT OAuth managed by Codex (tokens persisted and refreshed by Codex).",
+    }),
+    Schema.Literal("chatgptAuthTokens").annotate({
+      description:
+        "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE.\n\nChatGPT auth tokens are supplied by an external host app and are only stored in memory. Token refresh must be handled by the external host app.",
+    }),
+    Schema.Literal("headers").annotate({
+      description: "Backend auth supplied as request headers.",
+    }),
+    Schema.Literal("agentIdentity").annotate({
+      description: "Programmatic Codex auth backed by a registered Agent Identity.",
+    }),
+    Schema.Literal("personalAccessToken").annotate({
+      description: "Programmatic Codex auth backed by a personal access token.",
+    }),
+    Schema.Literal("bedrockApiKey").annotate({
+      description: "Amazon Bedrock bearer token managed by Codex.",
+    }),
+    Schema.Literal("bedrockAccessKeys").annotate({
+      description: "Amazon Bedrock AWS access keys managed by Codex.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Authentication mode for OpenAI-backed providers.",
+  identifier: "V2AccountUpdatedNotification__AuthMode",
+});
+
+export type V2AccountUpdatedNotification__PlanType = string;
+export const V2AccountUpdatedNotification__PlanType = Schema.String.annotate({
+  identifier: "V2AccountUpdatedNotification__PlanType",
+});
+
+export type V2AppListUpdatedNotification__AppReview = { readonly status: string };
+export const V2AppListUpdatedNotification__AppReview = Schema.Struct({
+  status: Schema.String,
+}).annotate({ identifier: "V2AppListUpdatedNotification__AppReview" });
+
+export type V2AppListUpdatedNotification__AppScreenshot = {
+  readonly fileId?: string | null;
+  readonly url?: string | null;
+  readonly userPrompt: string;
+};
+export const V2AppListUpdatedNotification__AppScreenshot = Schema.Struct({
+  fileId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  userPrompt: Schema.String,
+}).annotate({ identifier: "V2AppListUpdatedNotification__AppScreenshot" });
 
 export type V2AppListUpdatedNotification__AppBranding = {
   readonly category?: string | null;
@@ -3402,20 +4265,9 @@ export const V2AppListUpdatedNotification__AppBranding = Schema.Struct({
   privacyPolicy: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   termsOfService: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   website: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({ description: "EXPERIMENTAL - app metadata returned by app-list APIs." });
-
-export type V2AppListUpdatedNotification__AppReview = { readonly status: string };
-export const V2AppListUpdatedNotification__AppReview = Schema.Struct({ status: Schema.String });
-
-export type V2AppListUpdatedNotification__AppScreenshot = {
-  readonly fileId?: string | null;
-  readonly url?: string | null;
-  readonly userPrompt: string;
-};
-export const V2AppListUpdatedNotification__AppScreenshot = Schema.Struct({
-  fileId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  userPrompt: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL - app metadata returned by app-list APIs.",
+  identifier: "V2AppListUpdatedNotification__AppBranding",
 });
 
 export type V2AppsInstalledResponse__InstalledApp = {
@@ -3443,7 +4295,26 @@ export const V2AppsInstalledResponse__InstalledApp = Schema.Struct({
       Schema.Null,
     ]),
   ),
-}).annotate({ description: "Installed connector runtime state." });
+}).annotate({
+  description: "Installed connector runtime state.",
+  identifier: "V2AppsInstalledResponse__InstalledApp",
+});
+
+export type V2AppsListResponse__AppReview = { readonly status: string };
+export const V2AppsListResponse__AppReview = Schema.Struct({ status: Schema.String }).annotate({
+  identifier: "V2AppsListResponse__AppReview",
+});
+
+export type V2AppsListResponse__AppScreenshot = {
+  readonly fileId?: string | null;
+  readonly url?: string | null;
+  readonly userPrompt: string;
+};
+export const V2AppsListResponse__AppScreenshot = Schema.Struct({
+  fileId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  userPrompt: Schema.String,
+}).annotate({ identifier: "V2AppsListResponse__AppScreenshot" });
 
 export type V2AppsListResponse__AppBranding = {
   readonly category?: string | null;
@@ -3460,43 +4331,62 @@ export const V2AppsListResponse__AppBranding = Schema.Struct({
   privacyPolicy: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   termsOfService: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   website: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({ description: "EXPERIMENTAL - app metadata returned by app-list APIs." });
-
-export type V2AppsListResponse__AppReview = { readonly status: string };
-export const V2AppsListResponse__AppReview = Schema.Struct({ status: Schema.String });
-
-export type V2AppsListResponse__AppScreenshot = {
-  readonly fileId?: string | null;
-  readonly url?: string | null;
-  readonly userPrompt: string;
-};
-export const V2AppsListResponse__AppScreenshot = Schema.Struct({
-  fileId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  userPrompt: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL - app metadata returned by app-list APIs.",
+  identifier: "V2AppsListResponse__AppBranding",
 });
 
 export type V2AppsReadResponse__AppToolSummary = {
   readonly description: string;
+  readonly disabledReason?: string | null;
+  readonly isEnabled?: boolean;
+  readonly isReadOnly?: boolean;
   readonly name: string;
   readonly title?: string | null;
 };
 export const V2AppsReadResponse__AppToolSummary = Schema.Struct({
   description: Schema.String,
+  disabledReason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  isEnabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
+  isReadOnly: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
   name: Schema.String,
   title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({ description: "EXPERIMENTAL - metadata returned by app/read." });
+}).annotate({
+  description: "EXPERIMENTAL - metadata returned by app/read.",
+  identifier: "V2AppsReadResponse__AppToolSummary",
+});
 
 export type V2CancelLoginAccountResponse__CancelLoginAccountStatus = "canceled" | "notFound";
 export const V2CancelLoginAccountResponse__CancelLoginAccountStatus = Schema.Literals([
   "canceled",
   "notFound",
-]);
+]).annotate({ identifier: "V2CancelLoginAccountResponse__CancelLoginAccountStatus" });
 
-export type V2CommandExecParams__AbsolutePathBuf = string;
-export const V2CommandExecParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+export type V2CommandExecOutputDeltaNotification__CommandExecOutputStream = "stdout" | "stderr";
+export const V2CommandExecOutputDeltaNotification__CommandExecOutputStream = Schema.Union(
+  [
+    Schema.Literal("stdout").annotate({
+      description: "stdout stream. PTY mode multiplexes terminal output here.",
+    }),
+    Schema.Literal("stderr").annotate({ description: "stderr stream." }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Stream label for `command/exec/outputDelta` notifications.",
+  identifier: "V2CommandExecOutputDeltaNotification__CommandExecOutputStream",
+});
+
+export type V2CommandExecParams__NetworkAccess = "restricted" | "enabled";
+export const V2CommandExecParams__NetworkAccess = Schema.Literals([
+  "restricted",
+  "enabled",
+]).annotate({ identifier: "V2CommandExecParams__NetworkAccess" });
+
+export type V2CommandExecParams__AbsolutePathBuf = string;
+export const V2CommandExecParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2CommandExecParams__AbsolutePathBuf",
 });
 
 export type V2CommandExecParams__CommandExecTerminalSize = {
@@ -3508,54 +4398,62 @@ export const V2CommandExecParams__CommandExecTerminalSize = Schema.Struct({
     description: "Terminal width in character cells.",
     format: "uint16",
   })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   rows: Schema.Number.annotate({
     description: "Terminal height in character cells.",
     format: "uint16",
   })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-}).annotate({ description: "PTY size in character cells for `command/exec` PTY sessions." });
-
-export type V2ConfigBatchWriteParams__MergeStrategy = "replace" | "upsert";
-export const V2ConfigBatchWriteParams__MergeStrategy = Schema.Literals(["replace", "upsert"]);
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({
+  description: "PTY size in character cells for `command/exec` PTY sessions.",
+  identifier: "V2CommandExecParams__CommandExecTerminalSize",
+});
 
-export type V2ConfigReadResponse__AbsolutePathBuf = string;
-export const V2ConfigReadResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+export type V2CommandExecResizeParams__CommandExecTerminalSize = {
+  readonly cols: number;
+  readonly rows: number;
+};
+export const V2CommandExecResizeParams__CommandExecTerminalSize = Schema.Struct({
+  cols: Schema.Number.annotate({
+    description: "Terminal width in character cells.",
+    format: "uint16",
+  })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  rows: Schema.Number.annotate({
+    description: "Terminal height in character cells.",
+    format: "uint16",
+  })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({
+  description: "PTY size in character cells for `command/exec` PTY sessions.",
+  identifier: "V2CommandExecResizeParams__CommandExecTerminalSize",
 });
 
-export type V2ConfigReadResponse__AnalyticsConfig = {
-  readonly enabled?: boolean | null;
-  readonly [x: string]: unknown;
+export type V2ConfigBatchWriteParams__MergeStrategy = "replace" | "upsert";
+export const V2ConfigBatchWriteParams__MergeStrategy = Schema.Literals([
+  "replace",
+  "upsert",
+]).annotate({ identifier: "V2ConfigBatchWriteParams__MergeStrategy" });
+
+export type V2ConfigReadResponse__AnalyticsConfig = { readonly enabled?: boolean | null } & {
+  readonly [x: string]: Schema.Json;
 };
 export const V2ConfigReadResponse__AnalyticsConfig = Schema.StructWithRest(
   Schema.Struct({ enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])) }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-);
-
-export type V2ConfigReadResponse__AppToolApproval = "auto" | "prompt" | "writes" | "approve";
-export const V2ConfigReadResponse__AppToolApproval = Schema.Literals([
-  "auto",
-  "prompt",
-  "writes",
-  "approve",
-]);
-
-export type V2ConfigReadResponse__AppToolsConfig = {};
-export const V2ConfigReadResponse__AppToolsConfig = Schema.Struct({});
-
-export type V2ConfigReadResponse__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const V2ConfigReadResponse__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
+  [Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" }))],
+).annotate({ identifier: "V2ConfigReadResponse__AnalyticsConfig" });
 
 export type V2ConfigReadResponse__AskForApproval =
   | "untrusted"
@@ -3584,32 +4482,65 @@ export const V2ConfigReadResponse__AskForApproval = Schema.Union(
     }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ConfigReadResponse__AskForApproval" });
 
-export type V2ConfigReadResponse__AutoCompactTokenLimitScope = "total" | "body_after_prefix";
-export const V2ConfigReadResponse__AutoCompactTokenLimitScope = Schema.Literals([
-  "total",
-  "body_after_prefix",
+export type V2ConfigReadResponse__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const V2ConfigReadResponse__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
 ]).annotate({
   description:
-    "Selects which part of the active context is charged against `model_auto_compact_token_limit`.",
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ConfigReadResponse__ApprovalsReviewer",
 });
 
+export type V2ConfigReadResponse__AllowDenyRequirement = "allow" | "deny";
+export const V2ConfigReadResponse__AllowDenyRequirement = Schema.Literals([
+  "allow",
+  "deny",
+]).annotate({ identifier: "V2ConfigReadResponse__AllowDenyRequirement" });
+
 export type V2ConfigReadResponse__ForcedChatgptWorkspaceIds = string | ReadonlyArray<string>;
 export const V2ConfigReadResponse__ForcedChatgptWorkspaceIds = Schema.Union([
   Schema.String,
   Schema.Array(Schema.String),
 ]).annotate({
   description: "Backward-compatible API shape for ChatGPT workspace login restrictions.",
+  identifier: "V2ConfigReadResponse__ForcedChatgptWorkspaceIds",
 });
 
 export type V2ConfigReadResponse__ForcedLoginMethod = "chatgpt" | "api";
-export const V2ConfigReadResponse__ForcedLoginMethod = Schema.Literals(["chatgpt", "api"]);
+export const V2ConfigReadResponse__ForcedLoginMethod = Schema.Literals(["chatgpt", "api"]).annotate(
+  { identifier: "V2ConfigReadResponse__ForcedLoginMethod" },
+);
+
+export type V2ConfigReadResponse__AutoCompactTokenLimitScope = "total" | "body_after_prefix";
+export const V2ConfigReadResponse__AutoCompactTokenLimitScope = Schema.Union(
+  [
+    Schema.Literal("total").annotate({
+      description: "Count the full active context against the limit.",
+    }),
+    Schema.Literal("body_after_prefix").annotate({
+      description: "Count sampled output and later growth after the carried window prefix.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Selects which part of the active context is charged against `model_auto_compact_token_limit`.",
+  identifier: "V2ConfigReadResponse__AutoCompactTokenLimitScope",
+});
 
 export type V2ConfigReadResponse__ReasoningEffort = string;
 export const V2ConfigReadResponse__ReasoningEffort = Schema.String.annotate({
   description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ConfigReadResponse__ReasoningEffort",
+  }),
+);
 
 export type V2ConfigReadResponse__ReasoningSummary = "auto" | "concise" | "detailed" | "none";
 export const V2ConfigReadResponse__ReasoningSummary = Schema.Union(
@@ -3621,6 +4552,14 @@ export const V2ConfigReadResponse__ReasoningSummary = Schema.Union(
 ).annotate({
   description:
     "A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#reasoning-summaries",
+  identifier: "V2ConfigReadResponse__ReasoningSummary",
+});
+
+export type V2ConfigReadResponse__Verbosity = "low" | "medium" | "high";
+export const V2ConfigReadResponse__Verbosity = Schema.Literals(["low", "medium", "high"]).annotate({
+  description:
+    "Controls output length/detail on GPT-5 models via the Responses API. Serialized with lowercase values to match the OpenAI API.",
+  identifier: "V2ConfigReadResponse__Verbosity",
 });
 
 export type V2ConfigReadResponse__SandboxMode =
@@ -3631,7 +4570,7 @@ export const V2ConfigReadResponse__SandboxMode = Schema.Literals([
   "read-only",
   "workspace-write",
   "danger-full-access",
-]);
+]).annotate({ identifier: "V2ConfigReadResponse__SandboxMode" });
 
 export type V2ConfigReadResponse__SandboxWorkspaceWrite = {
   readonly exclude_slash_tmp?: boolean;
@@ -3644,20 +4583,14 @@ export const V2ConfigReadResponse__SandboxWorkspaceWrite = Schema.Struct({
   exclude_tmpdir_env_var: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
   network_access: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
   writable_roots: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-});
-
-export type V2ConfigReadResponse__Verbosity = "low" | "medium" | "high";
-export const V2ConfigReadResponse__Verbosity = Schema.Literals(["low", "medium", "high"]).annotate({
-  description:
-    "Controls output length/detail on GPT-5 models via the Responses API. Serialized with lowercase values to match the OpenAI API.",
-});
+}).annotate({ identifier: "V2ConfigReadResponse__SandboxWorkspaceWrite" });
 
 export type V2ConfigReadResponse__WebSearchContextSize = "low" | "medium" | "high";
 export const V2ConfigReadResponse__WebSearchContextSize = Schema.Literals([
   "low",
   "medium",
   "high",
-]);
+]).annotate({ identifier: "V2ConfigReadResponse__WebSearchContextSize" });
 
 export type V2ConfigReadResponse__WebSearchLocation = {
   readonly city?: string | null;
@@ -3670,7 +4603,7 @@ export const V2ConfigReadResponse__WebSearchLocation = Schema.Struct({
   country: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   region: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   timezone: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ConfigReadResponse__WebSearchLocation" });
 
 export type V2ConfigReadResponse__WebSearchMode = "disabled" | "cached" | "indexed" | "live";
 export const V2ConfigReadResponse__WebSearchMode = Schema.Literals([
@@ -3678,7 +4611,56 @@ export const V2ConfigReadResponse__WebSearchMode = Schema.Literals([
   "cached",
   "indexed",
   "live",
-]);
+]).annotate({ identifier: "V2ConfigReadResponse__WebSearchMode" });
+
+export type V2ConfigReadResponse__AbsolutePathBuf = string;
+export const V2ConfigReadResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ConfigReadResponse__AbsolutePathBuf",
+});
+
+export type V2ConfigReadResponse__AppToolApproval = "auto" | "prompt" | "writes" | "approve";
+export const V2ConfigReadResponse__AppToolApproval = Schema.Literals([
+  "auto",
+  "prompt",
+  "writes",
+  "approve",
+]).annotate({ identifier: "V2ConfigReadResponse__AppToolApproval" });
+
+export type V2ConfigReadResponse__AppLinksConfig = { readonly [x: string]: Schema.Json };
+export const V2ConfigReadResponse__AppLinksConfig = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
+  description: "Account settings for a single app.",
+  identifier: "V2ConfigReadResponse__AppLinksConfig",
+});
+
+export type V2ConfigReadResponse__ToolExposureSurface = "code_mode" | "deferred" | "direct";
+export const V2ConfigReadResponse__ToolExposureSurface = Schema.Union(
+  [
+    Schema.Literal("code_mode").annotate({
+      description: "Nested tools available to Code Mode scripts.",
+    }),
+    Schema.Literal("deferred").annotate({
+      description: "Tools discovered later through tool search.",
+    }),
+    Schema.Literal("direct").annotate({
+      description: "Tools present in the model's initial tool list.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "A model-facing surface on which a tool can be exposed.",
+  identifier: "V2ConfigReadResponse__ToolExposureSurface",
+});
+
+export type V2ConfigReadResponse__AppToolsConfig = { readonly [x: string]: Schema.Json };
+export const V2ConfigReadResponse__AppToolsConfig = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ identifier: "V2ConfigReadResponse__AppToolsConfig" });
 
 export type V2ConfigRequirementsReadResponse__AskForApproval =
   | "untrusted"
@@ -3707,17 +4689,119 @@ export const V2ConfigRequirementsReadResponse__AskForApproval = Schema.Union(
     }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
+).annotate({ identifier: "V2ConfigRequirementsReadResponse__AskForApproval" });
+
+export type V2ConfigRequirementsReadResponse__ForcedLoginMethod = "chatgpt" | "api";
+export const V2ConfigRequirementsReadResponse__ForcedLoginMethod = Schema.Literals([
+  "chatgpt",
+  "api",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__ForcedLoginMethod" });
+
+export type V2ConfigRequirementsReadResponse__SandboxMode =
+  | "read-only"
+  | "workspace-write"
+  | "danger-full-access";
+export const V2ConfigRequirementsReadResponse__SandboxMode = Schema.Literals([
+  "read-only",
+  "workspace-write",
+  "danger-full-access",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__SandboxMode" });
+
+export type V2ConfigRequirementsReadResponse__WebSearchMode =
+  | "disabled"
+  | "cached"
+  | "indexed"
+  | "live";
+export const V2ConfigRequirementsReadResponse__WebSearchMode = Schema.Literals([
+  "disabled",
+  "cached",
+  "indexed",
+  "live",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__WebSearchMode" });
+
+export type V2ConfigRequirementsReadResponse__WindowsSandboxImplementation =
+  | "elevated"
+  | "unelevated"
+  | "mxc";
+export const V2ConfigRequirementsReadResponse__WindowsSandboxImplementation = Schema.Literals([
+  "elevated",
+  "unelevated",
+  "mxc",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__WindowsSandboxImplementation" });
+
+export type V2ConfigRequirementsReadResponse__AutoReviewRequirements = {
+  readonly ignoreRules?: ReadonlyArray<string> | null;
+  readonly requiredOnModels?: ReadonlyArray<string> | null;
+};
+export const V2ConfigRequirementsReadResponse__AutoReviewRequirements = Schema.Struct({
+  ignoreRules: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  requiredOnModels: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__AutoReviewRequirements" });
+
+export type V2ConfigRequirementsReadResponse__AllowDenyRequirement = "allow" | "deny";
+export const V2ConfigRequirementsReadResponse__AllowDenyRequirement = Schema.Literals([
+  "allow",
+  "deny",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__AllowDenyRequirement" });
+
+export type V2ConfigRequirementsReadResponse__BrowserUseAccessApprovalLifetime = "turn" | "thread";
+export const V2ConfigRequirementsReadResponse__BrowserUseAccessApprovalLifetime = Schema.Literals([
+  "turn",
+  "thread",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__BrowserUseAccessApprovalLifetime" });
+
+export type V2ConfigRequirementsReadResponse__CliAuthCredentialsStoreMode =
+  | "file"
+  | "keyring"
+  | "auto"
+  | "ephemeral";
+export const V2ConfigRequirementsReadResponse__CliAuthCredentialsStoreMode = Schema.Literals([
+  "file",
+  "keyring",
+  "auto",
+  "ephemeral",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__CliAuthCredentialsStoreMode" });
+
+export type V2ConfigRequirementsReadResponse__ResidencyRequirement = "us";
+export const V2ConfigRequirementsReadResponse__ResidencyRequirement = Schema.Literal("us").annotate(
+  { identifier: "V2ConfigRequirementsReadResponse__ResidencyRequirement" },
 );
 
-export type V2ConfigRequirementsReadResponse__ComputerUseRequirements = {
-  readonly allowLockedComputerUse?: boolean | null;
+export type V2ConfigRequirementsReadResponse__FeedbackRequirements = {
+  readonly enabled?: boolean | null;
 };
-export const V2ConfigRequirementsReadResponse__ComputerUseRequirements = Schema.Struct({
-  allowLockedComputerUse: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-});
+export const V2ConfigRequirementsReadResponse__FeedbackRequirements = Schema.Struct({
+  enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__FeedbackRequirements" });
+
+export type V2ConfigRequirementsReadResponse__InAppBrowserRequirements = {
+  readonly allowExternalBrowserSettingsImport?: boolean | null;
+};
+export const V2ConfigRequirementsReadResponse__InAppBrowserRequirements = Schema.Struct({
+  allowExternalBrowserSettingsImport: Schema.optionalKey(
+    Schema.Union([Schema.Boolean, Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__InAppBrowserRequirements" });
+
+export type V2ConfigRequirementsReadResponse__ReasoningEffort = string;
+export const V2ConfigRequirementsReadResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ConfigRequirementsReadResponse__ReasoningEffort",
+  }),
+);
+
+export type V2ConfigRequirementsReadResponse__NetworkDomainPermission = "allow" | "deny";
+export const V2ConfigRequirementsReadResponse__NetworkDomainPermission = Schema.Literals([
+  "allow",
+  "deny",
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__NetworkDomainPermission" });
 
 export type V2ConfigRequirementsReadResponse__ConfiguredHookHandler =
   | {
+      readonly additionalContextLimit?: number | null;
       readonly async: boolean;
       readonly command: string;
       readonly commandWindows?: string | null;
@@ -3725,11 +4809,35 @@ export type V2ConfigRequirementsReadResponse__ConfiguredHookHandler =
       readonly timeoutSec?: number | null;
       readonly type: "command";
     }
+  | {
+      readonly input: { readonly [x: string]: Schema.Json };
+      readonly server: string;
+      readonly statusMessage?: string | null;
+      readonly timeoutSec?: number | null;
+      readonly tool: string;
+      readonly type: "mcp_tool";
+    }
   | { readonly type: "prompt" }
   | { readonly type: "agent" };
 export const V2ConfigRequirementsReadResponse__ConfiguredHookHandler = Schema.Union(
   [
     Schema.Struct({
+      additionalContextLimit: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description:
+              "Approximate token threshold for spilling this hook's `additionalContext` to disk. `null` uses 2,500 tokens; `0` disables spilling for this hook. The threshold is evaluated against the original context; a spilled preview also includes recovery metadata.",
+            format: "uint",
+          })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
       async: Schema.Boolean,
       command: Schema.String,
       commandWindows: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -3737,13 +4845,36 @@ export const V2ConfigRequirementsReadResponse__ConfiguredHookHandler = Schema.Un
       timeoutSec: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({ format: "uint64" })
-            .check(Schema.isInt())
-            .check(Schema.isGreaterThanOrEqualTo(0)),
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
           Schema.Null,
         ]),
       ),
       type: Schema.Literal("command").annotate({ title: "CommandConfiguredHookHandlerType" }),
     }).annotate({ title: "CommandConfiguredHookHandler" }),
+    Schema.Struct({
+      input: Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
+      server: Schema.String,
+      statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      timeoutSec: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "uint64" })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      tool: Schema.String,
+      type: Schema.Literal("mcp_tool").annotate({ title: "McpToolConfiguredHookHandlerType" }),
+    }).annotate({ title: "McpToolConfiguredHookHandler" }),
     Schema.Struct({
       type: Schema.Literal("prompt").annotate({ title: "PromptConfiguredHookHandlerType" }),
     }).annotate({ title: "PromptConfiguredHookHandler" }),
@@ -3752,58 +4883,19 @@ export const V2ConfigRequirementsReadResponse__ConfiguredHookHandler = Schema.Un
     }).annotate({ title: "AgentConfiguredHookHandler" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ConfigRequirementsReadResponse__NetworkDomainPermission = "allow" | "deny";
-export const V2ConfigRequirementsReadResponse__NetworkDomainPermission = Schema.Literals([
-  "allow",
-  "deny",
-]);
+).annotate({ identifier: "V2ConfigRequirementsReadResponse__ConfiguredHookHandler" });
 
 export type V2ConfigRequirementsReadResponse__NetworkUnixSocketPermission = "allow" | "deny";
 export const V2ConfigRequirementsReadResponse__NetworkUnixSocketPermission = Schema.Literals([
   "allow",
   "deny",
-]);
-
-export type V2ConfigRequirementsReadResponse__ReasoningEffort = string;
-export const V2ConfigRequirementsReadResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
-
-export type V2ConfigRequirementsReadResponse__ResidencyRequirement = "us";
-export const V2ConfigRequirementsReadResponse__ResidencyRequirement = Schema.Literal("us");
-
-export type V2ConfigRequirementsReadResponse__SandboxMode =
-  | "read-only"
-  | "workspace-write"
-  | "danger-full-access";
-export const V2ConfigRequirementsReadResponse__SandboxMode = Schema.Literals([
-  "read-only",
-  "workspace-write",
-  "danger-full-access",
-]);
-
-export type V2ConfigRequirementsReadResponse__WebSearchMode =
-  | "disabled"
-  | "cached"
-  | "indexed"
-  | "live";
-export const V2ConfigRequirementsReadResponse__WebSearchMode = Schema.Literals([
-  "disabled",
-  "cached",
-  "indexed",
-  "live",
-]);
-
-export type V2ConfigRequirementsReadResponse__WindowsSandboxSetupMode = "elevated" | "unelevated";
-export const V2ConfigRequirementsReadResponse__WindowsSandboxSetupMode = Schema.Literals([
-  "elevated",
-  "unelevated",
-]);
+]).annotate({ identifier: "V2ConfigRequirementsReadResponse__NetworkUnixSocketPermission" });
 
 export type V2ConfigValueWriteParams__MergeStrategy = "replace" | "upsert";
-export const V2ConfigValueWriteParams__MergeStrategy = Schema.Literals(["replace", "upsert"]);
+export const V2ConfigValueWriteParams__MergeStrategy = Schema.Literals([
+  "replace",
+  "upsert",
+]).annotate({ identifier: "V2ConfigValueWriteParams__MergeStrategy" });
 
 export type V2ConfigWarningNotification__TextPosition = {
   readonly column: number;
@@ -3814,21 +4906,28 @@ export const V2ConfigWarningNotification__TextPosition = Schema.Struct({
     description: "1-based column number (in Unicode scalar values).",
     format: "uint",
   })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   line: Schema.Number.annotate({ description: "1-based line number.", format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ConfigWarningNotification__TextPosition" });
 
 export type V2ConfigWriteResponse__AbsolutePathBuf = string;
 export const V2ConfigWriteResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ConfigWriteResponse__AbsolutePathBuf",
 });
 
 export type V2ConfigWriteResponse__WriteStatus = "ok" | "okOverridden";
-export const V2ConfigWriteResponse__WriteStatus = Schema.Literals(["ok", "okOverridden"]);
+export const V2ConfigWriteResponse__WriteStatus = Schema.Literals(["ok", "okOverridden"]).annotate({
+  identifier: "V2ConfigWriteResponse__WriteStatus",
+});
 
 export type V2ConsumeAccountRateLimitResetCreditResponse__ConsumeAccountRateLimitResetCreditOutcome =
   | "reset"
@@ -3836,101 +4935,85 @@ export type V2ConsumeAccountRateLimitResetCreditResponse__ConsumeAccountRateLimi
   | "noCredit"
   | "alreadyRedeemed";
 export const V2ConsumeAccountRateLimitResetCreditResponse__ConsumeAccountRateLimitResetCreditOutcome =
-  Schema.Literals(["reset", "nothingToReset", "noCredit", "alreadyRedeemed"]);
-
-export type V2ErrorNotification__NonSteerableTurnKind = "review" | "compact";
-export const V2ErrorNotification__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
-
-export type V2ExperimentalFeatureListResponse__ExperimentalFeature = {
-  readonly announcement?: string | null;
-  readonly defaultEnabled: boolean;
-  readonly description?: string | null;
-  readonly displayName?: string | null;
-  readonly enabled: boolean;
-  readonly name: string;
-  readonly stage: "beta" | "underDevelopment" | "stable" | "deprecated" | "removed";
-};
-export const V2ExperimentalFeatureListResponse__ExperimentalFeature = Schema.Struct({
-  announcement: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Announcement copy shown to users when the feature is introduced. Null when this feature is not in beta.",
+  Schema.Union(
+    [
+      Schema.Literal("reset").annotate({
+        description: "A reset credit was consumed and the eligible rate-limit windows were reset.",
       }),
-      Schema.Null,
-    ]),
-  ),
-  defaultEnabled: Schema.Boolean.annotate({
-    description: "Whether this feature is enabled by default.",
-  }),
-  description: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Short summary describing what the feature does. Null when this feature is not in beta.",
+      Schema.Literal("nothingToReset").annotate({
+        description: "No current rate-limit window is eligible for a reset.",
       }),
-      Schema.Null,
-    ]),
-  ),
-  displayName: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "User-facing display name shown in the experimental features UI. Null when this feature is not in beta.",
+      Schema.Literal("noCredit").annotate({
+        description: "The account has no earned reset credits available.",
       }),
-      Schema.Null,
-    ]),
-  ),
-  enabled: Schema.Boolean.annotate({
-    description: "Whether this feature is currently enabled in the loaded config.",
-  }),
-  name: Schema.String.annotate({
-    description: "Stable key used in config.toml and CLI flag toggles.",
-  }),
-  stage: Schema.Literals(["beta", "underDevelopment", "stable", "deprecated", "removed"]).annotate({
-    description: "Lifecycle stage of this feature flag.",
-  }),
-});
+      Schema.Literal("alreadyRedeemed").annotate({
+        description: "The same idempotency key already completed a reset successfully.",
+      }),
+    ],
+    { mode: "oneOf" },
+  ).annotate({
+    identifier:
+      "V2ConsumeAccountRateLimitResetCreditResponse__ConsumeAccountRateLimitResetCreditOutcome",
+  });
+
+export type V2ErrorNotification__NonSteerableTurnKind = "review" | "compact";
+export const V2ErrorNotification__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ErrorNotification__NonSteerableTurnKind" });
+
+export type V2ErrorNotification__MisalignmentSteer = { readonly message: string };
+export const V2ErrorNotification__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ErrorNotification__MisalignmentSteer" });
+
+export type V2ExperimentalFeatureListResponse__ExperimentalFeatureStage =
+  | "beta"
+  | "underDevelopment"
+  | "stable"
+  | "deprecated"
+  | "removed";
+export const V2ExperimentalFeatureListResponse__ExperimentalFeatureStage = Schema.Union(
+  [
+    Schema.Literal("beta").annotate({
+      description: "Feature is available for user testing and feedback.",
+    }),
+    Schema.Literal("underDevelopment").annotate({
+      description: "Feature is still being built and not ready for broad use.",
+    }),
+    Schema.Literal("stable").annotate({ description: "Feature is production-ready." }),
+    Schema.Literal("deprecated").annotate({
+      description: "Feature is deprecated and should be avoided.",
+    }),
+    Schema.Literal("removed").annotate({
+      description: "Feature flag is retained only for backwards compatibility.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ExperimentalFeatureListResponse__ExperimentalFeatureStage" });
+
+export type V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorSource =
+  | "remoteMcpServersConfig"
+  | "sessionToolUse";
+export const V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorSource =
+  Schema.Literals(["remoteMcpServersConfig", "sessionToolUse"]).annotate({
+    identifier: "V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorSource",
+  });
 
 export type V2ExternalAgentConfigDetectResponse__CommandMigration = { readonly name: string };
 export const V2ExternalAgentConfigDetectResponse__CommandMigration = Schema.Struct({
   name: Schema.String,
-});
-
-export type V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType =
-  | "AGENTS_MD"
-  | "CONFIG"
-  | "SKILLS"
-  | "PLUGINS"
-  | "MCP_SERVER_CONFIG"
-  | "SUBAGENTS"
-  | "HOOKS"
-  | "COMMANDS"
-  | "MEMORY"
-  | "SESSIONS";
-export const V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType =
-  Schema.Literals([
-    "AGENTS_MD",
-    "CONFIG",
-    "SKILLS",
-    "PLUGINS",
-    "MCP_SERVER_CONFIG",
-    "SUBAGENTS",
-    "HOOKS",
-    "COMMANDS",
-    "MEMORY",
-    "SESSIONS",
-  ]);
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__CommandMigration" });
 
 export type V2ExternalAgentConfigDetectResponse__HookMigration = { readonly name: string };
 export const V2ExternalAgentConfigDetectResponse__HookMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__HookMigration" });
 
 export type V2ExternalAgentConfigDetectResponse__McpServerMigration = { readonly name: string };
 export const V2ExternalAgentConfigDetectResponse__McpServerMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__McpServerMigration" });
 
 export type V2ExternalAgentConfigDetectResponse__PluginsMigration = {
   readonly marketplaceName: string;
@@ -3939,7 +5022,7 @@ export type V2ExternalAgentConfigDetectResponse__PluginsMigration = {
 export const V2ExternalAgentConfigDetectResponse__PluginsMigration = Schema.Struct({
   marketplaceName: Schema.String,
   pluginNames: Schema.Array(Schema.String),
-});
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__PluginsMigration" });
 
 export type V2ExternalAgentConfigDetectResponse__SessionMigration = {
   readonly cwd: string;
@@ -3950,19 +5033,19 @@ export const V2ExternalAgentConfigDetectResponse__SessionMigration = Schema.Stru
   cwd: Schema.String,
   path: Schema.String,
   title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__SessionMigration" });
 
 export type V2ExternalAgentConfigDetectResponse__SkillMigration = { readonly name: string };
 export const V2ExternalAgentConfigDetectResponse__SkillMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__SkillMigration" });
 
 export type V2ExternalAgentConfigDetectResponse__SubagentMigration = { readonly name: string };
 export const V2ExternalAgentConfigDetectResponse__SubagentMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__SubagentMigration" });
 
-export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType =
+export type V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType =
   | "AGENTS_MD"
   | "CONFIG"
   | "SKILLS"
@@ -3973,7 +5056,7 @@ export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfi
   | "COMMANDS"
   | "MEMORY"
   | "SESSIONS";
-export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType =
+export const V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType =
   Schema.Literals([
     "AGENTS_MD",
     "CONFIG",
@@ -3985,9 +5068,11 @@ export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConf
     "COMMANDS",
     "MEMORY",
     "SESSIONS",
-  ]);
+  ]).annotate({
+    identifier: "V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType",
+  });
 
-export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType =
+export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType =
   | "AGENTS_MD"
   | "CONFIG"
   | "SKILLS"
@@ -3998,7 +5083,7 @@ export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfi
   | "COMMANDS"
   | "MEMORY"
   | "SESSIONS";
-export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType =
+export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType =
   Schema.Literals([
     "AGENTS_MD",
     "CONFIG",
@@ -4010,19 +5095,48 @@ export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConf
     "COMMANDS",
     "MEMORY",
     "SESSIONS",
-  ]);
+  ]).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType",
+  });
 
 export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorSource =
   "remoteMcpServersConfig";
 export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorSource =
-  Schema.Literal("remoteMcpServersConfig");
+  Schema.Literal("remoteMcpServersConfig").annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorSource",
+  });
 
-export type V2ExternalAgentConfigImportParams__CommandMigration = { readonly name: string };
-export const V2ExternalAgentConfigImportParams__CommandMigration = Schema.Struct({
-  name: Schema.String,
-});
+export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType =
+  | "AGENTS_MD"
+  | "CONFIG"
+  | "SKILLS"
+  | "PLUGINS"
+  | "MCP_SERVER_CONFIG"
+  | "SUBAGENTS"
+  | "HOOKS"
+  | "COMMANDS"
+  | "MEMORY"
+  | "SESSIONS";
+export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType =
+  Schema.Literals([
+    "AGENTS_MD",
+    "CONFIG",
+    "SKILLS",
+    "PLUGINS",
+    "MCP_SERVER_CONFIG",
+    "SUBAGENTS",
+    "HOOKS",
+    "COMMANDS",
+    "MEMORY",
+    "SESSIONS",
+  ]).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType",
+  });
 
-export type V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType =
+export type V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType =
   | "AGENTS_MD"
   | "CONFIG"
   | "SKILLS"
@@ -4033,7 +5147,7 @@ export type V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemT
   | "COMMANDS"
   | "MEMORY"
   | "SESSIONS";
-export const V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType =
+export const V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType =
   Schema.Literals([
     "AGENTS_MD",
     "CONFIG",
@@ -4045,17 +5159,25 @@ export const V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItem
     "COMMANDS",
     "MEMORY",
     "SESSIONS",
-  ]);
+  ]).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType",
+  });
+
+export type V2ExternalAgentConfigImportParams__CommandMigration = { readonly name: string };
+export const V2ExternalAgentConfigImportParams__CommandMigration = Schema.Struct({
+  name: Schema.String,
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__CommandMigration" });
 
 export type V2ExternalAgentConfigImportParams__HookMigration = { readonly name: string };
 export const V2ExternalAgentConfigImportParams__HookMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__HookMigration" });
 
 export type V2ExternalAgentConfigImportParams__McpServerMigration = { readonly name: string };
 export const V2ExternalAgentConfigImportParams__McpServerMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__McpServerMigration" });
 
 export type V2ExternalAgentConfigImportParams__PluginsMigration = {
   readonly marketplaceName: string;
@@ -4064,7 +5186,7 @@ export type V2ExternalAgentConfigImportParams__PluginsMigration = {
 export const V2ExternalAgentConfigImportParams__PluginsMigration = Schema.Struct({
   marketplaceName: Schema.String,
   pluginNames: Schema.Array(Schema.String),
-});
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__PluginsMigration" });
 
 export type V2ExternalAgentConfigImportParams__SessionMigration = {
   readonly cwd: string;
@@ -4075,17 +5197,44 @@ export const V2ExternalAgentConfigImportParams__SessionMigration = Schema.Struct
   cwd: Schema.String,
   path: Schema.String,
   title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__SessionMigration" });
 
 export type V2ExternalAgentConfigImportParams__SkillMigration = { readonly name: string };
 export const V2ExternalAgentConfigImportParams__SkillMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__SkillMigration" });
 
 export type V2ExternalAgentConfigImportParams__SubagentMigration = { readonly name: string };
 export const V2ExternalAgentConfigImportParams__SubagentMigration = Schema.Struct({
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__SubagentMigration" });
+
+export type V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType =
+  | "AGENTS_MD"
+  | "CONFIG"
+  | "SKILLS"
+  | "PLUGINS"
+  | "MCP_SERVER_CONFIG"
+  | "SUBAGENTS"
+  | "HOOKS"
+  | "COMMANDS"
+  | "MEMORY"
+  | "SESSIONS";
+export const V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType =
+  Schema.Literals([
+    "AGENTS_MD",
+    "CONFIG",
+    "SKILLS",
+    "PLUGINS",
+    "MCP_SERVER_CONFIG",
+    "SUBAGENTS",
+    "HOOKS",
+    "COMMANDS",
+    "MEMORY",
+    "SESSIONS",
+  ]).annotate({
+    identifier: "V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType",
+  });
 
 export type V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType =
   | "AGENTS_MD"
@@ -4110,7 +5259,10 @@ export const V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfi
     "COMMANDS",
     "MEMORY",
     "SESSIONS",
-  ]);
+  ]).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType",
+  });
 
 export type V2FileChangePatchUpdatedNotification__PatchChangeKind =
   | { readonly type: "add" }
@@ -4130,12 +5282,41 @@ export const V2FileChangePatchUpdatedNotification__PatchChangeKind = Schema.Unio
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2FileChangePatchUpdatedNotification__PatchChangeKind" });
 
 export type V2FsChangedNotification__AbsolutePathBuf = string;
 export const V2FsChangedNotification__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsChangedNotification__AbsolutePathBuf",
+});
+
+export type V2FsCopyParams__AbsolutePathBuf = string;
+export const V2FsCopyParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsCopyParams__AbsolutePathBuf",
+});
+
+export type V2FsCreateDirectoryParams__AbsolutePathBuf = string;
+export const V2FsCreateDirectoryParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsCreateDirectoryParams__AbsolutePathBuf",
+});
+
+export type V2FsGetMetadataParams__AbsolutePathBuf = string;
+export const V2FsGetMetadataParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsGetMetadataParams__AbsolutePathBuf",
+});
+
+export type V2FsReadDirectoryParams__AbsolutePathBuf = string;
+export const V2FsReadDirectoryParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsReadDirectoryParams__AbsolutePathBuf",
 });
 
 export type V2FsReadDirectoryResponse__FsReadDirectoryEntry = {
@@ -4153,88 +5334,120 @@ export const V2FsReadDirectoryResponse__FsReadDirectoryEntry = Schema.Struct({
   isFile: Schema.Boolean.annotate({
     description: "Whether this entry resolves to a regular file.",
   }),
-}).annotate({ description: "A directory entry returned by `fs/readDirectory`." });
+}).annotate({
+  description: "A directory entry returned by `fs/readDirectory`.",
+  identifier: "V2FsReadDirectoryResponse__FsReadDirectoryEntry",
+});
 
-export type V2GetAccountRateLimitsResponse__CreditsSnapshot = {
-  readonly balance?: string | null;
-  readonly hasCredits: boolean;
-  readonly unlimited: boolean;
-};
-export const V2GetAccountRateLimitsResponse__CreditsSnapshot = Schema.Struct({
-  balance: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  hasCredits: Schema.Boolean,
-  unlimited: Schema.Boolean,
+export type V2FsReadFileParams__AbsolutePathBuf = string;
+export const V2FsReadFileParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsReadFileParams__AbsolutePathBuf",
 });
 
-export type V2GetAccountRateLimitsResponse__PlanType =
-  | "free"
-  | "go"
-  | "plus"
-  | "pro"
-  | "prolite"
-  | "team"
-  | "self_serve_business_prolite"
-  | "self_serve_business_usage_based"
-  | "business"
-  | "ent26"
-  | "enterprise_cbp_automation"
-  | "enterprise_cbp_usage_based"
-  | "enterprise"
-  | "edu"
-  | "edu_plus"
-  | "edu_pro"
-  | "unknown";
-export const V2GetAccountRateLimitsResponse__PlanType = Schema.Literals([
-  "free",
-  "go",
-  "plus",
-  "pro",
-  "prolite",
-  "team",
-  "self_serve_business_prolite",
-  "self_serve_business_usage_based",
-  "business",
-  "ent26",
-  "enterprise_cbp_automation",
-  "enterprise_cbp_usage_based",
-  "enterprise",
-  "edu",
-  "edu_plus",
-  "edu_pro",
-  "unknown",
-]);
+export type V2FsRemoveParams__AbsolutePathBuf = string;
+export const V2FsRemoveParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsRemoveParams__AbsolutePathBuf",
+});
 
-export type V2GetAccountRateLimitsResponse__RateLimitReachedType =
-  | "rate_limit_reached"
-  | "workspace_owner_credits_depleted"
-  | "workspace_member_credits_depleted"
-  | "workspace_owner_usage_limit_reached"
-  | "workspace_member_usage_limit_reached";
-export const V2GetAccountRateLimitsResponse__RateLimitReachedType = Schema.Literals([
-  "rate_limit_reached",
-  "workspace_owner_credits_depleted",
-  "workspace_member_credits_depleted",
-  "workspace_owner_usage_limit_reached",
-  "workspace_member_usage_limit_reached",
-]);
+export type V2FsWatchParams__AbsolutePathBuf = string;
+export const V2FsWatchParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsWatchParams__AbsolutePathBuf",
+});
 
-export type V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus =
-  | "available"
-  | "redeeming"
-  | "redeemed"
+export type V2FsWatchResponse__AbsolutePathBuf = string;
+export const V2FsWatchResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsWatchResponse__AbsolutePathBuf",
+});
+
+export type V2FsWriteFileParams__AbsolutePathBuf = string;
+export const V2FsWriteFileParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2FsWriteFileParams__AbsolutePathBuf",
+});
+
+export type V2GatewayOAuthChangedNotification__GatewayOAuthStatus =
+  | "notReady"
+  | "started"
+  | "succeeded"
+  | "failed";
+export const V2GatewayOAuthChangedNotification__GatewayOAuthStatus = Schema.Literals([
+  "notReady",
+  "started",
+  "succeeded",
+  "failed",
+]).annotate({ identifier: "V2GatewayOAuthChangedNotification__GatewayOAuthStatus" });
+
+export type V2GatewayOAuthReadResponse__GatewayOAuthStatus =
+  | "notReady"
+  | "started"
+  | "succeeded"
+  | "failed";
+export const V2GatewayOAuthReadResponse__GatewayOAuthStatus = Schema.Literals([
+  "notReady",
+  "started",
+  "succeeded",
+  "failed",
+]).annotate({ identifier: "V2GatewayOAuthReadResponse__GatewayOAuthStatus" });
+
+export type V2GetAccountRateLimitsResponse__RateLimitResetType = "codexRateLimits" | "unknown";
+export const V2GetAccountRateLimitsResponse__RateLimitResetType = Schema.Literals([
+  "codexRateLimits",
+  "unknown",
+]).annotate({ identifier: "V2GetAccountRateLimitsResponse__RateLimitResetType" });
+
+export type V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus =
+  | "available"
+  | "redeeming"
+  | "redeemed"
   | "unknown";
 export const V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus = Schema.Literals([
   "available",
   "redeeming",
   "redeemed",
   "unknown",
-]);
+]).annotate({ identifier: "V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus" });
 
-export type V2GetAccountRateLimitsResponse__RateLimitResetType = "codexRateLimits" | "unknown";
-export const V2GetAccountRateLimitsResponse__RateLimitResetType = Schema.Literals([
-  "codexRateLimits",
-  "unknown",
-]);
+export type V2GetAccountRateLimitsResponse__CreditsSnapshot = {
+  readonly balance?: string | null;
+  readonly hasCredits: boolean;
+  readonly unlimited: boolean;
+};
+export const V2GetAccountRateLimitsResponse__CreditsSnapshot = Schema.Struct({
+  balance: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  hasCredits: Schema.Boolean,
+  unlimited: Schema.Boolean,
+}).annotate({ identifier: "V2GetAccountRateLimitsResponse__CreditsSnapshot" });
+
+export type V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot = {
+  readonly limit: string;
+  readonly remainingPercent: number;
+  readonly resetsAt: number;
+  readonly used: string;
+};
+export const V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot = Schema.Struct({
+  limit: Schema.String,
+  remainingPercent: Schema.Number.annotate({ format: "int32" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  resetsAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  used: Schema.String,
+}).annotate({ identifier: "V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot" });
+
+export type V2GetAccountRateLimitsResponse__PlanType = string;
+export const V2GetAccountRateLimitsResponse__PlanType = Schema.String.annotate({
+  identifier: "V2GetAccountRateLimitsResponse__PlanType",
+});
 
 export type V2GetAccountRateLimitsResponse__RateLimitWindow = {
   readonly resetsAt?: number | null;
@@ -4243,64 +5456,54 @@ export type V2GetAccountRateLimitsResponse__RateLimitWindow = {
 };
 export const V2GetAccountRateLimitsResponse__RateLimitWindow = Schema.Struct({
   resetsAt: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  usedPercent: Schema.Number.annotate({ format: "int32" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
   ),
-  usedPercent: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
   windowDurationMins: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
-});
+}).annotate({ identifier: "V2GetAccountRateLimitsResponse__RateLimitWindow" });
 
-export type V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot = {
-  readonly limit: string;
-  readonly remainingPercent: number;
-  readonly resetsAt: number;
-  readonly used: string;
-};
-export const V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot = Schema.Struct({
-  limit: Schema.String,
-  remainingPercent: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-  resetsAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  used: Schema.String,
+export type V2GetAccountRateLimitsResponse__RateLimitReachedType =
+  | "rate_limit_reached"
+  | "workspace_owner_credits_depleted"
+  | "workspace_member_credits_depleted"
+  | "workspace_owner_usage_limit_reached"
+  | "workspace_member_usage_limit_reached";
+export const V2GetAccountRateLimitsResponse__RateLimitReachedType = Schema.Literals([
+  "rate_limit_reached",
+  "workspace_owner_credits_depleted",
+  "workspace_member_credits_depleted",
+  "workspace_owner_usage_limit_reached",
+  "workspace_member_usage_limit_reached",
+]).annotate({ identifier: "V2GetAccountRateLimitsResponse__RateLimitReachedType" });
+
+export type V2GetAccountResponse__PlanType = string;
+export const V2GetAccountResponse__PlanType = Schema.String.annotate({
+  identifier: "V2GetAccountResponse__PlanType",
 });
 
-export type V2GetAccountResponse__PlanType =
-  | "free"
-  | "go"
-  | "plus"
-  | "pro"
-  | "prolite"
-  | "team"
-  | "self_serve_business_prolite"
-  | "self_serve_business_usage_based"
-  | "business"
-  | "ent26"
-  | "enterprise_cbp_automation"
-  | "enterprise_cbp_usage_based"
-  | "enterprise"
-  | "edu"
-  | "edu_plus"
-  | "edu_pro"
-  | "unknown";
-export const V2GetAccountResponse__PlanType = Schema.Literals([
-  "free",
-  "go",
-  "plus",
-  "pro",
-  "prolite",
-  "team",
-  "self_serve_business_prolite",
-  "self_serve_business_usage_based",
-  "business",
-  "ent26",
-  "enterprise_cbp_automation",
-  "enterprise_cbp_usage_based",
-  "enterprise",
-  "edu",
-  "edu_plus",
-  "edu_pro",
-  "unknown",
-]);
+export type V2GetAccountResponse__AccountRoutingOverride = "NO_CONSTRAINT" | "us" | "us_cr";
+export const V2GetAccountResponse__AccountRoutingOverride = Schema.Literals([
+  "NO_CONSTRAINT",
+  "us",
+  "us_cr",
+]).annotate({
+  description: "Backend routing policy. Wire values match the accounts/check contract.",
+  identifier: "V2GetAccountResponse__AccountRoutingOverride",
+});
 
 export type V2GetAccountTokenUsageResponse__AccountTokenUsageDailyBucket = {
   readonly startDate: string;
@@ -4308,8 +5511,10 @@ export type V2GetAccountTokenUsageResponse__AccountTokenUsageDailyBucket = {
 };
 export const V2GetAccountTokenUsageResponse__AccountTokenUsageDailyBucket = Schema.Struct({
   startDate: Schema.String,
-  tokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-});
+  tokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "V2GetAccountTokenUsageResponse__AccountTokenUsageDailyBucket" });
 
 export type V2GetAccountTokenUsageResponse__AccountTokenUsageSummary = {
   readonly currentStreakDays?: number | null;
@@ -4320,21 +5525,106 @@ export type V2GetAccountTokenUsageResponse__AccountTokenUsageSummary = {
 };
 export const V2GetAccountTokenUsageResponse__AccountTokenUsageSummary = Schema.Struct({
   currentStreakDays: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
   lifetimeTokens: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
   longestRunningTurnSec: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
   longestStreakDays: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
   peakDailyTokens: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
-});
+}).annotate({ identifier: "V2GetAccountTokenUsageResponse__AccountTokenUsageSummary" });
+
+export type V2GetAccountTokenUsageResponse__ThreadUsageBreakdownGroup = {
+  readonly cachedInputTokens?: number | null;
+  readonly estimatedUsageCreditsMicros: number;
+  readonly inputTokens?: number | null;
+  readonly model?: string | null;
+  readonly netNewInputTokens?: number | null;
+  readonly outputTokens?: number | null;
+  readonly reasoningEffort?: string | null;
+  readonly speed?: string | null;
+  readonly totalTokens?: number | null;
+};
+export const V2GetAccountTokenUsageResponse__ThreadUsageBreakdownGroup = Schema.Struct({
+  cachedInputTokens: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  estimatedUsageCreditsMicros: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  inputTokens: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  model: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  netNewInputTokens: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  outputTokens: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  reasoningEffort: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  speed: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  totalTokens: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2GetAccountTokenUsageResponse__ThreadUsageBreakdownGroup" });
 
 export type V2GetWorkspaceMessagesResponse__WorkspaceMessageType =
   | "headline"
@@ -4344,13 +5634,21 @@ export const V2GetWorkspaceMessagesResponse__WorkspaceMessageType = Schema.Liter
   "headline",
   "announcement",
   "unknown",
-]);
+]).annotate({ identifier: "V2GetWorkspaceMessagesResponse__WorkspaceMessageType" });
 
-export type V2HookCompletedNotification__AbsolutePathBuf = string;
-export const V2HookCompletedNotification__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+export type V2HookCompletedNotification__HookOutputEntryKind =
+  | "warning"
+  | "stop"
+  | "feedback"
+  | "context"
+  | "error";
+export const V2HookCompletedNotification__HookOutputEntryKind = Schema.Literals([
+  "warning",
+  "stop",
+  "feedback",
+  "context",
+  "error",
+]).annotate({ identifier: "V2HookCompletedNotification__HookOutputEntryKind" });
 
 export type V2HookCompletedNotification__HookEventName =
   | "preToolUse"
@@ -4363,7 +5661,8 @@ export type V2HookCompletedNotification__HookEventName =
   | "userPromptSubmit"
   | "subagentStart"
   | "subagentStop"
-  | "stop";
+  | "stop"
+  | "interrupt";
 export const V2HookCompletedNotification__HookEventName = Schema.Literals([
   "preToolUse",
   "permissionRequest",
@@ -4376,31 +5675,64 @@ export const V2HookCompletedNotification__HookEventName = Schema.Literals([
   "subagentStart",
   "subagentStop",
   "stop",
-]);
+  "interrupt",
+]).annotate({ identifier: "V2HookCompletedNotification__HookEventName" });
 
 export type V2HookCompletedNotification__HookExecutionMode = "sync" | "async";
-export const V2HookCompletedNotification__HookExecutionMode = Schema.Literals(["sync", "async"]);
-
-export type V2HookCompletedNotification__HookHandlerType = "command" | "prompt" | "agent";
+export const V2HookCompletedNotification__HookExecutionMode = Schema.Literals([
+  "sync",
+  "async",
+]).annotate({ identifier: "V2HookCompletedNotification__HookExecutionMode" });
+
+export type V2HookCompletedNotification__HookHandlerType =
+  | "command"
+  | "mcpTool"
+  | "prompt"
+  | "agent";
 export const V2HookCompletedNotification__HookHandlerType = Schema.Literals([
   "command",
+  "mcpTool",
   "prompt",
   "agent",
-]);
+]).annotate({ identifier: "V2HookCompletedNotification__HookHandlerType" });
 
-export type V2HookCompletedNotification__HookOutputEntryKind =
-  | "warning"
-  | "stop"
-  | "feedback"
-  | "context"
-  | "error";
-export const V2HookCompletedNotification__HookOutputEntryKind = Schema.Literals([
-  "warning",
-  "stop",
-  "feedback",
-  "context",
-  "error",
-]);
+export type V2HookCompletedNotification__HookScope = "thread" | "turn";
+export const V2HookCompletedNotification__HookScope = Schema.Literals(["thread", "turn"]).annotate({
+  identifier: "V2HookCompletedNotification__HookScope",
+});
+
+export type V2HookCompletedNotification__HookSource =
+  | "system"
+  | "user"
+  | "project"
+  | "mdm"
+  | "sessionFlags"
+  | "plugin"
+  | "cloudRequirements"
+  | "cloudManagedConfig"
+  | "legacyManagedConfigFile"
+  | "legacyManagedConfigMdm"
+  | "unknown";
+export const V2HookCompletedNotification__HookSource = Schema.Literals([
+  "system",
+  "user",
+  "project",
+  "mdm",
+  "sessionFlags",
+  "plugin",
+  "cloudRequirements",
+  "cloudManagedConfig",
+  "legacyManagedConfigFile",
+  "legacyManagedConfigMdm",
+  "unknown",
+]).annotate({ identifier: "V2HookCompletedNotification__HookSource" });
+
+export type V2HookCompletedNotification__AbsolutePathBuf = string;
+export const V2HookCompletedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2HookCompletedNotification__AbsolutePathBuf",
+});
 
 export type V2HookCompletedNotification__HookRunStatus =
   | "running"
@@ -4414,16 +5746,7 @@ export const V2HookCompletedNotification__HookRunStatus = Schema.Literals([
   "failed",
   "blocked",
   "stopped",
-]);
-
-export type V2HookCompletedNotification__HookScope = "thread" | "turn";
-export const V2HookCompletedNotification__HookScope = Schema.Literals(["thread", "turn"]);
-
-export type V2HooksListResponse__AbsolutePathBuf = string;
-export const V2HooksListResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+]).annotate({ identifier: "V2HookCompletedNotification__HookRunStatus" });
 
 export type V2HooksListResponse__HookErrorInfo = {
   readonly message: string;
@@ -4432,7 +5755,7 @@ export type V2HooksListResponse__HookErrorInfo = {
 export const V2HooksListResponse__HookErrorInfo = Schema.Struct({
   message: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2HooksListResponse__HookErrorInfo" });
 
 export type V2HooksListResponse__HookEventName =
   | "preToolUse"
@@ -4445,7 +5768,8 @@ export type V2HooksListResponse__HookEventName =
   | "userPromptSubmit"
   | "subagentStart"
   | "subagentStop"
-  | "stop";
+  | "stop"
+  | "interrupt";
 export const V2HooksListResponse__HookEventName = Schema.Literals([
   "preToolUse",
   "permissionRequest",
@@ -4458,10 +5782,8 @@ export const V2HooksListResponse__HookEventName = Schema.Literals([
   "subagentStart",
   "subagentStop",
   "stop",
-]);
-
-export type V2HooksListResponse__HookHandlerType = "command" | "prompt" | "agent";
-export const V2HooksListResponse__HookHandlerType = Schema.Literals(["command", "prompt", "agent"]);
+  "interrupt",
+]).annotate({ identifier: "V2HooksListResponse__HookEventName" });
 
 export type V2HooksListResponse__HookSource =
   | "system"
@@ -4487,7 +5809,14 @@ export const V2HooksListResponse__HookSource = Schema.Literals([
   "legacyManagedConfigFile",
   "legacyManagedConfigMdm",
   "unknown",
-]);
+]).annotate({ identifier: "V2HooksListResponse__HookSource" });
+
+export type V2HooksListResponse__AbsolutePathBuf = string;
+export const V2HooksListResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2HooksListResponse__AbsolutePathBuf",
+});
 
 export type V2HooksListResponse__HookTrustStatus = "managed" | "untrusted" | "trusted" | "modified";
 export const V2HooksListResponse__HookTrustStatus = Schema.Literals([
@@ -4495,13 +5824,21 @@ export const V2HooksListResponse__HookTrustStatus = Schema.Literals([
   "untrusted",
   "trusted",
   "modified",
-]);
+]).annotate({ identifier: "V2HooksListResponse__HookTrustStatus" });
 
-export type V2HookStartedNotification__AbsolutePathBuf = string;
-export const V2HookStartedNotification__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+export type V2HookStartedNotification__HookOutputEntryKind =
+  | "warning"
+  | "stop"
+  | "feedback"
+  | "context"
+  | "error";
+export const V2HookStartedNotification__HookOutputEntryKind = Schema.Literals([
+  "warning",
+  "stop",
+  "feedback",
+  "context",
+  "error",
+]).annotate({ identifier: "V2HookStartedNotification__HookOutputEntryKind" });
 
 export type V2HookStartedNotification__HookEventName =
   | "preToolUse"
@@ -4514,7 +5851,8 @@ export type V2HookStartedNotification__HookEventName =
   | "userPromptSubmit"
   | "subagentStart"
   | "subagentStop"
-  | "stop";
+  | "stop"
+  | "interrupt";
 export const V2HookStartedNotification__HookEventName = Schema.Literals([
   "preToolUse",
   "permissionRequest",
@@ -4527,31 +5865,60 @@ export const V2HookStartedNotification__HookEventName = Schema.Literals([
   "subagentStart",
   "subagentStop",
   "stop",
-]);
+  "interrupt",
+]).annotate({ identifier: "V2HookStartedNotification__HookEventName" });
 
 export type V2HookStartedNotification__HookExecutionMode = "sync" | "async";
-export const V2HookStartedNotification__HookExecutionMode = Schema.Literals(["sync", "async"]);
+export const V2HookStartedNotification__HookExecutionMode = Schema.Literals([
+  "sync",
+  "async",
+]).annotate({ identifier: "V2HookStartedNotification__HookExecutionMode" });
 
-export type V2HookStartedNotification__HookHandlerType = "command" | "prompt" | "agent";
+export type V2HookStartedNotification__HookHandlerType = "command" | "mcpTool" | "prompt" | "agent";
 export const V2HookStartedNotification__HookHandlerType = Schema.Literals([
   "command",
+  "mcpTool",
   "prompt",
   "agent",
-]);
+]).annotate({ identifier: "V2HookStartedNotification__HookHandlerType" });
 
-export type V2HookStartedNotification__HookOutputEntryKind =
-  | "warning"
-  | "stop"
-  | "feedback"
-  | "context"
-  | "error";
-export const V2HookStartedNotification__HookOutputEntryKind = Schema.Literals([
-  "warning",
-  "stop",
-  "feedback",
-  "context",
-  "error",
-]);
+export type V2HookStartedNotification__HookScope = "thread" | "turn";
+export const V2HookStartedNotification__HookScope = Schema.Literals(["thread", "turn"]).annotate({
+  identifier: "V2HookStartedNotification__HookScope",
+});
+
+export type V2HookStartedNotification__HookSource =
+  | "system"
+  | "user"
+  | "project"
+  | "mdm"
+  | "sessionFlags"
+  | "plugin"
+  | "cloudRequirements"
+  | "cloudManagedConfig"
+  | "legacyManagedConfigFile"
+  | "legacyManagedConfigMdm"
+  | "unknown";
+export const V2HookStartedNotification__HookSource = Schema.Literals([
+  "system",
+  "user",
+  "project",
+  "mdm",
+  "sessionFlags",
+  "plugin",
+  "cloudRequirements",
+  "cloudManagedConfig",
+  "legacyManagedConfigFile",
+  "legacyManagedConfigMdm",
+  "unknown",
+]).annotate({ identifier: "V2HookStartedNotification__HookSource" });
+
+export type V2HookStartedNotification__AbsolutePathBuf = string;
+export const V2HookStartedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2HookStartedNotification__AbsolutePathBuf",
+});
 
 export type V2HookStartedNotification__HookRunStatus =
   | "running"
@@ -4565,34 +5932,111 @@ export const V2HookStartedNotification__HookRunStatus = Schema.Literals([
   "failed",
   "blocked",
   "stopped",
-]);
+]).annotate({ identifier: "V2HookStartedNotification__HookRunStatus" });
 
-export type V2HookStartedNotification__HookScope = "thread" | "turn";
-export const V2HookStartedNotification__HookScope = Schema.Literals(["thread", "turn"]);
+export type V2ItemCompletedNotification__ByteRange = {
+  readonly end: number;
+  readonly start: number;
+};
+export const V2ItemCompletedNotification__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ItemCompletedNotification__ByteRange" });
 
-export type V2ItemCompletedNotification__AbsolutePathBuf = string;
-export const V2ItemCompletedNotification__AbsolutePathBuf = Schema.String.annotate({
+export type V2ItemCompletedNotification__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ItemCompletedNotification__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ItemCompletedNotification__ImageDetail" });
+
+export type V2ItemCompletedNotification__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
+};
+export const V2ItemCompletedNotification__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ItemCompletedNotification__HookPromptFragment" });
+
+export type V2ItemCompletedNotification__AgentMessageDelivery = "async";
+export const V2ItemCompletedNotification__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ItemCompletedNotification__AgentMessageDelivery",
+});
+
+export type V2ItemCompletedNotification__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
+};
+export const V2ItemCompletedNotification__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2ItemCompletedNotification__MemoryCitationEntry" });
+
+export type V2ItemCompletedNotification__MessagePhase = "commentary" | "final_answer";
+export const V2ItemCompletedNotification__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ItemCompletedNotification__MessagePhase",
 });
 
-export type V2ItemCompletedNotification__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ItemCompletedNotification__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ItemCompletedNotification__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ItemCompletedNotification__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ItemCompletedNotification__AsyncUserInputQuestion" });
+
+export type V2ItemCompletedNotification__LegacyAppPathString = string;
+export const V2ItemCompletedNotification__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ItemCompletedNotification__LegacyAppPathString",
+});
+
+export type V2ItemCompletedNotification__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ItemCompletedNotification__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ItemCompletedNotification__CommandExecutionSource" });
 
 export type V2ItemCompletedNotification__CommandExecutionStatus =
   | "inProgress"
@@ -4604,65 +6048,39 @@ export const V2ItemCompletedNotification__CommandExecutionStatus = Schema.Litera
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ItemCompletedNotification__CommandExecutionStatus" });
 
-export type V2ItemCompletedNotification__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ItemCompletedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+export type V2ItemCompletedNotification__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2ItemCompletedNotification__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
     Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
     Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ItemCompletedNotification__PatchChangeKind" });
 
-export type V2ItemCompletedNotification__DynamicToolCallStatus =
+export type V2ItemCompletedNotification__PatchApplyStatus =
   | "inProgress"
   | "completed"
-  | "failed";
-export const V2ItemCompletedNotification__DynamicToolCallStatus = Schema.Literals([
+  | "failed"
+  | "declined";
+export const V2ItemCompletedNotification__PatchApplyStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2ItemCompletedNotification__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2ItemCompletedNotification__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
-
-export type V2ItemCompletedNotification__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ItemCompletedNotification__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
-
-export type V2ItemCompletedNotification__LegacyAppPathString = string;
-export const V2ItemCompletedNotification__LegacyAppPathString = Schema.String;
+  "declined",
+]).annotate({ identifier: "V2ItemCompletedNotification__PatchApplyStatus" });
 
 export type V2ItemCompletedNotification__McpToolCallAppContext = {
   readonly actionName?: string | null;
@@ -4677,93 +6095,136 @@ export const V2ItemCompletedNotification__McpToolCallAppContext = Schema.Struct(
   connectorId: Schema.String,
   linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ItemCompletedNotification__McpToolCallAppContext" });
 
 export type V2ItemCompletedNotification__McpToolCallError = { readonly message: string };
 export const V2ItemCompletedNotification__McpToolCallError = Schema.Struct({
   message: Schema.String,
-});
+}).annotate({ identifier: "V2ItemCompletedNotification__McpToolCallError" });
+
+export type V2ItemCompletedNotification__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ItemCompletedNotification__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ItemCompletedNotification__McpAppDisplayMode" });
 
 export type V2ItemCompletedNotification__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
 export const V2ItemCompletedNotification__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ItemCompletedNotification__McpToolCallResult" });
 
 export type V2ItemCompletedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
 export const V2ItemCompletedNotification__McpToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2ItemCompletedNotification__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
-};
-export const V2ItemCompletedNotification__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
-});
+]).annotate({ identifier: "V2ItemCompletedNotification__McpToolCallStatus" });
 
-export type V2ItemCompletedNotification__MessagePhase = "commentary" | "final_answer";
-export const V2ItemCompletedNotification__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
+export type V2ItemCompletedNotification__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ItemCompletedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemCompletedNotification__DynamicToolCallOutputContentItem" });
 
-export type V2ItemCompletedNotification__PatchApplyStatus =
+export type V2ItemCompletedNotification__DynamicToolCallStatus =
   | "inProgress"
   | "completed"
-  | "failed"
-  | "declined";
-export const V2ItemCompletedNotification__PatchApplyStatus = Schema.Literals([
+  | "failed";
+export const V2ItemCompletedNotification__DynamicToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
+]).annotate({ identifier: "V2ItemCompletedNotification__DynamicToolCallStatus" });
 
-export type V2ItemCompletedNotification__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ItemCompletedNotification__PatchChangeKind = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ItemCompletedNotification__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ItemCompletedNotification__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ItemCompletedNotification__CollabAgentStatus" });
 
 export type V2ItemCompletedNotification__ReasoningEffort = string;
 export const V2ItemCompletedNotification__ReasoningEffort = Schema.String.annotate({
   description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ItemCompletedNotification__ReasoningEffort",
+  }),
+);
+
+export type V2ItemCompletedNotification__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ItemCompletedNotification__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ItemCompletedNotification__CollabAgentToolCallStatus" });
+
+export type V2ItemCompletedNotification__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ItemCompletedNotification__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ItemCompletedNotification__CollabAgentTool" });
 
 export type V2ItemCompletedNotification__SubAgentActivityKind =
   | "started"
@@ -4775,32 +6236,7 @@ export const V2ItemCompletedNotification__SubAgentActivityKind = Schema.Literals
   "interacted",
   "interrupted",
   "completed",
-]);
-
-export type V2ItemCompletedNotification__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2ItemCompletedNotification__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+]).annotate({ identifier: "V2ItemCompletedNotification__SubAgentActivityKind" });
 
 export type V2ItemCompletedNotification__WebSearchAction =
   | {
@@ -4832,33 +6268,109 @@ export const V2ItemCompletedNotification__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ItemCompletedNotification__WebSearchAction" });
+
+export type V2ItemCompletedNotification__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ItemCompletedNotification__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemCompletedNotification__ImageGenerationFailure" });
+
+export type V2ItemCompletedNotification__AbsolutePathBuf = string;
+export const V2ItemCompletedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ItemCompletedNotification__AbsolutePathBuf",
+});
+
+export type V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString = string;
+export const V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString =
+  Schema.String.annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString",
+  });
+
+export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianCommandSource =
+  | "shell"
+  | "unifiedExec";
+export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianCommandSource =
+  Schema.Literals(["shell", "unifiedExec"]).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__GuardianCommandSource",
+  });
 
 export type V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf = string;
 export const V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf =
   Schema.String.annotate({
     description:
       "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf",
+  });
+
+export type V2ItemGuardianApprovalReviewCompletedNotification__NetworkApprovalProtocol =
+  | "http"
+  | "https"
+  | "socks5Tcp"
+  | "socks5Udp";
+export const V2ItemGuardianApprovalReviewCompletedNotification__NetworkApprovalProtocol =
+  Schema.Literals(["http", "https", "socks5Tcp", "socks5Udp"]).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__NetworkApprovalProtocol",
+  });
+
+export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode =
+  | "read"
+  | "write"
+  | "deny";
+export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode =
+  Schema.Literals(["read", "write", "deny"]).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode",
   });
 
 export type V2ItemGuardianApprovalReviewCompletedNotification__AdditionalNetworkPermissions = {
   readonly enabled?: boolean | null;
 };
 export const V2ItemGuardianApprovalReviewCompletedNotification__AdditionalNetworkPermissions =
-  Schema.Struct({ enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])) });
+  Schema.Struct({
+    enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  }).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__AdditionalNetworkPermissions",
+  });
 
 export type V2ItemGuardianApprovalReviewCompletedNotification__AutoReviewDecisionSource = "agent";
 export const V2ItemGuardianApprovalReviewCompletedNotification__AutoReviewDecisionSource =
   Schema.Literal("agent").annotate({
     description: "[UNSTABLE] Source that produced a terminal approval auto-review decision.",
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__AutoReviewDecisionSource",
   });
 
-export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode =
-  | "read"
-  | "write"
-  | "deny";
-export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode =
-  Schema.Literals(["read", "write", "deny"]);
+export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel =
+  | "low"
+  | "medium"
+  | "high"
+  | "critical";
+export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel = Schema.Literals(
+  ["low", "medium", "high", "critical"],
+).annotate({
+  description: "[UNSTABLE] Risk level assigned by approval auto-review.",
+  identifier: "V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel",
+});
 
 export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewStatus =
   | "inProgress"
@@ -4869,23 +6381,9 @@ export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalR
 export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewStatus =
   Schema.Literals(["inProgress", "approved", "denied", "timedOut", "aborted"]).annotate({
     description: "[UNSTABLE] Lifecycle state for an approval auto-review.",
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewStatus",
   });
 
-export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianCommandSource =
-  | "shell"
-  | "unifiedExec";
-export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianCommandSource =
-  Schema.Literals(["shell", "unifiedExec"]);
-
-export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel =
-  | "low"
-  | "medium"
-  | "high"
-  | "critical";
-export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel = Schema.Literals(
-  ["low", "medium", "high", "critical"],
-).annotate({ description: "[UNSTABLE] Risk level assigned by approval auto-review." });
-
 export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAuthorization =
   | "unknown"
   | "low"
@@ -4894,55 +6392,59 @@ export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAutho
 export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAuthorization =
   Schema.Literals(["unknown", "low", "medium", "high"]).annotate({
     description: "[UNSTABLE] Authorization level assigned by approval auto-review.",
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAuthorization",
   });
 
-export type V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString = string;
-export const V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString = Schema.String;
+export type V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString = string;
+export const V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString =
+  Schema.String.annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString",
+  });
 
-export type V2ItemGuardianApprovalReviewCompletedNotification__NetworkApprovalProtocol =
-  | "http"
-  | "https"
-  | "socks5Tcp"
-  | "socks5Udp";
-export const V2ItemGuardianApprovalReviewCompletedNotification__NetworkApprovalProtocol =
-  Schema.Literals(["http", "https", "socks5Tcp", "socks5Udp"]);
+export type V2ItemGuardianApprovalReviewStartedNotification__GuardianCommandSource =
+  | "shell"
+  | "unifiedExec";
+export const V2ItemGuardianApprovalReviewStartedNotification__GuardianCommandSource =
+  Schema.Literals(["shell", "unifiedExec"]).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__GuardianCommandSource",
+  });
 
 export type V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf = string;
 export const V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf =
   Schema.String.annotate({
     description:
       "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf",
   });
 
-export type V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions = {
-  readonly enabled?: boolean | null;
-};
-export const V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions =
-  Schema.Struct({ enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])) });
+export type V2ItemGuardianApprovalReviewStartedNotification__NetworkApprovalProtocol =
+  | "http"
+  | "https"
+  | "socks5Tcp"
+  | "socks5Udp";
+export const V2ItemGuardianApprovalReviewStartedNotification__NetworkApprovalProtocol =
+  Schema.Literals(["http", "https", "socks5Tcp", "socks5Udp"]).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__NetworkApprovalProtocol",
+  });
 
 export type V2ItemGuardianApprovalReviewStartedNotification__FileSystemAccessMode =
   | "read"
   | "write"
   | "deny";
 export const V2ItemGuardianApprovalReviewStartedNotification__FileSystemAccessMode =
-  Schema.Literals(["read", "write", "deny"]);
-
-export type V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus =
-  | "inProgress"
-  | "approved"
-  | "denied"
-  | "timedOut"
-  | "aborted";
-export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus =
-  Schema.Literals(["inProgress", "approved", "denied", "timedOut", "aborted"]).annotate({
-    description: "[UNSTABLE] Lifecycle state for an approval auto-review.",
+  Schema.Literals(["read", "write", "deny"]).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__FileSystemAccessMode",
   });
 
-export type V2ItemGuardianApprovalReviewStartedNotification__GuardianCommandSource =
-  | "shell"
-  | "unifiedExec";
-export const V2ItemGuardianApprovalReviewStartedNotification__GuardianCommandSource =
-  Schema.Literals(["shell", "unifiedExec"]);
+export type V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions = {
+  readonly enabled?: boolean | null;
+};
+export const V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions =
+  Schema.Struct({
+    enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  }).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions",
+  });
 
 export type V2ItemGuardianApprovalReviewStartedNotification__GuardianRiskLevel =
   | "low"
@@ -4954,7 +6456,22 @@ export const V2ItemGuardianApprovalReviewStartedNotification__GuardianRiskLevel
   "medium",
   "high",
   "critical",
-]).annotate({ description: "[UNSTABLE] Risk level assigned by approval auto-review." });
+]).annotate({
+  description: "[UNSTABLE] Risk level assigned by approval auto-review.",
+  identifier: "V2ItemGuardianApprovalReviewStartedNotification__GuardianRiskLevel",
+});
+
+export type V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus =
+  | "inProgress"
+  | "approved"
+  | "denied"
+  | "timedOut"
+  | "aborted";
+export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus =
+  Schema.Literals(["inProgress", "approved", "denied", "timedOut", "aborted"]).annotate({
+    description: "[UNSTABLE] Lifecycle state for an approval auto-review.",
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus",
+  });
 
 export type V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthorization =
   | "unknown"
@@ -4964,42 +6481,109 @@ export type V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthori
 export const V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthorization =
   Schema.Literals(["unknown", "low", "medium", "high"]).annotate({
     description: "[UNSTABLE] Authorization level assigned by approval auto-review.",
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthorization",
   });
 
-export type V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString = string;
-export const V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString = Schema.String;
+export type V2ItemStartedNotification__ByteRange = { readonly end: number; readonly start: number };
+export const V2ItemStartedNotification__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ItemStartedNotification__ByteRange" });
 
-export type V2ItemGuardianApprovalReviewStartedNotification__NetworkApprovalProtocol =
-  | "http"
-  | "https"
-  | "socks5Tcp"
-  | "socks5Udp";
-export const V2ItemGuardianApprovalReviewStartedNotification__NetworkApprovalProtocol =
-  Schema.Literals(["http", "https", "socks5Tcp", "socks5Udp"]);
+export type V2ItemStartedNotification__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ItemStartedNotification__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ItemStartedNotification__ImageDetail" });
 
-export type V2ItemStartedNotification__AbsolutePathBuf = string;
-export const V2ItemStartedNotification__AbsolutePathBuf = Schema.String.annotate({
+export type V2ItemStartedNotification__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
+};
+export const V2ItemStartedNotification__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ItemStartedNotification__HookPromptFragment" });
+
+export type V2ItemStartedNotification__AgentMessageDelivery = "async";
+export const V2ItemStartedNotification__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ItemStartedNotification__AgentMessageDelivery",
+});
+
+export type V2ItemStartedNotification__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
+};
+export const V2ItemStartedNotification__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2ItemStartedNotification__MemoryCitationEntry" });
+
+export type V2ItemStartedNotification__MessagePhase = "commentary" | "final_answer";
+export const V2ItemStartedNotification__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ItemStartedNotification__MessagePhase",
 });
 
-export type V2ItemStartedNotification__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ItemStartedNotification__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ItemStartedNotification__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ItemStartedNotification__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ItemStartedNotification__AsyncUserInputQuestion" });
+
+export type V2ItemStartedNotification__LegacyAppPathString = string;
+export const V2ItemStartedNotification__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ItemStartedNotification__LegacyAppPathString",
+});
+
+export type V2ItemStartedNotification__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ItemStartedNotification__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ItemStartedNotification__CommandExecutionSource" });
 
 export type V2ItemStartedNotification__CommandExecutionStatus =
   | "inProgress"
@@ -5011,65 +6595,39 @@ export const V2ItemStartedNotification__CommandExecutionStatus = Schema.Literals
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ItemStartedNotification__CommandExecutionStatus" });
 
-export type V2ItemStartedNotification__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ItemStartedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+export type V2ItemStartedNotification__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2ItemStartedNotification__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
     Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
     Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ItemStartedNotification__PatchChangeKind" });
 
-export type V2ItemStartedNotification__DynamicToolCallStatus =
+export type V2ItemStartedNotification__PatchApplyStatus =
   | "inProgress"
   | "completed"
-  | "failed";
-export const V2ItemStartedNotification__DynamicToolCallStatus = Schema.Literals([
+  | "failed"
+  | "declined";
+export const V2ItemStartedNotification__PatchApplyStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2ItemStartedNotification__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2ItemStartedNotification__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
-
-export type V2ItemStartedNotification__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ItemStartedNotification__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
-
-export type V2ItemStartedNotification__LegacyAppPathString = string;
-export const V2ItemStartedNotification__LegacyAppPathString = Schema.String;
+  "declined",
+]).annotate({ identifier: "V2ItemStartedNotification__PatchApplyStatus" });
 
 export type V2ItemStartedNotification__McpToolCallAppContext = {
   readonly actionName?: string | null;
@@ -5084,93 +6642,136 @@ export const V2ItemStartedNotification__McpToolCallAppContext = Schema.Struct({
   connectorId: Schema.String,
   linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ItemStartedNotification__McpToolCallAppContext" });
 
 export type V2ItemStartedNotification__McpToolCallError = { readonly message: string };
 export const V2ItemStartedNotification__McpToolCallError = Schema.Struct({
   message: Schema.String,
-});
+}).annotate({ identifier: "V2ItemStartedNotification__McpToolCallError" });
+
+export type V2ItemStartedNotification__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ItemStartedNotification__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ItemStartedNotification__McpAppDisplayMode" });
 
 export type V2ItemStartedNotification__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
 export const V2ItemStartedNotification__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ItemStartedNotification__McpToolCallResult" });
 
 export type V2ItemStartedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
 export const V2ItemStartedNotification__McpToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2ItemStartedNotification__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
-};
-export const V2ItemStartedNotification__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
-});
+]).annotate({ identifier: "V2ItemStartedNotification__McpToolCallStatus" });
 
-export type V2ItemStartedNotification__MessagePhase = "commentary" | "final_answer";
-export const V2ItemStartedNotification__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
+export type V2ItemStartedNotification__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ItemStartedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemStartedNotification__DynamicToolCallOutputContentItem" });
 
-export type V2ItemStartedNotification__PatchApplyStatus =
+export type V2ItemStartedNotification__DynamicToolCallStatus =
   | "inProgress"
   | "completed"
-  | "failed"
-  | "declined";
-export const V2ItemStartedNotification__PatchApplyStatus = Schema.Literals([
+  | "failed";
+export const V2ItemStartedNotification__DynamicToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
+]).annotate({ identifier: "V2ItemStartedNotification__DynamicToolCallStatus" });
 
-export type V2ItemStartedNotification__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ItemStartedNotification__PatchChangeKind = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ItemStartedNotification__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ItemStartedNotification__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ItemStartedNotification__CollabAgentStatus" });
 
 export type V2ItemStartedNotification__ReasoningEffort = string;
 export const V2ItemStartedNotification__ReasoningEffort = Schema.String.annotate({
   description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ItemStartedNotification__ReasoningEffort",
+  }),
+);
+
+export type V2ItemStartedNotification__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ItemStartedNotification__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ItemStartedNotification__CollabAgentToolCallStatus" });
+
+export type V2ItemStartedNotification__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ItemStartedNotification__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ItemStartedNotification__CollabAgentTool" });
 
 export type V2ItemStartedNotification__SubAgentActivityKind =
   | "started"
@@ -5182,32 +6783,7 @@ export const V2ItemStartedNotification__SubAgentActivityKind = Schema.Literals([
   "interacted",
   "interrupted",
   "completed",
-]);
-
-export type V2ItemStartedNotification__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2ItemStartedNotification__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+]).annotate({ identifier: "V2ItemStartedNotification__SubAgentActivityKind" });
 
 export type V2ItemStartedNotification__WebSearchAction =
   | {
@@ -5239,48 +6815,85 @@ export const V2ItemStartedNotification__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ItemStartedNotification__WebSearchAction" });
+
+export type V2ItemStartedNotification__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ItemStartedNotification__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemStartedNotification__ImageGenerationFailure" });
+
+export type V2ItemStartedNotification__AbsolutePathBuf = string;
+export const V2ItemStartedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ItemStartedNotification__AbsolutePathBuf",
+});
 
 export type V2ListMcpServerStatusParams__McpServerStatusDetail = "full" | "toolsAndAuthOnly";
 export const V2ListMcpServerStatusParams__McpServerStatusDetail = Schema.Literals([
   "full",
   "toolsAndAuthOnly",
-]);
+]).annotate({ identifier: "V2ListMcpServerStatusParams__McpServerStatusDetail" });
 
 export type V2ListMcpServerStatusResponse__McpAuthStatus =
+  | "unknown"
   | "unsupported"
   | "notLoggedIn"
   | "bearerToken"
   | "oAuth";
 export const V2ListMcpServerStatusResponse__McpAuthStatus = Schema.Literals([
+  "unknown",
   "unsupported",
   "notLoggedIn",
   "bearerToken",
   "oAuth",
-]);
+]).annotate({ identifier: "V2ListMcpServerStatusResponse__McpAuthStatus" });
 
-export type V2ListMcpServerStatusResponse__McpServerInfo = {
+export type V2ListMcpServerStatusResponse__ResourceTemplate = {
+  readonly annotations?: Schema.Json;
   readonly description?: string | null;
-  readonly icons?: ReadonlyArray<unknown> | null;
+  readonly mimeType?: string | null;
   readonly name: string;
   readonly title?: string | null;
-  readonly version: string;
-  readonly websiteUrl?: string | null;
+  readonly uriTemplate: string;
 };
-export const V2ListMcpServerStatusResponse__McpServerInfo = Schema.Struct({
+export const V2ListMcpServerStatusResponse__ResourceTemplate = Schema.Struct({
+  annotations: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  icons: Schema.optionalKey(Schema.Union([Schema.Array(Schema.Unknown), Schema.Null])),
+  mimeType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   name: Schema.String,
   title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  version: Schema.String,
-  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({ description: "Presentation metadata advertised by an initialized MCP server." });
+  uriTemplate: Schema.String,
+}).annotate({
+  description: "A template description for resources available on the server.",
+  identifier: "V2ListMcpServerStatusResponse__ResourceTemplate",
+});
 
 export type V2ListMcpServerStatusResponse__Resource = {
-  readonly _meta?: unknown;
-  readonly annotations?: unknown;
+  readonly _meta?: Schema.Json;
+  readonly annotations?: Schema.Json;
   readonly description?: string | null;
-  readonly icons?: ReadonlyArray<unknown> | null;
+  readonly icons?: ReadonlyArray<Schema.Json> | null;
   readonly mimeType?: string | null;
   readonly name: string;
   readonly size?: number | null;
@@ -5288,76 +6901,112 @@ export type V2ListMcpServerStatusResponse__Resource = {
   readonly uri: string;
 };
 export const V2ListMcpServerStatusResponse__Resource = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  annotations: Schema.optionalKey(Schema.Unknown),
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  annotations: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  icons: Schema.optionalKey(Schema.Union([Schema.Array(Schema.Unknown), Schema.Null])),
+  icons: Schema.optionalKey(
+    Schema.Union([Schema.Array(Schema.Json.annotate({ expected: "JSON value" })), Schema.Null]),
+  ),
   mimeType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   name: Schema.String,
   size: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
   title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   uri: Schema.String,
-}).annotate({ description: "A known resource that the server is capable of reading." });
+}).annotate({
+  description: "A known resource that the server is capable of reading.",
+  identifier: "V2ListMcpServerStatusResponse__Resource",
+});
 
-export type V2ListMcpServerStatusResponse__ResourceTemplate = {
-  readonly annotations?: unknown;
+export type V2ListMcpServerStatusResponse__McpServerConnectionStatus =
+  | "notStarted"
+  | "starting"
+  | "connected"
+  | "authenticationRequired"
+  | "failed"
+  | "cancelled"
+  | "disabled";
+export const V2ListMcpServerStatusResponse__McpServerConnectionStatus = Schema.Literals([
+  "notStarted",
+  "starting",
+  "connected",
+  "authenticationRequired",
+  "failed",
+  "cancelled",
+  "disabled",
+]).annotate({ identifier: "V2ListMcpServerStatusResponse__McpServerConnectionStatus" });
+
+export type V2ListMcpServerStatusResponse__McpServerInfo = {
   readonly description?: string | null;
-  readonly mimeType?: string | null;
+  readonly icons?: ReadonlyArray<Schema.Json> | null;
   readonly name: string;
   readonly title?: string | null;
-  readonly uriTemplate: string;
+  readonly version: string;
+  readonly websiteUrl?: string | null;
 };
-export const V2ListMcpServerStatusResponse__ResourceTemplate = Schema.Struct({
-  annotations: Schema.optionalKey(Schema.Unknown),
+export const V2ListMcpServerStatusResponse__McpServerInfo = Schema.Struct({
   description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  mimeType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icons: Schema.optionalKey(
+    Schema.Union([Schema.Array(Schema.Json.annotate({ expected: "JSON value" })), Schema.Null]),
+  ),
   name: Schema.String,
   title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  uriTemplate: Schema.String,
-}).annotate({ description: "A template description for resources available on the server." });
+  version: Schema.String,
+  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Presentation metadata advertised by an initialized MCP server.",
+  identifier: "V2ListMcpServerStatusResponse__McpServerInfo",
+});
 
 export type V2ListMcpServerStatusResponse__Tool = {
-  readonly _meta?: unknown;
-  readonly annotations?: unknown;
+  readonly _meta?: Schema.Json;
+  readonly annotations?: Schema.Json;
   readonly description?: string | null;
-  readonly icons?: ReadonlyArray<unknown> | null;
-  readonly inputSchema: unknown;
+  readonly icons?: ReadonlyArray<Schema.Json> | null;
+  readonly inputSchema: Schema.Json;
   readonly name: string;
-  readonly outputSchema?: unknown;
+  readonly outputSchema?: Schema.Json;
   readonly title?: string | null;
 };
 export const V2ListMcpServerStatusResponse__Tool = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  annotations: Schema.optionalKey(Schema.Unknown),
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  annotations: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  icons: Schema.optionalKey(Schema.Union([Schema.Array(Schema.Unknown), Schema.Null])),
-  inputSchema: Schema.Unknown,
+  icons: Schema.optionalKey(
+    Schema.Union([Schema.Array(Schema.Json.annotate({ expected: "JSON value" })), Schema.Null]),
+  ),
+  inputSchema: Schema.Json.annotate({ expected: "JSON value" }),
   name: Schema.String,
-  outputSchema: Schema.optionalKey(Schema.Unknown),
+  outputSchema: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({ description: "Definition for a tool the client can call." });
+}).annotate({
+  description: "Definition for a tool the client can call.",
+  identifier: "V2ListMcpServerStatusResponse__Tool",
+});
 
 export type V2LoginAccountParams__LoginAppBrand = "codex" | "chatgpt";
-export const V2LoginAccountParams__LoginAppBrand = Schema.Literals(["codex", "chatgpt"]);
+export const V2LoginAccountParams__LoginAppBrand = Schema.Literals(["codex", "chatgpt"]).annotate({
+  identifier: "V2LoginAccountParams__LoginAppBrand",
+});
 
 export type V2MarketplaceAddResponse__AbsolutePathBuf = string;
 export const V2MarketplaceAddResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2MarketplaceAddResponse__AbsolutePathBuf",
 });
 
 export type V2MarketplaceRemoveResponse__AbsolutePathBuf = string;
 export const V2MarketplaceRemoveResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2MarketplaceUpgradeResponse__AbsolutePathBuf = string;
-export const V2MarketplaceUpgradeResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2MarketplaceRemoveResponse__AbsolutePathBuf",
 });
 
 export type V2MarketplaceUpgradeResponse__MarketplaceUpgradeErrorInfo = {
@@ -5367,41 +7016,81 @@ export type V2MarketplaceUpgradeResponse__MarketplaceUpgradeErrorInfo = {
 export const V2MarketplaceUpgradeResponse__MarketplaceUpgradeErrorInfo = Schema.Struct({
   marketplaceName: Schema.String,
   message: Schema.String,
+}).annotate({ identifier: "V2MarketplaceUpgradeResponse__MarketplaceUpgradeErrorInfo" });
+
+export type V2MarketplaceUpgradeResponse__AbsolutePathBuf = string;
+export const V2MarketplaceUpgradeResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2MarketplaceUpgradeResponse__AbsolutePathBuf",
 });
 
+export type V2McpResourceReadParams__McpResourceReadTarget = {
+  readonly connectorId: string;
+  readonly linkId: string | null;
+};
+export const V2McpResourceReadParams__McpResourceReadTarget = Schema.Struct({
+  connectorId: Schema.String,
+  linkId: Schema.Union([
+    Schema.String.annotate({
+      description: "Null explicitly requests no-auth access, subject to the app's resource policy.",
+    }),
+    Schema.Null,
+  ]),
+}).annotate({ identifier: "V2McpResourceReadParams__McpResourceReadTarget" });
+
 export type V2McpResourceReadResponse__ResourceContent =
   | {
-      readonly _meta?: unknown;
+      readonly _meta?: Schema.Json;
       readonly mimeType?: string | null;
       readonly text: string;
       readonly uri: string;
     }
   | {
-      readonly _meta?: unknown;
+      readonly _meta?: Schema.Json;
       readonly blob: string;
       readonly mimeType?: string | null;
       readonly uri: string;
     };
 export const V2McpResourceReadResponse__ResourceContent = Schema.Union([
   Schema.Struct({
-    _meta: Schema.optionalKey(Schema.Unknown),
+    _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
     mimeType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
     text: Schema.String,
     uri: Schema.String.annotate({ description: "The URI of this resource." }),
   }),
   Schema.Struct({
-    _meta: Schema.optionalKey(Schema.Unknown),
+    _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
     blob: Schema.String,
     mimeType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
     uri: Schema.String.annotate({ description: "The URI of this resource." }),
   }),
-]).annotate({ description: "Contents returned when reading a resource from an MCP server." });
+]).annotate({
+  description: "Contents returned when reading a resource from an MCP server.",
+  identifier: "V2McpResourceReadResponse__ResourceContent",
+});
+
+export type V2McpServerEventStreamNotification__McpServerEventNotification = {
+  readonly method: string;
+  readonly params: Schema.Json;
+};
+export const V2McpServerEventStreamNotification__McpServerEventNotification = Schema.Struct({
+  method: Schema.String,
+  params: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({ identifier: "V2McpServerEventStreamNotification__McpServerEventNotification" });
+
+export type V2McpServerOauthLoginParams__McpServerOauthClientRegistration = "auto" | "cimd" | "dcr";
+export const V2McpServerOauthLoginParams__McpServerOauthClientRegistration = Schema.Literals([
+  "auto",
+  "cimd",
+  "dcr",
+]).annotate({ identifier: "V2McpServerOauthLoginParams__McpServerOauthClientRegistration" });
 
 export type V2McpServerStatusUpdatedNotification__McpServerStartupFailureReason =
   "reauthenticationRequired";
 export const V2McpServerStatusUpdatedNotification__McpServerStartupFailureReason = Schema.Literal(
   "reauthenticationRequired",
-);
+).annotate({ identifier: "V2McpServerStatusUpdatedNotification__McpServerStartupFailureReason" });
 
 export type V2McpServerStatusUpdatedNotification__McpServerStartupState =
   | "starting"
@@ -5413,17 +7102,56 @@ export const V2McpServerStatusUpdatedNotification__McpServerStartupState = Schem
   "ready",
   "failed",
   "cancelled",
-]);
+]).annotate({ identifier: "V2McpServerStatusUpdatedNotification__McpServerStartupState" });
+
+export type V2ModelListResponse__ModelAvailabilityNux = { readonly message: string };
+export const V2ModelListResponse__ModelAvailabilityNux = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ModelListResponse__ModelAvailabilityNux" });
+
+export type V2ModelListResponse__CyberAccessProgram = "standard" | "daybreakBlue" | "daybreakRed";
+export const V2ModelListResponse__CyberAccessProgram = Schema.Literals([
+  "standard",
+  "daybreakBlue",
+  "daybreakRed",
+]).annotate({
+  description:
+    "Requested cyber treatment for a ChatGPT-authenticated Codex turn. Authorization and model-tier restrictions remain server-owned.",
+  identifier: "V2ModelListResponse__CyberAccessProgram",
+});
+
+export type V2ModelListResponse__ReasoningEffort = string;
+export const V2ModelListResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ModelListResponse__ReasoningEffort",
+  }),
+);
 
 export type V2ModelListResponse__InputModality = "text" | "image" | "audio";
-export const V2ModelListResponse__InputModality = Schema.Literals([
-  "text",
-  "image",
-  "audio",
-]).annotate({ description: "Canonical user-input modality tags advertised by a model." });
+export const V2ModelListResponse__InputModality = Schema.Union(
+  [
+    Schema.Literal("text").annotate({ description: "Plain text turns and tool payloads." }),
+    Schema.Literal("image").annotate({ description: "Image attachments included in user turns." }),
+    Schema.Literal("audio").annotate({ description: "Audio attachments included in user turns." }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Canonical user-input modality tags advertised by a model.",
+  identifier: "V2ModelListResponse__InputModality",
+});
 
-export type V2ModelListResponse__ModelAvailabilityNux = { readonly message: string };
-export const V2ModelListResponse__ModelAvailabilityNux = Schema.Struct({ message: Schema.String });
+export type V2ModelListResponse__MultiAgentVersion = "disabled" | "v1" | "v2";
+export const V2ModelListResponse__MultiAgentVersion = Schema.Literals([
+  "disabled",
+  "v1",
+  "v2",
+]).annotate({
+  description: "Multi-agent runtime supported by a model.",
+  identifier: "V2ModelListResponse__MultiAgentVersion",
+});
 
 export type V2ModelListResponse__ModelServiceTier = {
   readonly description: string;
@@ -5434,33 +7162,79 @@ export const V2ModelListResponse__ModelServiceTier = Schema.Struct({
   description: Schema.String,
   id: Schema.String,
   name: Schema.String,
-});
+}).annotate({ identifier: "V2ModelListResponse__ModelServiceTier" });
 
 export type V2ModelListResponse__ModelUpgradeInfo = {
   readonly migrationMarkdown?: string | null;
   readonly model: string;
   readonly modelLink?: string | null;
+  readonly retirementAt?: number | null;
   readonly upgradeCopy?: string | null;
 };
 export const V2ModelListResponse__ModelUpgradeInfo = Schema.Struct({
   migrationMarkdown: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   model: Schema.String,
   modelLink: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  retirementAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Informational Unix timestamp for this upgrade's scheduled retirement, if known.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
   upgradeCopy: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ModelListResponse__ReasoningEffort = string;
-export const V2ModelListResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+}).annotate({ identifier: "V2ModelListResponse__ModelUpgradeInfo" });
 
 export type V2ModelReroutedNotification__ModelRerouteReason = "highRiskCyberActivity";
-export const V2ModelReroutedNotification__ModelRerouteReason =
-  Schema.Literal("highRiskCyberActivity");
+export const V2ModelReroutedNotification__ModelRerouteReason = Schema.Literal(
+  "highRiskCyberActivity",
+).annotate({ identifier: "V2ModelReroutedNotification__ModelRerouteReason" });
 
 export type V2ModelVerificationNotification__ModelVerification = "trustedAccessForCyber";
-export const V2ModelVerificationNotification__ModelVerification =
-  Schema.Literal("trustedAccessForCyber");
+export const V2ModelVerificationNotification__ModelVerification = Schema.Literal(
+  "trustedAccessForCyber",
+).annotate({ identifier: "V2ModelVerificationNotification__ModelVerification" });
+
+export type V2NullableGetAccountRateLimitsParams__GetAccountRateLimitsParams = {
+  readonly excludeResetCreditDetails?: boolean;
+  readonly supportsLunaReserve?: boolean;
+};
+export const V2NullableGetAccountRateLimitsParams__GetAccountRateLimitsParams = Schema.Struct({
+  excludeResetCreditDetails: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Skip the separate reset-credit detail lookup for background usage polls. The usage response still includes the available count; omitted/false preserves detailed reads.",
+    }),
+  ),
+  supportsLunaReserve: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "The client supports automatic Luna Reserve fallback. For eligible ChatGPT CLI users, allow the backend to record experiment exposure after ordinary usage is blocked.",
+    }),
+  ),
+}).annotate({
+  description:
+    "Usage-read capabilities of the requesting client, never inferred from its experiment arm.",
+  identifier: "V2NullableGetAccountRateLimitsParams__GetAccountRateLimitsParams",
+});
+
+export type V2NullableGetAccountTokenUsageParams__GetAccountTokenUsageParams = {
+  readonly threadId?: string | null;
+};
+export const V2NullableGetAccountTokenUsageParams__GetAccountTokenUsageParams = Schema.Struct({
+  threadId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "When present, read estimated usage for this thread instead of account-wide token activity.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2NullableGetAccountTokenUsageParams__GetAccountTokenUsageParams" });
 
 export type V2PermissionProfileListResponse__PermissionProfileSummary = {
   readonly allowed: boolean;
@@ -5480,18 +7254,20 @@ export const V2PermissionProfileListResponse__PermissionProfileSummary = Schema.
     ]),
   ),
   id: Schema.String.annotate({ description: "Available permission profile identifier." }),
-});
+}).annotate({ identifier: "V2PermissionProfileListResponse__PermissionProfileSummary" });
 
 export type V2PluginInstalledParams__AbsolutePathBuf = string;
 export const V2PluginInstalledParams__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginInstalledParams__AbsolutePathBuf",
 });
 
 export type V2PluginInstalledResponse__AbsolutePathBuf = string;
 export const V2PluginInstalledResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginInstalledResponse__AbsolutePathBuf",
 });
 
 export type V2PluginInstalledResponse__MarketplaceInterface = {
@@ -5499,13 +7275,37 @@ export type V2PluginInstalledResponse__MarketplaceInterface = {
 };
 export const V2PluginInstalledResponse__MarketplaceInterface = Schema.Struct({
   displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2PluginInstalledResponse__MarketplaceInterface" });
 
 export type V2PluginInstalledResponse__PluginAuthPolicy = "ON_INSTALL" | "ON_USE";
 export const V2PluginInstalledResponse__PluginAuthPolicy = Schema.Literals([
   "ON_INSTALL",
   "ON_USE",
-]);
+]).annotate({ identifier: "V2PluginInstalledResponse__PluginAuthPolicy" });
+
+export type V2PluginInstalledResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
+export const V2PluginInstalledResponse__PluginAvailability = Schema.Union(
+  [
+    Schema.Literal("DISABLED_BY_ADMIN"),
+    Schema.Literal("AVAILABLE").annotate({
+      description:
+        'Plugin-service currently sends `"ENABLED"` for available remote plugins. Codex app-server exposes `"AVAILABLE"` in its API; the alias keeps decoding compatible with that upstream response.',
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginInstalledResponse__PluginAvailability" });
+
+export type V2PluginInstalledResponse__PluginDisabledReason =
+  | "disabled_by_admin"
+  | "plan_not_eligible"
+  | "required_app_unavailable"
+  | "unknown";
+export const V2PluginInstalledResponse__PluginDisabledReason = Schema.Literals([
+  "disabled_by_admin",
+  "plan_not_eligible",
+  "required_app_unavailable",
+  "unknown",
+]).annotate({ identifier: "V2PluginInstalledResponse__PluginDisabledReason" });
 
 export type V2PluginInstalledResponse__PluginInstallPolicy =
   | "NOT_AVAILABLE"
@@ -5515,7 +7315,7 @@ export const V2PluginInstalledResponse__PluginInstallPolicy = Schema.Literals([
   "NOT_AVAILABLE",
   "AVAILABLE",
   "INSTALLED_BY_DEFAULT",
-]);
+]).annotate({ identifier: "V2PluginInstalledResponse__PluginInstallPolicy" });
 
 export type V2PluginInstalledResponse__PluginInstallPolicySource =
   | "WORKSPACE_SETTING"
@@ -5523,7 +7323,7 @@ export type V2PluginInstalledResponse__PluginInstallPolicySource =
 export const V2PluginInstalledResponse__PluginInstallPolicySource = Schema.Literals([
   "WORKSPACE_SETTING",
   "IMPLICIT_CANONICAL_APP",
-]);
+]).annotate({ identifier: "V2PluginInstalledResponse__PluginInstallPolicySource" });
 
 export type V2PluginInstalledResponse__PluginShareDiscoverability =
   | "LISTED"
@@ -5533,26 +7333,27 @@ export const V2PluginInstalledResponse__PluginShareDiscoverability = Schema.Lite
   "LISTED",
   "UNLISTED",
   "PRIVATE",
-]);
-
-export type V2PluginInstalledResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
-export const V2PluginInstalledResponse__PluginSharePrincipalRole = Schema.Literals([
-  "reader",
-  "editor",
-  "owner",
-]);
+]).annotate({ identifier: "V2PluginInstalledResponse__PluginShareDiscoverability" });
 
 export type V2PluginInstalledResponse__PluginSharePrincipalType = "user" | "group" | "workspace";
 export const V2PluginInstalledResponse__PluginSharePrincipalType = Schema.Literals([
   "user",
   "group",
   "workspace",
-]);
+]).annotate({ identifier: "V2PluginInstalledResponse__PluginSharePrincipalType" });
+
+export type V2PluginInstalledResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
+export const V2PluginInstalledResponse__PluginSharePrincipalRole = Schema.Literals([
+  "reader",
+  "editor",
+  "owner",
+]).annotate({ identifier: "V2PluginInstalledResponse__PluginSharePrincipalRole" });
 
 export type V2PluginInstallParams__AbsolutePathBuf = string;
 export const V2PluginInstallParams__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginInstallParams__AbsolutePathBuf",
 });
 
 export type V2PluginInstallResponse__AppSummary = {
@@ -5568,15 +7369,22 @@ export const V2PluginInstallResponse__AppSummary = Schema.Struct({
   id: Schema.String,
   installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   name: Schema.String,
-}).annotate({ description: "EXPERIMENTAL - app metadata summary for plugin responses." });
+}).annotate({
+  description: "EXPERIMENTAL - app metadata summary for plugin responses.",
+  identifier: "V2PluginInstallResponse__AppSummary",
+});
 
 export type V2PluginInstallResponse__PluginAuthPolicy = "ON_INSTALL" | "ON_USE";
-export const V2PluginInstallResponse__PluginAuthPolicy = Schema.Literals(["ON_INSTALL", "ON_USE"]);
+export const V2PluginInstallResponse__PluginAuthPolicy = Schema.Literals([
+  "ON_INSTALL",
+  "ON_USE",
+]).annotate({ identifier: "V2PluginInstallResponse__PluginAuthPolicy" });
 
 export type V2PluginListParams__AbsolutePathBuf = string;
 export const V2PluginListParams__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginListParams__AbsolutePathBuf",
 });
 
 export type V2PluginListParams__PluginListMarketplaceKind =
@@ -5591,21 +7399,49 @@ export const V2PluginListParams__PluginListMarketplaceKind = Schema.Literals([
   "workspace-directory",
   "shared-with-me",
   "created-by-me-remote",
-]);
+]).annotate({ identifier: "V2PluginListParams__PluginListMarketplaceKind" });
 
 export type V2PluginListResponse__AbsolutePathBuf = string;
 export const V2PluginListResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginListResponse__AbsolutePathBuf",
 });
 
 export type V2PluginListResponse__MarketplaceInterface = { readonly displayName?: string | null };
 export const V2PluginListResponse__MarketplaceInterface = Schema.Struct({
   displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2PluginListResponse__MarketplaceInterface" });
 
 export type V2PluginListResponse__PluginAuthPolicy = "ON_INSTALL" | "ON_USE";
-export const V2PluginListResponse__PluginAuthPolicy = Schema.Literals(["ON_INSTALL", "ON_USE"]);
+export const V2PluginListResponse__PluginAuthPolicy = Schema.Literals([
+  "ON_INSTALL",
+  "ON_USE",
+]).annotate({ identifier: "V2PluginListResponse__PluginAuthPolicy" });
+
+export type V2PluginListResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
+export const V2PluginListResponse__PluginAvailability = Schema.Union(
+  [
+    Schema.Literal("DISABLED_BY_ADMIN"),
+    Schema.Literal("AVAILABLE").annotate({
+      description:
+        'Plugin-service currently sends `"ENABLED"` for available remote plugins. Codex app-server exposes `"AVAILABLE"` in its API; the alias keeps decoding compatible with that upstream response.',
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginListResponse__PluginAvailability" });
+
+export type V2PluginListResponse__PluginDisabledReason =
+  | "disabled_by_admin"
+  | "plan_not_eligible"
+  | "required_app_unavailable"
+  | "unknown";
+export const V2PluginListResponse__PluginDisabledReason = Schema.Literals([
+  "disabled_by_admin",
+  "plan_not_eligible",
+  "required_app_unavailable",
+  "unknown",
+]).annotate({ identifier: "V2PluginListResponse__PluginDisabledReason" });
 
 export type V2PluginListResponse__PluginInstallPolicy =
   | "NOT_AVAILABLE"
@@ -5615,7 +7451,7 @@ export const V2PluginListResponse__PluginInstallPolicy = Schema.Literals([
   "NOT_AVAILABLE",
   "AVAILABLE",
   "INSTALLED_BY_DEFAULT",
-]);
+]).annotate({ identifier: "V2PluginListResponse__PluginInstallPolicy" });
 
 export type V2PluginListResponse__PluginInstallPolicySource =
   | "WORKSPACE_SETTING"
@@ -5623,40 +7459,43 @@ export type V2PluginListResponse__PluginInstallPolicySource =
 export const V2PluginListResponse__PluginInstallPolicySource = Schema.Literals([
   "WORKSPACE_SETTING",
   "IMPLICIT_CANONICAL_APP",
-]);
+]).annotate({ identifier: "V2PluginListResponse__PluginInstallPolicySource" });
 
 export type V2PluginListResponse__PluginShareDiscoverability = "LISTED" | "UNLISTED" | "PRIVATE";
 export const V2PluginListResponse__PluginShareDiscoverability = Schema.Literals([
   "LISTED",
   "UNLISTED",
   "PRIVATE",
-]);
-
-export type V2PluginListResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
-export const V2PluginListResponse__PluginSharePrincipalRole = Schema.Literals([
-  "reader",
-  "editor",
-  "owner",
-]);
+]).annotate({ identifier: "V2PluginListResponse__PluginShareDiscoverability" });
 
 export type V2PluginListResponse__PluginSharePrincipalType = "user" | "group" | "workspace";
 export const V2PluginListResponse__PluginSharePrincipalType = Schema.Literals([
   "user",
   "group",
   "workspace",
-]);
+]).annotate({ identifier: "V2PluginListResponse__PluginSharePrincipalType" });
+
+export type V2PluginListResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
+export const V2PluginListResponse__PluginSharePrincipalRole = Schema.Literals([
+  "reader",
+  "editor",
+  "owner",
+]).annotate({ identifier: "V2PluginListResponse__PluginSharePrincipalRole" });
 
 export type V2PluginReadParams__AbsolutePathBuf = string;
 export const V2PluginReadParams__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginReadParams__AbsolutePathBuf",
 });
 
-export type V2PluginReadResponse__AbsolutePathBuf = string;
-export const V2PluginReadResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+export type V2PluginReadResponse__AppTemplateUnavailableReason =
+  | "NOT_CONFIGURED_FOR_WORKSPACE"
+  | "NO_ACTIVE_WORKSPACE";
+export const V2PluginReadResponse__AppTemplateUnavailableReason = Schema.Literals([
+  "NOT_CONFIGURED_FOR_WORKSPACE",
+  "NO_ACTIVE_WORKSPACE",
+]).annotate({ identifier: "V2PluginReadResponse__AppTemplateUnavailableReason" });
 
 export type V2PluginReadResponse__AppSummary = {
   readonly category?: string | null;
@@ -5671,15 +7510,10 @@ export const V2PluginReadResponse__AppSummary = Schema.Struct({
   id: Schema.String,
   installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   name: Schema.String,
-}).annotate({ description: "EXPERIMENTAL - app metadata summary for plugin responses." });
-
-export type V2PluginReadResponse__AppTemplateUnavailableReason =
-  | "NOT_CONFIGURED_FOR_WORKSPACE"
-  | "NO_ACTIVE_WORKSPACE";
-export const V2PluginReadResponse__AppTemplateUnavailableReason = Schema.Literals([
-  "NOT_CONFIGURED_FOR_WORKSPACE",
-  "NO_ACTIVE_WORKSPACE",
-]);
+}).annotate({
+  description: "EXPERIMENTAL - app metadata summary for plugin responses.",
+  identifier: "V2PluginReadResponse__AppSummary",
+});
 
 export type V2PluginReadResponse__HookEventName =
   | "preToolUse"
@@ -5692,7 +7526,8 @@ export type V2PluginReadResponse__HookEventName =
   | "userPromptSubmit"
   | "subagentStart"
   | "subagentStop"
-  | "stop";
+  | "stop"
+  | "interrupt";
 export const V2PluginReadResponse__HookEventName = Schema.Literals([
   "preToolUse",
   "permissionRequest",
@@ -5705,10 +7540,63 @@ export const V2PluginReadResponse__HookEventName = Schema.Literals([
   "subagentStart",
   "subagentStop",
   "stop",
-]);
+  "interrupt",
+]).annotate({ identifier: "V2PluginReadResponse__HookEventName" });
+
+export type V2PluginReadResponse__AbsolutePathBuf = string;
+export const V2PluginReadResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginReadResponse__AbsolutePathBuf",
+});
+
+export type V2PluginReadResponse__ScheduledTaskWeekday =
+  | "MO"
+  | "TU"
+  | "WE"
+  | "TH"
+  | "FR"
+  | "SA"
+  | "SU";
+export const V2PluginReadResponse__ScheduledTaskWeekday = Schema.Literals([
+  "MO",
+  "TU",
+  "WE",
+  "TH",
+  "FR",
+  "SA",
+  "SU",
+]).annotate({ identifier: "V2PluginReadResponse__ScheduledTaskWeekday" });
 
 export type V2PluginReadResponse__PluginAuthPolicy = "ON_INSTALL" | "ON_USE";
-export const V2PluginReadResponse__PluginAuthPolicy = Schema.Literals(["ON_INSTALL", "ON_USE"]);
+export const V2PluginReadResponse__PluginAuthPolicy = Schema.Literals([
+  "ON_INSTALL",
+  "ON_USE",
+]).annotate({ identifier: "V2PluginReadResponse__PluginAuthPolicy" });
+
+export type V2PluginReadResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
+export const V2PluginReadResponse__PluginAvailability = Schema.Union(
+  [
+    Schema.Literal("DISABLED_BY_ADMIN"),
+    Schema.Literal("AVAILABLE").annotate({
+      description:
+        'Plugin-service currently sends `"ENABLED"` for available remote plugins. Codex app-server exposes `"AVAILABLE"` in its API; the alias keeps decoding compatible with that upstream response.',
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginReadResponse__PluginAvailability" });
+
+export type V2PluginReadResponse__PluginDisabledReason =
+  | "disabled_by_admin"
+  | "plan_not_eligible"
+  | "required_app_unavailable"
+  | "unknown";
+export const V2PluginReadResponse__PluginDisabledReason = Schema.Literals([
+  "disabled_by_admin",
+  "plan_not_eligible",
+  "required_app_unavailable",
+  "unknown",
+]).annotate({ identifier: "V2PluginReadResponse__PluginDisabledReason" });
 
 export type V2PluginReadResponse__PluginInstallPolicy =
   | "NOT_AVAILABLE"
@@ -5718,7 +7606,7 @@ export const V2PluginReadResponse__PluginInstallPolicy = Schema.Literals([
   "NOT_AVAILABLE",
   "AVAILABLE",
   "INSTALLED_BY_DEFAULT",
-]);
+]).annotate({ identifier: "V2PluginReadResponse__PluginInstallPolicy" });
 
 export type V2PluginReadResponse__PluginInstallPolicySource =
   | "WORKSPACE_SETTING"
@@ -5726,64 +7614,96 @@ export type V2PluginReadResponse__PluginInstallPolicySource =
 export const V2PluginReadResponse__PluginInstallPolicySource = Schema.Literals([
   "WORKSPACE_SETTING",
   "IMPLICIT_CANONICAL_APP",
-]);
+]).annotate({ identifier: "V2PluginReadResponse__PluginInstallPolicySource" });
 
 export type V2PluginReadResponse__PluginShareDiscoverability = "LISTED" | "UNLISTED" | "PRIVATE";
 export const V2PluginReadResponse__PluginShareDiscoverability = Schema.Literals([
   "LISTED",
   "UNLISTED",
   "PRIVATE",
-]);
-
-export type V2PluginReadResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
-export const V2PluginReadResponse__PluginSharePrincipalRole = Schema.Literals([
-  "reader",
-  "editor",
-  "owner",
-]);
+]).annotate({ identifier: "V2PluginReadResponse__PluginShareDiscoverability" });
 
 export type V2PluginReadResponse__PluginSharePrincipalType = "user" | "group" | "workspace";
 export const V2PluginReadResponse__PluginSharePrincipalType = Schema.Literals([
   "user",
   "group",
   "workspace",
-]);
+]).annotate({ identifier: "V2PluginReadResponse__PluginSharePrincipalType" });
 
-export type V2PluginReadResponse__ScheduledTaskWeekday =
-  | "MO"
-  | "TU"
-  | "WE"
-  | "TH"
-  | "FR"
-  | "SA"
-  | "SU";
-export const V2PluginReadResponse__ScheduledTaskWeekday = Schema.Literals([
-  "MO",
-  "TU",
-  "WE",
-  "TH",
-  "FR",
-  "SA",
-  "SU",
-]);
+export type V2PluginReadResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
+export const V2PluginReadResponse__PluginSharePrincipalRole = Schema.Literals([
+  "reader",
+  "editor",
+  "owner",
+]).annotate({ identifier: "V2PluginReadResponse__PluginSharePrincipalRole" });
+
+export type V2PluginReconcileResponse__PluginReconcileChangedPlugin = {
+  readonly hasApps: boolean;
+  readonly hasHooks: boolean;
+  readonly hasMcps: boolean;
+  readonly hasSkills: boolean;
+  readonly id: string;
+};
+export const V2PluginReconcileResponse__PluginReconcileChangedPlugin = Schema.Struct({
+  hasApps: Schema.Boolean,
+  hasHooks: Schema.Boolean,
+  hasMcps: Schema.Boolean,
+  hasSkills: Schema.Boolean.annotate({
+    description:
+      "Whether either bundle declares skill roots; not a validated inventory of enabled skills.",
+  }),
+  id: Schema.String.annotate({
+    description: "Local plugin ID (`name@marketplace`), matching `PluginSummary.id`.",
+  }),
+}).annotate({
+  description:
+    "Runtime categories affected by this change, not just capabilities currently present. Flags describe declarations before runtime policy filtering. Updates OR the old and new bundle flags; enablement changes and cached reinstalls use the cached bundle; removals retain the old bundle's flags.",
+  identifier: "V2PluginReconcileResponse__PluginReconcileChangedPlugin",
+});
 
 export type V2PluginShareCheckoutResponse__AbsolutePathBuf = string;
 export const V2PluginShareCheckoutResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginShareCheckoutResponse__AbsolutePathBuf",
 });
 
 export type V2PluginShareListResponse__AbsolutePathBuf = string;
 export const V2PluginShareListResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginShareListResponse__AbsolutePathBuf",
 });
 
 export type V2PluginShareListResponse__PluginAuthPolicy = "ON_INSTALL" | "ON_USE";
 export const V2PluginShareListResponse__PluginAuthPolicy = Schema.Literals([
   "ON_INSTALL",
   "ON_USE",
-]);
+]).annotate({ identifier: "V2PluginShareListResponse__PluginAuthPolicy" });
+
+export type V2PluginShareListResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
+export const V2PluginShareListResponse__PluginAvailability = Schema.Union(
+  [
+    Schema.Literal("DISABLED_BY_ADMIN"),
+    Schema.Literal("AVAILABLE").annotate({
+      description:
+        'Plugin-service currently sends `"ENABLED"` for available remote plugins. Codex app-server exposes `"AVAILABLE"` in its API; the alias keeps decoding compatible with that upstream response.',
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginShareListResponse__PluginAvailability" });
+
+export type V2PluginShareListResponse__PluginDisabledReason =
+  | "disabled_by_admin"
+  | "plan_not_eligible"
+  | "required_app_unavailable"
+  | "unknown";
+export const V2PluginShareListResponse__PluginDisabledReason = Schema.Literals([
+  "disabled_by_admin",
+  "plan_not_eligible",
+  "required_app_unavailable",
+  "unknown",
+]).annotate({ identifier: "V2PluginShareListResponse__PluginDisabledReason" });
 
 export type V2PluginShareListResponse__PluginInstallPolicy =
   | "NOT_AVAILABLE"
@@ -5793,7 +7713,7 @@ export const V2PluginShareListResponse__PluginInstallPolicy = Schema.Literals([
   "NOT_AVAILABLE",
   "AVAILABLE",
   "INSTALLED_BY_DEFAULT",
-]);
+]).annotate({ identifier: "V2PluginShareListResponse__PluginInstallPolicy" });
 
 export type V2PluginShareListResponse__PluginInstallPolicySource =
   | "WORKSPACE_SETTING"
@@ -5801,7 +7721,7 @@ export type V2PluginShareListResponse__PluginInstallPolicySource =
 export const V2PluginShareListResponse__PluginInstallPolicySource = Schema.Literals([
   "WORKSPACE_SETTING",
   "IMPLICIT_CANONICAL_APP",
-]);
+]).annotate({ identifier: "V2PluginShareListResponse__PluginInstallPolicySource" });
 
 export type V2PluginShareListResponse__PluginShareDiscoverability =
   | "LISTED"
@@ -5811,44 +7731,58 @@ export const V2PluginShareListResponse__PluginShareDiscoverability = Schema.Lite
   "LISTED",
   "UNLISTED",
   "PRIVATE",
-]);
-
-export type V2PluginShareListResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
-export const V2PluginShareListResponse__PluginSharePrincipalRole = Schema.Literals([
-  "reader",
-  "editor",
-  "owner",
-]);
+]).annotate({ identifier: "V2PluginShareListResponse__PluginShareDiscoverability" });
 
 export type V2PluginShareListResponse__PluginSharePrincipalType = "user" | "group" | "workspace";
 export const V2PluginShareListResponse__PluginSharePrincipalType = Schema.Literals([
   "user",
   "group",
   "workspace",
-]);
+]).annotate({ identifier: "V2PluginShareListResponse__PluginSharePrincipalType" });
 
-export type V2PluginShareSaveParams__AbsolutePathBuf = string;
-export const V2PluginShareSaveParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+export type V2PluginShareListResponse__PluginSharePrincipalRole = "reader" | "editor" | "owner";
+export const V2PluginShareListResponse__PluginSharePrincipalRole = Schema.Literals([
+  "reader",
+  "editor",
+  "owner",
+]).annotate({ identifier: "V2PluginShareListResponse__PluginSharePrincipalRole" });
 
 export type V2PluginShareSaveParams__PluginShareDiscoverability = "LISTED" | "UNLISTED" | "PRIVATE";
 export const V2PluginShareSaveParams__PluginShareDiscoverability = Schema.Literals([
   "LISTED",
   "UNLISTED",
   "PRIVATE",
-]);
+]).annotate({ identifier: "V2PluginShareSaveParams__PluginShareDiscoverability" });
+
+export type V2PluginShareSaveParams__AbsolutePathBuf = string;
+export const V2PluginShareSaveParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2PluginShareSaveParams__AbsolutePathBuf",
+});
 
 export type V2PluginShareSaveParams__PluginSharePrincipalType = "user" | "group" | "workspace";
 export const V2PluginShareSaveParams__PluginSharePrincipalType = Schema.Literals([
   "user",
   "group",
   "workspace",
-]);
+]).annotate({ identifier: "V2PluginShareSaveParams__PluginSharePrincipalType" });
 
 export type V2PluginShareSaveParams__PluginShareTargetRole = "reader" | "editor";
-export const V2PluginShareSaveParams__PluginShareTargetRole = Schema.Literals(["reader", "editor"]);
+export const V2PluginShareSaveParams__PluginShareTargetRole = Schema.Literals([
+  "reader",
+  "editor",
+]).annotate({ identifier: "V2PluginShareSaveParams__PluginShareTargetRole" });
+
+export type V2PluginShareUpdateTargetsParams__PluginShareUpdateDiscoverability =
+  | "UNLISTED"
+  | "PRIVATE"
+  | "LISTED";
+export const V2PluginShareUpdateTargetsParams__PluginShareUpdateDiscoverability = Schema.Literals([
+  "UNLISTED",
+  "PRIVATE",
+  "LISTED",
+]).annotate({ identifier: "V2PluginShareUpdateTargetsParams__PluginShareUpdateDiscoverability" });
 
 export type V2PluginShareUpdateTargetsParams__PluginSharePrincipalType =
   | "user"
@@ -5858,23 +7792,13 @@ export const V2PluginShareUpdateTargetsParams__PluginSharePrincipalType = Schema
   "user",
   "group",
   "workspace",
-]);
+]).annotate({ identifier: "V2PluginShareUpdateTargetsParams__PluginSharePrincipalType" });
 
 export type V2PluginShareUpdateTargetsParams__PluginShareTargetRole = "reader" | "editor";
 export const V2PluginShareUpdateTargetsParams__PluginShareTargetRole = Schema.Literals([
   "reader",
   "editor",
-]);
-
-export type V2PluginShareUpdateTargetsParams__PluginShareUpdateDiscoverability =
-  | "UNLISTED"
-  | "PRIVATE"
-  | "LISTED";
-export const V2PluginShareUpdateTargetsParams__PluginShareUpdateDiscoverability = Schema.Literals([
-  "UNLISTED",
-  "PRIVATE",
-  "LISTED",
-]);
+]).annotate({ identifier: "V2PluginShareUpdateTargetsParams__PluginShareTargetRole" });
 
 export type V2PluginShareUpdateTargetsResponse__PluginShareDiscoverability =
   | "LISTED"
@@ -5884,7 +7808,17 @@ export const V2PluginShareUpdateTargetsResponse__PluginShareDiscoverability = Sc
   "LISTED",
   "UNLISTED",
   "PRIVATE",
-]);
+]).annotate({ identifier: "V2PluginShareUpdateTargetsResponse__PluginShareDiscoverability" });
+
+export type V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType =
+  | "user"
+  | "group"
+  | "workspace";
+export const V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType = Schema.Literals([
+  "user",
+  "group",
+  "workspace",
+]).annotate({ identifier: "V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType" });
 
 export type V2PluginShareUpdateTargetsResponse__PluginSharePrincipalRole =
   | "reader"
@@ -5894,17 +7828,28 @@ export const V2PluginShareUpdateTargetsResponse__PluginSharePrincipalRole = Sche
   "reader",
   "editor",
   "owner",
-]);
+]).annotate({ identifier: "V2PluginShareUpdateTargetsResponse__PluginSharePrincipalRole" });
 
-export type V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType =
-  | "user"
-  | "group"
-  | "workspace";
-export const V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType = Schema.Literals([
-  "user",
-  "group",
-  "workspace",
-]);
+export type V2ProcessOutputDeltaNotification__ProcessOutputStream = "stdout" | "stderr";
+export const V2ProcessOutputDeltaNotification__ProcessOutputStream = Schema.Union(
+  [
+    Schema.Literal("stdout").annotate({
+      description: "stdout stream. PTY mode multiplexes terminal output here.",
+    }),
+    Schema.Literal("stderr").annotate({ description: "stderr stream." }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "Stream label for `process/outputDelta` notifications.",
+  identifier: "V2ProcessOutputDeltaNotification__ProcessOutputStream",
+});
+
+export type V2ProjectChangedNotification__ProjectChangeType = "created" | "updated" | "deleted";
+export const V2ProjectChangedNotification__ProjectChangeType = Schema.Literals([
+  "created",
+  "updated",
+  "deleted",
+]).annotate({ identifier: "V2ProjectChangedNotification__ProjectChangeType" });
 
 export type V2RawResponseCompletedNotification__TokenUsageBreakdown = {
   readonly cacheWriteInputTokens?: number;
@@ -5916,35 +7861,38 @@ export type V2RawResponseCompletedNotification__TokenUsageBreakdown = {
 };
 export const V2RawResponseCompletedNotification__TokenUsageBreakdown = Schema.Struct({
   cacheWriteInputTokens: Schema.optionalKey(
-    Schema.Number.annotate({ default: 0, format: "int64" }).check(Schema.isInt()),
+    Schema.Number.annotate({ default: 0, format: "int64" }).check(
+      Schema.isInt().annotate({ expected: "an integer" }),
+    ),
   ),
-  cachedInputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  inputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  outputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  reasoningOutputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  totalTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-});
+  cachedInputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  inputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  outputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  reasoningOutputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  totalTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "V2RawResponseCompletedNotification__TokenUsageBreakdown" });
 
-export type V2RawResponseItemCompletedNotification__AgentMessageInputContent =
-  | { readonly text: string; readonly type: "input_text" }
-  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
-export const V2RawResponseItemCompletedNotification__AgentMessageInputContent = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("input_text").annotate({
-        title: "InputTextAgentMessageInputContentType",
-      }),
-    }).annotate({ title: "InputTextAgentMessageInputContent" }),
-    Schema.Struct({
-      encrypted_content: Schema.String,
-      type: Schema.Literal("encrypted_content").annotate({
-        title: "EncryptedContentAgentMessageInputContentType",
-      }),
-    }).annotate({ title: "EncryptedContentAgentMessageInputContent" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2RawResponseCompletedNotification__ResponseUsageMetadata = {
+  readonly amount?: string | null;
+  readonly metadata?: Schema.Json;
+};
+export const V2RawResponseCompletedNotification__ResponseUsageMetadata = Schema.Struct({
+  amount: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  metadata: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({
+  description: "Usage metadata reported for one upstream response.",
+  identifier: "V2RawResponseCompletedNotification__ResponseUsageMetadata",
+});
 
 export type V2RawResponseItemCompletedNotification__ImageDetail =
   | "auto"
@@ -5956,7 +7904,7 @@ export const V2RawResponseItemCompletedNotification__ImageDetail = Schema.Litera
   "low",
   "high",
   "original",
-]);
+]).annotate({ identifier: "V2RawResponseItemCompletedNotification__ImageDetail" });
 
 export type V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough = {
   readonly turn_id?: string | null;
@@ -5967,76 +7915,66 @@ export const V2RawResponseItemCompletedNotification__InternalChatMessageMetadata
   }).annotate({
     description:
       "Internal Responses API passthrough metadata copied into underlying chat messages.\n\nResponses API strongly types this payload. Do not modify it without first getting API approval and making the corresponding Responses API change.",
+    identifier: "V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough",
   });
 
-export type V2RawResponseItemCompletedNotification__LocalShellAction = {
-  readonly command: ReadonlyArray<string>;
-  readonly env?: { readonly [x: string]: string } | null;
-  readonly timeout_ms?: number | null;
-  readonly type: "exec";
-  readonly user?: string | null;
-  readonly working_directory?: string | null;
-};
-export const V2RawResponseItemCompletedNotification__LocalShellAction = Schema.Union(
+export type V2RawResponseItemCompletedNotification__MessagePhase = "commentary" | "final_answer";
+export const V2RawResponseItemCompletedNotification__MessagePhase = Schema.Union(
   [
-    Schema.Struct({
-      command: Schema.Array(Schema.String),
-      env: Schema.optionalKey(
-        Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-      ),
-      timeout_ms: Schema.optionalKey(
-        Schema.Union([
-          Schema.Number.annotate({ format: "uint64" })
-            .check(Schema.isInt())
-            .check(Schema.isGreaterThanOrEqualTo(0)),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("exec").annotate({ title: "ExecLocalShellActionType" }),
-      user: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      working_directory: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "ExecLocalShellAction" }),
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2RawResponseItemCompletedNotification__LocalShellStatus =
-  | "completed"
-  | "in_progress"
-  | "incomplete";
-export const V2RawResponseItemCompletedNotification__LocalShellStatus = Schema.Literals([
-  "completed",
-  "in_progress",
-  "incomplete",
-]);
-
-export type V2RawResponseItemCompletedNotification__MessagePhase = "commentary" | "final_answer";
-export const V2RawResponseItemCompletedNotification__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2RawResponseItemCompletedNotification__MessagePhase",
 });
 
-export type V2RawResponseItemCompletedNotification__ReasoningItemContent =
-  | { readonly text: string; readonly type: "reasoning_text" }
-  | { readonly text: string; readonly type: "text" };
-export const V2RawResponseItemCompletedNotification__ReasoningItemContent = Schema.Union(
+export type V2RawResponseItemCompletedNotification__AgentMessageInputContent =
+  | { readonly text: string; readonly type: "input_text" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2RawResponseItemCompletedNotification__AgentMessageInputContent = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
-      type: Schema.Literal("reasoning_text").annotate({
-        title: "ReasoningTextReasoningItemContentType",
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextAgentMessageInputContentType",
       }),
-    }).annotate({ title: "ReasoningTextReasoningItemContent" }),
+    }).annotate({ title: "InputTextAgentMessageInputContent" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentAgentMessageInputContentType",
+      }),
+    }).annotate({ title: "EncryptedContentAgentMessageInputContent" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2RawResponseItemCompletedNotification__AgentMessageInputContent" });
+
+export type V2RawResponseItemCompletedNotification__ReasoningItemContent =
+  | { readonly text: string; readonly type: "reasoning_text" }
+  | { readonly text: string; readonly type: "text" };
+export const V2RawResponseItemCompletedNotification__ReasoningItemContent = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("reasoning_text").annotate({
+        title: "ReasoningTextReasoningItemContentType",
+      }),
+    }).annotate({ title: "ReasoningTextReasoningItemContent" }),
     Schema.Struct({
       text: Schema.String,
       type: Schema.Literal("text").annotate({ title: "TextReasoningItemContentType" }),
     }).annotate({ title: "TextReasoningItemContent" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2RawResponseItemCompletedNotification__ReasoningItemContent" });
 
 export type V2RawResponseItemCompletedNotification__ReasoningItemReasoningSummary = {
   readonly text: string;
@@ -6052,7 +7990,52 @@ export const V2RawResponseItemCompletedNotification__ReasoningItemReasoningSumma
     }).annotate({ title: "SummaryTextReasoningItemReasoningSummary" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2RawResponseItemCompletedNotification__ReasoningItemReasoningSummary" });
+
+export type V2RawResponseItemCompletedNotification__LocalShellAction = {
+  readonly command: ReadonlyArray<string>;
+  readonly env?: { readonly [x: string]: string } | null;
+  readonly timeout_ms?: number | null;
+  readonly type: "exec";
+  readonly user?: string | null;
+  readonly working_directory?: string | null;
+};
+export const V2RawResponseItemCompletedNotification__LocalShellAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.Array(Schema.String),
+      env: Schema.optionalKey(
+        Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+      ),
+      timeout_ms: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "uint64" })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("exec").annotate({ title: "ExecLocalShellActionType" }),
+      user: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      working_directory: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "ExecLocalShellAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2RawResponseItemCompletedNotification__LocalShellAction" });
+
+export type V2RawResponseItemCompletedNotification__LocalShellStatus =
+  | "completed"
+  | "in_progress"
+  | "incomplete";
+export const V2RawResponseItemCompletedNotification__LocalShellStatus = Schema.Literals([
+  "completed",
+  "in_progress",
+  "incomplete",
+]).annotate({ identifier: "V2RawResponseItemCompletedNotification__LocalShellStatus" });
 
 export type V2RawResponseItemCompletedNotification__ResponsesApiWebSearchAction =
   | {
@@ -6092,6 +8075,16 @@ export const V2RawResponseItemCompletedNotification__ResponsesApiWebSearchAction
     }).annotate({ title: "OtherResponsesApiWebSearchAction" }),
   ],
   { mode: "oneOf" },
+).annotate({ identifier: "V2RawResponseItemCompletedNotification__ResponsesApiWebSearchAction" });
+
+export type V2RawResponseItemCompletedNotification__ReasoningEffort = string;
+export const V2RawResponseItemCompletedNotification__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2RawResponseItemCompletedNotification__ReasoningEffort",
+  }),
 );
 
 export type V2RemoteControlStatusChangedNotification__RemoteControlConnectionStatus =
@@ -6100,10 +8093,14 @@ export type V2RemoteControlStatusChangedNotification__RemoteControlConnectionSta
   | "connected"
   | "errored";
 export const V2RemoteControlStatusChangedNotification__RemoteControlConnectionStatus =
-  Schema.Literals(["disabled", "connecting", "connected", "errored"]);
+  Schema.Literals(["disabled", "connecting", "connected", "errored"]).annotate({
+    identifier: "V2RemoteControlStatusChangedNotification__RemoteControlConnectionStatus",
+  });
 
 export type V2ReviewStartParams__ReviewDelivery = "inline" | "detached";
-export const V2ReviewStartParams__ReviewDelivery = Schema.Literals(["inline", "detached"]);
+export const V2ReviewStartParams__ReviewDelivery = Schema.Literals(["inline", "detached"]).annotate(
+  { identifier: "V2ReviewStartParams__ReviewDelivery" },
+);
 
 export type V2ReviewStartParams__ReviewTarget =
   | { readonly type: "uncommittedChanges" }
@@ -6151,87 +8148,32 @@ export const V2ReviewStartParams__ReviewTarget = Schema.Union(
     }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ReviewStartResponse__AbsolutePathBuf = string;
-export const V2ReviewStartResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2ReviewStartResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ReviewStartResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
-
-export type V2ReviewStartResponse__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2ReviewStartResponse__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
+).annotate({ identifier: "V2ReviewStartParams__ReviewTarget" });
 
-export type V2ReviewStartResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ReviewStartResponse__DynamicToolCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ReviewStartResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ReviewStartResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ReviewStartResponse__NonSteerableTurnKind" });
 
-export type V2ReviewStartResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ReviewStartResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ReviewStartResponse__MisalignmentSteer = { readonly message: string };
+export const V2ReviewStartResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ReviewStartResponse__MisalignmentSteer" });
 
-export type V2ReviewStartResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2ReviewStartResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
+export type V2ReviewStartResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ReviewStartResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ReviewStartResponse__ByteRange" });
 
 export type V2ReviewStartResponse__ImageDetail = "auto" | "low" | "high" | "original";
 export const V2ReviewStartResponse__ImageDetail = Schema.Literals([
@@ -6239,47 +8181,22 @@ export const V2ReviewStartResponse__ImageDetail = Schema.Literals([
   "low",
   "high",
   "original",
-]);
-
-export type V2ReviewStartResponse__LegacyAppPathString = string;
-export const V2ReviewStartResponse__LegacyAppPathString = Schema.String;
+]).annotate({ identifier: "V2ReviewStartResponse__ImageDetail" });
 
-export type V2ReviewStartResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
+export type V2ReviewStartResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const V2ReviewStartResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ReviewStartResponse__McpToolCallError = { readonly message: string };
-export const V2ReviewStartResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
+export const V2ReviewStartResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ReviewStartResponse__HookPromptFragment" });
 
-export type V2ReviewStartResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ReviewStartResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+export type V2ReviewStartResponse__AgentMessageDelivery = "async";
+export const V2ReviewStartResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ReviewStartResponse__AgentMessageDelivery",
 });
 
-export type V2ReviewStartResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ReviewStartResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
-
 export type V2ReviewStartResponse__MemoryCitationEntry = {
   readonly lineEnd: number;
   readonly lineStart: number;
@@ -6288,38 +8205,74 @@ export type V2ReviewStartResponse__MemoryCitationEntry = {
 };
 export const V2ReviewStartResponse__MemoryCitationEntry = Schema.Struct({
   lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   note: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2ReviewStartResponse__MemoryCitationEntry" });
 
 export type V2ReviewStartResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ReviewStartResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export const V2ReviewStartResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ReviewStartResponse__MessagePhase",
 });
 
-export type V2ReviewStartResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ReviewStartResponse__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type V2ReviewStartResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ReviewStartResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ReviewStartResponse__AsyncUserInputQuestion" });
 
-export type V2ReviewStartResponse__PatchApplyStatus =
+export type V2ReviewStartResponse__LegacyAppPathString = string;
+export const V2ReviewStartResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ReviewStartResponse__LegacyAppPathString",
+});
+
+export type V2ReviewStartResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ReviewStartResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ReviewStartResponse__CommandExecutionSource" });
+
+export type V2ReviewStartResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ReviewStartResponse__PatchApplyStatus = Schema.Literals([
+export const V2ReviewStartResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ReviewStartResponse__CommandExecutionStatus" });
 
 export type V2ReviewStartResponse__PatchChangeKind =
   | { readonly type: "add" }
@@ -6339,12 +8292,160 @@ export const V2ReviewStartResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ReviewStartResponse__PatchChangeKind" });
+
+export type V2ReviewStartResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ReviewStartResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ReviewStartResponse__PatchApplyStatus" });
+
+export type V2ReviewStartResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
+};
+export const V2ReviewStartResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ReviewStartResponse__McpToolCallAppContext" });
+
+export type V2ReviewStartResponse__McpToolCallError = { readonly message: string };
+export const V2ReviewStartResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ReviewStartResponse__McpToolCallError" });
+
+export type V2ReviewStartResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ReviewStartResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ReviewStartResponse__McpAppDisplayMode" });
+
+export type V2ReviewStartResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ReviewStartResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ReviewStartResponse__McpToolCallResult" });
+
+export type V2ReviewStartResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ReviewStartResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ReviewStartResponse__McpToolCallStatus" });
+
+export type V2ReviewStartResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ReviewStartResponse__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ReviewStartResponse__DynamicToolCallOutputContentItem" });
+
+export type V2ReviewStartResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ReviewStartResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ReviewStartResponse__DynamicToolCallStatus" });
+
+export type V2ReviewStartResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ReviewStartResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ReviewStartResponse__CollabAgentStatus" });
 
 export type V2ReviewStartResponse__ReasoningEffort = string;
 export const V2ReviewStartResponse__ReasoningEffort = Schema.String.annotate({
   description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ReviewStartResponse__ReasoningEffort",
+  }),
+);
+
+export type V2ReviewStartResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ReviewStartResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ReviewStartResponse__CollabAgentToolCallStatus" });
+
+export type V2ReviewStartResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ReviewStartResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ReviewStartResponse__CollabAgentTool" });
 
 export type V2ReviewStartResponse__SubAgentActivityKind =
   | "started"
@@ -6356,44 +8457,7 @@ export const V2ReviewStartResponse__SubAgentActivityKind = Schema.Literals([
   "interacted",
   "interrupted",
   "completed",
-]);
-
-export type V2ReviewStartResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2ReviewStartResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2ReviewStartResponse__TurnStatus =
-  | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2ReviewStartResponse__TurnStatus = Schema.Literals([
-  "completed",
-  "interrupted",
-  "failed",
-  "inProgress",
-]);
+]).annotate({ identifier: "V2ReviewStartResponse__SubAgentActivityKind" });
 
 export type V2ReviewStartResponse__WebSearchAction =
   | {
@@ -6425,13 +8489,74 @@ export const V2ReviewStartResponse__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ReviewStartResponse__WebSearchAction" });
+
+export type V2ReviewStartResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ReviewStartResponse__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ReviewStartResponse__ImageGenerationFailure" });
+
+export type V2ReviewStartResponse__AbsolutePathBuf = string;
+export const V2ReviewStartResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ReviewStartResponse__AbsolutePathBuf",
+});
+
+export type V2ReviewStartResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ReviewStartResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ReviewStartResponse__TurnItemsView" });
+
+export type V2ReviewStartResponse__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ReviewStartResponse__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2ReviewStartResponse__TurnStatus" });
 
 export type V2SendAddCreditsNudgeEmailParams__AddCreditsNudgeCreditType = "credits" | "usage_limit";
 export const V2SendAddCreditsNudgeEmailParams__AddCreditsNudgeCreditType = Schema.Literals([
   "credits",
   "usage_limit",
-]);
+]).annotate({ identifier: "V2SendAddCreditsNudgeEmailParams__AddCreditsNudgeCreditType" });
 
 export type V2SendAddCreditsNudgeEmailResponse__AddCreditsNudgeEmailStatus =
   | "sent"
@@ -6439,30 +8564,28 @@ export type V2SendAddCreditsNudgeEmailResponse__AddCreditsNudgeEmailStatus =
 export const V2SendAddCreditsNudgeEmailResponse__AddCreditsNudgeEmailStatus = Schema.Literals([
   "sent",
   "cooldown_active",
-]);
+]).annotate({ identifier: "V2SendAddCreditsNudgeEmailResponse__AddCreditsNudgeEmailStatus" });
 
 export type V2ServerRequestResolvedNotification__RequestId = string | number;
 export const V2ServerRequestResolvedNotification__RequestId = Schema.Union([
   Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-]);
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+]).annotate({ identifier: "V2ServerRequestResolvedNotification__RequestId" });
 
 export type V2SkillsConfigWriteParams__AbsolutePathBuf = string;
 export const V2SkillsConfigWriteParams__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2SkillsConfigWriteParams__AbsolutePathBuf",
 });
 
 export type V2SkillsExtraRootsSetParams__AbsolutePathBuf = string;
 export const V2SkillsExtraRootsSetParams__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2SkillsListResponse__AbsolutePathBuf = string;
-export const V2SkillsListResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2SkillsExtraRootsSetParams__AbsolutePathBuf",
 });
 
 export type V2SkillsListResponse__SkillErrorInfo = {
@@ -6472,15 +8595,7 @@ export type V2SkillsListResponse__SkillErrorInfo = {
 export const V2SkillsListResponse__SkillErrorInfo = Schema.Struct({
   message: Schema.String,
   path: Schema.String,
-});
-
-export type V2SkillsListResponse__SkillScope = "user" | "repo" | "system" | "admin";
-export const V2SkillsListResponse__SkillScope = Schema.Literals([
-  "user",
-  "repo",
-  "system",
-  "admin",
-]);
+}).annotate({ identifier: "V2SkillsListResponse__SkillErrorInfo" });
 
 export type V2SkillsListResponse__SkillToolDependency = {
   readonly command?: string | null;
@@ -6497,16 +8612,81 @@ export const V2SkillsListResponse__SkillToolDependency = Schema.Struct({
   type: Schema.String,
   url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   value: Schema.String,
+}).annotate({ identifier: "V2SkillsListResponse__SkillToolDependency" });
+
+export type V2SkillsListResponse__AbsolutePathBuf = string;
+export const V2SkillsListResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2SkillsListResponse__AbsolutePathBuf",
 });
 
-export type V2ThreadForkParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const V2ThreadForkParams__ApprovalsReviewer = Schema.Literals([
+export type V2SkillsListResponse__SkillScope = "user" | "repo" | "system" | "admin";
+export const V2SkillsListResponse__SkillScope = Schema.Literals([
   "user",
-  "auto_review",
-  "guardian_subagent",
+  "repo",
+  "system",
+  "admin",
+]).annotate({ identifier: "V2SkillsListResponse__SkillScope" });
+
+export type V2ThreadAttachmentAddResponse__ThreadAttachment = {
+  readonly attachmentType: string;
+  readonly createdAt: number;
+  readonly id: string;
+  readonly identityKey: string;
+  readonly payload: Schema.Json;
+};
+export const V2ThreadAttachmentAddResponse__ThreadAttachment = Schema.Struct({
+  attachmentType: Schema.String,
+  createdAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  id: Schema.String,
+  identityKey: Schema.String,
+  payload: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({
+  description: "An independently persisted attachment associated with a thread.",
+  identifier: "V2ThreadAttachmentAddResponse__ThreadAttachment",
+});
+
+export type V2ThreadAttachmentAddResponse__ThreadAttachmentAddOutcome = "created" | "existing";
+export const V2ThreadAttachmentAddResponse__ThreadAttachmentAddOutcome = Schema.Literals([
+  "created",
+  "existing",
 ]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  description: "Result of attempting to associate an attachment with a thread.",
+  identifier: "V2ThreadAttachmentAddResponse__ThreadAttachmentAddOutcome",
+});
+
+export type V2ThreadAttachmentListResponse__ThreadAttachment = {
+  readonly attachmentType: string;
+  readonly createdAt: number;
+  readonly id: string;
+  readonly identityKey: string;
+  readonly payload: Schema.Json;
+};
+export const V2ThreadAttachmentListResponse__ThreadAttachment = Schema.Struct({
+  attachmentType: Schema.String,
+  createdAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  id: Schema.String,
+  identityKey: Schema.String,
+  payload: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({
+  description: "An independently persisted attachment associated with a thread.",
+  identifier: "V2ThreadAttachmentListResponse__ThreadAttachment",
+});
+
+export type V2ThreadAttachmentUpdatedNotification__ThreadAttachmentOperation =
+  | "created"
+  | "deleted";
+export const V2ThreadAttachmentUpdatedNotification__ThreadAttachmentOperation = Schema.Literals([
+  "created",
+  "deleted",
+]).annotate({
+  description: "The persisted attachment change represented by a notification.",
+  identifier: "V2ThreadAttachmentUpdatedNotification__ThreadAttachmentOperation",
 });
 
 export type V2ThreadForkParams__AskForApproval =
@@ -6536,7 +8716,18 @@ export const V2ThreadForkParams__AskForApproval = Schema.Union(
     }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadForkParams__AskForApproval" });
+
+export type V2ThreadForkParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const V2ThreadForkParams__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ThreadForkParams__ApprovalsReviewer",
+});
 
 export type V2ThreadForkParams__SandboxMode =
   | "read-only"
@@ -6546,20 +8737,13 @@ export const V2ThreadForkParams__SandboxMode = Schema.Literals([
   "read-only",
   "workspace-write",
   "danger-full-access",
-]);
+]).annotate({ identifier: "V2ThreadForkParams__SandboxMode" });
 
 export type V2ThreadForkParams__ThreadSource = string;
-export const V2ThreadForkParams__ThreadSource = Schema.String;
-
-export type V2ThreadForkResponse__AbsolutePathBuf = string;
-export const V2ThreadForkResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+export const V2ThreadForkParams__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadForkParams__ThreadSource",
 });
 
-export type V2ThreadForkResponse__AgentPath = string;
-export const V2ThreadForkResponse__AgentPath = Schema.String;
-
 export type V2ThreadForkResponse__AskForApproval =
   | "untrusted"
   | "on-request"
@@ -6587,72 +8771,46 @@ export const V2ThreadForkResponse__AskForApproval = Schema.Union(
     }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadForkResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadForkResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+).annotate({ identifier: "V2ThreadForkResponse__AskForApproval" });
 
-export type V2ThreadForkResponse__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2ThreadForkResponse__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
+export type V2ThreadForkResponse__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const V2ThreadForkResponse__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ThreadForkResponse__ApprovalsReviewer",
+});
 
-export type V2ThreadForkResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadForkResponse__DynamicToolCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
-  ],
-  { mode: "oneOf" },
+export type V2ThreadForkResponse__AbsolutePathBuf = string;
+export const V2ThreadForkResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadForkResponse__AbsolutePathBuf",
+});
+
+export type V2ThreadForkResponse__LegacyAppPathString = string;
+export const V2ThreadForkResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadForkResponse__LegacyAppPathString",
+});
+
+export type V2ThreadForkResponse__ReasoningEffort = string;
+export const V2ThreadForkResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadForkResponse__ReasoningEffort",
+  }),
 );
 
-export type V2ThreadForkResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadForkResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadForkResponse__NetworkAccess = "restricted" | "enabled";
+export const V2ThreadForkResponse__NetworkAccess = Schema.Literals([
+  "restricted",
+  "enabled",
+]).annotate({ identifier: "V2ThreadForkResponse__NetworkAccess" });
 
 export type V2ThreadForkResponse__GitInfo = {
   readonly branch?: string | null;
@@ -6663,64 +8821,94 @@ export const V2ThreadForkResponse__GitInfo = Schema.Struct({
   branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ThreadForkResponse__GitInfo" });
 
-export type V2ThreadForkResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
+export type V2ThreadForkResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadForkResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadForkResponse__ThreadHistoryMode" });
+
+export type V2ThreadForkResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2ThreadForkResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
+export const V2ThreadForkResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadForkResponse__ThreadSectionAppearance",
+});
+
+export type V2ThreadForkResponse__AgentPath = string;
+export const V2ThreadForkResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadForkResponse__AgentPath",
+});
+
+export type V2ThreadForkResponse__ThreadId = string;
+export const V2ThreadForkResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadForkResponse__ThreadId",
+});
+
+export type V2ThreadForkResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
+export const V2ThreadForkResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadForkResponse__ThreadActiveFlag" });
+
+export type V2ThreadForkResponse__ThreadSource = string;
+export const V2ThreadForkResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadForkResponse__ThreadSource",
 });
 
+export type V2ThreadForkResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadForkResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadForkResponse__NonSteerableTurnKind" });
+
+export type V2ThreadForkResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadForkResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadForkResponse__MisalignmentSteer" });
+
+export type V2ThreadForkResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadForkResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadForkResponse__ByteRange" });
+
 export type V2ThreadForkResponse__ImageDetail = "auto" | "low" | "high" | "original";
 export const V2ThreadForkResponse__ImageDetail = Schema.Literals([
   "auto",
   "low",
   "high",
   "original",
-]);
+]).annotate({ identifier: "V2ThreadForkResponse__ImageDetail" });
 
-export type V2ThreadForkResponse__LegacyAppPathString = string;
-export const V2ThreadForkResponse__LegacyAppPathString = Schema.String;
-
-export type V2ThreadForkResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
+export type V2ThreadForkResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const V2ThreadForkResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ThreadForkResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadForkResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
+export const V2ThreadForkResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadForkResponse__HookPromptFragment" });
 
-export type V2ThreadForkResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ThreadForkResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+export type V2ThreadForkResponse__AgentMessageDelivery = "async";
+export const V2ThreadForkResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadForkResponse__AgentMessageDelivery",
 });
 
-export type V2ThreadForkResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadForkResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
-
 export type V2ThreadForkResponse__MemoryCitationEntry = {
   readonly lineEnd: number;
   readonly lineStart: number;
@@ -6729,38 +8917,69 @@ export type V2ThreadForkResponse__MemoryCitationEntry = {
 };
 export const V2ThreadForkResponse__MemoryCitationEntry = Schema.Struct({
   lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   note: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadForkResponse__MemoryCitationEntry" });
 
 export type V2ThreadForkResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadForkResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export const V2ThreadForkResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadForkResponse__MessagePhase",
 });
 
-export type V2ThreadForkResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadForkResponse__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type V2ThreadForkResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadForkResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadForkResponse__AsyncUserInputQuestion" });
 
-export type V2ThreadForkResponse__PatchApplyStatus =
+export type V2ThreadForkResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadForkResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadForkResponse__CommandExecutionSource" });
+
+export type V2ThreadForkResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ThreadForkResponse__PatchApplyStatus = Schema.Literals([
+export const V2ThreadForkResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadForkResponse__CommandExecutionStatus" });
 
 export type V2ThreadForkResponse__PatchChangeKind =
   | { readonly type: "add" }
@@ -6780,73 +8999,162 @@ export const V2ThreadForkResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadForkResponse__ReasoningEffort = string;
-export const V2ThreadForkResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+).annotate({ identifier: "V2ThreadForkResponse__PatchChangeKind" });
 
-export type V2ThreadForkResponse__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2ThreadForkResponse__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
+export type V2ThreadForkResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadForkResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
   "completed",
-]);
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadForkResponse__PatchApplyStatus" });
 
-export type V2ThreadForkResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadForkResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const V2ThreadForkResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export const V2ThreadForkResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadForkResponse__McpToolCallAppContext" });
 
-export type V2ThreadForkResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
-export const V2ThreadForkResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
+export type V2ThreadForkResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadForkResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadForkResponse__McpToolCallError" });
 
-export type V2ThreadForkResponse__ThreadId = string;
-export const V2ThreadForkResponse__ThreadId = Schema.String;
+export type V2ThreadForkResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadForkResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadForkResponse__McpAppDisplayMode" });
 
-export type V2ThreadForkResponse__ThreadSource = string;
-export const V2ThreadForkResponse__ThreadSource = Schema.String;
+export type V2ThreadForkResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadForkResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadForkResponse__McpToolCallResult" });
 
-export type V2ThreadForkResponse__TurnStatus =
-  | "completed"
+export type V2ThreadForkResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadForkResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadForkResponse__McpToolCallStatus" });
+
+export type V2ThreadForkResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadForkResponse__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__DynamicToolCallOutputContentItem" });
+
+export type V2ThreadForkResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadForkResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadForkResponse__DynamicToolCallStatus" });
+
+export type V2ThreadForkResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
   | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadForkResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadForkResponse__CollabAgentStatus" });
+
+export type V2ThreadForkResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
   | "failed"
-  | "inProgress";
-export const V2ThreadForkResponse__TurnStatus = Schema.Literals([
+  | "interrupted";
+export const V2ThreadForkResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "interrupted",
   "failed",
-  "inProgress",
-]);
+  "interrupted",
+]).annotate({ identifier: "V2ThreadForkResponse__CollabAgentToolCallStatus" });
+
+export type V2ThreadForkResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadForkResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadForkResponse__CollabAgentTool" });
+
+export type V2ThreadForkResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadForkResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadForkResponse__SubAgentActivityKind" });
 
 export type V2ThreadForkResponse__WebSearchAction =
   | {
@@ -6878,7 +9186,61 @@ export const V2ThreadForkResponse__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadForkResponse__WebSearchAction" });
+
+export type V2ThreadForkResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ThreadForkResponse__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__ImageGenerationFailure" });
+
+export type V2ThreadForkResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadForkResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__TurnItemsView" });
+
+export type V2ThreadForkResponse__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadForkResponse__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2ThreadForkResponse__TurnStatus" });
 
 export type V2ThreadGoalGetResponse__ThreadGoalStatus =
   | "active"
@@ -6894,7 +9256,7 @@ export const V2ThreadGoalGetResponse__ThreadGoalStatus = Schema.Literals([
   "usageLimited",
   "budgetLimited",
   "complete",
-]);
+]).annotate({ identifier: "V2ThreadGoalGetResponse__ThreadGoalStatus" });
 
 export type V2ThreadGoalSetParams__ThreadGoalStatus =
   | "active"
@@ -6910,7 +9272,7 @@ export const V2ThreadGoalSetParams__ThreadGoalStatus = Schema.Literals([
   "usageLimited",
   "budgetLimited",
   "complete",
-]);
+]).annotate({ identifier: "V2ThreadGoalSetParams__ThreadGoalStatus" });
 
 export type V2ThreadGoalSetResponse__ThreadGoalStatus =
   | "active"
@@ -6926,7 +9288,7 @@ export const V2ThreadGoalSetResponse__ThreadGoalStatus = Schema.Literals([
   "usageLimited",
   "budgetLimited",
   "complete",
-]);
+]).annotate({ identifier: "V2ThreadGoalSetResponse__ThreadGoalStatus" });
 
 export type V2ThreadGoalUpdatedNotification__ThreadGoalStatus =
   | "active"
@@ -6942,317 +9304,332 @@ export const V2ThreadGoalUpdatedNotification__ThreadGoalStatus = Schema.Literals
   "usageLimited",
   "budgetLimited",
   "complete",
-]);
+]).annotate({ identifier: "V2ThreadGoalUpdatedNotification__ThreadGoalStatus" });
 
-export type V2ThreadListParams__SortDirection = "asc" | "desc";
-export const V2ThreadListParams__SortDirection = Schema.Literals(["asc", "desc"]);
+export type V2ThreadItemsListParams__ThreadItemsListAnchor = {
+  readonly itemId: string;
+  readonly type: "item";
+};
+export const V2ThreadItemsListParams__ThreadItemsListAnchor = Schema.Union(
+  [
+    Schema.Struct({
+      itemId: Schema.String,
+      type: Schema.Literal("item").annotate({ title: "ItemThreadItemsListAnchorType" }),
+    }).annotate({ title: "ItemThreadItemsListAnchor" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "An exclusive item position within the requested visible turn.",
+  identifier: "V2ThreadItemsListParams__ThreadItemsListAnchor",
+});
 
-export type V2ThreadListParams__ThreadListCwdFilter = string | ReadonlyArray<string>;
-export const V2ThreadListParams__ThreadListCwdFilter = Schema.Union([
-  Schema.String,
-  Schema.Array(Schema.String),
-]);
+export type V2ThreadItemsListParams__SortDirection = "asc" | "desc";
+export const V2ThreadItemsListParams__SortDirection = Schema.Literals(["asc", "desc"]).annotate({
+  identifier: "V2ThreadItemsListParams__SortDirection",
+});
 
-export type V2ThreadListParams__ThreadSortKey = "created_at" | "updated_at" | "recency_at";
-export const V2ThreadListParams__ThreadSortKey = Schema.Literals([
-  "created_at",
-  "updated_at",
-  "recency_at",
-]);
+export type V2ThreadItemsListResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadItemsListResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadItemsListResponse__ByteRange" });
 
-export type V2ThreadListParams__ThreadSourceKind =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "subAgent"
-  | "subAgentReview"
-  | "subAgentCompact"
-  | "subAgentThreadSpawn"
-  | "subAgentOther"
-  | "unknown";
-export const V2ThreadListParams__ThreadSourceKind = Schema.Literals([
-  "cli",
-  "vscode",
-  "exec",
-  "appServer",
-  "subAgent",
-  "subAgentReview",
-  "subAgentCompact",
-  "subAgentThreadSpawn",
-  "subAgentOther",
-  "unknown",
-]);
+export type V2ThreadItemsListResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadItemsListResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadItemsListResponse__ImageDetail" });
 
-export type V2ThreadListResponse__AbsolutePathBuf = string;
-export const V2ThreadListResponse__AbsolutePathBuf = Schema.String.annotate({
+export type V2ThreadItemsListResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
+};
+export const V2ThreadItemsListResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadItemsListResponse__HookPromptFragment" });
+
+export type V2ThreadItemsListResponse__AgentMessageDelivery = "async";
+export const V2ThreadItemsListResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadItemsListResponse__AgentMessageDelivery",
+});
+
+export type V2ThreadItemsListResponse__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
+};
+export const V2ThreadItemsListResponse__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadItemsListResponse__MemoryCitationEntry" });
+
+export type V2ThreadItemsListResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadItemsListResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadItemsListResponse__MessagePhase",
 });
 
-export type V2ThreadListResponse__AgentPath = string;
-export const V2ThreadListResponse__AgentPath = Schema.String;
+export type V2ThreadItemsListResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadItemsListResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadItemsListResponse__AsyncUserInputQuestion" });
 
-export type V2ThreadListResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadListResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ThreadItemsListResponse__LegacyAppPathString = string;
+export const V2ThreadItemsListResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadItemsListResponse__LegacyAppPathString",
+});
 
-export type V2ThreadListResponse__CommandExecutionStatus =
+export type V2ThreadItemsListResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadItemsListResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadItemsListResponse__CommandExecutionSource" });
+
+export type V2ThreadItemsListResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ThreadListResponse__CommandExecutionStatus = Schema.Literals([
+export const V2ThreadItemsListResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadItemsListResponse__CommandExecutionStatus" });
 
-export type V2ThreadListResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadListResponse__DynamicToolCallOutputContentItem = Schema.Union(
+export type V2ThreadItemsListResponse__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2ThreadItemsListResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
     Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
     Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadItemsListResponse__PatchChangeKind" });
 
-export type V2ThreadListResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadListResponse__DynamicToolCallStatus = Schema.Literals([
+export type V2ThreadItemsListResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadItemsListResponse__PatchApplyStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2ThreadListResponse__GitInfo = {
-  readonly branch?: string | null;
-  readonly originUrl?: string | null;
-  readonly sha?: string | null;
-};
-export const V2ThreadListResponse__GitInfo = Schema.Struct({
-  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ThreadListResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2ThreadListResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
-
-export type V2ThreadListResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadListResponse__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
-
-export type V2ThreadListResponse__LegacyAppPathString = string;
-export const V2ThreadListResponse__LegacyAppPathString = Schema.String;
+  "declined",
+]).annotate({ identifier: "V2ThreadItemsListResponse__PatchApplyStatus" });
 
-export type V2ThreadListResponse__McpToolCallAppContext = {
+export type V2ThreadItemsListResponse__McpToolCallAppContext = {
   readonly actionName?: string | null;
   readonly appName?: string | null;
   readonly connectorId: string;
   readonly linkId?: string | null;
   readonly resourceUri?: string | null;
 };
-export const V2ThreadListResponse__McpToolCallAppContext = Schema.Struct({
+export const V2ThreadItemsListResponse__McpToolCallAppContext = Schema.Struct({
   actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   connectorId: Schema.String,
   linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ThreadItemsListResponse__McpToolCallAppContext" });
 
-export type V2ThreadListResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadListResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
+export type V2ThreadItemsListResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadItemsListResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadItemsListResponse__McpToolCallError" });
+
+export type V2ThreadItemsListResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadItemsListResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadItemsListResponse__McpAppDisplayMode" });
+
+export type V2ThreadItemsListResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadItemsListResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadItemsListResponse__McpToolCallResult" });
+
+export type V2ThreadItemsListResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadItemsListResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadItemsListResponse__McpToolCallStatus" });
 
-export type V2ThreadListResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ThreadListResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+export type V2ThreadItemsListResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadItemsListResponse__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadItemsListResponse__DynamicToolCallOutputContentItem" });
 
-export type V2ThreadListResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadListResponse__McpToolCallStatus = Schema.Literals([
+export type V2ThreadItemsListResponse__DynamicToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed";
+export const V2ThreadItemsListResponse__DynamicToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2ThreadListResponse__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
-};
-export const V2ThreadListResponse__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
-});
+]).annotate({ identifier: "V2ThreadItemsListResponse__DynamicToolCallStatus" });
 
-export type V2ThreadListResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadListResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
+export type V2ThreadItemsListResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadItemsListResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadItemsListResponse__CollabAgentStatus" });
 
-export type V2ThreadListResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadListResponse__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type V2ThreadItemsListResponse__ReasoningEffort = string;
+export const V2ThreadItemsListResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadItemsListResponse__ReasoningEffort",
+  }),
+);
 
-export type V2ThreadListResponse__PatchApplyStatus =
+export type V2ThreadItemsListResponse__CollabAgentToolCallStatus =
   | "inProgress"
   | "completed"
   | "failed"
-  | "declined";
-export const V2ThreadListResponse__PatchApplyStatus = Schema.Literals([
+  | "interrupted";
+export const V2ThreadItemsListResponse__CollabAgentToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
-
-export type V2ThreadListResponse__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadListResponse__PatchChangeKind = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
-  ],
-  { mode: "oneOf" },
-);
+  "interrupted",
+]).annotate({ identifier: "V2ThreadItemsListResponse__CollabAgentToolCallStatus" });
 
-export type V2ThreadListResponse__ReasoningEffort = string;
-export const V2ThreadListResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+export type V2ThreadItemsListResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadItemsListResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadItemsListResponse__CollabAgentTool" });
 
-export type V2ThreadListResponse__SubAgentActivityKind =
+export type V2ThreadItemsListResponse__SubAgentActivityKind =
   | "started"
   | "interacted"
   | "interrupted"
   | "completed";
-export const V2ThreadListResponse__SubAgentActivityKind = Schema.Literals([
+export const V2ThreadItemsListResponse__SubAgentActivityKind = Schema.Literals([
   "started",
   "interacted",
   "interrupted",
   "completed",
-]);
-
-export type V2ThreadListResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2ThreadListResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2ThreadListResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
-export const V2ThreadListResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
-
-export type V2ThreadListResponse__ThreadId = string;
-export const V2ThreadListResponse__ThreadId = Schema.String;
-
-export type V2ThreadListResponse__ThreadSource = string;
-export const V2ThreadListResponse__ThreadSource = Schema.String;
-
-export type V2ThreadListResponse__TurnStatus =
-  | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2ThreadListResponse__TurnStatus = Schema.Literals([
-  "completed",
-  "interrupted",
-  "failed",
-  "inProgress",
-]);
+]).annotate({ identifier: "V2ThreadItemsListResponse__SubAgentActivityKind" });
 
-export type V2ThreadListResponse__WebSearchAction =
+export type V2ThreadItemsListResponse__WebSearchAction =
   | {
       readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
@@ -7261,7 +9638,7 @@ export type V2ThreadListResponse__WebSearchAction =
   | { readonly type: "openPage"; readonly url?: string | null }
   | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
   | { readonly type: "other" };
-export const V2ThreadListResponse__WebSearchAction = Schema.Union(
+export const V2ThreadItemsListResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
       queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
@@ -7282,241 +9659,283 @@ export const V2ThreadListResponse__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadItemsListResponse__WebSearchAction" });
 
-export type V2ThreadMetadataUpdateParams__ThreadMetadataGitInfoUpdateParams = {
-  readonly branch?: string | null;
-  readonly originUrl?: string | null;
-  readonly sha?: string | null;
+export type V2ThreadItemsListResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const V2ThreadMetadataUpdateParams__ThreadMetadataGitInfoUpdateParams = Schema.Struct({
-  branch: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Omit to leave the stored branch unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  originUrl: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Omit to leave the stored origin URL unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  sha: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Omit to leave the stored commit unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
+export const V2ThreadItemsListResponse__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-      Schema.Null,
-    ]),
-  ),
-});
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadItemsListResponse__ImageGenerationFailure" });
 
-export type V2ThreadMetadataUpdateResponse__AbsolutePathBuf = string;
-export const V2ThreadMetadataUpdateResponse__AbsolutePathBuf = Schema.String.annotate({
+export type V2ThreadItemsListResponse__AbsolutePathBuf = string;
+export const V2ThreadItemsListResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadItemsListResponse__AbsolutePathBuf",
 });
 
-export type V2ThreadMetadataUpdateResponse__AgentPath = string;
-export const V2ThreadMetadataUpdateResponse__AgentPath = Schema.String;
+export type V2ThreadListParams__ThreadListCwdFilter = string | ReadonlyArray<string>;
+export const V2ThreadListParams__ThreadListCwdFilter = Schema.Union([
+  Schema.String,
+  Schema.Array(Schema.String),
+]).annotate({ identifier: "V2ThreadListParams__ThreadListCwdFilter" });
 
-export type V2ThreadMetadataUpdateResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadMetadataUpdateResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ThreadListParams__SortDirection = "asc" | "desc";
+export const V2ThreadListParams__SortDirection = Schema.Literals(["asc", "desc"]).annotate({
+  identifier: "V2ThreadListParams__SortDirection",
+});
 
-export type V2ThreadMetadataUpdateResponse__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2ThreadMetadataUpdateResponse__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
+export type V2ThreadListParams__ThreadSortKey =
+  | "created_at"
+  | "updated_at"
+  | "recency_at"
+  | "section_position";
+export const V2ThreadListParams__ThreadSortKey = Schema.Literals([
+  "created_at",
+  "updated_at",
+  "recency_at",
+  "section_position",
+]).annotate({ identifier: "V2ThreadListParams__ThreadSortKey" });
 
-export type V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadListParams__ThreadSourceKind =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "subAgent"
+  | "subAgentReview"
+  | "subAgentCompact"
+  | "subAgentThreadSpawn"
+  | "subAgentOther"
+  | "unknown";
+export const V2ThreadListParams__ThreadSourceKind = Schema.Literals([
+  "cli",
+  "vscode",
+  "exec",
+  "appServer",
+  "subAgent",
+  "subAgentReview",
+  "subAgentCompact",
+  "subAgentThreadSpawn",
+  "subAgentOther",
+  "unknown",
+]).annotate({ identifier: "V2ThreadListParams__ThreadSourceKind" });
 
-export type V2ThreadMetadataUpdateResponse__DynamicToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed";
-export const V2ThreadMetadataUpdateResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadListResponse__AbsolutePathBuf = string;
+export const V2ThreadListResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadListResponse__AbsolutePathBuf",
+});
 
-export type V2ThreadMetadataUpdateResponse__GitInfo = {
+export type V2ThreadListResponse__GitInfo = {
   readonly branch?: string | null;
   readonly originUrl?: string | null;
   readonly sha?: string | null;
 };
-export const V2ThreadMetadataUpdateResponse__GitInfo = Schema.Struct({
+export const V2ThreadListResponse__GitInfo = Schema.Struct({
   branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ThreadListResponse__GitInfo" });
 
-export type V2ThreadMetadataUpdateResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
+export type V2ThreadListResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadListResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadListResponse__ThreadHistoryMode" });
+
+export type V2ThreadListResponse__ReasoningEffort = string;
+export const V2ThreadListResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadListResponse__ReasoningEffort",
+  }),
+);
+
+export type V2ThreadListResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2ThreadMetadataUpdateResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
+export const V2ThreadListResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadListResponse__ThreadSectionAppearance",
 });
 
-export type V2ThreadMetadataUpdateResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadMetadataUpdateResponse__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
+export type V2ThreadListResponse__AgentPath = string;
+export const V2ThreadListResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadListResponse__AgentPath",
+});
 
-export type V2ThreadMetadataUpdateResponse__LegacyAppPathString = string;
-export const V2ThreadMetadataUpdateResponse__LegacyAppPathString = Schema.String;
+export type V2ThreadListResponse__ThreadId = string;
+export const V2ThreadListResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadListResponse__ThreadId",
+});
 
-export type V2ThreadMetadataUpdateResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
-};
-export const V2ThreadMetadataUpdateResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export type V2ThreadListResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
+export const V2ThreadListResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadListResponse__ThreadActiveFlag" });
+
+export type V2ThreadListResponse__ThreadSource = string;
+export const V2ThreadListResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadListResponse__ThreadSource",
 });
 
-export type V2ThreadMetadataUpdateResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadMetadataUpdateResponse__McpToolCallError = Schema.Struct({
+export type V2ThreadListResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadListResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadListResponse__NonSteerableTurnKind" });
+
+export type V2ThreadListResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadListResponse__MisalignmentSteer = Schema.Struct({
   message: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadListResponse__MisalignmentSteer" });
 
-export type V2ThreadMetadataUpdateResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
+export type V2ThreadListResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadListResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadListResponse__ByteRange" });
+
+export type V2ThreadListResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadListResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadListResponse__ImageDetail" });
+
+export type V2ThreadListResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const V2ThreadMetadataUpdateResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+export const V2ThreadListResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadListResponse__HookPromptFragment" });
 
-export type V2ThreadMetadataUpdateResponse__McpToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed";
-export const V2ThreadMetadataUpdateResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadListResponse__AgentMessageDelivery = "async";
+export const V2ThreadListResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadListResponse__AgentMessageDelivery",
+});
 
-export type V2ThreadMetadataUpdateResponse__MemoryCitationEntry = {
+export type V2ThreadListResponse__MemoryCitationEntry = {
   readonly lineEnd: number;
   readonly lineStart: number;
   readonly note: string;
   readonly path: string;
 };
-export const V2ThreadMetadataUpdateResponse__MemoryCitationEntry = Schema.Struct({
+export const V2ThreadListResponse__MemoryCitationEntry = Schema.Struct({
   lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   note: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadListResponse__MemoryCitationEntry" });
 
-export type V2ThreadMetadataUpdateResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadMetadataUpdateResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export type V2ThreadListResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadListResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadListResponse__MessagePhase",
 });
 
-export type V2ThreadMetadataUpdateResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadMetadataUpdateResponse__NonSteerableTurnKind = Schema.Literals([
-  "review",
-  "compact",
-]);
+export type V2ThreadListResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadListResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadListResponse__AsyncUserInputQuestion" });
 
-export type V2ThreadMetadataUpdateResponse__PatchApplyStatus =
+export type V2ThreadListResponse__LegacyAppPathString = string;
+export const V2ThreadListResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadListResponse__LegacyAppPathString",
+});
+
+export type V2ThreadListResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadListResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadListResponse__CommandExecutionSource" });
+
+export type V2ThreadListResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ThreadMetadataUpdateResponse__PatchApplyStatus = Schema.Literals([
+export const V2ThreadListResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadListResponse__CommandExecutionStatus" });
 
-export type V2ThreadMetadataUpdateResponse__PatchChangeKind =
+export type V2ThreadListResponse__PatchChangeKind =
   | { readonly type: "add" }
   | { readonly type: "delete" }
   | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadMetadataUpdateResponse__PatchChangeKind = Schema.Union(
+export const V2ThreadListResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
       type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
@@ -7530,77 +9949,164 @@ export const V2ThreadMetadataUpdateResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadMetadataUpdateResponse__ReasoningEffort = string;
-export const V2ThreadMetadataUpdateResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+).annotate({ identifier: "V2ThreadListResponse__PatchChangeKind" });
 
-export type V2ThreadMetadataUpdateResponse__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2ThreadMetadataUpdateResponse__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
+export type V2ThreadListResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadListResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
   "completed",
-]);
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadListResponse__PatchApplyStatus" });
 
-export type V2ThreadMetadataUpdateResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadListResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const V2ThreadMetadataUpdateResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export const V2ThreadListResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadListResponse__McpToolCallAppContext" });
 
-export type V2ThreadMetadataUpdateResponse__ThreadActiveFlag =
-  | "waitingOnApproval"
-  | "waitingOnUserInput";
-export const V2ThreadMetadataUpdateResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
+export type V2ThreadListResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadListResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadListResponse__McpToolCallError" });
 
-export type V2ThreadMetadataUpdateResponse__ThreadId = string;
-export const V2ThreadMetadataUpdateResponse__ThreadId = Schema.String;
+export type V2ThreadListResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadListResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadListResponse__McpAppDisplayMode" });
 
-export type V2ThreadMetadataUpdateResponse__ThreadSource = string;
-export const V2ThreadMetadataUpdateResponse__ThreadSource = Schema.String;
+export type V2ThreadListResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadListResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadListResponse__McpToolCallResult" });
 
-export type V2ThreadMetadataUpdateResponse__TurnStatus =
-  | "completed"
+export type V2ThreadListResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadListResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadListResponse__McpToolCallStatus" });
+
+export type V2ThreadListResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadListResponse__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__DynamicToolCallOutputContentItem" });
+
+export type V2ThreadListResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadListResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadListResponse__DynamicToolCallStatus" });
+
+export type V2ThreadListResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
   | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadListResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadListResponse__CollabAgentStatus" });
+
+export type V2ThreadListResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
   | "failed"
-  | "inProgress";
-export const V2ThreadMetadataUpdateResponse__TurnStatus = Schema.Literals([
+  | "interrupted";
+export const V2ThreadListResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "interrupted",
   "failed",
-  "inProgress",
-]);
+  "interrupted",
+]).annotate({ identifier: "V2ThreadListResponse__CollabAgentToolCallStatus" });
 
-export type V2ThreadMetadataUpdateResponse__WebSearchAction =
+export type V2ThreadListResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadListResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadListResponse__CollabAgentTool" });
+
+export type V2ThreadListResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadListResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadListResponse__SubAgentActivityKind" });
+
+export type V2ThreadListResponse__WebSearchAction =
   | {
       readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
@@ -7609,7 +10115,7 @@ export type V2ThreadMetadataUpdateResponse__WebSearchAction =
   | { readonly type: "openPage"; readonly url?: string | null }
   | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
   | { readonly type: "other" };
-export const V2ThreadMetadataUpdateResponse__WebSearchAction = Schema.Union(
+export const V2ThreadListResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
       queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
@@ -7630,195 +10136,298 @@ export const V2ThreadMetadataUpdateResponse__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadListResponse__WebSearchAction" });
 
-export type V2ThreadReadResponse__AbsolutePathBuf = string;
-export const V2ThreadReadResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2ThreadReadResponse__AgentPath = string;
-export const V2ThreadReadResponse__AgentPath = Schema.String;
+export type V2ThreadListResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ThreadListResponse__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__ImageGenerationFailure" });
 
-export type V2ThreadReadResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadReadResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ThreadListResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadListResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__TurnItemsView" });
 
-export type V2ThreadReadResponse__CommandExecutionStatus =
-  | "inProgress"
+export type V2ThreadListResponse__TurnStatus =
   | "completed"
+  | "interrupted"
   | "failed"
-  | "declined";
-export const V2ThreadReadResponse__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
+  | "inProgress";
+export const V2ThreadListResponse__TurnStatus = Schema.Literals([
   "completed",
+  "interrupted",
   "failed",
-  "declined",
-]);
+  "inProgress",
+]).annotate({ identifier: "V2ThreadListResponse__TurnStatus" });
 
-export type V2ThreadReadResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadReadResponse__DynamicToolCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
+export type V2ThreadMetadataUpdateParams__ThreadMetadataGitInfoUpdateParams = {
+  readonly branch?: string | null;
+  readonly originUrl?: string | null;
+  readonly sha?: string | null;
+};
+export const V2ThreadMetadataUpdateParams__ThreadMetadataGitInfoUpdateParams = Schema.Struct({
+  branch: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Omit to leave the stored branch unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
       }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
+      Schema.Null,
+    ]),
+  ),
+  originUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Omit to leave the stored origin URL unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
       }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
+      Schema.Null,
+    ]),
+  ),
+  sha: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Omit to leave the stored commit unchanged, set to `null` to clear it, or provide a non-empty string to replace it.",
       }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadMetadataUpdateParams__ThreadMetadataGitInfoUpdateParams" });
 
-export type V2ThreadReadResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadReadResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadMetadataUpdateResponse__AbsolutePathBuf = string;
+export const V2ThreadMetadataUpdateResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadMetadataUpdateResponse__AbsolutePathBuf",
+});
 
-export type V2ThreadReadResponse__GitInfo = {
+export type V2ThreadMetadataUpdateResponse__GitInfo = {
   readonly branch?: string | null;
   readonly originUrl?: string | null;
   readonly sha?: string | null;
 };
-export const V2ThreadReadResponse__GitInfo = Schema.Struct({
+export const V2ThreadMetadataUpdateResponse__GitInfo = Schema.Struct({
   branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__GitInfo" });
 
-export type V2ThreadReadResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
+export type V2ThreadMetadataUpdateResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadMetadataUpdateResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__ThreadHistoryMode" });
+
+export type V2ThreadMetadataUpdateResponse__ReasoningEffort = string;
+export const V2ThreadMetadataUpdateResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadMetadataUpdateResponse__ReasoningEffort",
+  }),
+);
+
+export type V2ThreadMetadataUpdateResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2ThreadReadResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
+export const V2ThreadMetadataUpdateResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadMetadataUpdateResponse__ThreadSectionAppearance",
 });
 
-export type V2ThreadReadResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadReadResponse__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
+export type V2ThreadMetadataUpdateResponse__AgentPath = string;
+export const V2ThreadMetadataUpdateResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadMetadataUpdateResponse__AgentPath",
+});
 
-export type V2ThreadReadResponse__LegacyAppPathString = string;
-export const V2ThreadReadResponse__LegacyAppPathString = Schema.String;
+export type V2ThreadMetadataUpdateResponse__ThreadId = string;
+export const V2ThreadMetadataUpdateResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadMetadataUpdateResponse__ThreadId",
+});
 
-export type V2ThreadReadResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
-};
-export const V2ThreadReadResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export type V2ThreadMetadataUpdateResponse__ThreadActiveFlag =
+  | "waitingOnApproval"
+  | "waitingOnUserInput";
+export const V2ThreadMetadataUpdateResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__ThreadActiveFlag" });
+
+export type V2ThreadMetadataUpdateResponse__ThreadSource = string;
+export const V2ThreadMetadataUpdateResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadMetadataUpdateResponse__ThreadSource",
 });
 
-export type V2ThreadReadResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadReadResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
+export type V2ThreadMetadataUpdateResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadMetadataUpdateResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__NonSteerableTurnKind" });
 
-export type V2ThreadReadResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
+export type V2ThreadMetadataUpdateResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadMetadataUpdateResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__MisalignmentSteer" });
+
+export type V2ThreadMetadataUpdateResponse__ByteRange = {
+  readonly end: number;
+  readonly start: number;
 };
-export const V2ThreadReadResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+export const V2ThreadMetadataUpdateResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__ByteRange" });
 
-export type V2ThreadReadResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadReadResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadMetadataUpdateResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadMetadataUpdateResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__ImageDetail" });
 
-export type V2ThreadReadResponse__MemoryCitationEntry = {
+export type V2ThreadMetadataUpdateResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
+};
+export const V2ThreadMetadataUpdateResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__HookPromptFragment" });
+
+export type V2ThreadMetadataUpdateResponse__AgentMessageDelivery = "async";
+export const V2ThreadMetadataUpdateResponse__AgentMessageDelivery = Schema.Literal(
+  "async",
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__AgentMessageDelivery" });
+
+export type V2ThreadMetadataUpdateResponse__MemoryCitationEntry = {
   readonly lineEnd: number;
   readonly lineStart: number;
   readonly note: string;
   readonly path: string;
 };
-export const V2ThreadReadResponse__MemoryCitationEntry = Schema.Struct({
+export const V2ThreadMetadataUpdateResponse__MemoryCitationEntry = Schema.Struct({
   lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   note: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__MemoryCitationEntry" });
 
-export type V2ThreadReadResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadReadResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export type V2ThreadMetadataUpdateResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadMetadataUpdateResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadMetadataUpdateResponse__MessagePhase",
 });
 
-export type V2ThreadReadResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadReadResponse__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type V2ThreadMetadataUpdateResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadMetadataUpdateResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__AsyncUserInputQuestion" });
 
-export type V2ThreadReadResponse__PatchApplyStatus =
+export type V2ThreadMetadataUpdateResponse__LegacyAppPathString = string;
+export const V2ThreadMetadataUpdateResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadMetadataUpdateResponse__LegacyAppPathString",
+});
+
+export type V2ThreadMetadataUpdateResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadMetadataUpdateResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__CommandExecutionSource" });
+
+export type V2ThreadMetadataUpdateResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ThreadReadResponse__PatchApplyStatus = Schema.Literals([
+export const V2ThreadMetadataUpdateResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__CommandExecutionStatus" });
 
-export type V2ThreadReadResponse__PatchChangeKind =
+export type V2ThreadMetadataUpdateResponse__PatchChangeKind =
   | { readonly type: "add" }
   | { readonly type: "delete" }
   | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadReadResponse__PatchChangeKind = Schema.Union(
+export const V2ThreadMetadataUpdateResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
       type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
@@ -7832,580 +10441,451 @@ export const V2ThreadReadResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadReadResponse__ReasoningEffort = string;
-export const V2ThreadReadResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__PatchChangeKind" });
 
-export type V2ThreadReadResponse__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2ThreadReadResponse__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
+export type V2ThreadMetadataUpdateResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadMetadataUpdateResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
   "completed",
-]);
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__PatchApplyStatus" });
 
-export type V2ThreadReadResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadMetadataUpdateResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const V2ThreadReadResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export const V2ThreadMetadataUpdateResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__McpToolCallAppContext" });
 
-export type V2ThreadReadResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
-export const V2ThreadReadResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
+export type V2ThreadMetadataUpdateResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadMetadataUpdateResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__McpToolCallError" });
 
-export type V2ThreadReadResponse__ThreadId = string;
-export const V2ThreadReadResponse__ThreadId = Schema.String;
+export type V2ThreadMetadataUpdateResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadMetadataUpdateResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__McpAppDisplayMode" });
 
-export type V2ThreadReadResponse__ThreadSource = string;
-export const V2ThreadReadResponse__ThreadSource = Schema.String;
+export type V2ThreadMetadataUpdateResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadMetadataUpdateResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__McpToolCallResult" });
 
-export type V2ThreadReadResponse__TurnStatus =
+export type V2ThreadMetadataUpdateResponse__McpToolCallStatus =
+  | "inProgress"
   | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2ThreadReadResponse__TurnStatus = Schema.Literals([
+  | "failed";
+export const V2ThreadMetadataUpdateResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "interrupted",
   "failed",
-  "inProgress",
-]);
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__McpToolCallStatus" });
 
-export type V2ThreadReadResponse__WebSearchAction =
-  | {
-      readonly queries?: ReadonlyArray<string> | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly type: "openPage"; readonly url?: string | null }
-  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
-  | { readonly type: "other" };
-export const V2ThreadReadResponse__WebSearchAction = Schema.Union(
-  [
-    Schema.Struct({
-      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
-    }).annotate({ title: "SearchWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageWebSearchAction" }),
-    Schema.Struct({
-      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
-    }).annotate({ title: "OtherWebSearchAction" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadRealtimeOutputAudioDeltaNotification__ThreadRealtimeAudioChunk = {
-  readonly data: string;
-  readonly itemId?: string | null;
-  readonly numChannels: number;
-  readonly sampleRate: number;
-  readonly samplesPerChannel?: number | null;
-};
-export const V2ThreadRealtimeOutputAudioDeltaNotification__ThreadRealtimeAudioChunk = Schema.Struct(
-  {
-    data: Schema.String,
-    itemId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    numChannels: Schema.Number.annotate({ format: "uint16" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    sampleRate: Schema.Number.annotate({ format: "uint32" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    samplesPerChannel: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint32" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-        Schema.Null,
-      ]),
-    ),
-  },
-).annotate({ description: "EXPERIMENTAL - thread realtime audio chunk." });
-
-export type V2ThreadRealtimeStartedNotification__RealtimeConversationVersion = "v1" | "v2" | "v3";
-export const V2ThreadRealtimeStartedNotification__RealtimeConversationVersion = Schema.Literals([
-  "v1",
-  "v2",
-  "v3",
-]);
-
-export type V2ThreadResumeParams__AgentMessageInputContent =
-  | { readonly text: string; readonly type: "input_text" }
-  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
-export const V2ThreadResumeParams__AgentMessageInputContent = Schema.Union(
+export type V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
-      type: Schema.Literal("input_text").annotate({
-        title: "InputTextAgentMessageInputContentType",
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
       }),
-    }).annotate({ title: "InputTextAgentMessageInputContent" }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      encrypted_content: Schema.String,
-      type: Schema.Literal("encrypted_content").annotate({
-        title: "EncryptedContentAgentMessageInputContentType",
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
       }),
-    }).annotate({ title: "EncryptedContentAgentMessageInputContent" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadResumeParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const V2ThreadResumeParams__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
-
-export type V2ThreadResumeParams__AskForApproval =
-  | "untrusted"
-  | "on-request"
-  | "never"
-  | {
-      readonly granular: {
-        readonly mcp_elicitations: boolean;
-        readonly request_permissions?: boolean;
-        readonly rules: boolean;
-        readonly sandbox_approval: boolean;
-        readonly skill_approval?: boolean;
-      };
-    };
-export const V2ThreadResumeParams__AskForApproval = Schema.Union(
-  [
-    Schema.Literals(["untrusted", "on-request", "never"]),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      granular: Schema.Struct({
-        mcp_elicitations: Schema.Boolean,
-        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        rules: Schema.Boolean,
-        sandbox_approval: Schema.Boolean,
-        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
       }),
-    }).annotate({ title: "GranularAskForApproval" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadResumeParams__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadResumeParams__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
-
-export type V2ThreadResumeParams__InternalChatMessageMetadataPassthrough = {
-  readonly turn_id?: string | null;
-};
-export const V2ThreadResumeParams__InternalChatMessageMetadataPassthrough = Schema.Struct({
-  turn_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({
-  description:
-    "Internal Responses API passthrough metadata copied into underlying chat messages.\n\nResponses API strongly types this payload. Do not modify it without first getting API approval and making the corresponding Responses API change.",
-});
-
-export type V2ThreadResumeParams__LocalShellAction = {
-  readonly command: ReadonlyArray<string>;
-  readonly env?: { readonly [x: string]: string } | null;
-  readonly timeout_ms?: number | null;
-  readonly type: "exec";
-  readonly user?: string | null;
-  readonly working_directory?: string | null;
-};
-export const V2ThreadResumeParams__LocalShellAction = Schema.Union(
-  [
-    Schema.Struct({
-      command: Schema.Array(Schema.String),
-      env: Schema.optionalKey(
-        Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-      ),
-      timeout_ms: Schema.optionalKey(
-        Schema.Union([
-          Schema.Number.annotate({ format: "uint64" })
-            .check(Schema.isInt())
-            .check(Schema.isGreaterThanOrEqualTo(0)),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("exec").annotate({ title: "ExecLocalShellActionType" }),
-      user: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      working_directory: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "ExecLocalShellAction" }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem" });
 
-export type V2ThreadResumeParams__LocalShellStatus = "completed" | "in_progress" | "incomplete";
-export const V2ThreadResumeParams__LocalShellStatus = Schema.Literals([
+export type V2ThreadMetadataUpdateResponse__DynamicToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed";
+export const V2ThreadMetadataUpdateResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "in_progress",
-  "incomplete",
-]);
+  "failed",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__DynamicToolCallStatus" });
 
-export type V2ThreadResumeParams__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadResumeParams__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
+export type V2ThreadMetadataUpdateResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadMetadataUpdateResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__CollabAgentStatus" });
 
-export type V2ThreadResumeParams__Personality = "none" | "friendly" | "pragmatic";
-export const V2ThreadResumeParams__Personality = Schema.Literals(["none", "friendly", "pragmatic"]);
+export type V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus" });
 
-export type V2ThreadResumeParams__ReasoningItemContent =
-  | { readonly text: string; readonly type: "reasoning_text" }
-  | { readonly text: string; readonly type: "text" };
-export const V2ThreadResumeParams__ReasoningItemContent = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("reasoning_text").annotate({
-        title: "ReasoningTextReasoningItemContentType",
-      }),
-    }).annotate({ title: "ReasoningTextReasoningItemContent" }),
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("text").annotate({ title: "TextReasoningItemContentType" }),
-    }).annotate({ title: "TextReasoningItemContent" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadMetadataUpdateResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadMetadataUpdateResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__CollabAgentTool" });
 
-export type V2ThreadResumeParams__ReasoningItemReasoningSummary = {
-  readonly text: string;
-  readonly type: "summary_text";
-};
-export const V2ThreadResumeParams__ReasoningItemReasoningSummary = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("summary_text").annotate({
-        title: "SummaryTextReasoningItemReasoningSummaryType",
-      }),
-    }).annotate({ title: "SummaryTextReasoningItemReasoningSummary" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadMetadataUpdateResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadMetadataUpdateResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__SubAgentActivityKind" });
 
-export type V2ThreadResumeParams__ResponsesApiWebSearchAction =
+export type V2ThreadMetadataUpdateResponse__WebSearchAction =
   | {
       readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
       readonly type: "search";
     }
-  | { readonly type: "open_page"; readonly url?: string | null }
-  | {
-      readonly pattern?: string | null;
-      readonly type: "find_in_page";
-      readonly url?: string | null;
-    }
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
   | { readonly type: "other" };
-export const V2ThreadResumeParams__ResponsesApiWebSearchAction = Schema.Union(
+export const V2ThreadMetadataUpdateResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
       queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
       query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchResponsesApiWebSearchActionType" }),
-    }).annotate({ title: "SearchResponsesApiWebSearchAction" }),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
     Schema.Struct({
-      type: Schema.Literal("open_page").annotate({
-        title: "OpenPageResponsesApiWebSearchActionType",
-      }),
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
       url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageResponsesApiWebSearchAction" }),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
     Schema.Struct({
       pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("find_in_page").annotate({
-        title: "FindInPageResponsesApiWebSearchActionType",
-      }),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
       url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageResponsesApiWebSearchAction" }),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
     Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherResponsesApiWebSearchActionType" }),
-    }).annotate({ title: "OtherResponsesApiWebSearchAction" }),
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadResumeParams__SandboxMode =
-  | "read-only"
-  | "workspace-write"
-  | "danger-full-access";
-export const V2ThreadResumeParams__SandboxMode = Schema.Literals([
-  "read-only",
-  "workspace-write",
-  "danger-full-access",
-]);
-
-export type V2ThreadResumeParams__SortDirection = "asc" | "desc";
-export const V2ThreadResumeParams__SortDirection = Schema.Literals(["asc", "desc"]);
-
-export type V2ThreadResumeParams__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadResumeParams__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
-
-export type V2ThreadResumeResponse__AbsolutePathBuf = string;
-export const V2ThreadResumeResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2ThreadResumeResponse__AgentPath = string;
-export const V2ThreadResumeResponse__AgentPath = Schema.String;
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__WebSearchAction" });
 
-export type V2ThreadResumeResponse__AskForApproval =
-  | "untrusted"
-  | "on-request"
-  | "never"
-  | {
-      readonly granular: {
-        readonly mcp_elicitations: boolean;
-        readonly request_permissions?: boolean;
-        readonly rules: boolean;
-        readonly sandbox_approval: boolean;
-        readonly skill_approval?: boolean;
-      };
-    };
-export const V2ThreadResumeResponse__AskForApproval = Schema.Union(
+export type V2ThreadMetadataUpdateResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ThreadMetadataUpdateResponse__ImageGenerationFailure = Schema.Union(
   [
-    Schema.Literals(["untrusted", "on-request", "never"]),
     Schema.Struct({
-      granular: Schema.Struct({
-        mcp_elicitations: Schema.Boolean,
-        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        rules: Schema.Boolean,
-        sandbox_approval: Schema.Boolean,
-        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-    }).annotate({ title: "GranularAskForApproval" }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadResumeResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadResumeResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
-
-export type V2ThreadResumeResponse__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2ThreadResumeResponse__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__ImageGenerationFailure" });
 
-export type V2ThreadResumeResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadResumeResponse__DynamicToolCallOutputContentItem = Schema.Union(
+export type V2ThreadMetadataUpdateResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadMetadataUpdateResponse__TurnItemsView = Schema.Union(
   [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__TurnItemsView" });
 
-export type V2ThreadResumeResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadResumeResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
+export type V2ThreadMetadataUpdateResponse__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadMetadataUpdateResponse__TurnStatus = Schema.Literals([
   "completed",
+  "interrupted",
   "failed",
-]);
+  "inProgress",
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__TurnStatus" });
 
-export type V2ThreadResumeResponse__GitInfo = {
+export type V2ThreadReadResponse__AbsolutePathBuf = string;
+export const V2ThreadReadResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadReadResponse__AbsolutePathBuf",
+});
+
+export type V2ThreadReadResponse__GitInfo = {
   readonly branch?: string | null;
   readonly originUrl?: string | null;
   readonly sha?: string | null;
 };
-export const V2ThreadResumeResponse__GitInfo = Schema.Struct({
+export const V2ThreadReadResponse__GitInfo = Schema.Struct({
   branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ThreadResumeResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2ThreadResumeResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadReadResponse__GitInfo" });
 
-export type V2ThreadResumeResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadResumeResponse__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
+export type V2ThreadReadResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadReadResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadReadResponse__ThreadHistoryMode" });
 
-export type V2ThreadResumeResponse__LegacyAppPathString = string;
-export const V2ThreadResumeResponse__LegacyAppPathString = Schema.String;
+export type V2ThreadReadResponse__ReasoningEffort = string;
+export const V2ThreadReadResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadReadResponse__ReasoningEffort",
+  }),
+);
 
-export type V2ThreadResumeResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
+export type V2ThreadReadResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2ThreadResumeResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export const V2ThreadReadResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadReadResponse__ThreadSectionAppearance",
 });
 
-export type V2ThreadResumeResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadResumeResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
+export type V2ThreadReadResponse__AgentPath = string;
+export const V2ThreadReadResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadReadResponse__AgentPath",
+});
 
-export type V2ThreadResumeResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ThreadResumeResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+export type V2ThreadReadResponse__ThreadId = string;
+export const V2ThreadReadResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadReadResponse__ThreadId",
 });
 
-export type V2ThreadResumeResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadResumeResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadReadResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
+export const V2ThreadReadResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadReadResponse__ThreadActiveFlag" });
 
-export type V2ThreadResumeResponse__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
-};
-export const V2ThreadResumeResponse__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
+export type V2ThreadReadResponse__ThreadSource = string;
+export const V2ThreadReadResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadReadResponse__ThreadSource",
 });
 
-export type V2ThreadResumeResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadResumeResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
+export type V2ThreadReadResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadReadResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadReadResponse__NonSteerableTurnKind" });
 
-export type V2ThreadResumeResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadResumeResponse__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type V2ThreadReadResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadReadResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadReadResponse__MisalignmentSteer" });
 
-export type V2ThreadResumeResponse__PatchApplyStatus =
+export type V2ThreadReadResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadReadResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadReadResponse__ByteRange" });
+
+export type V2ThreadReadResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadReadResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadReadResponse__ImageDetail" });
+
+export type V2ThreadReadResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
+};
+export const V2ThreadReadResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadReadResponse__HookPromptFragment" });
+
+export type V2ThreadReadResponse__AgentMessageDelivery = "async";
+export const V2ThreadReadResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadReadResponse__AgentMessageDelivery",
+});
+
+export type V2ThreadReadResponse__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
+};
+export const V2ThreadReadResponse__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadReadResponse__MemoryCitationEntry" });
+
+export type V2ThreadReadResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadReadResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadReadResponse__MessagePhase",
+});
+
+export type V2ThreadReadResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadReadResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadReadResponse__AsyncUserInputQuestion" });
+
+export type V2ThreadReadResponse__LegacyAppPathString = string;
+export const V2ThreadReadResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadReadResponse__LegacyAppPathString",
+});
+
+export type V2ThreadReadResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadReadResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadReadResponse__CommandExecutionSource" });
+
+export type V2ThreadReadResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ThreadResumeResponse__PatchApplyStatus = Schema.Literals([
+export const V2ThreadReadResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadReadResponse__CommandExecutionStatus" });
 
-export type V2ThreadResumeResponse__PatchChangeKind =
+export type V2ThreadReadResponse__PatchChangeKind =
   | { readonly type: "add" }
   | { readonly type: "delete" }
   | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadResumeResponse__PatchChangeKind = Schema.Union(
+export const V2ThreadReadResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
       type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
@@ -8419,150 +10899,69 @@ export const V2ThreadResumeResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadResumeResponse__ReasoningEffort = string;
-export const V2ThreadResumeResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
-
-export type V2ThreadResumeResponse__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2ThreadResumeResponse__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
-  "completed",
-]);
+).annotate({ identifier: "V2ThreadReadResponse__PatchChangeKind" });
 
-export type V2ThreadResumeResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2ThreadResumeResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2ThreadResumeResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
-export const V2ThreadResumeResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
-
-export type V2ThreadResumeResponse__ThreadId = string;
-export const V2ThreadResumeResponse__ThreadId = Schema.String;
-
-export type V2ThreadResumeResponse__ThreadSource = string;
-export const V2ThreadResumeResponse__ThreadSource = Schema.String;
-
-export type V2ThreadResumeResponse__TurnStatus =
+export type V2ThreadReadResponse__PatchApplyStatus =
+  | "inProgress"
   | "completed"
-  | "interrupted"
   | "failed"
-  | "inProgress";
-export const V2ThreadResumeResponse__TurnStatus = Schema.Literals([
+  | "declined";
+export const V2ThreadReadResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "interrupted",
   "failed",
-  "inProgress",
-]);
+  "declined",
+]).annotate({ identifier: "V2ThreadReadResponse__PatchApplyStatus" });
 
-export type V2ThreadResumeResponse__WebSearchAction =
-  | {
-      readonly queries?: ReadonlyArray<string> | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly type: "openPage"; readonly url?: string | null }
-  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
-  | { readonly type: "other" };
-export const V2ThreadResumeResponse__WebSearchAction = Schema.Union(
-  [
-    Schema.Struct({
-      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
-    }).annotate({ title: "SearchWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageWebSearchAction" }),
-    Schema.Struct({
-      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
-    }).annotate({ title: "OtherWebSearchAction" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadReadResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
+};
+export const V2ThreadReadResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadReadResponse__McpToolCallAppContext" });
 
-export type V2ThreadRollbackResponse__AbsolutePathBuf = string;
-export const V2ThreadRollbackResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+export type V2ThreadReadResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadReadResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadReadResponse__McpToolCallError" });
 
-export type V2ThreadRollbackResponse__AgentPath = string;
-export const V2ThreadRollbackResponse__AgentPath = Schema.String;
+export type V2ThreadReadResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadReadResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadReadResponse__McpAppDisplayMode" });
 
-export type V2ThreadRollbackResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadRollbackResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ThreadReadResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadReadResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadReadResponse__McpToolCallResult" });
 
-export type V2ThreadRollbackResponse__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2ThreadRollbackResponse__CommandExecutionStatus = Schema.Literals([
+export type V2ThreadReadResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadReadResponse__McpToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
+]).annotate({ identifier: "V2ThreadReadResponse__McpToolCallStatus" });
 
-export type V2ThreadRollbackResponse__DynamicToolCallOutputContentItem =
+export type V2ThreadReadResponse__DynamicToolCallOutputContentItem =
   | { readonly text: string; readonly type: "inputText" }
   | { readonly imageUrl: string; readonly type: "inputImage" }
   | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadRollbackResponse__DynamicToolCallOutputContentItem = Schema.Union(
+export const V2ThreadReadResponse__DynamicToolCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
@@ -8584,213 +10983,80 @@ export const V2ThreadRollbackResponse__DynamicToolCallOutputContentItem = Schema
     }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadReadResponse__DynamicToolCallOutputContentItem" });
 
-export type V2ThreadRollbackResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadRollbackResponse__DynamicToolCallStatus = Schema.Literals([
+export type V2ThreadReadResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadReadResponse__DynamicToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2ThreadRollbackResponse__GitInfo = {
-  readonly branch?: string | null;
-  readonly originUrl?: string | null;
-  readonly sha?: string | null;
-};
-export const V2ThreadRollbackResponse__GitInfo = Schema.Struct({
-  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ThreadRollbackResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2ThreadRollbackResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
-
-export type V2ThreadRollbackResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadRollbackResponse__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
-
-export type V2ThreadRollbackResponse__LegacyAppPathString = string;
-export const V2ThreadRollbackResponse__LegacyAppPathString = Schema.String;
-
-export type V2ThreadRollbackResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
-};
-export const V2ThreadRollbackResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ThreadRollbackResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadRollbackResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
-
-export type V2ThreadRollbackResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ThreadRollbackResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+]).annotate({ identifier: "V2ThreadReadResponse__DynamicToolCallStatus" });
 
-export type V2ThreadRollbackResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadRollbackResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
+export type V2ThreadReadResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadReadResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
   "completed",
-  "failed",
-]);
-
-export type V2ThreadRollbackResponse__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
-};
-export const V2ThreadRollbackResponse__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
-});
-
-export type V2ThreadRollbackResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadRollbackResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
-
-export type V2ThreadRollbackResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadRollbackResponse__NonSteerableTurnKind = Schema.Literals([
-  "review",
-  "compact",
-]);
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadReadResponse__CollabAgentStatus" });
 
-export type V2ThreadRollbackResponse__PatchApplyStatus =
+export type V2ThreadReadResponse__CollabAgentToolCallStatus =
   | "inProgress"
   | "completed"
   | "failed"
-  | "declined";
-export const V2ThreadRollbackResponse__PatchApplyStatus = Schema.Literals([
+  | "interrupted";
+export const V2ThreadReadResponse__CollabAgentToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
-
-export type V2ThreadRollbackResponse__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadRollbackResponse__PatchChangeKind = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
-  ],
-  { mode: "oneOf" },
-);
+  "interrupted",
+]).annotate({ identifier: "V2ThreadReadResponse__CollabAgentToolCallStatus" });
 
-export type V2ThreadRollbackResponse__ReasoningEffort = string;
-export const V2ThreadRollbackResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+export type V2ThreadReadResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadReadResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadReadResponse__CollabAgentTool" });
 
-export type V2ThreadRollbackResponse__SubAgentActivityKind =
+export type V2ThreadReadResponse__SubAgentActivityKind =
   | "started"
   | "interacted"
   | "interrupted"
   | "completed";
-export const V2ThreadRollbackResponse__SubAgentActivityKind = Schema.Literals([
+export const V2ThreadReadResponse__SubAgentActivityKind = Schema.Literals([
   "started",
   "interacted",
   "interrupted",
   "completed",
-]);
-
-export type V2ThreadRollbackResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2ThreadRollbackResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2ThreadRollbackResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
-export const V2ThreadRollbackResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
-
-export type V2ThreadRollbackResponse__ThreadId = string;
-export const V2ThreadRollbackResponse__ThreadId = Schema.String;
-
-export type V2ThreadRollbackResponse__ThreadSource = string;
-export const V2ThreadRollbackResponse__ThreadSource = Schema.String;
-
-export type V2ThreadRollbackResponse__TurnStatus =
-  | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2ThreadRollbackResponse__TurnStatus = Schema.Literals([
-  "completed",
-  "interrupted",
-  "failed",
-  "inProgress",
-]);
+]).annotate({ identifier: "V2ThreadReadResponse__SubAgentActivityKind" });
 
-export type V2ThreadRollbackResponse__WebSearchAction =
+export type V2ThreadReadResponse__WebSearchAction =
   | {
       readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
@@ -8799,7 +11065,7 @@ export type V2ThreadRollbackResponse__WebSearchAction =
   | { readonly type: "openPage"; readonly url?: string | null }
   | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
   | { readonly type: "other" };
-export const V2ThreadRollbackResponse__WebSearchAction = Schema.Union(
+export const V2ThreadReadResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
       queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
@@ -8820,431 +11086,484 @@ export const V2ThreadRollbackResponse__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadSettingsUpdatedNotification__AbsolutePathBuf = string;
-export const V2ThreadSettingsUpdatedNotification__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+).annotate({ identifier: "V2ThreadReadResponse__WebSearchAction" });
 
-export type V2ThreadSettingsUpdatedNotification__ActivePermissionProfile = {
-  readonly extends?: string | null;
-  readonly id: string;
+export type V2ThreadReadResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const V2ThreadSettingsUpdatedNotification__ActivePermissionProfile = Schema.Struct({
-  extends: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  id: Schema.String.annotate({
-    description:
-      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-  }),
-});
-
-export type V2ThreadSettingsUpdatedNotification__ApprovalsReviewer =
-  | "user"
-  | "auto_review"
-  | "guardian_subagent";
-export const V2ThreadSettingsUpdatedNotification__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
-
-export type V2ThreadSettingsUpdatedNotification__AskForApproval =
-  | "untrusted"
-  | "on-request"
-  | "never"
-  | {
-      readonly granular: {
-        readonly mcp_elicitations: boolean;
-        readonly request_permissions?: boolean;
-        readonly rules: boolean;
-        readonly sandbox_approval: boolean;
-        readonly skill_approval?: boolean;
-      };
-    };
-export const V2ThreadSettingsUpdatedNotification__AskForApproval = Schema.Union(
+export const V2ThreadReadResponse__ImageGenerationFailure = Schema.Union(
   [
-    Schema.Literals(["untrusted", "on-request", "never"]),
     Schema.Struct({
-      granular: Schema.Struct({
-        mcp_elicitations: Schema.Boolean,
-        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        rules: Schema.Boolean,
-        sandbox_approval: Schema.Boolean,
-        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-    }).annotate({ title: "GranularAskForApproval" }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadSettingsUpdatedNotification__ModeKind = "plan" | "default";
-export const V2ThreadSettingsUpdatedNotification__ModeKind = Schema.Literals([
-  "plan",
-  "default",
-]).annotate({ description: "Initial collaboration mode to use when the TUI starts." });
-
-export type V2ThreadSettingsUpdatedNotification__Personality = "none" | "friendly" | "pragmatic";
-export const V2ThreadSettingsUpdatedNotification__Personality = Schema.Literals([
-  "none",
-  "friendly",
-  "pragmatic",
-]);
+).annotate({ identifier: "V2ThreadReadResponse__ImageGenerationFailure" });
 
-export type V2ThreadSettingsUpdatedNotification__ReasoningEffort = string;
-export const V2ThreadSettingsUpdatedNotification__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
-
-export type V2ThreadSettingsUpdatedNotification__ReasoningSummary =
-  | "auto"
-  | "concise"
-  | "detailed"
-  | "none";
-export const V2ThreadSettingsUpdatedNotification__ReasoningSummary = Schema.Union(
+export type V2ThreadReadResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadReadResponse__TurnItemsView = Schema.Union(
   [
-    Schema.Literals(["auto", "concise", "detailed"]),
-    Schema.Literal("none").annotate({ description: "Option to disable reasoning summaries." }),
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#reasoning-summaries",
-});
-
-export type V2ThreadStartedNotification__AbsolutePathBuf = string;
-export const V2ThreadStartedNotification__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2ThreadStartedNotification__AgentPath = string;
-export const V2ThreadStartedNotification__AgentPath = Schema.String;
-
-export type V2ThreadStartedNotification__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadStartedNotification__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+).annotate({ identifier: "V2ThreadReadResponse__TurnItemsView" });
 
-export type V2ThreadStartedNotification__CommandExecutionStatus =
-  | "inProgress"
+export type V2ThreadReadResponse__TurnStatus =
   | "completed"
+  | "interrupted"
   | "failed"
-  | "declined";
-export const V2ThreadStartedNotification__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
+  | "inProgress";
+export const V2ThreadReadResponse__TurnStatus = Schema.Literals([
   "completed",
+  "interrupted",
   "failed",
-  "declined",
-]);
+  "inProgress",
+]).annotate({ identifier: "V2ThreadReadResponse__TurnStatus" });
 
-export type V2ThreadStartedNotification__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadStartedNotification__DynamicToolCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeTranscriptRole =
+  | "user"
+  | "assistant";
+export const V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeTranscriptRole =
+  Schema.Literals(["user", "assistant"]).annotate({
+    identifier: "V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeTranscriptRole",
+  });
 
-export type V2ThreadStartedNotification__DynamicToolCallStatus =
-  | "inProgress"
-  | "completed"
+export type V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeBemItemPresentation =
+  | { readonly type: "wholeItem" }
+  | { readonly type: "inlineMarkdown" }
+  | { readonly index: number; readonly type: "inlineVisualization" };
+export const V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeBemItemPresentation =
+  Schema.Union(
+    [
+      Schema.Struct({
+        type: Schema.Literal("wholeItem").annotate({
+          title: "WholeItemThreadRealtimeBemItemPresentationType",
+        }),
+      }).annotate({ title: "WholeItemThreadRealtimeBemItemPresentation" }),
+      Schema.Struct({
+        type: Schema.Literal("inlineMarkdown").annotate({
+          title: "InlineMarkdownThreadRealtimeBemItemPresentationType",
+        }),
+      }).annotate({ title: "InlineMarkdownThreadRealtimeBemItemPresentation" }),
+      Schema.Struct({
+        index: Schema.Number.annotate({ format: "uint32" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+        type: Schema.Literal("inlineVisualization").annotate({
+          title: "InlineVisualizationThreadRealtimeBemItemPresentationType",
+        }),
+      }).annotate({ title: "InlineVisualizationThreadRealtimeBemItemPresentation" }),
+    ],
+    { mode: "oneOf" },
+  ).annotate({
+    description: "EXPERIMENTAL - how an existing agent item appears in a realtime conversation.",
+    identifier: "V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeBemItemPresentation",
+  });
+
+export type V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeSessionOutcome =
+  | "ended"
   | "failed";
-export const V2ThreadStartedNotification__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export const V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeSessionOutcome =
+  Schema.Literals(["ended", "failed"]).annotate({
+    identifier: "V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeSessionOutcome",
+  });
 
-export type V2ThreadStartedNotification__GitInfo = {
-  readonly branch?: string | null;
-  readonly originUrl?: string | null;
-  readonly sha?: string | null;
-};
-export const V2ThreadStartedNotification__GitInfo = Schema.Struct({
-  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export type V2ThreadRealtimeItemStartedNotification__ThreadRealtimeTranscriptRole =
+  | "user"
+  | "assistant";
+export const V2ThreadRealtimeItemStartedNotification__ThreadRealtimeTranscriptRole =
+  Schema.Literals(["user", "assistant"]).annotate({
+    identifier: "V2ThreadRealtimeItemStartedNotification__ThreadRealtimeTranscriptRole",
+  });
 
-export type V2ThreadStartedNotification__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
+export type V2ThreadRealtimeItemStartedNotification__ThreadRealtimeBemItemPresentation =
+  | { readonly type: "wholeItem" }
+  | { readonly type: "inlineMarkdown" }
+  | { readonly index: number; readonly type: "inlineVisualization" };
+export const V2ThreadRealtimeItemStartedNotification__ThreadRealtimeBemItemPresentation =
+  Schema.Union(
+    [
+      Schema.Struct({
+        type: Schema.Literal("wholeItem").annotate({
+          title: "WholeItemThreadRealtimeBemItemPresentationType",
+        }),
+      }).annotate({ title: "WholeItemThreadRealtimeBemItemPresentation" }),
+      Schema.Struct({
+        type: Schema.Literal("inlineMarkdown").annotate({
+          title: "InlineMarkdownThreadRealtimeBemItemPresentationType",
+        }),
+      }).annotate({ title: "InlineMarkdownThreadRealtimeBemItemPresentation" }),
+      Schema.Struct({
+        index: Schema.Number.annotate({ format: "uint32" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+        type: Schema.Literal("inlineVisualization").annotate({
+          title: "InlineVisualizationThreadRealtimeBemItemPresentationType",
+        }),
+      }).annotate({ title: "InlineVisualizationThreadRealtimeBemItemPresentation" }),
+    ],
+    { mode: "oneOf" },
+  ).annotate({
+    description: "EXPERIMENTAL - how an existing agent item appears in a realtime conversation.",
+    identifier: "V2ThreadRealtimeItemStartedNotification__ThreadRealtimeBemItemPresentation",
+  });
+
+export type V2ThreadRealtimeItemStartedNotification__ThreadRealtimeSessionOutcome =
+  | "ended"
+  | "failed";
+export const V2ThreadRealtimeItemStartedNotification__ThreadRealtimeSessionOutcome =
+  Schema.Literals(["ended", "failed"]).annotate({
+    identifier: "V2ThreadRealtimeItemStartedNotification__ThreadRealtimeSessionOutcome",
+  });
+
+export type V2ThreadRealtimeOutputAudioDeltaNotification__ThreadRealtimeAudioChunk = {
+  readonly data: string;
+  readonly itemId?: string | null;
+  readonly numChannels: number;
+  readonly sampleRate: number;
+  readonly samplesPerChannel?: number | null;
 };
-export const V2ThreadStartedNotification__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
+export const V2ThreadRealtimeOutputAudioDeltaNotification__ThreadRealtimeAudioChunk = Schema.Struct(
+  {
+    data: Schema.String,
+    itemId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    numChannels: Schema.Number.annotate({ format: "uint16" })
+      .check(Schema.isInt().annotate({ expected: "an integer" }))
+      .check(
+        Schema.isGreaterThanOrEqualTo(0).annotate({
+          expected: "a value greater than or equal to 0",
+        }),
+      ),
+    sampleRate: Schema.Number.annotate({ format: "uint32" })
+      .check(Schema.isInt().annotate({ expected: "an integer" }))
+      .check(
+        Schema.isGreaterThanOrEqualTo(0).annotate({
+          expected: "a value greater than or equal to 0",
+        }),
+      ),
+    samplesPerChannel: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint32" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+  },
+).annotate({
+  description: "EXPERIMENTAL - thread realtime audio chunk.",
+  identifier: "V2ThreadRealtimeOutputAudioDeltaNotification__ThreadRealtimeAudioChunk",
 });
 
-export type V2ThreadStartedNotification__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadStartedNotification__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
+export type V2ThreadRealtimeStartedNotification__RealtimeConversationVersion = "v1" | "v2" | "v3";
+export const V2ThreadRealtimeStartedNotification__RealtimeConversationVersion = Schema.Literals([
+  "v1",
+  "v2",
+  "v3",
+]).annotate({ identifier: "V2ThreadRealtimeStartedNotification__RealtimeConversationVersion" });
 
-export type V2ThreadStartedNotification__LegacyAppPathString = string;
-export const V2ThreadStartedNotification__LegacyAppPathString = Schema.String;
+export type V2ThreadResumeParams__AskForApproval =
+  | "untrusted"
+  | "on-request"
+  | "never"
+  | {
+      readonly granular: {
+        readonly mcp_elicitations: boolean;
+        readonly request_permissions?: boolean;
+        readonly rules: boolean;
+        readonly sandbox_approval: boolean;
+        readonly skill_approval?: boolean;
+      };
+    };
+export const V2ThreadResumeParams__AskForApproval = Schema.Union(
+  [
+    Schema.Literals(["untrusted", "on-request", "never"]),
+    Schema.Struct({
+      granular: Schema.Struct({
+        mcp_elicitations: Schema.Boolean,
+        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+        rules: Schema.Boolean,
+        sandbox_approval: Schema.Boolean,
+        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      }),
+    }).annotate({ title: "GranularAskForApproval" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeParams__AskForApproval" });
 
-export type V2ThreadStartedNotification__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
-};
-export const V2ThreadStartedNotification__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export type V2ThreadResumeParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const V2ThreadResumeParams__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ThreadResumeParams__ApprovalsReviewer",
 });
 
-export type V2ThreadStartedNotification__McpToolCallError = { readonly message: string };
-export const V2ThreadStartedNotification__McpToolCallError = Schema.Struct({
-  message: Schema.String,
+export type V2ThreadResumeParams__Personality = "none" | "friendly" | "pragmatic";
+export const V2ThreadResumeParams__Personality = Schema.Literals([
+  "none",
+  "friendly",
+  "pragmatic",
+]).annotate({
+  description: "Deprecated: `friendly` and `pragmatic` no longer select a style.",
+  identifier: "V2ThreadResumeParams__Personality",
 });
 
-export type V2ThreadStartedNotification__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ThreadStartedNotification__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+export type V2ThreadResumeParams__SandboxMode =
+  | "read-only"
+  | "workspace-write"
+  | "danger-full-access";
+export const V2ThreadResumeParams__SandboxMode = Schema.Literals([
+  "read-only",
+  "workspace-write",
+  "danger-full-access",
+]).annotate({ identifier: "V2ThreadResumeParams__SandboxMode" });
 
-export type V2ThreadStartedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadStartedNotification__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadResumeParams__ReasoningEffort = string;
+export const V2ThreadResumeParams__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadResumeParams__ReasoningEffort",
+  }),
+);
 
-export type V2ThreadStartedNotification__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
+export type V2ThreadResumeParams__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadResumeParams__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadResumeParams__ImageDetail" });
+
+export type V2ThreadResumeParams__InternalChatMessageMetadataPassthrough = {
+  readonly turn_id?: string | null;
 };
-export const V2ThreadStartedNotification__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
+export const V2ThreadResumeParams__InternalChatMessageMetadataPassthrough = Schema.Struct({
+  turn_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description:
+    "Internal Responses API passthrough metadata copied into underlying chat messages.\n\nResponses API strongly types this payload. Do not modify it without first getting API approval and making the corresponding Responses API change.",
+  identifier: "V2ThreadResumeParams__InternalChatMessageMetadataPassthrough",
 });
 
-export type V2ThreadStartedNotification__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadStartedNotification__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export type V2ThreadResumeParams__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadResumeParams__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadResumeParams__MessagePhase",
 });
 
-export type V2ThreadStartedNotification__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadStartedNotification__NonSteerableTurnKind = Schema.Literals([
-  "review",
-  "compact",
-]);
-
-export type V2ThreadStartedNotification__PatchApplyStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2ThreadStartedNotification__PatchApplyStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
-
-export type V2ThreadStartedNotification__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadStartedNotification__PatchChangeKind = Schema.Union(
+export type V2ThreadResumeParams__AgentMessageInputContent =
+  | { readonly text: string; readonly type: "input_text" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadResumeParams__AgentMessageInputContent = Schema.Union(
   [
     Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextAgentMessageInputContentType",
+      }),
+    }).annotate({ title: "InputTextAgentMessageInputContent" }),
     Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentAgentMessageInputContentType",
+      }),
+    }).annotate({ title: "EncryptedContentAgentMessageInputContent" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadStartedNotification__ReasoningEffort = string;
-export const V2ThreadStartedNotification__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+).annotate({ identifier: "V2ThreadResumeParams__AgentMessageInputContent" });
 
-export type V2ThreadStartedNotification__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2ThreadStartedNotification__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
-  "completed",
-]);
+export type V2ThreadResumeParams__ReasoningItemContent =
+  | { readonly text: string; readonly type: "reasoning_text" }
+  | { readonly text: string; readonly type: "text" };
+export const V2ThreadResumeParams__ReasoningItemContent = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("reasoning_text").annotate({
+        title: "ReasoningTextReasoningItemContentType",
+      }),
+    }).annotate({ title: "ReasoningTextReasoningItemContent" }),
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("text").annotate({ title: "TextReasoningItemContentType" }),
+    }).annotate({ title: "TextReasoningItemContent" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeParams__ReasoningItemContent" });
 
-export type V2ThreadStartedNotification__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadResumeParams__ReasoningItemReasoningSummary = {
+  readonly text: string;
+  readonly type: "summary_text";
 };
-export const V2ThreadStartedNotification__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+export const V2ThreadResumeParams__ReasoningItemReasoningSummary = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("summary_text").annotate({
+        title: "SummaryTextReasoningItemReasoningSummaryType",
       }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2ThreadStartedNotification__ThreadActiveFlag =
-  | "waitingOnApproval"
-  | "waitingOnUserInput";
-export const V2ThreadStartedNotification__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
-
-export type V2ThreadStartedNotification__ThreadId = string;
-export const V2ThreadStartedNotification__ThreadId = Schema.String;
+    }).annotate({ title: "SummaryTextReasoningItemReasoningSummary" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeParams__ReasoningItemReasoningSummary" });
 
-export type V2ThreadStartedNotification__ThreadSource = string;
-export const V2ThreadStartedNotification__ThreadSource = Schema.String;
+export type V2ThreadResumeParams__LocalShellAction = {
+  readonly command: ReadonlyArray<string>;
+  readonly env?: { readonly [x: string]: string } | null;
+  readonly timeout_ms?: number | null;
+  readonly type: "exec";
+  readonly user?: string | null;
+  readonly working_directory?: string | null;
+};
+export const V2ThreadResumeParams__LocalShellAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.Array(Schema.String),
+      env: Schema.optionalKey(
+        Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+      ),
+      timeout_ms: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "uint64" })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("exec").annotate({ title: "ExecLocalShellActionType" }),
+      user: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      working_directory: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "ExecLocalShellAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeParams__LocalShellAction" });
 
-export type V2ThreadStartedNotification__TurnStatus =
-  | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2ThreadStartedNotification__TurnStatus = Schema.Literals([
+export type V2ThreadResumeParams__LocalShellStatus = "completed" | "in_progress" | "incomplete";
+export const V2ThreadResumeParams__LocalShellStatus = Schema.Literals([
   "completed",
-  "interrupted",
-  "failed",
-  "inProgress",
-]);
+  "in_progress",
+  "incomplete",
+]).annotate({ identifier: "V2ThreadResumeParams__LocalShellStatus" });
 
-export type V2ThreadStartedNotification__WebSearchAction =
+export type V2ThreadResumeParams__ResponsesApiWebSearchAction =
   | {
       readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
       readonly type: "search";
     }
-  | { readonly type: "openPage"; readonly url?: string | null }
-  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "open_page"; readonly url?: string | null }
+  | {
+      readonly pattern?: string | null;
+      readonly type: "find_in_page";
+      readonly url?: string | null;
+    }
   | { readonly type: "other" };
-export const V2ThreadStartedNotification__WebSearchAction = Schema.Union(
+export const V2ThreadResumeParams__ResponsesApiWebSearchAction = Schema.Union(
   [
     Schema.Struct({
       queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
       query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
-    }).annotate({ title: "SearchWebSearchAction" }),
+      type: Schema.Literal("search").annotate({ title: "SearchResponsesApiWebSearchActionType" }),
+    }).annotate({ title: "SearchResponsesApiWebSearchAction" }),
     Schema.Struct({
-      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      type: Schema.Literal("open_page").annotate({
+        title: "OpenPageResponsesApiWebSearchActionType",
+      }),
       url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageWebSearchAction" }),
+    }).annotate({ title: "OpenPageResponsesApiWebSearchAction" }),
     Schema.Struct({
       pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      type: Schema.Literal("find_in_page").annotate({
+        title: "FindInPageResponsesApiWebSearchActionType",
+      }),
       url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageWebSearchAction" }),
+    }).annotate({ title: "FindInPageResponsesApiWebSearchAction" }),
     Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
-    }).annotate({ title: "OtherWebSearchAction" }),
+      type: Schema.Literal("other").annotate({ title: "OtherResponsesApiWebSearchActionType" }),
+    }).annotate({ title: "OtherResponsesApiWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadResumeParams__ResponsesApiWebSearchAction" });
 
-export type V2ThreadStartParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const V2ThreadStartParams__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+export type V2ThreadResumeParams__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadResumeParams__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeParams__TurnItemsView" });
+
+export type V2ThreadResumeParams__SortDirection = "asc" | "desc";
+export const V2ThreadResumeParams__SortDirection = Schema.Literals(["asc", "desc"]).annotate({
+  identifier: "V2ThreadResumeParams__SortDirection",
 });
 
-export type V2ThreadStartParams__AskForApproval =
+export type V2ThreadResumeResponse__AskForApproval =
   | "untrusted"
   | "on-request"
   | "never"
@@ -9257,7 +11576,7 @@ export type V2ThreadStartParams__AskForApproval =
         readonly skill_approval?: boolean;
       };
     };
-export const V2ThreadStartParams__AskForApproval = Schema.Union(
+export const V2ThreadResumeResponse__AskForApproval = Schema.Union(
   [
     Schema.Literals(["untrusted", "on-request", "never"]),
     Schema.Struct({
@@ -9271,266 +11590,230 @@ export const V2ThreadStartParams__AskForApproval = Schema.Union(
     }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadStartParams__DynamicToolNamespaceTool = {
-  readonly deferLoading?: boolean;
-  readonly description: string;
-  readonly inputSchema: unknown;
-  readonly name: string;
-  readonly type: "function";
-};
-export const V2ThreadStartParams__DynamicToolNamespaceTool = Schema.Union(
-  [
-    Schema.Struct({
-      deferLoading: Schema.optionalKey(Schema.Boolean),
-      description: Schema.String,
-      inputSchema: Schema.Unknown,
-      name: Schema.String,
-      type: Schema.Literal("function").annotate({ title: "FunctionDynamicToolNamespaceToolType" }),
-    }).annotate({ title: "FunctionDynamicToolNamespaceTool" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartParams__LegacyAppPathString = string;
-export const V2ThreadStartParams__LegacyAppPathString = Schema.String;
-
-export type V2ThreadStartParams__Personality = "none" | "friendly" | "pragmatic";
-export const V2ThreadStartParams__Personality = Schema.Literals(["none", "friendly", "pragmatic"]);
+).annotate({ identifier: "V2ThreadResumeResponse__AskForApproval" });
 
-export type V2ThreadStartParams__SandboxMode =
-  | "read-only"
-  | "workspace-write"
-  | "danger-full-access";
-export const V2ThreadStartParams__SandboxMode = Schema.Literals([
-  "read-only",
-  "workspace-write",
-  "danger-full-access",
-]);
+export type V2ThreadResumeResponse__ApprovalsReviewer =
+  | "user"
+  | "auto_review"
+  | "guardian_subagent";
+export const V2ThreadResumeResponse__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ThreadResumeResponse__ApprovalsReviewer",
+});
 
-export type V2ThreadStartParams__ThreadSource = string;
-export const V2ThreadStartParams__ThreadSource = Schema.String;
+export type V2ThreadResumeResponse__ModeKind = "plan" | "default";
+export const V2ThreadResumeResponse__ModeKind = Schema.Literals(["plan", "default"]).annotate({
+  description: "Initial collaboration mode to use when the TUI starts.",
+  identifier: "V2ThreadResumeResponse__ModeKind",
+});
 
-export type V2ThreadStartParams__ThreadStartSource = "startup" | "clear";
-export const V2ThreadStartParams__ThreadStartSource = Schema.Literals(["startup", "clear"]);
+export type V2ThreadResumeResponse__ReasoningEffort = string;
+export const V2ThreadResumeResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadResumeResponse__ReasoningEffort",
+  }),
+);
 
-export type V2ThreadStartResponse__AbsolutePathBuf = string;
-export const V2ThreadStartResponse__AbsolutePathBuf = Schema.String.annotate({
+export type V2ThreadResumeResponse__AbsolutePathBuf = string;
+export const V2ThreadResumeResponse__AbsolutePathBuf = Schema.String.annotate({
   description:
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadResumeResponse__AbsolutePathBuf",
 });
 
-export type V2ThreadStartResponse__AgentPath = string;
-export const V2ThreadStartResponse__AgentPath = Schema.String;
-
-export type V2ThreadStartResponse__AskForApproval =
-  | "untrusted"
-  | "on-request"
-  | "never"
-  | {
-      readonly granular: {
-        readonly mcp_elicitations: boolean;
-        readonly request_permissions?: boolean;
-        readonly rules: boolean;
-        readonly sandbox_approval: boolean;
-        readonly skill_approval?: boolean;
-      };
-    };
-export const V2ThreadStartResponse__AskForApproval = Schema.Union(
-  [
-    Schema.Literals(["untrusted", "on-request", "never"]),
-    Schema.Struct({
-      granular: Schema.Struct({
-        mcp_elicitations: Schema.Boolean,
-        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        rules: Schema.Boolean,
-        sandbox_approval: Schema.Boolean,
-        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      }),
-    }).annotate({ title: "GranularAskForApproval" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2ThreadStartResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
-
-export type V2ThreadStartResponse__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2ThreadStartResponse__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
-
-export type V2ThreadStartResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadStartResponse__DynamicToolCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadResumeResponse__LegacyAppPathString = string;
+export const V2ThreadResumeResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadResumeResponse__LegacyAppPathString",
+});
 
-export type V2ThreadStartResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadStartResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadResumeResponse__NetworkAccess = "restricted" | "enabled";
+export const V2ThreadResumeResponse__NetworkAccess = Schema.Literals([
+  "restricted",
+  "enabled",
+]).annotate({ identifier: "V2ThreadResumeResponse__NetworkAccess" });
 
-export type V2ThreadStartResponse__GitInfo = {
+export type V2ThreadResumeResponse__GitInfo = {
   readonly branch?: string | null;
   readonly originUrl?: string | null;
   readonly sha?: string | null;
 };
-export const V2ThreadStartResponse__GitInfo = Schema.Struct({
+export const V2ThreadResumeResponse__GitInfo = Schema.Struct({
   branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ThreadResumeResponse__GitInfo" });
 
-export type V2ThreadStartResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
+export type V2ThreadResumeResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadResumeResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadResumeResponse__ThreadHistoryMode" });
+
+export type V2ThreadResumeResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2ThreadStartResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
+export const V2ThreadResumeResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadResumeResponse__ThreadSectionAppearance",
 });
 
-export type V2ThreadStartResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadStartResponse__ImageDetail = Schema.Literals([
+export type V2ThreadResumeResponse__AgentPath = string;
+export const V2ThreadResumeResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadResumeResponse__AgentPath",
+});
+
+export type V2ThreadResumeResponse__ThreadId = string;
+export const V2ThreadResumeResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadResumeResponse__ThreadId",
+});
+
+export type V2ThreadResumeResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
+export const V2ThreadResumeResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadResumeResponse__ThreadActiveFlag" });
+
+export type V2ThreadResumeResponse__ThreadSource = string;
+export const V2ThreadResumeResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadResumeResponse__ThreadSource",
+});
+
+export type V2ThreadResumeResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadResumeResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadResumeResponse__NonSteerableTurnKind" });
+
+export type V2ThreadResumeResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadResumeResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadResumeResponse__MisalignmentSteer" });
+
+export type V2ThreadResumeResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadResumeResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadResumeResponse__ByteRange" });
+
+export type V2ThreadResumeResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadResumeResponse__ImageDetail = Schema.Literals([
   "auto",
   "low",
   "high",
   "original",
-]);
-
-export type V2ThreadStartResponse__LegacyAppPathString = string;
-export const V2ThreadStartResponse__LegacyAppPathString = Schema.String;
+]).annotate({ identifier: "V2ThreadResumeResponse__ImageDetail" });
 
-export type V2ThreadStartResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
+export type V2ThreadResumeResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const V2ThreadStartResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ThreadStartResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadStartResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
+export const V2ThreadResumeResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadResumeResponse__HookPromptFragment" });
 
-export type V2ThreadStartResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ThreadStartResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+export type V2ThreadResumeResponse__AgentMessageDelivery = "async";
+export const V2ThreadResumeResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadResumeResponse__AgentMessageDelivery",
 });
 
-export type V2ThreadStartResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadStartResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
-
-export type V2ThreadStartResponse__MemoryCitationEntry = {
+export type V2ThreadResumeResponse__MemoryCitationEntry = {
   readonly lineEnd: number;
   readonly lineStart: number;
   readonly note: string;
   readonly path: string;
 };
-export const V2ThreadStartResponse__MemoryCitationEntry = Schema.Struct({
+export const V2ThreadResumeResponse__MemoryCitationEntry = Schema.Struct({
   lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   note: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadResumeResponse__MemoryCitationEntry" });
 
-export type V2ThreadStartResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadStartResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export type V2ThreadResumeResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadResumeResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadResumeResponse__MessagePhase",
 });
 
-export type V2ThreadStartResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadStartResponse__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type V2ThreadResumeResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadResumeResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadResumeResponse__AsyncUserInputQuestion" });
 
-export type V2ThreadStartResponse__PatchApplyStatus =
+export type V2ThreadResumeResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadResumeResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadResumeResponse__CommandExecutionSource" });
+
+export type V2ThreadResumeResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ThreadStartResponse__PatchApplyStatus = Schema.Literals([
+export const V2ThreadResumeResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadResumeResponse__CommandExecutionStatus" });
 
-export type V2ThreadStartResponse__PatchChangeKind =
+export type V2ThreadResumeResponse__PatchChangeKind =
   | { readonly type: "add" }
   | { readonly type: "delete" }
   | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadStartResponse__PatchChangeKind = Schema.Union(
+export const V2ThreadResumeResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
       type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
@@ -9544,143 +11827,100 @@ export const V2ThreadStartResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadStartResponse__ReasoningEffort = string;
-export const V2ThreadStartResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+).annotate({ identifier: "V2ThreadResumeResponse__PatchChangeKind" });
 
-export type V2ThreadStartResponse__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2ThreadStartResponse__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
+export type V2ThreadResumeResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadResumeResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
   "completed",
-]);
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadResumeResponse__PatchApplyStatus" });
 
-export type V2ThreadStartResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadResumeResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const V2ThreadStartResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export const V2ThreadResumeResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadResumeResponse__McpToolCallAppContext" });
 
-export type V2ThreadStartResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
-export const V2ThreadStartResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
+export type V2ThreadResumeResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadResumeResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadResumeResponse__McpToolCallError" });
 
-export type V2ThreadStartResponse__ThreadId = string;
-export const V2ThreadStartResponse__ThreadId = Schema.String;
+export type V2ThreadResumeResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadResumeResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadResumeResponse__McpAppDisplayMode" });
 
-export type V2ThreadStartResponse__ThreadSource = string;
-export const V2ThreadStartResponse__ThreadSource = Schema.String;
+export type V2ThreadResumeResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadResumeResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadResumeResponse__McpToolCallResult" });
 
-export type V2ThreadStartResponse__TurnStatus =
-  | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2ThreadStartResponse__TurnStatus = Schema.Literals([
+export type V2ThreadResumeResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadResumeResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "interrupted",
   "failed",
-  "inProgress",
-]);
+]).annotate({ identifier: "V2ThreadResumeResponse__McpToolCallStatus" });
 
-export type V2ThreadStartResponse__WebSearchAction =
-  | {
-      readonly queries?: ReadonlyArray<string> | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly type: "openPage"; readonly url?: string | null }
-  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
-  | { readonly type: "other" };
-export const V2ThreadStartResponse__WebSearchAction = Schema.Union(
+export type V2ThreadResumeResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadResumeResponse__DynamicToolCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
-      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
-    }).annotate({ title: "SearchWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageWebSearchAction" }),
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageWebSearchAction" }),
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
-    }).annotate({ title: "OtherWebSearchAction" }),
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadStatusChangedNotification__ThreadActiveFlag =
-  | "waitingOnApproval"
-  | "waitingOnUserInput";
-export const V2ThreadStatusChangedNotification__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
-
-export type V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown = {
-  readonly cacheWriteInputTokens?: number;
-  readonly cachedInputTokens: number;
-  readonly inputTokens: number;
-  readonly outputTokens: number;
-  readonly reasoningOutputTokens: number;
-  readonly totalTokens: number;
-};
-export const V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown = Schema.Struct({
-  cacheWriteInputTokens: Schema.optionalKey(
-    Schema.Number.annotate({ default: 0, format: "int64" }).check(Schema.isInt()),
-  ),
-  cachedInputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  inputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  outputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  reasoningOutputTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  totalTokens: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-});
-
-export type V2ThreadUnarchiveResponse__AbsolutePathBuf = string;
-export const V2ThreadUnarchiveResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+).annotate({ identifier: "V2ThreadResumeResponse__DynamicToolCallOutputContentItem" });
 
-export type V2ThreadUnarchiveResponse__AgentPath = string;
-export const V2ThreadUnarchiveResponse__AgentPath = Schema.String;
+export type V2ThreadResumeResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadResumeResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadResumeResponse__DynamicToolCallStatus" });
 
-export type V2ThreadUnarchiveResponse__CollabAgentStatus =
+export type V2ThreadResumeResponse__CollabAgentStatus =
   | "pendingInit"
   | "running"
   | "interrupted"
@@ -9688,7 +11928,7 @@ export type V2ThreadUnarchiveResponse__CollabAgentStatus =
   | "errored"
   | "shutdown"
   | "notFound";
-export const V2ThreadUnarchiveResponse__CollabAgentStatus = Schema.Literals([
+export const V2ThreadResumeResponse__CollabAgentStatus = Schema.Literals([
   "pendingInit",
   "running",
   "interrupted",
@@ -9696,176 +11936,336 @@ export const V2ThreadUnarchiveResponse__CollabAgentStatus = Schema.Literals([
   "errored",
   "shutdown",
   "notFound",
-]);
+]).annotate({ identifier: "V2ThreadResumeResponse__CollabAgentStatus" });
 
-export type V2ThreadUnarchiveResponse__CommandExecutionStatus =
+export type V2ThreadResumeResponse__CollabAgentToolCallStatus =
   | "inProgress"
   | "completed"
   | "failed"
-  | "declined";
-export const V2ThreadUnarchiveResponse__CommandExecutionStatus = Schema.Literals([
+  | "interrupted";
+export const V2ThreadResumeResponse__CollabAgentToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
+  "interrupted",
+]).annotate({ identifier: "V2ThreadResumeResponse__CollabAgentToolCallStatus" });
 
-export type V2ThreadUnarchiveResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2ThreadUnarchiveResponse__DynamicToolCallOutputContentItem = Schema.Union(
+export type V2ThreadResumeResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadResumeResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadResumeResponse__CollabAgentTool" });
+
+export type V2ThreadResumeResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadResumeResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadResumeResponse__SubAgentActivityKind" });
+
+export type V2ThreadResumeResponse__WebSearchAction =
+  | {
+      readonly queries?: ReadonlyArray<string> | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const V2ThreadResumeResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
     Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
     Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
+    Schema.Struct({
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeResponse__WebSearchAction" });
+
+export type V2ThreadResumeResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ThreadResumeResponse__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadResumeResponse__ImageGenerationFailure" });
 
-export type V2ThreadUnarchiveResponse__DynamicToolCallStatus =
-  | "inProgress"
+export type V2ThreadResumeResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadResumeResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeResponse__TurnItemsView" });
+
+export type V2ThreadResumeResponse__TurnStatus =
   | "completed"
-  | "failed";
-export const V2ThreadUnarchiveResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadResumeResponse__TurnStatus = Schema.Literals([
   "completed",
+  "interrupted",
   "failed",
-]);
+  "inProgress",
+]).annotate({ identifier: "V2ThreadResumeResponse__TurnStatus" });
 
-export type V2ThreadUnarchiveResponse__GitInfo = {
+export type V2ThreadRevertResponse__AbsolutePathBuf = string;
+export const V2ThreadRevertResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadRevertResponse__AbsolutePathBuf",
+});
+
+export type V2ThreadRevertResponse__GitInfo = {
   readonly branch?: string | null;
   readonly originUrl?: string | null;
   readonly sha?: string | null;
 };
-export const V2ThreadUnarchiveResponse__GitInfo = Schema.Struct({
+export const V2ThreadRevertResponse__GitInfo = Schema.Struct({
   branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "V2ThreadRevertResponse__GitInfo" });
 
-export type V2ThreadUnarchiveResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2ThreadUnarchiveResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
-
-export type V2ThreadUnarchiveResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2ThreadUnarchiveResponse__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
+export type V2ThreadRevertResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadRevertResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadRevertResponse__ThreadHistoryMode" });
 
-export type V2ThreadUnarchiveResponse__LegacyAppPathString = string;
-export const V2ThreadUnarchiveResponse__LegacyAppPathString = Schema.String;
+export type V2ThreadRevertResponse__ReasoningEffort = string;
+export const V2ThreadRevertResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadRevertResponse__ReasoningEffort",
+  }),
+);
 
-export type V2ThreadUnarchiveResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
+export type V2ThreadRevertResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2ThreadUnarchiveResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export const V2ThreadRevertResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadRevertResponse__ThreadSectionAppearance",
 });
 
-export type V2ThreadUnarchiveResponse__McpToolCallError = { readonly message: string };
-export const V2ThreadUnarchiveResponse__McpToolCallError = Schema.Struct({
-  message: Schema.String,
+export type V2ThreadRevertResponse__AgentPath = string;
+export const V2ThreadRevertResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadRevertResponse__AgentPath",
 });
 
-export type V2ThreadUnarchiveResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2ThreadUnarchiveResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+export type V2ThreadRevertResponse__ThreadId = string;
+export const V2ThreadRevertResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadRevertResponse__ThreadId",
 });
 
-export type V2ThreadUnarchiveResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2ThreadUnarchiveResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadRevertResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
+export const V2ThreadRevertResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadRevertResponse__ThreadActiveFlag" });
 
-export type V2ThreadUnarchiveResponse__MemoryCitationEntry = {
+export type V2ThreadRevertResponse__ThreadSource = string;
+export const V2ThreadRevertResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadRevertResponse__ThreadSource",
+});
+
+export type V2ThreadRevertResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadRevertResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadRevertResponse__NonSteerableTurnKind" });
+
+export type V2ThreadRevertResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadRevertResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadRevertResponse__MisalignmentSteer" });
+
+export type V2ThreadRevertResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadRevertResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadRevertResponse__ByteRange" });
+
+export type V2ThreadRevertResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadRevertResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadRevertResponse__ImageDetail" });
+
+export type V2ThreadRevertResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
+};
+export const V2ThreadRevertResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadRevertResponse__HookPromptFragment" });
+
+export type V2ThreadRevertResponse__AgentMessageDelivery = "async";
+export const V2ThreadRevertResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadRevertResponse__AgentMessageDelivery",
+});
+
+export type V2ThreadRevertResponse__MemoryCitationEntry = {
   readonly lineEnd: number;
   readonly lineStart: number;
   readonly note: string;
   readonly path: string;
 };
-export const V2ThreadUnarchiveResponse__MemoryCitationEntry = Schema.Struct({
+export const V2ThreadRevertResponse__MemoryCitationEntry = Schema.Struct({
   lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   note: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadRevertResponse__MemoryCitationEntry" });
 
-export type V2ThreadUnarchiveResponse__MessagePhase = "commentary" | "final_answer";
-export const V2ThreadUnarchiveResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export type V2ThreadRevertResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadRevertResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadRevertResponse__MessagePhase",
 });
 
-export type V2ThreadUnarchiveResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2ThreadUnarchiveResponse__NonSteerableTurnKind = Schema.Literals([
-  "review",
-  "compact",
-]);
+export type V2ThreadRevertResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadRevertResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadRevertResponse__AsyncUserInputQuestion" });
 
-export type V2ThreadUnarchiveResponse__PatchApplyStatus =
+export type V2ThreadRevertResponse__LegacyAppPathString = string;
+export const V2ThreadRevertResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadRevertResponse__LegacyAppPathString",
+});
+
+export type V2ThreadRevertResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadRevertResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadRevertResponse__CommandExecutionSource" });
+
+export type V2ThreadRevertResponse__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2ThreadUnarchiveResponse__PatchApplyStatus = Schema.Literals([
+export const V2ThreadRevertResponse__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadRevertResponse__CommandExecutionStatus" });
 
-export type V2ThreadUnarchiveResponse__PatchChangeKind =
+export type V2ThreadRevertResponse__PatchChangeKind =
   | { readonly type: "add" }
   | { readonly type: "delete" }
   | { readonly move_path?: string | null; readonly type: "update" };
-export const V2ThreadUnarchiveResponse__PatchChangeKind = Schema.Union(
+export const V2ThreadRevertResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
       type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
@@ -9879,159 +12279,69 @@ export const V2ThreadUnarchiveResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadUnarchiveResponse__ReasoningEffort = string;
-export const V2ThreadUnarchiveResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
-
-export type V2ThreadUnarchiveResponse__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2ThreadUnarchiveResponse__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
-  "completed",
-]);
-
-export type V2ThreadUnarchiveResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2ThreadUnarchiveResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2ThreadUnarchiveResponse__ThreadActiveFlag =
-  | "waitingOnApproval"
-  | "waitingOnUserInput";
-export const V2ThreadUnarchiveResponse__ThreadActiveFlag = Schema.Literals([
-  "waitingOnApproval",
-  "waitingOnUserInput",
-]);
-
-export type V2ThreadUnarchiveResponse__ThreadId = string;
-export const V2ThreadUnarchiveResponse__ThreadId = Schema.String;
+).annotate({ identifier: "V2ThreadRevertResponse__PatchChangeKind" });
 
-export type V2ThreadUnarchiveResponse__ThreadSource = string;
-export const V2ThreadUnarchiveResponse__ThreadSource = Schema.String;
-
-export type V2ThreadUnarchiveResponse__TurnStatus =
+export type V2ThreadRevertResponse__PatchApplyStatus =
+  | "inProgress"
   | "completed"
-  | "interrupted"
   | "failed"
-  | "inProgress";
-export const V2ThreadUnarchiveResponse__TurnStatus = Schema.Literals([
+  | "declined";
+export const V2ThreadRevertResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "interrupted",
   "failed",
-  "inProgress",
-]);
-
-export type V2ThreadUnarchiveResponse__WebSearchAction =
-  | {
-      readonly queries?: ReadonlyArray<string> | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly type: "openPage"; readonly url?: string | null }
-  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
-  | { readonly type: "other" };
-export const V2ThreadUnarchiveResponse__WebSearchAction = Schema.Union(
-  [
-    Schema.Struct({
-      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
-    }).annotate({ title: "SearchWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageWebSearchAction" }),
-    Schema.Struct({
-      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
-    }).annotate({ title: "OtherWebSearchAction" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadUnsubscribeResponse__ThreadUnsubscribeStatus =
-  | "notLoaded"
-  | "notSubscribed"
-  | "unsubscribed";
-export const V2ThreadUnsubscribeResponse__ThreadUnsubscribeStatus = Schema.Literals([
-  "notLoaded",
-  "notSubscribed",
-  "unsubscribed",
-]);
-
-export type V2TurnCompletedNotification__AbsolutePathBuf = string;
-export const V2TurnCompletedNotification__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
+  "declined",
+]).annotate({ identifier: "V2ThreadRevertResponse__PatchApplyStatus" });
 
-export type V2TurnCompletedNotification__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2TurnCompletedNotification__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ThreadRevertResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
+};
+export const V2ThreadRevertResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadRevertResponse__McpToolCallAppContext" });
 
-export type V2TurnCompletedNotification__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2TurnCompletedNotification__CommandExecutionStatus = Schema.Literals([
+export type V2ThreadRevertResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadRevertResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadRevertResponse__McpToolCallError" });
+
+export type V2ThreadRevertResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadRevertResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadRevertResponse__McpAppDisplayMode" });
+
+export type V2ThreadRevertResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadRevertResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadRevertResponse__McpToolCallResult" });
+
+export type V2ThreadRevertResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadRevertResponse__McpToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
+]).annotate({ identifier: "V2ThreadRevertResponse__McpToolCallStatus" });
 
-export type V2TurnCompletedNotification__DynamicToolCallOutputContentItem =
+export type V2ThreadRevertResponse__DynamicToolCallOutputContentItem =
   | { readonly text: string; readonly type: "inputText" }
   | { readonly imageUrl: string; readonly type: "inputImage" }
   | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2TurnCompletedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+export const V2ThreadRevertResponse__DynamicToolCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
@@ -10053,195 +12363,80 @@ export const V2TurnCompletedNotification__DynamicToolCallOutputContentItem = Sch
     }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadRevertResponse__DynamicToolCallOutputContentItem" });
 
-export type V2TurnCompletedNotification__DynamicToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed";
-export const V2TurnCompletedNotification__DynamicToolCallStatus = Schema.Literals([
+export type V2ThreadRevertResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadRevertResponse__DynamicToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-]);
-
-export type V2TurnCompletedNotification__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
-};
-export const V2TurnCompletedNotification__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
-
-export type V2TurnCompletedNotification__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2TurnCompletedNotification__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
-
-export type V2TurnCompletedNotification__LegacyAppPathString = string;
-export const V2TurnCompletedNotification__LegacyAppPathString = Schema.String;
-
-export type V2TurnCompletedNotification__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
-};
-export const V2TurnCompletedNotification__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2TurnCompletedNotification__McpToolCallError = { readonly message: string };
-export const V2TurnCompletedNotification__McpToolCallError = Schema.Struct({
-  message: Schema.String,
-});
-
-export type V2TurnCompletedNotification__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2TurnCompletedNotification__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
-});
+]).annotate({ identifier: "V2ThreadRevertResponse__DynamicToolCallStatus" });
 
-export type V2TurnCompletedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2TurnCompletedNotification__McpToolCallStatus = Schema.Literals([
-  "inProgress",
+export type V2ThreadRevertResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadRevertResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
   "completed",
-  "failed",
-]);
-
-export type V2TurnCompletedNotification__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
-};
-export const V2TurnCompletedNotification__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
-});
-
-export type V2TurnCompletedNotification__MessagePhase = "commentary" | "final_answer";
-export const V2TurnCompletedNotification__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
-});
-
-export type V2TurnCompletedNotification__NonSteerableTurnKind = "review" | "compact";
-export const V2TurnCompletedNotification__NonSteerableTurnKind = Schema.Literals([
-  "review",
-  "compact",
-]);
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadRevertResponse__CollabAgentStatus" });
 
-export type V2TurnCompletedNotification__PatchApplyStatus =
+export type V2ThreadRevertResponse__CollabAgentToolCallStatus =
   | "inProgress"
   | "completed"
   | "failed"
-  | "declined";
-export const V2TurnCompletedNotification__PatchApplyStatus = Schema.Literals([
+  | "interrupted";
+export const V2ThreadRevertResponse__CollabAgentToolCallStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
-  "declined",
-]);
-
-export type V2TurnCompletedNotification__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const V2TurnCompletedNotification__PatchChangeKind = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
-  ],
-  { mode: "oneOf" },
-);
+  "interrupted",
+]).annotate({ identifier: "V2ThreadRevertResponse__CollabAgentToolCallStatus" });
 
-export type V2TurnCompletedNotification__ReasoningEffort = string;
-export const V2TurnCompletedNotification__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+export type V2ThreadRevertResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadRevertResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadRevertResponse__CollabAgentTool" });
 
-export type V2TurnCompletedNotification__SubAgentActivityKind =
+export type V2ThreadRevertResponse__SubAgentActivityKind =
   | "started"
   | "interacted"
   | "interrupted"
   | "completed";
-export const V2TurnCompletedNotification__SubAgentActivityKind = Schema.Literals([
+export const V2ThreadRevertResponse__SubAgentActivityKind = Schema.Literals([
   "started",
   "interacted",
   "interrupted",
   "completed",
-]);
-
-export type V2TurnCompletedNotification__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
-};
-export const V2TurnCompletedNotification__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2TurnCompletedNotification__TurnStatus =
-  | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2TurnCompletedNotification__TurnStatus = Schema.Literals([
-  "completed",
-  "interrupted",
-  "failed",
-  "inProgress",
-]);
+]).annotate({ identifier: "V2ThreadRevertResponse__SubAgentActivityKind" });
 
-export type V2TurnCompletedNotification__WebSearchAction =
+export type V2ThreadRevertResponse__WebSearchAction =
   | {
       readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
@@ -10250,7 +12445,7 @@ export type V2TurnCompletedNotification__WebSearchAction =
   | { readonly type: "openPage"; readonly url?: string | null }
   | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
   | { readonly type: "other" };
-export const V2TurnCompletedNotification__WebSearchAction = Schema.Union(
+export const V2ThreadRevertResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
       queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
@@ -10271,323 +12466,143 @@ export const V2TurnCompletedNotification__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnPlanUpdatedNotification__TurnPlanStepStatus =
-  | "pending"
-  | "inProgress"
-  | "completed";
-export const V2TurnPlanUpdatedNotification__TurnPlanStepStatus = Schema.Literals([
-  "pending",
-  "inProgress",
-  "completed",
-]);
-
-export type V2TurnStartedNotification__AbsolutePathBuf = string;
-export const V2TurnStartedNotification__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2TurnStartedNotification__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2TurnStartedNotification__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
-
-export type V2TurnStartedNotification__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2TurnStartedNotification__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
+).annotate({ identifier: "V2ThreadRevertResponse__WebSearchAction" });
 
-export type V2TurnStartedNotification__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2TurnStartedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+export type V2ThreadRevertResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ThreadRevertResponse__ImageGenerationFailure = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadRevertResponse__ImageGenerationFailure" });
 
-export type V2TurnStartedNotification__DynamicToolCallStatus =
-  | "inProgress"
+export type V2ThreadRevertResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadRevertResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadRevertResponse__TurnItemsView" });
+
+export type V2ThreadRevertResponse__TurnStatus =
   | "completed"
-  | "failed";
-export const V2TurnStartedNotification__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadRevertResponse__TurnStatus = Schema.Literals([
   "completed",
+  "interrupted",
   "failed",
-]);
+  "inProgress",
+]).annotate({ identifier: "V2ThreadRevertResponse__TurnStatus" });
 
-export type V2TurnStartedNotification__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
+export type V2ThreadSectionCreateParams__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2TurnStartedNotification__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
+export const V2ThreadSectionCreateParams__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadSectionCreateParams__ThreadSectionAppearance",
 });
 
-export type V2TurnStartedNotification__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2TurnStartedNotification__ImageDetail = Schema.Literals([
-  "auto",
-  "low",
-  "high",
-  "original",
-]);
-
-export type V2TurnStartedNotification__LegacyAppPathString = string;
-export const V2TurnStartedNotification__LegacyAppPathString = Schema.String;
-
-export type V2TurnStartedNotification__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
+export type V2ThreadSectionCreateResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2TurnStartedNotification__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2TurnStartedNotification__McpToolCallError = { readonly message: string };
-export const V2TurnStartedNotification__McpToolCallError = Schema.Struct({
-  message: Schema.String,
+export const V2ThreadSectionCreateResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadSectionCreateResponse__ThreadSectionAppearance",
 });
 
-export type V2TurnStartedNotification__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
+export type V2ThreadSectionListResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2TurnStartedNotification__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+export const V2ThreadSectionListResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadSectionListResponse__ThreadSectionAppearance",
 });
 
-export type V2TurnStartedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2TurnStartedNotification__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
-
-export type V2TurnStartedNotification__MemoryCitationEntry = {
-  readonly lineEnd: number;
-  readonly lineStart: number;
-  readonly note: string;
-  readonly path: string;
+export type V2ThreadSectionUpdateParams__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const V2TurnStartedNotification__MemoryCitationEntry = Schema.Struct({
-  lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  note: Schema.String,
-  path: Schema.String,
+export const V2ThreadSectionUpdateParams__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadSectionUpdateParams__ThreadSectionAppearance",
 });
 
-export type V2TurnStartedNotification__MessagePhase = "commentary" | "final_answer";
-export const V2TurnStartedNotification__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
-  description:
-    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+export type V2ThreadSectionUpdateResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
+};
+export const V2ThreadSectionUpdateResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadSectionUpdateResponse__ThreadSectionAppearance",
 });
 
-export type V2TurnStartedNotification__NonSteerableTurnKind = "review" | "compact";
-export const V2TurnStartedNotification__NonSteerableTurnKind = Schema.Literals([
-  "review",
-  "compact",
-]);
-
-export type V2TurnStartedNotification__PatchApplyStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2TurnStartedNotification__PatchApplyStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
-
-export type V2TurnStartedNotification__PatchChangeKind =
-  | { readonly type: "add" }
-  | { readonly type: "delete" }
-  | { readonly move_path?: string | null; readonly type: "update" };
-export const V2TurnStartedNotification__PatchChangeKind = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
-    }).annotate({ title: "AddPatchChangeKind" }),
-    Schema.Struct({
-      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
-    }).annotate({ title: "DeletePatchChangeKind" }),
-    Schema.Struct({
-      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
-    }).annotate({ title: "UpdatePatchChangeKind" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2TurnStartedNotification__ReasoningEffort = string;
-export const V2TurnStartedNotification__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
-
-export type V2TurnStartedNotification__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2TurnStartedNotification__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
-  "completed",
-]);
-
-export type V2TurnStartedNotification__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadSettingsUpdatedNotification__ActivePermissionProfile = {
+  readonly extends?: string | null;
+  readonly id: string;
 };
-export const V2TurnStartedNotification__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
+export const V2ThreadSettingsUpdatedNotification__ActivePermissionProfile = Schema.Struct({
+  extends: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+        description:
+          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
       }),
       Schema.Null,
     ]),
   ),
-});
-
-export type V2TurnStartedNotification__TurnStatus =
-  | "completed"
-  | "interrupted"
-  | "failed"
-  | "inProgress";
-export const V2TurnStartedNotification__TurnStatus = Schema.Literals([
-  "completed",
-  "interrupted",
-  "failed",
-  "inProgress",
-]);
-
-export type V2TurnStartedNotification__WebSearchAction =
-  | {
-      readonly queries?: ReadonlyArray<string> | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly type: "openPage"; readonly url?: string | null }
-  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
-  | { readonly type: "other" };
-export const V2TurnStartedNotification__WebSearchAction = Schema.Union(
-  [
-    Schema.Struct({
-      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
-    }).annotate({ title: "SearchWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "OpenPageWebSearchAction" }),
-    Schema.Struct({
-      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
-      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    }).annotate({ title: "FindInPageWebSearchAction" }),
-    Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
-    }).annotate({ title: "OtherWebSearchAction" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2TurnStartParams__AbsolutePathBuf = string;
-export const V2TurnStartParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2TurnStartParams__AdditionalContextKind = "untrusted" | "application";
-export const V2TurnStartParams__AdditionalContextKind = Schema.Literals([
-  "untrusted",
-  "application",
-]);
-
-export type V2TurnStartParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const V2TurnStartParams__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
+  id: Schema.String.annotate({
+    description:
+      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
+  }),
+}).annotate({ identifier: "V2ThreadSettingsUpdatedNotification__ActivePermissionProfile" });
 
-export type V2TurnStartParams__AskForApproval =
+export type V2ThreadSettingsUpdatedNotification__AskForApproval =
   | "untrusted"
   | "on-request"
   | "never"
@@ -10600,7 +12615,7 @@ export type V2TurnStartParams__AskForApproval =
         readonly skill_approval?: boolean;
       };
     };
-export const V2TurnStartParams__AskForApproval = Schema.Union(
+export const V2ThreadSettingsUpdatedNotification__AskForApproval = Schema.Union(
   [
     Schema.Literals(["untrusted", "on-request", "never"]),
     Schema.Struct({
@@ -10614,29 +12629,70 @@ export const V2TurnStartParams__AskForApproval = Schema.Union(
     }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnStartParams__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2TurnStartParams__ImageDetail = Schema.Literals(["auto", "low", "high", "original"]);
+).annotate({ identifier: "V2ThreadSettingsUpdatedNotification__AskForApproval" });
 
-export type V2TurnStartParams__LegacyAppPathString = string;
-export const V2TurnStartParams__LegacyAppPathString = Schema.String;
+export type V2ThreadSettingsUpdatedNotification__ApprovalsReviewer =
+  | "user"
+  | "auto_review"
+  | "guardian_subagent";
+export const V2ThreadSettingsUpdatedNotification__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ThreadSettingsUpdatedNotification__ApprovalsReviewer",
+});
 
-export type V2TurnStartParams__ModeKind = "plan" | "default";
-export const V2TurnStartParams__ModeKind = Schema.Literals(["plan", "default"]).annotate({
+export type V2ThreadSettingsUpdatedNotification__ModeKind = "plan" | "default";
+export const V2ThreadSettingsUpdatedNotification__ModeKind = Schema.Literals([
+  "plan",
+  "default",
+]).annotate({
   description: "Initial collaboration mode to use when the TUI starts.",
+  identifier: "V2ThreadSettingsUpdatedNotification__ModeKind",
 });
 
-export type V2TurnStartParams__Personality = "none" | "friendly" | "pragmatic";
-export const V2TurnStartParams__Personality = Schema.Literals(["none", "friendly", "pragmatic"]);
-
-export type V2TurnStartParams__ReasoningEffort = string;
-export const V2TurnStartParams__ReasoningEffort = Schema.String.annotate({
+export type V2ThreadSettingsUpdatedNotification__ReasoningEffort = string;
+export const V2ThreadSettingsUpdatedNotification__ReasoningEffort = Schema.String.annotate({
   description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadSettingsUpdatedNotification__ReasoningEffort",
+  }),
+);
 
-export type V2TurnStartParams__ReasoningSummary = "auto" | "concise" | "detailed" | "none";
-export const V2TurnStartParams__ReasoningSummary = Schema.Union(
+export type V2ThreadSettingsUpdatedNotification__AbsolutePathBuf = string;
+export const V2ThreadSettingsUpdatedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadSettingsUpdatedNotification__AbsolutePathBuf",
+});
+
+export type V2ThreadSettingsUpdatedNotification__Personality = "none" | "friendly" | "pragmatic";
+export const V2ThreadSettingsUpdatedNotification__Personality = Schema.Literals([
+  "none",
+  "friendly",
+  "pragmatic",
+]).annotate({
+  description: "Deprecated: `friendly` and `pragmatic` no longer select a style.",
+  identifier: "V2ThreadSettingsUpdatedNotification__Personality",
+});
+
+export type V2ThreadSettingsUpdatedNotification__NetworkAccess = "restricted" | "enabled";
+export const V2ThreadSettingsUpdatedNotification__NetworkAccess = Schema.Literals([
+  "restricted",
+  "enabled",
+]).annotate({ identifier: "V2ThreadSettingsUpdatedNotification__NetworkAccess" });
+
+export type V2ThreadSettingsUpdatedNotification__ReasoningSummary =
+  | "auto"
+  | "concise"
+  | "detailed"
+  | "none";
+export const V2ThreadSettingsUpdatedNotification__ReasoningSummary = Schema.Union(
   [
     Schema.Literals(["auto", "concise", "detailed"]),
     Schema.Literal("none").annotate({ description: "Option to disable reasoning summaries." }),
@@ -10645,206 +12701,210 @@ export const V2TurnStartParams__ReasoningSummary = Schema.Union(
 ).annotate({
   description:
     "A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#reasoning-summaries",
+  identifier: "V2ThreadSettingsUpdatedNotification__ReasoningSummary",
 });
 
-export type V2TurnStartParams__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadStartedNotification__AbsolutePathBuf = string;
+export const V2ThreadStartedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadStartedNotification__AbsolutePathBuf",
+});
+
+export type V2ThreadStartedNotification__GitInfo = {
+  readonly branch?: string | null;
+  readonly originUrl?: string | null;
+  readonly sha?: string | null;
 };
-export const V2TurnStartParams__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
+export const V2ThreadStartedNotification__GitInfo = Schema.Struct({
+  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadStartedNotification__GitInfo" });
+
+export type V2ThreadStartedNotification__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadStartedNotification__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadStartedNotification__ThreadHistoryMode" });
+
+export type V2ThreadStartedNotification__ReasoningEffort = string;
+export const V2ThreadStartedNotification__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadStartedNotification__ReasoningEffort",
   }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
-      }),
-      Schema.Null,
-    ]),
-  ),
+);
+
+export type V2ThreadStartedNotification__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
+};
+export const V2ThreadStartedNotification__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadStartedNotification__ThreadSectionAppearance",
 });
 
-export type V2TurnStartResponse__AbsolutePathBuf = string;
-export const V2TurnStartResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+export type V2ThreadStartedNotification__AgentPath = string;
+export const V2ThreadStartedNotification__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadStartedNotification__AgentPath",
 });
 
-export type V2TurnStartResponse__CollabAgentStatus =
-  | "pendingInit"
-  | "running"
-  | "interrupted"
-  | "completed"
-  | "errored"
-  | "shutdown"
-  | "notFound";
-export const V2TurnStartResponse__CollabAgentStatus = Schema.Literals([
-  "pendingInit",
-  "running",
-  "interrupted",
-  "completed",
-  "errored",
-  "shutdown",
-  "notFound",
-]);
+export type V2ThreadStartedNotification__ThreadId = string;
+export const V2ThreadStartedNotification__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadStartedNotification__ThreadId",
+});
 
-export type V2TurnStartResponse__CommandExecutionStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "declined";
-export const V2TurnStartResponse__CommandExecutionStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "declined",
-]);
+export type V2ThreadStartedNotification__ThreadActiveFlag =
+  | "waitingOnApproval"
+  | "waitingOnUserInput";
+export const V2ThreadStartedNotification__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadStartedNotification__ThreadActiveFlag" });
 
-export type V2TurnStartResponse__DynamicToolCallOutputContentItem =
-  | { readonly text: string; readonly type: "inputText" }
-  | { readonly imageUrl: string; readonly type: "inputImage" }
-  | { readonly audioUrl: string; readonly type: "inputAudio" };
-export const V2TurnStartResponse__DynamicToolCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("inputText").annotate({
-        title: "InputTextDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      imageUrl: Schema.String,
-      type: Schema.Literal("inputImage").annotate({
-        title: "InputImageDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
-    Schema.Struct({
-      audioUrl: Schema.String,
-      type: Schema.Literal("inputAudio").annotate({
-        title: "InputAudioDynamicToolCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadStartedNotification__ThreadSource = string;
+export const V2ThreadStartedNotification__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadStartedNotification__ThreadSource",
+});
 
-export type V2TurnStartResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2TurnStartResponse__DynamicToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
+export type V2ThreadStartedNotification__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadStartedNotification__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadStartedNotification__NonSteerableTurnKind" });
 
-export type V2TurnStartResponse__HookPromptFragment = {
-  readonly hookRunId: string;
-  readonly text: string;
+export type V2ThreadStartedNotification__MisalignmentSteer = { readonly message: string };
+export const V2ThreadStartedNotification__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadStartedNotification__MisalignmentSteer" });
+
+export type V2ThreadStartedNotification__ByteRange = {
+  readonly end: number;
+  readonly start: number;
 };
-export const V2TurnStartResponse__HookPromptFragment = Schema.Struct({
-  hookRunId: Schema.String,
-  text: Schema.String,
-});
+export const V2ThreadStartedNotification__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadStartedNotification__ByteRange" });
 
-export type V2TurnStartResponse__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2TurnStartResponse__ImageDetail = Schema.Literals([
+export type V2ThreadStartedNotification__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadStartedNotification__ImageDetail = Schema.Literals([
   "auto",
   "low",
   "high",
   "original",
-]);
+]).annotate({ identifier: "V2ThreadStartedNotification__ImageDetail" });
 
-export type V2TurnStartResponse__LegacyAppPathString = string;
-export const V2TurnStartResponse__LegacyAppPathString = Schema.String;
-
-export type V2TurnStartResponse__McpToolCallAppContext = {
-  readonly actionName?: string | null;
-  readonly appName?: string | null;
-  readonly connectorId: string;
-  readonly linkId?: string | null;
-  readonly resourceUri?: string | null;
+export type V2ThreadStartedNotification__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const V2TurnStartResponse__McpToolCallAppContext = Schema.Struct({
-  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  connectorId: Schema.String,
-  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2TurnStartResponse__McpToolCallError = { readonly message: string };
-export const V2TurnStartResponse__McpToolCallError = Schema.Struct({ message: Schema.String });
+export const V2ThreadStartedNotification__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadStartedNotification__HookPromptFragment" });
 
-export type V2TurnStartResponse__McpToolCallResult = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
-  readonly structuredContent?: unknown;
-};
-export const V2TurnStartResponse__McpToolCallResult = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+export type V2ThreadStartedNotification__AgentMessageDelivery = "async";
+export const V2ThreadStartedNotification__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadStartedNotification__AgentMessageDelivery",
 });
 
-export type V2TurnStartResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
-export const V2TurnStartResponse__McpToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-]);
-
-export type V2TurnStartResponse__MemoryCitationEntry = {
+export type V2ThreadStartedNotification__MemoryCitationEntry = {
   readonly lineEnd: number;
   readonly lineStart: number;
   readonly note: string;
   readonly path: string;
 };
-export const V2TurnStartResponse__MemoryCitationEntry = Schema.Struct({
+export const V2ThreadStartedNotification__MemoryCitationEntry = Schema.Struct({
   lineEnd: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   lineStart: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   note: Schema.String,
   path: Schema.String,
-});
+}).annotate({ identifier: "V2ThreadStartedNotification__MemoryCitationEntry" });
 
-export type V2TurnStartResponse__MessagePhase = "commentary" | "final_answer";
-export const V2TurnStartResponse__MessagePhase = Schema.Literals([
-  "commentary",
-  "final_answer",
-]).annotate({
+export type V2ThreadStartedNotification__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadStartedNotification__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
     'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadStartedNotification__MessagePhase",
 });
 
-export type V2TurnStartResponse__NonSteerableTurnKind = "review" | "compact";
-export const V2TurnStartResponse__NonSteerableTurnKind = Schema.Literals(["review", "compact"]);
+export type V2ThreadStartedNotification__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
+};
+export const V2ThreadStartedNotification__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadStartedNotification__AsyncUserInputQuestion" });
 
-export type V2TurnStartResponse__PatchApplyStatus =
+export type V2ThreadStartedNotification__LegacyAppPathString = string;
+export const V2ThreadStartedNotification__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadStartedNotification__LegacyAppPathString",
+});
+
+export type V2ThreadStartedNotification__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadStartedNotification__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadStartedNotification__CommandExecutionSource" });
+
+export type V2ThreadStartedNotification__CommandExecutionStatus =
   | "inProgress"
   | "completed"
   | "failed"
   | "declined";
-export const V2TurnStartResponse__PatchApplyStatus = Schema.Literals([
+export const V2ThreadStartedNotification__CommandExecutionStatus = Schema.Literals([
   "inProgress",
   "completed",
   "failed",
   "declined",
-]);
+]).annotate({ identifier: "V2ThreadStartedNotification__CommandExecutionStatus" });
 
-export type V2TurnStartResponse__PatchChangeKind =
+export type V2ThreadStartedNotification__PatchChangeKind =
   | { readonly type: "add" }
   | { readonly type: "delete" }
   | { readonly move_path?: string | null; readonly type: "update" };
-export const V2TurnStartResponse__PatchChangeKind = Schema.Union(
+export const V2ThreadStartedNotification__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
       type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
@@ -10858,59 +12918,167 @@ export const V2TurnStartResponse__PatchChangeKind = Schema.Union(
     }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnStartResponse__ReasoningEffort = string;
-export const V2TurnStartResponse__ReasoningEffort = Schema.String.annotate({
-  description: "A non-empty reasoning effort value advertised by the model.",
-}).check(Schema.isMinLength(1));
+).annotate({ identifier: "V2ThreadStartedNotification__PatchChangeKind" });
 
-export type V2TurnStartResponse__SubAgentActivityKind =
-  | "started"
-  | "interacted"
-  | "interrupted"
-  | "completed";
-export const V2TurnStartResponse__SubAgentActivityKind = Schema.Literals([
-  "started",
-  "interacted",
-  "interrupted",
+export type V2ThreadStartedNotification__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadStartedNotification__PatchApplyStatus = Schema.Literals([
+  "inProgress",
   "completed",
-]);
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadStartedNotification__PatchApplyStatus" });
 
-export type V2TurnStartResponse__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadStartedNotification__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const V2TurnStartResponse__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+export const V2ThreadStartedNotification__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadStartedNotification__McpToolCallAppContext" });
+
+export type V2ThreadStartedNotification__McpToolCallError = { readonly message: string };
+export const V2ThreadStartedNotification__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadStartedNotification__McpToolCallError" });
+
+export type V2ThreadStartedNotification__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadStartedNotification__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadStartedNotification__McpAppDisplayMode" });
+
+export type V2ThreadStartedNotification__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadStartedNotification__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadStartedNotification__McpToolCallResult" });
+
+export type V2ThreadStartedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadStartedNotification__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadStartedNotification__McpToolCallStatus" });
+
+export type V2ThreadStartedNotification__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadStartedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-});
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartedNotification__DynamicToolCallOutputContentItem" });
 
-export type V2TurnStartResponse__TurnStatus = "completed" | "interrupted" | "failed" | "inProgress";
-export const V2TurnStartResponse__TurnStatus = Schema.Literals([
+export type V2ThreadStartedNotification__DynamicToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed";
+export const V2ThreadStartedNotification__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
   "completed",
-  "interrupted",
   "failed",
+]).annotate({ identifier: "V2ThreadStartedNotification__DynamicToolCallStatus" });
+
+export type V2ThreadStartedNotification__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadStartedNotification__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadStartedNotification__CollabAgentStatus" });
+
+export type V2ThreadStartedNotification__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ThreadStartedNotification__CollabAgentToolCallStatus = Schema.Literals([
   "inProgress",
-]);
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ThreadStartedNotification__CollabAgentToolCallStatus" });
 
-export type V2TurnStartResponse__WebSearchAction =
+export type V2ThreadStartedNotification__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadStartedNotification__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadStartedNotification__CollabAgentTool" });
+
+export type V2ThreadStartedNotification__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadStartedNotification__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadStartedNotification__SubAgentActivityKind" });
+
+export type V2ThreadStartedNotification__WebSearchAction =
   | {
       readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
@@ -10919,7 +13087,7 @@ export type V2TurnStartResponse__WebSearchAction =
   | { readonly type: "openPage"; readonly url?: string | null }
   | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
   | { readonly type: "other" };
-export const V2TurnStartResponse__WebSearchAction = Schema.Union(
+export const V2ThreadStartedNotification__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
       queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
@@ -10940,4638 +13108,3776 @@ export const V2TurnStartResponse__WebSearchAction = Schema.Union(
     }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnSteerParams__AdditionalContextKind = "untrusted" | "application";
-export const V2TurnSteerParams__AdditionalContextKind = Schema.Literals([
-  "untrusted",
-  "application",
-]);
+).annotate({ identifier: "V2ThreadStartedNotification__WebSearchAction" });
 
-export type V2TurnSteerParams__ImageDetail = "auto" | "low" | "high" | "original";
-export const V2TurnSteerParams__ImageDetail = Schema.Literals(["auto", "low", "high", "original"]);
-
-export type V2TurnSteerParams__TextElement = {
-  readonly byteRange: { readonly end: number; readonly start: number };
-  readonly placeholder?: string | null;
+export type V2ThreadStartedNotification__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const V2TurnSteerParams__TextElement = Schema.Struct({
-  byteRange: Schema.Struct({
-    end: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    start: Schema.Number.annotate({ format: "uint" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({
-    description: "Byte range in the parent `text` buffer that this element occupies.",
-  }),
-  placeholder: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+export const V2ThreadStartedNotification__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2WindowsSandboxReadinessResponse__WindowsSandboxReadiness =
-  | "ready"
-  | "notConfigured"
-  | "updateRequired";
-export const V2WindowsSandboxReadinessResponse__WindowsSandboxReadiness = Schema.Literals([
-  "ready",
-  "notConfigured",
-  "updateRequired",
-]);
-
-export type V2WindowsSandboxSetupCompletedNotification__WindowsSandboxSetupMode =
-  | "elevated"
-  | "unelevated";
-export const V2WindowsSandboxSetupCompletedNotification__WindowsSandboxSetupMode = Schema.Literals([
-  "elevated",
-  "unelevated",
-]);
-
-export type V2WindowsSandboxSetupStartParams__AbsolutePathBuf = string;
-export const V2WindowsSandboxSetupStartParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2WindowsSandboxSetupStartParams__WindowsSandboxSetupMode = "elevated" | "unelevated";
-export const V2WindowsSandboxSetupStartParams__WindowsSandboxSetupMode = Schema.Literals([
-  "elevated",
-  "unelevated",
-]);
-
-export type ApplyPatchApprovalResponse__NetworkPolicyAmendment = {
-  readonly action: ApplyPatchApprovalResponse__NetworkPolicyRuleAction;
-  readonly host: string;
-};
-export const ApplyPatchApprovalResponse__NetworkPolicyAmendment = Schema.Struct({
-  action: ApplyPatchApprovalResponse__NetworkPolicyRuleAction,
-  host: Schema.String,
-});
-
-export type ClientRequest__PluginInstallParams = {
-  readonly marketplacePath?: ClientRequest__AbsolutePathBuf | null;
-  readonly pluginName: string;
-  readonly remoteMarketplaceName?: string | null;
-};
-export const ClientRequest__PluginInstallParams = Schema.Struct({
-  marketplacePath: Schema.optionalKey(Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null])),
-  pluginName: Schema.String,
-  remoteMarketplaceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartedNotification__ImageGenerationFailure" });
 
-export type ClientRequest__PluginInstalledParams = {
-  readonly cwds?: ReadonlyArray<ClientRequest__AbsolutePathBuf> | null;
-  readonly installSuggestionPluginNames?: ReadonlyArray<string> | null;
-};
-export const ClientRequest__PluginInstalledParams = Schema.Struct({
-  cwds: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ClientRequest__AbsolutePathBuf).annotate({
-        description: "Optional working directories used to discover repo marketplaces.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  installSuggestionPluginNames: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(Schema.String).annotate({
-        description:
-          "Additional uninstalled plugin names that should be returned when present locally. This is used by mention surfaces that intentionally expose install entrypoints.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export type V2ThreadStartedNotification__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadStartedNotification__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartedNotification__TurnItemsView" });
 
-export type ClientRequest__PluginReadParams = {
-  readonly marketplacePath?: ClientRequest__AbsolutePathBuf | null;
-  readonly pluginName: string;
-  readonly remoteMarketplaceName?: string | null;
-};
-export const ClientRequest__PluginReadParams = Schema.Struct({
-  marketplacePath: Schema.optionalKey(Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null])),
-  pluginName: Schema.String,
-  remoteMarketplaceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export type V2ThreadStartedNotification__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadStartedNotification__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2ThreadStartedNotification__TurnStatus" });
 
-export type ClientRequest__SandboxPolicy =
-  | { readonly type: "dangerFullAccess" }
-  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
+export type V2ThreadStartParams__AskForApproval =
+  | "untrusted"
+  | "on-request"
+  | "never"
   | {
-      readonly excludeSlashTmp?: boolean;
-      readonly excludeTmpdirEnvVar?: boolean;
-      readonly networkAccess?: boolean;
-      readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<ClientRequest__AbsolutePathBuf>;
+      readonly granular: {
+        readonly mcp_elicitations: boolean;
+        readonly request_permissions?: boolean;
+        readonly rules: boolean;
+        readonly sandbox_approval: boolean;
+        readonly skill_approval?: boolean;
+      };
     };
-export const ClientRequest__SandboxPolicy = Schema.Union(
+export const V2ThreadStartParams__AskForApproval = Schema.Union(
   [
+    Schema.Literals(["untrusted", "on-request", "never"]),
     Schema.Struct({
-      type: Schema.Literal("dangerFullAccess").annotate({
-        title: "DangerFullAccessSandboxPolicyType",
-      }),
-    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-    }).annotate({ title: "ReadOnlySandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-      ),
-      type: Schema.Literal("externalSandbox").annotate({
-        title: "ExternalSandboxSandboxPolicyType",
+      granular: Schema.Struct({
+        mcp_elicitations: Schema.Boolean,
+        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+        rules: Schema.Boolean,
+        sandbox_approval: Schema.Boolean,
+        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
       }),
-    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-    Schema.Struct({
-      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
-      writableRoots: Schema.optionalKey(
-        Schema.Array(ClientRequest__AbsolutePathBuf).annotate({ default: [] }),
-      ),
-    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+    }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartParams__AskForApproval" });
 
-export type ClientRequest__SkillsConfigWriteParams = {
-  readonly enabled: boolean;
-  readonly name?: string | null;
-  readonly path?: ClientRequest__AbsolutePathBuf | null;
-};
-export const ClientRequest__SkillsConfigWriteParams = Schema.Struct({
-  enabled: Schema.Boolean,
-  name: Schema.optionalKey(
-    Schema.Union([Schema.String.annotate({ description: "Name-based selector." }), Schema.Null]),
-  ),
-  path: Schema.optionalKey(
-    Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Path-based selector.",
-    }),
-  ),
+export type V2ThreadStartParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const V2ThreadStartParams__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ThreadStartParams__ApprovalsReviewer",
 });
 
-export type ClientRequest__SkillsExtraRootsSetParams = {
-  readonly extraRoots: ReadonlyArray<ClientRequest__AbsolutePathBuf>;
-};
-export const ClientRequest__SkillsExtraRootsSetParams = Schema.Struct({
-  extraRoots: Schema.Array(ClientRequest__AbsolutePathBuf),
+export type V2ThreadStartParams__Personality = "none" | "friendly" | "pragmatic";
+export const V2ThreadStartParams__Personality = Schema.Literals([
+  "none",
+  "friendly",
+  "pragmatic",
+]).annotate({
+  description: "Deprecated: `friendly` and `pragmatic` no longer select a style.",
+  identifier: "V2ThreadStartParams__Personality",
 });
 
-export type ClientRequest__SendAddCreditsNudgeEmailParams = {
-  readonly creditType: ClientRequest__AddCreditsNudgeCreditType;
-};
-export const ClientRequest__SendAddCreditsNudgeEmailParams = Schema.Struct({
-  creditType: ClientRequest__AddCreditsNudgeCreditType,
+export type V2ThreadStartParams__SandboxMode =
+  | "read-only"
+  | "workspace-write"
+  | "danger-full-access";
+export const V2ThreadStartParams__SandboxMode = Schema.Literals([
+  "read-only",
+  "workspace-write",
+  "danger-full-access",
+]).annotate({ identifier: "V2ThreadStartParams__SandboxMode" });
+
+export type V2ThreadStartParams__ThreadStartSource = "startup" | "clear";
+export const V2ThreadStartParams__ThreadStartSource = Schema.Literals([
+  "startup",
+  "clear",
+]).annotate({ identifier: "V2ThreadStartParams__ThreadStartSource" });
+
+export type V2ThreadStartParams__ThreadSource = string;
+export const V2ThreadStartParams__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadStartParams__ThreadSource",
 });
 
-export type ClientRequest__ContentItem =
-  | { readonly text: string; readonly type: "input_text" }
-  | {
-      readonly detail?: ClientRequest__ImageDetail | null;
-      readonly image_url: string;
-      readonly type: "input_image";
-    }
-  | { readonly audio_url: string; readonly type: "input_audio" }
-  | { readonly text: string; readonly type: "output_text" };
-export const ClientRequest__ContentItem = Schema.Union(
+export type V2ThreadStartParams__DynamicToolNamespaceTool = {
+  readonly deferLoading?: boolean;
+  readonly description: string;
+  readonly inputSchema: Schema.Json;
+  readonly name: string;
+  readonly type: "function";
+};
+export const V2ThreadStartParams__DynamicToolNamespaceTool = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("input_text").annotate({ title: "InputTextContentItemType" }),
-    }).annotate({ title: "InputTextContentItem" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
-      image_url: Schema.String,
-      type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
-    }).annotate({ title: "InputImageContentItem" }),
-    Schema.Struct({
-      audio_url: Schema.String,
-      type: Schema.Literal("input_audio").annotate({ title: "InputAudioContentItemType" }),
-    }).annotate({ title: "InputAudioContentItem" }),
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("output_text").annotate({ title: "OutputTextContentItemType" }),
-    }).annotate({ title: "OutputTextContentItem" }),
+      deferLoading: Schema.optionalKey(Schema.Boolean),
+      description: Schema.String,
+      inputSchema: Schema.Json.annotate({ expected: "JSON value" }),
+      name: Schema.String,
+      type: Schema.Literal("function").annotate({ title: "FunctionDynamicToolNamespaceToolType" }),
+    }).annotate({ title: "FunctionDynamicToolNamespaceTool" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartParams__DynamicToolNamespaceTool" });
 
-export type ClientRequest__FunctionCallOutputContentItem =
-  | { readonly text: string; readonly type: "input_text" }
-  | {
-      readonly detail?: ClientRequest__ImageDetail | null;
-      readonly image_url: string;
-      readonly type: "input_image";
-    }
-  | { readonly audio_url: string; readonly type: "input_audio" }
-  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
-export const ClientRequest__FunctionCallOutputContentItem = Schema.Union(
+export type V2ThreadStartParams__CapabilityRootLocation = {
+  readonly environmentId: string;
+  readonly path: string;
+  readonly type: "environment";
+};
+export const V2ThreadStartParams__CapabilityRootLocation = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("input_text").annotate({
-        title: "InputTextFunctionCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
-      image_url: Schema.String,
-      type: Schema.Literal("input_image").annotate({
-        title: "InputImageFunctionCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
-    Schema.Struct({
-      audio_url: Schema.String,
-      type: Schema.Literal("input_audio").annotate({
-        title: "InputAudioFunctionCallOutputContentItemType",
+      environmentId: Schema.String,
+      path: Schema.String.annotate({
+        description: "Absolute path for the root in the selected environment.",
       }),
-    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
-    Schema.Struct({
-      encrypted_content: Schema.String,
-      type: Schema.Literal("encrypted_content").annotate({
-        title: "EncryptedContentFunctionCallOutputContentItemType",
+      type: Schema.Literal("environment").annotate({
+        title: "EnvironmentCapabilityRootLocationType",
       }),
-    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+    }).annotate({
+      title: "EnvironmentCapabilityRootLocation",
+      description: "A path owned by an execution environment.",
+    }),
   ],
   { mode: "oneOf" },
 ).annotate({
-  description:
-    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  description: "Location used to resolve a selected capability root.",
+  identifier: "V2ThreadStartParams__CapabilityRootLocation",
 });
 
-export type ClientRequest__InitializeParams = {
-  readonly capabilities?: ClientRequest__InitializeCapabilities | null;
-  readonly clientInfo: ClientRequest__ClientInfo;
-};
-export const ClientRequest__InitializeParams = Schema.Struct({
-  capabilities: Schema.optionalKey(
-    Schema.Union([ClientRequest__InitializeCapabilities, Schema.Null]),
-  ),
-  clientInfo: ClientRequest__ClientInfo,
+export type V2ThreadStartParams__LegacyAppPathString = string;
+export const V2ThreadStartParams__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadStartParams__LegacyAppPathString",
 });
 
-export type ClientRequest__LoginAccountParams =
-  | { readonly apiKey: string; readonly type: "apiKey" }
-  | {
-      readonly appBrand?: ClientRequest__LoginAppBrand | null;
-      readonly codexStreamlinedLogin?: boolean;
-      readonly type: "chatgpt";
-      readonly useHostedLoginSuccessPage?: boolean;
-    }
-  | { readonly type: "chatgptDeviceCode" }
+export type V2ThreadStartResponse__AskForApproval =
+  | "untrusted"
+  | "on-request"
+  | "never"
   | {
-      readonly accessToken: string;
-      readonly chatgptAccountId: string;
-      readonly chatgptPlanType?: string | null;
-      readonly type: "chatgptAuthTokens";
-    }
-  | { readonly apiKey: string; readonly region: string; readonly type: "amazonBedrock" };
-export const ClientRequest__LoginAccountParams = Schema.Union(
+      readonly granular: {
+        readonly mcp_elicitations: boolean;
+        readonly request_permissions?: boolean;
+        readonly rules: boolean;
+        readonly sandbox_approval: boolean;
+        readonly skill_approval?: boolean;
+      };
+    };
+export const V2ThreadStartResponse__AskForApproval = Schema.Union(
   [
+    Schema.Literals(["untrusted", "on-request", "never"]),
     Schema.Struct({
-      apiKey: Schema.String,
-      type: Schema.Literal("apiKey").annotate({ title: "ApiKeyLoginAccountParamsType" }),
-    }).annotate({ title: "ApiKeyLoginAccountParams" }),
-    Schema.Struct({
-      appBrand: Schema.optionalKey(Schema.Union([ClientRequest__LoginAppBrand, Schema.Null])),
-      codexStreamlinedLogin: Schema.optionalKey(Schema.Boolean),
-      type: Schema.Literal("chatgpt").annotate({ title: "ChatgptLoginAccountParamsType" }),
-      useHostedLoginSuccessPage: Schema.optionalKey(Schema.Boolean),
-    }).annotate({ title: "ChatgptLoginAccountParams" }),
-    Schema.Struct({
-      type: Schema.Literal("chatgptDeviceCode").annotate({
-        title: "ChatgptDeviceCodeLoginAccountParamsType",
-      }),
-    }).annotate({ title: "ChatgptDeviceCodeLoginAccountParams" }),
-    Schema.Struct({
-      accessToken: Schema.String.annotate({
-        description:
-          "Access token (JWT) supplied by the client. This token is used for backend API requests and email extraction.",
-      }),
-      chatgptAccountId: Schema.String.annotate({
-        description: "Workspace/account identifier supplied by the client.",
-      }),
-      chatgptPlanType: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({
-            description:
-              "Optional plan type supplied by the client.\n\nWhen `null`, Codex attempts to derive the plan type from access-token claims. If unavailable, the plan defaults to `unknown`.",
-          }),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("chatgptAuthTokens").annotate({
-        title: "ChatgptAuthTokensLoginAccountParamsType",
-      }),
-    }).annotate({
-      title: "ChatgptAuthTokensLoginAccountParams",
-      description:
-        "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE. The access token must contain the same scopes that Codex-managed ChatGPT auth tokens have.",
-    }),
-    Schema.Struct({
-      apiKey: Schema.String,
-      region: Schema.String,
-      type: Schema.Literal("amazonBedrock").annotate({
-        title: "AmazonBedrockLoginAccountParamsType",
+      granular: Schema.Struct({
+        mcp_elicitations: Schema.Boolean,
+        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+        rules: Schema.Boolean,
+        sandbox_approval: Schema.Boolean,
+        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
       }),
-    }).annotate({
-      title: "AmazonBedrockLoginAccountParams",
-      description: "[UNSTABLE] Managed Amazon Bedrock login is experimental.",
-    }),
+    }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartResponse__AskForApproval" });
+
+export type V2ThreadStartResponse__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const V2ThreadStartResponse__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
+  description:
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2ThreadStartResponse__ApprovalsReviewer",
+});
+
+export type V2ThreadStartResponse__AbsolutePathBuf = string;
+export const V2ThreadStartResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadStartResponse__AbsolutePathBuf",
+});
+
+export type V2ThreadStartResponse__LegacyAppPathString = string;
+export const V2ThreadStartResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadStartResponse__LegacyAppPathString",
+});
+
+export type V2ThreadStartResponse__ReasoningEffort = string;
+export const V2ThreadStartResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadStartResponse__ReasoningEffort",
+  }),
 );
 
-export type ClientRequest__ListMcpServerStatusParams = {
-  readonly cursor?: string | null;
-  readonly detail?: ClientRequest__McpServerStatusDetail | null;
-  readonly limit?: number | null;
-  readonly threadId?: string | null;
+export type V2ThreadStartResponse__NetworkAccess = "restricted" | "enabled";
+export const V2ThreadStartResponse__NetworkAccess = Schema.Literals([
+  "restricted",
+  "enabled",
+]).annotate({ identifier: "V2ThreadStartResponse__NetworkAccess" });
+
+export type V2ThreadStartResponse__GitInfo = {
+  readonly branch?: string | null;
+  readonly originUrl?: string | null;
+  readonly sha?: string | null;
 };
-export const ClientRequest__ListMcpServerStatusParams = Schema.Struct({
-  cursor: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Opaque pagination cursor returned by a previous call.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  detail: Schema.optionalKey(
-    Schema.Union([ClientRequest__McpServerStatusDetail, Schema.Null]).annotate({
-      description:
-        "Controls how much MCP inventory data to fetch for each server. Defaults to `Full` when omitted.",
-    }),
-  ),
-  limit: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
-        description: "Optional page size; defaults to a server-defined value.",
-        format: "uint32",
-      })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export const V2ThreadStartResponse__GitInfo = Schema.Struct({
+  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadStartResponse__GitInfo" });
 
-export type ClientRequest__ConfigEdit = {
-  readonly keyPath: string;
-  readonly mergeStrategy: ClientRequest__MergeStrategy;
-  readonly value: unknown;
+export type V2ThreadStartResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadStartResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadStartResponse__ThreadHistoryMode" });
+
+export type V2ThreadStartResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const ClientRequest__ConfigEdit = Schema.Struct({
-  keyPath: Schema.String,
-  mergeStrategy: ClientRequest__MergeStrategy,
-  value: Schema.Unknown,
+export const V2ThreadStartResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadStartResponse__ThreadSectionAppearance",
 });
 
-export type ClientRequest__ConfigValueWriteParams = {
-  readonly expectedVersion?: string | null;
-  readonly filePath?: string | null;
-  readonly keyPath: string;
-  readonly mergeStrategy: ClientRequest__MergeStrategy;
-  readonly value: unknown;
-};
-export const ClientRequest__ConfigValueWriteParams = Schema.Struct({
-  expectedVersion: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  filePath: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Path to the config file to write; defaults to the user's `config.toml` when omitted.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  keyPath: Schema.String,
-  mergeStrategy: ClientRequest__MergeStrategy,
-  value: Schema.Unknown,
+export type V2ThreadStartResponse__AgentPath = string;
+export const V2ThreadStartResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadStartResponse__AgentPath",
 });
 
-export type ClientRequest__PluginListParams = {
-  readonly cwds?: ReadonlyArray<ClientRequest__AbsolutePathBuf> | null;
-  readonly marketplaceKinds?: ReadonlyArray<ClientRequest__PluginListMarketplaceKind> | null;
-};
-export const ClientRequest__PluginListParams = Schema.Struct({
-  cwds: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ClientRequest__AbsolutePathBuf).annotate({
-        description:
-          "Optional working directories used to discover repo marketplaces. When omitted, only home-scoped marketplaces and the official curated marketplace are considered.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  marketplaceKinds: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ClientRequest__PluginListMarketplaceKind).annotate({
-        description:
-          "Optional marketplace kind filter. When omitted, only local marketplaces are queried, plus the default remote catalog when enabled by feature flag.",
-      }),
-      Schema.Null,
-    ]),
-  ),
+export type V2ThreadStartResponse__ThreadId = string;
+export const V2ThreadStartResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadStartResponse__ThreadId",
 });
 
-export type ClientRequest__PluginShareTarget = {
-  readonly principalId: string;
-  readonly principalType: ClientRequest__PluginSharePrincipalType;
-  readonly role: ClientRequest__PluginShareTargetRole;
-};
-export const ClientRequest__PluginShareTarget = Schema.Struct({
-  principalId: Schema.String,
-  principalType: ClientRequest__PluginSharePrincipalType,
-  role: ClientRequest__PluginShareTargetRole,
+export type V2ThreadStartResponse__ThreadActiveFlag = "waitingOnApproval" | "waitingOnUserInput";
+export const V2ThreadStartResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadStartResponse__ThreadActiveFlag" });
+
+export type V2ThreadStartResponse__ThreadSource = string;
+export const V2ThreadStartResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadStartResponse__ThreadSource",
 });
 
-export type ClientRequest__Settings = {
-  readonly developer_instructions?: string | null;
-  readonly model: string;
-  readonly reasoning_effort?: ClientRequest__ReasoningEffort | null;
-};
-export const ClientRequest__Settings = Schema.Struct({
-  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  model: Schema.String,
-  reasoning_effort: Schema.optionalKey(Schema.Union([ClientRequest__ReasoningEffort, Schema.Null])),
-}).annotate({ description: "Settings for a collaboration mode." });
+export type V2ThreadStartResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadStartResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadStartResponse__NonSteerableTurnKind" });
 
-export type ClientRequest__ReviewStartParams = {
-  readonly delivery?: ClientRequest__ReviewDelivery | null;
-  readonly target: ClientRequest__ReviewTarget;
-  readonly threadId: string;
+export type V2ThreadStartResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadStartResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadStartResponse__MisalignmentSteer" });
+
+export type V2ThreadStartResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadStartResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadStartResponse__ByteRange" });
+
+export type V2ThreadStartResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadStartResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadStartResponse__ImageDetail" });
+
+export type V2ThreadStartResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const ClientRequest__ReviewStartParams = Schema.Struct({
-  delivery: Schema.optionalKey(
-    Schema.Union([ClientRequest__ReviewDelivery, Schema.Null]).annotate({
-      description:
-        "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`).",
-    }),
-  ),
-  target: ClientRequest__ReviewTarget,
-  threadId: Schema.String,
+export const V2ThreadStartResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadStartResponse__HookPromptFragment" });
+
+export type V2ThreadStartResponse__AgentMessageDelivery = "async";
+export const V2ThreadStartResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadStartResponse__AgentMessageDelivery",
 });
 
-export type ClientRequest__ThreadResumeParams = {
-  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
-  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
-  readonly baseInstructions?: string | null;
-  readonly config?: { readonly [x: string]: unknown } | null;
-  readonly cwd?: string | null;
-  readonly developerInstructions?: string | null;
-  readonly model?: string | null;
-  readonly modelProvider?: string | null;
-  readonly personality?: ClientRequest__Personality | null;
-  readonly sandbox?: ClientRequest__SandboxMode | null;
-  readonly serviceTier?: string | null;
-  readonly threadId: string;
+export type V2ThreadStartResponse__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
 };
-export const ClientRequest__ThreadResumeParams = Schema.Struct({
-  approvalPolicy: Schema.optionalKey(Schema.Union([ClientRequest__AskForApproval, Schema.Null])),
-  approvalsReviewer: Schema.optionalKey(
-    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
+export const V2ThreadStartResponse__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadStartResponse__MemoryCitationEntry" });
+
+export type V2ThreadStartResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadStartResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
       description:
-        "Override where approval requests are routed for review on this thread and subsequent turns.",
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
     }),
-  ),
-  baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  config: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.Unknown), Schema.Null]),
-  ),
-  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  model: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Configuration overrides for the resumed thread, if any.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  personality: Schema.optionalKey(Schema.Union([ClientRequest__Personality, Schema.Null])),
-  sandbox: Schema.optionalKey(Schema.Union([ClientRequest__SandboxMode, Schema.Null])),
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  threadId: Schema.String,
-}).annotate({
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
   description:
-    "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nFor non-running threads, the precedence is: history > non-empty path > thread_id. If using history or a non-empty path for a non-running thread, the thread_id param will be ignored.\n\nIf thread_id identifies a running thread, app-server rejoins that thread and treats a non-empty path as a consistency check against the active rollout path. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadStartResponse__MessagePhase",
 });
 
-export type ClientRequest__MigrationDetails = {
-  readonly commands?: ReadonlyArray<ClientRequest__CommandMigration>;
-  readonly hooks?: ReadonlyArray<ClientRequest__HookMigration>;
-  readonly mcpServers?: ReadonlyArray<ClientRequest__McpServerMigration>;
-  readonly memory?: ReadonlyArray<string>;
-  readonly plugins?: ReadonlyArray<ClientRequest__PluginsMigration>;
-  readonly sessions?: ReadonlyArray<ClientRequest__SessionMigration>;
-  readonly skills?: ReadonlyArray<ClientRequest__SkillMigration>;
-  readonly subagents?: ReadonlyArray<ClientRequest__SubagentMigration>;
+export type V2ThreadStartResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
 };
-export const ClientRequest__MigrationDetails = Schema.Struct({
-  commands: Schema.optionalKey(
-    Schema.Array(ClientRequest__CommandMigration).annotate({ default: [] }),
-  ),
-  hooks: Schema.optionalKey(Schema.Array(ClientRequest__HookMigration).annotate({ default: [] })),
-  mcpServers: Schema.optionalKey(
-    Schema.Array(ClientRequest__McpServerMigration).annotate({ default: [] }),
-  ),
-  memory: Schema.optionalKey(Schema.Array(Schema.String)),
-  plugins: Schema.optionalKey(
-    Schema.Array(ClientRequest__PluginsMigration).annotate({ default: [] }),
-  ),
-  sessions: Schema.optionalKey(
-    Schema.Array(ClientRequest__SessionMigration).annotate({ default: [] }),
-  ),
-  skills: Schema.optionalKey(Schema.Array(ClientRequest__SkillMigration).annotate({ default: [] })),
-  subagents: Schema.optionalKey(
-    Schema.Array(ClientRequest__SubagentMigration).annotate({ default: [] }),
-  ),
-});
+export const V2ThreadStartResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadStartResponse__AsyncUserInputQuestion" });
 
-export type ClientRequest__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<ClientRequest__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: ClientRequest__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: ClientRequest__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const ClientRequest__UserInput = Schema.Union(
+export type V2ThreadStartResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadStartResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadStartResponse__CommandExecutionSource" });
+
+export type V2ThreadStartResponse__CommandExecutionStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadStartResponse__CommandExecutionStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadStartResponse__CommandExecutionStatus" });
+
+export type V2ThreadStartResponse__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2ThreadStartResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(ClientRequest__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
     Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
     Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartResponse__PatchChangeKind" });
 
-export type ClientRequest__ThreadGoalSetParams = {
-  readonly objective?: string | null;
-  readonly status?: ClientRequest__ThreadGoalStatus | null;
-  readonly threadId: string;
-  readonly tokenBudget?: number | null;
-};
-export const ClientRequest__ThreadGoalSetParams = Schema.Struct({
-  objective: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: Schema.optionalKey(Schema.Union([ClientRequest__ThreadGoalStatus, Schema.Null])),
-  threadId: Schema.String,
-  tokenBudget: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-});
+export type V2ThreadStartResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadStartResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadStartResponse__PatchApplyStatus" });
 
-export type ClientRequest__ThreadMetadataUpdateParams = {
-  readonly gitInfo?: ClientRequest__ThreadMetadataGitInfoUpdateParams | null;
-  readonly threadId: string;
+export type V2ThreadStartResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const ClientRequest__ThreadMetadataUpdateParams = Schema.Struct({
-  gitInfo: Schema.optionalKey(
-    Schema.Union([ClientRequest__ThreadMetadataGitInfoUpdateParams, Schema.Null]).annotate({
-      description:
-        "Patch the stored Git metadata for this thread. Omit a field to leave it unchanged, set it to `null` to clear it, or provide a string to replace the stored value.",
-    }),
-  ),
-  threadId: Schema.String,
-});
+export const V2ThreadStartResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadStartResponse__McpToolCallAppContext" });
 
-export type ClientRequest__ThreadForkParams = {
-  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
-  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
-  readonly baseInstructions?: string | null;
-  readonly config?: { readonly [x: string]: unknown } | null;
-  readonly cwd?: string | null;
-  readonly developerInstructions?: string | null;
-  readonly ephemeral?: boolean;
-  readonly lastTurnId?: string | null;
-  readonly model?: string | null;
-  readonly modelProvider?: string | null;
-  readonly sandbox?: ClientRequest__SandboxMode | null;
-  readonly serviceTier?: string | null;
-  readonly threadId: string;
-  readonly threadSource?: ClientRequest__ThreadSource | null;
+export type V2ThreadStartResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadStartResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadStartResponse__McpToolCallError" });
+
+export type V2ThreadStartResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadStartResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadStartResponse__McpAppDisplayMode" });
+
+export type V2ThreadStartResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
-export const ClientRequest__ThreadForkParams = Schema.Struct({
-  approvalPolicy: Schema.optionalKey(Schema.Union([ClientRequest__AskForApproval, Schema.Null])),
-  approvalsReviewer: Schema.optionalKey(
-    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
-      description:
-        "Override where approval requests are routed for review on this thread and subsequent turns.",
-    }),
-  ),
-  baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  config: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.Unknown), Schema.Null]),
-  ),
-  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  ephemeral: Schema.optionalKey(Schema.Boolean),
-  lastTurnId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Optional last turn id to fork through, inclusive.\n\nWhen specified, turns after `last_turn_id` are omitted from the fork. The referenced turn cannot be in progress.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  model: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Configuration overrides for the forked thread, if any.",
+export const V2ThreadStartResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadStartResponse__McpToolCallResult" });
+
+export type V2ThreadStartResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadStartResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadStartResponse__McpToolCallStatus" });
+
+export type V2ThreadStartResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadStartResponse__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-  modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  sandbox: Schema.optionalKey(Schema.Union([ClientRequest__SandboxMode, Schema.Null])),
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  threadId: Schema.String,
-  threadSource: Schema.optionalKey(
-    Schema.Union([ClientRequest__ThreadSource, Schema.Null]).annotate({
-      description:
-        "Optional client-supplied analytics source classification for this forked thread.",
-    }),
-  ),
-}).annotate({
-  description:
-    "There are two ways to fork a thread: 1. By thread_id: load the thread from disk by thread_id and fork it into a new thread. 2. By path: load the thread from disk by path and fork it into a new thread.\n\nIf using a non-empty path, the thread_id param will be ignored. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
-});
-
-export type ClientRequest__ThreadListParams = {
-  readonly archived?: boolean | null;
-  readonly cursor?: string | null;
-  readonly cwd?: ClientRequest__ThreadListCwdFilter | null;
-  readonly limit?: number | null;
-  readonly modelProviders?: ReadonlyArray<string> | null;
-  readonly searchTerm?: string | null;
-  readonly sortDirection?: ClientRequest__SortDirection | null;
-  readonly sortKey?: ClientRequest__ThreadSortKey | null;
-  readonly sourceKinds?: ReadonlyArray<ClientRequest__ThreadSourceKind> | null;
-  readonly useStateDbOnly?: boolean;
-};
-export const ClientRequest__ThreadListParams = Schema.Struct({
-  archived: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description:
-          "Optional archived filter; when set to true, only archived threads are returned. If false or null, only non-archived threads are returned.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  cursor: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Opaque pagination cursor returned by a previous call.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  cwd: Schema.optionalKey(
-    Schema.Union([ClientRequest__ThreadListCwdFilter, Schema.Null]).annotate({
-      description:
-        "Optional cwd filter or filters; when set, only threads whose session cwd exactly matches one of these paths are returned.",
-    }),
-  ),
-  limit: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
-        description: "Optional page size; defaults to a reasonable server-side value.",
-        format: "uint32",
-      })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  modelProviders: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(Schema.String).annotate({
-        description:
-          "Optional provider filter; when set, only sessions recorded under these providers are returned. When present but empty, includes all providers.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  searchTerm: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional substring filter for the extracted thread title.",
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-  sortDirection: Schema.optionalKey(
-    Schema.Union([ClientRequest__SortDirection, Schema.Null]).annotate({
-      description: "Optional sort direction; defaults to descending (newest first).",
-    }),
-  ),
-  sortKey: Schema.optionalKey(
-    Schema.Union([ClientRequest__ThreadSortKey, Schema.Null]).annotate({
-      description: "Optional sort key; defaults to created_at.",
-    }),
-  ),
-  sourceKinds: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ClientRequest__ThreadSourceKind).annotate({
-        description:
-          "Optional source filter; when set, only sessions from these source kinds are returned. When omitted or empty, defaults to interactive sources.",
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-  useStateDbOnly: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description:
-        "If true, return from the state DB without scanning JSONL rollouts to repair thread metadata. Omitted or false preserves scan-and-repair behavior.",
-    }),
-  ),
-});
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartResponse__DynamicToolCallOutputContentItem" });
 
-export type ClientRequest__ThreadStartParams = {
-  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
-  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
-  readonly baseInstructions?: string | null;
-  readonly config?: { readonly [x: string]: unknown } | null;
-  readonly cwd?: string | null;
-  readonly developerInstructions?: string | null;
-  readonly ephemeral?: boolean | null;
-  readonly model?: string | null;
-  readonly modelProvider?: string | null;
-  readonly personality?: ClientRequest__Personality | null;
-  readonly sandbox?: ClientRequest__SandboxMode | null;
-  readonly serviceName?: string | null;
-  readonly serviceTier?: string | null;
-  readonly sessionStartSource?: ClientRequest__ThreadStartSource | null;
-  readonly threadSource?: ClientRequest__ThreadSource | null;
-};
-export const ClientRequest__ThreadStartParams = Schema.Struct({
-  approvalPolicy: Schema.optionalKey(Schema.Union([ClientRequest__AskForApproval, Schema.Null])),
-  approvalsReviewer: Schema.optionalKey(
-    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
-      description:
-        "Override where approval requests are routed for review on this thread and subsequent turns.",
-    }),
-  ),
-  baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  config: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.Unknown), Schema.Null]),
-  ),
-  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  ephemeral: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  model: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  personality: Schema.optionalKey(Schema.Union([ClientRequest__Personality, Schema.Null])),
-  sandbox: Schema.optionalKey(Schema.Union([ClientRequest__SandboxMode, Schema.Null])),
-  serviceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  sessionStartSource: Schema.optionalKey(
-    Schema.Union([ClientRequest__ThreadStartSource, Schema.Null]),
-  ),
-  threadSource: Schema.optionalKey(
-    Schema.Union([ClientRequest__ThreadSource, Schema.Null]).annotate({
-      description: "Optional client-supplied analytics source classification for this thread.",
-    }),
-  ),
-});
+export type V2ThreadStartResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadStartResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadStartResponse__DynamicToolCallStatus" });
 
-export type ClientRequest__WindowsSandboxSetupStartParams = {
-  readonly cwd?: ClientRequest__AbsolutePathBuf | null;
-  readonly mode: ClientRequest__WindowsSandboxSetupMode;
-};
-export const ClientRequest__WindowsSandboxSetupStartParams = Schema.Struct({
-  cwd: Schema.optionalKey(Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null])),
-  mode: ClientRequest__WindowsSandboxSetupMode,
-});
+export type V2ThreadStartResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadStartResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadStartResponse__CollabAgentStatus" });
 
-export type CommandExecutionRequestApprovalParams__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: CommandExecutionRequestApprovalParams__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+export type V2ThreadStartResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ThreadStartResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ThreadStartResponse__CollabAgentToolCallStatus" });
+
+export type V2ThreadStartResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadStartResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadStartResponse__CollabAgentTool" });
+
+export type V2ThreadStartResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadStartResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadStartResponse__SubAgentActivityKind" });
+
+export type V2ThreadStartResponse__WebSearchAction =
   | {
-      readonly command: string;
-      readonly path?: string | null;
+      readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
       readonly type: "search";
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const CommandExecutionRequestApprovalParams__CommandAction = Schema.Union(
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const V2ThreadStartResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: CommandExecutionRequestApprovalParams__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartResponse__WebSearchAction" });
 
-export type CommandExecutionRequestApprovalParams__FileSystemSpecialPath =
-  | { readonly kind: "root" }
-  | { readonly kind: "minimal" }
-  | {
-      readonly kind: "project_roots";
-      readonly subpath?: CommandExecutionRequestApprovalParams__LegacyAppPathString | null;
-    }
-  | { readonly kind: "tmpdir" }
-  | { readonly kind: "slash_tmp" }
-  | {
-      readonly kind: "unknown";
-      readonly path: string;
-      readonly subpath?: CommandExecutionRequestApprovalParams__LegacyAppPathString | null;
-    };
-export const CommandExecutionRequestApprovalParams__FileSystemSpecialPath = Schema.Union(
+export type V2ThreadStartResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2ThreadStartResponse__ImageGenerationFailure = Schema.Union(
   [
-    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
-      title: "RootFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
-      title: "MinimalFileSystemSpecialPath",
-    }),
     Schema.Struct({
-      kind: Schema.Literal("project_roots"),
-      subpath: Schema.optionalKey(
-        Schema.Union([CommandExecutionRequestApprovalParams__LegacyAppPathString, Schema.Null]),
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
       ),
-    }).annotate({ title: "KindFileSystemSpecialPath" }),
-    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
-      title: "TmpdirFileSystemSpecialPath",
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartResponse__ImageGenerationFailure" });
+
+export type V2ThreadStartResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadStartResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
     }),
-    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
-      title: "SlashTmpFileSystemSpecialPath",
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
     }),
-    Schema.Struct({
-      kind: Schema.Literal("unknown"),
-      path: Schema.String,
-      subpath: Schema.optionalKey(
-        Schema.Union([CommandExecutionRequestApprovalParams__LegacyAppPathString, Schema.Null]),
-      ),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
     }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartResponse__TurnItemsView" });
 
-export type CommandExecutionRequestApprovalParams__NetworkApprovalContext = {
-  readonly host: string;
-  readonly protocol: CommandExecutionRequestApprovalParams__NetworkApprovalProtocol;
-};
-export const CommandExecutionRequestApprovalParams__NetworkApprovalContext = Schema.Struct({
-  host: Schema.String,
-  protocol: CommandExecutionRequestApprovalParams__NetworkApprovalProtocol,
-});
+export type V2ThreadStartResponse__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadStartResponse__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2ThreadStartResponse__TurnStatus" });
 
-export type CommandExecutionRequestApprovalParams__NetworkPolicyAmendment = {
-  readonly action: CommandExecutionRequestApprovalParams__NetworkPolicyRuleAction;
-  readonly host: string;
-};
-export const CommandExecutionRequestApprovalParams__NetworkPolicyAmendment = Schema.Struct({
-  action: CommandExecutionRequestApprovalParams__NetworkPolicyRuleAction,
-  host: Schema.String,
-});
+export type V2ThreadStatusChangedNotification__ThreadActiveFlag =
+  | "waitingOnApproval"
+  | "waitingOnUserInput";
+export const V2ThreadStatusChangedNotification__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadStatusChangedNotification__ThreadActiveFlag" });
 
-export type CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment = {
-  readonly action: CommandExecutionRequestApprovalResponse__NetworkPolicyRuleAction;
-  readonly host: string;
+export type V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown = {
+  readonly cacheWriteInputTokens?: number;
+  readonly cachedInputTokens: number;
+  readonly inputTokens: number;
+  readonly outputTokens: number;
+  readonly reasoningOutputTokens: number;
+  readonly totalTokens: number;
 };
-export const CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment = Schema.Struct({
-  action: CommandExecutionRequestApprovalResponse__NetworkPolicyRuleAction,
-  host: Schema.String,
+export const V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown = Schema.Struct({
+  cacheWriteInputTokens: Schema.optionalKey(
+    Schema.Number.annotate({ default: 0, format: "int64" }).check(
+      Schema.isInt().annotate({ expected: "an integer" }),
+    ),
+  ),
+  cachedInputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  inputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  outputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  reasoningOutputTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  totalTokens: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown" });
+
+export type V2ThreadTurnsListParams__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadTurnsListParams__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadTurnsListParams__TurnItemsView" });
+
+export type V2ThreadTurnsListParams__SortDirection = "asc" | "desc";
+export const V2ThreadTurnsListParams__SortDirection = Schema.Literals(["asc", "desc"]).annotate({
+  identifier: "V2ThreadTurnsListParams__SortDirection",
 });
 
-export type ExecCommandApprovalResponse__NetworkPolicyAmendment = {
-  readonly action: ExecCommandApprovalResponse__NetworkPolicyRuleAction;
-  readonly host: string;
+export type V2ThreadTurnsListResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadTurnsListResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__NonSteerableTurnKind" });
+
+export type V2ThreadTurnsListResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadTurnsListResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadTurnsListResponse__MisalignmentSteer" });
+
+export type V2ThreadTurnsListResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadTurnsListResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadTurnsListResponse__ByteRange" });
+
+export type V2ThreadTurnsListResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadTurnsListResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__ImageDetail" });
+
+export type V2ThreadTurnsListResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const ExecCommandApprovalResponse__NetworkPolicyAmendment = Schema.Struct({
-  action: ExecCommandApprovalResponse__NetworkPolicyRuleAction,
-  host: Schema.String,
+export const V2ThreadTurnsListResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadTurnsListResponse__HookPromptFragment" });
+
+export type V2ThreadTurnsListResponse__AgentMessageDelivery = "async";
+export const V2ThreadTurnsListResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadTurnsListResponse__AgentMessageDelivery",
 });
 
-export type FuzzyFileSearchResponse__FuzzyFileSearchResult = {
-  readonly file_name: string;
-  readonly indices?: ReadonlyArray<number> | null;
-  readonly match_type: FuzzyFileSearchResponse__FuzzyFileSearchMatchType;
+export type V2ThreadTurnsListResponse__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
   readonly path: string;
-  readonly root: string;
-  readonly score: number;
 };
-export const FuzzyFileSearchResponse__FuzzyFileSearchResult = Schema.Struct({
-  file_name: Schema.String,
-  indices: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(
-        Schema.Number.annotate({ format: "uint32" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-      ),
-      Schema.Null,
-    ]),
-  ),
-  match_type: FuzzyFileSearchResponse__FuzzyFileSearchMatchType,
+export const V2ThreadTurnsListResponse__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
   path: Schema.String,
-  root: Schema.String,
-  score: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-}).annotate({ description: "Superset of [`codex_file_search::FileMatch`]" });
+}).annotate({ identifier: "V2ThreadTurnsListResponse__MemoryCitationEntry" });
 
-export type FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchResult = {
-  readonly file_name: string;
-  readonly indices?: ReadonlyArray<number> | null;
-  readonly match_type: FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType;
-  readonly path: string;
-  readonly root: string;
-  readonly score: number;
-};
-export const FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchResult = Schema.Struct({
-  file_name: Schema.String,
-  indices: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(
-        Schema.Number.annotate({ format: "uint32" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-      ),
-      Schema.Null,
-    ]),
-  ),
-  match_type: FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType,
-  path: Schema.String,
-  root: Schema.String,
-  score: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-}).annotate({ description: "Superset of [`codex_file_search::FileMatch`]" });
+export type V2ThreadTurnsListResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadTurnsListResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadTurnsListResponse__MessagePhase",
+});
 
-export type JSONRPCMessage__JSONRPCError = {
-  readonly error: JSONRPCMessage__JSONRPCErrorError;
-  readonly id: JSONRPCMessage__RequestId;
+export type V2ThreadTurnsListResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
 };
-export const JSONRPCMessage__JSONRPCError = Schema.Struct({
-  error: JSONRPCMessage__JSONRPCErrorError,
-  id: JSONRPCMessage__RequestId,
-}).annotate({ description: "A response to a request that indicates an error occurred." });
+export const V2ThreadTurnsListResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadTurnsListResponse__AsyncUserInputQuestion" });
 
-export type JSONRPCMessage__JSONRPCResponse = {
-  readonly id: JSONRPCMessage__RequestId;
-  readonly result: unknown;
-};
-export const JSONRPCMessage__JSONRPCResponse = Schema.Struct({
-  id: JSONRPCMessage__RequestId,
-  result: Schema.Unknown,
-}).annotate({ description: "A successful (non-error) response to a request." });
+export type V2ThreadTurnsListResponse__LegacyAppPathString = string;
+export const V2ThreadTurnsListResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadTurnsListResponse__LegacyAppPathString",
+});
 
-export type JSONRPCMessage__JSONRPCRequest = {
-  readonly id: JSONRPCMessage__RequestId;
-  readonly method: string;
-  readonly params?: unknown;
-  readonly trace?: JSONRPCMessage__W3cTraceContext | null;
-};
-export const JSONRPCMessage__JSONRPCRequest = Schema.Struct({
-  id: JSONRPCMessage__RequestId,
-  method: Schema.String,
-  params: Schema.optionalKey(Schema.Unknown),
-  trace: Schema.optionalKey(
-    Schema.Union([JSONRPCMessage__W3cTraceContext, Schema.Null]).annotate({
-      description: "Optional W3C Trace Context for distributed tracing.",
-    }),
-  ),
-}).annotate({ description: "A request that expects a response." });
+export type V2ThreadTurnsListResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadTurnsListResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__CommandExecutionSource" });
 
-export type McpServerElicitationRequestParams__McpElicitationBooleanSchema = {
-  readonly default?: boolean | null;
-  readonly description?: string | null;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationBooleanType;
-};
-export const McpServerElicitationRequestParams__McpElicitationBooleanSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: McpServerElicitationRequestParams__McpElicitationBooleanType,
-});
-
-export type McpServerElicitationRequestParams__McpElicitationTitledEnumItems = {
-  readonly anyOf: ReadonlyArray<McpServerElicitationRequestParams__McpElicitationConstOption>;
-};
-export const McpServerElicitationRequestParams__McpElicitationTitledEnumItems = Schema.Struct({
-  anyOf: Schema.Array(McpServerElicitationRequestParams__McpElicitationConstOption),
-});
-
-export type McpServerElicitationRequestParams__McpElicitationNumberSchema = {
-  readonly default?: number | null;
-  readonly description?: string | null;
-  readonly maximum?: number | null;
-  readonly minimum?: number | null;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationNumberType;
-};
-export const McpServerElicitationRequestParams__McpElicitationNumberSchema = Schema.Struct({
-  default: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "double" }).check(Schema.isFinite()),
-      Schema.Null,
-    ]),
-  ),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  maximum: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "double" }).check(Schema.isFinite()),
-      Schema.Null,
-    ]),
-  ),
-  minimum: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "double" }).check(Schema.isFinite()),
-      Schema.Null,
-    ]),
-  ),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: McpServerElicitationRequestParams__McpElicitationNumberType,
-});
-
-export type McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly enum: ReadonlyArray<string>;
-  readonly enumNames?: ReadonlyArray<string> | null;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
-};
-export const McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema =
-  Schema.Struct({
-    default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    enum: Schema.Array(Schema.String),
-    enumNames: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    type: McpServerElicitationRequestParams__McpElicitationStringType,
-  });
-
-export type McpServerElicitationRequestParams__McpElicitationStringSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly format?: McpServerElicitationRequestParams__McpElicitationStringFormat | null;
-  readonly maxLength?: number | null;
-  readonly minLength?: number | null;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
-};
-export const McpServerElicitationRequestParams__McpElicitationStringSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  format: Schema.optionalKey(
-    Schema.Union([McpServerElicitationRequestParams__McpElicitationStringFormat, Schema.Null]),
-  ),
-  maxLength: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  minLength: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: McpServerElicitationRequestParams__McpElicitationStringType,
-});
-
-export type McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly oneOf: ReadonlyArray<McpServerElicitationRequestParams__McpElicitationConstOption>;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
-};
-export const McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema =
-  Schema.Struct({
-    default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    oneOf: Schema.Array(McpServerElicitationRequestParams__McpElicitationConstOption),
-    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    type: McpServerElicitationRequestParams__McpElicitationStringType,
-  });
-
-export type McpServerElicitationRequestParams__McpElicitationUntitledEnumItems = {
-  readonly enum: ReadonlyArray<string>;
-  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
-};
-export const McpServerElicitationRequestParams__McpElicitationUntitledEnumItems = Schema.Struct({
-  enum: Schema.Array(Schema.String),
-  type: McpServerElicitationRequestParams__McpElicitationStringType,
-});
-
-export type McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly enum: ReadonlyArray<string>;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
-};
-export const McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema =
-  Schema.Struct({
-    default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    enum: Schema.Array(Schema.String),
-    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    type: McpServerElicitationRequestParams__McpElicitationStringType,
-  });
+export type V2ThreadTurnsListResponse__CommandExecutionStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadTurnsListResponse__CommandExecutionStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__CommandExecutionStatus" });
 
-export type PermissionsRequestApprovalParams__FileSystemSpecialPath =
-  | { readonly kind: "root" }
-  | { readonly kind: "minimal" }
-  | {
-      readonly kind: "project_roots";
-      readonly subpath?: PermissionsRequestApprovalParams__LegacyAppPathString | null;
-    }
-  | { readonly kind: "tmpdir" }
-  | { readonly kind: "slash_tmp" }
-  | {
-      readonly kind: "unknown";
-      readonly path: string;
-      readonly subpath?: PermissionsRequestApprovalParams__LegacyAppPathString | null;
-    };
-export const PermissionsRequestApprovalParams__FileSystemSpecialPath = Schema.Union(
+export type V2ThreadTurnsListResponse__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2ThreadTurnsListResponse__PatchChangeKind = Schema.Union(
   [
-    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
-      title: "RootFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
-      title: "MinimalFileSystemSpecialPath",
-    }),
     Schema.Struct({
-      kind: Schema.Literal("project_roots"),
-      subpath: Schema.optionalKey(
-        Schema.Union([PermissionsRequestApprovalParams__LegacyAppPathString, Schema.Null]),
-      ),
-    }).annotate({ title: "KindFileSystemSpecialPath" }),
-    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
-      title: "TmpdirFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
-      title: "SlashTmpFileSystemSpecialPath",
-    }),
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
     Schema.Struct({
-      kind: Schema.Literal("unknown"),
-      path: Schema.String,
-      subpath: Schema.optionalKey(
-        Schema.Union([PermissionsRequestApprovalParams__LegacyAppPathString, Schema.Null]),
-      ),
-    }),
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
+    Schema.Struct({
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadTurnsListResponse__PatchChangeKind" });
 
-export type PermissionsRequestApprovalResponse__FileSystemSpecialPath =
-  | { readonly kind: "root" }
-  | { readonly kind: "minimal" }
-  | {
-      readonly kind: "project_roots";
-      readonly subpath?: PermissionsRequestApprovalResponse__LegacyAppPathString | null;
-    }
-  | { readonly kind: "tmpdir" }
-  | { readonly kind: "slash_tmp" }
-  | {
-      readonly kind: "unknown";
-      readonly path: string;
-      readonly subpath?: PermissionsRequestApprovalResponse__LegacyAppPathString | null;
-    };
-export const PermissionsRequestApprovalResponse__FileSystemSpecialPath = Schema.Union(
+export type V2ThreadTurnsListResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadTurnsListResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__PatchApplyStatus" });
+
+export type V2ThreadTurnsListResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
+};
+export const V2ThreadTurnsListResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadTurnsListResponse__McpToolCallAppContext" });
+
+export type V2ThreadTurnsListResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadTurnsListResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadTurnsListResponse__McpToolCallError" });
+
+export type V2ThreadTurnsListResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadTurnsListResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__McpAppDisplayMode" });
+
+export type V2ThreadTurnsListResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
+};
+export const V2ThreadTurnsListResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadTurnsListResponse__McpToolCallResult" });
+
+export type V2ThreadTurnsListResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadTurnsListResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__McpToolCallStatus" });
+
+export type V2ThreadTurnsListResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadTurnsListResponse__DynamicToolCallOutputContentItem = Schema.Union(
   [
-    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
-      title: "RootFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
-      title: "MinimalFileSystemSpecialPath",
-    }),
     Schema.Struct({
-      kind: Schema.Literal("project_roots"),
-      subpath: Schema.optionalKey(
-        Schema.Union([PermissionsRequestApprovalResponse__LegacyAppPathString, Schema.Null]),
-      ),
-    }).annotate({ title: "KindFileSystemSpecialPath" }),
-    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
-      title: "TmpdirFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
-      title: "SlashTmpFileSystemSpecialPath",
-    }),
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      kind: Schema.Literal("unknown"),
-      path: Schema.String,
-      subpath: Schema.optionalKey(
-        Schema.Union([PermissionsRequestApprovalResponse__LegacyAppPathString, Schema.Null]),
-      ),
-    }),
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadTurnsListResponse__DynamicToolCallOutputContentItem" });
+
+export type V2ThreadTurnsListResponse__DynamicToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed";
+export const V2ThreadTurnsListResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__DynamicToolCallStatus" });
+
+export type V2ThreadTurnsListResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadTurnsListResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__CollabAgentStatus" });
+
+export type V2ThreadTurnsListResponse__ReasoningEffort = string;
+export const V2ThreadTurnsListResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadTurnsListResponse__ReasoningEffort",
+  }),
 );
 
-export type ServerNotification__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: ServerNotification__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+export type V2ThreadTurnsListResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ThreadTurnsListResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__CollabAgentToolCallStatus" });
+
+export type V2ThreadTurnsListResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadTurnsListResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__CollabAgentTool" });
+
+export type V2ThreadTurnsListResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadTurnsListResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__SubAgentActivityKind" });
+
+export type V2ThreadTurnsListResponse__WebSearchAction =
   | {
-      readonly command: string;
-      readonly path?: string | null;
+      readonly queries?: ReadonlyArray<string> | null;
       readonly query?: string | null;
       readonly type: "search";
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const ServerNotification__CommandAction = Schema.Union(
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const V2ThreadTurnsListResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: ServerNotification__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadTurnsListResponse__WebSearchAction" });
 
-export type ServerNotification__FsChangedNotification = {
-  readonly changedPaths: ReadonlyArray<ServerNotification__AbsolutePathBuf>;
-  readonly watchId: string;
+export type V2ThreadTurnsListResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const ServerNotification__FsChangedNotification = Schema.Struct({
-  changedPaths: Schema.Array(ServerNotification__AbsolutePathBuf).annotate({
-    description: "File or directory paths associated with this event.",
-  }),
-  watchId: Schema.String.annotate({
-    description: "Watch identifier previously provided to `fs/watch`.",
-  }),
-}).annotate({ description: "Filesystem watch notification emitted for `fs/watch` subscribers." });
-
-export type ServerNotification__SandboxPolicy =
-  | { readonly type: "dangerFullAccess" }
-  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-  | {
-      readonly excludeSlashTmp?: boolean;
-      readonly excludeTmpdirEnvVar?: boolean;
-      readonly networkAccess?: boolean;
-      readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<ServerNotification__AbsolutePathBuf>;
-    };
-export const ServerNotification__SandboxPolicy = Schema.Union(
+export const V2ThreadTurnsListResponse__ImageGenerationFailure = Schema.Union(
   [
     Schema.Struct({
-      type: Schema.Literal("dangerFullAccess").annotate({
-        title: "DangerFullAccessSandboxPolicyType",
-      }),
-    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-    }).annotate({ title: "ReadOnlySandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
       ),
-      type: Schema.Literal("externalSandbox").annotate({
-        title: "ExternalSandboxSandboxPolicyType",
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-    Schema.Struct({
-      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
-      writableRoots: Schema.optionalKey(
-        Schema.Array(ServerNotification__AbsolutePathBuf).annotate({ default: [] }),
-      ),
-    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadTurnsListResponse__ImageGenerationFailure" });
 
-export type ServerNotification__AppMetadata = {
-  readonly categories?: ReadonlyArray<string> | null;
-  readonly developer?: string | null;
-  readonly firstPartyRequiresInstall?: boolean | null;
-  readonly firstPartyType?: string | null;
-  readonly review?: ServerNotification__AppReview | null;
-  readonly screenshots?: ReadonlyArray<ServerNotification__AppScreenshot> | null;
-  readonly seoDescription?: string | null;
-  readonly showInComposerWhenUnlinked?: boolean | null;
-  readonly subCategories?: ReadonlyArray<string> | null;
-  readonly version?: string | null;
-  readonly versionId?: string | null;
-  readonly versionNotes?: string | null;
-};
-export const ServerNotification__AppMetadata = Schema.Struct({
-  categories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  firstPartyRequiresInstall: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  firstPartyType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  review: Schema.optionalKey(Schema.Union([ServerNotification__AppReview, Schema.Null])),
-  screenshots: Schema.optionalKey(
-    Schema.Union([Schema.Array(ServerNotification__AppScreenshot), Schema.Null]),
-  ),
-  seoDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  showInComposerWhenUnlinked: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  subCategories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  version: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  versionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  versionNotes: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export type V2ThreadTurnsListResponse__AbsolutePathBuf = string;
+export const V2ThreadTurnsListResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadTurnsListResponse__AbsolutePathBuf",
 });
 
-export type ServerNotification__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: ServerNotification__CollabAgentStatus;
-};
-export const ServerNotification__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: ServerNotification__CollabAgentStatus,
-});
+export type V2ThreadTurnsListResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadTurnsListResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadTurnsListResponse__TurnItemsView" });
 
-export type ServerNotification__ExternalAgentConfigImportItemTypeFailure = {
-  readonly cwd?: string | null;
-  readonly errorType?: string | null;
-  readonly failureStage: string;
-  readonly itemType: ServerNotification__ExternalAgentConfigMigrationItemType;
-  readonly message: string;
-  readonly source?: string | null;
-  readonly subErrorType?: string | null;
-};
-export const ServerNotification__ExternalAgentConfigImportItemTypeFailure = Schema.Struct({
-  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  failureStage: Schema.String,
-  itemType: ServerNotification__ExternalAgentConfigMigrationItemType,
-  message: Schema.String,
-  source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export type V2ThreadTurnsListResponse__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadTurnsListResponse__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2ThreadTurnsListResponse__TurnStatus" });
+
+export type V2ThreadUnarchiveResponse__AbsolutePathBuf = string;
+export const V2ThreadUnarchiveResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2ThreadUnarchiveResponse__AbsolutePathBuf",
 });
 
-export type ServerNotification__ExternalAgentConfigImportItemTypeSuccess = {
-  readonly cwd?: string | null;
-  readonly itemType: ServerNotification__ExternalAgentConfigMigrationItemType;
-  readonly source?: string | null;
-  readonly target?: string | null;
+export type V2ThreadUnarchiveResponse__GitInfo = {
+  readonly branch?: string | null;
+  readonly originUrl?: string | null;
+  readonly sha?: string | null;
 };
-export const ServerNotification__ExternalAgentConfigImportItemTypeSuccess = Schema.Struct({
-  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  itemType: ServerNotification__ExternalAgentConfigMigrationItemType,
-  source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export const V2ThreadUnarchiveResponse__GitInfo = Schema.Struct({
+  branch: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  originUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__GitInfo" });
 
-export type ServerNotification__FuzzyFileSearchResult = {
-  readonly file_name: string;
-  readonly indices?: ReadonlyArray<number> | null;
-  readonly match_type: ServerNotification__FuzzyFileSearchMatchType;
-  readonly path: string;
-  readonly root: string;
-  readonly score: number;
-};
-export const ServerNotification__FuzzyFileSearchResult = Schema.Struct({
-  file_name: Schema.String,
-  indices: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(
-        Schema.Number.annotate({ format: "uint32" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-      ),
-      Schema.Null,
-    ]),
-  ),
-  match_type: ServerNotification__FuzzyFileSearchMatchType,
-  path: Schema.String,
-  root: Schema.String,
-  score: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-}).annotate({ description: "Superset of [`codex_file_search::FileMatch`]" });
+export type V2ThreadUnarchiveResponse__ThreadHistoryMode = "legacy" | "paginated";
+export const V2ThreadUnarchiveResponse__ThreadHistoryMode = Schema.Literals([
+  "legacy",
+  "paginated",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__ThreadHistoryMode" });
 
-export type ServerNotification__GuardianApprovalReview = {
-  readonly rationale?: string | null;
-  readonly riskLevel?: ServerNotification__GuardianRiskLevel | null;
-  readonly status: ServerNotification__GuardianApprovalReviewStatus;
-  readonly userAuthorization?: ServerNotification__GuardianUserAuthorization | null;
+export type V2ThreadUnarchiveResponse__ReasoningEffort = string;
+export const V2ThreadUnarchiveResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2ThreadUnarchiveResponse__ReasoningEffort",
+  }),
+);
+
+export type V2ThreadUnarchiveResponse__ThreadSectionAppearance = {
+  readonly color?: string | null;
+  readonly icon?: string | null;
 };
-export const ServerNotification__GuardianApprovalReview = Schema.Struct({
-  rationale: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  riskLevel: Schema.optionalKey(Schema.Union([ServerNotification__GuardianRiskLevel, Schema.Null])),
-  status: ServerNotification__GuardianApprovalReviewStatus,
-  userAuthorization: Schema.optionalKey(
-    Schema.Union([ServerNotification__GuardianUserAuthorization, Schema.Null]),
-  ),
+export const V2ThreadUnarchiveResponse__ThreadSectionAppearance = Schema.Struct({
+  color: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  icon: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
 }).annotate({
-  description:
-    "[UNSTABLE] Temporary approval auto-review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
+  description: "Extensible visual presentation for a custom thread section.",
+  identifier: "V2ThreadUnarchiveResponse__ThreadSectionAppearance",
 });
 
-export type ServerNotification__HookOutputEntry = {
-  readonly kind: ServerNotification__HookOutputEntryKind;
-  readonly text: string;
-};
-export const ServerNotification__HookOutputEntry = Schema.Struct({
-  kind: ServerNotification__HookOutputEntryKind,
-  text: Schema.String,
+export type V2ThreadUnarchiveResponse__AgentPath = string;
+export const V2ThreadUnarchiveResponse__AgentPath = Schema.String.annotate({
+  identifier: "V2ThreadUnarchiveResponse__AgentPath",
 });
 
-export type ServerNotification__FileSystemSpecialPath =
-  | { readonly kind: "root" }
-  | { readonly kind: "minimal" }
-  | {
-      readonly kind: "project_roots";
-      readonly subpath?: ServerNotification__LegacyAppPathString | null;
-    }
-  | { readonly kind: "tmpdir" }
-  | { readonly kind: "slash_tmp" }
-  | {
-      readonly kind: "unknown";
-      readonly path: string;
-      readonly subpath?: ServerNotification__LegacyAppPathString | null;
-    };
-export const ServerNotification__FileSystemSpecialPath = Schema.Union(
-  [
-    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
-      title: "RootFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
-      title: "MinimalFileSystemSpecialPath",
-    }),
-    Schema.Struct({
-      kind: Schema.Literal("project_roots"),
-      subpath: Schema.optionalKey(
-        Schema.Union([ServerNotification__LegacyAppPathString, Schema.Null]),
-      ),
-    }).annotate({ title: "KindFileSystemSpecialPath" }),
-    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
-      title: "TmpdirFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
-      title: "SlashTmpFileSystemSpecialPath",
-    }),
-    Schema.Struct({
-      kind: Schema.Literal("unknown"),
-      path: Schema.String,
-      subpath: Schema.optionalKey(
-        Schema.Union([ServerNotification__LegacyAppPathString, Schema.Null]),
-      ),
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type ServerNotification__McpServerStatusUpdatedNotification = {
-  readonly error?: string | null;
-  readonly failureReason?: ServerNotification__McpServerStartupFailureReason | null;
-  readonly name: string;
-  readonly status: ServerNotification__McpServerStartupState;
-  readonly threadId?: string | null;
-};
-export const ServerNotification__McpServerStatusUpdatedNotification = Schema.Struct({
-  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  failureReason: Schema.optionalKey(
-    Schema.Union([ServerNotification__McpServerStartupFailureReason, Schema.Null]),
-  ),
-  name: Schema.String,
-  status: ServerNotification__McpServerStartupState,
-  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export type V2ThreadUnarchiveResponse__ThreadId = string;
+export const V2ThreadUnarchiveResponse__ThreadId = Schema.String.annotate({
+  identifier: "V2ThreadUnarchiveResponse__ThreadId",
 });
 
-export type ServerNotification__MemoryCitation = {
-  readonly entries: ReadonlyArray<ServerNotification__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const ServerNotification__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(ServerNotification__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
+export type V2ThreadUnarchiveResponse__ThreadActiveFlag =
+  | "waitingOnApproval"
+  | "waitingOnUserInput";
+export const V2ThreadUnarchiveResponse__ThreadActiveFlag = Schema.Literals([
+  "waitingOnApproval",
+  "waitingOnUserInput",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__ThreadActiveFlag" });
+
+export type V2ThreadUnarchiveResponse__ThreadSource = string;
+export const V2ThreadUnarchiveResponse__ThreadSource = Schema.String.annotate({
+  identifier: "V2ThreadUnarchiveResponse__ThreadSource",
 });
 
-export type ServerNotification__ModelReroutedNotification = {
-  readonly fromModel: string;
-  readonly reason: ServerNotification__ModelRerouteReason;
-  readonly threadId: string;
-  readonly toModel: string;
-  readonly turnId: string;
+export type V2ThreadUnarchiveResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2ThreadUnarchiveResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__NonSteerableTurnKind" });
+
+export type V2ThreadUnarchiveResponse__MisalignmentSteer = { readonly message: string };
+export const V2ThreadUnarchiveResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__MisalignmentSteer" });
+
+export type V2ThreadUnarchiveResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2ThreadUnarchiveResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__ByteRange" });
+
+export type V2ThreadUnarchiveResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2ThreadUnarchiveResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__ImageDetail" });
+
+export type V2ThreadUnarchiveResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const ServerNotification__ModelReroutedNotification = Schema.Struct({
-  fromModel: Schema.String,
-  reason: ServerNotification__ModelRerouteReason,
-  threadId: Schema.String,
-  toModel: Schema.String,
-  turnId: Schema.String,
+export const V2ThreadUnarchiveResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__HookPromptFragment" });
+
+export type V2ThreadUnarchiveResponse__AgentMessageDelivery = "async";
+export const V2ThreadUnarchiveResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2ThreadUnarchiveResponse__AgentMessageDelivery",
 });
 
-export type ServerNotification__ModelVerificationNotification = {
-  readonly threadId: string;
-  readonly turnId: string;
-  readonly verifications: ReadonlyArray<ServerNotification__ModelVerification>;
+export type V2ThreadUnarchiveResponse__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
 };
-export const ServerNotification__ModelVerificationNotification = Schema.Struct({
-  threadId: Schema.String,
-  turnId: Schema.String,
-  verifications: Schema.Array(ServerNotification__ModelVerification),
-});
+export const V2ThreadUnarchiveResponse__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__MemoryCitationEntry" });
 
-export type ServerNotification__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
-  | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: ServerNotification__NonSteerableTurnKind;
-      };
-    };
-export const ServerNotification__CodexErrorInfo = Schema.Union(
+export type V2ThreadUnarchiveResponse__MessagePhase = "commentary" | "final_answer";
+export const V2ThreadUnarchiveResponse__MessagePhase = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
-    Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
+    Schema.Literal("commentary").annotate({
       description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
-    Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
     }),
-    Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({ turnKind: ServerNotification__NonSteerableTurnKind }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
     }),
   ],
   { mode: "oneOf" },
 ).annotate({
   description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2ThreadUnarchiveResponse__MessagePhase",
 });
 
-export type ServerNotification__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: ServerNotification__PatchChangeKind;
-  readonly path: string;
+export type V2ThreadUnarchiveResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
 };
-export const ServerNotification__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: ServerNotification__PatchChangeKind,
-  path: Schema.String,
-});
+export const V2ThreadUnarchiveResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__AsyncUserInputQuestion" });
 
-export type ServerNotification__AccountUpdatedNotification = {
-  readonly authMode?: ServerNotification__AuthMode | null;
-  readonly planType?: ServerNotification__PlanType | null;
-};
-export const ServerNotification__AccountUpdatedNotification = Schema.Struct({
-  authMode: Schema.optionalKey(Schema.Union([ServerNotification__AuthMode, Schema.Null])),
-  planType: Schema.optionalKey(Schema.Union([ServerNotification__PlanType, Schema.Null])),
+export type V2ThreadUnarchiveResponse__LegacyAppPathString = string;
+export const V2ThreadUnarchiveResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2ThreadUnarchiveResponse__LegacyAppPathString",
 });
 
-export type ServerNotification__ThreadRealtimeStartedNotification = {
-  readonly realtimeSessionId?: string | null;
-  readonly threadId: string;
-  readonly version: ServerNotification__RealtimeConversationVersion;
-};
-export const ServerNotification__ThreadRealtimeStartedNotification = Schema.Struct({
-  realtimeSessionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  threadId: Schema.String,
-  version: ServerNotification__RealtimeConversationVersion,
-}).annotate({ description: "EXPERIMENTAL - emitted when thread realtime startup is accepted." });
+export type V2ThreadUnarchiveResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2ThreadUnarchiveResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__CommandExecutionSource" });
 
-export type ServerNotification__Settings = {
-  readonly developer_instructions?: string | null;
-  readonly model: string;
-  readonly reasoning_effort?: ServerNotification__ReasoningEffort | null;
-};
-export const ServerNotification__Settings = Schema.Struct({
-  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  model: Schema.String,
-  reasoning_effort: Schema.optionalKey(
-    Schema.Union([ServerNotification__ReasoningEffort, Schema.Null]),
-  ),
-}).annotate({ description: "Settings for a collaboration mode." });
+export type V2ThreadUnarchiveResponse__CommandExecutionStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadUnarchiveResponse__CommandExecutionStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__CommandExecutionStatus" });
 
-export type ServerNotification__RemoteControlStatusChangedNotification = {
-  readonly environmentId?: string | null;
-  readonly installationId: string;
-  readonly serverName: string;
-  readonly status: ServerNotification__RemoteControlConnectionStatus;
-};
-export const ServerNotification__RemoteControlStatusChangedNotification = Schema.Struct({
-  environmentId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  installationId: Schema.String,
-  serverName: Schema.String,
-  status: ServerNotification__RemoteControlConnectionStatus,
-}).annotate({
-  description: "Current remote-control connection status and remote identity exposed to clients.",
-});
+export type V2ThreadUnarchiveResponse__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2ThreadUnarchiveResponse__PatchChangeKind = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
+    Schema.Struct({
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
+    Schema.Struct({
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadUnarchiveResponse__PatchChangeKind" });
 
-export type ServerNotification__ServerRequestResolvedNotification = {
-  readonly requestId: ServerNotification__RequestId;
-  readonly threadId: string;
+export type V2ThreadUnarchiveResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2ThreadUnarchiveResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__PatchApplyStatus" });
+
+export type V2ThreadUnarchiveResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const ServerNotification__ServerRequestResolvedNotification = Schema.Struct({
-  requestId: ServerNotification__RequestId,
-  threadId: Schema.String,
-});
+export const V2ThreadUnarchiveResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__McpToolCallAppContext" });
 
-export type ServerNotification__RateLimitSnapshot = {
-  readonly credits?: ServerNotification__CreditsSnapshot | null;
-  readonly individualLimit?: ServerNotification__SpendControlLimitSnapshot | null;
-  readonly limitId?: string | null;
-  readonly limitName?: string | null;
-  readonly planType?: ServerNotification__PlanType | null;
-  readonly primary?: ServerNotification__RateLimitWindow | null;
-  readonly rateLimitReachedType?: ServerNotification__RateLimitReachedType | null;
-  readonly secondary?: ServerNotification__RateLimitWindow | null;
-  readonly spendControlReached?: boolean | null;
+export type V2ThreadUnarchiveResponse__McpToolCallError = { readonly message: string };
+export const V2ThreadUnarchiveResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__McpToolCallError" });
+
+export type V2ThreadUnarchiveResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2ThreadUnarchiveResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__McpAppDisplayMode" });
+
+export type V2ThreadUnarchiveResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
-export const ServerNotification__RateLimitSnapshot = Schema.Struct({
-  credits: Schema.optionalKey(Schema.Union([ServerNotification__CreditsSnapshot, Schema.Null])),
-  individualLimit: Schema.optionalKey(
-    Schema.Union([ServerNotification__SpendControlLimitSnapshot, Schema.Null]),
-  ),
-  limitId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  limitName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  planType: Schema.optionalKey(Schema.Union([ServerNotification__PlanType, Schema.Null])),
-  primary: Schema.optionalKey(Schema.Union([ServerNotification__RateLimitWindow, Schema.Null])),
-  rateLimitReachedType: Schema.optionalKey(
-    Schema.Union([ServerNotification__RateLimitReachedType, Schema.Null]),
-  ),
-  secondary: Schema.optionalKey(Schema.Union([ServerNotification__RateLimitWindow, Schema.Null])),
-  spendControlReached: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description:
-          "Backend-reported spend-control state. `None` is unavailable, not a sparse-update recovery.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export const V2ThreadUnarchiveResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__McpToolCallResult" });
 
-export type ServerNotification__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<ServerNotification__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: ServerNotification__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: ServerNotification__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const ServerNotification__UserInput = Schema.Union(
+export type V2ThreadUnarchiveResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2ThreadUnarchiveResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__McpToolCallStatus" });
+
+export type V2ThreadUnarchiveResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2ThreadUnarchiveResponse__DynamicToolCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(ServerNotification__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([ServerNotification__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([ServerNotification__ImageDetail, Schema.Null])),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadUnarchiveResponse__DynamicToolCallOutputContentItem" });
 
-export type ServerNotification__TextRange = {
-  readonly end: ServerNotification__TextPosition;
-  readonly start: ServerNotification__TextPosition;
-};
-export const ServerNotification__TextRange = Schema.Struct({
-  end: ServerNotification__TextPosition,
-  start: ServerNotification__TextPosition,
-});
+export type V2ThreadUnarchiveResponse__DynamicToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed";
+export const V2ThreadUnarchiveResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__DynamicToolCallStatus" });
 
-export type ServerNotification__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
+export type V2ThreadUnarchiveResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2ThreadUnarchiveResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__CollabAgentStatus" });
+
+export type V2ThreadUnarchiveResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2ThreadUnarchiveResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__CollabAgentToolCallStatus" });
+
+export type V2ThreadUnarchiveResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2ThreadUnarchiveResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__CollabAgentTool" });
+
+export type V2ThreadUnarchiveResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2ThreadUnarchiveResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__SubAgentActivityKind" });
+
+export type V2ThreadUnarchiveResponse__WebSearchAction =
   | {
-      readonly activeFlags: ReadonlyArray<ServerNotification__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const ServerNotification__ThreadStatus = Schema.Union(
+      readonly queries?: ReadonlyArray<string> | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const V2ThreadUnarchiveResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
     Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
     Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
     Schema.Struct({
-      activeFlags: Schema.Array(ServerNotification__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadUnarchiveResponse__WebSearchAction" });
 
-export type ServerNotification__ThreadGoal = {
-  readonly createdAt: number;
-  readonly objective: string;
-  readonly status: ServerNotification__ThreadGoalStatus;
-  readonly threadId: string;
-  readonly timeUsedSeconds: number;
-  readonly tokenBudget?: number | null;
-  readonly tokensUsed: number;
-  readonly updatedAt: number;
+export type V2ThreadUnarchiveResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const ServerNotification__ThreadGoal = Schema.Struct({
-  createdAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  objective: Schema.String,
-  status: ServerNotification__ThreadGoalStatus,
-  threadId: Schema.String,
-  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  tokenBudget: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  updatedAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-});
-
-export type ServerNotification__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: ServerNotification__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: ServerNotification__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const ServerNotification__SubAgentSource = Schema.Union(
+export const V2ThreadUnarchiveResponse__ImageGenerationFailure = Schema.Union(
   [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
     Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(Schema.Union([ServerNotification__AgentPath, Schema.Null])),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: ServerNotification__ThreadId,
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
       }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadUnarchiveResponse__ImageGenerationFailure" });
 
-export type ServerNotification__ThreadRealtimeOutputAudioDeltaNotification = {
-  readonly audio: ServerNotification__ThreadRealtimeAudioChunk;
-  readonly threadId: string;
-};
-export const ServerNotification__ThreadRealtimeOutputAudioDeltaNotification = Schema.Struct({
-  audio: ServerNotification__ThreadRealtimeAudioChunk,
-  threadId: Schema.String,
-}).annotate({ description: "EXPERIMENTAL - streamed output audio emitted by thread realtime." });
+export type V2ThreadUnarchiveResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2ThreadUnarchiveResponse__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadUnarchiveResponse__TurnItemsView" });
 
-export type ServerNotification__ThreadTokenUsage = {
-  readonly last: ServerNotification__TokenUsageBreakdown;
-  readonly modelContextWindow?: number | null;
-  readonly total: ServerNotification__TokenUsageBreakdown;
+export type V2ThreadUnarchiveResponse__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2ThreadUnarchiveResponse__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__TurnStatus" });
+
+export type V2ThreadUnsubscribeResponse__ThreadUnsubscribeStatus =
+  | "notLoaded"
+  | "notSubscribed"
+  | "unsubscribed";
+export const V2ThreadUnsubscribeResponse__ThreadUnsubscribeStatus = Schema.Literals([
+  "notLoaded",
+  "notSubscribed",
+  "unsubscribed",
+]).annotate({ identifier: "V2ThreadUnsubscribeResponse__ThreadUnsubscribeStatus" });
+
+export type V2TurnCompletedNotification__NonSteerableTurnKind = "review" | "compact";
+export const V2TurnCompletedNotification__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2TurnCompletedNotification__NonSteerableTurnKind" });
+
+export type V2TurnCompletedNotification__MisalignmentSteer = { readonly message: string };
+export const V2TurnCompletedNotification__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2TurnCompletedNotification__MisalignmentSteer" });
+
+export type V2TurnCompletedNotification__ByteRange = {
+  readonly end: number;
+  readonly start: number;
 };
-export const ServerNotification__ThreadTokenUsage = Schema.Struct({
-  last: ServerNotification__TokenUsageBreakdown,
-  modelContextWindow: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  total: ServerNotification__TokenUsageBreakdown,
-});
+export const V2TurnCompletedNotification__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2TurnCompletedNotification__ByteRange" });
 
-export type ServerNotification__TurnPlanStep = {
-  readonly status: ServerNotification__TurnPlanStepStatus;
-  readonly step: string;
+export type V2TurnCompletedNotification__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2TurnCompletedNotification__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2TurnCompletedNotification__ImageDetail" });
+
+export type V2TurnCompletedNotification__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const ServerNotification__TurnPlanStep = Schema.Struct({
-  status: ServerNotification__TurnPlanStepStatus,
-  step: Schema.String,
+export const V2TurnCompletedNotification__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2TurnCompletedNotification__HookPromptFragment" });
+
+export type V2TurnCompletedNotification__AgentMessageDelivery = "async";
+export const V2TurnCompletedNotification__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2TurnCompletedNotification__AgentMessageDelivery",
 });
 
-export type ServerNotification__WindowsSandboxSetupCompletedNotification = {
-  readonly error?: string | null;
-  readonly mode: ServerNotification__WindowsSandboxSetupMode;
-  readonly success: boolean;
+export type V2TurnCompletedNotification__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
 };
-export const ServerNotification__WindowsSandboxSetupCompletedNotification = Schema.Struct({
-  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  mode: ServerNotification__WindowsSandboxSetupMode,
-  success: Schema.Boolean,
-});
+export const V2TurnCompletedNotification__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2TurnCompletedNotification__MemoryCitationEntry" });
 
-export type ServerRequest__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: ServerRequest__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
-  | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly command: string; readonly type: "unknown" };
-export const ServerRequest__CommandAction = Schema.Union(
+export type V2TurnCompletedNotification__MessagePhase = "commentary" | "final_answer";
+export const V2TurnCompletedNotification__MessagePhase = Schema.Union(
   [
-    Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: ServerRequest__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
   ],
   { mode: "oneOf" },
-);
+).annotate({
+  description:
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2TurnCompletedNotification__MessagePhase",
+});
 
-export type ServerRequest__ChatgptAuthTokensRefreshParams = {
-  readonly previousAccountId?: string | null;
-  readonly reason: ServerRequest__ChatgptAuthTokensRefreshReason;
+export type V2TurnCompletedNotification__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
 };
-export const ServerRequest__ChatgptAuthTokensRefreshParams = Schema.Struct({
-  previousAccountId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Workspace/account identifier that Codex was previously using.\n\nClients that manage multiple accounts/workspaces can use this as a hint to refresh the token for the correct workspace.\n\nThis may be `null` when the prior auth state did not include a workspace identifier (`chatgpt_account_id`).",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  reason: ServerRequest__ChatgptAuthTokensRefreshReason,
+export const V2TurnCompletedNotification__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2TurnCompletedNotification__AsyncUserInputQuestion" });
+
+export type V2TurnCompletedNotification__LegacyAppPathString = string;
+export const V2TurnCompletedNotification__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2TurnCompletedNotification__LegacyAppPathString",
 });
 
-export type ServerRequest__FileSystemSpecialPath =
-  | { readonly kind: "root" }
-  | { readonly kind: "minimal" }
-  | { readonly kind: "project_roots"; readonly subpath?: ServerRequest__LegacyAppPathString | null }
-  | { readonly kind: "tmpdir" }
-  | { readonly kind: "slash_tmp" }
-  | {
-      readonly kind: "unknown";
-      readonly path: string;
-      readonly subpath?: ServerRequest__LegacyAppPathString | null;
-    };
-export const ServerRequest__FileSystemSpecialPath = Schema.Union(
+export type V2TurnCompletedNotification__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2TurnCompletedNotification__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2TurnCompletedNotification__CommandExecutionSource" });
+
+export type V2TurnCompletedNotification__CommandExecutionStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2TurnCompletedNotification__CommandExecutionStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2TurnCompletedNotification__CommandExecutionStatus" });
+
+export type V2TurnCompletedNotification__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2TurnCompletedNotification__PatchChangeKind = Schema.Union(
   [
-    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
-      title: "RootFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
-      title: "MinimalFileSystemSpecialPath",
-    }),
     Schema.Struct({
-      kind: Schema.Literal("project_roots"),
-      subpath: Schema.optionalKey(Schema.Union([ServerRequest__LegacyAppPathString, Schema.Null])),
-    }).annotate({ title: "KindFileSystemSpecialPath" }),
-    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
-      title: "TmpdirFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
-      title: "SlashTmpFileSystemSpecialPath",
-    }),
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
     Schema.Struct({
-      kind: Schema.Literal("unknown"),
-      path: Schema.String,
-      subpath: Schema.optionalKey(Schema.Union([ServerRequest__LegacyAppPathString, Schema.Null])),
-    }),
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
+    Schema.Struct({
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnCompletedNotification__PatchChangeKind" });
 
-export type ServerRequest__McpElicitationBooleanSchema = {
-  readonly default?: boolean | null;
-  readonly description?: string | null;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationBooleanType;
-};
-export const ServerRequest__McpElicitationBooleanSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationBooleanType,
-});
+export type V2TurnCompletedNotification__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2TurnCompletedNotification__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2TurnCompletedNotification__PatchApplyStatus" });
 
-export type ServerRequest__McpElicitationTitledEnumItems = {
-  readonly anyOf: ReadonlyArray<ServerRequest__McpElicitationConstOption>;
+export type V2TurnCompletedNotification__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const ServerRequest__McpElicitationTitledEnumItems = Schema.Struct({
-  anyOf: Schema.Array(ServerRequest__McpElicitationConstOption),
-});
+export const V2TurnCompletedNotification__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2TurnCompletedNotification__McpToolCallAppContext" });
 
-export type ServerRequest__McpElicitationNumberSchema = {
-  readonly default?: number | null;
-  readonly description?: string | null;
-  readonly maximum?: number | null;
-  readonly minimum?: number | null;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationNumberType;
-};
-export const ServerRequest__McpElicitationNumberSchema = Schema.Struct({
-  default: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "double" }).check(Schema.isFinite()),
-      Schema.Null,
-    ]),
-  ),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  maximum: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "double" }).check(Schema.isFinite()),
-      Schema.Null,
-    ]),
-  ),
-  minimum: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "double" }).check(Schema.isFinite()),
-      Schema.Null,
-    ]),
-  ),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationNumberType,
-});
+export type V2TurnCompletedNotification__McpToolCallError = { readonly message: string };
+export const V2TurnCompletedNotification__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2TurnCompletedNotification__McpToolCallError" });
 
-export type ServerRequest__McpElicitationLegacyTitledEnumSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly enum: ReadonlyArray<string>;
-  readonly enumNames?: ReadonlyArray<string> | null;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationStringType;
+export type V2TurnCompletedNotification__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2TurnCompletedNotification__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2TurnCompletedNotification__McpAppDisplayMode" });
+
+export type V2TurnCompletedNotification__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
-export const ServerRequest__McpElicitationLegacyTitledEnumSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  enum: Schema.Array(Schema.String),
-  enumNames: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationStringType,
-});
+export const V2TurnCompletedNotification__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2TurnCompletedNotification__McpToolCallResult" });
 
-export type ServerRequest__McpElicitationStringSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly format?: ServerRequest__McpElicitationStringFormat | null;
-  readonly maxLength?: number | null;
-  readonly minLength?: number | null;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationStringType;
-};
-export const ServerRequest__McpElicitationStringSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  format: Schema.optionalKey(
-    Schema.Union([ServerRequest__McpElicitationStringFormat, Schema.Null]),
-  ),
-  maxLength: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  minLength: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      Schema.Null,
-    ]),
-  ),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationStringType,
-});
-
-export type ServerRequest__McpElicitationTitledSingleSelectEnumSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly oneOf: ReadonlyArray<ServerRequest__McpElicitationConstOption>;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationStringType;
-};
-export const ServerRequest__McpElicitationTitledSingleSelectEnumSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  oneOf: Schema.Array(ServerRequest__McpElicitationConstOption),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationStringType,
-});
-
-export type ServerRequest__McpElicitationUntitledEnumItems = {
-  readonly enum: ReadonlyArray<string>;
-  readonly type: ServerRequest__McpElicitationStringType;
-};
-export const ServerRequest__McpElicitationUntitledEnumItems = Schema.Struct({
-  enum: Schema.Array(Schema.String),
-  type: ServerRequest__McpElicitationStringType,
-});
-
-export type ServerRequest__McpElicitationUntitledSingleSelectEnumSchema = {
-  readonly default?: string | null;
-  readonly description?: string | null;
-  readonly enum: ReadonlyArray<string>;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationStringType;
-};
-export const ServerRequest__McpElicitationUntitledSingleSelectEnumSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  enum: Schema.Array(Schema.String),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationStringType,
-});
-
-export type ServerRequest__NetworkApprovalContext = {
-  readonly host: string;
-  readonly protocol: ServerRequest__NetworkApprovalProtocol;
-};
-export const ServerRequest__NetworkApprovalContext = Schema.Struct({
-  host: Schema.String,
-  protocol: ServerRequest__NetworkApprovalProtocol,
-});
-
-export type ServerRequest__NetworkPolicyAmendment = {
-  readonly action: ServerRequest__NetworkPolicyRuleAction;
-  readonly host: string;
-};
-export const ServerRequest__NetworkPolicyAmendment = Schema.Struct({
-  action: ServerRequest__NetworkPolicyRuleAction,
-  host: Schema.String,
-});
+export type V2TurnCompletedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2TurnCompletedNotification__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2TurnCompletedNotification__McpToolCallStatus" });
 
-export type ServerRequest__ApplyPatchApprovalParams = {
-  readonly callId: string;
-  readonly conversationId: ServerRequest__ThreadId;
-  readonly fileChanges: { readonly [x: string]: ServerRequest__FileChange };
-  readonly grantRoot?: string | null;
-  readonly reason?: string | null;
-};
-export const ServerRequest__ApplyPatchApprovalParams = Schema.Struct({
-  callId: Schema.String.annotate({
-    description:
-      "Use to correlate this with [codex_protocol::protocol::PatchApplyBeginEvent] and [codex_protocol::protocol::PatchApplyEndEvent].",
-  }),
-  conversationId: ServerRequest__ThreadId,
-  fileChanges: Schema.Record(Schema.String, ServerRequest__FileChange),
-  grantRoot: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "When set, the agent is asking the user to allow writes under this root for the remainder of the session (unclear if this is honored today).",
+export type V2TurnCompletedNotification__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2TurnCompletedNotification__DynamicToolCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-  reason: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Optional explanatory reason (e.g. request for extra write access).",
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type ServerRequest__ExecCommandApprovalParams = {
-  readonly approvalId?: string | null;
-  readonly callId: string;
-  readonly command: ReadonlyArray<string>;
-  readonly conversationId: ServerRequest__ThreadId;
-  readonly cwd: string;
-  readonly parsedCmd: ReadonlyArray<ServerRequest__ParsedCommand>;
-  readonly reason?: string | null;
-};
-export const ServerRequest__ExecCommandApprovalParams = Schema.Struct({
-  approvalId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({ description: "Identifier for this specific approval callback." }),
-      Schema.Null,
-    ]),
-  ),
-  callId: Schema.String.annotate({
-    description:
-      "Use to correlate this with [codex_protocol::protocol::ExecCommandBeginEvent] and [codex_protocol::protocol::ExecCommandEndEvent].",
-  }),
-  command: Schema.Array(Schema.String),
-  conversationId: ServerRequest__ThreadId,
-  cwd: Schema.String,
-  parsedCmd: Schema.Array(ServerRequest__ParsedCommand),
-  reason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
+    Schema.Struct({
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnCompletedNotification__DynamicToolCallOutputContentItem" });
 
-export type ServerRequest__ToolRequestUserInputQuestion = {
-  readonly header: string;
-  readonly id: string;
-  readonly isOther?: boolean;
-  readonly isSecret?: boolean;
-  readonly options?: ReadonlyArray<ServerRequest__ToolRequestUserInputOption> | null;
-  readonly question: string;
-};
-export const ServerRequest__ToolRequestUserInputQuestion = Schema.Struct({
-  header: Schema.String,
-  id: Schema.String,
-  isOther: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  isSecret: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  options: Schema.optionalKey(
-    Schema.Union([Schema.Array(ServerRequest__ToolRequestUserInputOption), Schema.Null]),
-  ),
-  question: Schema.String,
-}).annotate({
-  description: "EXPERIMENTAL. Represents one request_user_input question and its required options.",
-});
+export type V2TurnCompletedNotification__DynamicToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed";
+export const V2TurnCompletedNotification__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2TurnCompletedNotification__DynamicToolCallStatus" });
 
-export type ToolRequestUserInputParams__ToolRequestUserInputQuestion = {
-  readonly header: string;
-  readonly id: string;
-  readonly isOther?: boolean;
-  readonly isSecret?: boolean;
-  readonly options?: ReadonlyArray<ToolRequestUserInputParams__ToolRequestUserInputOption> | null;
-  readonly question: string;
-};
-export const ToolRequestUserInputParams__ToolRequestUserInputQuestion = Schema.Struct({
-  header: Schema.String,
-  id: Schema.String,
-  isOther: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  isSecret: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  options: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ToolRequestUserInputParams__ToolRequestUserInputOption),
-      Schema.Null,
-    ]),
-  ),
-  question: Schema.String,
-}).annotate({
-  description: "EXPERIMENTAL. Represents one request_user_input question and its required options.",
-});
+export type V2TurnCompletedNotification__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2TurnCompletedNotification__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2TurnCompletedNotification__CollabAgentStatus" });
 
-export type V2AccountRateLimitsUpdatedNotification__RateLimitSnapshot = {
-  readonly credits?: V2AccountRateLimitsUpdatedNotification__CreditsSnapshot | null;
-  readonly individualLimit?: V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot | null;
-  readonly limitId?: string | null;
-  readonly limitName?: string | null;
-  readonly planType?: V2AccountRateLimitsUpdatedNotification__PlanType | null;
-  readonly primary?: V2AccountRateLimitsUpdatedNotification__RateLimitWindow | null;
-  readonly rateLimitReachedType?: V2AccountRateLimitsUpdatedNotification__RateLimitReachedType | null;
-  readonly secondary?: V2AccountRateLimitsUpdatedNotification__RateLimitWindow | null;
-  readonly spendControlReached?: boolean | null;
-};
-export const V2AccountRateLimitsUpdatedNotification__RateLimitSnapshot = Schema.Struct({
-  credits: Schema.optionalKey(
-    Schema.Union([V2AccountRateLimitsUpdatedNotification__CreditsSnapshot, Schema.Null]),
-  ),
-  individualLimit: Schema.optionalKey(
-    Schema.Union([V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot, Schema.Null]),
-  ),
-  limitId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  limitName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  planType: Schema.optionalKey(
-    Schema.Union([V2AccountRateLimitsUpdatedNotification__PlanType, Schema.Null]),
-  ),
-  primary: Schema.optionalKey(
-    Schema.Union([V2AccountRateLimitsUpdatedNotification__RateLimitWindow, Schema.Null]),
-  ),
-  rateLimitReachedType: Schema.optionalKey(
-    Schema.Union([V2AccountRateLimitsUpdatedNotification__RateLimitReachedType, Schema.Null]),
-  ),
-  secondary: Schema.optionalKey(
-    Schema.Union([V2AccountRateLimitsUpdatedNotification__RateLimitWindow, Schema.Null]),
-  ),
-  spendControlReached: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description:
-          "Backend-reported spend-control state. `None` is unavailable, not a sparse-update recovery.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export type V2TurnCompletedNotification__ReasoningEffort = string;
+export const V2TurnCompletedNotification__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2TurnCompletedNotification__ReasoningEffort",
+  }),
+);
 
-export type V2AppListUpdatedNotification__AppMetadata = {
-  readonly categories?: ReadonlyArray<string> | null;
-  readonly developer?: string | null;
-  readonly firstPartyRequiresInstall?: boolean | null;
-  readonly firstPartyType?: string | null;
-  readonly review?: V2AppListUpdatedNotification__AppReview | null;
-  readonly screenshots?: ReadonlyArray<V2AppListUpdatedNotification__AppScreenshot> | null;
-  readonly seoDescription?: string | null;
-  readonly showInComposerWhenUnlinked?: boolean | null;
-  readonly subCategories?: ReadonlyArray<string> | null;
-  readonly version?: string | null;
-  readonly versionId?: string | null;
-  readonly versionNotes?: string | null;
-};
-export const V2AppListUpdatedNotification__AppMetadata = Schema.Struct({
-  categories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  firstPartyRequiresInstall: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  firstPartyType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  review: Schema.optionalKey(Schema.Union([V2AppListUpdatedNotification__AppReview, Schema.Null])),
-  screenshots: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2AppListUpdatedNotification__AppScreenshot), Schema.Null]),
-  ),
-  seoDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  showInComposerWhenUnlinked: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  subCategories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  version: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  versionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  versionNotes: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export type V2TurnCompletedNotification__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2TurnCompletedNotification__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2TurnCompletedNotification__CollabAgentToolCallStatus" });
 
-export type V2AppsListResponse__AppMetadata = {
-  readonly categories?: ReadonlyArray<string> | null;
-  readonly developer?: string | null;
-  readonly firstPartyRequiresInstall?: boolean | null;
-  readonly firstPartyType?: string | null;
-  readonly review?: V2AppsListResponse__AppReview | null;
-  readonly screenshots?: ReadonlyArray<V2AppsListResponse__AppScreenshot> | null;
-  readonly seoDescription?: string | null;
-  readonly showInComposerWhenUnlinked?: boolean | null;
-  readonly subCategories?: ReadonlyArray<string> | null;
-  readonly version?: string | null;
-  readonly versionId?: string | null;
-  readonly versionNotes?: string | null;
-};
-export const V2AppsListResponse__AppMetadata = Schema.Struct({
-  categories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  firstPartyRequiresInstall: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  firstPartyType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  review: Schema.optionalKey(Schema.Union([V2AppsListResponse__AppReview, Schema.Null])),
-  screenshots: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2AppsListResponse__AppScreenshot), Schema.Null]),
-  ),
-  seoDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  showInComposerWhenUnlinked: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  subCategories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  version: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  versionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  versionNotes: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export type V2TurnCompletedNotification__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2TurnCompletedNotification__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2TurnCompletedNotification__CollabAgentTool" });
 
-export type V2AppsReadResponse__ConnectorMetadata = {
-  readonly description?: string | null;
-  readonly iconUrl?: string | null;
-  readonly id: string;
-  readonly name: string;
-  readonly toolSummaries?: ReadonlyArray<V2AppsReadResponse__AppToolSummary> | null;
-};
-export const V2AppsReadResponse__ConnectorMetadata = Schema.Struct({
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  iconUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  id: Schema.String,
-  name: Schema.String,
-  toolSummaries: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2AppsReadResponse__AppToolSummary), Schema.Null]),
-  ),
-}).annotate({ description: "EXPERIMENTAL - metadata returned by app/read." });
+export type V2TurnCompletedNotification__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2TurnCompletedNotification__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2TurnCompletedNotification__SubAgentActivityKind" });
 
-export type V2CommandExecParams__SandboxPolicy =
-  | { readonly type: "dangerFullAccess" }
-  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
+export type V2TurnCompletedNotification__WebSearchAction =
   | {
-      readonly excludeSlashTmp?: boolean;
-      readonly excludeTmpdirEnvVar?: boolean;
-      readonly networkAccess?: boolean;
-      readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<V2CommandExecParams__AbsolutePathBuf>;
-    };
-export const V2CommandExecParams__SandboxPolicy = Schema.Union(
+      readonly queries?: ReadonlyArray<string> | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const V2TurnCompletedNotification__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
-      type: Schema.Literal("dangerFullAccess").annotate({
-        title: "DangerFullAccessSandboxPolicyType",
-      }),
-    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
     Schema.Struct({
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-    }).annotate({ title: "ReadOnlySandboxPolicy" }),
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
     Schema.Struct({
-      networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-      ),
-      type: Schema.Literal("externalSandbox").annotate({
-        title: "ExternalSandboxSandboxPolicyType",
-      }),
-    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
     Schema.Struct({
-      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
-      writableRoots: Schema.optionalKey(
-        Schema.Array(V2CommandExecParams__AbsolutePathBuf).annotate({ default: [] }),
-      ),
-    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnCompletedNotification__WebSearchAction" });
 
-export type V2ConfigBatchWriteParams__ConfigEdit = {
-  readonly keyPath: string;
-  readonly mergeStrategy: V2ConfigBatchWriteParams__MergeStrategy;
-  readonly value: unknown;
+export type V2TurnCompletedNotification__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const V2ConfigBatchWriteParams__ConfigEdit = Schema.Struct({
-  keyPath: Schema.String,
-  mergeStrategy: V2ConfigBatchWriteParams__MergeStrategy,
-  value: Schema.Unknown,
-});
-
-export type V2ConfigReadResponse__ConfigLayerSource =
-  | { readonly domain: string; readonly key: string; readonly type: "mdm" }
-  | { readonly file: string; readonly type: "system" }
-  | { readonly id: string; readonly name: string; readonly type: "enterpriseManaged" }
-  | { readonly file: string; readonly profile?: string | null; readonly type: "user" }
-  | { readonly dotCodexFolder: V2ConfigReadResponse__AbsolutePathBuf; readonly type: "project" }
-  | { readonly type: "sessionFlags" }
-  | {
-      readonly file: V2ConfigReadResponse__AbsolutePathBuf;
-      readonly type: "legacyManagedConfigTomlFromFile";
-    }
-  | { readonly type: "legacyManagedConfigTomlFromMdm" };
-export const V2ConfigReadResponse__ConfigLayerSource = Schema.Union(
+export const V2TurnCompletedNotification__ImageGenerationFailure = Schema.Union(
   [
     Schema.Struct({
-      domain: Schema.String,
-      key: Schema.String,
-      type: Schema.Literal("mdm").annotate({ title: "MdmConfigLayerSourceType" }),
-    }).annotate({
-      title: "MdmConfigLayerSource",
-      description: "Managed preferences layer delivered by MDM (macOS only).",
-    }),
-    Schema.Struct({
-      file: Schema.String.annotate({
-        description:
-          "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      }),
-      type: Schema.Literal("system").annotate({ title: "SystemConfigLayerSourceType" }),
-    }).annotate({
-      title: "SystemConfigLayerSource",
-      description: "Managed config layer from a file (usually `managed_config.toml`).",
-    }),
-    Schema.Struct({
-      id: Schema.String.annotate({ description: "Stable identifier for the delivered layer." }),
-      name: Schema.String.annotate({
-        description:
-          "Admin-facing name for the delivered layer. This is surfaced in diagnostics so users know which cloud layer needs administrator attention.",
-      }),
-      type: Schema.Literal("enterpriseManaged").annotate({
-        title: "EnterpriseManagedConfigLayerSourceType",
-      }),
-    }).annotate({
-      title: "EnterpriseManagedConfigLayerSource",
-      description: "Enterprise-managed config layer delivered by the cloud config bundle.",
-    }),
-    Schema.Struct({
-      file: Schema.String.annotate({
-        description:
-          "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-      }),
-      profile: Schema.optionalKey(
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
         Schema.Union([
-          Schema.String.annotate({
-            description:
-              "Name of the selected profile-v2 config layered on top of the base user config, when this layer represents one.",
-          }),
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
           Schema.Null,
         ]),
       ),
-      type: Schema.Literal("user").annotate({ title: "UserConfigLayerSourceType" }),
-    }).annotate({
-      title: "UserConfigLayerSource",
-      description:
-        "User config layer from $CODEX_HOME/config.toml. This layer is special in that it is expected to be: - writable by the user - generally outside the workspace directory",
-    }),
-    Schema.Struct({
-      dotCodexFolder: V2ConfigReadResponse__AbsolutePathBuf,
-      type: Schema.Literal("project").annotate({ title: "ProjectConfigLayerSourceType" }),
-    }).annotate({
-      title: "ProjectConfigLayerSource",
-      description:
-        "Path to a .codex/ folder within a project. There could be multiple of these between `cwd` and the project/repo root.",
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnCompletedNotification__ImageGenerationFailure" });
+
+export type V2TurnCompletedNotification__AbsolutePathBuf = string;
+export const V2TurnCompletedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2TurnCompletedNotification__AbsolutePathBuf",
+});
+
+export type V2TurnCompletedNotification__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2TurnCompletedNotification__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
     }),
-    Schema.Struct({
-      type: Schema.Literal("sessionFlags").annotate({ title: "SessionFlagsConfigLayerSourceType" }),
-    }).annotate({
-      title: "SessionFlagsConfigLayerSource",
-      description: "Session-layer overrides supplied via `-c`/`--config`.",
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
     }),
-    Schema.Struct({
-      file: V2ConfigReadResponse__AbsolutePathBuf,
-      type: Schema.Literal("legacyManagedConfigTomlFromFile").annotate({
-        title: "LegacyManagedConfigTomlFromFileConfigLayerSourceType",
-      }),
-    }).annotate({
-      title: "LegacyManagedConfigTomlFromFileConfigLayerSource",
+    Schema.Literal("full").annotate({
       description:
-        '`managed_config.toml` was designed to be a config that was loaded as the last layer on top of everything else. This scheme did not quite work out as intended, but we keep this variant as a "best effort" while we phase out `managed_config.toml` in favor of `requirements.toml`.',
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
     }),
-    Schema.Struct({
-      type: Schema.Literal("legacyManagedConfigTomlFromMdm").annotate({
-        title: "LegacyManagedConfigTomlFromMdmConfigLayerSourceType",
-      }),
-    }).annotate({ title: "LegacyManagedConfigTomlFromMdmConfigLayerSource" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnCompletedNotification__TurnItemsView" });
 
-export type V2ConfigReadResponse__AppsDefaultConfig = {
-  readonly approvals_reviewer?: V2ConfigReadResponse__ApprovalsReviewer | null;
-  readonly default_tools_approval_mode?: V2ConfigReadResponse__AppToolApproval | null;
-  readonly destructive_enabled?: boolean;
-  readonly enabled?: boolean;
-  readonly open_world_enabled?: boolean;
+export type V2TurnCompletedNotification__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2TurnCompletedNotification__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2TurnCompletedNotification__TurnStatus" });
+
+export type V2TurnPlanUpdatedNotification__TurnPlanStepStatus =
+  | "pending"
+  | "inProgress"
+  | "completed";
+export const V2TurnPlanUpdatedNotification__TurnPlanStepStatus = Schema.Literals([
+  "pending",
+  "inProgress",
+  "completed",
+]).annotate({ identifier: "V2TurnPlanUpdatedNotification__TurnPlanStepStatus" });
+
+export type V2TurnStartedNotification__NonSteerableTurnKind = "review" | "compact";
+export const V2TurnStartedNotification__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2TurnStartedNotification__NonSteerableTurnKind" });
+
+export type V2TurnStartedNotification__MisalignmentSteer = { readonly message: string };
+export const V2TurnStartedNotification__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2TurnStartedNotification__MisalignmentSteer" });
+
+export type V2TurnStartedNotification__ByteRange = { readonly end: number; readonly start: number };
+export const V2TurnStartedNotification__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2TurnStartedNotification__ByteRange" });
+
+export type V2TurnStartedNotification__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2TurnStartedNotification__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2TurnStartedNotification__ImageDetail" });
+
+export type V2TurnStartedNotification__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const V2ConfigReadResponse__AppsDefaultConfig = Schema.Struct({
-  approvals_reviewer: Schema.optionalKey(
-    Schema.Union([V2ConfigReadResponse__ApprovalsReviewer, Schema.Null]),
-  ),
-  default_tools_approval_mode: Schema.optionalKey(
-    Schema.Union([V2ConfigReadResponse__AppToolApproval, Schema.Null]),
-  ),
-  destructive_enabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
-  enabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
-  open_world_enabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
+export const V2TurnStartedNotification__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2TurnStartedNotification__HookPromptFragment" });
+
+export type V2TurnStartedNotification__AgentMessageDelivery = "async";
+export const V2TurnStartedNotification__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2TurnStartedNotification__AgentMessageDelivery",
 });
 
-export type V2ConfigReadResponse__WebSearchToolConfig = {
-  readonly allowed_domains?: ReadonlyArray<string> | null;
-  readonly context_size?: V2ConfigReadResponse__WebSearchContextSize | null;
-  readonly location?: V2ConfigReadResponse__WebSearchLocation | null;
+export type V2TurnStartedNotification__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
 };
-export const V2ConfigReadResponse__WebSearchToolConfig = Schema.Struct({
-  allowed_domains: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  context_size: Schema.optionalKey(
-    Schema.Union([V2ConfigReadResponse__WebSearchContextSize, Schema.Null]),
-  ),
-  location: Schema.optionalKey(
-    Schema.Union([V2ConfigReadResponse__WebSearchLocation, Schema.Null]),
-  ),
+export const V2TurnStartedNotification__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2TurnStartedNotification__MemoryCitationEntry" });
+
+export type V2TurnStartedNotification__MessagePhase = "commentary" | "final_answer";
+export const V2TurnStartedNotification__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2TurnStartedNotification__MessagePhase",
 });
 
-export type V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup = {
-  readonly hooks: ReadonlyArray<V2ConfigRequirementsReadResponse__ConfiguredHookHandler>;
-  readonly matcher?: string | null;
+export type V2TurnStartedNotification__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
 };
-export const V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup = Schema.Struct({
-  hooks: Schema.Array(V2ConfigRequirementsReadResponse__ConfiguredHookHandler),
-  matcher: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+export const V2TurnStartedNotification__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2TurnStartedNotification__AsyncUserInputQuestion" });
+
+export type V2TurnStartedNotification__LegacyAppPathString = string;
+export const V2TurnStartedNotification__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2TurnStartedNotification__LegacyAppPathString",
 });
 
-export type V2ConfigRequirementsReadResponse__NewThreadModelDefaults = {
-  readonly model?: string | null;
-  readonly modelReasoningEffort?: V2ConfigRequirementsReadResponse__ReasoningEffort | null;
-  readonly serviceTier?: string | null;
+export type V2TurnStartedNotification__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2TurnStartedNotification__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2TurnStartedNotification__CommandExecutionSource" });
+
+export type V2TurnStartedNotification__CommandExecutionStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2TurnStartedNotification__CommandExecutionStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2TurnStartedNotification__CommandExecutionStatus" });
+
+export type V2TurnStartedNotification__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2TurnStartedNotification__PatchChangeKind = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
+    Schema.Struct({
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
+    Schema.Struct({
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartedNotification__PatchChangeKind" });
+
+export type V2TurnStartedNotification__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2TurnStartedNotification__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2TurnStartedNotification__PatchApplyStatus" });
+
+export type V2TurnStartedNotification__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const V2ConfigRequirementsReadResponse__NewThreadModelDefaults = Schema.Struct({
-  model: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  modelReasoningEffort: Schema.optionalKey(
-    Schema.Union([V2ConfigRequirementsReadResponse__ReasoningEffort, Schema.Null]),
-  ),
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export const V2TurnStartedNotification__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2TurnStartedNotification__McpToolCallAppContext" });
 
-export type V2ConfigWarningNotification__TextRange = {
-  readonly end: V2ConfigWarningNotification__TextPosition;
-  readonly start: V2ConfigWarningNotification__TextPosition;
+export type V2TurnStartedNotification__McpToolCallError = { readonly message: string };
+export const V2TurnStartedNotification__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2TurnStartedNotification__McpToolCallError" });
+
+export type V2TurnStartedNotification__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2TurnStartedNotification__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2TurnStartedNotification__McpAppDisplayMode" });
+
+export type V2TurnStartedNotification__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
-export const V2ConfigWarningNotification__TextRange = Schema.Struct({
-  end: V2ConfigWarningNotification__TextPosition,
-  start: V2ConfigWarningNotification__TextPosition,
-});
+export const V2TurnStartedNotification__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2TurnStartedNotification__McpToolCallResult" });
 
-export type V2ConfigWriteResponse__ConfigLayerSource =
-  | { readonly domain: string; readonly key: string; readonly type: "mdm" }
-  | { readonly file: string; readonly type: "system" }
-  | { readonly id: string; readonly name: string; readonly type: "enterpriseManaged" }
-  | { readonly file: string; readonly profile?: string | null; readonly type: "user" }
-  | { readonly dotCodexFolder: V2ConfigWriteResponse__AbsolutePathBuf; readonly type: "project" }
-  | { readonly type: "sessionFlags" }
-  | {
-      readonly file: V2ConfigWriteResponse__AbsolutePathBuf;
-      readonly type: "legacyManagedConfigTomlFromFile";
-    }
-  | { readonly type: "legacyManagedConfigTomlFromMdm" };
-export const V2ConfigWriteResponse__ConfigLayerSource = Schema.Union(
+export type V2TurnStartedNotification__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2TurnStartedNotification__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2TurnStartedNotification__McpToolCallStatus" });
+
+export type V2TurnStartedNotification__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2TurnStartedNotification__DynamicToolCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
-      domain: Schema.String,
-      key: Schema.String,
-      type: Schema.Literal("mdm").annotate({ title: "MdmConfigLayerSourceType" }),
-    }).annotate({
-      title: "MdmConfigLayerSource",
-      description: "Managed preferences layer delivered by MDM (macOS only).",
-    }),
-    Schema.Struct({
-      file: Schema.String.annotate({
-        description:
-          "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
       }),
-      type: Schema.Literal("system").annotate({ title: "SystemConfigLayerSourceType" }),
-    }).annotate({
-      title: "SystemConfigLayerSource",
-      description: "Managed config layer from a file (usually `managed_config.toml`).",
-    }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      id: Schema.String.annotate({ description: "Stable identifier for the delivered layer." }),
-      name: Schema.String.annotate({
-        description:
-          "Admin-facing name for the delivered layer. This is surfaced in diagnostics so users know which cloud layer needs administrator attention.",
-      }),
-      type: Schema.Literal("enterpriseManaged").annotate({
-        title: "EnterpriseManagedConfigLayerSourceType",
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
       }),
-    }).annotate({
-      title: "EnterpriseManagedConfigLayerSource",
-      description: "Enterprise-managed config layer delivered by the cloud config bundle.",
-    }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      file: Schema.String.annotate({
-        description:
-          "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
       }),
-      profile: Schema.optionalKey(
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartedNotification__DynamicToolCallOutputContentItem" });
+
+export type V2TurnStartedNotification__DynamicToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed";
+export const V2TurnStartedNotification__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2TurnStartedNotification__DynamicToolCallStatus" });
+
+export type V2TurnStartedNotification__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2TurnStartedNotification__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2TurnStartedNotification__CollabAgentStatus" });
+
+export type V2TurnStartedNotification__ReasoningEffort = string;
+export const V2TurnStartedNotification__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2TurnStartedNotification__ReasoningEffort",
+  }),
+);
+
+export type V2TurnStartedNotification__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2TurnStartedNotification__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2TurnStartedNotification__CollabAgentToolCallStatus" });
+
+export type V2TurnStartedNotification__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2TurnStartedNotification__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2TurnStartedNotification__CollabAgentTool" });
+
+export type V2TurnStartedNotification__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2TurnStartedNotification__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2TurnStartedNotification__SubAgentActivityKind" });
+
+export type V2TurnStartedNotification__WebSearchAction =
+  | {
+      readonly queries?: ReadonlyArray<string> | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const V2TurnStartedNotification__WebSearchAction = Schema.Union(
+  [
+    Schema.Struct({
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
+    Schema.Struct({
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
+    Schema.Struct({
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
+    Schema.Struct({
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartedNotification__WebSearchAction" });
+
+export type V2TurnStartedNotification__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
+};
+export const V2TurnStartedNotification__ImageGenerationFailure = Schema.Union(
+  [
+    Schema.Struct({
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
         Schema.Union([
-          Schema.String.annotate({
-            description:
-              "Name of the selected profile-v2 config layered on top of the base user config, when this layer represents one.",
-          }),
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
           Schema.Null,
         ]),
       ),
-      type: Schema.Literal("user").annotate({ title: "UserConfigLayerSourceType" }),
-    }).annotate({
-      title: "UserConfigLayerSource",
-      description:
-        "User config layer from $CODEX_HOME/config.toml. This layer is special in that it is expected to be: - writable by the user - generally outside the workspace directory",
-    }),
-    Schema.Struct({
-      dotCodexFolder: V2ConfigWriteResponse__AbsolutePathBuf,
-      type: Schema.Literal("project").annotate({ title: "ProjectConfigLayerSourceType" }),
-    }).annotate({
-      title: "ProjectConfigLayerSource",
-      description:
-        "Path to a .codex/ folder within a project. There could be multiple of these between `cwd` and the project/repo root.",
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartedNotification__ImageGenerationFailure" });
+
+export type V2TurnStartedNotification__AbsolutePathBuf = string;
+export const V2TurnStartedNotification__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2TurnStartedNotification__AbsolutePathBuf",
+});
+
+export type V2TurnStartedNotification__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2TurnStartedNotification__TurnItemsView = Schema.Union(
+  [
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
     }),
-    Schema.Struct({
-      type: Schema.Literal("sessionFlags").annotate({ title: "SessionFlagsConfigLayerSourceType" }),
-    }).annotate({
-      title: "SessionFlagsConfigLayerSource",
-      description: "Session-layer overrides supplied via `-c`/`--config`.",
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
     }),
-    Schema.Struct({
-      file: V2ConfigWriteResponse__AbsolutePathBuf,
-      type: Schema.Literal("legacyManagedConfigTomlFromFile").annotate({
-        title: "LegacyManagedConfigTomlFromFileConfigLayerSourceType",
-      }),
-    }).annotate({
-      title: "LegacyManagedConfigTomlFromFileConfigLayerSource",
+    Schema.Literal("full").annotate({
       description:
-        '`managed_config.toml` was designed to be a config that was loaded as the last layer on top of everything else. This scheme did not quite work out as intended, but we keep this variant as a "best effort" while we phase out `managed_config.toml` in favor of `requirements.toml`.',
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
     }),
-    Schema.Struct({
-      type: Schema.Literal("legacyManagedConfigTomlFromMdm").annotate({
-        title: "LegacyManagedConfigTomlFromMdmConfigLayerSourceType",
-      }),
-    }).annotate({ title: "LegacyManagedConfigTomlFromMdmConfigLayerSource" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartedNotification__TurnItemsView" });
 
-export type V2ErrorNotification__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type V2TurnStartedNotification__TurnStatus =
+  | "completed"
+  | "interrupted"
+  | "failed"
+  | "inProgress";
+export const V2TurnStartedNotification__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2TurnStartedNotification__TurnStatus" });
+
+export type V2TurnStartParams__AskForApproval =
+  | "untrusted"
+  | "on-request"
+  | "never"
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ErrorNotification__NonSteerableTurnKind;
+      readonly granular: {
+        readonly mcp_elicitations: boolean;
+        readonly request_permissions?: boolean;
+        readonly rules: boolean;
+        readonly sandbox_approval: boolean;
+        readonly skill_approval?: boolean;
       };
     };
-export const V2ErrorNotification__CodexErrorInfo = Schema.Union(
+export const V2TurnStartParams__AskForApproval = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
-    Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
-    Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
+    Schema.Literals(["untrusted", "on-request", "never"]),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ErrorNotification__NonSteerableTurnKind,
+      granular: Schema.Struct({
+        mcp_elicitations: Schema.Boolean,
+        request_permissions: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+        rules: Schema.Boolean,
+        sandbox_approval: Schema.Boolean,
+        skill_approval: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
       }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
-    }),
+    }).annotate({ title: "GranularAskForApproval" }),
   ],
   { mode: "oneOf" },
-).annotate({
+).annotate({ identifier: "V2TurnStartParams__AskForApproval" });
+
+export type V2TurnStartParams__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
+export const V2TurnStartParams__ApprovalsReviewer = Schema.Literals([
+  "user",
+  "auto_review",
+  "guardian_subagent",
+]).annotate({
   description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
+  identifier: "V2TurnStartParams__ApprovalsReviewer",
 });
 
-export type V2ExternalAgentConfigDetectResponse__MigrationDetails = {
-  readonly commands?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__CommandMigration>;
-  readonly hooks?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__HookMigration>;
-  readonly mcpServers?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__McpServerMigration>;
-  readonly memory?: ReadonlyArray<string>;
-  readonly plugins?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__PluginsMigration>;
-  readonly sessions?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__SessionMigration>;
-  readonly skills?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__SkillMigration>;
-  readonly subagents?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__SubagentMigration>;
-};
-export const V2ExternalAgentConfigDetectResponse__MigrationDetails = Schema.Struct({
-  commands: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigDetectResponse__CommandMigration).annotate({ default: [] }),
-  ),
-  hooks: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigDetectResponse__HookMigration).annotate({ default: [] }),
-  ),
-  mcpServers: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigDetectResponse__McpServerMigration).annotate({ default: [] }),
-  ),
-  memory: Schema.optionalKey(Schema.Array(Schema.String)),
-  plugins: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigDetectResponse__PluginsMigration).annotate({ default: [] }),
-  ),
-  sessions: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigDetectResponse__SessionMigration).annotate({ default: [] }),
-  ),
-  skills: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigDetectResponse__SkillMigration).annotate({ default: [] }),
-  ),
-  subagents: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigDetectResponse__SubagentMigration).annotate({ default: [] }),
-  ),
+export type V2TurnStartParams__ReasoningEffort = string;
+export const V2TurnStartParams__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2TurnStartParams__ReasoningEffort",
+  }),
+);
+
+export type V2TurnStartParams__ByteRange = { readonly end: number; readonly start: number };
+export const V2TurnStartParams__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2TurnStartParams__ByteRange" });
+
+export type V2TurnStartParams__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2TurnStartParams__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2TurnStartParams__ImageDetail" });
+
+export type V2TurnStartParams__Personality = "none" | "friendly" | "pragmatic";
+export const V2TurnStartParams__Personality = Schema.Literals([
+  "none",
+  "friendly",
+  "pragmatic",
+]).annotate({
+  description: "Deprecated: `friendly` and `pragmatic` no longer select a style.",
+  identifier: "V2TurnStartParams__Personality",
 });
 
-export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure =
-  {
-    readonly cwd?: string | null;
-    readonly errorType?: string | null;
-    readonly failureStage: string;
-    readonly itemType: V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType;
-    readonly message: string;
-    readonly source?: string | null;
-    readonly subErrorType?: string | null;
-  };
-export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure =
-  Schema.Struct({
-    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    failureStage: Schema.String,
-    itemType:
-      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType,
-    message: Schema.String,
-    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  });
+export type V2TurnStartParams__NetworkAccess = "restricted" | "enabled";
+export const V2TurnStartParams__NetworkAccess = Schema.Literals(["restricted", "enabled"]).annotate(
+  { identifier: "V2TurnStartParams__NetworkAccess" },
+);
 
-export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess =
-  {
-    readonly cwd?: string | null;
-    readonly itemType: V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType;
-    readonly source?: string | null;
-    readonly target?: string | null;
-  };
-export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess =
-  Schema.Struct({
-    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    itemType:
-      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType,
-    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  });
+export type V2TurnStartParams__AbsolutePathBuf = string;
+export const V2TurnStartParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2TurnStartParams__AbsolutePathBuf",
+});
 
-export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure =
-  {
-    readonly cwd?: string | null;
-    readonly errorType?: string | null;
-    readonly failureStage: string;
-    readonly itemType: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType;
-    readonly message: string;
-    readonly source?: string | null;
-    readonly subErrorType?: string | null;
-  };
-export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure =
-  Schema.Struct({
-    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    failureStage: Schema.String,
-    itemType:
-      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType,
-    message: Schema.String,
-    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  });
+export type V2TurnStartParams__ReasoningSummary = "auto" | "concise" | "detailed" | "none";
+export const V2TurnStartParams__ReasoningSummary = Schema.Union(
+  [
+    Schema.Literals(["auto", "concise", "detailed"]),
+    Schema.Literal("none").annotate({ description: "Option to disable reasoning summaries." }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "A summary of the reasoning performed by the model. This can be useful for debugging and understanding the model's reasoning process. See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#reasoning-summaries",
+  identifier: "V2TurnStartParams__ReasoningSummary",
+});
 
-export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess =
-  {
-    readonly cwd?: string | null;
-    readonly itemType: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType;
-    readonly source?: string | null;
-    readonly target?: string | null;
-  };
-export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess =
-  Schema.Struct({
-    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    itemType:
-      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType,
-    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  });
+export type V2TurnStartParams__AdditionalContextKind = "untrusted" | "application";
+export const V2TurnStartParams__AdditionalContextKind = Schema.Literals([
+  "untrusted",
+  "application",
+]).annotate({ identifier: "V2TurnStartParams__AdditionalContextKind" });
 
-export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorCandidate =
-  {
-    readonly name: string;
-    readonly sessionCount: number;
-    readonly source: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorSource;
-  };
-export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorCandidate =
-  Schema.Struct({
-    name: Schema.String,
-    sessionCount: Schema.Number.annotate({ format: "uint32" })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    source: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorSource,
-  });
+export type V2TurnStartParams__ModeKind = "plan" | "default";
+export const V2TurnStartParams__ModeKind = Schema.Literals(["plan", "default"]).annotate({
+  description: "Initial collaboration mode to use when the TUI starts.",
+  identifier: "V2TurnStartParams__ModeKind",
+});
 
-export type V2ExternalAgentConfigImportParams__MigrationDetails = {
-  readonly commands?: ReadonlyArray<V2ExternalAgentConfigImportParams__CommandMigration>;
-  readonly hooks?: ReadonlyArray<V2ExternalAgentConfigImportParams__HookMigration>;
-  readonly mcpServers?: ReadonlyArray<V2ExternalAgentConfigImportParams__McpServerMigration>;
-  readonly memory?: ReadonlyArray<string>;
-  readonly plugins?: ReadonlyArray<V2ExternalAgentConfigImportParams__PluginsMigration>;
-  readonly sessions?: ReadonlyArray<V2ExternalAgentConfigImportParams__SessionMigration>;
-  readonly skills?: ReadonlyArray<V2ExternalAgentConfigImportParams__SkillMigration>;
-  readonly subagents?: ReadonlyArray<V2ExternalAgentConfigImportParams__SubagentMigration>;
-};
-export const V2ExternalAgentConfigImportParams__MigrationDetails = Schema.Struct({
-  commands: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigImportParams__CommandMigration).annotate({ default: [] }),
-  ),
-  hooks: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigImportParams__HookMigration).annotate({ default: [] }),
-  ),
-  mcpServers: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigImportParams__McpServerMigration).annotate({ default: [] }),
-  ),
-  memory: Schema.optionalKey(Schema.Array(Schema.String)),
-  plugins: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigImportParams__PluginsMigration).annotate({ default: [] }),
-  ),
-  sessions: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigImportParams__SessionMigration).annotate({ default: [] }),
-  ),
-  skills: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigImportParams__SkillMigration).annotate({ default: [] }),
-  ),
-  subagents: Schema.optionalKey(
-    Schema.Array(V2ExternalAgentConfigImportParams__SubagentMigration).annotate({ default: [] }),
-  ),
+export type V2TurnStartParams__LegacyAppPathString = string;
+export const V2TurnStartParams__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2TurnStartParams__LegacyAppPathString",
 });
 
-export type V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure =
-  {
-    readonly cwd?: string | null;
-    readonly errorType?: string | null;
-    readonly failureStage: string;
-    readonly itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType;
-    readonly message: string;
-    readonly source?: string | null;
-    readonly subErrorType?: string | null;
-  };
-export const V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure =
-  Schema.Struct({
-    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    failureStage: Schema.String,
-    itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType,
-    message: Schema.String,
-    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  });
+export type V2TurnStartResponse__NonSteerableTurnKind = "review" | "compact";
+export const V2TurnStartResponse__NonSteerableTurnKind = Schema.Literals([
+  "review",
+  "compact",
+]).annotate({ identifier: "V2TurnStartResponse__NonSteerableTurnKind" });
 
-export type V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess =
-  {
-    readonly cwd?: string | null;
-    readonly itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType;
-    readonly source?: string | null;
-    readonly target?: string | null;
-  };
-export const V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess =
-  Schema.Struct({
-    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType,
-    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  });
+export type V2TurnStartResponse__MisalignmentSteer = { readonly message: string };
+export const V2TurnStartResponse__MisalignmentSteer = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2TurnStartResponse__MisalignmentSteer" });
 
-export type V2FileChangePatchUpdatedNotification__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2FileChangePatchUpdatedNotification__PatchChangeKind;
-  readonly path: string;
+export type V2TurnStartResponse__ByteRange = { readonly end: number; readonly start: number };
+export const V2TurnStartResponse__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2TurnStartResponse__ByteRange" });
+
+export type V2TurnStartResponse__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2TurnStartResponse__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2TurnStartResponse__ImageDetail" });
+
+export type V2TurnStartResponse__HookPromptFragment = {
+  readonly hookRunId: string;
+  readonly text: string;
 };
-export const V2FileChangePatchUpdatedNotification__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2FileChangePatchUpdatedNotification__PatchChangeKind,
-  path: Schema.String,
+export const V2TurnStartResponse__HookPromptFragment = Schema.Struct({
+  hookRunId: Schema.String,
+  text: Schema.String,
+}).annotate({ identifier: "V2TurnStartResponse__HookPromptFragment" });
+
+export type V2TurnStartResponse__AgentMessageDelivery = "async";
+export const V2TurnStartResponse__AgentMessageDelivery = Schema.Literal("async").annotate({
+  identifier: "V2TurnStartResponse__AgentMessageDelivery",
 });
 
-export type V2GetAccountRateLimitsResponse__RateLimitResetCredit = {
-  readonly description?: string | null;
-  readonly expiresAt?: number | null;
-  readonly grantedAt: number;
-  readonly id: string;
-  readonly resetType: V2GetAccountRateLimitsResponse__RateLimitResetType;
-  readonly status: V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus;
-  readonly title?: string | null;
+export type V2TurnStartResponse__MemoryCitationEntry = {
+  readonly lineEnd: number;
+  readonly lineStart: number;
+  readonly note: string;
+  readonly path: string;
 };
-export const V2GetAccountRateLimitsResponse__RateLimitResetCredit = Schema.Struct({
-  description: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Backend-provided display description for this credit, or `null` when unavailable.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  expiresAt: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
-        description:
-          "Unix timestamp in seconds when the credit expires, or `null` if it does not expire.",
-        format: "int64",
-      }).check(Schema.isInt()),
-      Schema.Null,
-    ]),
-  ),
-  grantedAt: Schema.Number.annotate({
-    description: "Unix timestamp in seconds when the credit was granted.",
-    format: "int64",
-  }).check(Schema.isInt()),
-  id: Schema.String.annotate({ description: "Opaque backend identifier for this reset credit." }),
-  resetType: V2GetAccountRateLimitsResponse__RateLimitResetType,
-  status: V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus,
-  title: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Backend-provided display title for this credit, or `null` when unavailable.",
-      }),
-      Schema.Null,
-    ]),
-  ),
+export const V2TurnStartResponse__MemoryCitationEntry = Schema.Struct({
+  lineEnd: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  lineStart: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  note: Schema.String,
+  path: Schema.String,
+}).annotate({ identifier: "V2TurnStartResponse__MemoryCitationEntry" });
+
+export type V2TurnStartResponse__MessagePhase = "commentary" | "final_answer";
+export const V2TurnStartResponse__MessagePhase = Schema.Union(
+  [
+    Schema.Literal("commentary").annotate({
+      description:
+        "Mid-turn assistant text (for example preamble/progress narration).\n\nAdditional tool calls or assistant output may follow before turn completion.",
+    }),
+    Schema.Literal("final_answer").annotate({
+      description: "The assistant's terminal answer text for the current turn.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    'Classifies an assistant message as interim commentary or final answer text.\n\nProviders do not emit this consistently, so callers must treat `None` as "phase unknown" and keep compatibility behavior for legacy models.',
+  identifier: "V2TurnStartResponse__MessagePhase",
 });
 
-export type V2GetAccountRateLimitsResponse__RateLimitSnapshot = {
-  readonly credits?: V2GetAccountRateLimitsResponse__CreditsSnapshot | null;
-  readonly individualLimit?: V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot | null;
-  readonly limitId?: string | null;
-  readonly limitName?: string | null;
-  readonly planType?: V2GetAccountRateLimitsResponse__PlanType | null;
-  readonly primary?: V2GetAccountRateLimitsResponse__RateLimitWindow | null;
-  readonly rateLimitReachedType?: V2GetAccountRateLimitsResponse__RateLimitReachedType | null;
-  readonly secondary?: V2GetAccountRateLimitsResponse__RateLimitWindow | null;
-  readonly spendControlReached?: boolean | null;
+export type V2TurnStartResponse__AsyncUserInputQuestion = {
+  readonly options?: ReadonlyArray<string> | null;
+  readonly title: string;
 };
-export const V2GetAccountRateLimitsResponse__RateLimitSnapshot = Schema.Struct({
-  credits: Schema.optionalKey(
-    Schema.Union([V2GetAccountRateLimitsResponse__CreditsSnapshot, Schema.Null]),
-  ),
-  individualLimit: Schema.optionalKey(
-    Schema.Union([V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot, Schema.Null]),
-  ),
-  limitId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  limitName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  planType: Schema.optionalKey(
-    Schema.Union([V2GetAccountRateLimitsResponse__PlanType, Schema.Null]),
-  ),
-  primary: Schema.optionalKey(
-    Schema.Union([V2GetAccountRateLimitsResponse__RateLimitWindow, Schema.Null]),
-  ),
-  rateLimitReachedType: Schema.optionalKey(
-    Schema.Union([V2GetAccountRateLimitsResponse__RateLimitReachedType, Schema.Null]),
-  ),
-  secondary: Schema.optionalKey(
-    Schema.Union([V2GetAccountRateLimitsResponse__RateLimitWindow, Schema.Null]),
-  ),
-  spendControlReached: Schema.optionalKey(
-    Schema.Union([
-      Schema.Boolean.annotate({
-        description:
-          "Backend-reported spend-control state. `None` is unavailable, not a sparse-update recovery.",
-      }),
-      Schema.Null,
-    ]),
-  ),
+export const V2TurnStartResponse__AsyncUserInputQuestion = Schema.Struct({
+  options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.String,
+}).annotate({ identifier: "V2TurnStartResponse__AsyncUserInputQuestion" });
+
+export type V2TurnStartResponse__LegacyAppPathString = string;
+export const V2TurnStartResponse__LegacyAppPathString = Schema.String.annotate({
+  identifier: "V2TurnStartResponse__LegacyAppPathString",
 });
 
-export type V2GetAccountResponse__Account =
-  | { readonly type: "apiKey" }
-  | {
-      readonly email: string | null;
-      readonly planType: V2GetAccountResponse__PlanType;
-      readonly type: "chatgpt";
-    }
-  | { readonly type: "amazonBedrock"; readonly usesCodexManagedCredentials?: boolean };
-export const V2GetAccountResponse__Account = Schema.Union(
+export type V2TurnStartResponse__CommandExecutionSource =
+  | "agent"
+  | "userShell"
+  | "unifiedExecStartup"
+  | "unifiedExecInteraction";
+export const V2TurnStartResponse__CommandExecutionSource = Schema.Literals([
+  "agent",
+  "userShell",
+  "unifiedExecStartup",
+  "unifiedExecInteraction",
+]).annotate({ identifier: "V2TurnStartResponse__CommandExecutionSource" });
+
+export type V2TurnStartResponse__CommandExecutionStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2TurnStartResponse__CommandExecutionStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2TurnStartResponse__CommandExecutionStatus" });
+
+export type V2TurnStartResponse__PatchChangeKind =
+  | { readonly type: "add" }
+  | { readonly type: "delete" }
+  | { readonly move_path?: string | null; readonly type: "update" };
+export const V2TurnStartResponse__PatchChangeKind = Schema.Union(
   [
     Schema.Struct({
-      type: Schema.Literal("apiKey").annotate({ title: "ApiKeyAccountType" }),
-    }).annotate({ title: "ApiKeyAccount" }),
+      type: Schema.Literal("add").annotate({ title: "AddPatchChangeKindType" }),
+    }).annotate({ title: "AddPatchChangeKind" }),
     Schema.Struct({
-      email: Schema.Union([Schema.String, Schema.Null]),
-      planType: V2GetAccountResponse__PlanType,
-      type: Schema.Literal("chatgpt").annotate({ title: "ChatgptAccountType" }),
-    }).annotate({ title: "ChatgptAccount" }),
+      type: Schema.Literal("delete").annotate({ title: "DeletePatchChangeKindType" }),
+    }).annotate({ title: "DeletePatchChangeKind" }),
     Schema.Struct({
-      type: Schema.Literal("amazonBedrock").annotate({ title: "AmazonBedrockAccountType" }),
-      usesCodexManagedCredentials: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-    }).annotate({ title: "AmazonBedrockAccount" }),
+      move_path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("update").annotate({ title: "UpdatePatchChangeKindType" }),
+    }).annotate({ title: "UpdatePatchChangeKind" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartResponse__PatchChangeKind" });
 
-export type V2GetWorkspaceMessagesResponse__WorkspaceMessage = {
-  readonly archivedAt?: number | null;
-  readonly createdAt?: number | null;
-  readonly messageBody: string;
-  readonly messageId: string;
-  readonly messageType: V2GetWorkspaceMessagesResponse__WorkspaceMessageType;
-};
-export const V2GetWorkspaceMessagesResponse__WorkspaceMessage = Schema.Struct({
-  archivedAt: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
-        description: "Unix timestamp (in seconds) when the message was archived.",
-        format: "int64",
-      }).check(Schema.isInt()),
-      Schema.Null,
-    ]),
-  ),
-  createdAt: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
-        description: "Unix timestamp (in seconds) when the message was created.",
-        format: "int64",
-      }).check(Schema.isInt()),
-      Schema.Null,
-    ]),
-  ),
-  messageBody: Schema.String,
-  messageId: Schema.String,
-  messageType: V2GetWorkspaceMessagesResponse__WorkspaceMessageType,
-});
+export type V2TurnStartResponse__PatchApplyStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "declined";
+export const V2TurnStartResponse__PatchApplyStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "declined",
+]).annotate({ identifier: "V2TurnStartResponse__PatchApplyStatus" });
 
-export type V2HookCompletedNotification__HookOutputEntry = {
-  readonly kind: V2HookCompletedNotification__HookOutputEntryKind;
-  readonly text: string;
+export type V2TurnStartResponse__McpToolCallAppContext = {
+  readonly actionName?: string | null;
+  readonly appName?: string | null;
+  readonly connectorId: string;
+  readonly linkId?: string | null;
+  readonly resourceUri?: string | null;
 };
-export const V2HookCompletedNotification__HookOutputEntry = Schema.Struct({
-  kind: V2HookCompletedNotification__HookOutputEntryKind,
-  text: Schema.String,
-});
+export const V2TurnStartResponse__McpToolCallAppContext = Schema.Struct({
+  actionName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  appName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  connectorId: Schema.String,
+  linkId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceUri: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2TurnStartResponse__McpToolCallAppContext" });
 
-export type V2HooksListResponse__HookMetadata = {
-  readonly command?: string | null;
-  readonly currentHash: string;
-  readonly displayOrder: number;
-  readonly enabled: boolean;
-  readonly eventName: V2HooksListResponse__HookEventName;
-  readonly handlerType: V2HooksListResponse__HookHandlerType;
-  readonly isManaged: boolean;
-  readonly key: string;
-  readonly matcher?: string | null;
-  readonly pluginId?: string | null;
-  readonly source: V2HooksListResponse__HookSource;
-  readonly sourcePath: V2HooksListResponse__AbsolutePathBuf;
-  readonly statusMessage?: string | null;
-  readonly timeoutSec: number;
-  readonly trustStatus: V2HooksListResponse__HookTrustStatus;
-};
-export const V2HooksListResponse__HookMetadata = Schema.Struct({
-  command: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  currentHash: Schema.String,
-  displayOrder: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  enabled: Schema.Boolean,
-  eventName: V2HooksListResponse__HookEventName,
-  handlerType: V2HooksListResponse__HookHandlerType,
-  isManaged: Schema.Boolean,
-  key: Schema.String,
-  matcher: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  source: V2HooksListResponse__HookSource,
-  sourcePath: V2HooksListResponse__AbsolutePathBuf,
-  statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  timeoutSec: Schema.Number.annotate({ format: "uint64" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  trustStatus: V2HooksListResponse__HookTrustStatus,
-});
+export type V2TurnStartResponse__McpToolCallError = { readonly message: string };
+export const V2TurnStartResponse__McpToolCallError = Schema.Struct({
+  message: Schema.String,
+}).annotate({ identifier: "V2TurnStartResponse__McpToolCallError" });
 
-export type V2HookStartedNotification__HookOutputEntry = {
-  readonly kind: V2HookStartedNotification__HookOutputEntryKind;
-  readonly text: string;
+export type V2TurnStartResponse__McpAppDisplayMode = "inline" | "fullscreen";
+export const V2TurnStartResponse__McpAppDisplayMode = Schema.Literals([
+  "inline",
+  "fullscreen",
+]).annotate({ identifier: "V2TurnStartResponse__McpAppDisplayMode" });
+
+export type V2TurnStartResponse__McpToolCallResult = {
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
+  readonly structuredContent?: Schema.Json;
 };
-export const V2HookStartedNotification__HookOutputEntry = Schema.Struct({
-  kind: V2HookStartedNotification__HookOutputEntryKind,
-  text: Schema.String,
-});
+export const V2TurnStartResponse__McpToolCallResult = Schema.Struct({
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+}).annotate({ identifier: "V2TurnStartResponse__McpToolCallResult" });
 
-export type V2ItemCompletedNotification__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ItemCompletedNotification__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
-  | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ItemCompletedNotification__CommandAction = Schema.Union(
+export type V2TurnStartResponse__McpToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2TurnStartResponse__McpToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2TurnStartResponse__McpToolCallStatus" });
+
+export type V2TurnStartResponse__DynamicToolCallOutputContentItem =
+  | { readonly text: string; readonly type: "inputText" }
+  | { readonly imageUrl: string; readonly type: "inputImage" }
+  | { readonly audioUrl: string; readonly type: "inputAudio" };
+export const V2TurnStartResponse__DynamicToolCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ItemCompletedNotification__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      text: Schema.String,
+      type: Schema.Literal("inputText").annotate({
+        title: "InputTextDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      imageUrl: Schema.String,
+      type: Schema.Literal("inputImage").annotate({
+        title: "InputImageDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputImageDynamicToolCallOutputContentItem" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      audioUrl: Schema.String,
+      type: Schema.Literal("inputAudio").annotate({
+        title: "InputAudioDynamicToolCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioDynamicToolCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartResponse__DynamicToolCallOutputContentItem" });
+
+export type V2TurnStartResponse__DynamicToolCallStatus = "inProgress" | "completed" | "failed";
+export const V2TurnStartResponse__DynamicToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+]).annotate({ identifier: "V2TurnStartResponse__DynamicToolCallStatus" });
+
+export type V2TurnStartResponse__CollabAgentStatus =
+  | "pendingInit"
+  | "running"
+  | "interrupted"
+  | "completed"
+  | "errored"
+  | "shutdown"
+  | "notFound";
+export const V2TurnStartResponse__CollabAgentStatus = Schema.Literals([
+  "pendingInit",
+  "running",
+  "interrupted",
+  "completed",
+  "errored",
+  "shutdown",
+  "notFound",
+]).annotate({ identifier: "V2TurnStartResponse__CollabAgentStatus" });
+
+export type V2TurnStartResponse__ReasoningEffort = string;
+export const V2TurnStartResponse__ReasoningEffort = Schema.String.annotate({
+  description: "A non-empty reasoning effort value advertised by the model.",
+}).check(
+  Schema.isMinLength(1).annotate({
+    expected: "a value with a length of at least 1",
+    identifier: "V2TurnStartResponse__ReasoningEffort",
+  }),
 );
 
-export type V2ItemCompletedNotification__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ItemCompletedNotification__CollabAgentStatus;
-};
-export const V2ItemCompletedNotification__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ItemCompletedNotification__CollabAgentStatus,
-});
+export type V2TurnStartResponse__CollabAgentToolCallStatus =
+  | "inProgress"
+  | "completed"
+  | "failed"
+  | "interrupted";
+export const V2TurnStartResponse__CollabAgentToolCallStatus = Schema.Literals([
+  "inProgress",
+  "completed",
+  "failed",
+  "interrupted",
+]).annotate({ identifier: "V2TurnStartResponse__CollabAgentToolCallStatus" });
 
-export type V2ItemCompletedNotification__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ItemCompletedNotification__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const V2ItemCompletedNotification__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ItemCompletedNotification__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+export type V2TurnStartResponse__CollabAgentTool =
+  | "spawnAgent"
+  | "sendInput"
+  | "resumeAgent"
+  | "wait"
+  | "closeAgent"
+  | "sendMessage"
+  | "followupTask"
+  | "interruptAgent"
+  | "listAgents";
+export const V2TurnStartResponse__CollabAgentTool = Schema.Literals([
+  "spawnAgent",
+  "sendInput",
+  "resumeAgent",
+  "wait",
+  "closeAgent",
+  "sendMessage",
+  "followupTask",
+  "interruptAgent",
+  "listAgents",
+]).annotate({ identifier: "V2TurnStartResponse__CollabAgentTool" });
 
-export type V2ItemCompletedNotification__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ItemCompletedNotification__PatchChangeKind;
-  readonly path: string;
-};
-export const V2ItemCompletedNotification__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ItemCompletedNotification__PatchChangeKind,
-  path: Schema.String,
-});
+export type V2TurnStartResponse__SubAgentActivityKind =
+  | "started"
+  | "interacted"
+  | "interrupted"
+  | "completed";
+export const V2TurnStartResponse__SubAgentActivityKind = Schema.Literals([
+  "started",
+  "interacted",
+  "interrupted",
+  "completed",
+]).annotate({ identifier: "V2TurnStartResponse__SubAgentActivityKind" });
 
-export type V2ItemCompletedNotification__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ItemCompletedNotification__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ItemCompletedNotification__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
+export type V2TurnStartResponse__WebSearchAction =
   | {
-      readonly detail?: V2ItemCompletedNotification__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
+      readonly queries?: ReadonlyArray<string> | null;
+      readonly query?: string | null;
+      readonly type: "search";
     }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ItemCompletedNotification__UserInput = Schema.Union(
+  | { readonly type: "openPage"; readonly url?: string | null }
+  | { readonly pattern?: string | null; readonly type: "findInPage"; readonly url?: string | null }
+  | { readonly type: "other" };
+export const V2TurnStartResponse__WebSearchAction = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ItemCompletedNotification__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__ImageDetail, Schema.Null]),
-      ),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
+      queries: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchWebSearchActionType" }),
+    }).annotate({ title: "SearchWebSearchAction" }),
     Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
+      type: Schema.Literal("openPage").annotate({ title: "OpenPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "OpenPageWebSearchAction" }),
     Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
+      pattern: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("findInPage").annotate({ title: "FindInPageWebSearchActionType" }),
+      url: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    }).annotate({ title: "FindInPageWebSearchAction" }),
     Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
+      type: Schema.Literal("other").annotate({ title: "OtherWebSearchActionType" }),
+    }).annotate({ title: "OtherWebSearchAction" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReview = {
-  readonly rationale?: string | null;
-  readonly riskLevel?: V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel | null;
-  readonly status: V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewStatus;
-  readonly userAuthorization?: V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAuthorization | null;
-};
-export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReview =
-  Schema.Struct({
-    rationale: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    riskLevel: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel,
-        Schema.Null,
-      ]),
-    ),
-    status: V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewStatus,
-    userAuthorization: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAuthorization,
-        Schema.Null,
-      ]),
-    ),
-  }).annotate({
-    description:
-      "[UNSTABLE] Temporary approval auto-review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
-  });
-
-export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath =
-  | { readonly kind: "root" }
-  | { readonly kind: "minimal" }
-  | {
-      readonly kind: "project_roots";
-      readonly subpath?: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString | null;
-    }
-  | { readonly kind: "tmpdir" }
-  | { readonly kind: "slash_tmp" }
-  | {
-      readonly kind: "unknown";
-      readonly path: string;
-      readonly subpath?: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString | null;
-    };
-export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath =
-  Schema.Union(
-    [
-      Schema.Struct({ kind: Schema.Literal("root") }).annotate({
-        title: "RootFileSystemSpecialPath",
-      }),
-      Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
-        title: "MinimalFileSystemSpecialPath",
-      }),
-      Schema.Struct({
-        kind: Schema.Literal("project_roots"),
-        subpath: Schema.optionalKey(
-          Schema.Union([
-            V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
-            Schema.Null,
-          ]),
-        ),
-      }).annotate({ title: "KindFileSystemSpecialPath" }),
-      Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
-        title: "TmpdirFileSystemSpecialPath",
-      }),
-      Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
-        title: "SlashTmpFileSystemSpecialPath",
-      }),
-      Schema.Struct({
-        kind: Schema.Literal("unknown"),
-        path: Schema.String,
-        subpath: Schema.optionalKey(
-          Schema.Union([
-            V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
-            Schema.Null,
-          ]),
-        ),
-      }),
-    ],
-    { mode: "oneOf" },
-  );
+).annotate({ identifier: "V2TurnStartResponse__WebSearchAction" });
 
-export type V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReview = {
-  readonly rationale?: string | null;
-  readonly riskLevel?: V2ItemGuardianApprovalReviewStartedNotification__GuardianRiskLevel | null;
-  readonly status: V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus;
-  readonly userAuthorization?: V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthorization | null;
+export type V2TurnStartResponse__ImageGenerationFailure = {
+  readonly limitId: string;
+  readonly resetsAt?: number | null;
+  readonly type: "usageLimitExceeded";
 };
-export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReview =
-  Schema.Struct({
-    rationale: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    riskLevel: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewStartedNotification__GuardianRiskLevel,
-        Schema.Null,
-      ]),
-    ),
-    status: V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus,
-    userAuthorization: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthorization,
-        Schema.Null,
-      ]),
-    ),
-  }).annotate({
-    description:
-      "[UNSTABLE] Temporary approval auto-review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
-  });
-
-export type V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath =
-  | { readonly kind: "root" }
-  | { readonly kind: "minimal" }
-  | {
-      readonly kind: "project_roots";
-      readonly subpath?: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString | null;
-    }
-  | { readonly kind: "tmpdir" }
-  | { readonly kind: "slash_tmp" }
-  | {
-      readonly kind: "unknown";
-      readonly path: string;
-      readonly subpath?: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString | null;
-    };
-export const V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath = Schema.Union(
+export const V2TurnStartResponse__ImageGenerationFailure = Schema.Union(
   [
-    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
-      title: "RootFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
-      title: "MinimalFileSystemSpecialPath",
-    }),
     Schema.Struct({
-      kind: Schema.Literal("project_roots"),
-      subpath: Schema.optionalKey(
-        Schema.Union([
-          V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
-          Schema.Null,
-        ]),
-      ),
-    }).annotate({ title: "KindFileSystemSpecialPath" }),
-    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
-      title: "TmpdirFileSystemSpecialPath",
-    }),
-    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
-      title: "SlashTmpFileSystemSpecialPath",
-    }),
-    Schema.Struct({
-      kind: Schema.Literal("unknown"),
-      path: Schema.String,
-      subpath: Schema.optionalKey(
+      limitId: Schema.String,
+      resetsAt: Schema.optionalKey(
         Schema.Union([
-          V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
+          Schema.Number.annotate({ format: "int64" }).check(
+            Schema.isInt().annotate({ expected: "an integer" }),
+          ),
           Schema.Null,
         ]),
       ),
-    }),
+      type: Schema.Literal("usageLimitExceeded").annotate({
+        title: "UsageLimitExceededImageGenerationFailureType",
+      }),
+    }).annotate({ title: "UsageLimitExceededImageGenerationFailure" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartResponse__ImageGenerationFailure" });
 
-export type V2ItemStartedNotification__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ItemStartedNotification__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
-  | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ItemStartedNotification__CommandAction = Schema.Union(
+export type V2TurnStartResponse__AbsolutePathBuf = string;
+export const V2TurnStartResponse__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2TurnStartResponse__AbsolutePathBuf",
+});
+
+export type V2TurnStartResponse__TurnItemsView = "notLoaded" | "summary" | "full";
+export const V2TurnStartResponse__TurnItemsView = Schema.Union(
   [
-    Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ItemStartedNotification__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+    Schema.Literal("notLoaded").annotate({
+      description: "`items` was not loaded for this turn. The field is intentionally empty.",
+    }),
+    Schema.Literal("summary").annotate({
+      description: "`items` contains only a display summary for this turn.",
+    }),
+    Schema.Literal("full").annotate({
+      description:
+        "`items` contains every ThreadItem available from persisted app-server history for this turn.",
+    }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ItemStartedNotification__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ItemStartedNotification__CollabAgentStatus;
-};
-export const V2ItemStartedNotification__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ItemStartedNotification__CollabAgentStatus,
-});
+).annotate({ identifier: "V2TurnStartResponse__TurnItemsView" });
 
-export type V2ItemStartedNotification__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ItemStartedNotification__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const V2ItemStartedNotification__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ItemStartedNotification__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+export type V2TurnStartResponse__TurnStatus = "completed" | "interrupted" | "failed" | "inProgress";
+export const V2TurnStartResponse__TurnStatus = Schema.Literals([
+  "completed",
+  "interrupted",
+  "failed",
+  "inProgress",
+]).annotate({ identifier: "V2TurnStartResponse__TurnStatus" });
 
-export type V2ItemStartedNotification__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ItemStartedNotification__PatchChangeKind;
-  readonly path: string;
-};
-export const V2ItemStartedNotification__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ItemStartedNotification__PatchChangeKind,
-  path: Schema.String,
-});
+export type V2TurnSteerParams__ByteRange = { readonly end: number; readonly start: number };
+export const V2TurnSteerParams__ByteRange = Schema.Struct({
+  end: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+  start: Schema.Number.annotate({ format: "uint" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({ identifier: "V2TurnSteerParams__ByteRange" });
 
-export type V2ItemStartedNotification__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ItemStartedNotification__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ItemStartedNotification__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ItemStartedNotification__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ItemStartedNotification__UserInput = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ItemStartedNotification__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__ImageDetail, Schema.Null]),
-      ),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2TurnSteerParams__ImageDetail = "auto" | "low" | "high" | "original";
+export const V2TurnSteerParams__ImageDetail = Schema.Literals([
+  "auto",
+  "low",
+  "high",
+  "original",
+]).annotate({ identifier: "V2TurnSteerParams__ImageDetail" });
 
-export type V2ListMcpServerStatusResponse__McpServerStatus = {
-  readonly authStatus: V2ListMcpServerStatusResponse__McpAuthStatus;
-  readonly name: string;
-  readonly resourceTemplates: ReadonlyArray<V2ListMcpServerStatusResponse__ResourceTemplate>;
-  readonly resources: ReadonlyArray<V2ListMcpServerStatusResponse__Resource>;
-  readonly serverInfo?: V2ListMcpServerStatusResponse__McpServerInfo | null;
-  readonly tools: { readonly [x: string]: V2ListMcpServerStatusResponse__Tool };
-};
-export const V2ListMcpServerStatusResponse__McpServerStatus = Schema.Struct({
-  authStatus: V2ListMcpServerStatusResponse__McpAuthStatus,
-  name: Schema.String,
-  resourceTemplates: Schema.Array(V2ListMcpServerStatusResponse__ResourceTemplate),
-  resources: Schema.Array(V2ListMcpServerStatusResponse__Resource),
-  serverInfo: Schema.optionalKey(
-    Schema.Union([V2ListMcpServerStatusResponse__McpServerInfo, Schema.Null]),
-  ),
-  tools: Schema.Record(Schema.String, V2ListMcpServerStatusResponse__Tool),
+export type V2TurnSteerParams__AdditionalContextKind = "untrusted" | "application";
+export const V2TurnSteerParams__AdditionalContextKind = Schema.Literals([
+  "untrusted",
+  "application",
+]).annotate({ identifier: "V2TurnSteerParams__AdditionalContextKind" });
+
+export type V2WindowsSandboxReadinessResponse__WindowsSandboxReadiness =
+  | "ready"
+  | "notConfigured"
+  | "updateRequired";
+export const V2WindowsSandboxReadinessResponse__WindowsSandboxReadiness = Schema.Literals([
+  "ready",
+  "notConfigured",
+  "updateRequired",
+]).annotate({ identifier: "V2WindowsSandboxReadinessResponse__WindowsSandboxReadiness" });
+
+export type V2WindowsSandboxSetupCompletedNotification__WindowsSandboxSetupMode =
+  | "elevated"
+  | "unelevated";
+export const V2WindowsSandboxSetupCompletedNotification__WindowsSandboxSetupMode = Schema.Literals([
+  "elevated",
+  "unelevated",
+]).annotate({ identifier: "V2WindowsSandboxSetupCompletedNotification__WindowsSandboxSetupMode" });
+
+export type V2WindowsSandboxSetupStartParams__AbsolutePathBuf = string;
+export const V2WindowsSandboxSetupStartParams__AbsolutePathBuf = Schema.String.annotate({
+  description:
+    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+  identifier: "V2WindowsSandboxSetupStartParams__AbsolutePathBuf",
 });
 
-export type V2ModelListResponse__ReasoningEffortOption = {
-  readonly description: string;
-  readonly reasoningEffort: V2ModelListResponse__ReasoningEffort;
+export type V2WindowsSandboxSetupStartParams__WindowsSandboxSetupMode = "elevated" | "unelevated";
+export const V2WindowsSandboxSetupStartParams__WindowsSandboxSetupMode = Schema.Literals([
+  "elevated",
+  "unelevated",
+]).annotate({ identifier: "V2WindowsSandboxSetupStartParams__WindowsSandboxSetupMode" });
+
+export type ApplyPatchApprovalResponse__NetworkPolicyAmendment = {
+  readonly action: ApplyPatchApprovalResponse__NetworkPolicyRuleAction;
+  readonly host: string;
 };
-export const V2ModelListResponse__ReasoningEffortOption = Schema.Struct({
-  description: Schema.String,
-  reasoningEffort: V2ModelListResponse__ReasoningEffort,
-});
+export const ApplyPatchApprovalResponse__NetworkPolicyAmendment = Schema.Struct({
+  action: ApplyPatchApprovalResponse__NetworkPolicyRuleAction,
+  host: Schema.String,
+}).annotate({ identifier: "ApplyPatchApprovalResponse__NetworkPolicyAmendment" });
 
-export type V2PluginInstalledResponse__MarketplaceLoadErrorInfo = {
-  readonly marketplacePath: V2PluginInstalledResponse__AbsolutePathBuf;
-  readonly message: string;
+export type ClientRequest__InitializeParams = {
+  readonly capabilities?: ClientRequest__InitializeCapabilities | null;
+  readonly clientInfo: ClientRequest__ClientInfo;
 };
-export const V2PluginInstalledResponse__MarketplaceLoadErrorInfo = Schema.Struct({
-  marketplacePath: V2PluginInstalledResponse__AbsolutePathBuf,
-  message: Schema.String,
-});
+export const ClientRequest__InitializeParams = Schema.Struct({
+  capabilities: Schema.optionalKey(
+    Schema.Union([ClientRequest__InitializeCapabilities, Schema.Null]),
+  ),
+  clientInfo: ClientRequest__ClientInfo,
+}).annotate({ identifier: "ClientRequest__InitializeParams" });
 
-export type V2PluginInstalledResponse__PluginInterface = {
-  readonly brandColor?: string | null;
-  readonly capabilities: ReadonlyArray<string>;
-  readonly category?: string | null;
-  readonly composerIcon?: V2PluginInstalledResponse__AbsolutePathBuf | null;
-  readonly composerIconUrl?: string | null;
-  readonly defaultPrompt?: ReadonlyArray<string> | null;
-  readonly developerName?: string | null;
-  readonly displayName?: string | null;
-  readonly logo?: V2PluginInstalledResponse__AbsolutePathBuf | null;
-  readonly logoDark?: V2PluginInstalledResponse__AbsolutePathBuf | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly longDescription?: string | null;
-  readonly privacyPolicyUrl?: string | null;
-  readonly screenshotUrls: ReadonlyArray<string>;
-  readonly screenshots: ReadonlyArray<V2PluginInstalledResponse__AbsolutePathBuf>;
-  readonly shortDescription?: string | null;
-  readonly termsOfServiceUrl?: string | null;
-  readonly websiteUrl?: string | null;
+export type ClientRequest__ThreadResumeParams = {
+  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
+  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
+  readonly baseInstructions?: string | null;
+  readonly config?: { readonly [x: string]: Schema.Json } | null;
+  readonly cwd?: string | null;
+  readonly developerInstructions?: string | null;
+  readonly excludeTurns?: boolean;
+  readonly model?: string | null;
+  readonly modelProvider?: string | null;
+  readonly personality?: ClientRequest__Personality | null;
+  readonly sandbox?: ClientRequest__SandboxMode | null;
+  readonly serviceTier?: string | null;
+  readonly threadId: string;
 };
-export const V2PluginInstalledResponse__PluginInterface = Schema.Struct({
-  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  capabilities: Schema.Array(Schema.String),
-  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  composerIcon: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local composer icon path, resolved from the installed plugin package.",
+export const ClientRequest__ThreadResumeParams = Schema.Struct({
+  approvalPolicy: Schema.optionalKey(Schema.Union([ClientRequest__AskForApproval, Schema.Null])),
+  approvalsReviewer: Schema.optionalKey(
+    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
+      description:
+        "Override where approval requests are routed for review on this thread and subsequent turns.",
     }),
   ),
-  composerIconUrl: Schema.optionalKey(
+  baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  config: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
       Schema.Null,
     ]),
   ),
-  defaultPrompt: Schema.optionalKey(
+  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  excludeTurns: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, return only thread metadata and live-resume state without populating `thread.turns`. This is useful when the client plans to call `thread/turns/list` immediately after resuming. Full-history hydration is deprecated for paginated threads; use this with `thread/turns/list` and `thread/items/list` instead.",
+    }),
+  ),
+  model: Schema.optionalKey(
     Schema.Union([
-      Schema.Array(Schema.String).annotate({
-        description:
-          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
+      Schema.String.annotate({
+        description: "Configuration overrides for the resumed thread, if any.",
       }),
       Schema.Null,
     ]),
   ),
-  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logo: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local logo path, resolved from the installed plugin package.",
+  modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  personality: Schema.optionalKey(
+    Schema.Union([ClientRequest__Personality, Schema.Null]).annotate({
+      description:
+        "@deprecated `friendly` and `pragmatic` no longer select a style. Changing this does not rewrite the thread's existing instructions.",
     }),
   ),
-  logoDark: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local dark-mode logo path, resolved from the installed plugin package.",
+  sandbox: Schema.optionalKey(Schema.Union([ClientRequest__SandboxMode, Schema.Null])),
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  threadId: Schema.String,
+}).annotate({
+  description:
+    "There are three ways to resume a thread: 1. By thread_id: load the thread from disk by thread_id and resume it. 2. By history: instantiate the thread from memory and resume it. 3. By path: load the thread from disk by path and resume it.\n\nFor non-running threads, the precedence is: history > non-empty path > thread_id. If using history or a non-empty path for a non-running thread, the thread_id param will be ignored.\n\nIf thread_id identifies a running thread, app-server rejoins that thread and treats a non-empty path as a consistency check against the active rollout path. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
+  identifier: "ClientRequest__ThreadResumeParams",
+});
+
+export type ClientRequest__ThreadStartParams = {
+  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
+  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
+  readonly baseInstructions?: string | null;
+  readonly config?: { readonly [x: string]: Schema.Json } | null;
+  readonly cwd?: string | null;
+  readonly developerInstructions?: string | null;
+  readonly ephemeral?: boolean | null;
+  readonly model?: string | null;
+  readonly modelProvider?: string | null;
+  readonly personality?: ClientRequest__Personality | null;
+  readonly sandbox?: ClientRequest__SandboxMode | null;
+  readonly serviceName?: string | null;
+  readonly serviceTier?: string | null;
+  readonly sessionStartSource?: ClientRequest__ThreadStartSource | null;
+  readonly threadSource?: ClientRequest__ThreadSource | null;
+};
+export const ClientRequest__ThreadStartParams = Schema.Struct({
+  approvalPolicy: Schema.optionalKey(Schema.Union([ClientRequest__AskForApproval, Schema.Null])),
+  approvalsReviewer: Schema.optionalKey(
+    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
+      description:
+        "Override where approval requests are routed for review on this thread and subsequent turns.",
     }),
   ),
-  logoUrl: Schema.optionalKey(
+  baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  config: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
       Schema.Null,
     ]),
   ),
-  logoUrlDark: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
-      Schema.Null,
-    ]),
+  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  ephemeral: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  model: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  personality: Schema.optionalKey(
+    Schema.Union([ClientRequest__Personality, Schema.Null]).annotate({
+      description: "@deprecated `friendly` and `pragmatic` no longer select a style.",
+    }),
   ),
-  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  screenshotUrls: Schema.Array(Schema.String).annotate({
-    description: "Remote screenshot URLs from the plugin catalog.",
-  }),
-  screenshots: Schema.Array(V2PluginInstalledResponse__AbsolutePathBuf).annotate({
-    description: "Local screenshot paths, resolved from the installed plugin package.",
-  }),
-  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2PluginInstalledResponse__PluginSource =
-  | { readonly path: V2PluginInstalledResponse__AbsolutePathBuf; readonly type: "local" }
-  | {
-      readonly path?: string | null;
-      readonly refName?: string | null;
-      readonly sha?: string | null;
-      readonly type: "git";
-      readonly url: string;
-    }
-  | {
-      readonly package: string;
-      readonly registry?: string | null;
-      readonly type: "npm";
-      readonly version?: string | null;
-    }
-  | { readonly type: "remote" };
-export const V2PluginInstalledResponse__PluginSource = Schema.Union(
-  [
-    Schema.Struct({
-      path: V2PluginInstalledResponse__AbsolutePathBuf,
-      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
-    }).annotate({ title: "LocalPluginSource" }),
-    Schema.Struct({
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
-      url: Schema.String,
-    }).annotate({ title: "GitPluginSource" }),
-    Schema.Struct({
-      package: Schema.String,
-      registry: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({
-            description:
-              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
-          }),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
-      version: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({ description: "Optional npm version or version range." }),
-          Schema.Null,
-        ]),
-      ),
-    }).annotate({ title: "NpmPluginSource" }),
-    Schema.Struct({
-      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
-    }).annotate({
-      title: "RemotePluginSource",
-      description:
-        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
+  sandbox: Schema.optionalKey(Schema.Union([ClientRequest__SandboxMode, Schema.Null])),
+  serviceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  sessionStartSource: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadStartSource, Schema.Null]),
+  ),
+  threadSource: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadSource, Schema.Null]).annotate({
+      description: "Optional client-supplied analytics source classification for this thread.",
     }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2PluginInstalledResponse__PluginSharePrincipal = {
-  readonly name: string;
-  readonly principalId: string;
-  readonly principalType: V2PluginInstalledResponse__PluginSharePrincipalType;
-  readonly role: V2PluginInstalledResponse__PluginSharePrincipalRole;
-};
-export const V2PluginInstalledResponse__PluginSharePrincipal = Schema.Struct({
-  name: Schema.String,
-  principalId: Schema.String,
-  principalType: V2PluginInstalledResponse__PluginSharePrincipalType,
-  role: V2PluginInstalledResponse__PluginSharePrincipalRole,
-});
-
-export type V2PluginListResponse__MarketplaceLoadErrorInfo = {
-  readonly marketplacePath: V2PluginListResponse__AbsolutePathBuf;
-  readonly message: string;
-};
-export const V2PluginListResponse__MarketplaceLoadErrorInfo = Schema.Struct({
-  marketplacePath: V2PluginListResponse__AbsolutePathBuf,
-  message: Schema.String,
-});
+  ),
+}).annotate({ identifier: "ClientRequest__ThreadStartParams" });
 
-export type V2PluginListResponse__PluginInterface = {
-  readonly brandColor?: string | null;
-  readonly capabilities: ReadonlyArray<string>;
-  readonly category?: string | null;
-  readonly composerIcon?: V2PluginListResponse__AbsolutePathBuf | null;
-  readonly composerIconUrl?: string | null;
-  readonly defaultPrompt?: ReadonlyArray<string> | null;
-  readonly developerName?: string | null;
-  readonly displayName?: string | null;
-  readonly logo?: V2PluginListResponse__AbsolutePathBuf | null;
-  readonly logoDark?: V2PluginListResponse__AbsolutePathBuf | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly longDescription?: string | null;
-  readonly privacyPolicyUrl?: string | null;
-  readonly screenshotUrls: ReadonlyArray<string>;
-  readonly screenshots: ReadonlyArray<V2PluginListResponse__AbsolutePathBuf>;
-  readonly shortDescription?: string | null;
-  readonly termsOfServiceUrl?: string | null;
-  readonly websiteUrl?: string | null;
+export type ClientRequest__ThreadForkParams = {
+  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
+  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
+  readonly baseInstructions?: string | null;
+  readonly config?: { readonly [x: string]: Schema.Json } | null;
+  readonly cwd?: string | null;
+  readonly developerInstructions?: string | null;
+  readonly ephemeral?: boolean;
+  readonly excludeTurns?: boolean;
+  readonly lastTurnId?: string | null;
+  readonly model?: string | null;
+  readonly modelProvider?: string | null;
+  readonly sandbox?: ClientRequest__SandboxMode | null;
+  readonly serviceTier?: string | null;
+  readonly threadId: string;
+  readonly threadSource?: ClientRequest__ThreadSource | null;
 };
-export const V2PluginListResponse__PluginInterface = Schema.Struct({
-  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  capabilities: Schema.Array(Schema.String),
-  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  composerIcon: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local composer icon path, resolved from the installed plugin package.",
+export const ClientRequest__ThreadForkParams = Schema.Struct({
+  approvalPolicy: Schema.optionalKey(Schema.Union([ClientRequest__AskForApproval, Schema.Null])),
+  approvalsReviewer: Schema.optionalKey(
+    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
+      description:
+        "Override where approval requests are routed for review on this thread and subsequent turns.",
     }),
   ),
-  composerIconUrl: Schema.optionalKey(
+  baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  config: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
       Schema.Null,
     ]),
   ),
-  defaultPrompt: Schema.optionalKey(
+  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  ephemeral: Schema.optionalKey(Schema.Boolean),
+  excludeTurns: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, return only thread metadata and live fork state without populating `thread.turns`. This is useful when the client plans to call `thread/turns/list` immediately after forking. Full-history hydration is deprecated for paginated threads; use this with `thread/turns/list` and `thread/items/list` instead.",
+    }),
+  ),
+  lastTurnId: Schema.optionalKey(
     Schema.Union([
-      Schema.Array(Schema.String).annotate({
+      Schema.String.annotate({
         description:
-          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
+          "Optional last turn id to fork through, inclusive.\n\nWhen specified, turns after `last_turn_id` are omitted from the fork. The referenced turn cannot be in progress.",
       }),
       Schema.Null,
     ]),
   ),
-  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logo: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local logo path, resolved from the installed plugin package.",
-    }),
-  ),
-  logoDark: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local dark-mode logo path, resolved from the installed plugin package.",
-    }),
-  ),
-  logoUrl: Schema.optionalKey(
+  model: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.String.annotate({
+        description: "Configuration overrides for the forked thread, if any.",
+      }),
       Schema.Null,
     ]),
   ),
-  logoUrlDark: Schema.optionalKey(
+  modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  sandbox: Schema.optionalKey(Schema.Union([ClientRequest__SandboxMode, Schema.Null])),
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  threadId: Schema.String,
+  threadSource: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadSource, Schema.Null]).annotate({
+      description:
+        "Optional client-supplied analytics source classification for this forked thread.",
+    }),
+  ),
+}).annotate({
+  description:
+    "There are two ways to fork a thread: 1. By thread_id: load the thread from disk by thread_id and fork it into a new thread. 2. By path: load the thread from disk by path and fork it into a new thread.\n\nIf using a non-empty path, the thread_id param will be ignored. Empty string path values are treated as absent.\n\nPrefer using thread_id whenever possible.",
+  identifier: "ClientRequest__ThreadForkParams",
+});
+
+export type ClientRequest__ThreadGoalSetParams = {
+  readonly objective?: string | null;
+  readonly status?: ClientRequest__ThreadGoalStatus | null;
+  readonly threadId: string;
+  readonly tokenBudget?: number | null;
+};
+export const ClientRequest__ThreadGoalSetParams = Schema.Struct({
+  objective: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: Schema.optionalKey(Schema.Union([ClientRequest__ThreadGoalStatus, Schema.Null])),
+  threadId: Schema.String,
+  tokenBudget: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
       Schema.Null,
     ]),
   ),
-  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  screenshotUrls: Schema.Array(Schema.String).annotate({
-    description: "Remote screenshot URLs from the plugin catalog.",
-  }),
-  screenshots: Schema.Array(V2PluginListResponse__AbsolutePathBuf).annotate({
-    description: "Local screenshot paths, resolved from the installed plugin package.",
-  }),
-  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+}).annotate({ identifier: "ClientRequest__ThreadGoalSetParams" });
 
-export type V2PluginListResponse__PluginSource =
-  | { readonly path: V2PluginListResponse__AbsolutePathBuf; readonly type: "local" }
-  | {
-      readonly path?: string | null;
-      readonly refName?: string | null;
-      readonly sha?: string | null;
-      readonly type: "git";
-      readonly url: string;
-    }
-  | {
-      readonly package: string;
-      readonly registry?: string | null;
-      readonly type: "npm";
-      readonly version?: string | null;
-    }
-  | { readonly type: "remote" };
-export const V2PluginListResponse__PluginSource = Schema.Union(
-  [
-    Schema.Struct({
-      path: V2PluginListResponse__AbsolutePathBuf,
-      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
-    }).annotate({ title: "LocalPluginSource" }),
-    Schema.Struct({
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
-      url: Schema.String,
-    }).annotate({ title: "GitPluginSource" }),
-    Schema.Struct({
-      package: Schema.String,
-      registry: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({
-            description:
-              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
-          }),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
-      version: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({ description: "Optional npm version or version range." }),
-          Schema.Null,
-        ]),
-      ),
-    }).annotate({ title: "NpmPluginSource" }),
-    Schema.Struct({
-      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
-    }).annotate({
-      title: "RemotePluginSource",
+export type ClientRequest__ThreadMetadataUpdateParams = {
+  readonly gitInfo?: ClientRequest__ThreadMetadataGitInfoUpdateParams | null;
+  readonly threadId: string;
+};
+export const ClientRequest__ThreadMetadataUpdateParams = Schema.Struct({
+  gitInfo: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadMetadataGitInfoUpdateParams, Schema.Null]).annotate({
       description:
-        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
+        "Patch the stored Git metadata for this thread. Omit a field to leave it unchanged, set it to `null` to clear it, or provide a string to replace the stored value.",
     }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2PluginListResponse__PluginSharePrincipal = {
-  readonly name: string;
-  readonly principalId: string;
-  readonly principalType: V2PluginListResponse__PluginSharePrincipalType;
-  readonly role: V2PluginListResponse__PluginSharePrincipalRole;
-};
-export const V2PluginListResponse__PluginSharePrincipal = Schema.Struct({
-  name: Schema.String,
-  principalId: Schema.String,
-  principalType: V2PluginListResponse__PluginSharePrincipalType,
-  role: V2PluginListResponse__PluginSharePrincipalRole,
-});
+  ),
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadMetadataUpdateParams" });
 
-export type V2PluginReadResponse__PluginInterface = {
-  readonly brandColor?: string | null;
-  readonly capabilities: ReadonlyArray<string>;
-  readonly category?: string | null;
-  readonly composerIcon?: V2PluginReadResponse__AbsolutePathBuf | null;
-  readonly composerIconUrl?: string | null;
-  readonly defaultPrompt?: ReadonlyArray<string> | null;
-  readonly developerName?: string | null;
-  readonly displayName?: string | null;
-  readonly logo?: V2PluginReadResponse__AbsolutePathBuf | null;
-  readonly logoDark?: V2PluginReadResponse__AbsolutePathBuf | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly longDescription?: string | null;
-  readonly privacyPolicyUrl?: string | null;
-  readonly screenshotUrls: ReadonlyArray<string>;
-  readonly screenshots: ReadonlyArray<V2PluginReadResponse__AbsolutePathBuf>;
-  readonly shortDescription?: string | null;
-  readonly termsOfServiceUrl?: string | null;
-  readonly websiteUrl?: string | null;
+export type ClientRequest__ThreadListParams = {
+  readonly archived?: boolean | null;
+  readonly cursor?: string | null;
+  readonly cwd?: ClientRequest__ThreadListCwdFilter | null;
+  readonly limit?: number | null;
+  readonly modelProviders?: ReadonlyArray<string> | null;
+  readonly originators?: ReadonlyArray<string> | null;
+  readonly searchTerm?: string | null;
+  readonly sectionId?: string | null;
+  readonly sortDirection?: ClientRequest__SortDirection | null;
+  readonly sortKey?: ClientRequest__ThreadSortKey | null;
+  readonly sourceKinds?: ReadonlyArray<ClientRequest__ThreadSourceKind> | null;
+  readonly useStateDbOnly?: boolean;
 };
-export const V2PluginReadResponse__PluginInterface = Schema.Struct({
-  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  capabilities: Schema.Array(Schema.String),
-  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  composerIcon: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local composer icon path, resolved from the installed plugin package.",
+export const ClientRequest__ThreadListParams = Schema.Struct({
+  archived: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description:
+          "Optional archived filter; when set to true, only archived threads are returned. If false or null, only non-archived threads are returned.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  cursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Opaque pagination cursor returned by a previous call.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  cwd: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadListCwdFilter, Schema.Null]).annotate({
+      description:
+        "Optional cwd filter or filters; when set, only threads whose session cwd exactly matches one of these paths are returned.",
     }),
   ),
-  composerIconUrl: Schema.optionalKey(
+  limit: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.Number.annotate({
+        description: "Optional page size; defaults to a reasonable server-side value.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
-  defaultPrompt: Schema.optionalKey(
+  modelProviders: Schema.optionalKey(
     Schema.Union([
       Schema.Array(Schema.String).annotate({
         description:
-          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
+          "Optional provider filter; when set, only sessions recorded under these providers are returned. When present but empty, includes all providers.",
       }),
       Schema.Null,
     ]),
   ),
-  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logo: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local logo path, resolved from the installed plugin package.",
-    }),
+  originators: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Optional originator allowlist, matching any supplied value exactly. Supported by hosted backends only; the local app-server rejects a nonempty list. Omitted or empty lists leave originators unrestricted.",
+      }),
+      Schema.Null,
+    ]),
   ),
-  logoDark: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local dark-mode logo path, resolved from the installed plugin package.",
-    }),
+  searchTerm: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional substring filter for the extracted thread title.",
+      }),
+      Schema.Null,
+    ]),
   ),
-  logoUrl: Schema.optionalKey(
+  sectionId: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.String.annotate({
+        description:
+          "Omit to include every section, set to `null` for unsectioned threads, or provide a section ID to return only threads in that section.",
+      }),
       Schema.Null,
     ]),
   ),
-  logoUrlDark: Schema.optionalKey(
+  sortDirection: Schema.optionalKey(
+    Schema.Union([ClientRequest__SortDirection, Schema.Null]).annotate({
+      description: "Optional sort direction; defaults to descending (newest first).",
+    }),
+  ),
+  sortKey: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadSortKey, Schema.Null]).annotate({
+      description: "Optional sort key; defaults to created_at.",
+    }),
+  ),
+  sourceKinds: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
+      Schema.Array(ClientRequest__ThreadSourceKind).annotate({
+        description:
+          "Optional source filter; when set, only sessions from these source kinds are returned. When omitted or empty, defaults to interactive sources.",
+      }),
       Schema.Null,
     ]),
   ),
-  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  screenshotUrls: Schema.Array(Schema.String).annotate({
-    description: "Remote screenshot URLs from the plugin catalog.",
-  }),
-  screenshots: Schema.Array(V2PluginReadResponse__AbsolutePathBuf).annotate({
-    description: "Local screenshot paths, resolved from the installed plugin package.",
-  }),
-  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2PluginReadResponse__PluginSource =
-  | { readonly path: V2PluginReadResponse__AbsolutePathBuf; readonly type: "local" }
-  | {
-      readonly path?: string | null;
-      readonly refName?: string | null;
-      readonly sha?: string | null;
-      readonly type: "git";
-      readonly url: string;
-    }
-  | {
-      readonly package: string;
-      readonly registry?: string | null;
-      readonly type: "npm";
-      readonly version?: string | null;
-    }
-  | { readonly type: "remote" };
-export const V2PluginReadResponse__PluginSource = Schema.Union(
-  [
-    Schema.Struct({
-      path: V2PluginReadResponse__AbsolutePathBuf,
-      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
-    }).annotate({ title: "LocalPluginSource" }),
-    Schema.Struct({
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
-      url: Schema.String,
-    }).annotate({ title: "GitPluginSource" }),
-    Schema.Struct({
-      package: Schema.String,
-      registry: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({
-            description:
-              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
-          }),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
-      version: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({ description: "Optional npm version or version range." }),
-          Schema.Null,
-        ]),
-      ),
-    }).annotate({ title: "NpmPluginSource" }),
-    Schema.Struct({
-      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
-    }).annotate({
-      title: "RemotePluginSource",
+  useStateDbOnly: Schema.optionalKey(
+    Schema.Boolean.annotate({
       description:
-        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
+        "If true, return from the state DB without scanning JSONL rollouts to repair thread metadata. Omitted or false preserves scan-and-repair behavior.",
     }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2PluginReadResponse__SkillInterface = {
-  readonly brandColor?: string | null;
-  readonly defaultPrompt?: string | null;
-  readonly displayName?: string | null;
-  readonly iconLarge?: V2PluginReadResponse__AbsolutePathBuf | null;
-  readonly iconSmall?: V2PluginReadResponse__AbsolutePathBuf | null;
-  readonly shortDescription?: string | null;
-};
-export const V2PluginReadResponse__SkillInterface = Schema.Struct({
-  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  defaultPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  iconLarge: Schema.optionalKey(Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null])),
-  iconSmall: Schema.optionalKey(Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null])),
-  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+  ),
+}).annotate({ identifier: "ClientRequest__ThreadListParams" });
 
-export type V2PluginReadResponse__AppTemplateSummary = {
-  readonly canonicalConnectorId?: string | null;
-  readonly category?: string | null;
-  readonly description?: string | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly materializedAppIds: ReadonlyArray<string>;
+export type ClientRequest__ThreadSectionCreateParams = {
+  readonly appearance?: ClientRequest__ThreadSectionAppearance | null;
   readonly name: string;
-  readonly reason?: V2PluginReadResponse__AppTemplateUnavailableReason | null;
-  readonly templateId: string;
 };
-export const V2PluginReadResponse__AppTemplateSummary = Schema.Struct({
-  canonicalConnectorId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  materializedAppIds: Schema.Array(Schema.String),
-  name: Schema.String,
-  reason: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__AppTemplateUnavailableReason, Schema.Null]),
+export const ClientRequest__ThreadSectionCreateParams = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadSectionAppearance, Schema.Null]),
   ),
-  templateId: Schema.String,
-});
-
-export type V2PluginReadResponse__PluginHookSummary = {
-  readonly eventName: V2PluginReadResponse__HookEventName;
-  readonly key: string;
-};
-export const V2PluginReadResponse__PluginHookSummary = Schema.Struct({
-  eventName: V2PluginReadResponse__HookEventName,
-  key: Schema.String,
+  name: Schema.String.annotate({ description: "The user-visible name of the section." }),
+}).annotate({
+  description: "Parameters for creating an independently persisted thread section.",
+  identifier: "ClientRequest__ThreadSectionCreateParams",
 });
 
-export type V2PluginReadResponse__PluginSharePrincipal = {
+export type ClientRequest__ThreadSectionUpdateParams = {
+  readonly appearance?: ClientRequest__ThreadSectionAppearance | null;
   readonly name: string;
-  readonly principalId: string;
-  readonly principalType: V2PluginReadResponse__PluginSharePrincipalType;
-  readonly role: V2PluginReadResponse__PluginSharePrincipalRole;
+  readonly sectionId: string;
 };
-export const V2PluginReadResponse__PluginSharePrincipal = Schema.Struct({
-  name: Schema.String,
-  principalId: Schema.String,
-  principalType: V2PluginReadResponse__PluginSharePrincipalType,
-  role: V2PluginReadResponse__PluginSharePrincipalRole,
+export const ClientRequest__ThreadSectionUpdateParams = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Omit to preserve appearance, use `null` to clear it, or provide a replacement.",
+    }),
+  ),
+  name: Schema.String.annotate({ description: "The updated user-visible name of the section." }),
+  sectionId: Schema.String.annotate({
+    description: "The stable, server-generated identity of the section to update.",
+  }),
+}).annotate({
+  description: "Parameters for updating an independently persisted thread section.",
+  identifier: "ClientRequest__ThreadSectionUpdateParams",
 });
 
-export type V2PluginReadResponse__ScheduledTaskSchedule =
-  | {
-      readonly days?: ReadonlyArray<V2PluginReadResponse__ScheduledTaskWeekday> | null;
-      readonly intervalHours: number;
-      readonly type: "hourly";
-    }
-  | { readonly time: string; readonly type: "daily" }
-  | { readonly time: string; readonly type: "weekdays" }
-  | {
-      readonly days: ReadonlyArray<V2PluginReadResponse__ScheduledTaskWeekday>;
-      readonly time: string;
-      readonly type: "weekly";
-    };
-export const V2PluginReadResponse__ScheduledTaskSchedule = Schema.Union(
-  [
-    Schema.Struct({
-      days: Schema.optionalKey(
-        Schema.Union([Schema.Array(V2PluginReadResponse__ScheduledTaskWeekday), Schema.Null]),
-      ),
-      intervalHours: Schema.Number.annotate({ format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
-      type: Schema.Literal("hourly").annotate({ title: "HourlyScheduledTaskScheduleType" }),
-    }).annotate({ title: "HourlyScheduledTaskSchedule" }),
-    Schema.Struct({
-      time: Schema.String,
-      type: Schema.Literal("daily").annotate({ title: "DailyScheduledTaskScheduleType" }),
-    }).annotate({ title: "DailyScheduledTaskSchedule" }),
-    Schema.Struct({
-      time: Schema.String,
-      type: Schema.Literal("weekdays").annotate({ title: "WeekdaysScheduledTaskScheduleType" }),
-    }).annotate({ title: "WeekdaysScheduledTaskSchedule" }),
-    Schema.Struct({
-      days: Schema.Array(V2PluginReadResponse__ScheduledTaskWeekday),
-      time: Schema.String,
-      type: Schema.Literal("weekly").annotate({ title: "WeeklyScheduledTaskScheduleType" }),
-    }).annotate({ title: "WeeklyScheduledTaskSchedule" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2PluginShareListResponse__PluginInterface = {
-  readonly brandColor?: string | null;
-  readonly capabilities: ReadonlyArray<string>;
-  readonly category?: string | null;
-  readonly composerIcon?: V2PluginShareListResponse__AbsolutePathBuf | null;
-  readonly composerIconUrl?: string | null;
-  readonly defaultPrompt?: ReadonlyArray<string> | null;
-  readonly developerName?: string | null;
-  readonly displayName?: string | null;
-  readonly logo?: V2PluginShareListResponse__AbsolutePathBuf | null;
-  readonly logoDark?: V2PluginShareListResponse__AbsolutePathBuf | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly longDescription?: string | null;
-  readonly privacyPolicyUrl?: string | null;
-  readonly screenshotUrls: ReadonlyArray<string>;
-  readonly screenshots: ReadonlyArray<V2PluginShareListResponse__AbsolutePathBuf>;
-  readonly shortDescription?: string | null;
-  readonly termsOfServiceUrl?: string | null;
-  readonly websiteUrl?: string | null;
+export type ClientRequest__ThreadTurnsListParams = {
+  readonly cursor?: string | null;
+  readonly itemsView?: ClientRequest__TurnItemsView | null;
+  readonly limit?: number | null;
+  readonly sortDirection?: ClientRequest__SortDirection | null;
+  readonly threadId: string;
 };
-export const V2PluginShareListResponse__PluginInterface = Schema.Struct({
-  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  capabilities: Schema.Array(Schema.String),
-  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  composerIcon: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local composer icon path, resolved from the installed plugin package.",
-    }),
-  ),
-  composerIconUrl: Schema.optionalKey(
+export const ClientRequest__ThreadTurnsListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.String.annotate({
+        description: "Opaque cursor to pass to the next call to continue after the last turn.",
+      }),
       Schema.Null,
     ]),
   ),
-  defaultPrompt: Schema.optionalKey(
+  itemsView: Schema.optionalKey(
+    Schema.Union([ClientRequest__TurnItemsView, Schema.Null]).annotate({
+      description: "How much item detail to include for each returned turn; defaults to summary.",
+    }),
+  ),
+  limit: Schema.optionalKey(
     Schema.Union([
-      Schema.Array(Schema.String).annotate({
-        description:
-          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
-      }),
+      Schema.Number.annotate({ description: "Optional turn page size.", format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
-  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logo: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local logo path, resolved from the installed plugin package.",
-    }),
-  ),
-  logoDark: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description: "Local dark-mode logo path, resolved from the installed plugin package.",
+  sortDirection: Schema.optionalKey(
+    Schema.Union([ClientRequest__SortDirection, Schema.Null]).annotate({
+      description: "Optional turn pagination direction; defaults to descending.",
     }),
   ),
-  logoUrl: Schema.optionalKey(
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ThreadTurnsListParams" });
+
+export type ClientRequest__ThreadItemsListCursor = string | ClientRequest__ThreadItemsListAnchor;
+export const ClientRequest__ThreadItemsListCursor = Schema.Union([
+  Schema.String,
+  ClientRequest__ThreadItemsListAnchor,
+]).annotate({
+  description: "Starting position for an item-history page.",
+  identifier: "ClientRequest__ThreadItemsListCursor",
+});
+
+export type ClientRequest__SkillsExtraRootsSetParams = {
+  readonly extraRoots: ReadonlyArray<ClientRequest__AbsolutePathBuf>;
+};
+export const ClientRequest__SkillsExtraRootsSetParams = Schema.Struct({
+  extraRoots: Schema.Array(ClientRequest__AbsolutePathBuf),
+}).annotate({ identifier: "ClientRequest__SkillsExtraRootsSetParams" });
+
+export type ClientRequest__PluginInstalledParams = {
+  readonly cwds?: ReadonlyArray<ClientRequest__AbsolutePathBuf> | null;
+  readonly installSuggestionPluginNames?: ReadonlyArray<string> | null;
+};
+export const ClientRequest__PluginInstalledParams = Schema.Struct({
+  cwds: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.Array(ClientRequest__AbsolutePathBuf).annotate({
+        description: "Optional working directories used to discover repo marketplaces.",
+      }),
       Schema.Null,
     ]),
   ),
-  logoUrlDark: Schema.optionalKey(
+  installSuggestionPluginNames: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Additional uninstalled plugin names that should be returned when present locally. This is used by mention surfaces that intentionally expose install entrypoints.",
+      }),
       Schema.Null,
     ]),
   ),
-  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  screenshotUrls: Schema.Array(Schema.String).annotate({
-    description: "Remote screenshot URLs from the plugin catalog.",
-  }),
-  screenshots: Schema.Array(V2PluginShareListResponse__AbsolutePathBuf).annotate({
-    description: "Local screenshot paths, resolved from the installed plugin package.",
-  }),
-  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ClientRequest__PluginInstalledParams" });
+
+export type ClientRequest__PluginReadParams = {
+  readonly marketplacePath?: ClientRequest__AbsolutePathBuf | null;
+  readonly pluginName: string;
+  readonly remoteMarketplaceName?: string | null;
+};
+export const ClientRequest__PluginReadParams = Schema.Struct({
+  marketplacePath: Schema.optionalKey(Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null])),
+  pluginName: Schema.String,
+  remoteMarketplaceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ClientRequest__PluginReadParams" });
+
+export type ClientRequest__FsReadFileParams = { readonly path: ClientRequest__AbsolutePathBuf };
+export const ClientRequest__FsReadFileParams = Schema.Struct({
+  path: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to read." }),
+}).annotate({
+  description: "Read a file from the host filesystem.",
+  identifier: "ClientRequest__FsReadFileParams",
 });
 
-export type V2PluginShareListResponse__PluginSource =
-  | { readonly path: V2PluginShareListResponse__AbsolutePathBuf; readonly type: "local" }
-  | {
-      readonly path?: string | null;
-      readonly refName?: string | null;
-      readonly sha?: string | null;
-      readonly type: "git";
-      readonly url: string;
-    }
-  | {
-      readonly package: string;
-      readonly registry?: string | null;
-      readonly type: "npm";
-      readonly version?: string | null;
-    }
-  | { readonly type: "remote" };
-export const V2PluginShareListResponse__PluginSource = Schema.Union(
-  [
-    Schema.Struct({
-      path: V2PluginShareListResponse__AbsolutePathBuf,
-      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
-    }).annotate({ title: "LocalPluginSource" }),
-    Schema.Struct({
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
-      url: Schema.String,
-    }).annotate({ title: "GitPluginSource" }),
-    Schema.Struct({
-      package: Schema.String,
-      registry: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({
-            description:
-              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
-          }),
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
-      version: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({ description: "Optional npm version or version range." }),
-          Schema.Null,
-        ]),
-      ),
-    }).annotate({ title: "NpmPluginSource" }),
-    Schema.Struct({
-      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
-    }).annotate({
-      title: "RemotePluginSource",
-      description:
-        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
-    }),
-  ],
-  { mode: "oneOf" },
-);
+export type ClientRequest__FsWriteFileParams = {
+  readonly dataBase64: string;
+  readonly path: ClientRequest__AbsolutePathBuf;
+};
+export const ClientRequest__FsWriteFileParams = Schema.Struct({
+  dataBase64: Schema.String.annotate({ description: "File contents encoded as base64." }),
+  path: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to write." }),
+}).annotate({
+  description: "Write a file on the host filesystem.",
+  identifier: "ClientRequest__FsWriteFileParams",
+});
 
-export type V2PluginShareListResponse__PluginSharePrincipal = {
-  readonly name: string;
-  readonly principalId: string;
-  readonly principalType: V2PluginShareListResponse__PluginSharePrincipalType;
-  readonly role: V2PluginShareListResponse__PluginSharePrincipalRole;
+export type ClientRequest__FsCreateDirectoryParams = {
+  readonly path: ClientRequest__AbsolutePathBuf;
+  readonly recursive?: boolean | null;
 };
-export const V2PluginShareListResponse__PluginSharePrincipal = Schema.Struct({
-  name: Schema.String,
-  principalId: Schema.String,
-  principalType: V2PluginShareListResponse__PluginSharePrincipalType,
-  role: V2PluginShareListResponse__PluginSharePrincipalRole,
+export const ClientRequest__FsCreateDirectoryParams = Schema.Struct({
+  path: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute directory path to create." }),
+  recursive: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description: "Whether parent directories should also be created. Defaults to `true`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({
+  description: "Create a directory on the host filesystem.",
+  identifier: "ClientRequest__FsCreateDirectoryParams",
 });
 
-export type V2PluginShareSaveParams__PluginShareTarget = {
-  readonly principalId: string;
-  readonly principalType: V2PluginShareSaveParams__PluginSharePrincipalType;
-  readonly role: V2PluginShareSaveParams__PluginShareTargetRole;
+export type ClientRequest__FsGetMetadataParams = { readonly path: ClientRequest__AbsolutePathBuf };
+export const ClientRequest__FsGetMetadataParams = Schema.Struct({
+  path: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to inspect." }),
+}).annotate({
+  description: "Request metadata for an absolute path.",
+  identifier: "ClientRequest__FsGetMetadataParams",
+});
+
+export type ClientRequest__FsReadDirectoryParams = {
+  readonly path: ClientRequest__AbsolutePathBuf;
 };
-export const V2PluginShareSaveParams__PluginShareTarget = Schema.Struct({
-  principalId: Schema.String,
-  principalType: V2PluginShareSaveParams__PluginSharePrincipalType,
-  role: V2PluginShareSaveParams__PluginShareTargetRole,
+export const ClientRequest__FsReadDirectoryParams = Schema.Struct({
+  path: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute directory path to read." }),
+}).annotate({
+  description: "List direct child names for a directory.",
+  identifier: "ClientRequest__FsReadDirectoryParams",
 });
 
-export type V2PluginShareUpdateTargetsParams__PluginShareTarget = {
-  readonly principalId: string;
-  readonly principalType: V2PluginShareUpdateTargetsParams__PluginSharePrincipalType;
-  readonly role: V2PluginShareUpdateTargetsParams__PluginShareTargetRole;
+export type ClientRequest__FsRemoveParams = {
+  readonly force?: boolean | null;
+  readonly path: ClientRequest__AbsolutePathBuf;
+  readonly recursive?: boolean | null;
 };
-export const V2PluginShareUpdateTargetsParams__PluginShareTarget = Schema.Struct({
-  principalId: Schema.String,
-  principalType: V2PluginShareUpdateTargetsParams__PluginSharePrincipalType,
-  role: V2PluginShareUpdateTargetsParams__PluginShareTargetRole,
+export const ClientRequest__FsRemoveParams = Schema.Struct({
+  force: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description: "Whether missing paths should be ignored. Defaults to `true`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  path: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to remove." }),
+  recursive: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description: "Whether directory removal should recurse. Defaults to `true`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({
+  description: "Remove a file or directory tree from the host filesystem.",
+  identifier: "ClientRequest__FsRemoveParams",
 });
 
-export type V2PluginShareUpdateTargetsResponse__PluginSharePrincipal = {
-  readonly name: string;
+export type ClientRequest__FsCopyParams = {
+  readonly destinationPath: ClientRequest__AbsolutePathBuf;
+  readonly recursive?: boolean;
+  readonly sourcePath: ClientRequest__AbsolutePathBuf;
+};
+export const ClientRequest__FsCopyParams = Schema.Struct({
+  destinationPath: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute destination path." }),
+  recursive: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "Required for directory copies; ignored for file copies.",
+    }),
+  ),
+  sourcePath: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute source path." }),
+}).annotate({
+  description: "Copy a file or directory tree on the host filesystem.",
+  identifier: "ClientRequest__FsCopyParams",
+});
+
+export type ClientRequest__FsWatchParams = {
+  readonly path: ClientRequest__AbsolutePathBuf;
+  readonly watchId: string;
+};
+export const ClientRequest__FsWatchParams = Schema.Struct({
+  path: Schema.suspend(
+    (): Schema.Codec<ClientRequest__AbsolutePathBuf> => ClientRequest__AbsolutePathBuf,
+  ).annotate({ description: "Absolute file or directory path to watch." }),
+  watchId: Schema.String.annotate({
+    description: "Connection-scoped watch identifier used for `fs/unwatch` and `fs/changed`.",
+  }),
+}).annotate({
+  description: "Start filesystem watch notifications for an absolute path.",
+  identifier: "ClientRequest__FsWatchParams",
+});
+
+export type ClientRequest__SkillsConfigWriteParams = {
+  readonly enabled: boolean;
+  readonly name?: string | null;
+  readonly path?: ClientRequest__AbsolutePathBuf | null;
+};
+export const ClientRequest__SkillsConfigWriteParams = Schema.Struct({
+  enabled: Schema.Boolean,
+  name: Schema.optionalKey(
+    Schema.Union([Schema.String.annotate({ description: "Name-based selector." }), Schema.Null]),
+  ),
+  path: Schema.optionalKey(
+    Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Path-based selector.",
+    }),
+  ),
+}).annotate({ identifier: "ClientRequest__SkillsConfigWriteParams" });
+
+export type ClientRequest__PluginInstallParams = {
+  readonly installAttemptId?: string | null;
+  readonly marketplacePath?: ClientRequest__AbsolutePathBuf | null;
+  readonly pluginName: string;
+  readonly remoteMarketplaceName?: string | null;
+};
+export const ClientRequest__PluginInstallParams = Schema.Struct({
+  installAttemptId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Client-generated identifier used to correlate one installation attempt.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  marketplacePath: Schema.optionalKey(Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null])),
+  pluginName: Schema.String,
+  remoteMarketplaceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ClientRequest__PluginInstallParams" });
+
+export type ClientRequest__PluginListParams = {
+  readonly cwds?: ReadonlyArray<ClientRequest__AbsolutePathBuf> | null;
+  readonly forceRefetch?: boolean;
+  readonly marketplaceKinds?: ReadonlyArray<ClientRequest__PluginListMarketplaceKind> | null;
+};
+export const ClientRequest__PluginListParams = Schema.Struct({
+  cwds: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ClientRequest__AbsolutePathBuf).annotate({
+        description:
+          "Optional working directories used to discover repo marketplaces. When omitted, only home-scoped marketplaces and the official curated marketplace are considered.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  forceRefetch: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "Whether the client requests a fresh remote plugin catalog fetch.",
+    }),
+  ),
+  marketplaceKinds: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ClientRequest__PluginListMarketplaceKind).annotate({
+        description:
+          "Optional marketplace kind filter. When omitted, only local marketplaces are queried, plus the default remote catalog when enabled by feature flag.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__PluginListParams" });
+
+export type ClientRequest__PluginShareTarget = {
   readonly principalId: string;
-  readonly principalType: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType;
-  readonly role: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalRole;
+  readonly principalType: ClientRequest__PluginSharePrincipalType;
+  readonly role: ClientRequest__PluginShareTargetRole;
 };
-export const V2PluginShareUpdateTargetsResponse__PluginSharePrincipal = Schema.Struct({
-  name: Schema.String,
+export const ClientRequest__PluginShareTarget = Schema.Struct({
   principalId: Schema.String,
-  principalType: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType,
-  role: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalRole,
+  principalType: ClientRequest__PluginSharePrincipalType,
+  role: ClientRequest__PluginShareTargetRole,
+}).annotate({ identifier: "ClientRequest__PluginShareTarget" });
+
+export type ClientRequest__Settings = {
+  readonly developer_instructions?: string | null;
+  readonly model: string;
+  readonly reasoning_effort?: ClientRequest__ReasoningEffort | null;
+};
+export const ClientRequest__Settings = Schema.Struct({
+  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  model: Schema.String,
+  reasoning_effort: Schema.optionalKey(Schema.Union([ClientRequest__ReasoningEffort, Schema.Null])),
+}).annotate({
+  description: "Settings for a collaboration mode.",
+  identifier: "ClientRequest__Settings",
 });
 
-export type V2RawResponseItemCompletedNotification__ContentItem =
+export type ClientRequest__ConfigurationReasoning = {
+  readonly effort: ClientRequest__ReasoningEffort;
+};
+export const ClientRequest__ConfigurationReasoning = Schema.Struct({
+  effort: ClientRequest__ReasoningEffort,
+}).annotate({
+  description: "Reasoning settings interpreted by the backend for the routed model.",
+  identifier: "ClientRequest__ConfigurationReasoning",
+});
+
+export type ClientRequest__TextElement = {
+  readonly byteRange: ClientRequest__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const ClientRequest__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<ClientRequest__ByteRange> => ClientRequest__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__TextElement" });
+
+export type ClientRequest__FunctionCallOutputContentItem =
   | { readonly text: string; readonly type: "input_text" }
   | {
-      readonly detail?: V2RawResponseItemCompletedNotification__ImageDetail | null;
-      readonly image_url: string;
+      readonly detail?: ClientRequest__ImageDetail | null;
       readonly type: "input_image";
+      readonly image_url: string;
     }
-  | { readonly audio_url: string; readonly type: "input_audio" }
-  | { readonly text: string; readonly type: "output_text" };
-export const V2RawResponseItemCompletedNotification__ContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("input_text").annotate({ title: "InputTextContentItemType" }),
-    }).annotate({ title: "InputTextContentItem" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2RawResponseItemCompletedNotification__ImageDetail, Schema.Null]),
-      ),
-      image_url: Schema.String,
-      type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
-    }).annotate({ title: "InputImageContentItem" }),
-    Schema.Struct({
-      audio_url: Schema.String,
-      type: Schema.Literal("input_audio").annotate({ title: "InputAudioContentItemType" }),
-    }).annotate({ title: "InputAudioContentItem" }),
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("output_text").annotate({ title: "OutputTextContentItemType" }),
-    }).annotate({ title: "OutputTextContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem =
-  | { readonly text: string; readonly type: "input_text" }
   | {
-      readonly detail?: V2RawResponseItemCompletedNotification__ImageDetail | null;
-      readonly image_url: string;
+      readonly detail?: ClientRequest__ImageDetail | null;
       readonly type: "input_image";
+      readonly file_id: string;
     }
   | { readonly audio_url: string; readonly type: "input_audio" }
   | { readonly encrypted_content: string; readonly type: "encrypted_content" };
-export const V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem = Schema.Union(
+export const ClientRequest__FunctionCallOutputContentItem = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
@@ -15579,15 +16885,22 @@ export const V2RawResponseItemCompletedNotification__FunctionCallOutputContentIt
         title: "InputTextFunctionCallOutputContentItemType",
       }),
     }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2RawResponseItemCompletedNotification__ImageDetail, Schema.Null]),
-      ),
-      image_url: Schema.String,
-      type: Schema.Literal("input_image").annotate({
-        title: "InputImageFunctionCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
     Schema.Struct({
       audio_url: Schema.String,
       type: Schema.Literal("input_audio").annotate({
@@ -15605,282 +16918,454 @@ export const V2RawResponseItemCompletedNotification__FunctionCallOutputContentIt
 ).annotate({
   description:
     "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "ClientRequest__FunctionCallOutputContentItem",
 });
 
-export type V2ReviewStartResponse__CommandAction =
+export type ClientRequest__ContentItem =
+  | { readonly text: string; readonly type: "input_text" }
   | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ReviewStartResponse__AbsolutePathBuf;
-      readonly type: "read";
+      readonly detail?: ClientRequest__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
     }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
+      readonly detail?: ClientRequest__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ReviewStartResponse__CommandAction = Schema.Union(
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly text: string; readonly type: "output_text" };
+export const ClientRequest__ContentItem = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ReviewStartResponse__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({ title: "InputTextContentItemType" }),
+    }).annotate({ title: "InputTextContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdContentItem" }),
+    ]).annotate({ title: "InputImageContentItem" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({ title: "InputAudioContentItemType" }),
+    }).annotate({ title: "InputAudioContentItem" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      text: Schema.String,
+      type: Schema.Literal("output_text").annotate({ title: "OutputTextContentItemType" }),
+    }).annotate({ title: "OutputTextContentItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ReviewStartResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ReviewStartResponse__CollabAgentStatus;
-};
-export const V2ReviewStartResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ReviewStartResponse__CollabAgentStatus,
-});
-
-export type V2ReviewStartResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ReviewStartResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const V2ReviewStartResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ReviewStartResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+).annotate({ identifier: "ClientRequest__ContentItem" });
 
-export type V2ReviewStartResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type ClientRequest__SandboxPolicy =
+  | { readonly type: "dangerFullAccess" }
+  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
+  | { readonly networkAccess?: ClientRequest__NetworkAccess; readonly type: "externalSandbox" }
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ReviewStartResponse__NonSteerableTurnKind;
-      };
+      readonly excludeSlashTmp?: boolean;
+      readonly excludeTmpdirEnvVar?: boolean;
+      readonly networkAccess?: boolean;
+      readonly type: "workspaceWrite";
+      readonly writableRoots?: ReadonlyArray<ClientRequest__AbsolutePathBuf>;
     };
-export const V2ReviewStartResponse__CodexErrorInfo = Schema.Union(
+export const ClientRequest__SandboxPolicy = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
     Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      type: Schema.Literal("dangerFullAccess").annotate({
+        title: "DangerFullAccessSandboxPolicyType",
       }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
+    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
     Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
+    }).annotate({ title: "ReadOnlySandboxPolicy" }),
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      networkAccess: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<ClientRequest__NetworkAccess> => ClientRequest__NetworkAccess,
+        ).annotate({ default: "restricted" }),
+      ),
+      type: Schema.Literal("externalSandbox").annotate({
+        title: "ExternalSandboxSandboxPolicyType",
       }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
+    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ReviewStartResponse__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
-    }),
+      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
+      writableRoots: Schema.optionalKey(
+        Schema.Array(ClientRequest__AbsolutePathBuf).annotate({ default: [] }),
+      ),
+    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+).annotate({ identifier: "ClientRequest__SandboxPolicy" });
 
-export type V2ReviewStartResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ReviewStartResponse__PatchChangeKind;
-  readonly path: string;
+export type ClientRequest__ReviewStartParams = {
+  readonly delivery?: ClientRequest__ReviewDelivery | null;
+  readonly target: ClientRequest__ReviewTarget;
+  readonly threadId: string;
 };
-export const V2ReviewStartResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ReviewStartResponse__PatchChangeKind,
-  path: Schema.String,
-});
+export const ClientRequest__ReviewStartParams = Schema.Struct({
+  delivery: Schema.optionalKey(
+    Schema.Union([ClientRequest__ReviewDelivery, Schema.Null]).annotate({
+      description:
+        "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`). Detached delivery is deprecated and emits `deprecationNotice`. Use `thread/start` followed by an inline review for a separate review thread.",
+    }),
+  ),
+  target: ClientRequest__ReviewTarget,
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__ReviewStartParams" });
 
-export type V2ReviewStartResponse__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ReviewStartResponse__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ReviewStartResponse__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ReviewStartResponse__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
+export type ClientRequest__McpServerOauthLoginParams = {
+  readonly clientRegistration?: ClientRequest__McpServerOauthClientRegistration | null;
+  readonly name: string;
+  readonly scopes?: ReadonlyArray<string> | null;
+  readonly threadId?: string | null;
+  readonly timeoutSecs?: number | null;
+};
+export const ClientRequest__McpServerOauthLoginParams = Schema.Struct({
+  clientRegistration: Schema.optionalKey(
+    Schema.Union([ClientRequest__McpServerOauthClientRegistration, Schema.Null]).annotate({
+      description:
+        "Registration strategy for this login only; omission selects automatic discovery.",
+    }),
+  ),
+  name: Schema.String,
+  scopes: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  timeoutSecs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__McpServerOauthLoginParams" });
+
+export type ClientRequest__ListMcpServerStatusParams = {
+  readonly cursor?: string | null;
+  readonly detail?: ClientRequest__McpServerStatusDetail | null;
+  readonly limit?: number | null;
+  readonly serverName?: string | null;
+  readonly threadId?: string | null;
+};
+export const ClientRequest__ListMcpServerStatusParams = Schema.Struct({
+  cursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Opaque pagination cursor returned by a previous call.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  detail: Schema.optionalKey(
+    Schema.Union([ClientRequest__McpServerStatusDetail, Schema.Null]).annotate({
+      description:
+        "Controls how much MCP inventory data to fetch for each server. Defaults to `Full` when omitted.",
+    }),
+  ),
+  limit: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Optional page size; defaults to a server-defined value.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  serverName: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Limit discovery to one server. With a thread ID, reuse that thread's MCP connection.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ClientRequest__ListMcpServerStatusParams" });
+
+export type ClientRequest__McpResourceReadParams = {
+  readonly connectorId?: string | null;
+  readonly originCallId?: string | null;
+  readonly server: string;
+  readonly target?: ClientRequest__McpResourceReadTarget | null;
+  readonly threadId?: string | null;
+  readonly uri: string;
+};
+export const ClientRequest__McpResourceReadParams = Schema.Struct({
+  connectorId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  originCallId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Originating MCP tool call used to select the resource's app.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  server: Schema.String,
+  target: Schema.optionalKey(
+    Schema.Union([ClientRequest__McpResourceReadTarget, Schema.Null]).annotate({
+      description: "Explicit hosted app/account. Omit to retain legacy resource discovery.",
+    }),
+  ),
+  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  uri: Schema.String,
+}).annotate({ identifier: "ClientRequest__McpResourceReadParams" });
+
+export type ClientRequest__WindowsSandboxSetupStartParams = {
+  readonly cwd?: ClientRequest__AbsolutePathBuf | null;
+  readonly mode: ClientRequest__WindowsSandboxSetupMode;
+};
+export const ClientRequest__WindowsSandboxSetupStartParams = Schema.Struct({
+  cwd: Schema.optionalKey(Schema.Union([ClientRequest__AbsolutePathBuf, Schema.Null])),
+  mode: ClientRequest__WindowsSandboxSetupMode,
+}).annotate({ identifier: "ClientRequest__WindowsSandboxSetupStartParams" });
+
+export type ClientRequest__LoginAccountParams =
+  | { readonly apiKey: string; readonly type: "apiKey" }
+  | {
+      readonly appBrand?: ClientRequest__LoginAppBrand | null;
+      readonly codexStreamlinedLogin?: boolean;
+      readonly type: "chatgpt";
+      readonly useHostedLoginSuccessPage?: boolean;
     }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ReviewStartResponse__UserInput = Schema.Union(
+  | { readonly type: "chatgptDeviceCode" }
+  | {
+      readonly accessToken: string;
+      readonly chatgptAccountId: string;
+      readonly chatgptPlanType?: string | null;
+      readonly type: "chatgptAuthTokens";
+    }
+  | { readonly apiKey: string; readonly region: string; readonly type: "amazonBedrock" }
+  | {
+      readonly accessKeyId: string;
+      readonly region: string;
+      readonly secretAccessKey: string;
+      readonly sessionToken?: string | null;
+      readonly type: "amazonBedrockAccessKeys";
+    };
+export const ClientRequest__LoginAccountParams = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ReviewStartResponse__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
+      apiKey: Schema.String,
+      type: Schema.Literal("apiKey").annotate({ title: "ApiKeyLoginAccountParamsType" }),
+    }).annotate({ title: "ApiKeyLoginAccountParams" }),
     Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__ImageDetail, Schema.Null])),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
+      appBrand: Schema.optionalKey(Schema.Union([ClientRequest__LoginAppBrand, Schema.Null])),
+      codexStreamlinedLogin: Schema.optionalKey(Schema.Boolean),
+      type: Schema.Literal("chatgpt").annotate({ title: "ChatgptLoginAccountParamsType" }),
+      useHostedLoginSuccessPage: Schema.optionalKey(Schema.Boolean),
+    }).annotate({ title: "ChatgptLoginAccountParams" }),
     Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
+      type: Schema.Literal("chatgptDeviceCode").annotate({
+        title: "ChatgptDeviceCodeLoginAccountParamsType",
+      }),
+    }).annotate({ title: "ChatgptDeviceCodeLoginAccountParams" }),
     Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
+      accessToken: Schema.String.annotate({
+        description:
+          "Access token (JWT) supplied by the client. This token is used for backend API requests and email extraction.",
+      }),
+      chatgptAccountId: Schema.String.annotate({
+        description: "Workspace/account identifier supplied by the client.",
+      }),
+      chatgptPlanType: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Optional plan type supplied by the client.\n\nWhen `null`, Codex attempts to derive the plan type from access-token claims. If unavailable, the plan defaults to `unknown`.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("chatgptAuthTokens").annotate({
+        title: "ChatgptAuthTokensLoginAccountParamsType",
+      }),
+    }).annotate({
+      title: "ChatgptAuthTokensLoginAccountParams",
+      description:
+        "[UNSTABLE] FOR OPENAI INTERNAL USE ONLY - DO NOT USE. The access token must contain the same scopes that Codex-managed ChatGPT auth tokens have.",
+    }),
     Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
+      apiKey: Schema.String,
+      region: Schema.String,
+      type: Schema.Literal("amazonBedrock").annotate({
+        title: "AmazonBedrockLoginAccountParamsType",
+      }),
+    }).annotate({
+      title: "AmazonBedrockLoginAccountParams",
+      description: "[UNSTABLE] Managed Amazon Bedrock login is experimental.",
+    }),
     Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
+      accessKeyId: Schema.String,
+      region: Schema.String,
+      secretAccessKey: Schema.String,
+      sessionToken: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("amazonBedrockAccessKeys").annotate({
+        title: "AmazonBedrockAccessKeysLoginAccountParamsType",
+      }),
+    }).annotate({
+      title: "AmazonBedrockAccessKeysLoginAccountParams",
+      description: "[UNSTABLE] Managed Amazon Bedrock AWS access key login is experimental.",
+    }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ClientRequest__LoginAccountParams" });
 
-export type V2SkillsListResponse__SkillInterface = {
-  readonly brandColor?: string | null;
-  readonly defaultPrompt?: string | null;
-  readonly displayName?: string | null;
-  readonly iconLarge?: V2SkillsListResponse__AbsolutePathBuf | null;
-  readonly iconSmall?: V2SkillsListResponse__AbsolutePathBuf | null;
-  readonly shortDescription?: string | null;
+export type ClientRequest__SendAddCreditsNudgeEmailParams = {
+  readonly creditType: ClientRequest__AddCreditsNudgeCreditType;
 };
-export const V2SkillsListResponse__SkillInterface = Schema.Struct({
-  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  defaultPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  iconLarge: Schema.optionalKey(Schema.Union([V2SkillsListResponse__AbsolutePathBuf, Schema.Null])),
-  iconSmall: Schema.optionalKey(Schema.Union([V2SkillsListResponse__AbsolutePathBuf, Schema.Null])),
-  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+export const ClientRequest__SendAddCreditsNudgeEmailParams = Schema.Struct({
+  creditType: ClientRequest__AddCreditsNudgeCreditType,
+}).annotate({ identifier: "ClientRequest__SendAddCreditsNudgeEmailParams" });
 
-export type V2SkillsListResponse__SkillDependencies = {
-  readonly tools: ReadonlyArray<V2SkillsListResponse__SkillToolDependency>;
+export type ClientRequest__CommandExecResizeParams = {
+  readonly processId: string;
+  readonly size: ClientRequest__CommandExecTerminalSize;
 };
-export const V2SkillsListResponse__SkillDependencies = Schema.Struct({
-  tools: Schema.Array(V2SkillsListResponse__SkillToolDependency),
+export const ClientRequest__CommandExecResizeParams = Schema.Struct({
+  processId: Schema.String.annotate({
+    description:
+      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
+  }),
+  size: Schema.suspend(
+    (): Schema.Codec<ClientRequest__CommandExecTerminalSize> =>
+      ClientRequest__CommandExecTerminalSize,
+  ).annotate({ description: "New PTY size in character cells." }),
+}).annotate({
+  description: "Resize a running PTY-backed `command/exec` session.",
+  identifier: "ClientRequest__CommandExecResizeParams",
 });
 
-export type V2ThreadForkResponse__CommandAction =
+export type ClientRequest__MigrationDetails = {
+  readonly commands?: ReadonlyArray<ClientRequest__CommandMigration>;
+  readonly hooks?: ReadonlyArray<ClientRequest__HookMigration>;
+  readonly mcpServers?: ReadonlyArray<ClientRequest__McpServerMigration>;
+  readonly memory?: ReadonlyArray<string>;
+  readonly plugins?: ReadonlyArray<ClientRequest__PluginsMigration>;
+  readonly sessions?: ReadonlyArray<ClientRequest__SessionMigration>;
+  readonly skills?: ReadonlyArray<ClientRequest__SkillMigration>;
+  readonly subagents?: ReadonlyArray<ClientRequest__SubagentMigration>;
+};
+export const ClientRequest__MigrationDetails = Schema.Struct({
+  commands: Schema.optionalKey(
+    Schema.Array(ClientRequest__CommandMigration).annotate({ default: [] }),
+  ),
+  hooks: Schema.optionalKey(Schema.Array(ClientRequest__HookMigration).annotate({ default: [] })),
+  mcpServers: Schema.optionalKey(
+    Schema.Array(ClientRequest__McpServerMigration).annotate({ default: [] }),
+  ),
+  memory: Schema.optionalKey(Schema.Array(Schema.String)),
+  plugins: Schema.optionalKey(
+    Schema.Array(ClientRequest__PluginsMigration).annotate({ default: [] }),
+  ),
+  sessions: Schema.optionalKey(
+    Schema.Array(ClientRequest__SessionMigration).annotate({ default: [] }),
+  ),
+  skills: Schema.optionalKey(Schema.Array(ClientRequest__SkillMigration).annotate({ default: [] })),
+  subagents: Schema.optionalKey(
+    Schema.Array(ClientRequest__SubagentMigration).annotate({ default: [] }),
+  ),
+}).annotate({ identifier: "ClientRequest__MigrationDetails" });
+
+export type ClientRequest__ExternalAgentConfigImportItemTypeFailure = {
+  readonly cwd?: string | null;
+  readonly errorType?: string | null;
+  readonly failureStage: string;
+  readonly itemType: ClientRequest__ExternalAgentConfigMigrationItemType;
+  readonly message: string;
+  readonly source?: string | null;
+  readonly subErrorType?: string | null;
+};
+export const ClientRequest__ExternalAgentConfigImportItemTypeFailure = Schema.Struct({
+  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  failureStage: Schema.String,
+  itemType: ClientRequest__ExternalAgentConfigMigrationItemType,
+  message: Schema.String,
+  source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ClientRequest__ExternalAgentConfigImportItemTypeFailure" });
+
+export type ClientRequest__ExternalAgentConfigImportHistoryRecordSuccessParams = {
+  readonly cwd?: string | null;
+  readonly itemType: ClientRequest__ExternalAgentConfigMigrationItemType;
+  readonly source?: string | null;
+  readonly target?: string | null;
+  readonly title?: string | null;
+};
+export const ClientRequest__ExternalAgentConfigImportHistoryRecordSuccessParams = Schema.Struct({
+  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  itemType: ClientRequest__ExternalAgentConfigMigrationItemType,
+  source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  title: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Original title for an imported session, when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__ExternalAgentConfigImportHistoryRecordSuccessParams" });
+
+export type ClientRequest__ConfigValueWriteParams = {
+  readonly expectedVersion?: string | null;
+  readonly filePath?: string | null;
+  readonly keyPath: string;
+  readonly mergeStrategy: ClientRequest__MergeStrategy;
+  readonly value: Schema.Json;
+};
+export const ClientRequest__ConfigValueWriteParams = Schema.Struct({
+  expectedVersion: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  filePath: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Path to the config file to write; defaults to the user's `config.toml` when omitted.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  keyPath: Schema.String,
+  mergeStrategy: ClientRequest__MergeStrategy,
+  value: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({ identifier: "ClientRequest__ConfigValueWriteParams" });
+
+export type ClientRequest__ConfigEdit = {
+  readonly keyPath: string;
+  readonly mergeStrategy: ClientRequest__MergeStrategy;
+  readonly value: Schema.Json;
+};
+export const ClientRequest__ConfigEdit = Schema.Struct({
+  keyPath: Schema.String,
+  mergeStrategy: ClientRequest__MergeStrategy,
+  value: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({ identifier: "ClientRequest__ConfigEdit" });
+
+export type CommandExecutionRequestApprovalParams__CommandAction =
   | {
       readonly command: string;
       readonly name: string;
-      readonly path: V2ThreadForkResponse__AbsolutePathBuf;
+      readonly path: CommandExecutionRequestApprovalParams__LegacyAppPathString;
       readonly type: "read";
     }
   | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
@@ -15891,12 +17376,12 @@ export type V2ThreadForkResponse__CommandAction =
       readonly type: "search";
     }
   | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadForkResponse__CommandAction = Schema.Union(
+export const CommandExecutionRequestApprovalParams__CommandAction = Schema.Union(
   [
     Schema.Struct({
       command: Schema.String,
       name: Schema.String,
-      path: V2ThreadForkResponse__AbsolutePathBuf,
+      path: CommandExecutionRequestApprovalParams__LegacyAppPathString,
       type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
     }).annotate({ title: "ReadCommandAction" }),
     Schema.Struct({
@@ -15916,383 +17401,473 @@ export const V2ThreadForkResponse__CommandAction = Schema.Union(
     }).annotate({ title: "UnknownCommandAction" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadForkResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadForkResponse__CollabAgentStatus;
-};
-export const V2ThreadForkResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadForkResponse__CollabAgentStatus,
-});
-
-export type V2ThreadForkResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadForkResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const V2ThreadForkResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadForkResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+).annotate({ identifier: "CommandExecutionRequestApprovalParams__CommandAction" });
 
-export type V2ThreadForkResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "rateLimitExceeded"
-  | "misalignmentPolicyViolation"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type CommandExecutionRequestApprovalParams__FileSystemSpecialPath =
+  | { readonly kind: "root" }
+  | { readonly kind: "minimal" }
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadForkResponse__NonSteerableTurnKind;
-      };
+      readonly kind: "project_roots";
+      readonly subpath?: CommandExecutionRequestApprovalParams__LegacyAppPathString | null;
+    }
+  | { readonly kind: "tmpdir" }
+  | { readonly kind: "slash_tmp" }
+  | {
+      readonly kind: "unknown";
+      readonly path: string;
+      readonly subpath?: CommandExecutionRequestApprovalParams__LegacyAppPathString | null;
     };
-export const V2ThreadForkResponse__CodexErrorInfo = Schema.Union(
+export const CommandExecutionRequestApprovalParams__FileSystemSpecialPath = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "rateLimitExceeded",
-      "misalignmentPolicyViolation",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
+    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
+      title: "RootFileSystemSpecialPath",
     }),
-    Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
+    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
+      title: "MinimalFileSystemSpecialPath",
     }),
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
+      kind: Schema.Literal("project_roots"),
+      subpath: Schema.optionalKey(
+        Schema.Union([CommandExecutionRequestApprovalParams__LegacyAppPathString, Schema.Null]),
+      ),
+    }).annotate({ title: "KindFileSystemSpecialPath" }),
+    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
+      title: "TmpdirFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
+      title: "SlashTmpFileSystemSpecialPath",
     }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadForkResponse__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+      kind: Schema.Literal("unknown"),
+      path: Schema.String,
+      subpath: Schema.optionalKey(
+        Schema.Union([CommandExecutionRequestApprovalParams__LegacyAppPathString, Schema.Null]),
+      ),
     }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+).annotate({ identifier: "CommandExecutionRequestApprovalParams__FileSystemSpecialPath" });
 
-export type V2ThreadForkResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadForkResponse__PatchChangeKind;
-  readonly path: string;
+export type CommandExecutionRequestApprovalParams__NetworkApprovalContext = {
+  readonly host: string;
+  readonly protocol: CommandExecutionRequestApprovalParams__NetworkApprovalProtocol;
 };
-export const V2ThreadForkResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadForkResponse__PatchChangeKind,
-  path: Schema.String,
-});
+export const CommandExecutionRequestApprovalParams__NetworkApprovalContext = Schema.Struct({
+  host: Schema.String,
+  protocol: CommandExecutionRequestApprovalParams__NetworkApprovalProtocol,
+}).annotate({ identifier: "CommandExecutionRequestApprovalParams__NetworkApprovalContext" });
 
-export type V2ThreadForkResponse__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadForkResponse__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ThreadForkResponse__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ThreadForkResponse__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadForkResponse__UserInput = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadForkResponse__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__ImageDetail, Schema.Null])),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
+export type CommandExecutionRequestApprovalParams__NetworkPolicyAmendment = {
+  readonly action: CommandExecutionRequestApprovalParams__NetworkPolicyRuleAction;
+  readonly host: string;
+};
+export const CommandExecutionRequestApprovalParams__NetworkPolicyAmendment = Schema.Struct({
+  action: CommandExecutionRequestApprovalParams__NetworkPolicyRuleAction,
+  host: Schema.String,
+}).annotate({ identifier: "CommandExecutionRequestApprovalParams__NetworkPolicyAmendment" });
 
-export type V2ThreadForkResponse__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadForkResponse__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadForkResponse__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadForkResponse__SubAgentSource = Schema.Union(
-  [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadForkResponse__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadForkResponse__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
-  ],
-  { mode: "oneOf" },
-);
+export type CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment = {
+  readonly action: CommandExecutionRequestApprovalResponse__NetworkPolicyRuleAction;
+  readonly host: string;
+};
+export const CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment = Schema.Struct({
+  action: CommandExecutionRequestApprovalResponse__NetworkPolicyRuleAction,
+  host: Schema.String,
+}).annotate({ identifier: "CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment" });
 
-export type V2ThreadGoalGetResponse__ThreadGoal = {
-  readonly createdAt: number;
-  readonly objective: string;
-  readonly status: V2ThreadGoalGetResponse__ThreadGoalStatus;
-  readonly threadId: string;
-  readonly timeUsedSeconds: number;
-  readonly tokenBudget?: number | null;
-  readonly tokensUsed: number;
-  readonly updatedAt: number;
+export type ExecCommandApprovalResponse__NetworkPolicyAmendment = {
+  readonly action: ExecCommandApprovalResponse__NetworkPolicyRuleAction;
+  readonly host: string;
 };
-export const V2ThreadGoalGetResponse__ThreadGoal = Schema.Struct({
-  createdAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  objective: Schema.String,
-  status: V2ThreadGoalGetResponse__ThreadGoalStatus,
-  threadId: Schema.String,
-  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  tokenBudget: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+export const ExecCommandApprovalResponse__NetworkPolicyAmendment = Schema.Struct({
+  action: ExecCommandApprovalResponse__NetworkPolicyRuleAction,
+  host: Schema.String,
+}).annotate({ identifier: "ExecCommandApprovalResponse__NetworkPolicyAmendment" });
+
+export type FuzzyFileSearchResponse__FuzzyFileSearchResult = {
+  readonly file_name: string;
+  readonly indices?: ReadonlyArray<number> | null;
+  readonly match_type: FuzzyFileSearchResponse__FuzzyFileSearchMatchType;
+  readonly path: string;
+  readonly root: string;
+  readonly score: number;
+};
+export const FuzzyFileSearchResponse__FuzzyFileSearchResult = Schema.Struct({
+  file_name: Schema.String,
+  indices: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(
+        Schema.Number.annotate({ format: "uint32" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+      ),
+      Schema.Null,
+    ]),
   ),
-  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  updatedAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  match_type: FuzzyFileSearchResponse__FuzzyFileSearchMatchType,
+  path: Schema.String,
+  root: Schema.String,
+  score: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({
+  description: "Superset of [`codex_file_search::FileMatch`]",
+  identifier: "FuzzyFileSearchResponse__FuzzyFileSearchResult",
 });
 
-export type V2ThreadGoalSetResponse__ThreadGoal = {
-  readonly createdAt: number;
-  readonly objective: string;
-  readonly status: V2ThreadGoalSetResponse__ThreadGoalStatus;
-  readonly threadId: string;
-  readonly timeUsedSeconds: number;
-  readonly tokenBudget?: number | null;
-  readonly tokensUsed: number;
-  readonly updatedAt: number;
+export type FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchResult = {
+  readonly file_name: string;
+  readonly indices?: ReadonlyArray<number> | null;
+  readonly match_type: FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType;
+  readonly path: string;
+  readonly root: string;
+  readonly score: number;
 };
-export const V2ThreadGoalSetResponse__ThreadGoal = Schema.Struct({
-  createdAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  objective: Schema.String,
-  status: V2ThreadGoalSetResponse__ThreadGoalStatus,
-  threadId: Schema.String,
-  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  tokenBudget: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+export const FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchResult = Schema.Struct({
+  file_name: Schema.String,
+  indices: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(
+        Schema.Number.annotate({ format: "uint32" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+      ),
+      Schema.Null,
+    ]),
   ),
-  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  updatedAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  match_type: FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchMatchType,
+  path: Schema.String,
+  root: Schema.String,
+  score: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({
+  description: "Superset of [`codex_file_search::FileMatch`]",
+  identifier: "FuzzyFileSearchSessionUpdatedNotification__FuzzyFileSearchResult",
 });
 
-export type V2ThreadGoalUpdatedNotification__ThreadGoal = {
-  readonly createdAt: number;
-  readonly objective: string;
-  readonly status: V2ThreadGoalUpdatedNotification__ThreadGoalStatus;
-  readonly threadId: string;
-  readonly timeUsedSeconds: number;
-  readonly tokenBudget?: number | null;
-  readonly tokensUsed: number;
-  readonly updatedAt: number;
+export type JSONRPCMessage__JSONRPCResponse = {
+  readonly id: JSONRPCMessage__RequestId;
+  readonly result: Schema.Json;
 };
-export const V2ThreadGoalUpdatedNotification__ThreadGoal = Schema.Struct({
-  createdAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  objective: Schema.String,
-  status: V2ThreadGoalUpdatedNotification__ThreadGoalStatus,
-  threadId: Schema.String,
-  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  tokenBudget: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+export const JSONRPCMessage__JSONRPCResponse = Schema.Struct({
+  id: JSONRPCMessage__RequestId,
+  result: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({
+  description: "A successful (non-error) response to a request.",
+  identifier: "JSONRPCMessage__JSONRPCResponse",
+});
+
+export type JSONRPCMessage__JSONRPCRequest = {
+  readonly id: JSONRPCMessage__RequestId;
+  readonly method: string;
+  readonly params?: Schema.Json;
+  readonly trace?: JSONRPCMessage__W3cTraceContext | null;
+};
+export const JSONRPCMessage__JSONRPCRequest = Schema.Struct({
+  id: JSONRPCMessage__RequestId,
+  method: Schema.String,
+  params: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  trace: Schema.optionalKey(
+    Schema.Union([JSONRPCMessage__W3cTraceContext, Schema.Null]).annotate({
+      description: "Optional W3C Trace Context for distributed tracing.",
+    }),
   ),
-  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  updatedAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+}).annotate({
+  description: "A request that expects a response.",
+  identifier: "JSONRPCMessage__JSONRPCRequest",
 });
 
-export type V2ThreadListResponse__CommandAction =
+export type JSONRPCMessage__JSONRPCError = {
+  readonly error: JSONRPCMessage__JSONRPCErrorError;
+  readonly id: JSONRPCMessage__RequestId;
+};
+export const JSONRPCMessage__JSONRPCError = Schema.Struct({
+  error: JSONRPCMessage__JSONRPCErrorError,
+  id: JSONRPCMessage__RequestId,
+}).annotate({
+  description: "A response to a request that indicates an error occurred.",
+  identifier: "JSONRPCMessage__JSONRPCError",
+});
+
+export type McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly enum: ReadonlyArray<string>;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
+};
+export const McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema =
+  Schema.Struct({
+    default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    enum: Schema.Array(Schema.String),
+    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    type: McpServerElicitationRequestParams__McpElicitationStringType,
+  }).annotate({
+    identifier: "McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema",
+  });
+
+export type McpServerElicitationRequestParams__McpElicitationUntitledEnumItems = {
+  readonly enum: ReadonlyArray<string>;
+  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
+};
+export const McpServerElicitationRequestParams__McpElicitationUntitledEnumItems = Schema.Struct({
+  enum: Schema.Array(Schema.String),
+  type: McpServerElicitationRequestParams__McpElicitationStringType,
+}).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationUntitledEnumItems" });
+
+export type McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly enum: ReadonlyArray<string>;
+  readonly enumNames?: ReadonlyArray<string> | null;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
+};
+export const McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema =
+  Schema.Struct({
+    default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    enum: Schema.Array(Schema.String),
+    enumNames: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    type: McpServerElicitationRequestParams__McpElicitationStringType,
+  }).annotate({
+    identifier: "McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema",
+  });
+
+export type McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly oneOf: ReadonlyArray<McpServerElicitationRequestParams__McpElicitationConstOption>;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
+};
+export const McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema =
+  Schema.Struct({
+    default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    oneOf: Schema.Array(McpServerElicitationRequestParams__McpElicitationConstOption),
+    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    type: McpServerElicitationRequestParams__McpElicitationStringType,
+  }).annotate({
+    identifier: "McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema",
+  });
+
+export type McpServerElicitationRequestParams__McpElicitationTitledEnumItems = {
+  readonly anyOf: ReadonlyArray<McpServerElicitationRequestParams__McpElicitationConstOption>;
+};
+export const McpServerElicitationRequestParams__McpElicitationTitledEnumItems = Schema.Struct({
+  anyOf: Schema.Array(McpServerElicitationRequestParams__McpElicitationConstOption),
+}).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationTitledEnumItems" });
+
+export type McpServerElicitationRequestParams__McpElicitationStringSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly format?: McpServerElicitationRequestParams__McpElicitationStringFormat | null;
+  readonly maxLength?: number | null;
+  readonly minLength?: number | null;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationStringType;
+};
+export const McpServerElicitationRequestParams__McpElicitationStringSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  format: Schema.optionalKey(
+    Schema.Union([McpServerElicitationRequestParams__McpElicitationStringFormat, Schema.Null]),
+  ),
+  maxLength: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  minLength: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: McpServerElicitationRequestParams__McpElicitationStringType,
+}).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationStringSchema" });
+
+export type McpServerElicitationRequestParams__McpElicitationNumberSchema = {
+  readonly default?: number | null;
+  readonly description?: string | null;
+  readonly maximum?: number | null;
+  readonly minimum?: number | null;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationNumberType;
+};
+export const McpServerElicitationRequestParams__McpElicitationNumberSchema = Schema.Struct({
+  default: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "double" }).check(
+        Schema.isFinite().annotate({ expected: "a finite number" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  maximum: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "double" }).check(
+        Schema.isFinite().annotate({ expected: "a finite number" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  minimum: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "double" }).check(
+        Schema.isFinite().annotate({ expected: "a finite number" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: McpServerElicitationRequestParams__McpElicitationNumberType,
+}).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationNumberSchema" });
+
+export type McpServerElicitationRequestParams__McpElicitationBooleanSchema = {
+  readonly default?: boolean | null;
+  readonly description?: string | null;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationBooleanType;
+};
+export const McpServerElicitationRequestParams__McpElicitationBooleanSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: McpServerElicitationRequestParams__McpElicitationBooleanType,
+}).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationBooleanSchema" });
+
+export type PermissionsRequestApprovalParams__FileSystemSpecialPath =
+  | { readonly kind: "root" }
+  | { readonly kind: "minimal" }
   | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ThreadListResponse__AbsolutePathBuf;
-      readonly type: "read";
+      readonly kind: "project_roots";
+      readonly subpath?: PermissionsRequestApprovalParams__LegacyAppPathString | null;
     }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | { readonly kind: "tmpdir" }
+  | { readonly kind: "slash_tmp" }
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadListResponse__CommandAction = Schema.Union(
+      readonly kind: "unknown";
+      readonly path: string;
+      readonly subpath?: PermissionsRequestApprovalParams__LegacyAppPathString | null;
+    };
+export const PermissionsRequestApprovalParams__FileSystemSpecialPath = Schema.Union(
   [
+    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
+      title: "RootFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
+      title: "MinimalFileSystemSpecialPath",
+    }),
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ThreadListResponse__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      kind: Schema.Literal("project_roots"),
+      subpath: Schema.optionalKey(
+        Schema.Union([PermissionsRequestApprovalParams__LegacyAppPathString, Schema.Null]),
+      ),
+    }).annotate({ title: "KindFileSystemSpecialPath" }),
+    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
+      title: "TmpdirFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
+      title: "SlashTmpFileSystemSpecialPath",
+    }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      kind: Schema.Literal("unknown"),
+      path: Schema.String,
+      subpath: Schema.optionalKey(
+        Schema.Union([PermissionsRequestApprovalParams__LegacyAppPathString, Schema.Null]),
+      ),
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "PermissionsRequestApprovalParams__FileSystemSpecialPath" });
+
+export type PermissionsRequestApprovalResponse__FileSystemSpecialPath =
+  | { readonly kind: "root" }
+  | { readonly kind: "minimal" }
+  | {
+      readonly kind: "project_roots";
+      readonly subpath?: PermissionsRequestApprovalResponse__LegacyAppPathString | null;
+    }
+  | { readonly kind: "tmpdir" }
+  | { readonly kind: "slash_tmp" }
+  | {
+      readonly kind: "unknown";
+      readonly path: string;
+      readonly subpath?: PermissionsRequestApprovalResponse__LegacyAppPathString | null;
+    };
+export const PermissionsRequestApprovalResponse__FileSystemSpecialPath = Schema.Union(
+  [
+    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
+      title: "RootFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
+      title: "MinimalFileSystemSpecialPath",
+    }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      kind: Schema.Literal("project_roots"),
+      subpath: Schema.optionalKey(
+        Schema.Union([PermissionsRequestApprovalResponse__LegacyAppPathString, Schema.Null]),
+      ),
+    }).annotate({ title: "KindFileSystemSpecialPath" }),
+    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
+      title: "TmpdirFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
+      title: "SlashTmpFileSystemSpecialPath",
+    }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      kind: Schema.Literal("unknown"),
+      path: Schema.String,
+      subpath: Schema.optionalKey(
+        Schema.Union([PermissionsRequestApprovalResponse__LegacyAppPathString, Schema.Null]),
+      ),
+    }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadListResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadListResponse__CollabAgentStatus;
-};
-export const V2ThreadListResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadListResponse__CollabAgentStatus,
-});
-
-export type V2ThreadListResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadListResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const V2ThreadListResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadListResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+).annotate({ identifier: "PermissionsRequestApprovalResponse__FileSystemSpecialPath" });
 
-export type V2ThreadListResponse__CodexErrorInfo =
+export type ServerNotification__CodexErrorInfo =
   | "contextWindowExceeded"
   | "sessionBudgetExceeded"
   | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
   | "serverOverloaded"
   | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
   | "internalServerError"
   | "unauthorized"
   | "badRequest"
@@ -16305,17 +17880,21 @@ export type V2ThreadListResponse__CodexErrorInfo =
   | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
   | {
       readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadListResponse__NonSteerableTurnKind;
+        readonly turnKind: ServerNotification__NonSteerableTurnKind;
       };
     };
-export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
+export const ServerNotification__CodexErrorInfo = Schema.Union(
   [
     Schema.Literals([
       "contextWindowExceeded",
       "sessionBudgetExceeded",
       "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
       "serverOverloaded",
       "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
       "internalServerError",
       "unauthorized",
       "badRequest",
@@ -16328,8 +17907,12 @@ export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -16340,8 +17923,12 @@ export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -16355,8 +17942,12 @@ export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -16371,8 +17962,12 @@ export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -16382,9 +17977,7 @@ export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
       description: "Reached the retry limit for responses.",
     }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadListResponse__NonSteerableTurnKind,
-      }),
+      activeTurnNotSteerable: Schema.Struct({ turnKind: ServerNotification__NonSteerableTurnKind }),
     }).annotate({
       title: "ActiveTurnNotSteerableCodexErrorInfo",
       description:
@@ -16395,403 +17988,243 @@ export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
 ).annotate({
   description:
     "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "ServerNotification__CodexErrorInfo",
 });
 
-export type V2ThreadListResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadListResponse__PatchChangeKind;
-  readonly path: string;
+export type ServerNotification__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: ServerNotification__MisalignmentSteer | null;
 };
-export const V2ThreadListResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadListResponse__PatchChangeKind,
-  path: Schema.String,
-});
-
-export type V2ThreadListResponse__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadListResponse__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ThreadListResponse__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ThreadListResponse__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadListResponse__UserInput = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadListResponse__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadListResponse__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadListResponse__ImageDetail, Schema.Null])),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
+export const ServerNotification__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([ServerNotification__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "ServerNotification__MisalignmentErrorDetails" });
 
-export type V2ThreadListResponse__SubAgentSource =
+export type ServerNotification__FsChangedNotification = {
+  readonly changedPaths: ReadonlyArray<ServerNotification__AbsolutePathBuf>;
+  readonly watchId: string;
+};
+export const ServerNotification__FsChangedNotification = Schema.Struct({
+  changedPaths: Schema.Array(ServerNotification__AbsolutePathBuf).annotate({
+    description: "File or directory paths associated with this event.",
+  }),
+  watchId: Schema.String.annotate({
+    description: "Watch identifier previously provided to `fs/watch`.",
+  }),
+}).annotate({
+  description: "Filesystem watch notification emitted for `fs/watch` subscribers.",
+  identifier: "ServerNotification__FsChangedNotification",
+});
+
+export type ServerNotification__Settings = {
+  readonly developer_instructions?: string | null;
+  readonly model: string;
+  readonly reasoning_effort?: ServerNotification__ReasoningEffort | null;
+};
+export const ServerNotification__Settings = Schema.Struct({
+  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  model: Schema.String,
+  reasoning_effort: Schema.optionalKey(
+    Schema.Union([ServerNotification__ReasoningEffort, Schema.Null]),
+  ),
+}).annotate({
+  description: "Settings for a collaboration mode.",
+  identifier: "ServerNotification__Settings",
+});
+
+export type ServerNotification__ThreadSection = {
+  readonly appearance?: ServerNotification__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const ServerNotification__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([ServerNotification__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "ServerNotification__ThreadSection",
+});
+
+export type ServerNotification__SubAgentSource =
   | "review"
   | "compact"
   | "memory_consolidation"
   | {
       readonly thread_spawn: {
         readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadListResponse__AgentPath | null;
+        readonly agent_path?: ServerNotification__AgentPath | null;
         readonly agent_role?: string | null;
         readonly depth: number;
-        readonly parent_thread_id: V2ThreadListResponse__ThreadId;
+        readonly parent_thread_id: ServerNotification__ThreadId;
       };
     }
   | { readonly other: string };
-export const V2ThreadListResponse__SubAgentSource = Schema.Union(
+export const ServerNotification__SubAgentSource = Schema.Union(
   [
     Schema.Literals(["review", "compact", "memory_consolidation"]),
     Schema.Struct({
       thread_spawn: Schema.Struct({
         agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadListResponse__AgentPath, Schema.Null]),
-        ),
+        agent_path: Schema.optionalKey(Schema.Union([ServerNotification__AgentPath, Schema.Null])),
         agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadListResponse__ThreadId,
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: ServerNotification__ThreadId,
       }),
     }).annotate({ title: "ThreadSpawnSubAgentSource" }),
     Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ServerNotification__SubAgentSource" });
 
-export type V2ThreadMetadataUpdateResponse__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ThreadMetadataUpdateResponse__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+export type ServerNotification__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadMetadataUpdateResponse__CommandAction = Schema.Union(
+      readonly activeFlags: ReadonlyArray<ServerNotification__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const ServerNotification__ThreadStatus = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ThreadMetadataUpdateResponse__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      activeFlags: Schema.Array(ServerNotification__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadMetadataUpdateResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadMetadataUpdateResponse__CollabAgentStatus;
-};
-export const V2ThreadMetadataUpdateResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadMetadataUpdateResponse__CollabAgentStatus,
-});
+).annotate({ identifier: "ServerNotification__ThreadStatus" });
 
-export type V2ThreadMetadataUpdateResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadMetadataUpdateResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type ServerNotification__TextElement = {
+  readonly byteRange: ServerNotification__ByteRange;
+  readonly placeholder?: string | null;
 };
-export const V2ThreadMetadataUpdateResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadMetadataUpdateResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+export const ServerNotification__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<ServerNotification__ByteRange> => ServerNotification__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerNotification__TextElement" });
 
-export type V2ThreadMetadataUpdateResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type ServerNotification__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadMetadataUpdateResponse__NonSteerableTurnKind;
-      };
-    };
-export const V2ThreadMetadataUpdateResponse__CodexErrorInfo = Schema.Union(
+      readonly detail?: ServerNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: ServerNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const ServerNotification__FunctionCallOutputContentItem = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
     Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
       }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ServerNotification__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ServerNotification__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
       }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadMetadataUpdateResponse__NonSteerableTurnKind,
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
       }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
-    }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
   ],
   { mode: "oneOf" },
 ).annotate({
   description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "ServerNotification__FunctionCallOutputContentItem",
 });
 
-export type V2ThreadMetadataUpdateResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadMetadataUpdateResponse__PatchChangeKind;
-  readonly path: string;
+export type ServerNotification__MemoryCitation = {
+  readonly entries: ReadonlyArray<ServerNotification__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
 };
-export const V2ThreadMetadataUpdateResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadMetadataUpdateResponse__PatchChangeKind,
-  path: Schema.String,
-});
-
-export type V2ThreadMetadataUpdateResponse__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadMetadataUpdateResponse__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ThreadMetadataUpdateResponse__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ThreadMetadataUpdateResponse__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadMetadataUpdateResponse__UserInput = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadMetadataUpdateResponse__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__ImageDetail, Schema.Null]),
-      ),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadMetadataUpdateResponse__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadMetadataUpdateResponse__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadMetadataUpdateResponse__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadMetadataUpdateResponse__SubAgentSource = Schema.Union(
-  [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadMetadataUpdateResponse__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadMetadataUpdateResponse__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
-  ],
-  { mode: "oneOf" },
-);
+export const ServerNotification__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(ServerNotification__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "ServerNotification__MemoryCitation" });
 
-export type V2ThreadReadResponse__CommandAction =
+export type ServerNotification__CommandAction =
   | {
       readonly command: string;
       readonly name: string;
-      readonly path: V2ThreadReadResponse__AbsolutePathBuf;
+      readonly path: ServerNotification__LegacyAppPathString;
       readonly type: "read";
     }
   | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
@@ -16802,12 +18235,12 @@ export type V2ThreadReadResponse__CommandAction =
       readonly type: "search";
     }
   | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadReadResponse__CommandAction = Schema.Union(
+export const ServerNotification__CommandAction = Schema.Union(
   [
     Schema.Struct({
       command: Schema.String,
       name: Schema.String,
-      path: V2ThreadReadResponse__AbsolutePathBuf,
+      path: ServerNotification__LegacyAppPathString,
       type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
     }).annotate({ title: "ReadCommandAction" }),
     Schema.Struct({
@@ -16827,328 +18260,693 @@ export const V2ThreadReadResponse__CommandAction = Schema.Union(
     }).annotate({ title: "UnknownCommandAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ServerNotification__CommandAction" });
 
-export type V2ThreadReadResponse__CollabAgentState = {
+export type ServerNotification__FileSystemSpecialPath =
+  | { readonly kind: "root" }
+  | { readonly kind: "minimal" }
+  | {
+      readonly kind: "project_roots";
+      readonly subpath?: ServerNotification__LegacyAppPathString | null;
+    }
+  | { readonly kind: "tmpdir" }
+  | { readonly kind: "slash_tmp" }
+  | {
+      readonly kind: "unknown";
+      readonly path: string;
+      readonly subpath?: ServerNotification__LegacyAppPathString | null;
+    };
+export const ServerNotification__FileSystemSpecialPath = Schema.Union(
+  [
+    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
+      title: "RootFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
+      title: "MinimalFileSystemSpecialPath",
+    }),
+    Schema.Struct({
+      kind: Schema.Literal("project_roots"),
+      subpath: Schema.optionalKey(
+        Schema.Union([ServerNotification__LegacyAppPathString, Schema.Null]),
+      ),
+    }).annotate({ title: "KindFileSystemSpecialPath" }),
+    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
+      title: "TmpdirFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
+      title: "SlashTmpFileSystemSpecialPath",
+    }),
+    Schema.Struct({
+      kind: Schema.Literal("unknown"),
+      path: Schema.String,
+      subpath: Schema.optionalKey(
+        Schema.Union([ServerNotification__LegacyAppPathString, Schema.Null]),
+      ),
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__FileSystemSpecialPath" });
+
+export type ServerNotification__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: ServerNotification__PatchChangeKind;
+  readonly path: string;
+};
+export const ServerNotification__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: ServerNotification__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "ServerNotification__FileUpdateChange" });
+
+export type ServerNotification__McpAppUi = {
+  readonly preferredModelDisplayMode: ServerNotification__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const ServerNotification__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: ServerNotification__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "ServerNotification__McpAppUi",
+});
+
+export type ServerNotification__CollabAgentState = {
   readonly message?: string | null;
-  readonly status: V2ThreadReadResponse__CollabAgentStatus;
+  readonly status: ServerNotification__CollabAgentStatus;
 };
-export const V2ThreadReadResponse__CollabAgentState = Schema.Struct({
+export const ServerNotification__CollabAgentState = Schema.Struct({
   message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadReadResponse__CollabAgentStatus,
-});
+  status: ServerNotification__CollabAgentStatus,
+}).annotate({ identifier: "ServerNotification__CollabAgentState" });
 
-export type V2ThreadReadResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadReadResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type ServerNotification__ThreadAttachmentUpdatedNotification = {
+  readonly attachmentId: string;
+  readonly attachmentType: string;
+  readonly identityKey: string;
+  readonly operation: ServerNotification__ThreadAttachmentOperation;
+  readonly threadId: string;
 };
-export const V2ThreadReadResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadReadResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
+export const ServerNotification__ThreadAttachmentUpdatedNotification = Schema.Struct({
+  attachmentId: Schema.String,
+  attachmentType: Schema.String,
+  identityKey: Schema.String,
+  operation: ServerNotification__ThreadAttachmentOperation,
+  threadId: Schema.String,
+}).annotate({
+  description: "Notification published after a thread attachment is created or deleted.",
+  identifier: "ServerNotification__ThreadAttachmentUpdatedNotification",
 });
 
-export type V2ThreadReadResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "rateLimitExceeded"
-  | "misalignmentPolicyViolation"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type ServerNotification__ThreadGoal = {
+  readonly createdAt: number;
+  readonly objective: string;
+  readonly status: ServerNotification__ThreadGoalStatus;
+  readonly threadId: string;
+  readonly timeUsedSeconds: number;
+  readonly tokenBudget?: number | null;
+  readonly tokensUsed: number;
+  readonly updatedAt: number;
+};
+export const ServerNotification__ThreadGoal = Schema.Struct({
+  createdAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  objective: Schema.String,
+  status: ServerNotification__ThreadGoalStatus,
+  threadId: Schema.String,
+  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  tokenBudget: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  updatedAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "ServerNotification__ThreadGoal" });
+
+export type ServerNotification__ProjectChangedNotification = {
+  readonly changeType: ServerNotification__ProjectChangeType;
+  readonly projectId: string;
+};
+export const ServerNotification__ProjectChangedNotification = Schema.Struct({
+  changeType: ServerNotification__ProjectChangeType,
+  projectId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ProjectChangedNotification" });
+
+export type ServerNotification__SandboxPolicy =
+  | { readonly type: "dangerFullAccess" }
+  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
+  | { readonly networkAccess?: ServerNotification__NetworkAccess; readonly type: "externalSandbox" }
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadReadResponse__NonSteerableTurnKind;
-      };
+      readonly excludeSlashTmp?: boolean;
+      readonly excludeTmpdirEnvVar?: boolean;
+      readonly networkAccess?: boolean;
+      readonly type: "workspaceWrite";
+      readonly writableRoots?: ReadonlyArray<ServerNotification__AbsolutePathBuf>;
     };
-export const V2ThreadReadResponse__CodexErrorInfo = Schema.Union(
+export const ServerNotification__SandboxPolicy = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "rateLimitExceeded",
-      "misalignmentPolicyViolation",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
     Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      type: Schema.Literal("dangerFullAccess").annotate({
+        title: "DangerFullAccessSandboxPolicyType",
       }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
+    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
     Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
+    }).annotate({ title: "ReadOnlySandboxPolicy" }),
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      networkAccess: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<ServerNotification__NetworkAccess> => ServerNotification__NetworkAccess,
+        ).annotate({ default: "restricted" }),
+      ),
+      type: Schema.Literal("externalSandbox").annotate({
+        title: "ExternalSandboxSandboxPolicyType",
       }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
+    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadReadResponse__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
-    }),
+      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
+      writableRoots: Schema.optionalKey(
+        Schema.Array(ServerNotification__AbsolutePathBuf).annotate({ default: [] }),
+      ),
+    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
   ],
   { mode: "oneOf" },
-).annotate({
+).annotate({ identifier: "ServerNotification__SandboxPolicy" });
+
+export type ServerNotification__ThreadTokenUsage = {
+  readonly last: ServerNotification__TokenUsageBreakdown;
+  readonly modelContextWindow?: number | null;
+  readonly total: ServerNotification__TokenUsageBreakdown;
+};
+export const ServerNotification__ThreadTokenUsage = Schema.Struct({
+  last: ServerNotification__TokenUsageBreakdown,
+  modelContextWindow: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  total: ServerNotification__TokenUsageBreakdown,
+}).annotate({ identifier: "ServerNotification__ThreadTokenUsage" });
+
+export type ServerNotification__HookOutputEntry = {
+  readonly kind: ServerNotification__HookOutputEntryKind;
+  readonly text: string;
+};
+export const ServerNotification__HookOutputEntry = Schema.Struct({
+  kind: ServerNotification__HookOutputEntryKind,
+  text: Schema.String,
+}).annotate({ identifier: "ServerNotification__HookOutputEntry" });
+
+export type ServerNotification__TurnPlanStep = {
+  readonly status: ServerNotification__TurnPlanStepStatus;
+  readonly step: string;
+};
+export const ServerNotification__TurnPlanStep = Schema.Struct({
+  status: ServerNotification__TurnPlanStepStatus,
+  step: Schema.String,
+}).annotate({ identifier: "ServerNotification__TurnPlanStep" });
+
+export type ServerNotification__GuardianApprovalReview = {
+  readonly rationale?: string | null;
+  readonly riskLevel?: ServerNotification__GuardianRiskLevel | null;
+  readonly status: ServerNotification__GuardianApprovalReviewStatus;
+  readonly userAuthorization?: ServerNotification__GuardianUserAuthorization | null;
+};
+export const ServerNotification__GuardianApprovalReview = Schema.Struct({
+  rationale: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  riskLevel: Schema.optionalKey(Schema.Union([ServerNotification__GuardianRiskLevel, Schema.Null])),
+  status: ServerNotification__GuardianApprovalReviewStatus,
+  userAuthorization: Schema.optionalKey(
+    Schema.Union([ServerNotification__GuardianUserAuthorization, Schema.Null]),
+  ),
+}).annotate({
   description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+    "[UNSTABLE] Temporary approval auto-review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
+  identifier: "ServerNotification__GuardianApprovalReview",
 });
 
-export type V2ThreadReadResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadReadResponse__PatchChangeKind;
+export type ServerNotification__CommandExecOutputDeltaNotification = {
+  readonly capReached: boolean;
+  readonly deltaBase64: string;
+  readonly processId: string;
+  readonly stream: ServerNotification__CommandExecOutputStream;
+};
+export const ServerNotification__CommandExecOutputDeltaNotification = Schema.Struct({
+  capReached: Schema.Boolean.annotate({
+    description:
+      "`true` on the final streamed chunk for a stream when `outputBytesCap` truncated later output on that stream.",
+  }),
+  deltaBase64: Schema.String.annotate({ description: "Base64-encoded output bytes." }),
+  processId: Schema.String.annotate({
+    description:
+      "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
+  }),
+  stream: Schema.suspend(
+    (): Schema.Codec<ServerNotification__CommandExecOutputStream> =>
+      ServerNotification__CommandExecOutputStream,
+  ).annotate({ description: "Output stream for this chunk." }),
+}).annotate({
+  description:
+    "Base64-encoded output chunk emitted for a streaming `command/exec` request.\n\nThese notifications are connection-scoped. If the originating connection closes, the server terminates the process.",
+  identifier: "ServerNotification__CommandExecOutputDeltaNotification",
+});
+
+export type ServerNotification__ProcessOutputDeltaNotification = {
+  readonly capReached: boolean;
+  readonly deltaBase64: string;
+  readonly processHandle: string;
+  readonly stream: ServerNotification__ProcessOutputStream;
+};
+export const ServerNotification__ProcessOutputDeltaNotification = Schema.Struct({
+  capReached: Schema.Boolean.annotate({
+    description:
+      "True on the final streamed chunk for this stream when output was truncated by `outputBytesCap`.",
+  }),
+  deltaBase64: Schema.String.annotate({ description: "Base64-encoded output bytes." }),
+  processHandle: Schema.String.annotate({
+    description: "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
+  }),
+  stream: Schema.suspend(
+    (): Schema.Codec<ServerNotification__ProcessOutputStream> =>
+      ServerNotification__ProcessOutputStream,
+  ).annotate({ description: "Output stream this chunk belongs to." }),
+}).annotate({
+  description: "Base64-encoded output chunk emitted for a streaming `process/spawn` request.",
+  identifier: "ServerNotification__ProcessOutputDeltaNotification",
+});
+
+export type ServerNotification__ServerRequestResolvedNotification = {
+  readonly requestId: ServerNotification__RequestId;
+  readonly threadId: string;
+};
+export const ServerNotification__ServerRequestResolvedNotification = Schema.Struct({
+  requestId: ServerNotification__RequestId,
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ServerRequestResolvedNotification" });
+
+export type ServerNotification__McpServerStatusUpdatedNotification = {
+  readonly error?: string | null;
+  readonly failureReason?: ServerNotification__McpServerStartupFailureReason | null;
+  readonly name: string;
+  readonly status: ServerNotification__McpServerStartupState;
+  readonly threadId?: string | null;
+};
+export const ServerNotification__McpServerStatusUpdatedNotification = Schema.Struct({
+  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  failureReason: Schema.optionalKey(
+    Schema.Union([ServerNotification__McpServerStartupFailureReason, Schema.Null]),
+  ),
+  name: Schema.String,
+  status: ServerNotification__McpServerStartupState,
+  threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__McpServerStatusUpdatedNotification" });
+
+export type ServerNotification__McpServerEventStreamNotification = {
+  readonly notification: ServerNotification__McpServerEventNotification;
+  readonly subscriptionId: string;
+};
+export const ServerNotification__McpServerEventStreamNotification = Schema.Struct({
+  notification: ServerNotification__McpServerEventNotification,
+  subscriptionId: Schema.String,
+}).annotate({ identifier: "ServerNotification__McpServerEventStreamNotification" });
+
+export type ServerNotification__AccountUpdatedNotification = {
+  readonly authMode?: ServerNotification__AuthMode | null;
+  readonly planType?: ServerNotification__PlanType | null;
+};
+export const ServerNotification__AccountUpdatedNotification = Schema.Struct({
+  authMode: Schema.optionalKey(Schema.Union([ServerNotification__AuthMode, Schema.Null])),
+  planType: Schema.optionalKey(Schema.Union([ServerNotification__PlanType, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__AccountUpdatedNotification" });
+
+export type ServerNotification__GatewayOAuthChangedNotification = {
+  readonly authUrl?: string | null;
+  readonly error?: string | null;
+  readonly providerId: string;
+  readonly status: ServerNotification__GatewayOAuthStatus;
+};
+export const ServerNotification__GatewayOAuthChangedNotification = Schema.Struct({
+  authUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Authorization handoff, sent only to the connection that started login.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  providerId: Schema.String,
+  status: ServerNotification__GatewayOAuthStatus,
+}).annotate({ identifier: "ServerNotification__GatewayOAuthChangedNotification" });
+
+export type ServerNotification__RateLimitSnapshot = {
+  readonly credits?: ServerNotification__CreditsSnapshot | null;
+  readonly individualLimit?: ServerNotification__SpendControlLimitSnapshot | null;
+  readonly limitId?: string | null;
+  readonly limitName?: string | null;
+  readonly normalModelSlug?: string | null;
+  readonly planType?: ServerNotification__PlanType | null;
+  readonly primary?: ServerNotification__RateLimitWindow | null;
+  readonly rateLimitReachedType?: ServerNotification__RateLimitReachedType | null;
+  readonly secondary?: ServerNotification__RateLimitWindow | null;
+  readonly spendControlReached?: boolean | null;
+};
+export const ServerNotification__RateLimitSnapshot = Schema.Struct({
+  credits: Schema.optionalKey(Schema.Union([ServerNotification__CreditsSnapshot, Schema.Null])),
+  individualLimit: Schema.optionalKey(
+    Schema.Union([ServerNotification__SpendControlLimitSnapshot, Schema.Null]),
+  ),
+  limitId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  limitName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  normalModelSlug: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Normal model whose display name and reasoning options describe this quota alias.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  planType: Schema.optionalKey(Schema.Union([ServerNotification__PlanType, Schema.Null])),
+  primary: Schema.optionalKey(Schema.Union([ServerNotification__RateLimitWindow, Schema.Null])),
+  rateLimitReachedType: Schema.optionalKey(
+    Schema.Union([ServerNotification__RateLimitReachedType, Schema.Null]),
+  ),
+  secondary: Schema.optionalKey(Schema.Union([ServerNotification__RateLimitWindow, Schema.Null])),
+  spendControlReached: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description:
+          "Backend-reported spend-control state. `None` is unavailable, not a sparse-update recovery.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerNotification__RateLimitSnapshot" });
+
+export type ServerNotification__AppMetadata = {
+  readonly categories?: ReadonlyArray<string> | null;
+  readonly developer?: string | null;
+  readonly firstPartyRequiresInstall?: boolean | null;
+  readonly review?: ServerNotification__AppReview | null;
+  readonly screenshots?: ReadonlyArray<ServerNotification__AppScreenshot> | null;
+  readonly seoDescription?: string | null;
+  readonly showInComposerWhenUnlinked?: boolean | null;
+  readonly subCategories?: ReadonlyArray<string> | null;
+  readonly version?: string | null;
+  readonly versionId?: string | null;
+  readonly versionNotes?: string | null;
+};
+export const ServerNotification__AppMetadata = Schema.Struct({
+  categories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  firstPartyRequiresInstall: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  review: Schema.optionalKey(Schema.Union([ServerNotification__AppReview, Schema.Null])),
+  screenshots: Schema.optionalKey(
+    Schema.Union([Schema.Array(ServerNotification__AppScreenshot), Schema.Null]),
+  ),
+  seoDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  showInComposerWhenUnlinked: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  subCategories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  version: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  versionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  versionNotes: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__AppMetadata" });
+
+export type ServerNotification__RemoteControlStatusChangedNotification = {
+  readonly environmentId?: string | null;
+  readonly installationId: string;
+  readonly serverName: string;
+  readonly status: ServerNotification__RemoteControlConnectionStatus;
+};
+export const ServerNotification__RemoteControlStatusChangedNotification = Schema.Struct({
+  environmentId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  installationId: Schema.String,
+  serverName: Schema.String,
+  status: ServerNotification__RemoteControlConnectionStatus,
+}).annotate({
+  description: "Current remote-control connection status and remote identity exposed to clients.",
+  identifier: "ServerNotification__RemoteControlStatusChangedNotification",
+});
+
+export type ServerNotification__ExternalAgentConfigImportItemTypeFailure = {
+  readonly cwd?: string | null;
+  readonly errorType?: string | null;
+  readonly failureStage: string;
+  readonly itemType: ServerNotification__ExternalAgentConfigMigrationItemType;
+  readonly message: string;
+  readonly source?: string | null;
+  readonly subErrorType?: string | null;
+};
+export const ServerNotification__ExternalAgentConfigImportItemTypeFailure = Schema.Struct({
+  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  failureStage: Schema.String,
+  itemType: ServerNotification__ExternalAgentConfigMigrationItemType,
+  message: Schema.String,
+  source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__ExternalAgentConfigImportItemTypeFailure" });
+
+export type ServerNotification__ExternalAgentConfigImportItemTypeSuccess = {
+  readonly cwd?: string | null;
+  readonly itemType: ServerNotification__ExternalAgentConfigMigrationItemType;
+  readonly source?: string | null;
+  readonly target?: string | null;
+  readonly title?: string | null;
+};
+export const ServerNotification__ExternalAgentConfigImportItemTypeSuccess = Schema.Struct({
+  cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  itemType: ServerNotification__ExternalAgentConfigMigrationItemType,
+  source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  title: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Original title for an imported session; null for other item types.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerNotification__ExternalAgentConfigImportItemTypeSuccess" });
+
+export type ServerNotification__ModelReroutedNotification = {
+  readonly fromModel: string;
+  readonly reason: ServerNotification__ModelRerouteReason;
+  readonly threadId: string;
+  readonly toModel: string;
+  readonly turnId: string;
+};
+export const ServerNotification__ModelReroutedNotification = Schema.Struct({
+  fromModel: Schema.String,
+  reason: ServerNotification__ModelRerouteReason,
+  threadId: Schema.String,
+  toModel: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ModelReroutedNotification" });
+
+export type ServerNotification__ModelVerificationNotification = {
+  readonly threadId: string;
+  readonly turnId: string;
+  readonly verifications: ReadonlyArray<ServerNotification__ModelVerification>;
+};
+export const ServerNotification__ModelVerificationNotification = Schema.Struct({
+  threadId: Schema.String,
+  turnId: Schema.String,
+  verifications: Schema.Array(ServerNotification__ModelVerification),
+}).annotate({ identifier: "ServerNotification__ModelVerificationNotification" });
+
+export type ServerNotification__TextRange = {
+  readonly end: ServerNotification__TextPosition;
+  readonly start: ServerNotification__TextPosition;
+};
+export const ServerNotification__TextRange = Schema.Struct({
+  end: ServerNotification__TextPosition,
+  start: ServerNotification__TextPosition,
+}).annotate({ identifier: "ServerNotification__TextRange" });
+
+export type ServerNotification__FuzzyFileSearchResult = {
+  readonly file_name: string;
+  readonly indices?: ReadonlyArray<number> | null;
+  readonly match_type: ServerNotification__FuzzyFileSearchMatchType;
   readonly path: string;
+  readonly root: string;
+  readonly score: number;
 };
-export const V2ThreadReadResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadReadResponse__PatchChangeKind,
+export const ServerNotification__FuzzyFileSearchResult = Schema.Struct({
+  file_name: Schema.String,
+  indices: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(
+        Schema.Number.annotate({ format: "uint32" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  match_type: ServerNotification__FuzzyFileSearchMatchType,
   path: Schema.String,
+  root: Schema.String,
+  score: Schema.Number.annotate({ format: "uint32" })
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
+}).annotate({
+  description: "Superset of [`codex_file_search::FileMatch`]",
+  identifier: "ServerNotification__FuzzyFileSearchResult",
 });
 
-export type V2ThreadReadResponse__UserInput =
+export type ServerNotification__ThreadRealtimeStartedNotification = {
+  readonly realtimeSessionId?: string | null;
+  readonly threadId: string;
+  readonly version: ServerNotification__RealtimeConversationVersion;
+};
+export const ServerNotification__ThreadRealtimeStartedNotification = Schema.Struct({
+  realtimeSessionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  threadId: Schema.String,
+  version: ServerNotification__RealtimeConversationVersion,
+}).annotate({
+  description: "EXPERIMENTAL - emitted when thread realtime startup is accepted.",
+  identifier: "ServerNotification__ThreadRealtimeStartedNotification",
+});
+
+export type ServerNotification__ThreadRealtimeItem =
   | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadReadResponse__TextElement>;
-      readonly type: "text";
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly type: "realtimeSessionStarted";
     }
   | {
-      readonly detail?: V2ThreadReadResponse__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly role: ServerNotification__ThreadRealtimeTranscriptRole;
+      readonly text: string;
+      readonly type: "transcriptSegment";
     }
   | {
-      readonly detail?: V2ThreadReadResponse__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly item_id: string;
+      readonly presentation: ServerNotification__ThreadRealtimeBemItemPresentation;
+      readonly turn_id: string;
+      readonly type: "bemItemPromoted";
     }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadReadResponse__UserInput = Schema.Union(
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly outcome: ServerNotification__ThreadRealtimeSessionOutcome;
+      readonly type: "realtimeSessionClosed";
+    };
+export const ServerNotification__ThreadRealtimeItem = Schema.Union(
   [
     Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadReadResponse__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      type: Schema.Literal("realtimeSessionStarted").annotate({
+        title: "RealtimeSessionStartedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "RealtimeSessionStartedThreadRealtimeItem" }),
     Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      role: ServerNotification__ThreadRealtimeTranscriptRole,
+      text: Schema.String,
+      type: Schema.Literal("transcriptSegment").annotate({
+        title: "TranscriptSegmentThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "TranscriptSegmentThreadRealtimeItem" }),
     Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__ImageDetail, Schema.Null])),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      item_id: Schema.String,
+      presentation: ServerNotification__ThreadRealtimeBemItemPresentation,
+      turn_id: Schema.String,
+      type: Schema.Literal("bemItemPromoted").annotate({
+        title: "BemItemPromotedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "BemItemPromotedThreadRealtimeItem" }),
     Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadReadResponse__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadReadResponse__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadReadResponse__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadReadResponse__SubAgentSource = Schema.Union(
-  [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadReadResponse__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadReadResponse__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadResumeParams__ContentItem =
-  | { readonly text: string; readonly type: "input_text" }
-  | {
-      readonly detail?: V2ThreadResumeParams__ImageDetail | null;
-      readonly image_url: string;
-      readonly type: "input_image";
-    }
-  | { readonly audio_url: string; readonly type: "input_audio" }
-  | { readonly text: string; readonly type: "output_text" };
-export const V2ThreadResumeParams__ContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("input_text").annotate({ title: "InputTextContentItemType" }),
-    }).annotate({ title: "InputTextContentItem" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__ImageDetail, Schema.Null])),
-      image_url: Schema.String,
-      type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
-    }).annotate({ title: "InputImageContentItem" }),
-    Schema.Struct({
-      audio_url: Schema.String,
-      type: Schema.Literal("input_audio").annotate({ title: "InputAudioContentItemType" }),
-    }).annotate({ title: "InputAudioContentItem" }),
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("output_text").annotate({ title: "OutputTextContentItemType" }),
-    }).annotate({ title: "OutputTextContentItem" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadResumeParams__FunctionCallOutputContentItem =
-  | { readonly text: string; readonly type: "input_text" }
-  | {
-      readonly detail?: V2ThreadResumeParams__ImageDetail | null;
-      readonly image_url: string;
-      readonly type: "input_image";
-    }
-  | { readonly audio_url: string; readonly type: "input_audio" }
-  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
-export const V2ThreadResumeParams__FunctionCallOutputContentItem = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      type: Schema.Literal("input_text").annotate({
-        title: "InputTextFunctionCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__ImageDetail, Schema.Null])),
-      image_url: Schema.String,
-      type: Schema.Literal("input_image").annotate({
-        title: "InputImageFunctionCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
-    Schema.Struct({
-      audio_url: Schema.String,
-      type: Schema.Literal("input_audio").annotate({
-        title: "InputAudioFunctionCallOutputContentItemType",
-      }),
-    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
-    Schema.Struct({
-      encrypted_content: Schema.String,
-      type: Schema.Literal("encrypted_content").annotate({
-        title: "EncryptedContentFunctionCallOutputContentItemType",
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      outcome: ServerNotification__ThreadRealtimeSessionOutcome,
+      type: Schema.Literal("realtimeSessionClosed").annotate({
+        title: "RealtimeSessionClosedThreadRealtimeItemType",
       }),
-    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+    }).annotate({ title: "RealtimeSessionClosedThreadRealtimeItem" }),
   ],
   { mode: "oneOf" },
 ).annotate({
-  description:
-    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  description: "EXPERIMENTAL - a thread-scoped realtime item in the canonical timeline.",
+  identifier: "ServerNotification__ThreadRealtimeItem",
 });
 
-export type V2ThreadResumeResponse__CommandAction =
+export type ServerNotification__ThreadRealtimeOutputAudioDeltaNotification = {
+  readonly audio: ServerNotification__ThreadRealtimeAudioChunk;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadRealtimeOutputAudioDeltaNotification = Schema.Struct({
+  audio: ServerNotification__ThreadRealtimeAudioChunk,
+  threadId: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL - streamed output audio emitted by thread realtime.",
+  identifier: "ServerNotification__ThreadRealtimeOutputAudioDeltaNotification",
+});
+
+export type ServerNotification__WindowsSandboxSetupCompletedNotification = {
+  readonly error?: string | null;
+  readonly mode: ServerNotification__WindowsSandboxSetupMode;
+  readonly success: boolean;
+};
+export const ServerNotification__WindowsSandboxSetupCompletedNotification = Schema.Struct({
+  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  mode: ServerNotification__WindowsSandboxSetupMode,
+  success: Schema.Boolean,
+}).annotate({ identifier: "ServerNotification__WindowsSandboxSetupCompletedNotification" });
+
+export type ServerNotification__AccountLoginCompletedNotification = {
+  readonly error?: string | null;
+  readonly loginId?: string | null;
+  readonly onboardingEntrypoint?: ServerNotification__DesktopOnboardingEntrypoint | null;
+  readonly success: boolean;
+};
+export const ServerNotification__AccountLoginCompletedNotification = Schema.Struct({
+  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  loginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  onboardingEntrypoint: Schema.optionalKey(
+    Schema.Union([ServerNotification__DesktopOnboardingEntrypoint, Schema.Null]),
+  ),
+  success: Schema.Boolean,
+}).annotate({ identifier: "ServerNotification__AccountLoginCompletedNotification" });
+
+export type ServerRequest__CommandAction =
   | {
       readonly command: string;
       readonly name: string;
-      readonly path: V2ThreadResumeResponse__AbsolutePathBuf;
+      readonly path: ServerRequest__LegacyAppPathString;
       readonly type: "read";
     }
   | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
@@ -17159,12 +18957,12 @@ export type V2ThreadResumeResponse__CommandAction =
       readonly type: "search";
     }
   | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadResumeResponse__CommandAction = Schema.Union(
+export const ServerRequest__CommandAction = Schema.Union(
   [
     Schema.Struct({
       command: Schema.String,
       name: Schema.String,
-      path: V2ThreadResumeResponse__AbsolutePathBuf,
+      path: ServerRequest__LegacyAppPathString,
       type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
     }).annotate({ title: "ReadCommandAction" }),
     Schema.Struct({
@@ -17184,546 +18982,499 @@ export const V2ThreadResumeResponse__CommandAction = Schema.Union(
     }).annotate({ title: "UnknownCommandAction" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadResumeResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadResumeResponse__CollabAgentStatus;
-};
-export const V2ThreadResumeResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadResumeResponse__CollabAgentStatus,
-});
+).annotate({ identifier: "ServerRequest__CommandAction" });
 
-export type V2ThreadResumeResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadResumeResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const V2ThreadResumeResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadResumeResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
-
-export type V2ThreadResumeResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "rateLimitExceeded"
-  | "misalignmentPolicyViolation"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type ServerRequest__FileSystemSpecialPath =
+  | { readonly kind: "root" }
+  | { readonly kind: "minimal" }
+  | { readonly kind: "project_roots"; readonly subpath?: ServerRequest__LegacyAppPathString | null }
+  | { readonly kind: "tmpdir" }
+  | { readonly kind: "slash_tmp" }
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadResumeResponse__NonSteerableTurnKind;
-      };
+      readonly kind: "unknown";
+      readonly path: string;
+      readonly subpath?: ServerRequest__LegacyAppPathString | null;
     };
-export const V2ThreadResumeResponse__CodexErrorInfo = Schema.Union(
+export const ServerRequest__FileSystemSpecialPath = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "rateLimitExceeded",
-      "misalignmentPolicyViolation",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
+    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
+      title: "RootFileSystemSpecialPath",
     }),
-    Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
+    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
+      title: "MinimalFileSystemSpecialPath",
     }),
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
+      kind: Schema.Literal("project_roots"),
+      subpath: Schema.optionalKey(Schema.Union([ServerRequest__LegacyAppPathString, Schema.Null])),
+    }).annotate({ title: "KindFileSystemSpecialPath" }),
+    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
+      title: "TmpdirFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
+      title: "SlashTmpFileSystemSpecialPath",
     }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadResumeResponse__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+      kind: Schema.Literal("unknown"),
+      path: Schema.String,
+      subpath: Schema.optionalKey(Schema.Union([ServerRequest__LegacyAppPathString, Schema.Null])),
     }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+).annotate({ identifier: "ServerRequest__FileSystemSpecialPath" });
 
-export type V2ThreadResumeResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadResumeResponse__PatchChangeKind;
-  readonly path: string;
+export type ServerRequest__NetworkApprovalContext = {
+  readonly host: string;
+  readonly protocol: ServerRequest__NetworkApprovalProtocol;
 };
-export const V2ThreadResumeResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadResumeResponse__PatchChangeKind,
-  path: Schema.String,
-});
+export const ServerRequest__NetworkApprovalContext = Schema.Struct({
+  host: Schema.String,
+  protocol: ServerRequest__NetworkApprovalProtocol,
+}).annotate({ identifier: "ServerRequest__NetworkApprovalContext" });
 
-export type V2ThreadResumeResponse__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadResumeResponse__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ThreadResumeResponse__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ThreadResumeResponse__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadResumeResponse__UserInput = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadResumeResponse__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadResumeResponse__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadResumeResponse__ImageDetail, Schema.Null])),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ServerRequest__NetworkPolicyAmendment = {
+  readonly action: ServerRequest__NetworkPolicyRuleAction;
+  readonly host: string;
+};
+export const ServerRequest__NetworkPolicyAmendment = Schema.Struct({
+  action: ServerRequest__NetworkPolicyRuleAction,
+  host: Schema.String,
+}).annotate({ identifier: "ServerRequest__NetworkPolicyAmendment" });
 
-export type V2ThreadResumeResponse__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadResumeResponse__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadResumeResponse__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadResumeResponse__SubAgentSource = Schema.Union(
-  [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadResumeResponse__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadResumeResponse__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ServerRequest__ToolRequestUserInputQuestion = {
+  readonly header: string;
+  readonly id: string;
+  readonly isOther?: boolean;
+  readonly isSecret?: boolean;
+  readonly options?: ReadonlyArray<ServerRequest__ToolRequestUserInputOption> | null;
+  readonly question: string;
+};
+export const ServerRequest__ToolRequestUserInputQuestion = Schema.Struct({
+  header: Schema.String,
+  id: Schema.String,
+  isOther: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+  isSecret: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+  options: Schema.optionalKey(
+    Schema.Union([Schema.Array(ServerRequest__ToolRequestUserInputOption), Schema.Null]),
+  ),
+  question: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL. Represents one request_user_input question and its required options.",
+  identifier: "ServerRequest__ToolRequestUserInputQuestion",
+});
 
-export type V2ThreadRollbackResponse__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ThreadRollbackResponse__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
-  | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadRollbackResponse__CommandAction = Schema.Union(
-  [
-    Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ThreadRollbackResponse__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
-  ],
-  { mode: "oneOf" },
-);
+export type ServerRequest__McpElicitationUntitledSingleSelectEnumSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly enum: ReadonlyArray<string>;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationStringType;
+};
+export const ServerRequest__McpElicitationUntitledSingleSelectEnumSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  enum: Schema.Array(Schema.String),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationStringType,
+}).annotate({ identifier: "ServerRequest__McpElicitationUntitledSingleSelectEnumSchema" });
 
-export type V2ThreadRollbackResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadRollbackResponse__CollabAgentStatus;
+export type ServerRequest__McpElicitationUntitledEnumItems = {
+  readonly enum: ReadonlyArray<string>;
+  readonly type: ServerRequest__McpElicitationStringType;
 };
-export const V2ThreadRollbackResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadRollbackResponse__CollabAgentStatus,
-});
+export const ServerRequest__McpElicitationUntitledEnumItems = Schema.Struct({
+  enum: Schema.Array(Schema.String),
+  type: ServerRequest__McpElicitationStringType,
+}).annotate({ identifier: "ServerRequest__McpElicitationUntitledEnumItems" });
 
-export type V2ThreadRollbackResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadRollbackResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type ServerRequest__McpElicitationLegacyTitledEnumSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly enum: ReadonlyArray<string>;
+  readonly enumNames?: ReadonlyArray<string> | null;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationStringType;
 };
-export const V2ThreadRollbackResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadRollbackResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+export const ServerRequest__McpElicitationLegacyTitledEnumSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  enum: Schema.Array(Schema.String),
+  enumNames: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationStringType,
+}).annotate({ identifier: "ServerRequest__McpElicitationLegacyTitledEnumSchema" });
 
-export type V2ThreadRollbackResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "rateLimitExceeded"
-  | "misalignmentPolicyViolation"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
-  | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadRollbackResponse__NonSteerableTurnKind;
-      };
-    };
-export const V2ThreadRollbackResponse__CodexErrorInfo = Schema.Union(
-  [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "rateLimitExceeded",
-      "misalignmentPolicyViolation",
-      "other",
+export type ServerRequest__McpElicitationTitledSingleSelectEnumSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly oneOf: ReadonlyArray<ServerRequest__McpElicitationConstOption>;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationStringType;
+};
+export const ServerRequest__McpElicitationTitledSingleSelectEnumSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  oneOf: Schema.Array(ServerRequest__McpElicitationConstOption),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationStringType,
+}).annotate({ identifier: "ServerRequest__McpElicitationTitledSingleSelectEnumSchema" });
+
+export type ServerRequest__McpElicitationTitledEnumItems = {
+  readonly anyOf: ReadonlyArray<ServerRequest__McpElicitationConstOption>;
+};
+export const ServerRequest__McpElicitationTitledEnumItems = Schema.Struct({
+  anyOf: Schema.Array(ServerRequest__McpElicitationConstOption),
+}).annotate({ identifier: "ServerRequest__McpElicitationTitledEnumItems" });
+
+export type ServerRequest__McpElicitationStringSchema = {
+  readonly default?: string | null;
+  readonly description?: string | null;
+  readonly format?: ServerRequest__McpElicitationStringFormat | null;
+  readonly maxLength?: number | null;
+  readonly minLength?: number | null;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationStringType;
+};
+export const ServerRequest__McpElicitationStringSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  format: Schema.optionalKey(
+    Schema.Union([ServerRequest__McpElicitationStringFormat, Schema.Null]),
+  ),
+  maxLength: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
     ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
+  ),
+  minLength: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
         ),
+      Schema.Null,
+    ]),
+  ),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationStringType,
+}).annotate({ identifier: "ServerRequest__McpElicitationStringSchema" });
+
+export type ServerRequest__McpElicitationNumberSchema = {
+  readonly default?: number | null;
+  readonly description?: string | null;
+  readonly maximum?: number | null;
+  readonly minimum?: number | null;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationNumberType;
+};
+export const ServerRequest__McpElicitationNumberSchema = Schema.Struct({
+  default: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "double" }).check(
+        Schema.isFinite().annotate({ expected: "a finite number" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  maximum: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "double" }).check(
+        Schema.isFinite().annotate({ expected: "a finite number" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  minimum: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "double" }).check(
+        Schema.isFinite().annotate({ expected: "a finite number" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationNumberType,
+}).annotate({ identifier: "ServerRequest__McpElicitationNumberSchema" });
+
+export type ServerRequest__McpElicitationBooleanSchema = {
+  readonly default?: boolean | null;
+  readonly description?: string | null;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationBooleanType;
+};
+export const ServerRequest__McpElicitationBooleanSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationBooleanType,
+}).annotate({ identifier: "ServerRequest__McpElicitationBooleanSchema" });
+
+export type ServerRequest__ChatgptAuthTokensRefreshParams = {
+  readonly previousAccountId?: string | null;
+  readonly reason: ServerRequest__ChatgptAuthTokensRefreshReason;
+};
+export const ServerRequest__ChatgptAuthTokensRefreshParams = Schema.Struct({
+  previousAccountId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Workspace/account identifier that Codex was previously using.\n\nClients that manage multiple accounts/workspaces can use this as a hint to refresh the token for the correct workspace.\n\nThis may be `null` when the prior auth state did not include a workspace identifier (`chatgpt_account_id`).",
       }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      Schema.Null,
+    ]),
+  ),
+  reason: ServerRequest__ChatgptAuthTokensRefreshReason,
+}).annotate({ identifier: "ServerRequest__ChatgptAuthTokensRefreshParams" });
+
+export type ServerRequest__ApplyPatchApprovalParams = {
+  readonly callId: string;
+  readonly conversationId: ServerRequest__ThreadId;
+  readonly fileChanges: { readonly [x: string]: ServerRequest__FileChange };
+  readonly grantRoot?: string | null;
+  readonly reason?: string | null;
+};
+export const ServerRequest__ApplyPatchApprovalParams = Schema.Struct({
+  callId: Schema.String.annotate({
+    description:
+      "Use to correlate this with [codex_protocol::protocol::PatchApplyBeginEvent] and [codex_protocol::protocol::PatchApplyEndEvent].",
+  }),
+  conversationId: ServerRequest__ThreadId,
+  fileChanges: Schema.Record(Schema.String, ServerRequest__FileChange),
+  grantRoot: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "When set, the agent is asking the user to allow writes under this root for the remainder of the session (unclear if this is honored today).",
       }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
-    Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      Schema.Null,
+    ]),
+  ),
+  reason: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional explanatory reason (e.g. request for extra write access).",
       }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
-    Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerRequest__ApplyPatchApprovalParams" });
+
+export type ServerRequest__ExecCommandApprovalParams = {
+  readonly approvalId?: string | null;
+  readonly callId: string;
+  readonly command: ReadonlyArray<string>;
+  readonly conversationId: ServerRequest__ThreadId;
+  readonly cwd: string;
+  readonly parsedCmd: ReadonlyArray<ServerRequest__ParsedCommand>;
+  readonly reason?: string | null;
+};
+export const ServerRequest__ExecCommandApprovalParams = Schema.Struct({
+  approvalId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Identifier for this specific approval callback." }),
+      Schema.Null,
+    ]),
+  ),
+  callId: Schema.String.annotate({
+    description:
+      "Use to correlate this with [codex_protocol::protocol::ExecCommandBeginEvent] and [codex_protocol::protocol::ExecCommandEndEvent].",
+  }),
+  command: Schema.Array(Schema.String),
+  conversationId: ServerRequest__ThreadId,
+  cwd: Schema.String,
+  parsedCmd: Schema.Array(ServerRequest__ParsedCommand),
+  reason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerRequest__ExecCommandApprovalParams" });
+
+export type ToolRequestUserInputParams__ToolRequestUserInputQuestion = {
+  readonly header: string;
+  readonly id: string;
+  readonly isOther?: boolean;
+  readonly isSecret?: boolean;
+  readonly options?: ReadonlyArray<ToolRequestUserInputParams__ToolRequestUserInputOption> | null;
+  readonly question: string;
+};
+export const ToolRequestUserInputParams__ToolRequestUserInputQuestion = Schema.Struct({
+  header: Schema.String,
+  id: Schema.String,
+  isOther: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+  isSecret: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+  options: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ToolRequestUserInputParams__ToolRequestUserInputOption),
+      Schema.Null,
+    ]),
+  ),
+  question: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL. Represents one request_user_input question and its required options.",
+  identifier: "ToolRequestUserInputParams__ToolRequestUserInputQuestion",
+});
+
+export type V2AccountRateLimitsUpdatedNotification__RateLimitSnapshot = {
+  readonly credits?: V2AccountRateLimitsUpdatedNotification__CreditsSnapshot | null;
+  readonly individualLimit?: V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot | null;
+  readonly limitId?: string | null;
+  readonly limitName?: string | null;
+  readonly normalModelSlug?: string | null;
+  readonly planType?: V2AccountRateLimitsUpdatedNotification__PlanType | null;
+  readonly primary?: V2AccountRateLimitsUpdatedNotification__RateLimitWindow | null;
+  readonly rateLimitReachedType?: V2AccountRateLimitsUpdatedNotification__RateLimitReachedType | null;
+  readonly secondary?: V2AccountRateLimitsUpdatedNotification__RateLimitWindow | null;
+  readonly spendControlReached?: boolean | null;
+};
+export const V2AccountRateLimitsUpdatedNotification__RateLimitSnapshot = Schema.Struct({
+  credits: Schema.optionalKey(
+    Schema.Union([V2AccountRateLimitsUpdatedNotification__CreditsSnapshot, Schema.Null]),
+  ),
+  individualLimit: Schema.optionalKey(
+    Schema.Union([V2AccountRateLimitsUpdatedNotification__SpendControlLimitSnapshot, Schema.Null]),
+  ),
+  limitId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  limitName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  normalModelSlug: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Normal model whose display name and reasoning options describe this quota alias.",
       }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
-    Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadRollbackResponse__NonSteerableTurnKind,
+      Schema.Null,
+    ]),
+  ),
+  planType: Schema.optionalKey(
+    Schema.Union([V2AccountRateLimitsUpdatedNotification__PlanType, Schema.Null]),
+  ),
+  primary: Schema.optionalKey(
+    Schema.Union([V2AccountRateLimitsUpdatedNotification__RateLimitWindow, Schema.Null]),
+  ),
+  rateLimitReachedType: Schema.optionalKey(
+    Schema.Union([V2AccountRateLimitsUpdatedNotification__RateLimitReachedType, Schema.Null]),
+  ),
+  secondary: Schema.optionalKey(
+    Schema.Union([V2AccountRateLimitsUpdatedNotification__RateLimitWindow, Schema.Null]),
+  ),
+  spendControlReached: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description:
+          "Backend-reported spend-control state. `None` is unavailable, not a sparse-update recovery.",
       }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
-    }),
-  ],
-  { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2AccountRateLimitsUpdatedNotification__RateLimitSnapshot" });
 
-export type V2ThreadRollbackResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadRollbackResponse__PatchChangeKind;
-  readonly path: string;
+export type V2AppListUpdatedNotification__AppMetadata = {
+  readonly categories?: ReadonlyArray<string> | null;
+  readonly developer?: string | null;
+  readonly firstPartyRequiresInstall?: boolean | null;
+  readonly review?: V2AppListUpdatedNotification__AppReview | null;
+  readonly screenshots?: ReadonlyArray<V2AppListUpdatedNotification__AppScreenshot> | null;
+  readonly seoDescription?: string | null;
+  readonly showInComposerWhenUnlinked?: boolean | null;
+  readonly subCategories?: ReadonlyArray<string> | null;
+  readonly version?: string | null;
+  readonly versionId?: string | null;
+  readonly versionNotes?: string | null;
 };
-export const V2ThreadRollbackResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadRollbackResponse__PatchChangeKind,
-  path: Schema.String,
-});
+export const V2AppListUpdatedNotification__AppMetadata = Schema.Struct({
+  categories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  firstPartyRequiresInstall: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  review: Schema.optionalKey(Schema.Union([V2AppListUpdatedNotification__AppReview, Schema.Null])),
+  screenshots: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2AppListUpdatedNotification__AppScreenshot), Schema.Null]),
+  ),
+  seoDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  showInComposerWhenUnlinked: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  subCategories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  version: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  versionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  versionNotes: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2AppListUpdatedNotification__AppMetadata" });
 
-export type V2ThreadRollbackResponse__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadRollbackResponse__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ThreadRollbackResponse__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ThreadRollbackResponse__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadRollbackResponse__UserInput = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadRollbackResponse__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
-        }),
-      ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__ImageDetail, Schema.Null]),
-      ),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2AppsListResponse__AppMetadata = {
+  readonly categories?: ReadonlyArray<string> | null;
+  readonly developer?: string | null;
+  readonly firstPartyRequiresInstall?: boolean | null;
+  readonly review?: V2AppsListResponse__AppReview | null;
+  readonly screenshots?: ReadonlyArray<V2AppsListResponse__AppScreenshot> | null;
+  readonly seoDescription?: string | null;
+  readonly showInComposerWhenUnlinked?: boolean | null;
+  readonly subCategories?: ReadonlyArray<string> | null;
+  readonly version?: string | null;
+  readonly versionId?: string | null;
+  readonly versionNotes?: string | null;
+};
+export const V2AppsListResponse__AppMetadata = Schema.Struct({
+  categories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  developer: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  firstPartyRequiresInstall: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  review: Schema.optionalKey(Schema.Union([V2AppsListResponse__AppReview, Schema.Null])),
+  screenshots: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2AppsListResponse__AppScreenshot), Schema.Null]),
+  ),
+  seoDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  showInComposerWhenUnlinked: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  subCategories: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  version: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  versionId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  versionNotes: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2AppsListResponse__AppMetadata" });
 
-export type V2ThreadRollbackResponse__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadRollbackResponse__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadRollbackResponse__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadRollbackResponse__SubAgentSource = Schema.Union(
-  [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadRollbackResponse__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadRollbackResponse__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2AppsReadResponse__ConnectorMetadata = {
+  readonly description?: string | null;
+  readonly distributionChannel?: string | null;
+  readonly iconUrl?: string | null;
+  readonly iconUrlDark?: string | null;
+  readonly id: string;
+  readonly installUrl?: string | null;
+  readonly name: string;
+  readonly pluginDisplayNames?: ReadonlyArray<string>;
+  readonly toolSummaries?: ReadonlyArray<V2AppsReadResponse__AppToolSummary> | null;
+};
+export const V2AppsReadResponse__ConnectorMetadata = Schema.Struct({
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  distributionChannel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  iconUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  iconUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  id: Schema.String,
+  installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  name: Schema.String,
+  pluginDisplayNames: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+  toolSummaries: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2AppsReadResponse__AppToolSummary), Schema.Null]),
+  ),
+}).annotate({
+  description: "EXPERIMENTAL - metadata returned by app/read.",
+  identifier: "V2AppsReadResponse__ConnectorMetadata",
+});
 
-export type V2ThreadSettingsUpdatedNotification__SandboxPolicy =
+export type V2CommandExecParams__SandboxPolicy =
   | { readonly type: "dangerFullAccess" }
   | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
+  | {
+      readonly networkAccess?: V2CommandExecParams__NetworkAccess;
+      readonly type: "externalSandbox";
+    }
   | {
       readonly excludeSlashTmp?: boolean;
       readonly excludeTmpdirEnvVar?: boolean;
       readonly networkAccess?: boolean;
       readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<V2ThreadSettingsUpdatedNotification__AbsolutePathBuf>;
+      readonly writableRoots?: ReadonlyArray<V2CommandExecParams__AbsolutePathBuf>;
     };
-export const V2ThreadSettingsUpdatedNotification__SandboxPolicy = Schema.Union(
+export const V2CommandExecParams__SandboxPolicy = Schema.Union(
   [
     Schema.Struct({
       type: Schema.Literal("dangerFullAccess").annotate({
@@ -17736,7 +19487,10 @@ export const V2ThreadSettingsUpdatedNotification__SandboxPolicy = Schema.Union(
     }).annotate({ title: "ReadOnlySandboxPolicy" }),
     Schema.Struct({
       networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
+        Schema.suspend(
+          (): Schema.Codec<V2CommandExecParams__NetworkAccess> =>
+            V2CommandExecParams__NetworkAccess,
+        ).annotate({ default: "restricted" }),
       ),
       type: Schema.Literal("externalSandbox").annotate({
         title: "ExternalSandboxSandboxPolicyType",
@@ -17748,94 +19502,458 @@ export const V2ThreadSettingsUpdatedNotification__SandboxPolicy = Schema.Union(
       networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
       type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
       writableRoots: Schema.optionalKey(
-        Schema.Array(V2ThreadSettingsUpdatedNotification__AbsolutePathBuf).annotate({
-          default: [],
-        }),
+        Schema.Array(V2CommandExecParams__AbsolutePathBuf).annotate({ default: [] }),
       ),
     }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2CommandExecParams__SandboxPolicy" });
 
-export type V2ThreadSettingsUpdatedNotification__Settings = {
-  readonly developer_instructions?: string | null;
-  readonly model: string;
-  readonly reasoning_effort?: V2ThreadSettingsUpdatedNotification__ReasoningEffort | null;
+export type V2ConfigBatchWriteParams__ConfigEdit = {
+  readonly keyPath: string;
+  readonly mergeStrategy: V2ConfigBatchWriteParams__MergeStrategy;
+  readonly value: Schema.Json;
 };
-export const V2ThreadSettingsUpdatedNotification__Settings = Schema.Struct({
-  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  model: Schema.String,
-  reasoning_effort: Schema.optionalKey(
-    Schema.Union([V2ThreadSettingsUpdatedNotification__ReasoningEffort, Schema.Null]),
+export const V2ConfigBatchWriteParams__ConfigEdit = Schema.Struct({
+  keyPath: Schema.String,
+  mergeStrategy: V2ConfigBatchWriteParams__MergeStrategy,
+  value: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({ identifier: "V2ConfigBatchWriteParams__ConfigEdit" });
+
+export type V2ConfigReadResponse__BrowserUseOriginPolicyConfig = {
+  readonly access?: V2ConfigReadResponse__AllowDenyRequirement | null;
+  readonly downloads?: V2ConfigReadResponse__AllowDenyRequirement | null;
+  readonly full_cdp_access?: V2ConfigReadResponse__AllowDenyRequirement | null;
+  readonly uploads?: V2ConfigReadResponse__AllowDenyRequirement | null;
+};
+export const V2ConfigReadResponse__BrowserUseOriginPolicyConfig = Schema.Struct({
+  access: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+  downloads: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+  full_cdp_access: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+  uploads: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AllowDenyRequirement, Schema.Null]),
   ),
-}).annotate({ description: "Settings for a collaboration mode." });
+}).annotate({ identifier: "V2ConfigReadResponse__BrowserUseOriginPolicyConfig" });
 
-export type V2ThreadStartedNotification__CommandAction =
+export type V2ConfigReadResponse__ComputerUseMacosConfig = {
+  readonly bundle_ids?: { readonly [x: string]: V2ConfigReadResponse__AllowDenyRequirement } | null;
+};
+export const V2ConfigReadResponse__ComputerUseMacosConfig = Schema.Struct({
+  bundle_ids: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, V2ConfigReadResponse__AllowDenyRequirement),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ConfigReadResponse__ComputerUseMacosConfig" });
+
+export type V2ConfigReadResponse__ComputerUseWindowsExeConfig = {
+  readonly access: V2ConfigReadResponse__AllowDenyRequirement;
+  readonly binary_name?: string | null;
+  readonly product_name: string;
+  readonly publisher_name: string;
+};
+export const V2ConfigReadResponse__ComputerUseWindowsExeConfig = Schema.Struct({
+  access: V2ConfigReadResponse__AllowDenyRequirement,
+  binary_name: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  product_name: Schema.String,
+  publisher_name: Schema.String,
+}).annotate({ identifier: "V2ConfigReadResponse__ComputerUseWindowsExeConfig" });
+
+export type V2ConfigReadResponse__WebSearchToolConfig = {
+  readonly allowed_domains?: ReadonlyArray<string> | null;
+  readonly context_size?: V2ConfigReadResponse__WebSearchContextSize | null;
+  readonly location?: V2ConfigReadResponse__WebSearchLocation | null;
+};
+export const V2ConfigReadResponse__WebSearchToolConfig = Schema.Struct({
+  allowed_domains: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  context_size: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__WebSearchContextSize, Schema.Null]),
+  ),
+  location: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__WebSearchLocation, Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ConfigReadResponse__WebSearchToolConfig" });
+
+export type V2ConfigReadResponse__ConfigLayerSource =
+  | { readonly file: V2ConfigReadResponse__AbsolutePathBuf; readonly type: "packagedDefaults" }
+  | { readonly domain: string; readonly key: string; readonly type: "mdm" }
+  | { readonly file: V2ConfigReadResponse__AbsolutePathBuf; readonly type: "system" }
+  | { readonly id: string; readonly name: string; readonly type: "enterpriseManaged" }
   | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ThreadStartedNotification__AbsolutePathBuf;
-      readonly type: "read";
+      readonly file: V2ConfigReadResponse__AbsolutePathBuf;
+      readonly profile?: string | null;
+      readonly type: "user";
     }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | { readonly dotCodexFolder: V2ConfigReadResponse__AbsolutePathBuf; readonly type: "project" }
+  | { readonly type: "sessionFlags" }
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
+      readonly file: V2ConfigReadResponse__AbsolutePathBuf;
+      readonly type: "legacyManagedConfigTomlFromFile";
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadStartedNotification__CommandAction = Schema.Union(
+  | { readonly type: "legacyManagedConfigTomlFromMdm" };
+export const V2ConfigReadResponse__ConfigLayerSource = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ThreadStartedNotification__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      file: Schema.suspend(
+        (): Schema.Codec<V2ConfigReadResponse__AbsolutePathBuf> =>
+          V2ConfigReadResponse__AbsolutePathBuf,
+      ).annotate({ description: "Path to the packaged default configuration file." }),
+      type: Schema.Literal("packagedDefaults").annotate({
+        title: "PackagedDefaultsConfigLayerSourceType",
+      }),
+    }).annotate({
+      title: "PackagedDefaultsConfigLayerSource",
+      description: "Default configuration supplied with the installed Codex package.",
+    }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      domain: Schema.String,
+      key: Schema.String,
+      type: Schema.Literal("mdm").annotate({ title: "MdmConfigLayerSourceType" }),
+    }).annotate({
+      title: "MdmConfigLayerSource",
+      description: "Managed preferences layer delivered by MDM (macOS only).",
+    }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      file: Schema.suspend(
+        (): Schema.Codec<V2ConfigReadResponse__AbsolutePathBuf> =>
+          V2ConfigReadResponse__AbsolutePathBuf,
+      ).annotate({
+        description:
+          "This is the path to the system config.toml file, though it is not guaranteed to exist.",
+      }),
+      type: Schema.Literal("system").annotate({ title: "SystemConfigLayerSourceType" }),
+    }).annotate({
+      title: "SystemConfigLayerSource",
+      description: "Managed config layer from a file (usually `managed_config.toml`).",
+    }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      id: Schema.String.annotate({ description: "Stable identifier for the delivered layer." }),
+      name: Schema.String.annotate({
+        description:
+          "Admin-facing name for the delivered layer. This is surfaced in diagnostics so users know which cloud layer needs administrator attention.",
+      }),
+      type: Schema.Literal("enterpriseManaged").annotate({
+        title: "EnterpriseManagedConfigLayerSourceType",
+      }),
+    }).annotate({
+      title: "EnterpriseManagedConfigLayerSource",
+      description: "Enterprise-managed config layer delivered by the cloud config bundle.",
+    }),
+    Schema.Struct({
+      file: Schema.suspend(
+        (): Schema.Codec<V2ConfigReadResponse__AbsolutePathBuf> =>
+          V2ConfigReadResponse__AbsolutePathBuf,
+      ).annotate({
+        description:
+          "This is the path to the user's config.toml file, though it is not guaranteed to exist.",
+      }),
+      profile: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Name of the selected profile-v2 config layered on top of the base user config, when this layer represents one.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("user").annotate({ title: "UserConfigLayerSourceType" }),
+    }).annotate({
+      title: "UserConfigLayerSource",
+      description:
+        "User config layer from $CODEX_HOME/config.toml. This layer is special in that it is expected to be: - writable by the user - generally outside the workspace directory",
+    }),
+    Schema.Struct({
+      dotCodexFolder: V2ConfigReadResponse__AbsolutePathBuf,
+      type: Schema.Literal("project").annotate({ title: "ProjectConfigLayerSourceType" }),
+    }).annotate({
+      title: "ProjectConfigLayerSource",
+      description:
+        "Path to a .codex/ folder within a project. There could be multiple of these between `cwd` and the project/repo root.",
+    }),
+    Schema.Struct({
+      type: Schema.Literal("sessionFlags").annotate({ title: "SessionFlagsConfigLayerSourceType" }),
+    }).annotate({
+      title: "SessionFlagsConfigLayerSource",
+      description: "Session-layer overrides supplied via `-c`/`--config`.",
+    }),
+    Schema.Struct({
+      file: V2ConfigReadResponse__AbsolutePathBuf,
+      type: Schema.Literal("legacyManagedConfigTomlFromFile").annotate({
+        title: "LegacyManagedConfigTomlFromFileConfigLayerSourceType",
+      }),
+    }).annotate({
+      title: "LegacyManagedConfigTomlFromFileConfigLayerSource",
+      description:
+        '`managed_config.toml` was designed to be a config that was loaded as the last layer on top of everything else. This scheme did not quite work out as intended, but we keep this variant as a "best effort" while we phase out `managed_config.toml` in favor of `requirements.toml`.',
+    }),
+    Schema.Struct({
+      type: Schema.Literal("legacyManagedConfigTomlFromMdm").annotate({
+        title: "LegacyManagedConfigTomlFromMdmConfigLayerSourceType",
+      }),
+    }).annotate({ title: "LegacyManagedConfigTomlFromMdmConfigLayerSource" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ConfigReadResponse__ConfigLayerSource" });
 
-export type V2ThreadStartedNotification__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadStartedNotification__CollabAgentStatus;
+export type V2ConfigReadResponse__AppsDefaultConfig = {
+  readonly approvals_reviewer?: V2ConfigReadResponse__ApprovalsReviewer | null;
+  readonly default_tools_approval_mode?: V2ConfigReadResponse__AppToolApproval | null;
+  readonly destructive_enabled?: boolean;
+  readonly enabled?: boolean;
+  readonly open_world_enabled?: boolean;
 };
-export const V2ThreadStartedNotification__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadStartedNotification__CollabAgentStatus,
-});
+export const V2ConfigReadResponse__AppsDefaultConfig = Schema.Struct({
+  approvals_reviewer: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__ApprovalsReviewer, Schema.Null]),
+  ),
+  default_tools_approval_mode: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AppToolApproval, Schema.Null]),
+  ),
+  destructive_enabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
+  enabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
+  open_world_enabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
+}).annotate({ identifier: "V2ConfigReadResponse__AppsDefaultConfig" });
 
-export type V2ThreadStartedNotification__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadStartedNotification__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type V2ConfigRequirementsReadResponse__ComputerUseMacosRequirements = {
+  readonly bundleIds?: {
+    readonly [x: string]: V2ConfigRequirementsReadResponse__AllowDenyRequirement;
+  } | null;
 };
-export const V2ThreadStartedNotification__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadStartedNotification__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+export const V2ConfigRequirementsReadResponse__ComputerUseMacosRequirements = Schema.Struct({
+  bundleIds: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, V2ConfigRequirementsReadResponse__AllowDenyRequirement),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ComputerUseMacosRequirements" });
 
-export type V2ThreadStartedNotification__CodexErrorInfo =
+export type V2ConfigRequirementsReadResponse__ComputerUseWindowsExeRequirement = {
+  readonly access: V2ConfigRequirementsReadResponse__AllowDenyRequirement;
+  readonly binaryName?: string | null;
+  readonly productName: string;
+  readonly publisherName: string;
+};
+export const V2ConfigRequirementsReadResponse__ComputerUseWindowsExeRequirement = Schema.Struct({
+  access: V2ConfigRequirementsReadResponse__AllowDenyRequirement,
+  binaryName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  productName: Schema.String,
+  publisherName: Schema.String,
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ComputerUseWindowsExeRequirement" });
+
+export type V2ConfigRequirementsReadResponse__BrowserUseOriginPolicy = {
+  readonly access?: V2ConfigRequirementsReadResponse__AllowDenyRequirement | null;
+  readonly accessApprovalLifetime?: V2ConfigRequirementsReadResponse__BrowserUseAccessApprovalLifetime | null;
+  readonly autoReview?: V2ConfigRequirementsReadResponse__AllowDenyRequirement | null;
+  readonly downloads?: V2ConfigRequirementsReadResponse__AllowDenyRequirement | null;
+  readonly fullCdpAccess?: V2ConfigRequirementsReadResponse__AllowDenyRequirement | null;
+  readonly persistentApproval?: boolean | null;
+  readonly uploads?: V2ConfigRequirementsReadResponse__AllowDenyRequirement | null;
+};
+export const V2ConfigRequirementsReadResponse__BrowserUseOriginPolicy = Schema.Struct({
+  access: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+  accessApprovalLifetime: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__BrowserUseAccessApprovalLifetime, Schema.Null]),
+  ),
+  autoReview: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+  downloads: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+  fullCdpAccess: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+  persistentApproval: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  uploads: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__AllowDenyRequirement, Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__BrowserUseOriginPolicy" });
+
+export type V2ConfigRequirementsReadResponse__NewThreadModelDefaults = {
+  readonly model?: string | null;
+  readonly modelReasoningEffort?: V2ConfigRequirementsReadResponse__ReasoningEffort | null;
+  readonly serviceTier?: string | null;
+};
+export const V2ConfigRequirementsReadResponse__NewThreadModelDefaults = Schema.Struct({
+  model: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  modelReasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__ReasoningEffort, Schema.Null]),
+  ),
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__NewThreadModelDefaults" });
+
+export type V2ConfigRequirementsReadResponse__ApplicationNetworkRequirements = {
+  readonly domains: {
+    readonly [x: string]: V2ConfigRequirementsReadResponse__NetworkDomainPermission;
+  };
+  readonly enabled: boolean;
+};
+export const V2ConfigRequirementsReadResponse__ApplicationNetworkRequirements = Schema.Struct({
+  domains: Schema.Record(Schema.String, V2ConfigRequirementsReadResponse__NetworkDomainPermission),
+  enabled: Schema.Boolean.annotate({
+    description: "When enabled, only explicitly allowed exact domains may be contacted.",
+  }),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ApplicationNetworkRequirements" });
+
+export type V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup = {
+  readonly hooks: ReadonlyArray<V2ConfigRequirementsReadResponse__ConfiguredHookHandler>;
+  readonly matcher?: string | null;
+};
+export const V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup = Schema.Struct({
+  hooks: Schema.Array(V2ConfigRequirementsReadResponse__ConfiguredHookHandler),
+  matcher: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup" });
+
+export type V2ConfigWarningNotification__TextRange = {
+  readonly end: V2ConfigWarningNotification__TextPosition;
+  readonly start: V2ConfigWarningNotification__TextPosition;
+};
+export const V2ConfigWarningNotification__TextRange = Schema.Struct({
+  end: V2ConfigWarningNotification__TextPosition,
+  start: V2ConfigWarningNotification__TextPosition,
+}).annotate({ identifier: "V2ConfigWarningNotification__TextRange" });
+
+export type V2ConfigWriteResponse__ConfigLayerSource =
+  | { readonly file: V2ConfigWriteResponse__AbsolutePathBuf; readonly type: "packagedDefaults" }
+  | { readonly domain: string; readonly key: string; readonly type: "mdm" }
+  | { readonly file: V2ConfigWriteResponse__AbsolutePathBuf; readonly type: "system" }
+  | { readonly id: string; readonly name: string; readonly type: "enterpriseManaged" }
+  | {
+      readonly file: V2ConfigWriteResponse__AbsolutePathBuf;
+      readonly profile?: string | null;
+      readonly type: "user";
+    }
+  | { readonly dotCodexFolder: V2ConfigWriteResponse__AbsolutePathBuf; readonly type: "project" }
+  | { readonly type: "sessionFlags" }
+  | {
+      readonly file: V2ConfigWriteResponse__AbsolutePathBuf;
+      readonly type: "legacyManagedConfigTomlFromFile";
+    }
+  | { readonly type: "legacyManagedConfigTomlFromMdm" };
+export const V2ConfigWriteResponse__ConfigLayerSource = Schema.Union(
+  [
+    Schema.Struct({
+      file: Schema.suspend(
+        (): Schema.Codec<V2ConfigWriteResponse__AbsolutePathBuf> =>
+          V2ConfigWriteResponse__AbsolutePathBuf,
+      ).annotate({ description: "Path to the packaged default configuration file." }),
+      type: Schema.Literal("packagedDefaults").annotate({
+        title: "PackagedDefaultsConfigLayerSourceType",
+      }),
+    }).annotate({
+      title: "PackagedDefaultsConfigLayerSource",
+      description: "Default configuration supplied with the installed Codex package.",
+    }),
+    Schema.Struct({
+      domain: Schema.String,
+      key: Schema.String,
+      type: Schema.Literal("mdm").annotate({ title: "MdmConfigLayerSourceType" }),
+    }).annotate({
+      title: "MdmConfigLayerSource",
+      description: "Managed preferences layer delivered by MDM (macOS only).",
+    }),
+    Schema.Struct({
+      file: Schema.suspend(
+        (): Schema.Codec<V2ConfigWriteResponse__AbsolutePathBuf> =>
+          V2ConfigWriteResponse__AbsolutePathBuf,
+      ).annotate({
+        description:
+          "This is the path to the system config.toml file, though it is not guaranteed to exist.",
+      }),
+      type: Schema.Literal("system").annotate({ title: "SystemConfigLayerSourceType" }),
+    }).annotate({
+      title: "SystemConfigLayerSource",
+      description: "Managed config layer from a file (usually `managed_config.toml`).",
+    }),
+    Schema.Struct({
+      id: Schema.String.annotate({ description: "Stable identifier for the delivered layer." }),
+      name: Schema.String.annotate({
+        description:
+          "Admin-facing name for the delivered layer. This is surfaced in diagnostics so users know which cloud layer needs administrator attention.",
+      }),
+      type: Schema.Literal("enterpriseManaged").annotate({
+        title: "EnterpriseManagedConfigLayerSourceType",
+      }),
+    }).annotate({
+      title: "EnterpriseManagedConfigLayerSource",
+      description: "Enterprise-managed config layer delivered by the cloud config bundle.",
+    }),
+    Schema.Struct({
+      file: Schema.suspend(
+        (): Schema.Codec<V2ConfigWriteResponse__AbsolutePathBuf> =>
+          V2ConfigWriteResponse__AbsolutePathBuf,
+      ).annotate({
+        description:
+          "This is the path to the user's config.toml file, though it is not guaranteed to exist.",
+      }),
+      profile: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Name of the selected profile-v2 config layered on top of the base user config, when this layer represents one.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("user").annotate({ title: "UserConfigLayerSourceType" }),
+    }).annotate({
+      title: "UserConfigLayerSource",
+      description:
+        "User config layer from $CODEX_HOME/config.toml. This layer is special in that it is expected to be: - writable by the user - generally outside the workspace directory",
+    }),
+    Schema.Struct({
+      dotCodexFolder: V2ConfigWriteResponse__AbsolutePathBuf,
+      type: Schema.Literal("project").annotate({ title: "ProjectConfigLayerSourceType" }),
+    }).annotate({
+      title: "ProjectConfigLayerSource",
+      description:
+        "Path to a .codex/ folder within a project. There could be multiple of these between `cwd` and the project/repo root.",
+    }),
+    Schema.Struct({
+      type: Schema.Literal("sessionFlags").annotate({ title: "SessionFlagsConfigLayerSourceType" }),
+    }).annotate({
+      title: "SessionFlagsConfigLayerSource",
+      description: "Session-layer overrides supplied via `-c`/`--config`.",
+    }),
+    Schema.Struct({
+      file: V2ConfigWriteResponse__AbsolutePathBuf,
+      type: Schema.Literal("legacyManagedConfigTomlFromFile").annotate({
+        title: "LegacyManagedConfigTomlFromFileConfigLayerSourceType",
+      }),
+    }).annotate({
+      title: "LegacyManagedConfigTomlFromFileConfigLayerSource",
+      description:
+        '`managed_config.toml` was designed to be a config that was loaded as the last layer on top of everything else. This scheme did not quite work out as intended, but we keep this variant as a "best effort" while we phase out `managed_config.toml` in favor of `requirements.toml`.',
+    }),
+    Schema.Struct({
+      type: Schema.Literal("legacyManagedConfigTomlFromMdm").annotate({
+        title: "LegacyManagedConfigTomlFromMdmConfigLayerSourceType",
+      }),
+    }).annotate({ title: "LegacyManagedConfigTomlFromMdmConfigLayerSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ConfigWriteResponse__ConfigLayerSource" });
+
+export type V2ErrorNotification__CodexErrorInfo =
   | "contextWindowExceeded"
   | "sessionBudgetExceeded"
   | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
   | "serverOverloaded"
   | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
   | "internalServerError"
   | "unauthorized"
   | "badRequest"
@@ -17848,17 +19966,21 @@ export type V2ThreadStartedNotification__CodexErrorInfo =
   | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
   | {
       readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadStartedNotification__NonSteerableTurnKind;
+        readonly turnKind: V2ErrorNotification__NonSteerableTurnKind;
       };
     };
-export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
+export const V2ErrorNotification__CodexErrorInfo = Schema.Union(
   [
     Schema.Literals([
       "contextWindowExceeded",
       "sessionBudgetExceeded",
       "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
       "serverOverloaded",
       "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
       "internalServerError",
       "unauthorized",
       "badRequest",
@@ -17871,8 +19993,12 @@ export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -17883,8 +20009,12 @@ export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -17898,8 +20028,12 @@ export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -17914,8 +20048,12 @@ export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
         httpStatusCode: Schema.optionalKey(
           Schema.Union([
             Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
             Schema.Null,
           ]),
         ),
@@ -17926,7 +20064,7 @@ export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
     }),
     Schema.Struct({
       activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadStartedNotification__NonSteerableTurnKind,
+        turnKind: V2ErrorNotification__NonSteerableTurnKind,
       }),
     }).annotate({
       title: "ActiveTurnNotSteerableCodexErrorInfo",
@@ -17938,314 +20076,11780 @@ export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
 ).annotate({
   description:
     "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ErrorNotification__CodexErrorInfo",
 });
 
-export type V2ThreadStartedNotification__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadStartedNotification__PatchChangeKind;
-  readonly path: string;
+export type V2ErrorNotification__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ErrorNotification__MisalignmentSteer | null;
 };
-export const V2ThreadStartedNotification__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadStartedNotification__PatchChangeKind,
-  path: Schema.String,
-});
+export const V2ErrorNotification__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ErrorNotification__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ErrorNotification__MisalignmentErrorDetails" });
 
-export type V2ThreadStartedNotification__UserInput =
-  | {
-      readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadStartedNotification__TextElement>;
-      readonly type: "text";
-    }
-  | {
-      readonly detail?: V2ThreadStartedNotification__ImageDetail | null;
-      readonly type: "image";
-      readonly url: string;
-    }
-  | {
-      readonly detail?: V2ThreadStartedNotification__ImageDetail | null;
-      readonly path: string;
-      readonly type: "localImage";
-    }
-  | { readonly type: "audio"; readonly url: string }
-  | { readonly path: string; readonly type: "localAudio" }
-  | { readonly name: string; readonly path: string; readonly type: "skill" }
-  | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadStartedNotification__UserInput = Schema.Union(
-  [
-    Schema.Struct({
-      text: Schema.String,
-      text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadStartedNotification__TextElement).annotate({
-          description: "UI-defined spans within `text` used to render or persist special elements.",
-          default: [],
+export type V2ExperimentalFeatureListResponse__ExperimentalFeature = {
+  readonly announcement?: string | null;
+  readonly defaultEnabled: boolean;
+  readonly description?: string | null;
+  readonly displayName?: string | null;
+  readonly enabled: boolean;
+  readonly name: string;
+  readonly stage: V2ExperimentalFeatureListResponse__ExperimentalFeatureStage;
+};
+export const V2ExperimentalFeatureListResponse__ExperimentalFeature = Schema.Struct({
+  announcement: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Announcement copy shown to users when the feature is introduced. Null when this feature is not in beta.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  defaultEnabled: Schema.Boolean.annotate({
+    description: "Whether this feature is enabled by default.",
+  }),
+  description: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Short summary describing what the feature does. Null when this feature is not in beta.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  displayName: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "User-facing display name shown in the experimental features UI. Null when this feature is not in beta.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  enabled: Schema.Boolean.annotate({
+    description: "Whether this feature is currently enabled in the loaded config.",
+  }),
+  name: Schema.String.annotate({
+    description: "Stable key used in config.toml and CLI flag toggles.",
+  }),
+  stage: Schema.suspend(
+    (): Schema.Codec<V2ExperimentalFeatureListResponse__ExperimentalFeatureStage> =>
+      V2ExperimentalFeatureListResponse__ExperimentalFeatureStage,
+  ).annotate({ description: "Lifecycle stage of this feature flag." }),
+}).annotate({ identifier: "V2ExperimentalFeatureListResponse__ExperimentalFeature" });
+
+export type V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorCandidate = {
+  readonly name: string;
+  readonly sessionCount: number;
+  readonly source: V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorSource;
+};
+export const V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorCandidate =
+  Schema.Struct({
+    name: Schema.String,
+    sessionCount: Schema.Number.annotate({ format: "uint32" })
+      .check(Schema.isInt().annotate({ expected: "an integer" }))
+      .check(
+        Schema.isGreaterThanOrEqualTo(0).annotate({
+          expected: "a value greater than or equal to 0",
         }),
       ),
-      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
-    }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__ImageDetail, Schema.Null]),
-      ),
-      path: Schema.String,
-      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
-    }).annotate({ title: "LocalImageUserInput" }),
-    Schema.Struct({
-      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "AudioUserInput" }),
-    Schema.Struct({
-      path: Schema.String,
-      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
-    }).annotate({ title: "LocalAudioUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
-    }).annotate({ title: "SkillUserInput" }),
-    Schema.Struct({
-      name: Schema.String,
-      path: Schema.String,
-      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
-    }).annotate({ title: "MentionUserInput" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartedNotification__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadStartedNotification__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadStartedNotification__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadStartedNotification__SubAgentSource = Schema.Union(
-  [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadStartedNotification__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadStartedNotification__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
-  ],
-  { mode: "oneOf" },
-);
+    source: V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorSource,
+  }).annotate({
+    identifier: "V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorCandidate",
+  });
 
-export type V2ThreadStartResponse__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ThreadStartResponse__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+export type V2ExternalAgentConfigDetectResponse__MigrationDetails = {
+  readonly commands?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__CommandMigration>;
+  readonly hooks?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__HookMigration>;
+  readonly mcpServers?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__McpServerMigration>;
+  readonly memory?: ReadonlyArray<string>;
+  readonly plugins?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__PluginsMigration>;
+  readonly sessions?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__SessionMigration>;
+  readonly skills?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__SkillMigration>;
+  readonly subagents?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__SubagentMigration>;
+};
+export const V2ExternalAgentConfigDetectResponse__MigrationDetails = Schema.Struct({
+  commands: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigDetectResponse__CommandMigration).annotate({ default: [] }),
+  ),
+  hooks: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigDetectResponse__HookMigration).annotate({ default: [] }),
+  ),
+  mcpServers: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigDetectResponse__McpServerMigration).annotate({ default: [] }),
+  ),
+  memory: Schema.optionalKey(Schema.Array(Schema.String)),
+  plugins: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigDetectResponse__PluginsMigration).annotate({ default: [] }),
+  ),
+  sessions: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigDetectResponse__SessionMigration).annotate({ default: [] }),
+  ),
+  skills: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigDetectResponse__SkillMigration).annotate({ default: [] }),
+  ),
+  subagents: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigDetectResponse__SubagentMigration).annotate({ default: [] }),
+  ),
+}).annotate({ identifier: "V2ExternalAgentConfigDetectResponse__MigrationDetails" });
+
+export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure =
+  {
+    readonly cwd?: string | null;
+    readonly errorType?: string | null;
+    readonly failureStage: string;
+    readonly itemType: V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType;
+    readonly message: string;
+    readonly source?: string | null;
+    readonly subErrorType?: string | null;
+  };
+export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    failureStage: Schema.String,
+    itemType:
+      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType,
+    message: Schema.String,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure",
+  });
+
+export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess =
+  {
+    readonly cwd?: string | null;
+    readonly itemType: V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType;
+    readonly source?: string | null;
+    readonly target?: string | null;
+    readonly title?: string | null;
+  };
+export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    itemType:
+      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    title: Schema.optionalKey(
+      Schema.Union([
+        Schema.String.annotate({
+          description: "Original title for an imported session; null for other item types.",
+        }),
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess",
+  });
+
+export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorCandidate =
+  {
+    readonly name: string;
+    readonly sessionCount: number;
+    readonly source: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorSource;
+  };
+export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorCandidate =
+  Schema.Struct({
+    name: Schema.String,
+    sessionCount: Schema.Number.annotate({ format: "uint32" })
+      .check(Schema.isInt().annotate({ expected: "an integer" }))
+      .check(
+        Schema.isGreaterThanOrEqualTo(0).annotate({
+          expected: "a value greater than or equal to 0",
+        }),
+      ),
+    source: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorSource,
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentImportedConnectorCandidate",
+  });
+
+export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure =
+  {
+    readonly cwd?: string | null;
+    readonly errorType?: string | null;
+    readonly failureStage: string;
+    readonly itemType: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType;
+    readonly message: string;
+    readonly source?: string | null;
+    readonly subErrorType?: string | null;
+  };
+export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    failureStage: Schema.String,
+    itemType:
+      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType,
+    message: Schema.String,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure",
+  });
+
+export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess =
+  {
+    readonly cwd?: string | null;
+    readonly itemType: V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType;
+    readonly source?: string | null;
+    readonly target?: string | null;
+    readonly title?: string | null;
+  };
+export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    itemType:
+      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigMigrationItemType,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    title: Schema.optionalKey(
+      Schema.Union([
+        Schema.String.annotate({
+          description: "Original title for an imported session; null for other item types.",
+        }),
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess",
+  });
+
+export type V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportItemTypeFailure =
+  {
+    readonly cwd?: string | null;
+    readonly errorType?: string | null;
+    readonly failureStage: string;
+    readonly itemType: V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType;
+    readonly message: string;
+    readonly source?: string | null;
+    readonly subErrorType?: string | null;
+  };
+export const V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportItemTypeFailure =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    failureStage: Schema.String,
+    itemType: V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType,
+    message: Schema.String,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportItemTypeFailure",
+  });
+
+export type V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordSuccessParams =
+  {
+    readonly cwd?: string | null;
+    readonly itemType: V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType;
+    readonly source?: string | null;
+    readonly target?: string | null;
+    readonly title?: string | null;
+  };
+export const V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordSuccessParams =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    itemType: V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    title: Schema.optionalKey(
+      Schema.Union([
+        Schema.String.annotate({
+          description: "Original title for an imported session, when available.",
+        }),
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordSuccessParams",
+  });
+
+export type V2ExternalAgentConfigImportParams__MigrationDetails = {
+  readonly commands?: ReadonlyArray<V2ExternalAgentConfigImportParams__CommandMigration>;
+  readonly hooks?: ReadonlyArray<V2ExternalAgentConfigImportParams__HookMigration>;
+  readonly mcpServers?: ReadonlyArray<V2ExternalAgentConfigImportParams__McpServerMigration>;
+  readonly memory?: ReadonlyArray<string>;
+  readonly plugins?: ReadonlyArray<V2ExternalAgentConfigImportParams__PluginsMigration>;
+  readonly sessions?: ReadonlyArray<V2ExternalAgentConfigImportParams__SessionMigration>;
+  readonly skills?: ReadonlyArray<V2ExternalAgentConfigImportParams__SkillMigration>;
+  readonly subagents?: ReadonlyArray<V2ExternalAgentConfigImportParams__SubagentMigration>;
+};
+export const V2ExternalAgentConfigImportParams__MigrationDetails = Schema.Struct({
+  commands: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigImportParams__CommandMigration).annotate({ default: [] }),
+  ),
+  hooks: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigImportParams__HookMigration).annotate({ default: [] }),
+  ),
+  mcpServers: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigImportParams__McpServerMigration).annotate({ default: [] }),
+  ),
+  memory: Schema.optionalKey(Schema.Array(Schema.String)),
+  plugins: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigImportParams__PluginsMigration).annotate({ default: [] }),
+  ),
+  sessions: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigImportParams__SessionMigration).annotate({ default: [] }),
+  ),
+  skills: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigImportParams__SkillMigration).annotate({ default: [] }),
+  ),
+  subagents: Schema.optionalKey(
+    Schema.Array(V2ExternalAgentConfigImportParams__SubagentMigration).annotate({ default: [] }),
+  ),
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__MigrationDetails" });
+
+export type V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure =
+  {
+    readonly cwd?: string | null;
+    readonly errorType?: string | null;
+    readonly failureStage: string;
+    readonly itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType;
+    readonly message: string;
+    readonly source?: string | null;
+    readonly subErrorType?: string | null;
+  };
+export const V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    errorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    failureStage: Schema.String,
+    itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType,
+    message: Schema.String,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    subErrorType: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure",
+  });
+
+export type V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess =
+  {
+    readonly cwd?: string | null;
+    readonly itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType;
+    readonly source?: string | null;
+    readonly target?: string | null;
+    readonly title?: string | null;
+  };
+export const V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess =
+  Schema.Struct({
+    cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType,
+    source: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    target: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    title: Schema.optionalKey(
+      Schema.Union([
+        Schema.String.annotate({
+          description: "Original title for an imported session; null for other item types.",
+        }),
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess",
+  });
+
+export type V2FileChangePatchUpdatedNotification__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2FileChangePatchUpdatedNotification__PatchChangeKind;
+  readonly path: string;
+};
+export const V2FileChangePatchUpdatedNotification__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2FileChangePatchUpdatedNotification__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2FileChangePatchUpdatedNotification__FileUpdateChange" });
+
+export type V2GetAccountRateLimitsResponse__RateLimitResetCredit = {
+  readonly description?: string | null;
+  readonly expiresAt?: number | null;
+  readonly grantedAt: number;
+  readonly id: string;
+  readonly resetType: V2GetAccountRateLimitsResponse__RateLimitResetType;
+  readonly status: V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus;
+  readonly title?: string | null;
+};
+export const V2GetAccountRateLimitsResponse__RateLimitResetCredit = Schema.Struct({
+  description: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Backend-provided display description for this credit, or `null` when unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  expiresAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Unix timestamp in seconds when the credit expires, or `null` if it does not expire.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  grantedAt: Schema.Number.annotate({
+    description: "Unix timestamp in seconds when the credit was granted.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  id: Schema.String.annotate({ description: "Opaque backend identifier for this reset credit." }),
+  resetType: V2GetAccountRateLimitsResponse__RateLimitResetType,
+  status: V2GetAccountRateLimitsResponse__RateLimitResetCreditStatus,
+  title: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Backend-provided display title for this credit, or `null` when unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2GetAccountRateLimitsResponse__RateLimitResetCredit" });
+
+export type V2GetAccountRateLimitsResponse__RateLimitSnapshot = {
+  readonly credits?: V2GetAccountRateLimitsResponse__CreditsSnapshot | null;
+  readonly individualLimit?: V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot | null;
+  readonly limitId?: string | null;
+  readonly limitName?: string | null;
+  readonly normalModelSlug?: string | null;
+  readonly planType?: V2GetAccountRateLimitsResponse__PlanType | null;
+  readonly primary?: V2GetAccountRateLimitsResponse__RateLimitWindow | null;
+  readonly rateLimitReachedType?: V2GetAccountRateLimitsResponse__RateLimitReachedType | null;
+  readonly secondary?: V2GetAccountRateLimitsResponse__RateLimitWindow | null;
+  readonly spendControlReached?: boolean | null;
+};
+export const V2GetAccountRateLimitsResponse__RateLimitSnapshot = Schema.Struct({
+  credits: Schema.optionalKey(
+    Schema.Union([V2GetAccountRateLimitsResponse__CreditsSnapshot, Schema.Null]),
+  ),
+  individualLimit: Schema.optionalKey(
+    Schema.Union([V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot, Schema.Null]),
+  ),
+  limitId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  limitName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  normalModelSlug: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Normal model whose display name and reasoning options describe this quota alias.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  planType: Schema.optionalKey(
+    Schema.Union([V2GetAccountRateLimitsResponse__PlanType, Schema.Null]),
+  ),
+  primary: Schema.optionalKey(
+    Schema.Union([V2GetAccountRateLimitsResponse__RateLimitWindow, Schema.Null]),
+  ),
+  rateLimitReachedType: Schema.optionalKey(
+    Schema.Union([V2GetAccountRateLimitsResponse__RateLimitReachedType, Schema.Null]),
+  ),
+  secondary: Schema.optionalKey(
+    Schema.Union([V2GetAccountRateLimitsResponse__RateLimitWindow, Schema.Null]),
+  ),
+  spendControlReached: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description:
+          "Backend-reported spend-control state. `None` is unavailable, not a sparse-update recovery.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2GetAccountRateLimitsResponse__RateLimitSnapshot" });
+
+export type V2GetAccountResponse__Account =
+  | { readonly type: "apiKey" }
+  | {
+      readonly email: string | null;
+      readonly planType: V2GetAccountResponse__PlanType;
+      readonly type: "chatgpt";
+    }
+  | { readonly type: "amazonBedrock"; readonly usesCodexManagedCredentials?: boolean };
+export const V2GetAccountResponse__Account = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("apiKey").annotate({ title: "ApiKeyAccountType" }),
+    }).annotate({ title: "ApiKeyAccount" }),
+    Schema.Struct({
+      email: Schema.Union([Schema.String, Schema.Null]),
+      planType: V2GetAccountResponse__PlanType,
+      type: Schema.Literal("chatgpt").annotate({ title: "ChatgptAccountType" }),
+    }).annotate({ title: "ChatgptAccount" }),
+    Schema.Struct({
+      type: Schema.Literal("amazonBedrock").annotate({ title: "AmazonBedrockAccountType" }),
+      usesCodexManagedCredentials: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+    }).annotate({ title: "AmazonBedrockAccount" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2GetAccountResponse__Account" });
+
+export type V2GetAccountTokenUsageResponse__ThreadUsage = {
+  readonly estimatedUsageCreditsMicros: number;
+  readonly estimatedUsageUsdMicros?: number | null;
+  readonly groups: ReadonlyArray<V2GetAccountTokenUsageResponse__ThreadUsageBreakdownGroup>;
+  readonly threadId: string;
+};
+export const V2GetAccountTokenUsageResponse__ThreadUsage = Schema.Struct({
+  estimatedUsageCreditsMicros: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  estimatedUsageUsdMicros: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  groups: Schema.Array(V2GetAccountTokenUsageResponse__ThreadUsageBreakdownGroup),
+  threadId: Schema.String,
+}).annotate({ identifier: "V2GetAccountTokenUsageResponse__ThreadUsage" });
+
+export type V2GetWorkspaceMessagesResponse__WorkspaceMessage = {
+  readonly archivedAt?: number | null;
+  readonly createdAt?: number | null;
+  readonly messageBody: string;
+  readonly messageId: string;
+  readonly messageType: V2GetWorkspaceMessagesResponse__WorkspaceMessageType;
+};
+export const V2GetWorkspaceMessagesResponse__WorkspaceMessage = Schema.Struct({
+  archivedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp (in seconds) when the message was archived.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  createdAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp (in seconds) when the message was created.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  messageBody: Schema.String,
+  messageId: Schema.String,
+  messageType: V2GetWorkspaceMessagesResponse__WorkspaceMessageType,
+}).annotate({ identifier: "V2GetWorkspaceMessagesResponse__WorkspaceMessage" });
+
+export type V2HookCompletedNotification__HookOutputEntry = {
+  readonly kind: V2HookCompletedNotification__HookOutputEntryKind;
+  readonly text: string;
+};
+export const V2HookCompletedNotification__HookOutputEntry = Schema.Struct({
+  kind: V2HookCompletedNotification__HookOutputEntryKind,
+  text: Schema.String,
+}).annotate({ identifier: "V2HookCompletedNotification__HookOutputEntry" });
+
+export type V2HooksListResponse__HookMetadata =
+  | {
+      readonly additionalContextLimit?: number | null;
+      readonly currentHash: string;
+      readonly displayOrder: number;
+      readonly enabled: boolean;
+      readonly eventName: V2HooksListResponse__HookEventName;
+      readonly isManaged: boolean;
+      readonly key: string;
+      readonly matcher?: string | null;
+      readonly pluginId?: string | null;
+      readonly source: V2HooksListResponse__HookSource;
+      readonly sourcePath: V2HooksListResponse__AbsolutePathBuf;
+      readonly statusMessage?: string | null;
+      readonly timeoutSec: number;
+      readonly trustStatus: V2HooksListResponse__HookTrustStatus;
+      readonly async?: boolean;
+      readonly command: string;
+      readonly handlerType: "command";
+    }
+  | {
+      readonly additionalContextLimit?: number | null;
+      readonly currentHash: string;
+      readonly displayOrder: number;
+      readonly enabled: boolean;
+      readonly eventName: V2HooksListResponse__HookEventName;
+      readonly isManaged: boolean;
+      readonly key: string;
+      readonly matcher?: string | null;
+      readonly pluginId?: string | null;
+      readonly source: V2HooksListResponse__HookSource;
+      readonly sourcePath: V2HooksListResponse__AbsolutePathBuf;
+      readonly statusMessage?: string | null;
+      readonly timeoutSec: number;
+      readonly trustStatus: V2HooksListResponse__HookTrustStatus;
+      readonly handlerType: "mcpTool";
+      readonly server: string;
+      readonly tool: string;
+    }
+  | {
+      readonly additionalContextLimit?: number | null;
+      readonly currentHash: string;
+      readonly displayOrder: number;
+      readonly enabled: boolean;
+      readonly eventName: V2HooksListResponse__HookEventName;
+      readonly isManaged: boolean;
+      readonly key: string;
+      readonly matcher?: string | null;
+      readonly pluginId?: string | null;
+      readonly source: V2HooksListResponse__HookSource;
+      readonly sourcePath: V2HooksListResponse__AbsolutePathBuf;
+      readonly statusMessage?: string | null;
+      readonly timeoutSec: number;
+      readonly trustStatus: V2HooksListResponse__HookTrustStatus;
+      readonly handlerType: "prompt";
+    }
+  | {
+      readonly additionalContextLimit?: number | null;
+      readonly currentHash: string;
+      readonly displayOrder: number;
+      readonly enabled: boolean;
+      readonly eventName: V2HooksListResponse__HookEventName;
+      readonly isManaged: boolean;
+      readonly key: string;
+      readonly matcher?: string | null;
+      readonly pluginId?: string | null;
+      readonly source: V2HooksListResponse__HookSource;
+      readonly sourcePath: V2HooksListResponse__AbsolutePathBuf;
+      readonly statusMessage?: string | null;
+      readonly timeoutSec: number;
+      readonly trustStatus: V2HooksListResponse__HookTrustStatus;
+      readonly handlerType: "agent";
+    };
+export const V2HooksListResponse__HookMetadata = Schema.Union(
+  [
+    Schema.Struct({
+      additionalContextLimit: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description:
+              "Configured `additionalContext` spill threshold. `null` uses 2,500 tokens; `0` disables spilling.",
+            format: "uint",
+          })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      currentHash: Schema.String,
+      displayOrder: Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      enabled: Schema.Boolean,
+      eventName: V2HooksListResponse__HookEventName,
+      isManaged: Schema.Boolean,
+      key: Schema.String,
+      matcher: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      source: V2HooksListResponse__HookSource,
+      sourcePath: V2HooksListResponse__AbsolutePathBuf,
+      statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      timeoutSec: Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      trustStatus: V2HooksListResponse__HookTrustStatus,
+      async: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      command: Schema.String,
+      handlerType: Schema.Literal("command"),
+    }),
+    Schema.Struct({
+      additionalContextLimit: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description:
+              "Configured `additionalContext` spill threshold. `null` uses 2,500 tokens; `0` disables spilling.",
+            format: "uint",
+          })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      currentHash: Schema.String,
+      displayOrder: Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      enabled: Schema.Boolean,
+      eventName: V2HooksListResponse__HookEventName,
+      isManaged: Schema.Boolean,
+      key: Schema.String,
+      matcher: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      source: V2HooksListResponse__HookSource,
+      sourcePath: V2HooksListResponse__AbsolutePathBuf,
+      statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      timeoutSec: Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      trustStatus: V2HooksListResponse__HookTrustStatus,
+      handlerType: Schema.Literal("mcpTool"),
+      server: Schema.String,
+      tool: Schema.String,
+    }),
+    Schema.Struct({
+      additionalContextLimit: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description:
+              "Configured `additionalContext` spill threshold. `null` uses 2,500 tokens; `0` disables spilling.",
+            format: "uint",
+          })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      currentHash: Schema.String,
+      displayOrder: Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      enabled: Schema.Boolean,
+      eventName: V2HooksListResponse__HookEventName,
+      isManaged: Schema.Boolean,
+      key: Schema.String,
+      matcher: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      source: V2HooksListResponse__HookSource,
+      sourcePath: V2HooksListResponse__AbsolutePathBuf,
+      statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      timeoutSec: Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      trustStatus: V2HooksListResponse__HookTrustStatus,
+      handlerType: Schema.Literal("prompt"),
+    }).annotate({ title: "PromptHookMetadata" }),
+    Schema.Struct({
+      additionalContextLimit: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description:
+              "Configured `additionalContext` spill threshold. `null` uses 2,500 tokens; `0` disables spilling.",
+            format: "uint",
+          })
+            .check(Schema.isInt().annotate({ expected: "an integer" }))
+            .check(
+              Schema.isGreaterThanOrEqualTo(0).annotate({
+                expected: "a value greater than or equal to 0",
+              }),
+            ),
+          Schema.Null,
+        ]),
+      ),
+      currentHash: Schema.String,
+      displayOrder: Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      enabled: Schema.Boolean,
+      eventName: V2HooksListResponse__HookEventName,
+      isManaged: Schema.Boolean,
+      key: Schema.String,
+      matcher: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      source: V2HooksListResponse__HookSource,
+      sourcePath: V2HooksListResponse__AbsolutePathBuf,
+      statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      timeoutSec: Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      trustStatus: V2HooksListResponse__HookTrustStatus,
+      handlerType: Schema.Literal("agent"),
+    }).annotate({ title: "AgentHookMetadata" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2HooksListResponse__HookMetadata" });
+
+export type V2HookStartedNotification__HookOutputEntry = {
+  readonly kind: V2HookStartedNotification__HookOutputEntryKind;
+  readonly text: string;
+};
+export const V2HookStartedNotification__HookOutputEntry = Schema.Struct({
+  kind: V2HookStartedNotification__HookOutputEntryKind,
+  text: Schema.String,
+}).annotate({ identifier: "V2HookStartedNotification__HookOutputEntry" });
+
+export type V2ItemCompletedNotification__TextElement = {
+  readonly byteRange: V2ItemCompletedNotification__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ItemCompletedNotification__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ItemCompletedNotification__ByteRange> =>
+      V2ItemCompletedNotification__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ItemCompletedNotification__TextElement" });
+
+export type V2ItemCompletedNotification__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ItemCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ItemCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ItemCompletedNotification__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ItemCompletedNotification__FunctionCallOutputContentItem",
+});
+
+export type V2ItemCompletedNotification__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ItemCompletedNotification__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ItemCompletedNotification__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ItemCompletedNotification__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ItemCompletedNotification__MemoryCitation" });
+
+export type V2ItemCompletedNotification__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ItemCompletedNotification__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ItemCompletedNotification__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ItemCompletedNotification__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemCompletedNotification__CommandAction" });
+
+export type V2ItemCompletedNotification__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ItemCompletedNotification__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ItemCompletedNotification__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ItemCompletedNotification__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ItemCompletedNotification__FileUpdateChange" });
+
+export type V2ItemCompletedNotification__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ItemCompletedNotification__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ItemCompletedNotification__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ItemCompletedNotification__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ItemCompletedNotification__McpAppUi",
+});
+
+export type V2ItemCompletedNotification__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ItemCompletedNotification__CollabAgentStatus;
+};
+export const V2ItemCompletedNotification__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ItemCompletedNotification__CollabAgentStatus,
+}).annotate({ identifier: "V2ItemCompletedNotification__CollabAgentState" });
+
+export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath =
+  | { readonly kind: "root" }
+  | { readonly kind: "minimal" }
+  | {
+      readonly kind: "project_roots";
+      readonly subpath?: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString | null;
+    }
+  | { readonly kind: "tmpdir" }
+  | { readonly kind: "slash_tmp" }
+  | {
+      readonly kind: "unknown";
+      readonly path: string;
+      readonly subpath?: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString | null;
+    };
+export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath =
+  Schema.Union(
+    [
+      Schema.Struct({ kind: Schema.Literal("root") }).annotate({
+        title: "RootFileSystemSpecialPath",
+      }),
+      Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
+        title: "MinimalFileSystemSpecialPath",
+      }),
+      Schema.Struct({
+        kind: Schema.Literal("project_roots"),
+        subpath: Schema.optionalKey(
+          Schema.Union([
+            V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
+            Schema.Null,
+          ]),
+        ),
+      }).annotate({ title: "KindFileSystemSpecialPath" }),
+      Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
+        title: "TmpdirFileSystemSpecialPath",
+      }),
+      Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
+        title: "SlashTmpFileSystemSpecialPath",
+      }),
+      Schema.Struct({
+        kind: Schema.Literal("unknown"),
+        path: Schema.String,
+        subpath: Schema.optionalKey(
+          Schema.Union([
+            V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
+            Schema.Null,
+          ]),
+        ),
+      }),
+    ],
+    { mode: "oneOf" },
+  ).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath",
+  });
+
+export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReview = {
+  readonly rationale?: string | null;
+  readonly riskLevel?: V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel | null;
+  readonly status: V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewStatus;
+  readonly userAuthorization?: V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAuthorization | null;
+};
+export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReview =
+  Schema.Struct({
+    rationale: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    riskLevel: Schema.optionalKey(
+      Schema.Union([
+        V2ItemGuardianApprovalReviewCompletedNotification__GuardianRiskLevel,
+        Schema.Null,
+      ]),
+    ),
+    status: V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewStatus,
+    userAuthorization: Schema.optionalKey(
+      Schema.Union([
+        V2ItemGuardianApprovalReviewCompletedNotification__GuardianUserAuthorization,
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    description:
+      "[UNSTABLE] Temporary approval auto-review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReview",
+  });
+
+export type V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath =
+  | { readonly kind: "root" }
+  | { readonly kind: "minimal" }
+  | {
+      readonly kind: "project_roots";
+      readonly subpath?: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString | null;
+    }
+  | { readonly kind: "tmpdir" }
+  | { readonly kind: "slash_tmp" }
+  | {
+      readonly kind: "unknown";
+      readonly path: string;
+      readonly subpath?: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString | null;
+    };
+export const V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath = Schema.Union(
+  [
+    Schema.Struct({ kind: Schema.Literal("root") }).annotate({
+      title: "RootFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("minimal") }).annotate({
+      title: "MinimalFileSystemSpecialPath",
+    }),
+    Schema.Struct({
+      kind: Schema.Literal("project_roots"),
+      subpath: Schema.optionalKey(
+        Schema.Union([
+          V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
+          Schema.Null,
+        ]),
+      ),
+    }).annotate({ title: "KindFileSystemSpecialPath" }),
+    Schema.Struct({ kind: Schema.Literal("tmpdir") }).annotate({
+      title: "TmpdirFileSystemSpecialPath",
+    }),
+    Schema.Struct({ kind: Schema.Literal("slash_tmp") }).annotate({
+      title: "SlashTmpFileSystemSpecialPath",
+    }),
+    Schema.Struct({
+      kind: Schema.Literal("unknown"),
+      path: Schema.String,
+      subpath: Schema.optionalKey(
+        Schema.Union([
+          V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
+          Schema.Null,
+        ]),
+      ),
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  identifier: "V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath",
+});
+
+export type V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReview = {
+  readonly rationale?: string | null;
+  readonly riskLevel?: V2ItemGuardianApprovalReviewStartedNotification__GuardianRiskLevel | null;
+  readonly status: V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus;
+  readonly userAuthorization?: V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthorization | null;
+};
+export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReview =
+  Schema.Struct({
+    rationale: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    riskLevel: Schema.optionalKey(
+      Schema.Union([
+        V2ItemGuardianApprovalReviewStartedNotification__GuardianRiskLevel,
+        Schema.Null,
+      ]),
+    ),
+    status: V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewStatus,
+    userAuthorization: Schema.optionalKey(
+      Schema.Union([
+        V2ItemGuardianApprovalReviewStartedNotification__GuardianUserAuthorization,
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    description:
+      "[UNSTABLE] Temporary approval auto-review payload used by `item/autoApprovalReview/*` notifications. This shape is expected to change soon.",
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReview",
+  });
+
+export type V2ItemStartedNotification__TextElement = {
+  readonly byteRange: V2ItemStartedNotification__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ItemStartedNotification__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ItemStartedNotification__ByteRange> => V2ItemStartedNotification__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ItemStartedNotification__TextElement" });
+
+export type V2ItemStartedNotification__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ItemStartedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ItemStartedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ItemStartedNotification__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ItemStartedNotification__FunctionCallOutputContentItem",
+});
+
+export type V2ItemStartedNotification__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ItemStartedNotification__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ItemStartedNotification__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ItemStartedNotification__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ItemStartedNotification__MemoryCitation" });
+
+export type V2ItemStartedNotification__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ItemStartedNotification__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ItemStartedNotification__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ItemStartedNotification__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemStartedNotification__CommandAction" });
+
+export type V2ItemStartedNotification__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ItemStartedNotification__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ItemStartedNotification__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ItemStartedNotification__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ItemStartedNotification__FileUpdateChange" });
+
+export type V2ItemStartedNotification__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ItemStartedNotification__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ItemStartedNotification__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ItemStartedNotification__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ItemStartedNotification__McpAppUi",
+});
+
+export type V2ItemStartedNotification__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ItemStartedNotification__CollabAgentStatus;
+};
+export const V2ItemStartedNotification__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ItemStartedNotification__CollabAgentStatus,
+}).annotate({ identifier: "V2ItemStartedNotification__CollabAgentState" });
+
+export type V2ListMcpServerStatusResponse__McpServerStatus = {
+  readonly authStatus: V2ListMcpServerStatusResponse__McpAuthStatus;
+  readonly httpOrigin?: string | null;
+  readonly name: string;
+  readonly pluginId?: string | null;
+  readonly resourceTemplates: ReadonlyArray<V2ListMcpServerStatusResponse__ResourceTemplate>;
+  readonly resources: ReadonlyArray<V2ListMcpServerStatusResponse__Resource>;
+  readonly runtimeStatus?: V2ListMcpServerStatusResponse__McpServerConnectionStatus | null;
+  readonly serverCapabilities?: Schema.Json;
+  readonly serverInfo?: V2ListMcpServerStatusResponse__McpServerInfo | null;
+  readonly tools: { readonly [x: string]: V2ListMcpServerStatusResponse__Tool };
+  readonly toolsError?: string | null;
+};
+export const V2ListMcpServerStatusResponse__McpServerStatus = Schema.Struct({
+  authStatus: V2ListMcpServerStatusResponse__McpAuthStatus,
+  httpOrigin: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "HTTP origin of the effective configured endpoint, including plugin servers. Excludes credentials, path, query, and fragment; null for non-HTTP transports.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  name: Schema.String,
+  pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  resourceTemplates: Schema.Array(V2ListMcpServerStatusResponse__ResourceTemplate),
+  resources: Schema.Array(V2ListMcpServerStatusResponse__Resource),
+  runtimeStatus: Schema.optionalKey(
+    Schema.Union([V2ListMcpServerStatusResponse__McpServerConnectionStatus, Schema.Null]).annotate({
+      description:
+        "Current thread-runtime connection state; null when unavailable or the configuration changed.",
+    }),
+  ),
+  serverCapabilities: Schema.optionalKey(
+    Schema.Json.annotate({
+      expected: "JSON value",
+      description: "Capabilities advertised by the initialized MCP server; null when unavailable.",
+    }),
+  ),
+  serverInfo: Schema.optionalKey(
+    Schema.Union([V2ListMcpServerStatusResponse__McpServerInfo, Schema.Null]),
+  ),
+  tools: Schema.Record(Schema.String, V2ListMcpServerStatusResponse__Tool),
+  toolsError: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Tool discovery failed and no catalog was returned. Null when a catalog is returned, including cached or empty catalogs.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ListMcpServerStatusResponse__McpServerStatus" });
+
+export type V2ModelListResponse__ModelAccessPrograms = {
+  readonly cyber: ReadonlyArray<V2ModelListResponse__CyberAccessProgram>;
+};
+export const V2ModelListResponse__ModelAccessPrograms = Schema.Struct({
+  cyber: Schema.Array(V2ModelListResponse__CyberAccessProgram).annotate({
+    description: "Accepted explicit selections.",
+  }),
+}).annotate({
+  description: "Caller-specific explicit access programs advertised by model discovery.",
+  identifier: "V2ModelListResponse__ModelAccessPrograms",
+});
+
+export type V2ModelListResponse__ReasoningEffortOption = {
+  readonly description: string;
+  readonly reasoningEffort: V2ModelListResponse__ReasoningEffort;
+};
+export const V2ModelListResponse__ReasoningEffortOption = Schema.Struct({
+  description: Schema.String,
+  reasoningEffort: V2ModelListResponse__ReasoningEffort,
+}).annotate({ identifier: "V2ModelListResponse__ReasoningEffortOption" });
+
+export type V2PluginInstalledResponse__MarketplaceLoadErrorInfo = {
+  readonly marketplacePath: V2PluginInstalledResponse__AbsolutePathBuf;
+  readonly message: string;
+};
+export const V2PluginInstalledResponse__MarketplaceLoadErrorInfo = Schema.Struct({
+  marketplacePath: V2PluginInstalledResponse__AbsolutePathBuf,
+  message: Schema.String,
+}).annotate({ identifier: "V2PluginInstalledResponse__MarketplaceLoadErrorInfo" });
+
+export type V2PluginInstalledResponse__PluginInterface = {
+  readonly brandColor?: string | null;
+  readonly capabilities: ReadonlyArray<string>;
+  readonly category?: string | null;
+  readonly composerIcon?: V2PluginInstalledResponse__AbsolutePathBuf | null;
+  readonly composerIconUrl?: string | null;
+  readonly defaultPrompt?: ReadonlyArray<string> | null;
+  readonly developerName?: string | null;
+  readonly displayName?: string | null;
+  readonly logo?: V2PluginInstalledResponse__AbsolutePathBuf | null;
+  readonly logoDark?: V2PluginInstalledResponse__AbsolutePathBuf | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly longDescription?: string | null;
+  readonly privacyPolicyUrl?: string | null;
+  readonly screenshotUrls: ReadonlyArray<string>;
+  readonly screenshots: ReadonlyArray<V2PluginInstalledResponse__AbsolutePathBuf>;
+  readonly shortDescription?: string | null;
+  readonly termsOfServiceUrl?: string | null;
+  readonly websiteUrl?: string | null;
+};
+export const V2PluginInstalledResponse__PluginInterface = Schema.Struct({
+  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  capabilities: Schema.Array(Schema.String),
+  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  composerIcon: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local composer icon path, resolved from the installed plugin package.",
+    }),
+  ),
+  composerIconUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  defaultPrompt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logo: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoDark: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local dark-mode logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  logoUrlDark: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  screenshotUrls: Schema.Array(Schema.String).annotate({
+    description: "Remote screenshot URLs from the plugin catalog.",
+  }),
+  screenshots: Schema.Array(V2PluginInstalledResponse__AbsolutePathBuf).annotate({
+    description: "Local screenshot paths, resolved from the installed plugin package.",
+  }),
+  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginInstalledResponse__PluginInterface" });
+
+export type V2PluginInstalledResponse__PluginSource =
+  | { readonly path: V2PluginInstalledResponse__AbsolutePathBuf; readonly type: "local" }
+  | {
+      readonly path?: string | null;
+      readonly refName?: string | null;
+      readonly sha?: string | null;
+      readonly type: "git";
+      readonly url: string;
+    }
+  | {
+      readonly package: string;
+      readonly registry?: string | null;
+      readonly type: "npm";
+      readonly version?: string | null;
+    }
+  | { readonly type: "remote" };
+export const V2PluginInstalledResponse__PluginSource = Schema.Union(
+  [
+    Schema.Struct({
+      path: V2PluginInstalledResponse__AbsolutePathBuf,
+      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
+    }).annotate({ title: "LocalPluginSource" }),
+    Schema.Struct({
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
+      url: Schema.String,
+    }).annotate({ title: "GitPluginSource" }),
+    Schema.Struct({
+      package: Schema.String,
+      registry: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
+      version: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({ description: "Optional npm version or version range." }),
+          Schema.Null,
+        ]),
+      ),
+    }).annotate({ title: "NpmPluginSource" }),
+    Schema.Struct({
+      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
+    }).annotate({
+      title: "RemotePluginSource",
+      description:
+        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginInstalledResponse__PluginSource" });
+
+export type V2PluginInstalledResponse__PluginSharePrincipal = {
+  readonly name: string;
+  readonly principalId: string;
+  readonly principalType: V2PluginInstalledResponse__PluginSharePrincipalType;
+  readonly role: V2PluginInstalledResponse__PluginSharePrincipalRole;
+};
+export const V2PluginInstalledResponse__PluginSharePrincipal = Schema.Struct({
+  name: Schema.String,
+  principalId: Schema.String,
+  principalType: V2PluginInstalledResponse__PluginSharePrincipalType,
+  role: V2PluginInstalledResponse__PluginSharePrincipalRole,
+}).annotate({ identifier: "V2PluginInstalledResponse__PluginSharePrincipal" });
+
+export type V2PluginListResponse__MarketplaceLoadErrorInfo = {
+  readonly marketplacePath: V2PluginListResponse__AbsolutePathBuf;
+  readonly message: string;
+};
+export const V2PluginListResponse__MarketplaceLoadErrorInfo = Schema.Struct({
+  marketplacePath: V2PluginListResponse__AbsolutePathBuf,
+  message: Schema.String,
+}).annotate({ identifier: "V2PluginListResponse__MarketplaceLoadErrorInfo" });
+
+export type V2PluginListResponse__PluginInterface = {
+  readonly brandColor?: string | null;
+  readonly capabilities: ReadonlyArray<string>;
+  readonly category?: string | null;
+  readonly composerIcon?: V2PluginListResponse__AbsolutePathBuf | null;
+  readonly composerIconUrl?: string | null;
+  readonly defaultPrompt?: ReadonlyArray<string> | null;
+  readonly developerName?: string | null;
+  readonly displayName?: string | null;
+  readonly logo?: V2PluginListResponse__AbsolutePathBuf | null;
+  readonly logoDark?: V2PluginListResponse__AbsolutePathBuf | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly longDescription?: string | null;
+  readonly privacyPolicyUrl?: string | null;
+  readonly screenshotUrls: ReadonlyArray<string>;
+  readonly screenshots: ReadonlyArray<V2PluginListResponse__AbsolutePathBuf>;
+  readonly shortDescription?: string | null;
+  readonly termsOfServiceUrl?: string | null;
+  readonly websiteUrl?: string | null;
+};
+export const V2PluginListResponse__PluginInterface = Schema.Struct({
+  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  capabilities: Schema.Array(Schema.String),
+  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  composerIcon: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local composer icon path, resolved from the installed plugin package.",
+    }),
+  ),
+  composerIconUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  defaultPrompt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logo: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoDark: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local dark-mode logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  logoUrlDark: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  screenshotUrls: Schema.Array(Schema.String).annotate({
+    description: "Remote screenshot URLs from the plugin catalog.",
+  }),
+  screenshots: Schema.Array(V2PluginListResponse__AbsolutePathBuf).annotate({
+    description: "Local screenshot paths, resolved from the installed plugin package.",
+  }),
+  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginListResponse__PluginInterface" });
+
+export type V2PluginListResponse__PluginSource =
+  | { readonly path: V2PluginListResponse__AbsolutePathBuf; readonly type: "local" }
+  | {
+      readonly path?: string | null;
+      readonly refName?: string | null;
+      readonly sha?: string | null;
+      readonly type: "git";
+      readonly url: string;
+    }
+  | {
+      readonly package: string;
+      readonly registry?: string | null;
+      readonly type: "npm";
+      readonly version?: string | null;
+    }
+  | { readonly type: "remote" };
+export const V2PluginListResponse__PluginSource = Schema.Union(
+  [
+    Schema.Struct({
+      path: V2PluginListResponse__AbsolutePathBuf,
+      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
+    }).annotate({ title: "LocalPluginSource" }),
+    Schema.Struct({
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
+      url: Schema.String,
+    }).annotate({ title: "GitPluginSource" }),
+    Schema.Struct({
+      package: Schema.String,
+      registry: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
+      version: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({ description: "Optional npm version or version range." }),
+          Schema.Null,
+        ]),
+      ),
+    }).annotate({ title: "NpmPluginSource" }),
+    Schema.Struct({
+      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
+    }).annotate({
+      title: "RemotePluginSource",
+      description:
+        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginListResponse__PluginSource" });
+
+export type V2PluginListResponse__PluginSharePrincipal = {
+  readonly name: string;
+  readonly principalId: string;
+  readonly principalType: V2PluginListResponse__PluginSharePrincipalType;
+  readonly role: V2PluginListResponse__PluginSharePrincipalRole;
+};
+export const V2PluginListResponse__PluginSharePrincipal = Schema.Struct({
+  name: Schema.String,
+  principalId: Schema.String,
+  principalType: V2PluginListResponse__PluginSharePrincipalType,
+  role: V2PluginListResponse__PluginSharePrincipalRole,
+}).annotate({ identifier: "V2PluginListResponse__PluginSharePrincipal" });
+
+export type V2PluginReadResponse__AppTemplateSummary = {
+  readonly canonicalConnectorId?: string | null;
+  readonly category?: string | null;
+  readonly description?: string | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly materializedAppIds: ReadonlyArray<string>;
+  readonly name: string;
+  readonly reason?: V2PluginReadResponse__AppTemplateUnavailableReason | null;
+  readonly templateId: string;
+};
+export const V2PluginReadResponse__AppTemplateSummary = Schema.Struct({
+  canonicalConnectorId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  materializedAppIds: Schema.Array(Schema.String),
+  name: Schema.String,
+  reason: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__AppTemplateUnavailableReason, Schema.Null]),
+  ),
+  templateId: Schema.String,
+}).annotate({ identifier: "V2PluginReadResponse__AppTemplateSummary" });
+
+export type V2PluginReadResponse__PluginHookSummary = {
+  readonly eventName: V2PluginReadResponse__HookEventName;
+  readonly key: string;
+};
+export const V2PluginReadResponse__PluginHookSummary = Schema.Struct({
+  eventName: V2PluginReadResponse__HookEventName,
+  key: Schema.String,
+}).annotate({ identifier: "V2PluginReadResponse__PluginHookSummary" });
+
+export type V2PluginReadResponse__SkillInterface = {
+  readonly brandColor?: string | null;
+  readonly defaultPrompt?: string | null;
+  readonly displayName?: string | null;
+  readonly iconLarge?: V2PluginReadResponse__AbsolutePathBuf | null;
+  readonly iconLargeUrl?: string | null;
+  readonly iconSmall?: V2PluginReadResponse__AbsolutePathBuf | null;
+  readonly iconSmallUrl?: string | null;
+  readonly shortDescription?: string | null;
+};
+export const V2PluginReadResponse__SkillInterface = Schema.Struct({
+  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  defaultPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  iconLarge: Schema.optionalKey(Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null])),
+  iconLargeUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote large icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  iconSmall: Schema.optionalKey(Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null])),
+  iconSmallUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote small icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginReadResponse__SkillInterface" });
+
+export type V2PluginReadResponse__PluginInterface = {
+  readonly brandColor?: string | null;
+  readonly capabilities: ReadonlyArray<string>;
+  readonly category?: string | null;
+  readonly composerIcon?: V2PluginReadResponse__AbsolutePathBuf | null;
+  readonly composerIconUrl?: string | null;
+  readonly defaultPrompt?: ReadonlyArray<string> | null;
+  readonly developerName?: string | null;
+  readonly displayName?: string | null;
+  readonly logo?: V2PluginReadResponse__AbsolutePathBuf | null;
+  readonly logoDark?: V2PluginReadResponse__AbsolutePathBuf | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly longDescription?: string | null;
+  readonly privacyPolicyUrl?: string | null;
+  readonly screenshotUrls: ReadonlyArray<string>;
+  readonly screenshots: ReadonlyArray<V2PluginReadResponse__AbsolutePathBuf>;
+  readonly shortDescription?: string | null;
+  readonly termsOfServiceUrl?: string | null;
+  readonly websiteUrl?: string | null;
+};
+export const V2PluginReadResponse__PluginInterface = Schema.Struct({
+  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  capabilities: Schema.Array(Schema.String),
+  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  composerIcon: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local composer icon path, resolved from the installed plugin package.",
+    }),
+  ),
+  composerIconUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  defaultPrompt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logo: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoDark: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local dark-mode logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  logoUrlDark: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  screenshotUrls: Schema.Array(Schema.String).annotate({
+    description: "Remote screenshot URLs from the plugin catalog.",
+  }),
+  screenshots: Schema.Array(V2PluginReadResponse__AbsolutePathBuf).annotate({
+    description: "Local screenshot paths, resolved from the installed plugin package.",
+  }),
+  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginReadResponse__PluginInterface" });
+
+export type V2PluginReadResponse__PluginSource =
+  | { readonly path: V2PluginReadResponse__AbsolutePathBuf; readonly type: "local" }
+  | {
+      readonly path?: string | null;
+      readonly refName?: string | null;
+      readonly sha?: string | null;
+      readonly type: "git";
+      readonly url: string;
+    }
+  | {
+      readonly package: string;
+      readonly registry?: string | null;
+      readonly type: "npm";
+      readonly version?: string | null;
+    }
+  | { readonly type: "remote" };
+export const V2PluginReadResponse__PluginSource = Schema.Union(
+  [
+    Schema.Struct({
+      path: V2PluginReadResponse__AbsolutePathBuf,
+      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
+    }).annotate({ title: "LocalPluginSource" }),
+    Schema.Struct({
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
+      url: Schema.String,
+    }).annotate({ title: "GitPluginSource" }),
+    Schema.Struct({
+      package: Schema.String,
+      registry: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
+      version: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({ description: "Optional npm version or version range." }),
+          Schema.Null,
+        ]),
+      ),
+    }).annotate({ title: "NpmPluginSource" }),
+    Schema.Struct({
+      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
+    }).annotate({
+      title: "RemotePluginSource",
+      description:
+        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginReadResponse__PluginSource" });
+
+export type V2PluginReadResponse__ScheduledTaskSchedule =
+  | {
+      readonly days?: ReadonlyArray<V2PluginReadResponse__ScheduledTaskWeekday> | null;
+      readonly intervalHours: number;
+      readonly type: "hourly";
+    }
+  | { readonly time: string; readonly type: "daily" }
+  | { readonly time: string; readonly type: "weekdays" }
+  | {
+      readonly days: ReadonlyArray<V2PluginReadResponse__ScheduledTaskWeekday>;
+      readonly time: string;
+      readonly type: "weekly";
+    };
+export const V2PluginReadResponse__ScheduledTaskSchedule = Schema.Union(
+  [
+    Schema.Struct({
+      days: Schema.optionalKey(
+        Schema.Union([Schema.Array(V2PluginReadResponse__ScheduledTaskWeekday), Schema.Null]),
+      ),
+      intervalHours: Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      type: Schema.Literal("hourly").annotate({ title: "HourlyScheduledTaskScheduleType" }),
+    }).annotate({ title: "HourlyScheduledTaskSchedule" }),
+    Schema.Struct({
+      time: Schema.String,
+      type: Schema.Literal("daily").annotate({ title: "DailyScheduledTaskScheduleType" }),
+    }).annotate({ title: "DailyScheduledTaskSchedule" }),
+    Schema.Struct({
+      time: Schema.String,
+      type: Schema.Literal("weekdays").annotate({ title: "WeekdaysScheduledTaskScheduleType" }),
+    }).annotate({ title: "WeekdaysScheduledTaskSchedule" }),
+    Schema.Struct({
+      days: Schema.Array(V2PluginReadResponse__ScheduledTaskWeekday),
+      time: Schema.String,
+      type: Schema.Literal("weekly").annotate({ title: "WeeklyScheduledTaskScheduleType" }),
+    }).annotate({ title: "WeeklyScheduledTaskSchedule" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginReadResponse__ScheduledTaskSchedule" });
+
+export type V2PluginReadResponse__PluginSharePrincipal = {
+  readonly name: string;
+  readonly principalId: string;
+  readonly principalType: V2PluginReadResponse__PluginSharePrincipalType;
+  readonly role: V2PluginReadResponse__PluginSharePrincipalRole;
+};
+export const V2PluginReadResponse__PluginSharePrincipal = Schema.Struct({
+  name: Schema.String,
+  principalId: Schema.String,
+  principalType: V2PluginReadResponse__PluginSharePrincipalType,
+  role: V2PluginReadResponse__PluginSharePrincipalRole,
+}).annotate({ identifier: "V2PluginReadResponse__PluginSharePrincipal" });
+
+export type V2PluginShareListResponse__PluginInterface = {
+  readonly brandColor?: string | null;
+  readonly capabilities: ReadonlyArray<string>;
+  readonly category?: string | null;
+  readonly composerIcon?: V2PluginShareListResponse__AbsolutePathBuf | null;
+  readonly composerIconUrl?: string | null;
+  readonly defaultPrompt?: ReadonlyArray<string> | null;
+  readonly developerName?: string | null;
+  readonly displayName?: string | null;
+  readonly logo?: V2PluginShareListResponse__AbsolutePathBuf | null;
+  readonly logoDark?: V2PluginShareListResponse__AbsolutePathBuf | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly longDescription?: string | null;
+  readonly privacyPolicyUrl?: string | null;
+  readonly screenshotUrls: ReadonlyArray<string>;
+  readonly screenshots: ReadonlyArray<V2PluginShareListResponse__AbsolutePathBuf>;
+  readonly shortDescription?: string | null;
+  readonly termsOfServiceUrl?: string | null;
+  readonly websiteUrl?: string | null;
+};
+export const V2PluginShareListResponse__PluginInterface = Schema.Struct({
+  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  capabilities: Schema.Array(Schema.String),
+  category: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  composerIcon: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local composer icon path, resolved from the installed plugin package.",
+    }),
+  ),
+  composerIconUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote composer icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  defaultPrompt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Starter prompts for the plugin. Capped at 3 entries with a maximum of 128 characters per entry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  developerName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logo: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoDark: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description: "Local dark-mode logo path, resolved from the installed plugin package.",
+    }),
+  ),
+  logoUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  logoUrlDark: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote dark-mode logo URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  longDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  privacyPolicyUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  screenshotUrls: Schema.Array(Schema.String).annotate({
+    description: "Remote screenshot URLs from the plugin catalog.",
+  }),
+  screenshots: Schema.Array(V2PluginShareListResponse__AbsolutePathBuf).annotate({
+    description: "Local screenshot paths, resolved from the installed plugin package.",
+  }),
+  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  termsOfServiceUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  websiteUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginShareListResponse__PluginInterface" });
+
+export type V2PluginShareListResponse__PluginSource =
+  | { readonly path: V2PluginShareListResponse__AbsolutePathBuf; readonly type: "local" }
+  | {
+      readonly path?: string | null;
+      readonly refName?: string | null;
+      readonly sha?: string | null;
+      readonly type: "git";
+      readonly url: string;
+    }
+  | {
+      readonly package: string;
+      readonly registry?: string | null;
+      readonly type: "npm";
+      readonly version?: string | null;
+    }
+  | { readonly type: "remote" };
+export const V2PluginShareListResponse__PluginSource = Schema.Union(
+  [
+    Schema.Struct({
+      path: V2PluginShareListResponse__AbsolutePathBuf,
+      type: Schema.Literal("local").annotate({ title: "LocalPluginSourceType" }),
+    }).annotate({ title: "LocalPluginSource" }),
+    Schema.Struct({
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      refName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      sha: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("git").annotate({ title: "GitPluginSourceType" }),
+      url: Schema.String,
+    }).annotate({ title: "GitPluginSource" }),
+    Schema.Struct({
+      package: Schema.String,
+      registry: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Optional HTTPS registry URL. Authentication stays in the user's npm config.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("npm").annotate({ title: "NpmPluginSourceType" }),
+      version: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({ description: "Optional npm version or version range." }),
+          Schema.Null,
+        ]),
+      ),
+    }).annotate({ title: "NpmPluginSource" }),
+    Schema.Struct({
+      type: Schema.Literal("remote").annotate({ title: "RemotePluginSourceType" }),
+    }).annotate({
+      title: "RemotePluginSource",
+      description:
+        "The plugin is available in the remote catalog. Download metadata is kept server-side and is not exposed through the app-server API.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2PluginShareListResponse__PluginSource" });
+
+export type V2PluginShareListResponse__PluginSharePrincipal = {
+  readonly name: string;
+  readonly principalId: string;
+  readonly principalType: V2PluginShareListResponse__PluginSharePrincipalType;
+  readonly role: V2PluginShareListResponse__PluginSharePrincipalRole;
+};
+export const V2PluginShareListResponse__PluginSharePrincipal = Schema.Struct({
+  name: Schema.String,
+  principalId: Schema.String,
+  principalType: V2PluginShareListResponse__PluginSharePrincipalType,
+  role: V2PluginShareListResponse__PluginSharePrincipalRole,
+}).annotate({ identifier: "V2PluginShareListResponse__PluginSharePrincipal" });
+
+export type V2PluginShareSaveParams__PluginShareTarget = {
+  readonly principalId: string;
+  readonly principalType: V2PluginShareSaveParams__PluginSharePrincipalType;
+  readonly role: V2PluginShareSaveParams__PluginShareTargetRole;
+};
+export const V2PluginShareSaveParams__PluginShareTarget = Schema.Struct({
+  principalId: Schema.String,
+  principalType: V2PluginShareSaveParams__PluginSharePrincipalType,
+  role: V2PluginShareSaveParams__PluginShareTargetRole,
+}).annotate({ identifier: "V2PluginShareSaveParams__PluginShareTarget" });
+
+export type V2PluginShareUpdateTargetsParams__PluginShareTarget = {
+  readonly principalId: string;
+  readonly principalType: V2PluginShareUpdateTargetsParams__PluginSharePrincipalType;
+  readonly role: V2PluginShareUpdateTargetsParams__PluginShareTargetRole;
+};
+export const V2PluginShareUpdateTargetsParams__PluginShareTarget = Schema.Struct({
+  principalId: Schema.String,
+  principalType: V2PluginShareUpdateTargetsParams__PluginSharePrincipalType,
+  role: V2PluginShareUpdateTargetsParams__PluginShareTargetRole,
+}).annotate({ identifier: "V2PluginShareUpdateTargetsParams__PluginShareTarget" });
+
+export type V2PluginShareUpdateTargetsResponse__PluginSharePrincipal = {
+  readonly name: string;
+  readonly principalId: string;
+  readonly principalType: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType;
+  readonly role: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalRole;
+};
+export const V2PluginShareUpdateTargetsResponse__PluginSharePrincipal = Schema.Struct({
+  name: Schema.String,
+  principalId: Schema.String,
+  principalType: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalType,
+  role: V2PluginShareUpdateTargetsResponse__PluginSharePrincipalRole,
+}).annotate({ identifier: "V2PluginShareUpdateTargetsResponse__PluginSharePrincipal" });
+
+export type V2RawResponseItemCompletedNotification__ContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2RawResponseItemCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2RawResponseItemCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly text: string; readonly type: "output_text" };
+export const V2RawResponseItemCompletedNotification__ContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({ title: "InputTextContentItemType" }),
+    }).annotate({ title: "InputTextContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2RawResponseItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2RawResponseItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdContentItem" }),
+    ]).annotate({ title: "InputImageContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({ title: "InputAudioContentItemType" }),
+    }).annotate({ title: "InputAudioContentItem" }),
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("output_text").annotate({ title: "OutputTextContentItemType" }),
+    }).annotate({ title: "OutputTextContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2RawResponseItemCompletedNotification__ContentItem" });
+
+export type V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2RawResponseItemCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2RawResponseItemCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2RawResponseItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2RawResponseItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem",
+});
+
+export type V2RawResponseItemCompletedNotification__ConfigurationReasoning = {
+  readonly effort: V2RawResponseItemCompletedNotification__ReasoningEffort;
+};
+export const V2RawResponseItemCompletedNotification__ConfigurationReasoning = Schema.Struct({
+  effort: V2RawResponseItemCompletedNotification__ReasoningEffort,
+}).annotate({
+  description: "Reasoning settings interpreted by the backend for the routed model.",
+  identifier: "V2RawResponseItemCompletedNotification__ConfigurationReasoning",
+});
+
+export type V2ReviewStartResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ReviewStartResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ReviewStartResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ReviewStartResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ReviewStartResponse__CodexErrorInfo",
+});
+
+export type V2ReviewStartResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ReviewStartResponse__MisalignmentSteer | null;
+};
+export const V2ReviewStartResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ReviewStartResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ReviewStartResponse__MisalignmentErrorDetails" });
+
+export type V2ReviewStartResponse__TextElement = {
+  readonly byteRange: V2ReviewStartResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ReviewStartResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ReviewStartResponse__ByteRange> => V2ReviewStartResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ReviewStartResponse__TextElement" });
+
+export type V2ReviewStartResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ReviewStartResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ReviewStartResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ReviewStartResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ReviewStartResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ReviewStartResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ReviewStartResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ReviewStartResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ReviewStartResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ReviewStartResponse__MemoryCitation" });
+
+export type V2ReviewStartResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ReviewStartResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ReviewStartResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ReviewStartResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ReviewStartResponse__CommandAction" });
+
+export type V2ReviewStartResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ReviewStartResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ReviewStartResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ReviewStartResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ReviewStartResponse__FileUpdateChange" });
+
+export type V2ReviewStartResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ReviewStartResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ReviewStartResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ReviewStartResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ReviewStartResponse__McpAppUi",
+});
+
+export type V2ReviewStartResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ReviewStartResponse__CollabAgentStatus;
+};
+export const V2ReviewStartResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ReviewStartResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ReviewStartResponse__CollabAgentState" });
+
+export type V2SkillsListResponse__SkillDependencies = {
+  readonly tools: ReadonlyArray<V2SkillsListResponse__SkillToolDependency>;
+};
+export const V2SkillsListResponse__SkillDependencies = Schema.Struct({
+  tools: Schema.Array(V2SkillsListResponse__SkillToolDependency),
+}).annotate({ identifier: "V2SkillsListResponse__SkillDependencies" });
+
+export type V2SkillsListResponse__SkillInterface = {
+  readonly brandColor?: string | null;
+  readonly defaultPrompt?: string | null;
+  readonly displayName?: string | null;
+  readonly iconLarge?: V2SkillsListResponse__AbsolutePathBuf | null;
+  readonly iconLargeUrl?: string | null;
+  readonly iconSmall?: V2SkillsListResponse__AbsolutePathBuf | null;
+  readonly iconSmallUrl?: string | null;
+  readonly shortDescription?: string | null;
+};
+export const V2SkillsListResponse__SkillInterface = Schema.Struct({
+  brandColor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  defaultPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  displayName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  iconLarge: Schema.optionalKey(Schema.Union([V2SkillsListResponse__AbsolutePathBuf, Schema.Null])),
+  iconLargeUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote large icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  iconSmall: Schema.optionalKey(Schema.Union([V2SkillsListResponse__AbsolutePathBuf, Schema.Null])),
+  iconSmallUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Remote small icon URL from the plugin catalog." }),
+      Schema.Null,
+    ]),
+  ),
+  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2SkillsListResponse__SkillInterface" });
+
+export type V2ThreadForkResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadForkResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadForkResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadForkResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__CommandAction" });
+
+export type V2ThreadForkResponse__SandboxPolicy =
+  | { readonly type: "dangerFullAccess" }
+  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
+  | {
+      readonly networkAccess?: V2ThreadForkResponse__NetworkAccess;
+      readonly type: "externalSandbox";
+    }
+  | {
+      readonly excludeSlashTmp?: boolean;
+      readonly excludeTmpdirEnvVar?: boolean;
+      readonly networkAccess?: boolean;
+      readonly type: "workspaceWrite";
+      readonly writableRoots?: ReadonlyArray<V2ThreadForkResponse__AbsolutePathBuf>;
+    };
+export const V2ThreadForkResponse__SandboxPolicy = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("dangerFullAccess").annotate({
+        title: "DangerFullAccessSandboxPolicyType",
+      }),
+    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
+    }).annotate({ title: "ReadOnlySandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadForkResponse__NetworkAccess> =>
+            V2ThreadForkResponse__NetworkAccess,
+        ).annotate({ default: "restricted" }),
+      ),
+      type: Schema.Literal("externalSandbox").annotate({
+        title: "ExternalSandboxSandboxPolicyType",
+      }),
+    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
+    Schema.Struct({
+      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
+      writableRoots: Schema.optionalKey(
+        Schema.Array(V2ThreadForkResponse__AbsolutePathBuf).annotate({ default: [] }),
+      ),
+    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__SandboxPolicy" });
+
+export type V2ThreadForkResponse__ThreadSection = {
+  readonly appearance?: V2ThreadForkResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadForkResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadForkResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadForkResponse__ThreadSection",
+});
+
+export type V2ThreadForkResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadForkResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadForkResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadForkResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadForkResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadForkResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__SubAgentSource" });
+
+export type V2ThreadForkResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadForkResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadForkResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadForkResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__ThreadStatus" });
+
+export type V2ThreadForkResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadForkResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadForkResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadForkResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadForkResponse__CodexErrorInfo",
+});
+
+export type V2ThreadForkResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadForkResponse__MisalignmentSteer | null;
+};
+export const V2ThreadForkResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadForkResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadForkResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadForkResponse__TextElement = {
+  readonly byteRange: V2ThreadForkResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadForkResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadForkResponse__ByteRange> => V2ThreadForkResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadForkResponse__TextElement" });
+
+export type V2ThreadForkResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadForkResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadForkResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadForkResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadForkResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadForkResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadForkResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadForkResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadForkResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadForkResponse__MemoryCitation" });
+
+export type V2ThreadForkResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadForkResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadForkResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadForkResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadForkResponse__FileUpdateChange" });
+
+export type V2ThreadForkResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadForkResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadForkResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadForkResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadForkResponse__McpAppUi",
+});
+
+export type V2ThreadForkResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadForkResponse__CollabAgentStatus;
+};
+export const V2ThreadForkResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadForkResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadForkResponse__CollabAgentState" });
+
+export type V2ThreadGoalGetResponse__ThreadGoal = {
+  readonly createdAt: number;
+  readonly objective: string;
+  readonly status: V2ThreadGoalGetResponse__ThreadGoalStatus;
+  readonly threadId: string;
+  readonly timeUsedSeconds: number;
+  readonly tokenBudget?: number | null;
+  readonly tokensUsed: number;
+  readonly updatedAt: number;
+};
+export const V2ThreadGoalGetResponse__ThreadGoal = Schema.Struct({
+  createdAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  objective: Schema.String,
+  status: V2ThreadGoalGetResponse__ThreadGoalStatus,
+  threadId: Schema.String,
+  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  tokenBudget: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  updatedAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "V2ThreadGoalGetResponse__ThreadGoal" });
+
+export type V2ThreadGoalSetResponse__ThreadGoal = {
+  readonly createdAt: number;
+  readonly objective: string;
+  readonly status: V2ThreadGoalSetResponse__ThreadGoalStatus;
+  readonly threadId: string;
+  readonly timeUsedSeconds: number;
+  readonly tokenBudget?: number | null;
+  readonly tokensUsed: number;
+  readonly updatedAt: number;
+};
+export const V2ThreadGoalSetResponse__ThreadGoal = Schema.Struct({
+  createdAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  objective: Schema.String,
+  status: V2ThreadGoalSetResponse__ThreadGoalStatus,
+  threadId: Schema.String,
+  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  tokenBudget: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  updatedAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "V2ThreadGoalSetResponse__ThreadGoal" });
+
+export type V2ThreadGoalUpdatedNotification__ThreadGoal = {
+  readonly createdAt: number;
+  readonly objective: string;
+  readonly status: V2ThreadGoalUpdatedNotification__ThreadGoalStatus;
+  readonly threadId: string;
+  readonly timeUsedSeconds: number;
+  readonly tokenBudget?: number | null;
+  readonly tokensUsed: number;
+  readonly updatedAt: number;
+};
+export const V2ThreadGoalUpdatedNotification__ThreadGoal = Schema.Struct({
+  createdAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  objective: Schema.String,
+  status: V2ThreadGoalUpdatedNotification__ThreadGoalStatus,
+  threadId: Schema.String,
+  timeUsedSeconds: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  tokenBudget: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  tokensUsed: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  updatedAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+}).annotate({ identifier: "V2ThreadGoalUpdatedNotification__ThreadGoal" });
+
+export type V2ThreadItemsListParams__ThreadItemsListCursor =
+  | string
+  | V2ThreadItemsListParams__ThreadItemsListAnchor;
+export const V2ThreadItemsListParams__ThreadItemsListCursor = Schema.Union([
+  Schema.String,
+  V2ThreadItemsListParams__ThreadItemsListAnchor,
+]).annotate({
+  description: "Starting position for an item-history page.",
+  identifier: "V2ThreadItemsListParams__ThreadItemsListCursor",
+});
+
+export type V2ThreadItemsListResponse__TextElement = {
+  readonly byteRange: V2ThreadItemsListResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadItemsListResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadItemsListResponse__ByteRange> => V2ThreadItemsListResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadItemsListResponse__TextElement" });
+
+export type V2ThreadItemsListResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadItemsListResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadItemsListResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadItemsListResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadItemsListResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadItemsListResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadItemsListResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadItemsListResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadItemsListResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadItemsListResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadItemsListResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadItemsListResponse__MemoryCitation" });
+
+export type V2ThreadItemsListResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadItemsListResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadItemsListResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadItemsListResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadItemsListResponse__CommandAction" });
+
+export type V2ThreadItemsListResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadItemsListResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadItemsListResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadItemsListResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadItemsListResponse__FileUpdateChange" });
+
+export type V2ThreadItemsListResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadItemsListResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadItemsListResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadItemsListResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadItemsListResponse__McpAppUi",
+});
+
+export type V2ThreadItemsListResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadItemsListResponse__CollabAgentStatus;
+};
+export const V2ThreadItemsListResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadItemsListResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadItemsListResponse__CollabAgentState" });
+
+export type V2ThreadListResponse__ThreadSection = {
+  readonly appearance?: V2ThreadListResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadListResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadListResponse__ThreadSection",
+});
+
+export type V2ThreadListResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadListResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadListResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadListResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadListResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadListResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__SubAgentSource" });
+
+export type V2ThreadListResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadListResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadListResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadListResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__ThreadStatus" });
+
+export type V2ThreadListResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadListResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadListResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadListResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadListResponse__CodexErrorInfo",
+});
+
+export type V2ThreadListResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadListResponse__MisalignmentSteer | null;
+};
+export const V2ThreadListResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadListResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadListResponse__TextElement = {
+  readonly byteRange: V2ThreadListResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadListResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadListResponse__ByteRange> => V2ThreadListResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadListResponse__TextElement" });
+
+export type V2ThreadListResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadListResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadListResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadListResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadListResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadListResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadListResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadListResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadListResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadListResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadListResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadListResponse__MemoryCitation" });
+
+export type V2ThreadListResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadListResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadListResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadListResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__CommandAction" });
+
+export type V2ThreadListResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadListResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadListResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadListResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadListResponse__FileUpdateChange" });
+
+export type V2ThreadListResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadListResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadListResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadListResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadListResponse__McpAppUi",
+});
+
+export type V2ThreadListResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadListResponse__CollabAgentStatus;
+};
+export const V2ThreadListResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadListResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadListResponse__CollabAgentState" });
+
+export type V2ThreadMetadataUpdateResponse__ThreadSection = {
+  readonly appearance?: V2ThreadMetadataUpdateResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadMetadataUpdateResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadMetadataUpdateResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadMetadataUpdateResponse__ThreadSection",
+});
+
+export type V2ThreadMetadataUpdateResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadMetadataUpdateResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadMetadataUpdateResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadMetadataUpdateResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadMetadataUpdateResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadMetadataUpdateResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__SubAgentSource" });
+
+export type V2ThreadMetadataUpdateResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadMetadataUpdateResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadMetadataUpdateResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadMetadataUpdateResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__ThreadStatus" });
+
+export type V2ThreadMetadataUpdateResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadMetadataUpdateResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadMetadataUpdateResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadMetadataUpdateResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadMetadataUpdateResponse__CodexErrorInfo",
+});
+
+export type V2ThreadMetadataUpdateResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadMetadataUpdateResponse__MisalignmentSteer | null;
+};
+export const V2ThreadMetadataUpdateResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadMetadataUpdateResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadMetadataUpdateResponse__TextElement = {
+  readonly byteRange: V2ThreadMetadataUpdateResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadMetadataUpdateResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadMetadataUpdateResponse__ByteRange> =>
+      V2ThreadMetadataUpdateResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__TextElement" });
+
+export type V2ThreadMetadataUpdateResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadMetadataUpdateResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadMetadataUpdateResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadMetadataUpdateResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadMetadataUpdateResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadMetadataUpdateResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadMetadataUpdateResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadMetadataUpdateResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadMetadataUpdateResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadMetadataUpdateResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadMetadataUpdateResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__MemoryCitation" });
+
+export type V2ThreadMetadataUpdateResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadMetadataUpdateResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadMetadataUpdateResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadMetadataUpdateResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__CommandAction" });
+
+export type V2ThreadMetadataUpdateResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadMetadataUpdateResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadMetadataUpdateResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadMetadataUpdateResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__FileUpdateChange" });
+
+export type V2ThreadMetadataUpdateResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadMetadataUpdateResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadMetadataUpdateResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadMetadataUpdateResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadMetadataUpdateResponse__McpAppUi",
+});
+
+export type V2ThreadMetadataUpdateResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadMetadataUpdateResponse__CollabAgentStatus;
+};
+export const V2ThreadMetadataUpdateResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadMetadataUpdateResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__CollabAgentState" });
+
+export type V2ThreadReadResponse__ThreadSection = {
+  readonly appearance?: V2ThreadReadResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadReadResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadReadResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadReadResponse__ThreadSection",
+});
+
+export type V2ThreadReadResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadReadResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadReadResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadReadResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadReadResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadReadResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadReadResponse__SubAgentSource" });
+
+export type V2ThreadReadResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadReadResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadReadResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadReadResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadReadResponse__ThreadStatus" });
+
+export type V2ThreadReadResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadReadResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadReadResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadReadResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadReadResponse__CodexErrorInfo",
+});
+
+export type V2ThreadReadResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadReadResponse__MisalignmentSteer | null;
+};
+export const V2ThreadReadResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadReadResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadReadResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadReadResponse__TextElement = {
+  readonly byteRange: V2ThreadReadResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadReadResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadReadResponse__ByteRange> => V2ThreadReadResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadReadResponse__TextElement" });
+
+export type V2ThreadReadResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadReadResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadReadResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadReadResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadReadResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadReadResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadReadResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadReadResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadReadResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadReadResponse__MemoryCitation" });
+
+export type V2ThreadReadResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadReadResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadReadResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadReadResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadReadResponse__CommandAction" });
+
+export type V2ThreadReadResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadReadResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadReadResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadReadResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadReadResponse__FileUpdateChange" });
+
+export type V2ThreadReadResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadReadResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadReadResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadReadResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadReadResponse__McpAppUi",
+});
+
+export type V2ThreadReadResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadReadResponse__CollabAgentStatus;
+};
+export const V2ThreadReadResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadReadResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadReadResponse__CollabAgentState" });
+
+export type V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeItem =
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly type: "realtimeSessionStarted";
+    }
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly role: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeTranscriptRole;
+      readonly text: string;
+      readonly type: "transcriptSegment";
+    }
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly item_id: string;
+      readonly presentation: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeBemItemPresentation;
+      readonly turn_id: string;
+      readonly type: "bemItemPromoted";
+    }
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly outcome: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeSessionOutcome;
+      readonly type: "realtimeSessionClosed";
+    };
+export const V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeItem = Schema.Union(
+  [
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      type: Schema.Literal("realtimeSessionStarted").annotate({
+        title: "RealtimeSessionStartedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "RealtimeSessionStartedThreadRealtimeItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      role: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeTranscriptRole,
+      text: Schema.String,
+      type: Schema.Literal("transcriptSegment").annotate({
+        title: "TranscriptSegmentThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "TranscriptSegmentThreadRealtimeItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      item_id: Schema.String,
+      presentation: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeBemItemPresentation,
+      turn_id: Schema.String,
+      type: Schema.Literal("bemItemPromoted").annotate({
+        title: "BemItemPromotedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "BemItemPromotedThreadRealtimeItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      outcome: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeSessionOutcome,
+      type: Schema.Literal("realtimeSessionClosed").annotate({
+        title: "RealtimeSessionClosedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "RealtimeSessionClosedThreadRealtimeItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "EXPERIMENTAL - a thread-scoped realtime item in the canonical timeline.",
+  identifier: "V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeItem",
+});
+
+export type V2ThreadRealtimeItemStartedNotification__ThreadRealtimeItem =
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly type: "realtimeSessionStarted";
+    }
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly role: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeTranscriptRole;
+      readonly text: string;
+      readonly type: "transcriptSegment";
+    }
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly item_id: string;
+      readonly presentation: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeBemItemPresentation;
+      readonly turn_id: string;
+      readonly type: "bemItemPromoted";
+    }
+  | {
+      readonly id: string;
+      readonly realtimeSessionId: string;
+      readonly outcome: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeSessionOutcome;
+      readonly type: "realtimeSessionClosed";
+    };
+export const V2ThreadRealtimeItemStartedNotification__ThreadRealtimeItem = Schema.Union(
+  [
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      type: Schema.Literal("realtimeSessionStarted").annotate({
+        title: "RealtimeSessionStartedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "RealtimeSessionStartedThreadRealtimeItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      role: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeTranscriptRole,
+      text: Schema.String,
+      type: Schema.Literal("transcriptSegment").annotate({
+        title: "TranscriptSegmentThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "TranscriptSegmentThreadRealtimeItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      item_id: Schema.String,
+      presentation: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeBemItemPresentation,
+      turn_id: Schema.String,
+      type: Schema.Literal("bemItemPromoted").annotate({
+        title: "BemItemPromotedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "BemItemPromotedThreadRealtimeItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      realtimeSessionId: Schema.String,
+      outcome: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeSessionOutcome,
+      type: Schema.Literal("realtimeSessionClosed").annotate({
+        title: "RealtimeSessionClosedThreadRealtimeItemType",
+      }),
+    }).annotate({ title: "RealtimeSessionClosedThreadRealtimeItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "EXPERIMENTAL - a thread-scoped realtime item in the canonical timeline.",
+  identifier: "V2ThreadRealtimeItemStartedNotification__ThreadRealtimeItem",
+});
+
+export type V2ThreadResumeParams__ConfigurationReasoning = {
+  readonly effort: V2ThreadResumeParams__ReasoningEffort;
+};
+export const V2ThreadResumeParams__ConfigurationReasoning = Schema.Struct({
+  effort: V2ThreadResumeParams__ReasoningEffort,
+}).annotate({
+  description: "Reasoning settings interpreted by the backend for the routed model.",
+  identifier: "V2ThreadResumeParams__ConfigurationReasoning",
+});
+
+export type V2ThreadResumeParams__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadResumeParams__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadResumeParams__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadResumeParams__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadResumeParams__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadResumeParams__ContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadResumeParams__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadResumeParams__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly text: string; readonly type: "output_text" };
+export const V2ThreadResumeParams__ContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({ title: "InputTextContentItemType" }),
+    }).annotate({ title: "InputTextContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({ title: "InputImageContentItemType" }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdContentItem" }),
+    ]).annotate({ title: "InputImageContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({ title: "InputAudioContentItemType" }),
+    }).annotate({ title: "InputAudioContentItem" }),
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("output_text").annotate({ title: "OutputTextContentItemType" }),
+    }).annotate({ title: "OutputTextContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeParams__ContentItem" });
+
+export type V2ThreadResumeResponse__Settings = {
+  readonly developer_instructions?: string | null;
+  readonly model: string;
+  readonly reasoning_effort?: V2ThreadResumeResponse__ReasoningEffort | null;
+};
+export const V2ThreadResumeResponse__Settings = Schema.Struct({
+  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  model: Schema.String,
+  reasoning_effort: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__ReasoningEffort, Schema.Null]),
+  ),
+}).annotate({
+  description: "Settings for a collaboration mode.",
+  identifier: "V2ThreadResumeResponse__Settings",
+});
+
+export type V2ThreadResumeResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadResumeResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadResumeResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadResumeResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeResponse__CommandAction" });
+
+export type V2ThreadResumeResponse__SandboxPolicy =
+  | { readonly type: "dangerFullAccess" }
+  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
+  | {
+      readonly networkAccess?: V2ThreadResumeResponse__NetworkAccess;
+      readonly type: "externalSandbox";
+    }
+  | {
+      readonly excludeSlashTmp?: boolean;
+      readonly excludeTmpdirEnvVar?: boolean;
+      readonly networkAccess?: boolean;
+      readonly type: "workspaceWrite";
+      readonly writableRoots?: ReadonlyArray<V2ThreadResumeResponse__AbsolutePathBuf>;
+    };
+export const V2ThreadResumeResponse__SandboxPolicy = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("dangerFullAccess").annotate({
+        title: "DangerFullAccessSandboxPolicyType",
+      }),
+    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
+    }).annotate({ title: "ReadOnlySandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadResumeResponse__NetworkAccess> =>
+            V2ThreadResumeResponse__NetworkAccess,
+        ).annotate({ default: "restricted" }),
+      ),
+      type: Schema.Literal("externalSandbox").annotate({
+        title: "ExternalSandboxSandboxPolicyType",
+      }),
+    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
+    Schema.Struct({
+      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
+      writableRoots: Schema.optionalKey(
+        Schema.Array(V2ThreadResumeResponse__AbsolutePathBuf).annotate({ default: [] }),
+      ),
+    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeResponse__SandboxPolicy" });
+
+export type V2ThreadResumeResponse__ThreadSection = {
+  readonly appearance?: V2ThreadResumeResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadResumeResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadResumeResponse__ThreadSection",
+});
+
+export type V2ThreadResumeResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadResumeResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadResumeResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadResumeResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadResumeResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadResumeResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeResponse__SubAgentSource" });
+
+export type V2ThreadResumeResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadResumeResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadResumeResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadResumeResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadResumeResponse__ThreadStatus" });
+
+export type V2ThreadResumeResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadResumeResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadResumeResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadResumeResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadResumeResponse__CodexErrorInfo",
+});
+
+export type V2ThreadResumeResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadResumeResponse__MisalignmentSteer | null;
+};
+export const V2ThreadResumeResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadResumeResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadResumeResponse__TextElement = {
+  readonly byteRange: V2ThreadResumeResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadResumeResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadResumeResponse__ByteRange> => V2ThreadResumeResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadResumeResponse__TextElement" });
+
+export type V2ThreadResumeResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadResumeResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadResumeResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadResumeResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadResumeResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadResumeResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadResumeResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadResumeResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadResumeResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadResumeResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadResumeResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadResumeResponse__MemoryCitation" });
+
+export type V2ThreadResumeResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadResumeResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadResumeResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadResumeResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadResumeResponse__FileUpdateChange" });
+
+export type V2ThreadResumeResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadResumeResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadResumeResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadResumeResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadResumeResponse__McpAppUi",
+});
+
+export type V2ThreadResumeResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadResumeResponse__CollabAgentStatus;
+};
+export const V2ThreadResumeResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadResumeResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadResumeResponse__CollabAgentState" });
+
+export type V2ThreadRevertResponse__ThreadSection = {
+  readonly appearance?: V2ThreadRevertResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadRevertResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadRevertResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadRevertResponse__ThreadSection",
+});
+
+export type V2ThreadRevertResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadRevertResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadRevertResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadRevertResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadRevertResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadRevertResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadRevertResponse__SubAgentSource" });
+
+export type V2ThreadRevertResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadRevertResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadRevertResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadRevertResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadRevertResponse__ThreadStatus" });
+
+export type V2ThreadRevertResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadRevertResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadRevertResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadRevertResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadRevertResponse__CodexErrorInfo",
+});
+
+export type V2ThreadRevertResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadRevertResponse__MisalignmentSteer | null;
+};
+export const V2ThreadRevertResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadRevertResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadRevertResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadRevertResponse__TextElement = {
+  readonly byteRange: V2ThreadRevertResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadRevertResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadRevertResponse__ByteRange> => V2ThreadRevertResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadRevertResponse__TextElement" });
+
+export type V2ThreadRevertResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadRevertResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadRevertResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadRevertResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadRevertResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadRevertResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadRevertResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadRevertResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadRevertResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadRevertResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadRevertResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadRevertResponse__MemoryCitation" });
+
+export type V2ThreadRevertResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadRevertResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadRevertResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadRevertResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadRevertResponse__CommandAction" });
+
+export type V2ThreadRevertResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadRevertResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadRevertResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadRevertResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadRevertResponse__FileUpdateChange" });
+
+export type V2ThreadRevertResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadRevertResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadRevertResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadRevertResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadRevertResponse__McpAppUi",
+});
+
+export type V2ThreadRevertResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadRevertResponse__CollabAgentStatus;
+};
+export const V2ThreadRevertResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadRevertResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadRevertResponse__CollabAgentState" });
+
+export type V2ThreadSectionCreateResponse__ThreadSection = {
+  readonly appearance?: V2ThreadSectionCreateResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadSectionCreateResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadSectionCreateResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadSectionCreateResponse__ThreadSection",
+});
+
+export type V2ThreadSectionListResponse__ThreadSection = {
+  readonly appearance?: V2ThreadSectionListResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadSectionListResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadSectionListResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadSectionListResponse__ThreadSection",
+});
+
+export type V2ThreadSectionUpdateResponse__ThreadSection = {
+  readonly appearance?: V2ThreadSectionUpdateResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadSectionUpdateResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadSectionUpdateResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadSectionUpdateResponse__ThreadSection",
+});
+
+export type V2ThreadSettingsUpdatedNotification__Settings = {
+  readonly developer_instructions?: string | null;
+  readonly model: string;
+  readonly reasoning_effort?: V2ThreadSettingsUpdatedNotification__ReasoningEffort | null;
+};
+export const V2ThreadSettingsUpdatedNotification__Settings = Schema.Struct({
+  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  model: Schema.String,
+  reasoning_effort: Schema.optionalKey(
+    Schema.Union([V2ThreadSettingsUpdatedNotification__ReasoningEffort, Schema.Null]),
+  ),
+}).annotate({
+  description: "Settings for a collaboration mode.",
+  identifier: "V2ThreadSettingsUpdatedNotification__Settings",
+});
+
+export type V2ThreadSettingsUpdatedNotification__SandboxPolicy =
+  | { readonly type: "dangerFullAccess" }
+  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
+  | {
+      readonly networkAccess?: V2ThreadSettingsUpdatedNotification__NetworkAccess;
+      readonly type: "externalSandbox";
+    }
+  | {
+      readonly excludeSlashTmp?: boolean;
+      readonly excludeTmpdirEnvVar?: boolean;
+      readonly networkAccess?: boolean;
+      readonly type: "workspaceWrite";
+      readonly writableRoots?: ReadonlyArray<V2ThreadSettingsUpdatedNotification__AbsolutePathBuf>;
+    };
+export const V2ThreadSettingsUpdatedNotification__SandboxPolicy = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("dangerFullAccess").annotate({
+        title: "DangerFullAccessSandboxPolicyType",
+      }),
+    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
+    }).annotate({ title: "ReadOnlySandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadSettingsUpdatedNotification__NetworkAccess> =>
+            V2ThreadSettingsUpdatedNotification__NetworkAccess,
+        ).annotate({ default: "restricted" }),
+      ),
+      type: Schema.Literal("externalSandbox").annotate({
+        title: "ExternalSandboxSandboxPolicyType",
+      }),
+    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
+    Schema.Struct({
+      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
+      writableRoots: Schema.optionalKey(
+        Schema.Array(V2ThreadSettingsUpdatedNotification__AbsolutePathBuf).annotate({
+          default: [],
+        }),
+      ),
+    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadSettingsUpdatedNotification__SandboxPolicy" });
+
+export type V2ThreadStartedNotification__ThreadSection = {
+  readonly appearance?: V2ThreadStartedNotification__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadStartedNotification__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadStartedNotification__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadStartedNotification__ThreadSection",
+});
+
+export type V2ThreadStartedNotification__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadStartedNotification__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadStartedNotification__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadStartedNotification__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadStartedNotification__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadStartedNotification__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartedNotification__SubAgentSource" });
+
+export type V2ThreadStartedNotification__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadStartedNotification__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadStartedNotification__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadStartedNotification__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartedNotification__ThreadStatus" });
+
+export type V2ThreadStartedNotification__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadStartedNotification__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadStartedNotification__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadStartedNotification__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadStartedNotification__CodexErrorInfo",
+});
+
+export type V2ThreadStartedNotification__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadStartedNotification__MisalignmentSteer | null;
+};
+export const V2ThreadStartedNotification__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadStartedNotification__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadStartedNotification__MisalignmentErrorDetails" });
+
+export type V2ThreadStartedNotification__TextElement = {
+  readonly byteRange: V2ThreadStartedNotification__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadStartedNotification__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartedNotification__ByteRange> =>
+      V2ThreadStartedNotification__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadStartedNotification__TextElement" });
+
+export type V2ThreadStartedNotification__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadStartedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadStartedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadStartedNotification__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadStartedNotification__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadStartedNotification__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadStartedNotification__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadStartedNotification__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadStartedNotification__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadStartedNotification__MemoryCitation" });
+
+export type V2ThreadStartedNotification__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadStartedNotification__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadStartedNotification__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadStartedNotification__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartedNotification__CommandAction" });
+
+export type V2ThreadStartedNotification__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadStartedNotification__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadStartedNotification__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadStartedNotification__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadStartedNotification__FileUpdateChange" });
+
+export type V2ThreadStartedNotification__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadStartedNotification__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadStartedNotification__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadStartedNotification__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadStartedNotification__McpAppUi",
+});
+
+export type V2ThreadStartedNotification__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadStartedNotification__CollabAgentStatus;
+};
+export const V2ThreadStartedNotification__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadStartedNotification__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadStartedNotification__CollabAgentState" });
+
+export type V2ThreadStartResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadStartResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadStartResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadStartResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartResponse__CommandAction" });
+
+export type V2ThreadStartResponse__SandboxPolicy =
+  | { readonly type: "dangerFullAccess" }
+  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
+  | {
+      readonly networkAccess?: V2ThreadStartResponse__NetworkAccess;
+      readonly type: "externalSandbox";
+    }
+  | {
+      readonly excludeSlashTmp?: boolean;
+      readonly excludeTmpdirEnvVar?: boolean;
+      readonly networkAccess?: boolean;
+      readonly type: "workspaceWrite";
+      readonly writableRoots?: ReadonlyArray<V2ThreadStartResponse__AbsolutePathBuf>;
+    };
+export const V2ThreadStartResponse__SandboxPolicy = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("dangerFullAccess").annotate({
+        title: "DangerFullAccessSandboxPolicyType",
+      }),
+    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
+    }).annotate({ title: "ReadOnlySandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadStartResponse__NetworkAccess> =>
+            V2ThreadStartResponse__NetworkAccess,
+        ).annotate({ default: "restricted" }),
+      ),
+      type: Schema.Literal("externalSandbox").annotate({
+        title: "ExternalSandboxSandboxPolicyType",
+      }),
+    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
+    Schema.Struct({
+      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
+      writableRoots: Schema.optionalKey(
+        Schema.Array(V2ThreadStartResponse__AbsolutePathBuf).annotate({ default: [] }),
+      ),
+    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartResponse__SandboxPolicy" });
+
+export type V2ThreadStartResponse__ThreadSection = {
+  readonly appearance?: V2ThreadStartResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadStartResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadStartResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadStartResponse__ThreadSection",
+});
+
+export type V2ThreadStartResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadStartResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadStartResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadStartResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadStartResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadStartResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartResponse__SubAgentSource" });
+
+export type V2ThreadStartResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadStartResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadStartResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadStartResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStartResponse__ThreadStatus" });
+
+export type V2ThreadStartResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadStartResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadStartResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadStartResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadStartResponse__CodexErrorInfo",
+});
+
+export type V2ThreadStartResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadStartResponse__MisalignmentSteer | null;
+};
+export const V2ThreadStartResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadStartResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadStartResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadStartResponse__TextElement = {
+  readonly byteRange: V2ThreadStartResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadStartResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartResponse__ByteRange> => V2ThreadStartResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadStartResponse__TextElement" });
+
+export type V2ThreadStartResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadStartResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadStartResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadStartResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadStartResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadStartResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadStartResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadStartResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadStartResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadStartResponse__MemoryCitation" });
+
+export type V2ThreadStartResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadStartResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadStartResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadStartResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadStartResponse__FileUpdateChange" });
+
+export type V2ThreadStartResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadStartResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadStartResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadStartResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadStartResponse__McpAppUi",
+});
+
+export type V2ThreadStartResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadStartResponse__CollabAgentStatus;
+};
+export const V2ThreadStartResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadStartResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadStartResponse__CollabAgentState" });
+
+export type V2ThreadStatusChangedNotification__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadStatusChangedNotification__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadStatusChangedNotification__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadStatusChangedNotification__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadStatusChangedNotification__ThreadStatus" });
+
+export type V2ThreadTokenUsageUpdatedNotification__ThreadTokenUsage = {
+  readonly last: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown;
+  readonly modelContextWindow?: number | null;
+  readonly total: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown;
+};
+export const V2ThreadTokenUsageUpdatedNotification__ThreadTokenUsage = Schema.Struct({
+  last: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown,
+  modelContextWindow: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  total: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown,
+}).annotate({ identifier: "V2ThreadTokenUsageUpdatedNotification__ThreadTokenUsage" });
+
+export type V2ThreadTurnsListResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadTurnsListResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadTurnsListResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadTurnsListResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadTurnsListResponse__CodexErrorInfo",
+});
+
+export type V2ThreadTurnsListResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadTurnsListResponse__MisalignmentSteer | null;
+};
+export const V2ThreadTurnsListResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadTurnsListResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadTurnsListResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadTurnsListResponse__TextElement = {
+  readonly byteRange: V2ThreadTurnsListResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadTurnsListResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadTurnsListResponse__ByteRange> => V2ThreadTurnsListResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadTurnsListResponse__TextElement" });
+
+export type V2ThreadTurnsListResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadTurnsListResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadTurnsListResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadTurnsListResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadTurnsListResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadTurnsListResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadTurnsListResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadTurnsListResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadTurnsListResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadTurnsListResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadTurnsListResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadTurnsListResponse__MemoryCitation" });
+
+export type V2ThreadTurnsListResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadTurnsListResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadTurnsListResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadTurnsListResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadTurnsListResponse__CommandAction" });
+
+export type V2ThreadTurnsListResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadTurnsListResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadTurnsListResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadTurnsListResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadTurnsListResponse__FileUpdateChange" });
+
+export type V2ThreadTurnsListResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadTurnsListResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadTurnsListResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadTurnsListResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadTurnsListResponse__McpAppUi",
+});
+
+export type V2ThreadTurnsListResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadTurnsListResponse__CollabAgentStatus;
+};
+export const V2ThreadTurnsListResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadTurnsListResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadTurnsListResponse__CollabAgentState" });
+
+export type V2ThreadUnarchiveResponse__ThreadSection = {
+  readonly appearance?: V2ThreadUnarchiveResponse__ThreadSectionAppearance | null;
+  readonly id: string;
+  readonly name: string;
+};
+export const V2ThreadUnarchiveResponse__ThreadSection = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadUnarchiveResponse__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Optional appearance synchronized across clients.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Opaque UUIDv7 identity that remains stable when the section is renamed.",
+  }),
+  name: Schema.String.annotate({ description: "The current user-visible section name." }),
+}).annotate({
+  description: "An independently persisted, user-visible thread section.",
+  identifier: "V2ThreadUnarchiveResponse__ThreadSection",
+});
+
+export type V2ThreadUnarchiveResponse__SubAgentSource =
+  | "review"
+  | "compact"
+  | "memory_consolidation"
+  | {
+      readonly thread_spawn: {
+        readonly agent_nickname?: string | null;
+        readonly agent_path?: V2ThreadUnarchiveResponse__AgentPath | null;
+        readonly agent_role?: string | null;
+        readonly depth: number;
+        readonly parent_thread_id: V2ThreadUnarchiveResponse__ThreadId;
+      };
+    }
+  | { readonly other: string };
+export const V2ThreadUnarchiveResponse__SubAgentSource = Schema.Union(
+  [
+    Schema.Literals(["review", "compact", "memory_consolidation"]),
+    Schema.Struct({
+      thread_spawn: Schema.Struct({
+        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        agent_path: Schema.optionalKey(
+          Schema.Union([V2ThreadUnarchiveResponse__AgentPath, Schema.Null]),
+        ),
+        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+        depth: Schema.Number.annotate({ format: "int32" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
+        parent_thread_id: V2ThreadUnarchiveResponse__ThreadId,
+      }),
+    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
+    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadUnarchiveResponse__SubAgentSource" });
+
+export type V2ThreadUnarchiveResponse__ThreadStatus =
+  | { readonly type: "notLoaded" }
+  | { readonly type: "idle" }
+  | { readonly type: "systemError" }
+  | {
+      readonly activeFlags: ReadonlyArray<V2ThreadUnarchiveResponse__ThreadActiveFlag>;
+      readonly type: "active";
+    };
+export const V2ThreadUnarchiveResponse__ThreadStatus = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
+    }).annotate({ title: "NotLoadedThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
+    }).annotate({ title: "IdleThreadStatus" }),
+    Schema.Struct({
+      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
+    }).annotate({ title: "SystemErrorThreadStatus" }),
+    Schema.Struct({
+      activeFlags: Schema.Array(V2ThreadUnarchiveResponse__ThreadActiveFlag),
+      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
+    }).annotate({ title: "ActiveThreadStatus" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadUnarchiveResponse__ThreadStatus" });
+
+export type V2ThreadUnarchiveResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2ThreadUnarchiveResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2ThreadUnarchiveResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2ThreadUnarchiveResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2ThreadUnarchiveResponse__CodexErrorInfo",
+});
+
+export type V2ThreadUnarchiveResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2ThreadUnarchiveResponse__MisalignmentSteer | null;
+};
+export const V2ThreadUnarchiveResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2ThreadUnarchiveResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__MisalignmentErrorDetails" });
+
+export type V2ThreadUnarchiveResponse__TextElement = {
+  readonly byteRange: V2ThreadUnarchiveResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2ThreadUnarchiveResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2ThreadUnarchiveResponse__ByteRange> => V2ThreadUnarchiveResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__TextElement" });
+
+export type V2ThreadUnarchiveResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2ThreadUnarchiveResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2ThreadUnarchiveResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2ThreadUnarchiveResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadUnarchiveResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadUnarchiveResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2ThreadUnarchiveResponse__FunctionCallOutputContentItem",
+});
+
+export type V2ThreadUnarchiveResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2ThreadUnarchiveResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2ThreadUnarchiveResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2ThreadUnarchiveResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__MemoryCitation" });
+
+export type V2ThreadUnarchiveResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2ThreadUnarchiveResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2ThreadUnarchiveResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2ThreadUnarchiveResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadUnarchiveResponse__CommandAction" });
+
+export type V2ThreadUnarchiveResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2ThreadUnarchiveResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2ThreadUnarchiveResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2ThreadUnarchiveResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__FileUpdateChange" });
+
+export type V2ThreadUnarchiveResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2ThreadUnarchiveResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2ThreadUnarchiveResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2ThreadUnarchiveResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2ThreadUnarchiveResponse__McpAppUi",
+});
+
+export type V2ThreadUnarchiveResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2ThreadUnarchiveResponse__CollabAgentStatus;
+};
+export const V2ThreadUnarchiveResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2ThreadUnarchiveResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__CollabAgentState" });
+
+export type V2TurnCompletedNotification__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2TurnCompletedNotification__NonSteerableTurnKind;
+      };
+    };
+export const V2TurnCompletedNotification__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2TurnCompletedNotification__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2TurnCompletedNotification__CodexErrorInfo",
+});
+
+export type V2TurnCompletedNotification__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2TurnCompletedNotification__MisalignmentSteer | null;
+};
+export const V2TurnCompletedNotification__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2TurnCompletedNotification__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2TurnCompletedNotification__MisalignmentErrorDetails" });
+
+export type V2TurnCompletedNotification__TextElement = {
+  readonly byteRange: V2TurnCompletedNotification__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2TurnCompletedNotification__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2TurnCompletedNotification__ByteRange> =>
+      V2TurnCompletedNotification__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2TurnCompletedNotification__TextElement" });
+
+export type V2TurnCompletedNotification__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2TurnCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2TurnCompletedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2TurnCompletedNotification__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2TurnCompletedNotification__FunctionCallOutputContentItem",
+});
+
+export type V2TurnCompletedNotification__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2TurnCompletedNotification__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2TurnCompletedNotification__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2TurnCompletedNotification__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2TurnCompletedNotification__MemoryCitation" });
+
+export type V2TurnCompletedNotification__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2TurnCompletedNotification__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2TurnCompletedNotification__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2TurnCompletedNotification__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnCompletedNotification__CommandAction" });
+
+export type V2TurnCompletedNotification__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2TurnCompletedNotification__PatchChangeKind;
+  readonly path: string;
+};
+export const V2TurnCompletedNotification__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2TurnCompletedNotification__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2TurnCompletedNotification__FileUpdateChange" });
+
+export type V2TurnCompletedNotification__McpAppUi = {
+  readonly preferredModelDisplayMode: V2TurnCompletedNotification__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2TurnCompletedNotification__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2TurnCompletedNotification__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2TurnCompletedNotification__McpAppUi",
+});
+
+export type V2TurnCompletedNotification__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2TurnCompletedNotification__CollabAgentStatus;
+};
+export const V2TurnCompletedNotification__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2TurnCompletedNotification__CollabAgentStatus,
+}).annotate({ identifier: "V2TurnCompletedNotification__CollabAgentState" });
+
+export type V2TurnPlanUpdatedNotification__TurnPlanStep = {
+  readonly status: V2TurnPlanUpdatedNotification__TurnPlanStepStatus;
+  readonly step: string;
+};
+export const V2TurnPlanUpdatedNotification__TurnPlanStep = Schema.Struct({
+  status: V2TurnPlanUpdatedNotification__TurnPlanStepStatus,
+  step: Schema.String,
+}).annotate({ identifier: "V2TurnPlanUpdatedNotification__TurnPlanStep" });
+
+export type V2TurnStartedNotification__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2TurnStartedNotification__NonSteerableTurnKind;
+      };
+    };
+export const V2TurnStartedNotification__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2TurnStartedNotification__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2TurnStartedNotification__CodexErrorInfo",
+});
+
+export type V2TurnStartedNotification__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2TurnStartedNotification__MisalignmentSteer | null;
+};
+export const V2TurnStartedNotification__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2TurnStartedNotification__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2TurnStartedNotification__MisalignmentErrorDetails" });
+
+export type V2TurnStartedNotification__TextElement = {
+  readonly byteRange: V2TurnStartedNotification__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2TurnStartedNotification__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2TurnStartedNotification__ByteRange> => V2TurnStartedNotification__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2TurnStartedNotification__TextElement" });
+
+export type V2TurnStartedNotification__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2TurnStartedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2TurnStartedNotification__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2TurnStartedNotification__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2TurnStartedNotification__FunctionCallOutputContentItem",
+});
+
+export type V2TurnStartedNotification__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2TurnStartedNotification__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2TurnStartedNotification__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2TurnStartedNotification__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2TurnStartedNotification__MemoryCitation" });
+
+export type V2TurnStartedNotification__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2TurnStartedNotification__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2TurnStartedNotification__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2TurnStartedNotification__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartedNotification__CommandAction" });
+
+export type V2TurnStartedNotification__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2TurnStartedNotification__PatchChangeKind;
+  readonly path: string;
+};
+export const V2TurnStartedNotification__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2TurnStartedNotification__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2TurnStartedNotification__FileUpdateChange" });
+
+export type V2TurnStartedNotification__McpAppUi = {
+  readonly preferredModelDisplayMode: V2TurnStartedNotification__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2TurnStartedNotification__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2TurnStartedNotification__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2TurnStartedNotification__McpAppUi",
+});
+
+export type V2TurnStartedNotification__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2TurnStartedNotification__CollabAgentStatus;
+};
+export const V2TurnStartedNotification__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2TurnStartedNotification__CollabAgentStatus,
+}).annotate({ identifier: "V2TurnStartedNotification__CollabAgentState" });
+
+export type V2TurnStartParams__Settings = {
+  readonly developer_instructions?: string | null;
+  readonly model: string;
+  readonly reasoning_effort?: V2TurnStartParams__ReasoningEffort | null;
+};
+export const V2TurnStartParams__Settings = Schema.Struct({
+  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  model: Schema.String,
+  reasoning_effort: Schema.optionalKey(
+    Schema.Union([V2TurnStartParams__ReasoningEffort, Schema.Null]),
+  ),
+}).annotate({
+  description: "Settings for a collaboration mode.",
+  identifier: "V2TurnStartParams__Settings",
+});
+
+export type V2TurnStartParams__TextElement = {
+  readonly byteRange: V2TurnStartParams__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2TurnStartParams__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2TurnStartParams__ByteRange> => V2TurnStartParams__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2TurnStartParams__TextElement" });
+
+export type V2TurnStartParams__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2TurnStartParams__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2TurnStartParams__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2TurnStartParams__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2TurnStartParams__FunctionCallOutputContentItem",
+});
+
+export type V2TurnStartParams__SandboxPolicy =
+  | { readonly type: "dangerFullAccess" }
+  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
+  | { readonly networkAccess?: V2TurnStartParams__NetworkAccess; readonly type: "externalSandbox" }
+  | {
+      readonly excludeSlashTmp?: boolean;
+      readonly excludeTmpdirEnvVar?: boolean;
+      readonly networkAccess?: boolean;
+      readonly type: "workspaceWrite";
+      readonly writableRoots?: ReadonlyArray<V2TurnStartParams__AbsolutePathBuf>;
+    };
+export const V2TurnStartParams__SandboxPolicy = Schema.Union(
+  [
+    Schema.Struct({
+      type: Schema.Literal("dangerFullAccess").annotate({
+        title: "DangerFullAccessSandboxPolicyType",
+      }),
+    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
+    }).annotate({ title: "ReadOnlySandboxPolicy" }),
+    Schema.Struct({
+      networkAccess: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<V2TurnStartParams__NetworkAccess> => V2TurnStartParams__NetworkAccess,
+        ).annotate({ default: "restricted" }),
+      ),
+      type: Schema.Literal("externalSandbox").annotate({
+        title: "ExternalSandboxSandboxPolicyType",
+      }),
+    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
+    Schema.Struct({
+      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
+      writableRoots: Schema.optionalKey(
+        Schema.Array(V2TurnStartParams__AbsolutePathBuf).annotate({ default: [] }),
+      ),
+    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartParams__SandboxPolicy" });
+
+export type V2TurnStartResponse__CodexErrorInfo =
+  | "contextWindowExceeded"
+  | "sessionBudgetExceeded"
+  | "usageLimitExceeded"
+  | "rateLimitExceeded"
+  | "flexUnavailable"
+  | "serverOverloaded"
+  | "cyberPolicy"
+  | "misalignmentPolicyViolation"
+  | "tooManyDenials"
+  | "internalServerError"
+  | "unauthorized"
+  | "badRequest"
+  | "threadRollbackFailed"
+  | "sandboxError"
+  | "other"
+  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
+  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
+  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+  | {
+      readonly activeTurnNotSteerable: {
+        readonly turnKind: V2TurnStartResponse__NonSteerableTurnKind;
+      };
+    };
+export const V2TurnStartResponse__CodexErrorInfo = Schema.Union(
+  [
+    Schema.Literals([
+      "contextWindowExceeded",
+      "sessionBudgetExceeded",
+      "usageLimitExceeded",
+      "rateLimitExceeded",
+      "flexUnavailable",
+      "serverOverloaded",
+      "cyberPolicy",
+      "misalignmentPolicyViolation",
+      "tooManyDenials",
+      "internalServerError",
+      "unauthorized",
+      "badRequest",
+      "threadRollbackFailed",
+      "sandboxError",
+      "other",
+    ]),
+    Schema.Struct({
+      httpConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+    Schema.Struct({
+      responseStreamConnectionFailed: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamConnectionFailedCodexErrorInfo",
+      description: "Failed to connect to the response SSE stream.",
+    }),
+    Schema.Struct({
+      responseStreamDisconnected: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      description:
+        "The response SSE stream disconnected in the middle of a turn before completion.",
+    }),
+    Schema.Struct({
+      responseTooManyFailedAttempts: Schema.Struct({
+        httpStatusCode: Schema.optionalKey(
+          Schema.Union([
+            Schema.Number.annotate({ format: "uint16" })
+              .check(Schema.isInt().annotate({ expected: "an integer" }))
+              .check(
+                Schema.isGreaterThanOrEqualTo(0).annotate({
+                  expected: "a value greater than or equal to 0",
+                }),
+              ),
+            Schema.Null,
+          ]),
+        ),
+      }),
+    }).annotate({
+      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
+      description: "Reached the retry limit for responses.",
+    }),
+    Schema.Struct({
+      activeTurnNotSteerable: Schema.Struct({
+        turnKind: V2TurnStartResponse__NonSteerableTurnKind,
+      }),
+    }).annotate({
+      title: "ActiveTurnNotSteerableCodexErrorInfo",
+      description:
+        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
+  identifier: "V2TurnStartResponse__CodexErrorInfo",
+});
+
+export type V2TurnStartResponse__MisalignmentErrorDetails = {
+  readonly detailedExplanation?: string | null;
+  readonly errorType?: string | null;
+  readonly steer?: V2TurnStartResponse__MisalignmentSteer | null;
+};
+export const V2TurnStartResponse__MisalignmentErrorDetails = Schema.Struct({
+  detailedExplanation: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "A substantive localized explanation is required before offering continuation.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  errorType: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Open-ended classification; clients must accept categories added by Responses.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  steer: Schema.optionalKey(
+    Schema.Union([V2TurnStartResponse__MisalignmentSteer, Schema.Null]).annotate({
+      description:
+        "Instruction to submit as the next turn's user input if continuation is confirmed.",
+    }),
+  ),
+}).annotate({ identifier: "V2TurnStartResponse__MisalignmentErrorDetails" });
+
+export type V2TurnStartResponse__TextElement = {
+  readonly byteRange: V2TurnStartResponse__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2TurnStartResponse__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2TurnStartResponse__ByteRange> => V2TurnStartResponse__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2TurnStartResponse__TextElement" });
+
+export type V2TurnStartResponse__FunctionCallOutputContentItem =
+  | { readonly text: string; readonly type: "input_text" }
+  | {
+      readonly detail?: V2TurnStartResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly image_url: string;
+    }
+  | {
+      readonly detail?: V2TurnStartResponse__ImageDetail | null;
+      readonly type: "input_image";
+      readonly file_id: string;
+    }
+  | { readonly audio_url: string; readonly type: "input_audio" }
+  | { readonly encrypted_content: string; readonly type: "encrypted_content" };
+export const V2TurnStartResponse__FunctionCallOutputContentItem = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      type: Schema.Literal("input_text").annotate({
+        title: "InputTextFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputTextFunctionCallOutputContentItem" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        image_url: Schema.String,
+      }).annotate({ title: "ImageUrlFunctionCallOutputContentItem" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("input_image").annotate({
+          title: "InputImageFunctionCallOutputContentItemType",
+        }),
+        file_id: Schema.String,
+      }).annotate({ title: "FileIdFunctionCallOutputContentItem" }),
+    ]).annotate({ title: "InputImageFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      audio_url: Schema.String,
+      type: Schema.Literal("input_audio").annotate({
+        title: "InputAudioFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "InputAudioFunctionCallOutputContentItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      type: Schema.Literal("encrypted_content").annotate({
+        title: "EncryptedContentFunctionCallOutputContentItemType",
+      }),
+    }).annotate({ title: "EncryptedContentFunctionCallOutputContentItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Responses API compatible content items that can be returned by a tool call. This is a subset of ContentItem with the types we support as function call outputs.",
+  identifier: "V2TurnStartResponse__FunctionCallOutputContentItem",
+});
+
+export type V2TurnStartResponse__MemoryCitation = {
+  readonly entries: ReadonlyArray<V2TurnStartResponse__MemoryCitationEntry>;
+  readonly threadIds: ReadonlyArray<string>;
+};
+export const V2TurnStartResponse__MemoryCitation = Schema.Struct({
+  entries: Schema.Array(V2TurnStartResponse__MemoryCitationEntry),
+  threadIds: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2TurnStartResponse__MemoryCitation" });
+
+export type V2TurnStartResponse__CommandAction =
+  | {
+      readonly command: string;
+      readonly name: string;
+      readonly path: V2TurnStartResponse__LegacyAppPathString;
+      readonly type: "read";
+    }
+  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
+  | {
+      readonly command: string;
+      readonly path?: string | null;
+      readonly query?: string | null;
+      readonly type: "search";
+    }
+  | { readonly command: string; readonly type: "unknown" };
+export const V2TurnStartResponse__CommandAction = Schema.Union(
+  [
+    Schema.Struct({
+      command: Schema.String,
+      name: Schema.String,
+      path: V2TurnStartResponse__LegacyAppPathString,
+      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
+    }).annotate({ title: "ReadCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
+    }).annotate({ title: "ListFilesCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
+    }).annotate({ title: "SearchCommandAction" }),
+    Schema.Struct({
+      command: Schema.String,
+      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
+    }).annotate({ title: "UnknownCommandAction" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2TurnStartResponse__CommandAction" });
+
+export type V2TurnStartResponse__FileUpdateChange = {
+  readonly diff: string;
+  readonly kind: V2TurnStartResponse__PatchChangeKind;
+  readonly path: string;
+};
+export const V2TurnStartResponse__FileUpdateChange = Schema.Struct({
+  diff: Schema.String,
+  kind: V2TurnStartResponse__PatchChangeKind,
+  path: Schema.String,
+}).annotate({ identifier: "V2TurnStartResponse__FileUpdateChange" });
+
+export type V2TurnStartResponse__McpAppUi = {
+  readonly preferredModelDisplayMode: V2TurnStartResponse__McpAppDisplayMode;
+  readonly resourceUri: string;
+};
+export const V2TurnStartResponse__McpAppUi = Schema.Struct({
+  preferredModelDisplayMode: V2TurnStartResponse__McpAppDisplayMode,
+  resourceUri: Schema.String,
+}).annotate({
+  description:
+    "UI resource and display preference for model invocations, captured from the tool descriptor.",
+  identifier: "V2TurnStartResponse__McpAppUi",
+});
+
+export type V2TurnStartResponse__CollabAgentState = {
+  readonly message?: string | null;
+  readonly status: V2TurnStartResponse__CollabAgentStatus;
+};
+export const V2TurnStartResponse__CollabAgentState = Schema.Struct({
+  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  status: V2TurnStartResponse__CollabAgentStatus,
+}).annotate({ identifier: "V2TurnStartResponse__CollabAgentState" });
+
+export type V2TurnSteerParams__TextElement = {
+  readonly byteRange: V2TurnSteerParams__ByteRange;
+  readonly placeholder?: string | null;
+};
+export const V2TurnSteerParams__TextElement = Schema.Struct({
+  byteRange: Schema.suspend(
+    (): Schema.Codec<V2TurnSteerParams__ByteRange> => V2TurnSteerParams__ByteRange,
+  ).annotate({ description: "Byte range in the parent `text` buffer that this element occupies." }),
+  placeholder: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional human-readable placeholder for the element, displayed in the UI.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2TurnSteerParams__TextElement" });
+
+export type ApplyPatchApprovalResponse__ReviewDecision =
+  | "approved"
+  | {
+      readonly approved_execpolicy_amendment: {
+        readonly proposed_execpolicy_amendment: ReadonlyArray<string>;
+      };
+    }
+  | "approved_for_session"
+  | "approved_mcp_policy_amendment"
+  | {
+      readonly network_policy_amendment: {
+        readonly network_policy_amendment: ApplyPatchApprovalResponse__NetworkPolicyAmendment;
+      };
+    }
+  | { readonly denied: { readonly rejection: string } }
+  | "timed_out"
+  | "abort";
+export const ApplyPatchApprovalResponse__ReviewDecision = Schema.Union(
+  [
+    Schema.Literal("approved").annotate({
+      description: "User has approved this command and the agent should execute it.",
+    }),
+    Schema.Struct({
+      approved_execpolicy_amendment: Schema.Struct({
+        proposed_execpolicy_amendment: Schema.Array(Schema.String),
+      }),
+    }).annotate({
+      title: "ApprovedExecpolicyAmendmentReviewDecision",
+      description:
+        "User has approved this command and wants to apply the proposed execpolicy amendment so future matching commands are permitted.",
+    }),
+    Schema.Literal("approved_for_session").annotate({
+      description:
+        "User has approved this request and wants future prompts in the same session-scoped approval cache to be automatically approved for the remainder of the session.",
+    }),
+    Schema.Literal("approved_mcp_policy_amendment").annotate({
+      description:
+        "User has approved this MCP tool call and wants to amend its policy so matching future calls are automatically approved across sessions.",
+    }),
+    Schema.Struct({
+      network_policy_amendment: Schema.Struct({
+        network_policy_amendment: ApplyPatchApprovalResponse__NetworkPolicyAmendment,
+      }),
+    }).annotate({
+      title: "NetworkPolicyAmendmentReviewDecision",
+      description:
+        "User chose to persist a network policy rule (allow/deny) for future requests to the same host.",
+    }),
+    Schema.Struct({ denied: Schema.Struct({ rejection: Schema.String }) }).annotate({
+      title: "DeniedReviewDecision",
+      description:
+        "User has denied this command and the agent should not execute it, but it should continue the session and try something else.",
+    }),
+    Schema.Literal("timed_out").annotate({
+      description: "Automatic approval review timed out before reaching a decision.",
+    }),
+    Schema.Literal("abort").annotate({
+      description:
+        "User has denied this command and the agent should not do anything until the user's next command.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "User's decision in response to an ExecApprovalRequest.",
+  identifier: "ApplyPatchApprovalResponse__ReviewDecision",
+});
+
+export type ClientRequest__ThreadItemsListParams = {
+  readonly cursor?: ClientRequest__ThreadItemsListCursor | null;
+  readonly limit?: number | null;
+  readonly sortDirection?: ClientRequest__SortDirection | null;
+  readonly threadId: string;
+  readonly turnId?: string | null;
+};
+export const ClientRequest__ThreadItemsListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
+    Schema.Union([ClientRequest__ThreadItemsListCursor, Schema.Null]).annotate({
+      description:
+        "Opaque continuation cursor or an exclusive item anchor in the requested visible turn. An item anchor requires a non-empty `turnId`; ascending (the default) returns items after it, and descending returns items before it. Continue with the returned string cursor.",
+    }),
+  ),
+  limit: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ description: "Optional item page size.", format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  sortDirection: Schema.optionalKey(
+    Schema.Union([ClientRequest__SortDirection, Schema.Null]).annotate({
+      description: "Optional item pagination direction; defaults to ascending.",
+    }),
+  ),
+  threadId: Schema.String,
+  turnId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional turn id to filter by. When omitted, returns items across the thread.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__ThreadItemsListParams" });
+
+export type ClientRequest__PluginShareSaveParams = {
+  readonly discoverability?: ClientRequest__PluginShareDiscoverability | null;
+  readonly pluginPath: ClientRequest__AbsolutePathBuf;
+  readonly remotePluginId?: string | null;
+  readonly shareTargets?: ReadonlyArray<ClientRequest__PluginShareTarget> | null;
+};
+export const ClientRequest__PluginShareSaveParams = Schema.Struct({
+  discoverability: Schema.optionalKey(
+    Schema.Union([ClientRequest__PluginShareDiscoverability, Schema.Null]),
+  ),
+  pluginPath: ClientRequest__AbsolutePathBuf,
+  remotePluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  shareTargets: Schema.optionalKey(
+    Schema.Union([Schema.Array(ClientRequest__PluginShareTarget), Schema.Null]),
+  ),
+}).annotate({ identifier: "ClientRequest__PluginShareSaveParams" });
+
+export type ClientRequest__PluginShareUpdateTargetsParams = {
+  readonly discoverability: ClientRequest__PluginShareUpdateDiscoverability;
+  readonly remotePluginId: string;
+  readonly shareTargets: ReadonlyArray<ClientRequest__PluginShareTarget>;
+};
+export const ClientRequest__PluginShareUpdateTargetsParams = Schema.Struct({
+  discoverability: ClientRequest__PluginShareUpdateDiscoverability,
+  remotePluginId: Schema.String,
+  shareTargets: Schema.Array(ClientRequest__PluginShareTarget),
+}).annotate({ identifier: "ClientRequest__PluginShareUpdateTargetsParams" });
+
+export type ClientRequest__UserInput =
+  | {
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<ClientRequest__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: ClientRequest__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: ClientRequest__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: ClientRequest__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const ClientRequest__UserInput = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(ClientRequest__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
+    Schema.Struct({
+      detail: Schema.optionalKey(Schema.Union([ClientRequest__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ClientRequest__UserInput" });
+
+export type ClientRequest__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<ClientRequest__FunctionCallOutputContentItem>;
+export const ClientRequest__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(ClientRequest__FunctionCallOutputContentItem),
+]).annotate({ identifier: "ClientRequest__FunctionCallOutputBody" });
+
+export type ClientRequest__CommandExecParams = {
+  readonly command: ReadonlyArray<string>;
+  readonly cwd?: string | null;
+  readonly disableOutputCap?: boolean;
+  readonly disableTimeout?: boolean;
+  readonly env?: { readonly [x: string]: string | null } | null;
+  readonly outputBytesCap?: number | null;
+  readonly processId?: string | null;
+  readonly sandboxPolicy?: ClientRequest__SandboxPolicy | null;
+  readonly size?: ClientRequest__CommandExecTerminalSize | null;
+  readonly streamStdin?: boolean;
+  readonly streamStdoutStderr?: boolean;
+  readonly timeoutMs?: number | null;
+  readonly tty?: boolean;
+};
+export const ClientRequest__CommandExecParams = Schema.Struct({
+  command: Schema.Array(Schema.String).annotate({
+    description: "Command argv vector. Empty arrays are rejected.",
+  }),
+  cwd: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional working directory. Defaults to the server cwd.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  disableOutputCap: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Disable stdout/stderr capture truncation for this request.\n\nCannot be combined with `outputBytesCap`.",
+    }),
+  ),
+  disableTimeout: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Disable the timeout entirely for this request.\n\nCannot be combined with `timeoutMs`.",
+    }),
+  ),
+  env: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, Schema.Union([Schema.String, Schema.Null])).annotate({
+        description:
+          "Optional environment overrides merged into the server-computed environment.\n\nMatching names override inherited values. Set a key to `null` to unset an inherited variable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  outputBytesCap: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Optional per-stream stdout/stderr capture cap in bytes.\n\nWhen omitted, the server default applies. Cannot be combined with `disableOutputCap`.",
+        format: "uint",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  processId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional client-supplied, connection-scoped process id.\n\nRequired for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up `command/exec/write`, `command/exec/resize`, and `command/exec/terminate` calls. When omitted, buffered execution gets an internal id that is not exposed to the client.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  sandboxPolicy: Schema.optionalKey(
+    Schema.Union([ClientRequest__SandboxPolicy, Schema.Null]).annotate({
+      description:
+        "Optional sandbox policy for this command.\n\nUses the same shape as thread/turn execution sandbox configuration and defaults to the user's configured policy when omitted. Cannot be combined with `permissionProfile`.",
+    }),
+  ),
+  size: Schema.optionalKey(
+    Schema.Union([ClientRequest__CommandExecTerminalSize, Schema.Null]).annotate({
+      description: "Optional initial PTY size in character cells. Only valid when `tty` is true.",
+    }),
+  ),
+  streamStdin: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Allow follow-up `command/exec/write` requests to write stdin bytes.\n\nRequires a client-supplied `processId`.",
+    }),
+  ),
+  streamStdoutStderr: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Stream stdout/stderr via `command/exec/outputDelta` notifications.\n\nStreamed bytes are not duplicated into the final response and require a client-supplied `processId`.",
+    }),
+  ),
+  timeoutMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Optional timeout in milliseconds.\n\nWhen omitted, the server default applies. Cannot be combined with `disableTimeout`.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  tty: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "Enable PTY mode.\n\nThis implies `streamStdin` and `streamStdoutStderr`.",
+    }),
+  ),
+}).annotate({
+  description:
+    "Run a standalone command (argv vector) in the server sandbox without creating a thread or turn.\n\nThe final `command/exec` response is deferred until the process exits and is sent only after all `command/exec/outputDelta` notifications for that connection have been emitted.",
+  identifier: "ClientRequest__CommandExecParams",
+});
+
+export type ClientRequest__ExternalAgentConfigMigrationItem = {
+  readonly cwd?: string | null;
+  readonly description: string;
+  readonly details?: ClientRequest__MigrationDetails | null;
+  readonly itemType: ClientRequest__ExternalAgentConfigMigrationItemType;
+};
+export const ClientRequest__ExternalAgentConfigMigrationItem = Schema.Struct({
+  cwd: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  description: Schema.String,
+  details: Schema.optionalKey(Schema.Union([ClientRequest__MigrationDetails, Schema.Null])),
+  itemType: ClientRequest__ExternalAgentConfigMigrationItemType,
+}).annotate({ identifier: "ClientRequest__ExternalAgentConfigMigrationItem" });
+
+export type ClientRequest__ExternalAgentConfigImportHistoryRecordTypeResultParams = {
+  readonly failures: ReadonlyArray<ClientRequest__ExternalAgentConfigImportItemTypeFailure>;
+  readonly itemType: ClientRequest__ExternalAgentConfigMigrationItemType;
+  readonly successes: ReadonlyArray<ClientRequest__ExternalAgentConfigImportHistoryRecordSuccessParams>;
+};
+export const ClientRequest__ExternalAgentConfigImportHistoryRecordTypeResultParams = Schema.Struct({
+  failures: Schema.Array(ClientRequest__ExternalAgentConfigImportItemTypeFailure),
+  itemType: ClientRequest__ExternalAgentConfigMigrationItemType,
+  successes: Schema.Array(ClientRequest__ExternalAgentConfigImportHistoryRecordSuccessParams),
+}).annotate({
+  identifier: "ClientRequest__ExternalAgentConfigImportHistoryRecordTypeResultParams",
+});
+
+export type ClientRequest__ConfigBatchWriteParams = {
+  readonly edits: ReadonlyArray<ClientRequest__ConfigEdit>;
+  readonly expectedVersion?: string | null;
+  readonly filePath?: string | null;
+  readonly reloadUserConfig?: boolean;
+};
+export const ClientRequest__ConfigBatchWriteParams = Schema.Struct({
+  edits: Schema.Array(ClientRequest__ConfigEdit),
+  expectedVersion: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  filePath: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Path to the config file to write; defaults to the user's `config.toml` when omitted.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  reloadUserConfig: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, hot-reload updated runtime settings into loaded threads after writing. Session-static model, reasoning-effort, Plan-mode reasoning-effort, and service-tier defaults are not reloaded. The deprecated personality setting is also not reloaded.",
+    }),
+  ),
+}).annotate({ identifier: "ClientRequest__ConfigBatchWriteParams" });
+
+export type CommandExecutionRequestApprovalParams__FileSystemPath =
+  | {
+      readonly path: CommandExecutionRequestApprovalParams__LegacyAppPathString;
+      readonly type: "path";
+    }
+  | { readonly pattern: string; readonly type: "glob_pattern" }
+  | {
+      readonly type: "special";
+      readonly value: CommandExecutionRequestApprovalParams__FileSystemSpecialPath;
+    };
+export const CommandExecutionRequestApprovalParams__FileSystemPath = Schema.Union(
+  [
+    Schema.Struct({
+      path: CommandExecutionRequestApprovalParams__LegacyAppPathString,
+      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
+    }).annotate({ title: "PathFileSystemPath" }),
+    Schema.Struct({
+      pattern: Schema.String,
+      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
+    }).annotate({ title: "GlobPatternFileSystemPath" }),
+    Schema.Struct({
+      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
+      value: CommandExecutionRequestApprovalParams__FileSystemSpecialPath,
+    }).annotate({ title: "SpecialFileSystemPath" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "CommandExecutionRequestApprovalParams__FileSystemPath" });
+
+export type CommandExecutionRequestApprovalResponse__CommandExecutionApprovalDecision =
+  | "accept"
+  | "acceptForSession"
+  | {
+      readonly acceptWithExecpolicyAmendment: {
+        readonly execpolicy_amendment: ReadonlyArray<string>;
+      };
+    }
+  | {
+      readonly applyNetworkPolicyAmendment: {
+        readonly network_policy_amendment: CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment;
+      };
+    }
+  | "decline"
+  | "cancel";
+export const CommandExecutionRequestApprovalResponse__CommandExecutionApprovalDecision =
+  Schema.Union(
+    [
+      Schema.Literal("accept").annotate({ description: "User approved the command." }),
+      Schema.Literal("acceptForSession").annotate({
+        description:
+          "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
+      }),
+      Schema.Struct({
+        acceptWithExecpolicyAmendment: Schema.Struct({
+          execpolicy_amendment: Schema.Array(Schema.String),
+        }),
+      }).annotate({
+        title: "AcceptWithExecpolicyAmendmentCommandExecutionApprovalDecision",
+        description:
+          "User approved the command, and wants to apply the proposed execpolicy amendment so future matching commands can run without prompting.",
+      }),
+      Schema.Struct({
+        applyNetworkPolicyAmendment: Schema.Struct({
+          network_policy_amendment: CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment,
+        }),
+      }).annotate({
+        title: "ApplyNetworkPolicyAmendmentCommandExecutionApprovalDecision",
+        description: "User chose a persistent network policy rule (allow/deny) for this host.",
+      }),
+      Schema.Literal("decline").annotate({
+        description: "User denied the command. The agent will continue the turn.",
+      }),
+      Schema.Literal("cancel").annotate({
+        description: "User denied the command. The turn will also be immediately interrupted.",
+      }),
+    ],
+    { mode: "oneOf" },
+  ).annotate({
+    identifier: "CommandExecutionRequestApprovalResponse__CommandExecutionApprovalDecision",
+  });
+
+export type ExecCommandApprovalResponse__ReviewDecision =
+  | "approved"
+  | {
+      readonly approved_execpolicy_amendment: {
+        readonly proposed_execpolicy_amendment: ReadonlyArray<string>;
+      };
+    }
+  | "approved_for_session"
+  | "approved_mcp_policy_amendment"
+  | {
+      readonly network_policy_amendment: {
+        readonly network_policy_amendment: ExecCommandApprovalResponse__NetworkPolicyAmendment;
+      };
+    }
+  | { readonly denied: { readonly rejection: string } }
+  | "timed_out"
+  | "abort";
+export const ExecCommandApprovalResponse__ReviewDecision = Schema.Union(
+  [
+    Schema.Literal("approved").annotate({
+      description: "User has approved this command and the agent should execute it.",
+    }),
+    Schema.Struct({
+      approved_execpolicy_amendment: Schema.Struct({
+        proposed_execpolicy_amendment: Schema.Array(Schema.String),
+      }),
+    }).annotate({
+      title: "ApprovedExecpolicyAmendmentReviewDecision",
+      description:
+        "User has approved this command and wants to apply the proposed execpolicy amendment so future matching commands are permitted.",
+    }),
+    Schema.Literal("approved_for_session").annotate({
+      description:
+        "User has approved this request and wants future prompts in the same session-scoped approval cache to be automatically approved for the remainder of the session.",
+    }),
+    Schema.Literal("approved_mcp_policy_amendment").annotate({
+      description:
+        "User has approved this MCP tool call and wants to amend its policy so matching future calls are automatically approved across sessions.",
+    }),
+    Schema.Struct({
+      network_policy_amendment: Schema.Struct({
+        network_policy_amendment: ExecCommandApprovalResponse__NetworkPolicyAmendment,
+      }),
+    }).annotate({
+      title: "NetworkPolicyAmendmentReviewDecision",
+      description:
+        "User chose to persist a network policy rule (allow/deny) for future requests to the same host.",
+    }),
+    Schema.Struct({ denied: Schema.Struct({ rejection: Schema.String }) }).annotate({
+      title: "DeniedReviewDecision",
+      description:
+        "User has denied this command and the agent should not execute it, but it should continue the session and try something else.",
+    }),
+    Schema.Literal("timed_out").annotate({
+      description: "Automatic approval review timed out before reaching a decision.",
+    }),
+    Schema.Literal("abort").annotate({
+      description:
+        "User has denied this command and the agent should not do anything until the user's next command.",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description: "User's decision in response to an ExecApprovalRequest.",
+  identifier: "ExecCommandApprovalResponse__ReviewDecision",
+});
+
+export type McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema = {
+  readonly default?: ReadonlyArray<string> | null;
+  readonly description?: string | null;
+  readonly items: McpServerElicitationRequestParams__McpElicitationUntitledEnumItems;
+  readonly maxItems?: number | null;
+  readonly minItems?: number | null;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationArrayType;
+};
+export const McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema =
+  Schema.Struct({
+    default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    items: McpServerElicitationRequestParams__McpElicitationUntitledEnumItems,
+    maxItems: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint64" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+    minItems: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint64" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    type: McpServerElicitationRequestParams__McpElicitationArrayType,
+  }).annotate({
+    identifier: "McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema",
+  });
+
+export type McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema =
+  | McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema
+  | McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema;
+export const McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema = Schema.Union(
+  [
+    McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema,
+    McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema,
+  ],
+).annotate({
+  identifier: "McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema",
+});
+
+export type McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema = {
+  readonly default?: ReadonlyArray<string> | null;
+  readonly description?: string | null;
+  readonly items: McpServerElicitationRequestParams__McpElicitationTitledEnumItems;
+  readonly maxItems?: number | null;
+  readonly minItems?: number | null;
+  readonly title?: string | null;
+  readonly type: McpServerElicitationRequestParams__McpElicitationArrayType;
+};
+export const McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema =
+  Schema.Struct({
+    default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    items: McpServerElicitationRequestParams__McpElicitationTitledEnumItems,
+    maxItems: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint64" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+    minItems: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint64" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    type: McpServerElicitationRequestParams__McpElicitationArrayType,
+  }).annotate({
+    identifier: "McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema",
+  });
+
+export type PermissionsRequestApprovalParams__FileSystemPath =
+  | { readonly path: PermissionsRequestApprovalParams__LegacyAppPathString; readonly type: "path" }
+  | { readonly pattern: string; readonly type: "glob_pattern" }
+  | {
+      readonly type: "special";
+      readonly value: PermissionsRequestApprovalParams__FileSystemSpecialPath;
+    };
+export const PermissionsRequestApprovalParams__FileSystemPath = Schema.Union(
+  [
+    Schema.Struct({
+      path: PermissionsRequestApprovalParams__LegacyAppPathString,
+      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
+    }).annotate({ title: "PathFileSystemPath" }),
+    Schema.Struct({
+      pattern: Schema.String,
+      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
+    }).annotate({ title: "GlobPatternFileSystemPath" }),
+    Schema.Struct({
+      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
+      value: PermissionsRequestApprovalParams__FileSystemSpecialPath,
+    }).annotate({ title: "SpecialFileSystemPath" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "PermissionsRequestApprovalParams__FileSystemPath" });
+
+export type PermissionsRequestApprovalResponse__FileSystemPath =
+  | {
+      readonly path: PermissionsRequestApprovalResponse__LegacyAppPathString;
+      readonly type: "path";
+    }
+  | { readonly pattern: string; readonly type: "glob_pattern" }
+  | {
+      readonly type: "special";
+      readonly value: PermissionsRequestApprovalResponse__FileSystemSpecialPath;
+    };
+export const PermissionsRequestApprovalResponse__FileSystemPath = Schema.Union(
+  [
+    Schema.Struct({
+      path: PermissionsRequestApprovalResponse__LegacyAppPathString,
+      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
+    }).annotate({ title: "PathFileSystemPath" }),
+    Schema.Struct({
+      pattern: Schema.String,
+      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
+    }).annotate({ title: "GlobPatternFileSystemPath" }),
+    Schema.Struct({
+      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
+      value: PermissionsRequestApprovalResponse__FileSystemSpecialPath,
+    }).annotate({ title: "SpecialFileSystemPath" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "PermissionsRequestApprovalResponse__FileSystemPath" });
+
+export type ServerNotification__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: ServerNotification__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: ServerNotification__MisalignmentErrorDetails | null;
+};
+export const ServerNotification__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([ServerNotification__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([ServerNotification__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "ServerNotification__TurnError" });
+
+export type ServerNotification__CollaborationMode = {
+  readonly mode: ServerNotification__ModeKind;
+  readonly settings: ServerNotification__Settings;
+};
+export const ServerNotification__CollaborationMode = Schema.Struct({
+  mode: ServerNotification__ModeKind,
+  settings: ServerNotification__Settings,
+}).annotate({
+  description: "Collaboration mode for a Codex session.",
+  identifier: "ServerNotification__CollaborationMode",
+});
+
+export type ServerNotification__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: ServerNotification__SubAgentSource };
+export const ServerNotification__SessionSource = Schema.Union(
+  [
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: ServerNotification__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__SessionSource" });
+
+export type ServerNotification__ThreadStatusChangedNotification = {
+  readonly status: ServerNotification__ThreadStatus;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadStatusChangedNotification = Schema.Struct({
+  status: ServerNotification__ThreadStatus,
+  threadId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadStatusChangedNotification" });
+
+export type ServerNotification__UserInput =
+  | {
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<ServerNotification__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: ServerNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: ServerNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: ServerNotification__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const ServerNotification__UserInput = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(ServerNotification__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ServerNotification__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([ServerNotification__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
+    Schema.Struct({
+      detail: Schema.optionalKey(Schema.Union([ServerNotification__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__UserInput" });
+
+export type ServerNotification__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<ServerNotification__FunctionCallOutputContentItem>;
+export const ServerNotification__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(ServerNotification__FunctionCallOutputContentItem),
+]).annotate({ identifier: "ServerNotification__FunctionCallOutputBody" });
+
+export type ServerNotification__FileSystemPath =
+  | { readonly path: ServerNotification__LegacyAppPathString; readonly type: "path" }
+  | { readonly pattern: string; readonly type: "glob_pattern" }
+  | { readonly type: "special"; readonly value: ServerNotification__FileSystemSpecialPath };
+export const ServerNotification__FileSystemPath = Schema.Union(
+  [
+    Schema.Struct({
+      path: ServerNotification__LegacyAppPathString,
+      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
+    }).annotate({ title: "PathFileSystemPath" }),
+    Schema.Struct({
+      pattern: Schema.String,
+      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
+    }).annotate({ title: "GlobPatternFileSystemPath" }),
+    Schema.Struct({
+      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
+      value: ServerNotification__FileSystemSpecialPath,
+    }).annotate({ title: "SpecialFileSystemPath" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__FileSystemPath" });
+
+export type ServerNotification__FileChangePatchUpdatedNotification = {
+  readonly changes: ReadonlyArray<ServerNotification__FileUpdateChange>;
+  readonly itemId: string;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__FileChangePatchUpdatedNotification = Schema.Struct({
+  changes: Schema.Array(ServerNotification__FileUpdateChange),
+  itemId: Schema.String,
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__FileChangePatchUpdatedNotification" });
+
+export type ServerNotification__ThreadGoalUpdatedNotification = {
+  readonly goal: ServerNotification__ThreadGoal;
+  readonly threadId: string;
+  readonly turnId?: string | null;
+};
+export const ServerNotification__ThreadGoalUpdatedNotification = Schema.Struct({
+  goal: ServerNotification__ThreadGoal,
+  threadId: Schema.String,
+  turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__ThreadGoalUpdatedNotification" });
+
+export type ServerNotification__ThreadTokenUsageUpdatedNotification = {
+  readonly threadId: string;
+  readonly tokenUsage: ServerNotification__ThreadTokenUsage;
+  readonly turnId: string;
+};
+export const ServerNotification__ThreadTokenUsageUpdatedNotification = Schema.Struct({
+  threadId: Schema.String,
+  tokenUsage: ServerNotification__ThreadTokenUsage,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ThreadTokenUsageUpdatedNotification" });
+
+export type ServerNotification__HookRunSummary = {
+  readonly completedAt?: number | null;
+  readonly displayOrder: number;
+  readonly durationMs?: number | null;
+  readonly entries: ReadonlyArray<ServerNotification__HookOutputEntry>;
+  readonly eventName: ServerNotification__HookEventName;
+  readonly executionMode: ServerNotification__HookExecutionMode;
+  readonly handlerType: ServerNotification__HookHandlerType;
+  readonly id: string;
+  readonly scope: ServerNotification__HookScope;
+  readonly source?: ServerNotification__HookSource;
+  readonly sourcePath: ServerNotification__AbsolutePathBuf;
+  readonly startedAt: number;
+  readonly status: ServerNotification__HookRunStatus;
+  readonly statusMessage?: string | null;
+};
+export const ServerNotification__HookRunSummary = Schema.Struct({
+  completedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  displayOrder: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  durationMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  entries: Schema.Array(ServerNotification__HookOutputEntry),
+  eventName: ServerNotification__HookEventName,
+  executionMode: ServerNotification__HookExecutionMode,
+  handlerType: ServerNotification__HookHandlerType,
+  id: Schema.String,
+  scope: ServerNotification__HookScope,
+  source: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<ServerNotification__HookSource> => ServerNotification__HookSource,
+    ).annotate({ default: "unknown" }),
+  ),
+  sourcePath: ServerNotification__AbsolutePathBuf,
+  startedAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  status: ServerNotification__HookRunStatus,
+  statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__HookRunSummary" });
+
+export type ServerNotification__TurnPlanUpdatedNotification = {
+  readonly explanation?: string | null;
+  readonly plan: ReadonlyArray<ServerNotification__TurnPlanStep>;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__TurnPlanUpdatedNotification = Schema.Struct({
+  explanation: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  plan: Schema.Array(ServerNotification__TurnPlanStep),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__TurnPlanUpdatedNotification" });
+
+export type ServerNotification__AccountRateLimitsUpdatedNotification = {
+  readonly rateLimits: ServerNotification__RateLimitSnapshot;
+};
+export const ServerNotification__AccountRateLimitsUpdatedNotification = Schema.Struct({
+  rateLimits: ServerNotification__RateLimitSnapshot,
+}).annotate({
+  description:
+    "Sparse rolling rate-limit update.\n\nClients should merge available values into the most recent `account/rateLimits/read` response or refetch that snapshot. Nullable account metadata may be unavailable in a rolling update and does not clear a previously observed value.",
+  identifier: "ServerNotification__AccountRateLimitsUpdatedNotification",
+});
+
+export type ServerNotification__AppInfo = {
+  readonly appMetadata?: ServerNotification__AppMetadata | null;
+  readonly branding?: ServerNotification__AppBranding | null;
+  readonly description?: string | null;
+  readonly distributionChannel?: string | null;
+  readonly iconAssets?: { readonly [x: string]: string } | null;
+  readonly iconDarkAssets?: { readonly [x: string]: string } | null;
+  readonly id: string;
+  readonly installUrl?: string | null;
+  readonly isAccessible?: boolean;
+  readonly isEnabled?: boolean;
+  readonly labels?: { readonly [x: string]: string } | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly name: string;
+  readonly pluginDisplayNames?: ReadonlyArray<string>;
+};
+export const ServerNotification__AppInfo = Schema.Struct({
+  appMetadata: Schema.optionalKey(Schema.Union([ServerNotification__AppMetadata, Schema.Null])),
+  branding: Schema.optionalKey(Schema.Union([ServerNotification__AppBranding, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  distributionChannel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  iconAssets: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  iconDarkAssets: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  id: Schema.String,
+  installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  isAccessible: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+  isEnabled: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Whether this app is enabled in config.toml. Example: ```toml [apps.bad_app] enabled = false ```",
+      default: true,
+    }),
+  ),
+  labels: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  name: Schema.String,
+  pluginDisplayNames: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+}).annotate({
+  description: "EXPERIMENTAL - app metadata returned by app-list APIs.",
+  identifier: "ServerNotification__AppInfo",
+});
+
+export type ServerNotification__ExternalAgentConfigImportTypeResult = {
+  readonly failures: ReadonlyArray<ServerNotification__ExternalAgentConfigImportItemTypeFailure>;
+  readonly itemType: ServerNotification__ExternalAgentConfigMigrationItemType;
+  readonly successes: ReadonlyArray<ServerNotification__ExternalAgentConfigImportItemTypeSuccess>;
+};
+export const ServerNotification__ExternalAgentConfigImportTypeResult = Schema.Struct({
+  failures: Schema.Array(ServerNotification__ExternalAgentConfigImportItemTypeFailure),
+  itemType: ServerNotification__ExternalAgentConfigMigrationItemType,
+  successes: Schema.Array(ServerNotification__ExternalAgentConfigImportItemTypeSuccess),
+}).annotate({ identifier: "ServerNotification__ExternalAgentConfigImportTypeResult" });
+
+export type ServerNotification__ConfigWarningNotification = {
+  readonly details?: string | null;
+  readonly path?: string | null;
+  readonly range?: ServerNotification__TextRange | null;
+  readonly summary: string;
+};
+export const ServerNotification__ConfigWarningNotification = Schema.Struct({
+  details: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Optional extra guidance or error details." }),
+      Schema.Null,
+    ]),
+  ),
+  path: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional path to the config file that triggered the warning.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  range: Schema.optionalKey(
+    Schema.Union([ServerNotification__TextRange, Schema.Null]).annotate({
+      description: "Optional range for the error location inside the config file.",
+    }),
+  ),
+  summary: Schema.String.annotate({ description: "Concise summary of the warning." }),
+}).annotate({ identifier: "ServerNotification__ConfigWarningNotification" });
+
+export type ServerNotification__FuzzyFileSearchSessionUpdatedNotification = {
+  readonly files: ReadonlyArray<ServerNotification__FuzzyFileSearchResult>;
+  readonly query: string;
+  readonly sessionId: string;
+};
+export const ServerNotification__FuzzyFileSearchSessionUpdatedNotification = Schema.Struct({
+  files: Schema.Array(ServerNotification__FuzzyFileSearchResult),
+  query: Schema.String,
+  sessionId: Schema.String,
+}).annotate({ identifier: "ServerNotification__FuzzyFileSearchSessionUpdatedNotification" });
+
+export type ServerNotification__ThreadRealtimeItemStartedNotification = {
+  readonly item: ServerNotification__ThreadRealtimeItem;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadRealtimeItemStartedNotification = Schema.Struct({
+  item: ServerNotification__ThreadRealtimeItem,
+  threadId: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL - a realtime timeline item started before its content streams.",
+  identifier: "ServerNotification__ThreadRealtimeItemStartedNotification",
+});
+
+export type ServerNotification__ThreadRealtimeItemCompletedNotification = {
+  readonly item: ServerNotification__ThreadRealtimeItem;
+  readonly threadId: string;
+};
+export const ServerNotification__ThreadRealtimeItemCompletedNotification = Schema.Struct({
+  item: ServerNotification__ThreadRealtimeItem,
+  threadId: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL - a realtime timeline item published after canonical commit.",
+  identifier: "ServerNotification__ThreadRealtimeItemCompletedNotification",
+});
+
+export type ServerRequest__FileSystemPath =
+  | { readonly path: ServerRequest__LegacyAppPathString; readonly type: "path" }
+  | { readonly pattern: string; readonly type: "glob_pattern" }
+  | { readonly type: "special"; readonly value: ServerRequest__FileSystemSpecialPath };
+export const ServerRequest__FileSystemPath = Schema.Union(
+  [
+    Schema.Struct({
+      path: ServerRequest__LegacyAppPathString,
+      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
+    }).annotate({ title: "PathFileSystemPath" }),
+    Schema.Struct({
+      pattern: Schema.String,
+      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
+    }).annotate({ title: "GlobPatternFileSystemPath" }),
+    Schema.Struct({
+      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
+      value: ServerRequest__FileSystemSpecialPath,
+    }).annotate({ title: "SpecialFileSystemPath" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerRequest__FileSystemPath" });
+
+export type ServerRequest__CommandExecutionRequestApprovalParams = {
+  readonly approvalId?: string | null;
+  readonly command?: string | null;
+  readonly commandActions?: ReadonlyArray<ServerRequest__CommandAction> | null;
+  readonly cwd?: ServerRequest__LegacyAppPathString | null;
+  readonly environmentId?: string | null;
+  readonly itemId: string;
+  readonly kind?: ServerRequest__CommandExecutionApprovalKind;
+  readonly networkApprovalContext?: ServerRequest__NetworkApprovalContext | null;
+  readonly proposedExecpolicyAmendment?: ReadonlyArray<string> | null;
+  readonly proposedNetworkPolicyAmendments?: ReadonlyArray<ServerRequest__NetworkPolicyAmendment> | null;
+  readonly reason?: string | null;
+  readonly startedAtMs: number;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerRequest__CommandExecutionRequestApprovalParams = Schema.Struct({
+  approvalId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Unique identifier for this specific approval callback.\n\nFor regular shell/unified_exec approvals, this is null.\n\nFor zsh-exec-bridge subcommand approvals, multiple callbacks can belong to one parent `itemId`, so `approvalId` is a distinct opaque callback id (a UUID) used to disambiguate routing. Stdin approvals also use a distinct callback id; inspect `kind` to distinguish them.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  command: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "The command to be executed." }),
+      Schema.Null,
+    ]),
+  ),
+  commandActions: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ServerRequest__CommandAction).annotate({
+        description: "Best-effort parsed command actions for friendly display.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  cwd: Schema.optionalKey(
+    Schema.Union([ServerRequest__LegacyAppPathString, Schema.Null]).annotate({
+      description: "The command's working directory.",
+    }),
+  ),
+  environmentId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Environment in which the command will run." }),
+      Schema.Null,
+    ]),
+  ),
+  itemId: Schema.String,
+  kind: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<ServerRequest__CommandExecutionApprovalKind> =>
+        ServerRequest__CommandExecutionApprovalKind,
+    ).annotate({
+      description: "Kind of action under review. Defaults to `command` for older servers.",
+      default: "command",
+    }),
+  ),
+  networkApprovalContext: Schema.optionalKey(
+    Schema.Union([ServerRequest__NetworkApprovalContext, Schema.Null]).annotate({
+      description: "Optional context for a managed-network approval prompt.",
+    }),
+  ),
+  proposedExecpolicyAmendment: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Optional proposed execpolicy amendment to allow similar commands without prompting.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  proposedNetworkPolicyAmendments: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ServerRequest__NetworkPolicyAmendment).annotate({
+        description:
+          "Optional proposed network policy amendments (allow/deny host) for future requests.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  reason: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional explanatory reason (e.g. request for network access).",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  startedAtMs: Schema.Number.annotate({
+    description: "Unix timestamp (in milliseconds) when this approval request started.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerRequest__CommandExecutionRequestApprovalParams" });
+
+export type ServerRequest__ToolRequestUserInputParams = {
+  readonly autoResolutionMs?: number | null;
+  readonly isBlocking: boolean;
+  readonly itemId: string;
+  readonly questions: ReadonlyArray<ServerRequest__ToolRequestUserInputQuestion>;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerRequest__ToolRequestUserInputParams = Schema.Struct({
+  autoResolutionMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "@deprecated Use `isBlocking` to decide whether the request should block.",
+        format: "uint64",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  isBlocking: Schema.Boolean,
+  itemId: Schema.String,
+  questions: Schema.Array(ServerRequest__ToolRequestUserInputQuestion),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({
+  description: "EXPERIMENTAL. Params sent with a request_user_input event.",
+  identifier: "ServerRequest__ToolRequestUserInputParams",
+});
+
+export type ServerRequest__McpElicitationUntitledMultiSelectEnumSchema = {
+  readonly default?: ReadonlyArray<string> | null;
+  readonly description?: string | null;
+  readonly items: ServerRequest__McpElicitationUntitledEnumItems;
+  readonly maxItems?: number | null;
+  readonly minItems?: number | null;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationArrayType;
+};
+export const ServerRequest__McpElicitationUntitledMultiSelectEnumSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  items: ServerRequest__McpElicitationUntitledEnumItems,
+  maxItems: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  minItems: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationArrayType,
+}).annotate({ identifier: "ServerRequest__McpElicitationUntitledMultiSelectEnumSchema" });
+
+export type ServerRequest__McpElicitationSingleSelectEnumSchema =
+  | ServerRequest__McpElicitationUntitledSingleSelectEnumSchema
+  | ServerRequest__McpElicitationTitledSingleSelectEnumSchema;
+export const ServerRequest__McpElicitationSingleSelectEnumSchema = Schema.Union([
+  ServerRequest__McpElicitationUntitledSingleSelectEnumSchema,
+  ServerRequest__McpElicitationTitledSingleSelectEnumSchema,
+]).annotate({ identifier: "ServerRequest__McpElicitationSingleSelectEnumSchema" });
+
+export type ServerRequest__McpElicitationTitledMultiSelectEnumSchema = {
+  readonly default?: ReadonlyArray<string> | null;
+  readonly description?: string | null;
+  readonly items: ServerRequest__McpElicitationTitledEnumItems;
+  readonly maxItems?: number | null;
+  readonly minItems?: number | null;
+  readonly title?: string | null;
+  readonly type: ServerRequest__McpElicitationArrayType;
+};
+export const ServerRequest__McpElicitationTitledMultiSelectEnumSchema = Schema.Struct({
+  default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  items: ServerRequest__McpElicitationTitledEnumItems,
+  maxItems: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  minItems: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  type: ServerRequest__McpElicitationArrayType,
+}).annotate({ identifier: "ServerRequest__McpElicitationTitledMultiSelectEnumSchema" });
+
+export type V2AppListUpdatedNotification__AppInfo = {
+  readonly appMetadata?: V2AppListUpdatedNotification__AppMetadata | null;
+  readonly branding?: V2AppListUpdatedNotification__AppBranding | null;
+  readonly description?: string | null;
+  readonly distributionChannel?: string | null;
+  readonly iconAssets?: { readonly [x: string]: string } | null;
+  readonly iconDarkAssets?: { readonly [x: string]: string } | null;
+  readonly id: string;
+  readonly installUrl?: string | null;
+  readonly isAccessible?: boolean;
+  readonly isEnabled?: boolean;
+  readonly labels?: { readonly [x: string]: string } | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly name: string;
+  readonly pluginDisplayNames?: ReadonlyArray<string>;
+};
+export const V2AppListUpdatedNotification__AppInfo = Schema.Struct({
+  appMetadata: Schema.optionalKey(
+    Schema.Union([V2AppListUpdatedNotification__AppMetadata, Schema.Null]),
+  ),
+  branding: Schema.optionalKey(
+    Schema.Union([V2AppListUpdatedNotification__AppBranding, Schema.Null]),
+  ),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  distributionChannel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  iconAssets: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  iconDarkAssets: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  id: Schema.String,
+  installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  isAccessible: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+  isEnabled: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Whether this app is enabled in config.toml. Example: ```toml [apps.bad_app] enabled = false ```",
+      default: true,
+    }),
+  ),
+  labels: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  name: Schema.String,
+  pluginDisplayNames: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+}).annotate({
+  description: "EXPERIMENTAL - app metadata returned by app-list APIs.",
+  identifier: "V2AppListUpdatedNotification__AppInfo",
+});
+
+export type V2AppsListResponse__AppInfo = {
+  readonly appMetadata?: V2AppsListResponse__AppMetadata | null;
+  readonly branding?: V2AppsListResponse__AppBranding | null;
+  readonly description?: string | null;
+  readonly distributionChannel?: string | null;
+  readonly iconAssets?: { readonly [x: string]: string } | null;
+  readonly iconDarkAssets?: { readonly [x: string]: string } | null;
+  readonly id: string;
+  readonly installUrl?: string | null;
+  readonly isAccessible?: boolean;
+  readonly isEnabled?: boolean;
+  readonly labels?: { readonly [x: string]: string } | null;
+  readonly logoUrl?: string | null;
+  readonly logoUrlDark?: string | null;
+  readonly name: string;
+  readonly pluginDisplayNames?: ReadonlyArray<string>;
+};
+export const V2AppsListResponse__AppInfo = Schema.Struct({
+  appMetadata: Schema.optionalKey(Schema.Union([V2AppsListResponse__AppMetadata, Schema.Null])),
+  branding: Schema.optionalKey(Schema.Union([V2AppsListResponse__AppBranding, Schema.Null])),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  distributionChannel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  iconAssets: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  iconDarkAssets: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  id: Schema.String,
+  installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  isAccessible: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
+  isEnabled: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "Whether this app is enabled in config.toml. Example: ```toml [apps.bad_app] enabled = false ```",
+      default: true,
+    }),
+  ),
+  labels: Schema.optionalKey(
+    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
+  ),
+  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  name: Schema.String,
+  pluginDisplayNames: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+}).annotate({
+  description: "EXPERIMENTAL - app metadata returned by app-list APIs.",
+  identifier: "V2AppsListResponse__AppInfo",
+});
+
+export type V2ConfigReadResponse__BrowserUseConfig = {
+  readonly allow_history_access?: boolean | null;
+  readonly default_origin_policy?: V2ConfigReadResponse__BrowserUseOriginPolicyConfig | null;
+  readonly origins?: {
+    readonly [x: string]: V2ConfigReadResponse__BrowserUseOriginPolicyConfig;
+  } | null;
+};
+export const V2ConfigReadResponse__BrowserUseConfig = Schema.Struct({
+  allow_history_access: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  default_origin_policy: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__BrowserUseOriginPolicyConfig, Schema.Null]),
+  ),
+  origins: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, V2ConfigReadResponse__BrowserUseOriginPolicyConfig),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ConfigReadResponse__BrowserUseConfig" });
+
+export type V2ConfigReadResponse__ComputerUseWindowsConfig = {
+  readonly aumids?: { readonly [x: string]: V2ConfigReadResponse__AllowDenyRequirement } | null;
+  readonly exes?: ReadonlyArray<V2ConfigReadResponse__ComputerUseWindowsExeConfig> | null;
+};
+export const V2ConfigReadResponse__ComputerUseWindowsConfig = Schema.Struct({
+  aumids: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, V2ConfigReadResponse__AllowDenyRequirement),
+      Schema.Null,
+    ]),
+  ),
+  exes: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2ConfigReadResponse__ComputerUseWindowsExeConfig), Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ConfigReadResponse__ComputerUseWindowsConfig" });
+
+export type V2ConfigReadResponse__ToolsV2 = {
+  readonly web_search?: V2ConfigReadResponse__WebSearchToolConfig | null;
+};
+export const V2ConfigReadResponse__ToolsV2 = Schema.Struct({
+  web_search: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__WebSearchToolConfig, Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ConfigReadResponse__ToolsV2" });
+
+export type V2ConfigReadResponse__ConfigLayer = {
+  readonly config: Schema.Json;
+  readonly disabledReason?: string | null;
+  readonly name: V2ConfigReadResponse__ConfigLayerSource;
+  readonly version: string;
+};
+export const V2ConfigReadResponse__ConfigLayer = Schema.Struct({
+  config: Schema.Json.annotate({ expected: "JSON value" }),
+  disabledReason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  name: V2ConfigReadResponse__ConfigLayerSource,
+  version: Schema.String,
+}).annotate({ identifier: "V2ConfigReadResponse__ConfigLayer" });
+
+export type V2ConfigReadResponse__ConfigLayerMetadata = {
+  readonly name: V2ConfigReadResponse__ConfigLayerSource;
+  readonly version: string;
+};
+export const V2ConfigReadResponse__ConfigLayerMetadata = Schema.Struct({
+  name: V2ConfigReadResponse__ConfigLayerSource,
+  version: Schema.String,
+}).annotate({ identifier: "V2ConfigReadResponse__ConfigLayerMetadata" });
+
+export type V2ConfigRequirementsReadResponse__ComputerUseWindowsRequirements = {
+  readonly aumids?: {
+    readonly [x: string]: V2ConfigRequirementsReadResponse__AllowDenyRequirement;
+  } | null;
+  readonly exes?: ReadonlyArray<V2ConfigRequirementsReadResponse__ComputerUseWindowsExeRequirement> | null;
+};
+export const V2ConfigRequirementsReadResponse__ComputerUseWindowsRequirements = Schema.Struct({
+  aumids: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, V2ConfigRequirementsReadResponse__AllowDenyRequirement),
+      Schema.Null,
+    ]),
+  ),
+  exes: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(V2ConfigRequirementsReadResponse__ComputerUseWindowsExeRequirement),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ComputerUseWindowsRequirements" });
+
+export type V2ConfigRequirementsReadResponse__BrowserUseRequirements = {
+  readonly allowGlobalPersistentApproval?: boolean | null;
+  readonly allowHistoryAccess?: boolean | null;
+  readonly allowWebmcp?: boolean | null;
+  readonly defaultOriginPolicy?: V2ConfigRequirementsReadResponse__BrowserUseOriginPolicy | null;
+  readonly disableAutoReview?: boolean | null;
+  readonly origins?: {
+    readonly [x: string]: V2ConfigRequirementsReadResponse__BrowserUseOriginPolicy;
+  } | null;
+};
+export const V2ConfigRequirementsReadResponse__BrowserUseRequirements = Schema.Struct({
+  allowGlobalPersistentApproval: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  allowHistoryAccess: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  allowWebmcp: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  defaultOriginPolicy: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__BrowserUseOriginPolicy, Schema.Null]),
+  ),
+  disableAutoReview: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  origins: Schema.optionalKey(
+    Schema.Union([
+      Schema.Record(Schema.String, V2ConfigRequirementsReadResponse__BrowserUseOriginPolicy),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__BrowserUseRequirements" });
+
+export type V2ConfigRequirementsReadResponse__ModelsRequirements = {
+  readonly newThread?: V2ConfigRequirementsReadResponse__NewThreadModelDefaults | null;
+};
+export const V2ConfigRequirementsReadResponse__ModelsRequirements = Schema.Struct({
+  newThread: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__NewThreadModelDefaults, Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ModelsRequirements" });
+
+export type V2ConfigWriteResponse__ConfigLayerMetadata = {
+  readonly name: V2ConfigWriteResponse__ConfigLayerSource;
+  readonly version: string;
+};
+export const V2ConfigWriteResponse__ConfigLayerMetadata = Schema.Struct({
+  name: V2ConfigWriteResponse__ConfigLayerSource,
+  version: Schema.String,
+}).annotate({ identifier: "V2ConfigWriteResponse__ConfigLayerMetadata" });
+
+export type V2ErrorNotification__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ErrorNotification__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ErrorNotification__MisalignmentErrorDetails | null;
+};
+export const V2ErrorNotification__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ErrorNotification__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ErrorNotification__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ErrorNotification__TurnError" });
+
+export type V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItem = {
+  readonly cwd?: string | null;
+  readonly description: string;
+  readonly details?: V2ExternalAgentConfigDetectResponse__MigrationDetails | null;
+  readonly itemType: V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType;
+};
+export const V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItem = Schema.Struct({
+  cwd: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  description: Schema.String,
+  details: Schema.optionalKey(
+    Schema.Union([V2ExternalAgentConfigDetectResponse__MigrationDetails, Schema.Null]),
+  ),
+  itemType: V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType,
+}).annotate({
+  identifier: "V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItem",
+});
+
+export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportTypeResult =
+  {
+    readonly failures: ReadonlyArray<V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure>;
+    readonly itemType: V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType;
+    readonly successes: ReadonlyArray<V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess>;
+  };
+export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportTypeResult =
+  Schema.Struct({
+    failures: Schema.Array(
+      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure,
+    ),
+    itemType:
+      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType,
+    successes: Schema.Array(
+      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess,
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportTypeResult",
+  });
+
+export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportHistory = {
+  readonly completedAtMs: number;
+  readonly failures: ReadonlyArray<V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure>;
+  readonly importId: string;
+  readonly providerId?: string | null;
+  readonly successes: ReadonlyArray<V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess>;
+};
+export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportHistory =
+  Schema.Struct({
+    completedAtMs: Schema.Number.annotate({ format: "int64" }).check(
+      Schema.isInt().annotate({ expected: "an integer" }),
+    ),
+    failures: Schema.Array(
+      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure,
+    ),
+    importId: Schema.String,
+    providerId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    successes: Schema.Array(
+      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess,
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportHistory",
+  });
+
+export type V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordTypeResultParams =
+  {
+    readonly failures: ReadonlyArray<V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportItemTypeFailure>;
+    readonly itemType: V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType;
+    readonly successes: ReadonlyArray<V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordSuccessParams>;
+  };
+export const V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordTypeResultParams =
+  Schema.Struct({
+    failures: Schema.Array(
+      V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportItemTypeFailure,
+    ),
+    itemType: V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigMigrationItemType,
+    successes: Schema.Array(
+      V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordSuccessParams,
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordTypeResultParams",
+  });
+
+export type V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItem = {
+  readonly cwd?: string | null;
+  readonly description: string;
+  readonly details?: V2ExternalAgentConfigImportParams__MigrationDetails | null;
+  readonly itemType: V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType;
+};
+export const V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItem = Schema.Struct({
+  cwd: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  description: Schema.String,
+  details: Schema.optionalKey(
+    Schema.Union([V2ExternalAgentConfigImportParams__MigrationDetails, Schema.Null]),
+  ),
+  itemType: V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType,
+}).annotate({ identifier: "V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItem" });
+
+export type V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportTypeResult = {
+  readonly failures: ReadonlyArray<V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure>;
+  readonly itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType;
+  readonly successes: ReadonlyArray<V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess>;
+};
+export const V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportTypeResult =
+  Schema.Struct({
+    failures: Schema.Array(
+      V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure,
+    ),
+    itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType,
+    successes: Schema.Array(
+      V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess,
+    ),
+  }).annotate({
+    identifier:
+      "V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportTypeResult",
+  });
+
+export type V2GetAccountRateLimitsResponse__RateLimitResetCreditsSummary = {
+  readonly availableCount: number;
+  readonly credits?: ReadonlyArray<V2GetAccountRateLimitsResponse__RateLimitResetCredit> | null;
+};
+export const V2GetAccountRateLimitsResponse__RateLimitResetCreditsSummary = Schema.Struct({
+  availableCount: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  credits: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(V2GetAccountRateLimitsResponse__RateLimitResetCredit).annotate({
+        description:
+          "Detail rows for available reset credits, when the backend provides them.\n\n`null` means only `availableCount` is known, while an empty array means details were fetched and no available credits were returned. The backend may cap this list, so its length can be less than `availableCount`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2GetAccountRateLimitsResponse__RateLimitResetCreditsSummary" });
+
+export type V2HookCompletedNotification__HookRunSummary = {
+  readonly completedAt?: number | null;
+  readonly displayOrder: number;
+  readonly durationMs?: number | null;
+  readonly entries: ReadonlyArray<V2HookCompletedNotification__HookOutputEntry>;
+  readonly eventName: V2HookCompletedNotification__HookEventName;
+  readonly executionMode: V2HookCompletedNotification__HookExecutionMode;
+  readonly handlerType: V2HookCompletedNotification__HookHandlerType;
+  readonly id: string;
+  readonly scope: V2HookCompletedNotification__HookScope;
+  readonly source?: V2HookCompletedNotification__HookSource;
+  readonly sourcePath: V2HookCompletedNotification__AbsolutePathBuf;
+  readonly startedAt: number;
+  readonly status: V2HookCompletedNotification__HookRunStatus;
+  readonly statusMessage?: string | null;
+};
+export const V2HookCompletedNotification__HookRunSummary = Schema.Struct({
+  completedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  displayOrder: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  durationMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  entries: Schema.Array(V2HookCompletedNotification__HookOutputEntry),
+  eventName: V2HookCompletedNotification__HookEventName,
+  executionMode: V2HookCompletedNotification__HookExecutionMode,
+  handlerType: V2HookCompletedNotification__HookHandlerType,
+  id: Schema.String,
+  scope: V2HookCompletedNotification__HookScope,
+  source: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2HookCompletedNotification__HookSource> =>
+        V2HookCompletedNotification__HookSource,
+    ).annotate({ default: "unknown" }),
+  ),
+  sourcePath: V2HookCompletedNotification__AbsolutePathBuf,
+  startedAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  status: V2HookCompletedNotification__HookRunStatus,
+  statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2HookCompletedNotification__HookRunSummary" });
+
+export type V2HooksListResponse__HooksListEntry = {
+  readonly cwd: string;
+  readonly errors: ReadonlyArray<V2HooksListResponse__HookErrorInfo>;
+  readonly hooks: ReadonlyArray<V2HooksListResponse__HookMetadata>;
+  readonly warnings: ReadonlyArray<string>;
+};
+export const V2HooksListResponse__HooksListEntry = Schema.Struct({
+  cwd: Schema.String,
+  errors: Schema.Array(V2HooksListResponse__HookErrorInfo),
+  hooks: Schema.Array(V2HooksListResponse__HookMetadata),
+  warnings: Schema.Array(Schema.String),
+}).annotate({ identifier: "V2HooksListResponse__HooksListEntry" });
+
+export type V2HookStartedNotification__HookRunSummary = {
+  readonly completedAt?: number | null;
+  readonly displayOrder: number;
+  readonly durationMs?: number | null;
+  readonly entries: ReadonlyArray<V2HookStartedNotification__HookOutputEntry>;
+  readonly eventName: V2HookStartedNotification__HookEventName;
+  readonly executionMode: V2HookStartedNotification__HookExecutionMode;
+  readonly handlerType: V2HookStartedNotification__HookHandlerType;
+  readonly id: string;
+  readonly scope: V2HookStartedNotification__HookScope;
+  readonly source?: V2HookStartedNotification__HookSource;
+  readonly sourcePath: V2HookStartedNotification__AbsolutePathBuf;
+  readonly startedAt: number;
+  readonly status: V2HookStartedNotification__HookRunStatus;
+  readonly statusMessage?: string | null;
+};
+export const V2HookStartedNotification__HookRunSummary = Schema.Struct({
+  completedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  displayOrder: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  durationMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
+  ),
+  entries: Schema.Array(V2HookStartedNotification__HookOutputEntry),
+  eventName: V2HookStartedNotification__HookEventName,
+  executionMode: V2HookStartedNotification__HookExecutionMode,
+  handlerType: V2HookStartedNotification__HookHandlerType,
+  id: Schema.String,
+  scope: V2HookStartedNotification__HookScope,
+  source: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2HookStartedNotification__HookSource> =>
+        V2HookStartedNotification__HookSource,
+    ).annotate({ default: "unknown" }),
+  ),
+  sourcePath: V2HookStartedNotification__AbsolutePathBuf,
+  startedAt: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  status: V2HookStartedNotification__HookRunStatus,
+  statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2HookStartedNotification__HookRunSummary" });
+
+export type V2ItemCompletedNotification__UserInput =
+  | {
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ItemCompletedNotification__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ItemCompletedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ItemCompletedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ItemCompletedNotification__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ItemCompletedNotification__UserInput = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ItemCompletedNotification__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemCompletedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
+    Schema.Struct({
+      detail: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__ImageDetail, Schema.Null]),
+      ),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemCompletedNotification__UserInput" });
+
+export type V2ItemCompletedNotification__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ItemCompletedNotification__FunctionCallOutputContentItem>;
+export const V2ItemCompletedNotification__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ItemCompletedNotification__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ItemCompletedNotification__FunctionCallOutputBody" });
+
+export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath =
+  | {
+      readonly path: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString;
+      readonly type: "path";
+    }
+  | { readonly pattern: string; readonly type: "glob_pattern" }
+  | {
+      readonly type: "special";
+      readonly value: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath;
+    };
+export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath = Schema.Union(
+  [
+    Schema.Struct({
+      path: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
+      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
+    }).annotate({ title: "PathFileSystemPath" }),
+    Schema.Struct({
+      pattern: Schema.String,
+      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
+    }).annotate({ title: "GlobPatternFileSystemPath" }),
+    Schema.Struct({
+      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
+      value: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath,
+    }).annotate({ title: "SpecialFileSystemPath" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath" });
+
+export type V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath =
+  | {
+      readonly path: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString;
+      readonly type: "path";
+    }
+  | { readonly pattern: string; readonly type: "glob_pattern" }
+  | {
+      readonly type: "special";
+      readonly value: V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath;
+    };
+export const V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath = Schema.Union(
+  [
+    Schema.Struct({
+      path: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
+      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
+    }).annotate({ title: "PathFileSystemPath" }),
+    Schema.Struct({
+      pattern: Schema.String,
+      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
+    }).annotate({ title: "GlobPatternFileSystemPath" }),
+    Schema.Struct({
+      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
+      value: V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath,
+    }).annotate({ title: "SpecialFileSystemPath" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath" });
+
+export type V2ItemStartedNotification__UserInput =
+  | {
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ItemStartedNotification__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ItemStartedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ItemStartedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ItemStartedNotification__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ItemStartedNotification__UserInput = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ItemStartedNotification__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ItemStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
+    Schema.Struct({
+      detail: Schema.optionalKey(
+        Schema.Union([V2ItemStartedNotification__ImageDetail, Schema.Null]),
+      ),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ItemStartedNotification__UserInput" });
+
+export type V2ItemStartedNotification__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ItemStartedNotification__FunctionCallOutputContentItem>;
+export const V2ItemStartedNotification__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ItemStartedNotification__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ItemStartedNotification__FunctionCallOutputBody" });
+
+export type V2ModelListResponse__Model = {
+  readonly additionalSpeedTiers?: ReadonlyArray<string>;
+  readonly availabilityNux?: V2ModelListResponse__ModelAvailabilityNux | null;
+  readonly availableAccessPrograms?: V2ModelListResponse__ModelAccessPrograms | null;
+  readonly defaultReasoningEffort: V2ModelListResponse__ReasoningEffort;
+  readonly defaultServiceTier?: string | null;
+  readonly description: string;
+  readonly displayName: string;
+  readonly hidden: boolean;
+  readonly id: string;
+  readonly inputModalities?: ReadonlyArray<V2ModelListResponse__InputModality>;
+  readonly isDefault: boolean;
+  readonly model: string;
+  readonly modelSpecialty?: string | null;
+  readonly multiAgentVersion?: V2ModelListResponse__MultiAgentVersion | null;
+  readonly serviceTiers?: ReadonlyArray<V2ModelListResponse__ModelServiceTier>;
+  readonly supportedReasoningEfforts: ReadonlyArray<V2ModelListResponse__ReasoningEffortOption>;
+  readonly supportsPersonality?: boolean;
+  readonly upgrade?: string | null;
+  readonly upgradeInfo?: V2ModelListResponse__ModelUpgradeInfo | null;
+};
+export const V2ModelListResponse__Model = Schema.Struct({
+  additionalSpeedTiers: Schema.optionalKey(
+    Schema.Array(Schema.String).annotate({
+      description: "Deprecated: use `serviceTiers` instead.",
+      default: [],
+    }),
+  ),
+  availabilityNux: Schema.optionalKey(
+    Schema.Union([V2ModelListResponse__ModelAvailabilityNux, Schema.Null]),
+  ),
+  availableAccessPrograms: Schema.optionalKey(
+    Schema.Union([V2ModelListResponse__ModelAccessPrograms, Schema.Null]).annotate({
+      description: "Null when the catalog does not provide access-program metadata.",
+    }),
+  ),
+  defaultReasoningEffort: V2ModelListResponse__ReasoningEffort,
+  defaultServiceTier: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Catalog default service tier id for this model, when one is configured.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  description: Schema.String,
+  displayName: Schema.String,
+  hidden: Schema.Boolean,
+  id: Schema.String,
+  inputModalities: Schema.optionalKey(
+    Schema.Array(V2ModelListResponse__InputModality).annotate({ default: ["text", "image"] }),
+  ),
+  isDefault: Schema.Boolean,
+  model: Schema.String,
+  modelSpecialty: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  multiAgentVersion: Schema.optionalKey(
+    Schema.Union([V2ModelListResponse__MultiAgentVersion, Schema.Null]).annotate({
+      description: "Multi-agent runtime declared by this model, when available.",
+    }),
+  ),
+  serviceTiers: Schema.optionalKey(
+    Schema.Array(V2ModelListResponse__ModelServiceTier).annotate({ default: [] }),
+  ),
+  supportedReasoningEfforts: Schema.Array(V2ModelListResponse__ReasoningEffortOption),
+  supportsPersonality: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "@deprecated Always false; models no longer support personality selection.",
+      default: false,
+    }),
+  ),
+  upgrade: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  upgradeInfo: Schema.optionalKey(
+    Schema.Union([V2ModelListResponse__ModelUpgradeInfo, Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ModelListResponse__Model" });
+
+export type V2PluginInstalledResponse__PluginShareContext = {
+  readonly canPublishToWorkspace?: boolean | null;
+  readonly creatorAccountUserId?: string | null;
+  readonly creatorName?: string | null;
+  readonly discoverability?: V2PluginInstalledResponse__PluginShareDiscoverability | null;
+  readonly remotePluginId: string;
+  readonly remoteVersion?: string | null;
+  readonly sharePrincipals?: ReadonlyArray<V2PluginInstalledResponse__PluginSharePrincipal> | null;
+  readonly shareUrl?: string | null;
+};
+export const V2PluginInstalledResponse__PluginShareContext = Schema.Struct({
+  canPublishToWorkspace: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  discoverability: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__PluginShareDiscoverability, Schema.Null]),
+  ),
+  remotePluginId: Schema.String,
+  remoteVersion: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Version of the remote shared plugin release when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  sharePrincipals: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2PluginInstalledResponse__PluginSharePrincipal), Schema.Null]),
+  ),
+  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginInstalledResponse__PluginShareContext" });
+
+export type V2PluginListResponse__PluginShareContext = {
+  readonly canPublishToWorkspace?: boolean | null;
+  readonly creatorAccountUserId?: string | null;
+  readonly creatorName?: string | null;
+  readonly discoverability?: V2PluginListResponse__PluginShareDiscoverability | null;
+  readonly remotePluginId: string;
+  readonly remoteVersion?: string | null;
+  readonly sharePrincipals?: ReadonlyArray<V2PluginListResponse__PluginSharePrincipal> | null;
+  readonly shareUrl?: string | null;
+};
+export const V2PluginListResponse__PluginShareContext = Schema.Struct({
+  canPublishToWorkspace: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  discoverability: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__PluginShareDiscoverability, Schema.Null]),
+  ),
+  remotePluginId: Schema.String,
+  remoteVersion: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Version of the remote shared plugin release when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  sharePrincipals: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2PluginListResponse__PluginSharePrincipal), Schema.Null]),
+  ),
+  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginListResponse__PluginShareContext" });
+
+export type V2PluginReadResponse__SkillSummary = {
+  readonly description: string;
+  readonly enabled: boolean;
+  readonly interface?: V2PluginReadResponse__SkillInterface | null;
+  readonly name: string;
+  readonly path?: V2PluginReadResponse__AbsolutePathBuf | null;
+  readonly shortDescription?: string | null;
+};
+export const V2PluginReadResponse__SkillSummary = Schema.Struct({
+  description: Schema.String,
+  enabled: Schema.Boolean,
+  interface: Schema.optionalKey(Schema.Union([V2PluginReadResponse__SkillInterface, Schema.Null])),
+  name: Schema.String,
+  path: Schema.optionalKey(Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null])),
+  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginReadResponse__SkillSummary" });
+
+export type V2PluginReadResponse__ScheduledTaskSummary = {
+  readonly key: string;
+  readonly name: string;
+  readonly prompt: string;
+  readonly schedule: V2PluginReadResponse__ScheduledTaskSchedule;
+};
+export const V2PluginReadResponse__ScheduledTaskSummary = Schema.Struct({
+  key: Schema.String,
+  name: Schema.String,
+  prompt: Schema.String,
+  schedule: V2PluginReadResponse__ScheduledTaskSchedule,
+}).annotate({ identifier: "V2PluginReadResponse__ScheduledTaskSummary" });
+
+export type V2PluginReadResponse__PluginShareContext = {
+  readonly canPublishToWorkspace?: boolean | null;
+  readonly creatorAccountUserId?: string | null;
+  readonly creatorName?: string | null;
+  readonly discoverability?: V2PluginReadResponse__PluginShareDiscoverability | null;
+  readonly remotePluginId: string;
+  readonly remoteVersion?: string | null;
+  readonly sharePrincipals?: ReadonlyArray<V2PluginReadResponse__PluginSharePrincipal> | null;
+  readonly shareUrl?: string | null;
+};
+export const V2PluginReadResponse__PluginShareContext = Schema.Struct({
+  canPublishToWorkspace: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  discoverability: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__PluginShareDiscoverability, Schema.Null]),
+  ),
+  remotePluginId: Schema.String,
+  remoteVersion: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Version of the remote shared plugin release when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  sharePrincipals: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2PluginReadResponse__PluginSharePrincipal), Schema.Null]),
+  ),
+  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginReadResponse__PluginShareContext" });
+
+export type V2PluginShareListResponse__PluginShareContext = {
+  readonly canPublishToWorkspace?: boolean | null;
+  readonly creatorAccountUserId?: string | null;
+  readonly creatorName?: string | null;
+  readonly discoverability?: V2PluginShareListResponse__PluginShareDiscoverability | null;
+  readonly remotePluginId: string;
+  readonly remoteVersion?: string | null;
+  readonly sharePrincipals?: ReadonlyArray<V2PluginShareListResponse__PluginSharePrincipal> | null;
+  readonly shareUrl?: string | null;
+};
+export const V2PluginShareListResponse__PluginShareContext = Schema.Struct({
+  canPublishToWorkspace: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  discoverability: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__PluginShareDiscoverability, Schema.Null]),
+  ),
+  remotePluginId: Schema.String,
+  remoteVersion: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Version of the remote shared plugin release when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  sharePrincipals: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2PluginShareListResponse__PluginSharePrincipal), Schema.Null]),
+  ),
+  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2PluginShareListResponse__PluginShareContext" });
+
+export type V2RawResponseItemCompletedNotification__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem>;
+export const V2RawResponseItemCompletedNotification__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2RawResponseItemCompletedNotification__FunctionCallOutputBody" });
+
+export type V2ReviewStartResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ReviewStartResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ReviewStartResponse__MisalignmentErrorDetails | null;
+};
+export const V2ReviewStartResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ReviewStartResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ReviewStartResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ReviewStartResponse__TurnError" });
+
+export type V2ReviewStartResponse__UserInput =
+  | {
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ReviewStartResponse__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ReviewStartResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ReviewStartResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ReviewStartResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ReviewStartResponse__UserInput = Schema.Union(
+  [
+    Schema.Struct({
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ReviewStartResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
+    Schema.Struct({
+      detail: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ReviewStartResponse__UserInput" });
+
+export type V2ReviewStartResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ReviewStartResponse__FunctionCallOutputContentItem>;
+export const V2ReviewStartResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ReviewStartResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ReviewStartResponse__FunctionCallOutputBody" });
+
+export type V2SkillsListResponse__SkillMetadata = {
+  readonly dependencies?: V2SkillsListResponse__SkillDependencies | null;
+  readonly description: string;
+  readonly enabled: boolean;
+  readonly interface?: V2SkillsListResponse__SkillInterface | null;
+  readonly name: string;
+  readonly path: V2SkillsListResponse__AbsolutePathBuf;
+  readonly pluginId?: string | null;
+  readonly scope: V2SkillsListResponse__SkillScope;
+  readonly shortDescription?: string | null;
+};
+export const V2SkillsListResponse__SkillMetadata = Schema.Struct({
+  dependencies: Schema.optionalKey(
+    Schema.Union([V2SkillsListResponse__SkillDependencies, Schema.Null]),
+  ),
+  description: Schema.String,
+  enabled: Schema.Boolean,
+  interface: Schema.optionalKey(Schema.Union([V2SkillsListResponse__SkillInterface, Schema.Null])),
+  name: Schema.String,
+  path: V2SkillsListResponse__AbsolutePathBuf,
+  pluginId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Owning plugin ID, matching `PluginSummary.id`, when known.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  scope: V2SkillsListResponse__SkillScope,
+  shortDescription: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Legacy short_description from SKILL.md. Prefer SKILL.json interface.short_description.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2SkillsListResponse__SkillMetadata" });
+
+export type V2ThreadForkResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadForkResponse__SubAgentSource };
+export const V2ThreadForkResponse__SessionSource = Schema.Union(
+  [
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadForkResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__SessionSource" });
+
+export type V2ThreadForkResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadForkResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadForkResponse__MisalignmentErrorDetails | null;
+};
+export const V2ThreadForkResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadForkResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadForkResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadForkResponse__TurnError" });
+
+export type V2ThreadForkResponse__UserInput =
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadForkResponse__TextElement>;
+      readonly type: "text";
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadStartResponse__CommandAction = Schema.Union(
+  | {
+      readonly detail?: V2ThreadForkResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ThreadForkResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadForkResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadForkResponse__UserInput = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadForkResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
+    Schema.Struct({
+      detail: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
       name: Schema.String,
-      path: V2ThreadStartResponse__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadForkResponse__UserInput" });
+
+export type V2ThreadForkResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadForkResponse__FunctionCallOutputContentItem>;
+export const V2ThreadForkResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadForkResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadForkResponse__FunctionCallOutputBody" });
+
+export type V2ThreadItemsListResponse__UserInput =
+  | {
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadItemsListResponse__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ThreadItemsListResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ThreadItemsListResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadItemsListResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadItemsListResponse__UserInput = Schema.Union(
+  [
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadItemsListResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadItemsListResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadItemsListResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      detail: Schema.optionalKey(
+        Schema.Union([V2ThreadItemsListResponse__ImageDetail, Schema.Null]),
+      ),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadItemsListResponse__UserInput" });
 
-export type V2ThreadStartResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadStartResponse__CollabAgentStatus;
-};
-export const V2ThreadStartResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadStartResponse__CollabAgentStatus,
-});
+export type V2ThreadItemsListResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadItemsListResponse__FunctionCallOutputContentItem>;
+export const V2ThreadItemsListResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadItemsListResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadItemsListResponse__FunctionCallOutputBody" });
 
-export type V2ThreadStartResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadStartResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type V2ThreadListResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadListResponse__SubAgentSource };
+export const V2ThreadListResponse__SessionSource = Schema.Union(
+  [
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadListResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__SessionSource" });
+
+export type V2ThreadListResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadListResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadListResponse__MisalignmentErrorDetails | null;
 };
-export const V2ThreadStartResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadStartResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+export const V2ThreadListResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadListResponse__TurnError" });
 
-export type V2ThreadStartResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type V2ThreadListResponse__UserInput =
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadStartResponse__NonSteerableTurnKind;
-      };
-    };
-export const V2ThreadStartResponse__CodexErrorInfo = Schema.Union(
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadListResponse__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ThreadListResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ThreadListResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadListResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadListResponse__UserInput = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
     Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadListResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadListResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadListResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
+      detail: Schema.optionalKey(Schema.Union([V2ThreadListResponse__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
     Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadListResponse__UserInput" });
+
+export type V2ThreadListResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadListResponse__FunctionCallOutputContentItem>;
+export const V2ThreadListResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadListResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadListResponse__FunctionCallOutputBody" });
+
+export type V2ThreadMetadataUpdateResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadMetadataUpdateResponse__SubAgentSource };
+export const V2ThreadMetadataUpdateResponse__SessionSource = Schema.Union(
+  [
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadMetadataUpdateResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__SessionSource" });
+
+export type V2ThreadMetadataUpdateResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadMetadataUpdateResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadMetadataUpdateResponse__MisalignmentErrorDetails | null;
+};
+export const V2ThreadMetadataUpdateResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadMetadataUpdateResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadMetadataUpdateResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
       description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
+        "Optional public explanation and continuation instruction for a misalignment block.",
     }),
+  ),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__TurnError" });
+
+export type V2ThreadMetadataUpdateResponse__UserInput =
+  | {
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadMetadataUpdateResponse__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ThreadMetadataUpdateResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ThreadMetadataUpdateResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadMetadataUpdateResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadMetadataUpdateResponse__UserInput = Schema.Union(
+  [
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadMetadataUpdateResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadMetadataUpdateResponse__ImageDetail, Schema.Null]),
         ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadMetadataUpdateResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
+    Schema.Struct({
+      detail: Schema.optionalKey(
+        Schema.Union([V2ThreadMetadataUpdateResponse__ImageDetail, Schema.Null]),
+      ),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
+    Schema.Struct({
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
+    Schema.Struct({
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadStartResponse__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__UserInput" });
+
+export type V2ThreadMetadataUpdateResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadMetadataUpdateResponse__FunctionCallOutputContentItem>;
+export const V2ThreadMetadataUpdateResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadMetadataUpdateResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadMetadataUpdateResponse__FunctionCallOutputBody" });
+
+export type V2ThreadReadResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadReadResponse__SubAgentSource };
+export const V2ThreadReadResponse__SessionSource = Schema.Union(
+  [
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadReadResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
     }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+).annotate({ identifier: "V2ThreadReadResponse__SessionSource" });
 
-export type V2ThreadStartResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadStartResponse__PatchChangeKind;
-  readonly path: string;
+export type V2ThreadReadResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadReadResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadReadResponse__MisalignmentErrorDetails | null;
 };
-export const V2ThreadStartResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadStartResponse__PatchChangeKind,
-  path: Schema.String,
-});
+export const V2ThreadReadResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadReadResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadReadResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadReadResponse__TurnError" });
 
-export type V2ThreadStartResponse__UserInput =
+export type V2ThreadReadResponse__UserInput =
   | {
       readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadStartResponse__TextElement>;
+      readonly text_elements?: ReadonlyArray<V2ThreadReadResponse__TextElement>;
       readonly type: "text";
     }
   | {
-      readonly detail?: V2ThreadStartResponse__ImageDetail | null;
+      readonly detail?: V2ThreadReadResponse__ImageDetail | null;
       readonly type: "image";
       readonly url: string;
     }
   | {
-      readonly detail?: V2ThreadStartResponse__ImageDetail | null;
+      readonly detail?: V2ThreadReadResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadReadResponse__ImageDetail | null;
       readonly path: string;
       readonly type: "localImage";
     }
@@ -18253,25 +31857,32 @@ export type V2ThreadStartResponse__UserInput =
   | { readonly path: string; readonly type: "localAudio" }
   | { readonly name: string; readonly path: string; readonly type: "skill" }
   | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadStartResponse__UserInput = Schema.Union(
+export const V2ThreadReadResponse__UserInput = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
       text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadStartResponse__TextElement).annotate({
+        Schema.Array(V2ThreadReadResponse__TextElement).annotate({
           description: "UI-defined spans within `text` used to render or persist special elements.",
           default: [],
         }),
       ),
       type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
     }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__ImageDetail, Schema.Null])),
+      detail: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__ImageDetail, Schema.Null])),
       path: Schema.String,
       type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
     }).annotate({ title: "LocalImageUserInput" }),
@@ -18295,275 +31906,359 @@ export const V2ThreadStartResponse__UserInput = Schema.Union(
     }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadReadResponse__UserInput" });
 
-export type V2ThreadStartResponse__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadStartResponse__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadStartResponse__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadStartResponse__SubAgentSource = Schema.Union(
+export type V2ThreadReadResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadReadResponse__FunctionCallOutputContentItem>;
+export const V2ThreadReadResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadReadResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadReadResponse__FunctionCallOutputBody" });
+
+export type V2ThreadResumeParams__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadResumeParams__FunctionCallOutputContentItem>;
+export const V2ThreadResumeParams__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadResumeParams__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadResumeParams__FunctionCallOutputBody" });
+
+export type V2ThreadResumeResponse__CollaborationMode = {
+  readonly mode: V2ThreadResumeResponse__ModeKind;
+  readonly settings: V2ThreadResumeResponse__Settings;
+};
+export const V2ThreadResumeResponse__CollaborationMode = Schema.Struct({
+  mode: V2ThreadResumeResponse__ModeKind,
+  settings: V2ThreadResumeResponse__Settings,
+}).annotate({
+  description: "Collaboration mode for a Codex session.",
+  identifier: "V2ThreadResumeResponse__CollaborationMode",
+});
+
+export type V2ThreadResumeResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadResumeResponse__SubAgentSource };
+export const V2ThreadResumeResponse__SessionSource = Schema.Union(
   [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadStartResponse__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadStartResponse__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadResumeResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
+    }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadResumeResponse__SessionSource" });
 
-export type V2ThreadStatusChangedNotification__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
+export type V2ThreadResumeResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadResumeResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadResumeResponse__MisalignmentErrorDetails | null;
+};
+export const V2ThreadResumeResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadResumeResponse__TurnError" });
+
+export type V2ThreadResumeResponse__UserInput =
   | {
-      readonly activeFlags: ReadonlyArray<V2ThreadStatusChangedNotification__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadStatusChangedNotification__ThreadStatus = Schema.Union(
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadResumeResponse__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ThreadResumeResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ThreadResumeResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadResumeResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadResumeResponse__UserInput = Schema.Union(
   [
     Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadResumeResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadResumeResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadResumeResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
+      detail: Schema.optionalKey(Schema.Union([V2ThreadResumeResponse__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
     Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
     Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadStatusChangedNotification__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadResumeResponse__UserInput" });
 
-export type V2ThreadTokenUsageUpdatedNotification__ThreadTokenUsage = {
-  readonly last: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown;
-  readonly modelContextWindow?: number | null;
-  readonly total: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown;
+export type V2ThreadResumeResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadResumeResponse__FunctionCallOutputContentItem>;
+export const V2ThreadResumeResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadResumeResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadResumeResponse__FunctionCallOutputBody" });
+
+export type V2ThreadRevertResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadRevertResponse__SubAgentSource };
+export const V2ThreadRevertResponse__SessionSource = Schema.Union(
+  [
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadRevertResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
+    }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadRevertResponse__SessionSource" });
+
+export type V2ThreadRevertResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadRevertResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadRevertResponse__MisalignmentErrorDetails | null;
 };
-export const V2ThreadTokenUsageUpdatedNotification__ThreadTokenUsage = Schema.Struct({
-  last: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown,
-  modelContextWindow: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+export const V2ThreadRevertResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadRevertResponse__CodexErrorInfo, Schema.Null]),
   ),
-  total: V2ThreadTokenUsageUpdatedNotification__TokenUsageBreakdown,
-});
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadRevertResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadRevertResponse__TurnError" });
 
-export type V2ThreadUnarchiveResponse__CommandAction =
+export type V2ThreadRevertResponse__UserInput =
   | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2ThreadUnarchiveResponse__AbsolutePathBuf;
-      readonly type: "read";
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadRevertResponse__TextElement>;
+      readonly type: "text";
     }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
+      readonly detail?: V2ThreadRevertResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2ThreadUnarchiveResponse__CommandAction = Schema.Union(
+  | {
+      readonly detail?: V2ThreadRevertResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadRevertResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadRevertResponse__UserInput = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2ThreadUnarchiveResponse__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadRevertResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadRevertResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadRevertResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      detail: Schema.optionalKey(Schema.Union([V2ThreadRevertResponse__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadRevertResponse__UserInput" });
 
-export type V2ThreadUnarchiveResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2ThreadUnarchiveResponse__CollabAgentStatus;
-};
-export const V2ThreadUnarchiveResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2ThreadUnarchiveResponse__CollabAgentStatus,
-});
+export type V2ThreadRevertResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadRevertResponse__FunctionCallOutputContentItem>;
+export const V2ThreadRevertResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadRevertResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadRevertResponse__FunctionCallOutputBody" });
 
-export type V2ThreadUnarchiveResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2ThreadUnarchiveResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type V2ThreadSettingsUpdatedNotification__CollaborationMode = {
+  readonly mode: V2ThreadSettingsUpdatedNotification__ModeKind;
+  readonly settings: V2ThreadSettingsUpdatedNotification__Settings;
 };
-export const V2ThreadUnarchiveResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2ThreadUnarchiveResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
+export const V2ThreadSettingsUpdatedNotification__CollaborationMode = Schema.Struct({
+  mode: V2ThreadSettingsUpdatedNotification__ModeKind,
+  settings: V2ThreadSettingsUpdatedNotification__Settings,
+}).annotate({
+  description: "Collaboration mode for a Codex session.",
+  identifier: "V2ThreadSettingsUpdatedNotification__CollaborationMode",
 });
 
-export type V2ThreadUnarchiveResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
-  | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2ThreadUnarchiveResponse__NonSteerableTurnKind;
-      };
-    };
-export const V2ThreadUnarchiveResponse__CodexErrorInfo = Schema.Union(
+export type V2ThreadStartedNotification__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadStartedNotification__SubAgentSource };
+export const V2ThreadStartedNotification__SessionSource = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
-    Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
-    Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
-    Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2ThreadUnarchiveResponse__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadStartedNotification__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
     }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+).annotate({ identifier: "V2ThreadStartedNotification__SessionSource" });
 
-export type V2ThreadUnarchiveResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2ThreadUnarchiveResponse__PatchChangeKind;
-  readonly path: string;
+export type V2ThreadStartedNotification__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadStartedNotification__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadStartedNotification__MisalignmentErrorDetails | null;
 };
-export const V2ThreadUnarchiveResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2ThreadUnarchiveResponse__PatchChangeKind,
-  path: Schema.String,
-});
+export const V2ThreadStartedNotification__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadStartedNotification__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadStartedNotification__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadStartedNotification__TurnError" });
 
-export type V2ThreadUnarchiveResponse__UserInput =
+export type V2ThreadStartedNotification__UserInput =
   | {
       readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2ThreadUnarchiveResponse__TextElement>;
+      readonly text_elements?: ReadonlyArray<V2ThreadStartedNotification__TextElement>;
       readonly type: "text";
     }
   | {
-      readonly detail?: V2ThreadUnarchiveResponse__ImageDetail | null;
+      readonly detail?: V2ThreadStartedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ThreadStartedNotification__ImageDetail | null;
       readonly type: "image";
-      readonly url: string;
+      readonly fileId: string;
     }
   | {
-      readonly detail?: V2ThreadUnarchiveResponse__ImageDetail | null;
+      readonly detail?: V2ThreadStartedNotification__ImageDetail | null;
       readonly path: string;
       readonly type: "localImage";
     }
@@ -18571,28 +32266,37 @@ export type V2ThreadUnarchiveResponse__UserInput =
   | { readonly path: string; readonly type: "localAudio" }
   | { readonly name: string; readonly path: string; readonly type: "skill" }
   | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2ThreadUnarchiveResponse__UserInput = Schema.Union(
+export const V2ThreadStartedNotification__UserInput = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
       text_elements: Schema.optionalKey(
-        Schema.Array(V2ThreadUnarchiveResponse__TextElement).annotate({
+        Schema.Array(V2ThreadStartedNotification__TextElement).annotate({
           description: "UI-defined spans within `text` used to render or persist special elements.",
           default: [],
         }),
       ),
       type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
     }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
       detail: Schema.optionalKey(
-        Schema.Union([V2ThreadUnarchiveResponse__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2ThreadUnarchiveResponse__ImageDetail, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__ImageDetail, Schema.Null]),
       ),
       path: Schema.String,
       type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
@@ -18617,239 +32321,306 @@ export const V2ThreadUnarchiveResponse__UserInput = Schema.Union(
     }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartedNotification__UserInput" });
 
-export type V2ThreadUnarchiveResponse__SubAgentSource =
-  | "review"
-  | "compact"
-  | "memory_consolidation"
-  | {
-      readonly thread_spawn: {
-        readonly agent_nickname?: string | null;
-        readonly agent_path?: V2ThreadUnarchiveResponse__AgentPath | null;
-        readonly agent_role?: string | null;
-        readonly depth: number;
-        readonly parent_thread_id: V2ThreadUnarchiveResponse__ThreadId;
-      };
-    }
-  | { readonly other: string };
-export const V2ThreadUnarchiveResponse__SubAgentSource = Schema.Union(
+export type V2ThreadStartedNotification__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadStartedNotification__FunctionCallOutputContentItem>;
+export const V2ThreadStartedNotification__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadStartedNotification__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadStartedNotification__FunctionCallOutputBody" });
+
+export type V2ThreadStartResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadStartResponse__SubAgentSource };
+export const V2ThreadStartResponse__SessionSource = Schema.Union(
   [
-    Schema.Literals(["review", "compact", "memory_consolidation"]),
-    Schema.Struct({
-      thread_spawn: Schema.Struct({
-        agent_nickname: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        agent_path: Schema.optionalKey(
-          Schema.Union([V2ThreadUnarchiveResponse__AgentPath, Schema.Null]),
-        ),
-        agent_role: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-        depth: Schema.Number.annotate({ format: "int32" }).check(Schema.isInt()),
-        parent_thread_id: V2ThreadUnarchiveResponse__ThreadId,
-      }),
-    }).annotate({ title: "ThreadSpawnSubAgentSource" }),
-    Schema.Struct({ other: Schema.String }).annotate({ title: "OtherSubAgentSource" }),
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadStartResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
+    }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartResponse__SessionSource" });
 
-export type V2TurnCompletedNotification__CommandAction =
+export type V2ThreadStartResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadStartResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadStartResponse__MisalignmentErrorDetails | null;
+};
+export const V2ThreadStartResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadStartResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadStartResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadStartResponse__TurnError" });
+
+export type V2ThreadStartResponse__UserInput =
   | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2TurnCompletedNotification__AbsolutePathBuf;
-      readonly type: "read";
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadStartResponse__TextElement>;
+      readonly type: "text";
     }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
+      readonly detail?: V2ThreadStartResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2TurnCompletedNotification__CommandAction = Schema.Union(
+  | {
+      readonly detail?: V2ThreadStartResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadStartResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadStartResponse__UserInput = Schema.Union(
   [
     Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2TurnCompletedNotification__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadStartResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
+      detail: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__ImageDetail, Schema.Null])),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
     Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartResponse__UserInput" });
 
-export type V2TurnCompletedNotification__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2TurnCompletedNotification__CollabAgentStatus;
-};
-export const V2TurnCompletedNotification__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2TurnCompletedNotification__CollabAgentStatus,
-});
+export type V2ThreadStartResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadStartResponse__FunctionCallOutputContentItem>;
+export const V2ThreadStartResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadStartResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadStartResponse__FunctionCallOutputBody" });
 
-export type V2TurnCompletedNotification__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2TurnCompletedNotification__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type V2ThreadTurnsListResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadTurnsListResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadTurnsListResponse__MisalignmentErrorDetails | null;
 };
-export const V2TurnCompletedNotification__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2TurnCompletedNotification__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
+export const V2ThreadTurnsListResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadTurnsListResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadTurnsListResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadTurnsListResponse__TurnError" });
 
-export type V2TurnCompletedNotification__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "rateLimitExceeded"
-  | "misalignmentPolicyViolation"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
+export type V2ThreadTurnsListResponse__UserInput =
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2TurnCompletedNotification__NonSteerableTurnKind;
-      };
-    };
-export const V2TurnCompletedNotification__CodexErrorInfo = Schema.Union(
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2ThreadTurnsListResponse__TextElement>;
+      readonly type: "text";
+    }
+  | {
+      readonly detail?: V2ThreadTurnsListResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
+    }
+  | {
+      readonly detail?: V2ThreadTurnsListResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadTurnsListResponse__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2ThreadTurnsListResponse__UserInput = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "rateLimitExceeded",
-      "misalignmentPolicyViolation",
-      "other",
-    ]),
     Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2ThreadTurnsListResponse__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadTurnsListResponse__ImageDetail, Schema.Null]),
         ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadTurnsListResponse__ImageDetail, Schema.Null]),
         ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
+      detail: Schema.optionalKey(
+        Schema.Union([V2ThreadTurnsListResponse__ImageDetail, Schema.Null]),
+      ),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2TurnCompletedNotification__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2ThreadTurnsListResponse__UserInput" });
+
+export type V2ThreadTurnsListResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadTurnsListResponse__FunctionCallOutputContentItem>;
+export const V2ThreadTurnsListResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadTurnsListResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadTurnsListResponse__FunctionCallOutputBody" });
+
+export type V2ThreadUnarchiveResponse__SessionSource =
+  | "cli"
+  | "vscode"
+  | "exec"
+  | "appServer"
+  | "unknown"
+  | { readonly custom: string }
+  | { readonly subAgent: V2ThreadUnarchiveResponse__SubAgentSource };
+export const V2ThreadUnarchiveResponse__SessionSource = Schema.Union(
+  [
+    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
+    Schema.Struct({ subAgent: V2ThreadUnarchiveResponse__SubAgentSource }).annotate({
+      title: "SubAgentSessionSource",
     }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+).annotate({ identifier: "V2ThreadUnarchiveResponse__SessionSource" });
 
-export type V2TurnCompletedNotification__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2TurnCompletedNotification__PatchChangeKind;
-  readonly path: string;
+export type V2ThreadUnarchiveResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2ThreadUnarchiveResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2ThreadUnarchiveResponse__MisalignmentErrorDetails | null;
 };
-export const V2TurnCompletedNotification__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2TurnCompletedNotification__PatchChangeKind,
-  path: Schema.String,
-});
+export const V2ThreadUnarchiveResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadUnarchiveResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2ThreadUnarchiveResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__TurnError" });
 
-export type V2TurnCompletedNotification__UserInput =
+export type V2ThreadUnarchiveResponse__UserInput =
   | {
       readonly text: string;
-      readonly text_elements?: ReadonlyArray<V2TurnCompletedNotification__TextElement>;
+      readonly text_elements?: ReadonlyArray<V2ThreadUnarchiveResponse__TextElement>;
       readonly type: "text";
     }
   | {
-      readonly detail?: V2TurnCompletedNotification__ImageDetail | null;
+      readonly detail?: V2ThreadUnarchiveResponse__ImageDetail | null;
       readonly type: "image";
       readonly url: string;
     }
   | {
-      readonly detail?: V2TurnCompletedNotification__ImageDetail | null;
+      readonly detail?: V2ThreadUnarchiveResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2ThreadUnarchiveResponse__ImageDetail | null;
       readonly path: string;
       readonly type: "localImage";
     }
@@ -18857,28 +32628,37 @@ export type V2TurnCompletedNotification__UserInput =
   | { readonly path: string; readonly type: "localAudio" }
   | { readonly name: string; readonly path: string; readonly type: "skill" }
   | { readonly name: string; readonly path: string; readonly type: "mention" };
-export const V2TurnCompletedNotification__UserInput = Schema.Union(
+export const V2ThreadUnarchiveResponse__UserInput = Schema.Union(
   [
     Schema.Struct({
       text: Schema.String,
       text_elements: Schema.optionalKey(
-        Schema.Array(V2TurnCompletedNotification__TextElement).annotate({
+        Schema.Array(V2ThreadUnarchiveResponse__TextElement).annotate({
           description: "UI-defined spans within `text` used to render or persist special elements.",
           default: [],
         }),
       ),
       type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
     }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadUnarchiveResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2ThreadUnarchiveResponse__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
       detail: Schema.optionalKey(
-        Schema.Union([V2TurnCompletedNotification__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2TurnCompletedNotification__ImageDetail, Schema.Null]),
+        Schema.Union([V2ThreadUnarchiveResponse__ImageDetail, Schema.Null]),
       ),
       path: Schema.String,
       type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
@@ -18903,197 +32683,145 @@ export const V2TurnCompletedNotification__UserInput = Schema.Union(
     }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadUnarchiveResponse__UserInput" });
 
-export type V2TurnPlanUpdatedNotification__TurnPlanStep = {
-  readonly status: V2TurnPlanUpdatedNotification__TurnPlanStepStatus;
-  readonly step: string;
+export type V2ThreadUnarchiveResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2ThreadUnarchiveResponse__FunctionCallOutputContentItem>;
+export const V2ThreadUnarchiveResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2ThreadUnarchiveResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2ThreadUnarchiveResponse__FunctionCallOutputBody" });
+
+export type V2TurnCompletedNotification__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2TurnCompletedNotification__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2TurnCompletedNotification__MisalignmentErrorDetails | null;
 };
-export const V2TurnPlanUpdatedNotification__TurnPlanStep = Schema.Struct({
-  status: V2TurnPlanUpdatedNotification__TurnPlanStepStatus,
-  step: Schema.String,
-});
+export const V2TurnCompletedNotification__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2TurnCompletedNotification__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2TurnCompletedNotification__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2TurnCompletedNotification__TurnError" });
 
-export type V2TurnStartedNotification__CommandAction =
+export type V2TurnCompletedNotification__UserInput =
   | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2TurnStartedNotification__AbsolutePathBuf;
-      readonly type: "read";
+      readonly text: string;
+      readonly text_elements?: ReadonlyArray<V2TurnCompletedNotification__TextElement>;
+      readonly type: "text";
     }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
   | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
+      readonly detail?: V2TurnCompletedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly url: string;
     }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2TurnStartedNotification__CommandAction = Schema.Union(
-  [
-    Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2TurnStartedNotification__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2TurnStartedNotification__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2TurnStartedNotification__CollabAgentStatus;
-};
-export const V2TurnStartedNotification__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2TurnStartedNotification__CollabAgentStatus,
-});
-
-export type V2TurnStartedNotification__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2TurnStartedNotification__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
-};
-export const V2TurnStartedNotification__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2TurnStartedNotification__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
-
-export type V2TurnStartedNotification__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
   | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2TurnStartedNotification__NonSteerableTurnKind;
-      };
-    };
-export const V2TurnStartedNotification__CodexErrorInfo = Schema.Union(
+      readonly detail?: V2TurnCompletedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
+  | {
+      readonly detail?: V2TurnCompletedNotification__ImageDetail | null;
+      readonly path: string;
+      readonly type: "localImage";
+    }
+  | { readonly type: "audio"; readonly url: string }
+  | { readonly path: string; readonly type: "localAudio" }
+  | { readonly name: string; readonly path: string; readonly type: "skill" }
+  | { readonly name: string; readonly path: string; readonly type: "mention" };
+export const V2TurnCompletedNotification__UserInput = Schema.Union(
   [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
     Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
+      text: Schema.String,
+      text_elements: Schema.optionalKey(
+        Schema.Array(V2TurnCompletedNotification__TextElement).annotate({
+          description: "UI-defined spans within `text` used to render or persist special elements.",
+          default: [],
+        }),
+      ),
+      type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
+    }).annotate({ title: "TextUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnCompletedNotification__ImageDetail, Schema.Null]),
         ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnCompletedNotification__ImageDetail, Schema.Null]),
         ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
+      detail: Schema.optionalKey(
+        Schema.Union([V2TurnCompletedNotification__ImageDetail, Schema.Null]),
+      ),
+      path: Schema.String,
+      type: Schema.Literal("localImage").annotate({ title: "LocalImageUserInputType" }),
+    }).annotate({ title: "LocalImageUserInput" }),
     Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
+      type: Schema.Literal("audio").annotate({ title: "AudioUserInputType" }),
+      url: Schema.String,
+    }).annotate({ title: "AudioUserInput" }),
     Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2TurnStartedNotification__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
-      description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
-    }),
+      path: Schema.String,
+      type: Schema.Literal("localAudio").annotate({ title: "LocalAudioUserInputType" }),
+    }).annotate({ title: "LocalAudioUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("skill").annotate({ title: "SkillUserInputType" }),
+    }).annotate({ title: "SkillUserInput" }),
+    Schema.Struct({
+      name: Schema.String,
+      path: Schema.String,
+      type: Schema.Literal("mention").annotate({ title: "MentionUserInputType" }),
+    }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
+).annotate({ identifier: "V2TurnCompletedNotification__UserInput" });
 
-export type V2TurnStartedNotification__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2TurnStartedNotification__PatchChangeKind;
-  readonly path: string;
+export type V2TurnCompletedNotification__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2TurnCompletedNotification__FunctionCallOutputContentItem>;
+export const V2TurnCompletedNotification__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2TurnCompletedNotification__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2TurnCompletedNotification__FunctionCallOutputBody" });
+
+export type V2TurnStartedNotification__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2TurnStartedNotification__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2TurnStartedNotification__MisalignmentErrorDetails | null;
 };
-export const V2TurnStartedNotification__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2TurnStartedNotification__PatchChangeKind,
-  path: Schema.String,
-});
+export const V2TurnStartedNotification__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2TurnStartedNotification__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2TurnStartedNotification__MisalignmentErrorDetails, Schema.Null]).annotate({
+      description:
+        "Optional public explanation and continuation instruction for a misalignment block.",
+    }),
+  ),
+}).annotate({ identifier: "V2TurnStartedNotification__TurnError" });
 
 export type V2TurnStartedNotification__UserInput =
   | {
@@ -19106,6 +32834,11 @@ export type V2TurnStartedNotification__UserInput =
       readonly type: "image";
       readonly url: string;
     }
+  | {
+      readonly detail?: V2TurnStartedNotification__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
   | {
       readonly detail?: V2TurnStartedNotification__ImageDetail | null;
       readonly path: string;
@@ -19127,13 +32860,22 @@ export const V2TurnStartedNotification__UserInput = Schema.Union(
       ),
       type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
     }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(
-        Schema.Union([V2TurnStartedNotification__ImageDetail, Schema.Null]),
-      ),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(
+          Schema.Union([V2TurnStartedNotification__ImageDetail, Schema.Null]),
+        ),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
       detail: Schema.optionalKey(
         Schema.Union([V2TurnStartedNotification__ImageDetail, Schema.Null]),
@@ -19161,63 +32903,15 @@ export const V2TurnStartedNotification__UserInput = Schema.Union(
     }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnStartParams__SandboxPolicy =
-  | { readonly type: "dangerFullAccess" }
-  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-  | {
-      readonly excludeSlashTmp?: boolean;
-      readonly excludeTmpdirEnvVar?: boolean;
-      readonly networkAccess?: boolean;
-      readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<V2TurnStartParams__AbsolutePathBuf>;
-    };
-export const V2TurnStartParams__SandboxPolicy = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("dangerFullAccess").annotate({
-        title: "DangerFullAccessSandboxPolicyType",
-      }),
-    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-    }).annotate({ title: "ReadOnlySandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-      ),
-      type: Schema.Literal("externalSandbox").annotate({
-        title: "ExternalSandboxSandboxPolicyType",
-      }),
-    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-    Schema.Struct({
-      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
-      writableRoots: Schema.optionalKey(
-        Schema.Array(V2TurnStartParams__AbsolutePathBuf).annotate({ default: [] }),
-      ),
-    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
-  ],
-  { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartedNotification__UserInput" });
 
-export type V2TurnStartParams__Settings = {
-  readonly developer_instructions?: string | null;
-  readonly model: string;
-  readonly reasoning_effort?: V2TurnStartParams__ReasoningEffort | null;
-};
-export const V2TurnStartParams__Settings = Schema.Struct({
-  developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  model: Schema.String,
-  reasoning_effort: Schema.optionalKey(
-    Schema.Union([V2TurnStartParams__ReasoningEffort, Schema.Null]),
-  ),
-}).annotate({ description: "Settings for a collaboration mode." });
+export type V2TurnStartedNotification__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2TurnStartedNotification__FunctionCallOutputContentItem>;
+export const V2TurnStartedNotification__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2TurnStartedNotification__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2TurnStartedNotification__FunctionCallOutputBody" });
 
 export type V2TurnStartParams__UserInput =
   | {
@@ -19230,6 +32924,11 @@ export type V2TurnStartParams__UserInput =
       readonly type: "image";
       readonly url: string;
     }
+  | {
+      readonly detail?: V2TurnStartParams__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
   | {
       readonly detail?: V2TurnStartParams__ImageDetail | null;
       readonly path: string;
@@ -19251,11 +32950,18 @@ export const V2TurnStartParams__UserInput = Schema.Union(
       ),
       type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
     }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2TurnStartParams__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
       detail: Schema.optionalKey(Schema.Union([V2TurnStartParams__ImageDetail, Schema.Null])),
       path: Schema.String,
@@ -19281,188 +32987,35 @@ export const V2TurnStartParams__UserInput = Schema.Union(
     }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnStartResponse__CommandAction =
-  | {
-      readonly command: string;
-      readonly name: string;
-      readonly path: V2TurnStartResponse__AbsolutePathBuf;
-      readonly type: "read";
-    }
-  | { readonly command: string; readonly path?: string | null; readonly type: "listFiles" }
-  | {
-      readonly command: string;
-      readonly path?: string | null;
-      readonly query?: string | null;
-      readonly type: "search";
-    }
-  | { readonly command: string; readonly type: "unknown" };
-export const V2TurnStartResponse__CommandAction = Schema.Union(
-  [
-    Schema.Struct({
-      command: Schema.String,
-      name: Schema.String,
-      path: V2TurnStartResponse__AbsolutePathBuf,
-      type: Schema.Literal("read").annotate({ title: "ReadCommandActionType" }),
-    }).annotate({ title: "ReadCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("listFiles").annotate({ title: "ListFilesCommandActionType" }),
-    }).annotate({ title: "ListFilesCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      path: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      query: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("search").annotate({ title: "SearchCommandActionType" }),
-    }).annotate({ title: "SearchCommandAction" }),
-    Schema.Struct({
-      command: Schema.String,
-      type: Schema.Literal("unknown").annotate({ title: "UnknownCommandActionType" }),
-    }).annotate({ title: "UnknownCommandAction" }),
-  ],
-  { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartParams__UserInput" });
 
-export type V2TurnStartResponse__CollabAgentState = {
-  readonly message?: string | null;
-  readonly status: V2TurnStartResponse__CollabAgentStatus;
-};
-export const V2TurnStartResponse__CollabAgentState = Schema.Struct({
-  message: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  status: V2TurnStartResponse__CollabAgentStatus,
-});
+export type V2TurnStartParams__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2TurnStartParams__FunctionCallOutputContentItem>;
+export const V2TurnStartParams__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2TurnStartParams__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2TurnStartParams__FunctionCallOutputBody" });
 
-export type V2TurnStartResponse__MemoryCitation = {
-  readonly entries: ReadonlyArray<V2TurnStartResponse__MemoryCitationEntry>;
-  readonly threadIds: ReadonlyArray<string>;
+export type V2TurnStartResponse__TurnError = {
+  readonly additionalDetails?: string | null;
+  readonly codexErrorInfo?: V2TurnStartResponse__CodexErrorInfo | null;
+  readonly message: string;
+  readonly misalignment?: V2TurnStartResponse__MisalignmentErrorDetails | null;
 };
-export const V2TurnStartResponse__MemoryCitation = Schema.Struct({
-  entries: Schema.Array(V2TurnStartResponse__MemoryCitationEntry),
-  threadIds: Schema.Array(Schema.String),
-});
-
-export type V2TurnStartResponse__CodexErrorInfo =
-  | "contextWindowExceeded"
-  | "sessionBudgetExceeded"
-  | "usageLimitExceeded"
-  | "serverOverloaded"
-  | "cyberPolicy"
-  | "internalServerError"
-  | "unauthorized"
-  | "badRequest"
-  | "threadRollbackFailed"
-  | "sandboxError"
-  | "other"
-  | { readonly httpConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamConnectionFailed: { readonly httpStatusCode?: number | null } }
-  | { readonly responseStreamDisconnected: { readonly httpStatusCode?: number | null } }
-  | { readonly responseTooManyFailedAttempts: { readonly httpStatusCode?: number | null } }
-  | {
-      readonly activeTurnNotSteerable: {
-        readonly turnKind: V2TurnStartResponse__NonSteerableTurnKind;
-      };
-    };
-export const V2TurnStartResponse__CodexErrorInfo = Schema.Union(
-  [
-    Schema.Literals([
-      "contextWindowExceeded",
-      "sessionBudgetExceeded",
-      "usageLimitExceeded",
-      "serverOverloaded",
-      "cyberPolicy",
-      "internalServerError",
-      "unauthorized",
-      "badRequest",
-      "threadRollbackFailed",
-      "sandboxError",
-      "other",
-    ]),
-    Schema.Struct({
-      httpConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({ title: "HttpConnectionFailedCodexErrorInfo" }),
-    Schema.Struct({
-      responseStreamConnectionFailed: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamConnectionFailedCodexErrorInfo",
-      description: "Failed to connect to the response SSE stream.",
-    }),
-    Schema.Struct({
-      responseStreamDisconnected: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseStreamDisconnectedCodexErrorInfo",
-      description:
-        "The response SSE stream disconnected in the middle of a turn before completion.",
-    }),
-    Schema.Struct({
-      responseTooManyFailedAttempts: Schema.Struct({
-        httpStatusCode: Schema.optionalKey(
-          Schema.Union([
-            Schema.Number.annotate({ format: "uint16" })
-              .check(Schema.isInt())
-              .check(Schema.isGreaterThanOrEqualTo(0)),
-            Schema.Null,
-          ]),
-        ),
-      }),
-    }).annotate({
-      title: "ResponseTooManyFailedAttemptsCodexErrorInfo",
-      description: "Reached the retry limit for responses.",
-    }),
-    Schema.Struct({
-      activeTurnNotSteerable: Schema.Struct({
-        turnKind: V2TurnStartResponse__NonSteerableTurnKind,
-      }),
-    }).annotate({
-      title: "ActiveTurnNotSteerableCodexErrorInfo",
+export const V2TurnStartResponse__TurnError = Schema.Struct({
+  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  codexErrorInfo: Schema.optionalKey(
+    Schema.Union([V2TurnStartResponse__CodexErrorInfo, Schema.Null]),
+  ),
+  message: Schema.String,
+  misalignment: Schema.optionalKey(
+    Schema.Union([V2TurnStartResponse__MisalignmentErrorDetails, Schema.Null]).annotate({
       description:
-        "Returned when `turn/start` or `turn/steer` is submitted while the current active turn cannot accept same-turn steering, for example `/review` or manual `/compact`.",
+        "Optional public explanation and continuation instruction for a misalignment block.",
     }),
-  ],
-  { mode: "oneOf" },
-).annotate({
-  description:
-    "This translation layer make sure that we expose codex error code in camel case.\n\nWhen an upstream HTTP status is available (for example, from the Responses API or a provider), it is forwarded in `httpStatusCode` on the relevant `codexErrorInfo` variant.",
-});
-
-export type V2TurnStartResponse__FileUpdateChange = {
-  readonly diff: string;
-  readonly kind: V2TurnStartResponse__PatchChangeKind;
-  readonly path: string;
-};
-export const V2TurnStartResponse__FileUpdateChange = Schema.Struct({
-  diff: Schema.String,
-  kind: V2TurnStartResponse__PatchChangeKind,
-  path: Schema.String,
-});
+  ),
+}).annotate({ identifier: "V2TurnStartResponse__TurnError" });
 
 export type V2TurnStartResponse__UserInput =
   | {
@@ -19475,6 +33028,11 @@ export type V2TurnStartResponse__UserInput =
       readonly type: "image";
       readonly url: string;
     }
+  | {
+      readonly detail?: V2TurnStartResponse__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
   | {
       readonly detail?: V2TurnStartResponse__ImageDetail | null;
       readonly path: string;
@@ -19496,11 +33054,18 @@ export const V2TurnStartResponse__UserInput = Schema.Union(
       ),
       type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
     }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2TurnStartResponse__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnStartResponse__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
       detail: Schema.optionalKey(Schema.Union([V2TurnStartResponse__ImageDetail, Schema.Null])),
       path: Schema.String,
@@ -19526,7 +33091,15 @@ export const V2TurnStartResponse__UserInput = Schema.Union(
     }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartResponse__UserInput" });
+
+export type V2TurnStartResponse__FunctionCallOutputBody =
+  | string
+  | ReadonlyArray<V2TurnStartResponse__FunctionCallOutputContentItem>;
+export const V2TurnStartResponse__FunctionCallOutputBody = Schema.Union([
+  Schema.String,
+  Schema.Array(V2TurnStartResponse__FunctionCallOutputContentItem),
+]).annotate({ identifier: "V2TurnStartResponse__FunctionCallOutputBody" });
 
 export type V2TurnSteerParams__UserInput =
   | {
@@ -19539,6 +33112,11 @@ export type V2TurnSteerParams__UserInput =
       readonly type: "image";
       readonly url: string;
     }
+  | {
+      readonly detail?: V2TurnSteerParams__ImageDetail | null;
+      readonly type: "image";
+      readonly fileId: string;
+    }
   | {
       readonly detail?: V2TurnSteerParams__ImageDetail | null;
       readonly path: string;
@@ -19560,11 +33138,18 @@ export const V2TurnSteerParams__UserInput = Schema.Union(
       ),
       type: Schema.Literal("text").annotate({ title: "TextUserInputType" }),
     }).annotate({ title: "TextUserInput" }),
-    Schema.Struct({
-      detail: Schema.optionalKey(Schema.Union([V2TurnSteerParams__ImageDetail, Schema.Null])),
-      type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
-      url: Schema.String,
-    }).annotate({ title: "ImageUserInput" }),
+    Schema.Union([
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnSteerParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        url: Schema.String,
+      }).annotate({ title: "UrlUserInput" }),
+      Schema.Struct({
+        detail: Schema.optionalKey(Schema.Union([V2TurnSteerParams__ImageDetail, Schema.Null])),
+        type: Schema.Literal("image").annotate({ title: "ImageUserInputType" }),
+        fileId: Schema.String,
+      }).annotate({ title: "FileIdUserInput" }),
+    ]).annotate({ title: "ImageUserInput" }),
     Schema.Struct({
       detail: Schema.optionalKey(Schema.Union([V2TurnSteerParams__ImageDetail, Schema.Null])),
       path: Schema.String,
@@ -19590,848 +33175,1268 @@ export const V2TurnSteerParams__UserInput = Schema.Union(
     }).annotate({ title: "MentionUserInput" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnSteerParams__UserInput" });
 
-export type ApplyPatchApprovalResponse__ReviewDecision =
-  | "approved"
-  | {
-      readonly approved_execpolicy_amendment: {
-        readonly proposed_execpolicy_amendment: ReadonlyArray<string>;
-      };
-    }
-  | "approved_for_session"
-  | {
-      readonly network_policy_amendment: {
-        readonly network_policy_amendment: ApplyPatchApprovalResponse__NetworkPolicyAmendment;
-      };
-    }
-  | "denied"
-  | "timed_out"
-  | "abort";
-export const ApplyPatchApprovalResponse__ReviewDecision = Schema.Union(
-  [
-    Schema.Literal("approved").annotate({
-      description: "User has approved this command and the agent should execute it.",
-    }),
-    Schema.Struct({
-      approved_execpolicy_amendment: Schema.Struct({
-        proposed_execpolicy_amendment: Schema.Array(Schema.String),
-      }),
-    }).annotate({
-      title: "ApprovedExecpolicyAmendmentReviewDecision",
-      description:
-        "User has approved this command and wants to apply the proposed execpolicy amendment so future matching commands are permitted.",
-    }),
-    Schema.Literal("approved_for_session").annotate({
-      description:
-        "User has approved this request and wants future prompts in the same session-scoped approval cache to be automatically approved for the remainder of the session.",
-    }),
-    Schema.Struct({
-      network_policy_amendment: Schema.Struct({
-        network_policy_amendment: ApplyPatchApprovalResponse__NetworkPolicyAmendment,
-      }),
-    }).annotate({
-      title: "NetworkPolicyAmendmentReviewDecision",
-      description:
-        "User chose to persist a network policy rule (allow/deny) for future requests to the same host.",
-    }),
-    Schema.Literal("denied").annotate({
-      description:
-        "User has denied this command and the agent should not execute it, but it should continue the session and try something else.",
-    }),
-    Schema.Literal("timed_out").annotate({
-      description: "Automatic approval review timed out before reaching a decision.",
-    }),
-    Schema.Literal("abort").annotate({
-      description:
-        "User has denied this command and the agent should not do anything until the user's next command.",
-    }),
-  ],
-  { mode: "oneOf" },
-).annotate({ description: "User's decision in response to an ExecApprovalRequest." });
+export type ClientRequest__TurnSteerParams = {
+  readonly clientUserMessageId?: string | null;
+  readonly expectedTurnId: string;
+  readonly input: ReadonlyArray<ClientRequest__UserInput>;
+  readonly threadId: string;
+};
+export const ClientRequest__TurnSteerParams = Schema.Struct({
+  clientUserMessageId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  expectedTurnId: Schema.String.annotate({
+    description:
+      "Required active turn id precondition. The request fails when it does not match the currently active turn.",
+  }),
+  input: Schema.Array(ClientRequest__UserInput),
+  threadId: Schema.String,
+}).annotate({ identifier: "ClientRequest__TurnSteerParams" });
 
-export type ClientRequest__CommandExecParams = {
-  readonly command: ReadonlyArray<string>;
-  readonly cwd?: string | null;
-  readonly disableOutputCap?: boolean;
-  readonly disableTimeout?: boolean;
-  readonly env?: { readonly [x: string]: string | null } | null;
-  readonly outputBytesCap?: number | null;
-  readonly processId?: string | null;
-  readonly sandboxPolicy?: ClientRequest__SandboxPolicy | null;
-  readonly size?: ClientRequest__CommandExecTerminalSize | null;
-  readonly streamStdin?: boolean;
-  readonly streamStdoutStderr?: boolean;
-  readonly timeoutMs?: number | null;
-  readonly tty?: boolean;
+export type ClientRequest__TurnToolOutput = {
+  readonly name: string;
+  readonly namespace?: string | null;
+  readonly output: ClientRequest__FunctionCallOutputBody;
+};
+export const ClientRequest__TurnToolOutput = Schema.Struct({
+  name: Schema.String,
+  namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  output: ClientRequest__FunctionCallOutputBody,
+}).annotate({ identifier: "ClientRequest__TurnToolOutput" });
+
+export type ClientRequest__ExternalAgentConfigImportParams = {
+  readonly migrationItems: ReadonlyArray<ClientRequest__ExternalAgentConfigMigrationItem>;
+  readonly migrationSource?: string | null;
+  readonly providerId?: string | null;
+  readonly source?: string | null;
 };
-export const ClientRequest__CommandExecParams = Schema.Struct({
-  command: Schema.Array(Schema.String).annotate({
-    description: "Command argv vector. Empty arrays are rejected.",
-  }),
-  cwd: Schema.optionalKey(
+export const ClientRequest__ExternalAgentConfigImportParams = Schema.Struct({
+  migrationItems: Schema.Array(ClientRequest__ExternalAgentConfigMigrationItem),
+  migrationSource: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional working directory. Defaults to the server cwd.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  disableOutputCap: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description:
-        "Disable stdout/stderr capture truncation for this request.\n\nCannot be combined with `outputBytesCap`.",
-    }),
-  ),
-  disableTimeout: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description:
-        "Disable the timeout entirely for this request.\n\nCannot be combined with `timeoutMs`.",
-    }),
-  ),
-  env: Schema.optionalKey(
-    Schema.Union([
-      Schema.Record(Schema.String, Schema.Union([Schema.String, Schema.Null])).annotate({
         description:
-          "Optional environment overrides merged into the server-computed environment.\n\nMatching names override inherited values. Set a key to `null` to unset an inherited variable.",
+          "Migration-source selector used to produce the migration items. Pass the same value to detection and import; missing or unrecognized values use the default source.",
       }),
       Schema.Null,
     ]),
   ),
-  outputBytesCap: Schema.optionalKey(
+  providerId: Schema.optionalKey(
     Schema.Union([
-      Schema.Number.annotate({
+      Schema.String.annotate({
         description:
-          "Optional per-stream stdout/stderr capture cap in bytes.\n\nWhen omitted, the server default applies. Cannot be combined with `disableOutputCap`.",
-        format: "uint",
-      })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+          "Opaque provider identifier supplied by the caller for analytics attribution and import history display. This does not select the migration source.",
+      }),
       Schema.Null,
     ]),
   ),
-  processId: Schema.optionalKey(
+  source: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description:
-          "Optional client-supplied, connection-scoped process id.\n\nRequired for `tty`, `streamStdin`, `streamStdoutStderr`, and follow-up `command/exec/write`, `command/exec/resize`, and `command/exec/terminate` calls. When omitted, buffered execution gets an internal id that is not exposed to the client.",
+        description: "Optional identifier for the product that initiated the import.",
       }),
       Schema.Null,
     ]),
   ),
-  sandboxPolicy: Schema.optionalKey(
-    Schema.Union([ClientRequest__SandboxPolicy, Schema.Null]).annotate({
-      description:
-        "Optional sandbox policy for this command.\n\nUses the same shape as thread/turn execution sandbox configuration and defaults to the user's configured policy when omitted. Cannot be combined with `permissionProfile`.",
-    }),
+}).annotate({ identifier: "ClientRequest__ExternalAgentConfigImportParams" });
+
+export type ClientRequest__ExternalAgentConfigImportHistoryRecordParams = {
+  readonly itemTypeResults: ReadonlyArray<ClientRequest__ExternalAgentConfigImportHistoryRecordTypeResultParams>;
+  readonly providerId: string;
+};
+export const ClientRequest__ExternalAgentConfigImportHistoryRecordParams = Schema.Struct({
+  itemTypeResults: Schema.Array(
+    ClientRequest__ExternalAgentConfigImportHistoryRecordTypeResultParams,
+  ).annotate({ description: "Completed results grouped by imported item type." }),
+  providerId: Schema.String.annotate({
+    description: "Opaque provider identifier for the externally completed import.",
+  }),
+}).annotate({ identifier: "ClientRequest__ExternalAgentConfigImportHistoryRecordParams" });
+
+export type CommandExecutionRequestApprovalParams__FileSystemSandboxEntry = {
+  readonly access: CommandExecutionRequestApprovalParams__FileSystemAccessMode;
+  readonly path: CommandExecutionRequestApprovalParams__FileSystemPath;
+};
+export const CommandExecutionRequestApprovalParams__FileSystemSandboxEntry = Schema.Struct({
+  access: CommandExecutionRequestApprovalParams__FileSystemAccessMode,
+  path: CommandExecutionRequestApprovalParams__FileSystemPath,
+}).annotate({ identifier: "CommandExecutionRequestApprovalParams__FileSystemSandboxEntry" });
+
+export type McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema =
+  | McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema
+  | McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema;
+export const McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema = Schema.Union([
+  McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema,
+  McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema,
+]).annotate({
+  identifier: "McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema",
+});
+
+export type PermissionsRequestApprovalParams__FileSystemSandboxEntry = {
+  readonly access: PermissionsRequestApprovalParams__FileSystemAccessMode;
+  readonly path: PermissionsRequestApprovalParams__FileSystemPath;
+};
+export const PermissionsRequestApprovalParams__FileSystemSandboxEntry = Schema.Struct({
+  access: PermissionsRequestApprovalParams__FileSystemAccessMode,
+  path: PermissionsRequestApprovalParams__FileSystemPath,
+}).annotate({ identifier: "PermissionsRequestApprovalParams__FileSystemSandboxEntry" });
+
+export type PermissionsRequestApprovalResponse__FileSystemSandboxEntry = {
+  readonly access: PermissionsRequestApprovalResponse__FileSystemAccessMode;
+  readonly path: PermissionsRequestApprovalResponse__FileSystemPath;
+};
+export const PermissionsRequestApprovalResponse__FileSystemSandboxEntry = Schema.Struct({
+  access: PermissionsRequestApprovalResponse__FileSystemAccessMode,
+  path: PermissionsRequestApprovalResponse__FileSystemPath,
+}).annotate({ identifier: "PermissionsRequestApprovalResponse__FileSystemSandboxEntry" });
+
+export type ServerNotification__ErrorNotification = {
+  readonly error: ServerNotification__TurnError;
+  readonly threadId: string;
+  readonly turnId: string;
+  readonly willRetry: boolean;
+};
+export const ServerNotification__ErrorNotification = Schema.Struct({
+  error: ServerNotification__TurnError,
+  threadId: Schema.String,
+  turnId: Schema.String,
+  willRetry: Schema.Boolean,
+}).annotate({ identifier: "ServerNotification__ErrorNotification" });
+
+export type ServerNotification__ThreadSettings = {
+  readonly activePermissionProfile?: ServerNotification__ActivePermissionProfile | null;
+  readonly approvalPolicy: ServerNotification__AskForApproval;
+  readonly approvalsReviewer: ServerNotification__ApprovalsReviewer;
+  readonly collaborationMode: ServerNotification__CollaborationMode;
+  readonly cwd: ServerNotification__AbsolutePathBuf;
+  readonly disabledPluginIds?: ReadonlyArray<string>;
+  readonly effort?: ServerNotification__ReasoningEffort | null;
+  readonly model: string;
+  readonly modelProvider: string;
+  readonly personality?: ServerNotification__Personality | null;
+  readonly sandboxPolicy: ServerNotification__SandboxPolicy;
+  readonly serviceTier?: string | null;
+  readonly summary?: ServerNotification__ReasoningSummary | null;
+};
+export const ServerNotification__ThreadSettings = Schema.Struct({
+  activePermissionProfile: Schema.optionalKey(
+    Schema.Union([ServerNotification__ActivePermissionProfile, Schema.Null]),
   ),
-  size: Schema.optionalKey(
-    Schema.Union([ClientRequest__CommandExecTerminalSize, Schema.Null]).annotate({
-      description: "Optional initial PTY size in character cells. Only valid when `tty` is true.",
+  approvalPolicy: ServerNotification__AskForApproval,
+  approvalsReviewer: ServerNotification__ApprovalsReviewer,
+  collaborationMode: ServerNotification__CollaborationMode,
+  cwd: ServerNotification__AbsolutePathBuf,
+  disabledPluginIds: Schema.optionalKey(
+    Schema.Array(Schema.String).annotate({
+      description: "Saved list of disabled plugin IDs. Does not yet filter plugin capabilities.",
+      default: [],
     }),
   ),
-  streamStdin: Schema.optionalKey(
-    Schema.Boolean.annotate({
+  effort: Schema.optionalKey(Schema.Union([ServerNotification__ReasoningEffort, Schema.Null])),
+  model: Schema.String,
+  modelProvider: Schema.String,
+  personality: Schema.optionalKey(
+    Schema.Union([ServerNotification__Personality, Schema.Null]).annotate({
       description:
-        "Allow follow-up `command/exec/write` requests to write stdin bytes.\n\nRequires a client-supplied `processId`.",
+        "@deprecated Reports the saved setting; `friendly` and `pragmatic` no longer select a style.",
     }),
   ),
-  streamStdoutStderr: Schema.optionalKey(
-    Schema.Boolean.annotate({
+  sandboxPolicy: ServerNotification__SandboxPolicy,
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  summary: Schema.optionalKey(Schema.Union([ServerNotification__ReasoningSummary, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__ThreadSettings" });
+
+export type ServerNotification__ThreadItem =
+  | {
+      readonly clientId?: string | null;
+      readonly content: ReadonlyArray<ServerNotification__UserInput>;
+      readonly id: string;
+      readonly type: "userMessage";
+    }
+  | {
+      readonly fragments: ReadonlyArray<ServerNotification__HookPromptFragment>;
+      readonly id: string;
+      readonly type: "hookPrompt";
+    }
+  | {
+      readonly delivery?: ServerNotification__AgentMessageDelivery | null;
+      readonly id: string;
+      readonly memoryCitation?: ServerNotification__MemoryCitation | null;
+      readonly phase?: ServerNotification__MessagePhase | null;
+      readonly questions?: ReadonlyArray<ServerNotification__AsyncUserInputQuestion> | null;
+      readonly text: string;
+      readonly type: "agentMessage";
+    }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: ServerNotification__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
+  | { readonly id: string; readonly text: string; readonly type: "plan" }
+  | {
+      readonly content?: ReadonlyArray<string>;
+      readonly id: string;
+      readonly summary?: ReadonlyArray<string>;
+      readonly type: "reasoning";
+    }
+  | {
+      readonly aggregatedOutput?: string | null;
+      readonly command: string;
+      readonly commandActions: ReadonlyArray<ServerNotification__CommandAction>;
+      readonly cwd: ServerNotification__LegacyAppPathString;
+      readonly durationMs?: number | null;
+      readonly exitCode?: number | null;
+      readonly id: string;
+      readonly pluginId?: string | null;
+      readonly processId?: string | null;
+      readonly scriptPath?: string | null;
+      readonly source?: ServerNotification__CommandExecutionSource;
+      readonly status: ServerNotification__CommandExecutionStatus;
+      readonly type: "commandExecution";
+    }
+  | {
+      readonly changes: ReadonlyArray<ServerNotification__FileUpdateChange>;
+      readonly id: string;
+      readonly status: ServerNotification__PatchApplyStatus;
+      readonly type: "fileChange";
+    }
+  | {
+      readonly appContext?: ServerNotification__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
+      readonly durationMs?: number | null;
+      readonly error?: ServerNotification__McpToolCallError | null;
+      readonly id: string;
+      readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: ServerNotification__McpAppUi | null;
+      readonly pluginId?: string | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: ServerNotification__McpToolCallResult | null;
+      readonly server: string;
+      readonly status: ServerNotification__McpToolCallStatus;
+      readonly tool: string;
+      readonly type: "mcpToolCall";
+    }
+  | {
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<ServerNotification__DynamicToolCallOutputContentItem> | null;
+      readonly durationMs?: number | null;
+      readonly id: string;
+      readonly namespace?: string | null;
+      readonly status: ServerNotification__DynamicToolCallStatus;
+      readonly success?: boolean | null;
+      readonly tool: string;
+      readonly type: "dynamicToolCall";
+    }
+  | {
+      readonly agentsStates: { readonly [x: string]: ServerNotification__CollabAgentState };
+      readonly id: string;
+      readonly model?: string | null;
+      readonly prompt?: string | null;
+      readonly reasoningEffort?: ServerNotification__ReasoningEffort | null;
+      readonly receiverThreadIds: ReadonlyArray<string>;
+      readonly senderThreadId: string;
+      readonly status: ServerNotification__CollabAgentToolCallStatus;
+      readonly tool: ServerNotification__CollabAgentTool;
+      readonly type: "collabAgentToolCall";
+    }
+  | {
+      readonly agentPath: string;
+      readonly agentThreadId: string;
+      readonly id: string;
+      readonly kind: ServerNotification__SubAgentActivityKind;
+      readonly type: "subAgentActivity";
+    }
+  | {
+      readonly action?: ServerNotification__WebSearchAction | null;
+      readonly id: string;
+      readonly query: string;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
+      readonly type: "webSearch";
+    }
+  | {
+      readonly id: string;
+      readonly path: ServerNotification__LegacyAppPathString;
+      readonly type: "imageView";
+    }
+  | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
+  | {
+      readonly failure?: ServerNotification__ImageGenerationFailure | null;
+      readonly id: string;
+      readonly result: string;
+      readonly revisedPrompt?: string | null;
+      readonly savedPath?: ServerNotification__AbsolutePathBuf | null;
+      readonly status: string;
+      readonly transparentBackground?: boolean | null;
+      readonly type: "imageGeneration";
+    }
+  | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
+  | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
+  | { readonly id: string; readonly type: "contextCompaction" };
+export const ServerNotification__ThreadItem = Schema.Union(
+  [
+    Schema.Struct({
+      clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      content: Schema.Array(ServerNotification__UserInput),
+      id: Schema.String,
+      type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
+    }).annotate({ title: "UserMessageThreadItem" }),
+    Schema.Struct({
+      fragments: Schema.Array(ServerNotification__HookPromptFragment),
+      id: Schema.String,
+      type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
+    }).annotate({ title: "HookPromptThreadItem" }),
+    Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([ServerNotification__AgentMessageDelivery, Schema.Null]),
+      ),
+      id: Schema.String,
+      memoryCitation: Schema.optionalKey(
+        Schema.Union([ServerNotification__MemoryCitation, Schema.Null]),
+      ),
+      phase: Schema.optionalKey(Schema.Union([ServerNotification__MessagePhase, Schema.Null])),
+      questions: Schema.optionalKey(
+        Schema.Union([Schema.Array(ServerNotification__AsyncUserInputQuestion), Schema.Null]),
+      ),
+      text: Schema.String,
+      type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
+    }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: ServerNotification__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      text: Schema.String,
+      type: Schema.Literal("plan").annotate({ title: "PlanThreadItemType" }),
+    }).annotate({
+      title: "PlanThreadItem",
       description:
-        "Stream stdout/stderr via `command/exec/outputDelta` notifications.\n\nStreamed bytes are not duplicated into the final response and require a client-supplied `processId`.",
+        "EXPERIMENTAL - proposed plan item content. The completed plan item is authoritative and may not match the concatenation of `PlanDelta` text.",
     }),
-  ),
-  timeoutMs: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({
+    Schema.Struct({
+      content: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+      id: Schema.String,
+      summary: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+      type: Schema.Literal("reasoning").annotate({ title: "ReasoningThreadItemType" }),
+    }).annotate({ title: "ReasoningThreadItem" }),
+    Schema.Struct({
+      aggregatedOutput: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "The command's output, aggregated from stdout and stderr.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      command: Schema.String.annotate({ description: "The command to be executed." }),
+      commandActions: Schema.Array(ServerNotification__CommandAction).annotate({
         description:
-          "Optional timeout in milliseconds.\n\nWhen omitted, the server default applies. Cannot be combined with `disableTimeout`.",
-        format: "int64",
-      }).check(Schema.isInt()),
-      Schema.Null,
-    ]),
-  ),
-  tty: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "Enable PTY mode.\n\nThis implies `streamStdin` and `streamStdoutStderr`.",
+          "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
+      }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<ServerNotification__LegacyAppPathString> =>
+          ServerNotification__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
+      durationMs: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The duration of the command execution in milliseconds.",
+            format: "int64",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      exitCode: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The command's exit code.",
+            format: "int32",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      processId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "Identifier for the underlying PTY process (when available).",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      source: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<ServerNotification__CommandExecutionSource> =>
+            ServerNotification__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
+      ),
+      status: ServerNotification__CommandExecutionStatus,
+      type: Schema.Literal("commandExecution").annotate({
+        title: "CommandExecutionThreadItemType",
+      }),
+    }).annotate({ title: "CommandExecutionThreadItem" }),
+    Schema.Struct({
+      changes: Schema.Array(ServerNotification__FileUpdateChange),
+      id: Schema.String,
+      status: ServerNotification__PatchApplyStatus,
+      type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
+    }).annotate({ title: "FileChangeThreadItem" }),
+    Schema.Struct({
+      appContext: Schema.optionalKey(
+        Schema.Union([ServerNotification__McpToolCallAppContext, Schema.Null]),
+      ),
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
+      durationMs: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The duration of the MCP tool call in milliseconds.",
+            format: "int64",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      error: Schema.optionalKey(Schema.Union([ServerNotification__McpToolCallError, Schema.Null])),
+      id: Schema.String,
+      mcpAppResourceUri: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([ServerNotification__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
+      pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+      result: Schema.optionalKey(
+        Schema.Union([ServerNotification__McpToolCallResult, Schema.Null]),
+      ),
+      server: Schema.String,
+      status: ServerNotification__McpToolCallStatus,
+      tool: Schema.String,
+      type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
+    }).annotate({ title: "McpToolCallThreadItem" }),
+    Schema.Struct({
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
+      contentItems: Schema.optionalKey(
+        Schema.Union([
+          Schema.Array(ServerNotification__DynamicToolCallOutputContentItem),
+          Schema.Null,
+        ]),
+      ),
+      durationMs: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The duration of the dynamic tool call in milliseconds.",
+            format: "int64",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      id: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      status: ServerNotification__DynamicToolCallStatus,
+      success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+      tool: Schema.String,
+      type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
+    }).annotate({ title: "DynamicToolCallThreadItem" }),
+    Schema.Struct({
+      agentsStates: Schema.Record(Schema.String, ServerNotification__CollabAgentState).annotate({
+        description: "Last known status of the target agents, when available.",
+      }),
+      id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
+      model: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "Model requested for the spawned agent, when applicable.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      prompt: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "Prompt text sent as part of the collab tool call, when available.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      reasoningEffort: Schema.optionalKey(
+        Schema.Union([ServerNotification__ReasoningEffort, Schema.Null]).annotate({
+          description: "Reasoning effort requested for the spawned agent, when applicable.",
+        }),
+      ),
+      receiverThreadIds: Schema.Array(Schema.String).annotate({
+        description:
+          "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
+      }),
+      senderThreadId: Schema.String.annotate({
+        description: "Thread ID of the agent issuing the collab request.",
+      }),
+      status: Schema.suspend(
+        (): Schema.Codec<ServerNotification__CollabAgentToolCallStatus> =>
+          ServerNotification__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<ServerNotification__CollabAgentTool> =>
+          ServerNotification__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
+      type: Schema.Literal("collabAgentToolCall").annotate({
+        title: "CollabAgentToolCallThreadItemType",
+      }),
+    }).annotate({ title: "CollabAgentToolCallThreadItem" }),
+    Schema.Struct({
+      agentPath: Schema.String,
+      agentThreadId: Schema.String,
+      id: Schema.String,
+      kind: ServerNotification__SubAgentActivityKind,
+      type: Schema.Literal("subAgentActivity").annotate({
+        title: "SubAgentActivityThreadItemType",
+      }),
+    }).annotate({ title: "SubAgentActivityThreadItem" }),
+    Schema.Struct({
+      action: Schema.optionalKey(Schema.Union([ServerNotification__WebSearchAction, Schema.Null])),
+      id: Schema.String,
+      query: Schema.String,
+      results: Schema.optionalKey(
+        Schema.Union([
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
+            description:
+              "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("webSearch").annotate({ title: "WebSearchThreadItemType" }),
+    }).annotate({ title: "WebSearchThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      path: ServerNotification__LegacyAppPathString,
+      type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
+    }).annotate({ title: "ImageViewThreadItem" }),
+    Schema.Struct({
+      durationMs: Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      id: Schema.String,
+      type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
+    }).annotate({
+      title: "SleepThreadItem",
+      description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
-  ),
-}).annotate({
-  description:
-    "Run a standalone command (argv vector) in the server sandbox without creating a thread or turn.\n\nThe final `command/exec` response is deferred until the process exits and is sent only after all `command/exec/outputDelta` notifications for that connection have been emitted.",
-});
+    Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([ServerNotification__ImageGenerationFailure, Schema.Null]),
+      ),
+      id: Schema.String,
+      result: Schema.String,
+      revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      savedPath: Schema.optionalKey(
+        Schema.Union([ServerNotification__AbsolutePathBuf, Schema.Null]),
+      ),
+      status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+      type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+    }).annotate({ title: "ImageGenerationThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      review: Schema.String,
+      type: Schema.Literal("enteredReviewMode").annotate({
+        title: "EnteredReviewModeThreadItemType",
+      }),
+    }).annotate({ title: "EnteredReviewModeThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      review: Schema.String,
+      type: Schema.Literal("exitedReviewMode").annotate({
+        title: "ExitedReviewModeThreadItemType",
+      }),
+    }).annotate({ title: "ExitedReviewModeThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      type: Schema.Literal("contextCompaction").annotate({
+        title: "ContextCompactionThreadItemType",
+      }),
+    }).annotate({ title: "ContextCompactionThreadItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "ServerNotification__ThreadItem" });
 
-export type ClientRequest__FunctionCallOutputBody =
-  | string
-  | ReadonlyArray<ClientRequest__FunctionCallOutputContentItem>;
-export const ClientRequest__FunctionCallOutputBody = Schema.Union([
-  Schema.String,
-  Schema.Array(ClientRequest__FunctionCallOutputContentItem),
-]);
+export type ServerNotification__FileSystemSandboxEntry = {
+  readonly access: ServerNotification__FileSystemAccessMode;
+  readonly path: ServerNotification__FileSystemPath;
+};
+export const ServerNotification__FileSystemSandboxEntry = Schema.Struct({
+  access: ServerNotification__FileSystemAccessMode,
+  path: ServerNotification__FileSystemPath,
+}).annotate({ identifier: "ServerNotification__FileSystemSandboxEntry" });
 
-export type ClientRequest__ConfigBatchWriteParams = {
-  readonly edits: ReadonlyArray<ClientRequest__ConfigEdit>;
-  readonly expectedVersion?: string | null;
-  readonly filePath?: string | null;
-  readonly reloadUserConfig?: boolean;
+export type ServerNotification__HookStartedNotification = {
+  readonly run: ServerNotification__HookRunSummary;
+  readonly threadId: string;
+  readonly turnId?: string | null;
 };
-export const ClientRequest__ConfigBatchWriteParams = Schema.Struct({
-  edits: Schema.Array(ClientRequest__ConfigEdit),
-  expectedVersion: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  filePath: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Path to the config file to write; defaults to the user's `config.toml` when omitted.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  reloadUserConfig: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description:
-        "When true, hot-reload the updated user config into all loaded threads after writing.",
-    }),
-  ),
-});
+export const ServerNotification__HookStartedNotification = Schema.Struct({
+  run: ServerNotification__HookRunSummary,
+  threadId: Schema.String,
+  turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__HookStartedNotification" });
 
-export type ClientRequest__PluginShareSaveParams = {
-  readonly discoverability?: ClientRequest__PluginShareDiscoverability | null;
-  readonly pluginPath: ClientRequest__AbsolutePathBuf;
-  readonly remotePluginId?: string | null;
-  readonly shareTargets?: ReadonlyArray<ClientRequest__PluginShareTarget> | null;
+export type ServerNotification__HookCompletedNotification = {
+  readonly run: ServerNotification__HookRunSummary;
+  readonly threadId: string;
+  readonly turnId?: string | null;
 };
-export const ClientRequest__PluginShareSaveParams = Schema.Struct({
-  discoverability: Schema.optionalKey(
-    Schema.Union([ClientRequest__PluginShareDiscoverability, Schema.Null]),
-  ),
-  pluginPath: ClientRequest__AbsolutePathBuf,
-  remotePluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  shareTargets: Schema.optionalKey(
-    Schema.Union([Schema.Array(ClientRequest__PluginShareTarget), Schema.Null]),
-  ),
-});
+export const ServerNotification__HookCompletedNotification = Schema.Struct({
+  run: ServerNotification__HookRunSummary,
+  threadId: Schema.String,
+  turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "ServerNotification__HookCompletedNotification" });
 
-export type ClientRequest__PluginShareUpdateTargetsParams = {
-  readonly discoverability: ClientRequest__PluginShareUpdateDiscoverability;
-  readonly remotePluginId: string;
-  readonly shareTargets: ReadonlyArray<ClientRequest__PluginShareTarget>;
+export type ServerNotification__AppListUpdatedNotification = {
+  readonly data: ReadonlyArray<ServerNotification__AppInfo>;
 };
-export const ClientRequest__PluginShareUpdateTargetsParams = Schema.Struct({
-  discoverability: ClientRequest__PluginShareUpdateDiscoverability,
-  remotePluginId: Schema.String,
-  shareTargets: Schema.Array(ClientRequest__PluginShareTarget),
+export const ServerNotification__AppListUpdatedNotification = Schema.Struct({
+  data: Schema.Array(ServerNotification__AppInfo),
+}).annotate({
+  description: "EXPERIMENTAL - notification emitted when the app list changes.",
+  identifier: "ServerNotification__AppListUpdatedNotification",
 });
 
-export type ClientRequest__ExternalAgentConfigMigrationItem = {
-  readonly cwd?: string | null;
-  readonly description: string;
-  readonly details?: ClientRequest__MigrationDetails | null;
-  readonly itemType: ClientRequest__ExternalAgentConfigMigrationItemType;
+export type ServerNotification__ExternalAgentConfigImportProgressNotification = {
+  readonly importId: string;
+  readonly itemTypeResults: ReadonlyArray<ServerNotification__ExternalAgentConfigImportTypeResult>;
 };
-export const ClientRequest__ExternalAgentConfigMigrationItem = Schema.Struct({
-  cwd: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  description: Schema.String,
-  details: Schema.optionalKey(Schema.Union([ClientRequest__MigrationDetails, Schema.Null])),
-  itemType: ClientRequest__ExternalAgentConfigMigrationItemType,
-});
+export const ServerNotification__ExternalAgentConfigImportProgressNotification = Schema.Struct({
+  importId: Schema.String,
+  itemTypeResults: Schema.Array(ServerNotification__ExternalAgentConfigImportTypeResult),
+}).annotate({ identifier: "ServerNotification__ExternalAgentConfigImportProgressNotification" });
 
-export type ClientRequest__TurnStartParams = {
-  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
-  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
-  readonly clientUserMessageId?: string | null;
-  readonly cwd?: string | null;
-  readonly effort?: ClientRequest__ReasoningEffort | null;
-  readonly input: ReadonlyArray<ClientRequest__UserInput>;
-  readonly model?: string | null;
-  readonly outputSchema?: unknown;
-  readonly personality?: ClientRequest__Personality | null;
-  readonly sandboxPolicy?: ClientRequest__SandboxPolicy | null;
-  readonly serviceTier?: string | null;
-  readonly summary?: ClientRequest__ReasoningSummary | null;
-  readonly threadId: string;
+export type ServerNotification__ExternalAgentConfigImportCompletedNotification = {
+  readonly importId: string;
+  readonly itemTypeResults: ReadonlyArray<ServerNotification__ExternalAgentConfigImportTypeResult>;
 };
-export const ClientRequest__TurnStartParams = Schema.Struct({
-  approvalPolicy: Schema.optionalKey(
-    Schema.Union([ClientRequest__AskForApproval, Schema.Null]).annotate({
-      description: "Override the approval policy for this turn and subsequent turns.",
-    }),
-  ),
-  approvalsReviewer: Schema.optionalKey(
-    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
-      description:
-        "Override where approval requests are routed for review on this turn and subsequent turns.",
-    }),
-  ),
-  clientUserMessageId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  cwd: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Override the working directory for this turn and subsequent turns.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  effort: Schema.optionalKey(
-    Schema.Union([ClientRequest__ReasoningEffort, Schema.Null]).annotate({
-      description: "Override the reasoning effort for this turn and subsequent turns.",
-    }),
-  ),
-  input: Schema.Array(ClientRequest__UserInput),
-  model: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Override the model for this turn and subsequent turns.",
-      }),
-      Schema.Null,
-    ]),
+export const ServerNotification__ExternalAgentConfigImportCompletedNotification = Schema.Struct({
+  importId: Schema.String,
+  itemTypeResults: Schema.Array(ServerNotification__ExternalAgentConfigImportTypeResult),
+}).annotate({ identifier: "ServerNotification__ExternalAgentConfigImportCompletedNotification" });
+
+export type ServerRequest__FileSystemSandboxEntry = {
+  readonly access: ServerRequest__FileSystemAccessMode;
+  readonly path: ServerRequest__FileSystemPath;
+};
+export const ServerRequest__FileSystemSandboxEntry = Schema.Struct({
+  access: ServerRequest__FileSystemAccessMode,
+  path: ServerRequest__FileSystemPath,
+}).annotate({ identifier: "ServerRequest__FileSystemSandboxEntry" });
+
+export type ServerRequest__McpElicitationMultiSelectEnumSchema =
+  | ServerRequest__McpElicitationUntitledMultiSelectEnumSchema
+  | ServerRequest__McpElicitationTitledMultiSelectEnumSchema;
+export const ServerRequest__McpElicitationMultiSelectEnumSchema = Schema.Union([
+  ServerRequest__McpElicitationUntitledMultiSelectEnumSchema,
+  ServerRequest__McpElicitationTitledMultiSelectEnumSchema,
+]).annotate({ identifier: "ServerRequest__McpElicitationMultiSelectEnumSchema" });
+
+export type V2ConfigReadResponse__ComputerUseConfig = {
+  readonly default_app_access?: V2ConfigReadResponse__AllowDenyRequirement | null;
+  readonly macos?: V2ConfigReadResponse__ComputerUseMacosConfig | null;
+  readonly windows?: V2ConfigReadResponse__ComputerUseWindowsConfig | null;
+};
+export const V2ConfigReadResponse__ComputerUseConfig = Schema.Struct({
+  default_app_access: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AllowDenyRequirement, Schema.Null]),
   ),
-  outputSchema: Schema.optionalKey(
-    Schema.Unknown.annotate({
-      description:
-        "Optional JSON Schema used to constrain the final assistant message for this turn.",
-    }),
+  macos: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__ComputerUseMacosConfig, Schema.Null]),
   ),
-  personality: Schema.optionalKey(
-    Schema.Union([ClientRequest__Personality, Schema.Null]).annotate({
-      description: "Override the personality for this turn and subsequent turns.",
-    }),
+  windows: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__ComputerUseWindowsConfig, Schema.Null]),
   ),
-  sandboxPolicy: Schema.optionalKey(
-    Schema.Union([ClientRequest__SandboxPolicy, Schema.Null]).annotate({
-      description: "Override the sandbox policy for this turn and subsequent turns.",
-    }),
+}).annotate({ identifier: "V2ConfigReadResponse__ComputerUseConfig" });
+
+export type V2ConfigRequirementsReadResponse__ComputerUseRequirements = {
+  readonly allowLockedComputerUse?: boolean | null;
+  readonly allowPersistentApproval?: boolean | null;
+  readonly defaultAppAccess?: V2ConfigRequirementsReadResponse__AllowDenyRequirement | null;
+  readonly macos?: V2ConfigRequirementsReadResponse__ComputerUseMacosRequirements | null;
+  readonly windows?: V2ConfigRequirementsReadResponse__ComputerUseWindowsRequirements | null;
+};
+export const V2ConfigRequirementsReadResponse__ComputerUseRequirements = Schema.Struct({
+  allowLockedComputerUse: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  allowPersistentApproval: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  defaultAppAccess: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__AllowDenyRequirement, Schema.Null]),
   ),
-  serviceTier: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Override the service tier for this turn and subsequent turns.",
-      }),
-      Schema.Null,
-    ]),
+  macos: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__ComputerUseMacosRequirements, Schema.Null]),
   ),
-  summary: Schema.optionalKey(
-    Schema.Union([ClientRequest__ReasoningSummary, Schema.Null]).annotate({
-      description: "Override the reasoning summary for this turn and subsequent turns.",
-    }),
+  windows: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__ComputerUseWindowsRequirements, Schema.Null]),
   ),
-  threadId: Schema.String,
-});
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ComputerUseRequirements" });
 
-export type ClientRequest__TurnSteerParams = {
-  readonly clientUserMessageId?: string | null;
-  readonly expectedTurnId: string;
-  readonly input: ReadonlyArray<ClientRequest__UserInput>;
-  readonly threadId: string;
+export type V2ConfigWriteResponse__OverriddenMetadata = {
+  readonly effectiveValue: Schema.Json;
+  readonly message: string;
+  readonly overridingLayer: V2ConfigWriteResponse__ConfigLayerMetadata;
 };
-export const ClientRequest__TurnSteerParams = Schema.Struct({
-  clientUserMessageId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  expectedTurnId: Schema.String.annotate({
-    description:
-      "Required active turn id precondition. The request fails when it does not match the currently active turn.",
-  }),
-  input: Schema.Array(ClientRequest__UserInput),
-  threadId: Schema.String,
-});
+export const V2ConfigWriteResponse__OverriddenMetadata = Schema.Struct({
+  effectiveValue: Schema.Json.annotate({ expected: "JSON value" }),
+  message: Schema.String,
+  overridingLayer: V2ConfigWriteResponse__ConfigLayerMetadata,
+}).annotate({ identifier: "V2ConfigWriteResponse__OverriddenMetadata" });
 
-export type CommandExecutionRequestApprovalParams__FileSystemPath =
+export type V2ItemCompletedNotification__ThreadItem =
   | {
-      readonly path: CommandExecutionRequestApprovalParams__LegacyAppPathString;
-      readonly type: "path";
+      readonly clientId?: string | null;
+      readonly content: ReadonlyArray<V2ItemCompletedNotification__UserInput>;
+      readonly id: string;
+      readonly type: "userMessage";
     }
-  | { readonly pattern: string; readonly type: "glob_pattern" }
   | {
-      readonly type: "special";
-      readonly value: CommandExecutionRequestApprovalParams__FileSystemSpecialPath;
-    };
-export const CommandExecutionRequestApprovalParams__FileSystemPath = Schema.Union(
+      readonly fragments: ReadonlyArray<V2ItemCompletedNotification__HookPromptFragment>;
+      readonly id: string;
+      readonly type: "hookPrompt";
+    }
+  | {
+      readonly delivery?: V2ItemCompletedNotification__AgentMessageDelivery | null;
+      readonly id: string;
+      readonly memoryCitation?: V2ItemCompletedNotification__MemoryCitation | null;
+      readonly phase?: V2ItemCompletedNotification__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ItemCompletedNotification__AsyncUserInputQuestion> | null;
+      readonly text: string;
+      readonly type: "agentMessage";
+    }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ItemCompletedNotification__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
+  | { readonly id: string; readonly text: string; readonly type: "plan" }
+  | {
+      readonly content?: ReadonlyArray<string>;
+      readonly id: string;
+      readonly summary?: ReadonlyArray<string>;
+      readonly type: "reasoning";
+    }
+  | {
+      readonly aggregatedOutput?: string | null;
+      readonly command: string;
+      readonly commandActions: ReadonlyArray<V2ItemCompletedNotification__CommandAction>;
+      readonly cwd: V2ItemCompletedNotification__LegacyAppPathString;
+      readonly durationMs?: number | null;
+      readonly exitCode?: number | null;
+      readonly id: string;
+      readonly pluginId?: string | null;
+      readonly processId?: string | null;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ItemCompletedNotification__CommandExecutionSource;
+      readonly status: V2ItemCompletedNotification__CommandExecutionStatus;
+      readonly type: "commandExecution";
+    }
+  | {
+      readonly changes: ReadonlyArray<V2ItemCompletedNotification__FileUpdateChange>;
+      readonly id: string;
+      readonly status: V2ItemCompletedNotification__PatchApplyStatus;
+      readonly type: "fileChange";
+    }
+  | {
+      readonly appContext?: V2ItemCompletedNotification__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
+      readonly durationMs?: number | null;
+      readonly error?: V2ItemCompletedNotification__McpToolCallError | null;
+      readonly id: string;
+      readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ItemCompletedNotification__McpAppUi | null;
+      readonly pluginId?: string | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ItemCompletedNotification__McpToolCallResult | null;
+      readonly server: string;
+      readonly status: V2ItemCompletedNotification__McpToolCallStatus;
+      readonly tool: string;
+      readonly type: "mcpToolCall";
+    }
+  | {
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ItemCompletedNotification__DynamicToolCallOutputContentItem> | null;
+      readonly durationMs?: number | null;
+      readonly id: string;
+      readonly namespace?: string | null;
+      readonly status: V2ItemCompletedNotification__DynamicToolCallStatus;
+      readonly success?: boolean | null;
+      readonly tool: string;
+      readonly type: "dynamicToolCall";
+    }
+  | {
+      readonly agentsStates: {
+        readonly [x: string]: V2ItemCompletedNotification__CollabAgentState;
+      };
+      readonly id: string;
+      readonly model?: string | null;
+      readonly prompt?: string | null;
+      readonly reasoningEffort?: V2ItemCompletedNotification__ReasoningEffort | null;
+      readonly receiverThreadIds: ReadonlyArray<string>;
+      readonly senderThreadId: string;
+      readonly status: V2ItemCompletedNotification__CollabAgentToolCallStatus;
+      readonly tool: V2ItemCompletedNotification__CollabAgentTool;
+      readonly type: "collabAgentToolCall";
+    }
+  | {
+      readonly agentPath: string;
+      readonly agentThreadId: string;
+      readonly id: string;
+      readonly kind: V2ItemCompletedNotification__SubAgentActivityKind;
+      readonly type: "subAgentActivity";
+    }
+  | {
+      readonly action?: V2ItemCompletedNotification__WebSearchAction | null;
+      readonly id: string;
+      readonly query: string;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
+      readonly type: "webSearch";
+    }
+  | {
+      readonly id: string;
+      readonly path: V2ItemCompletedNotification__LegacyAppPathString;
+      readonly type: "imageView";
+    }
+  | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
+  | {
+      readonly failure?: V2ItemCompletedNotification__ImageGenerationFailure | null;
+      readonly id: string;
+      readonly result: string;
+      readonly revisedPrompt?: string | null;
+      readonly savedPath?: V2ItemCompletedNotification__AbsolutePathBuf | null;
+      readonly status: string;
+      readonly transparentBackground?: boolean | null;
+      readonly type: "imageGeneration";
+    }
+  | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
+  | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
+  | { readonly id: string; readonly type: "contextCompaction" };
+export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
   [
     Schema.Struct({
-      path: CommandExecutionRequestApprovalParams__LegacyAppPathString,
-      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
-    }).annotate({ title: "PathFileSystemPath" }),
+      clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      content: Schema.Array(V2ItemCompletedNotification__UserInput),
+      id: Schema.String,
+      type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
+    }).annotate({ title: "UserMessageThreadItem" }),
+    Schema.Struct({
+      fragments: Schema.Array(V2ItemCompletedNotification__HookPromptFragment),
+      id: Schema.String,
+      type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
+    }).annotate({ title: "HookPromptThreadItem" }),
+    Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__AgentMessageDelivery, Schema.Null]),
+      ),
+      id: Schema.String,
+      memoryCitation: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__MemoryCitation, Schema.Null]),
+      ),
+      phase: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__MessagePhase, Schema.Null]),
+      ),
+      questions: Schema.optionalKey(
+        Schema.Union([
+          Schema.Array(V2ItemCompletedNotification__AsyncUserInputQuestion),
+          Schema.Null,
+        ]),
+      ),
+      text: Schema.String,
+      type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
+    }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ItemCompletedNotification__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      text: Schema.String,
+      type: Schema.Literal("plan").annotate({ title: "PlanThreadItemType" }),
+    }).annotate({
+      title: "PlanThreadItem",
+      description:
+        "EXPERIMENTAL - proposed plan item content. The completed plan item is authoritative and may not match the concatenation of `PlanDelta` text.",
+    }),
+    Schema.Struct({
+      content: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+      id: Schema.String,
+      summary: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+      type: Schema.Literal("reasoning").annotate({ title: "ReasoningThreadItemType" }),
+    }).annotate({ title: "ReasoningThreadItem" }),
+    Schema.Struct({
+      aggregatedOutput: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "The command's output, aggregated from stdout and stderr.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      command: Schema.String.annotate({ description: "The command to be executed." }),
+      commandActions: Schema.Array(V2ItemCompletedNotification__CommandAction).annotate({
+        description:
+          "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
+      }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ItemCompletedNotification__LegacyAppPathString> =>
+          V2ItemCompletedNotification__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
+      durationMs: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The duration of the command execution in milliseconds.",
+            format: "int64",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      exitCode: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The command's exit code.",
+            format: "int32",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      processId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "Identifier for the underlying PTY process (when available).",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      source: Schema.optionalKey(
+        Schema.suspend(
+          (): Schema.Codec<V2ItemCompletedNotification__CommandExecutionSource> =>
+            V2ItemCompletedNotification__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
+      ),
+      status: V2ItemCompletedNotification__CommandExecutionStatus,
+      type: Schema.Literal("commandExecution").annotate({
+        title: "CommandExecutionThreadItemType",
+      }),
+    }).annotate({ title: "CommandExecutionThreadItem" }),
+    Schema.Struct({
+      changes: Schema.Array(V2ItemCompletedNotification__FileUpdateChange),
+      id: Schema.String,
+      status: V2ItemCompletedNotification__PatchApplyStatus,
+      type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
+    }).annotate({ title: "FileChangeThreadItem" }),
+    Schema.Struct({
+      appContext: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__McpToolCallAppContext, Schema.Null]),
+      ),
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
+      durationMs: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The duration of the MCP tool call in milliseconds.",
+            format: "int64",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      error: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__McpToolCallError, Schema.Null]),
+      ),
+      id: Schema.String,
+      mcpAppResourceUri: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
+      pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+      result: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__McpToolCallResult, Schema.Null]),
+      ),
+      server: Schema.String,
+      status: V2ItemCompletedNotification__McpToolCallStatus,
+      tool: Schema.String,
+      type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
+    }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      pattern: Schema.String,
-      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
-    }).annotate({ title: "GlobPatternFileSystemPath" }),
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
+      contentItems: Schema.optionalKey(
+        Schema.Union([
+          Schema.Array(V2ItemCompletedNotification__DynamicToolCallOutputContentItem),
+          Schema.Null,
+        ]),
+      ),
+      durationMs: Schema.optionalKey(
+        Schema.Union([
+          Schema.Number.annotate({
+            description: "The duration of the dynamic tool call in milliseconds.",
+            format: "int64",
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
+          Schema.Null,
+        ]),
+      ),
+      id: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      status: V2ItemCompletedNotification__DynamicToolCallStatus,
+      success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+      tool: Schema.String,
+      type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
+    }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
-      value: CommandExecutionRequestApprovalParams__FileSystemSpecialPath,
-    }).annotate({ title: "SpecialFileSystemPath" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type CommandExecutionRequestApprovalResponse__CommandExecutionApprovalDecision =
-  | "accept"
-  | "acceptForSession"
-  | {
-      readonly acceptWithExecpolicyAmendment: {
-        readonly execpolicy_amendment: ReadonlyArray<string>;
-      };
-    }
-  | {
-      readonly applyNetworkPolicyAmendment: {
-        readonly network_policy_amendment: CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment;
-      };
-    }
-  | "decline"
-  | "cancel";
-export const CommandExecutionRequestApprovalResponse__CommandExecutionApprovalDecision =
-  Schema.Union(
-    [
-      Schema.Literal("accept").annotate({ description: "User approved the command." }),
-      Schema.Literal("acceptForSession").annotate({
-        description:
-          "User approved the command and future prompts in the same session-scoped approval cache should run without prompting.",
-      }),
-      Schema.Struct({
-        acceptWithExecpolicyAmendment: Schema.Struct({
-          execpolicy_amendment: Schema.Array(Schema.String),
+      agentsStates: Schema.Record(
+        Schema.String,
+        V2ItemCompletedNotification__CollabAgentState,
+      ).annotate({ description: "Last known status of the target agents, when available." }),
+      id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
+      model: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "Model requested for the spawned agent, when applicable.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      prompt: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "Prompt text sent as part of the collab tool call, when available.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      reasoningEffort: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__ReasoningEffort, Schema.Null]).annotate({
+          description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
-      }).annotate({
-        title: "AcceptWithExecpolicyAmendmentCommandExecutionApprovalDecision",
+      ),
+      receiverThreadIds: Schema.Array(Schema.String).annotate({
         description:
-          "User approved the command, and wants to apply the proposed execpolicy amendment so future matching commands can run without prompting.",
-      }),
-      Schema.Struct({
-        applyNetworkPolicyAmendment: Schema.Struct({
-          network_policy_amendment: CommandExecutionRequestApprovalResponse__NetworkPolicyAmendment,
-        }),
-      }).annotate({
-        title: "ApplyNetworkPolicyAmendmentCommandExecutionApprovalDecision",
-        description: "User chose a persistent network policy rule (allow/deny) for this host.",
-      }),
-      Schema.Literal("decline").annotate({
-        description: "User denied the command. The agent will continue the turn.",
+          "Thread ID of the receiving agent, when applicable. In case of spawn operation, this corresponds to the newly spawned agent.",
       }),
-      Schema.Literal("cancel").annotate({
-        description: "User denied the command. The turn will also be immediately interrupted.",
+      senderThreadId: Schema.String.annotate({
+        description: "Thread ID of the agent issuing the collab request.",
       }),
-    ],
-    { mode: "oneOf" },
-  );
-
-export type ExecCommandApprovalResponse__ReviewDecision =
-  | "approved"
-  | {
-      readonly approved_execpolicy_amendment: {
-        readonly proposed_execpolicy_amendment: ReadonlyArray<string>;
-      };
-    }
-  | "approved_for_session"
-  | {
-      readonly network_policy_amendment: {
-        readonly network_policy_amendment: ExecCommandApprovalResponse__NetworkPolicyAmendment;
-      };
-    }
-  | "denied"
-  | "timed_out"
-  | "abort";
-export const ExecCommandApprovalResponse__ReviewDecision = Schema.Union(
-  [
-    Schema.Literal("approved").annotate({
-      description: "User has approved this command and the agent should execute it.",
-    }),
-    Schema.Struct({
-      approved_execpolicy_amendment: Schema.Struct({
-        proposed_execpolicy_amendment: Schema.Array(Schema.String),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ItemCompletedNotification__CollabAgentToolCallStatus> =>
+          V2ItemCompletedNotification__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ItemCompletedNotification__CollabAgentTool> =>
+          V2ItemCompletedNotification__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
+      type: Schema.Literal("collabAgentToolCall").annotate({
+        title: "CollabAgentToolCallThreadItemType",
       }),
-    }).annotate({
-      title: "ApprovedExecpolicyAmendmentReviewDecision",
-      description:
-        "User has approved this command and wants to apply the proposed execpolicy amendment so future matching commands are permitted.",
-    }),
-    Schema.Literal("approved_for_session").annotate({
-      description:
-        "User has approved this request and wants future prompts in the same session-scoped approval cache to be automatically approved for the remainder of the session.",
-    }),
+    }).annotate({ title: "CollabAgentToolCallThreadItem" }),
     Schema.Struct({
-      network_policy_amendment: Schema.Struct({
-        network_policy_amendment: ExecCommandApprovalResponse__NetworkPolicyAmendment,
+      agentPath: Schema.String,
+      agentThreadId: Schema.String,
+      id: Schema.String,
+      kind: V2ItemCompletedNotification__SubAgentActivityKind,
+      type: Schema.Literal("subAgentActivity").annotate({
+        title: "SubAgentActivityThreadItemType",
       }),
-    }).annotate({
-      title: "NetworkPolicyAmendmentReviewDecision",
-      description:
-        "User chose to persist a network policy rule (allow/deny) for future requests to the same host.",
-    }),
-    Schema.Literal("denied").annotate({
-      description:
-        "User has denied this command and the agent should not execute it, but it should continue the session and try something else.",
-    }),
-    Schema.Literal("timed_out").annotate({
-      description: "Automatic approval review timed out before reaching a decision.",
-    }),
-    Schema.Literal("abort").annotate({
-      description:
-        "User has denied this command and the agent should not do anything until the user's next command.",
-    }),
-  ],
-  { mode: "oneOf" },
-).annotate({ description: "User's decision in response to an ExecApprovalRequest." });
-
-export type McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema = {
-  readonly default?: ReadonlyArray<string> | null;
-  readonly description?: string | null;
-  readonly items: McpServerElicitationRequestParams__McpElicitationTitledEnumItems;
-  readonly maxItems?: number | null;
-  readonly minItems?: number | null;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationArrayType;
-};
-export const McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema =
-  Schema.Struct({
-    default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    items: McpServerElicitationRequestParams__McpElicitationTitledEnumItems,
-    maxItems: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint64" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-        Schema.Null,
-      ]),
-    ),
-    minItems: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint64" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-        Schema.Null,
-      ]),
-    ),
-    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    type: McpServerElicitationRequestParams__McpElicitationArrayType,
-  });
-
-export type McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema = {
-  readonly default?: ReadonlyArray<string> | null;
-  readonly description?: string | null;
-  readonly items: McpServerElicitationRequestParams__McpElicitationUntitledEnumItems;
-  readonly maxItems?: number | null;
-  readonly minItems?: number | null;
-  readonly title?: string | null;
-  readonly type: McpServerElicitationRequestParams__McpElicitationArrayType;
-};
-export const McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema =
-  Schema.Struct({
-    default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-    description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    items: McpServerElicitationRequestParams__McpElicitationUntitledEnumItems,
-    maxItems: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint64" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-        Schema.Null,
-      ]),
-    ),
-    minItems: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint64" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
-        Schema.Null,
-      ]),
-    ),
-    title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    type: McpServerElicitationRequestParams__McpElicitationArrayType,
-  });
-
-export type McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema =
-  | McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema
-  | McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema;
-export const McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema = Schema.Union(
-  [
-    McpServerElicitationRequestParams__McpElicitationUntitledSingleSelectEnumSchema,
-    McpServerElicitationRequestParams__McpElicitationTitledSingleSelectEnumSchema,
-  ],
-);
-
-export type PermissionsRequestApprovalParams__FileSystemPath =
-  | { readonly path: PermissionsRequestApprovalParams__LegacyAppPathString; readonly type: "path" }
-  | { readonly pattern: string; readonly type: "glob_pattern" }
-  | {
-      readonly type: "special";
-      readonly value: PermissionsRequestApprovalParams__FileSystemSpecialPath;
-    };
-export const PermissionsRequestApprovalParams__FileSystemPath = Schema.Union(
-  [
-    Schema.Struct({
-      path: PermissionsRequestApprovalParams__LegacyAppPathString,
-      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
-    }).annotate({ title: "PathFileSystemPath" }),
-    Schema.Struct({
-      pattern: Schema.String,
-      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
-    }).annotate({ title: "GlobPatternFileSystemPath" }),
-    Schema.Struct({
-      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
-      value: PermissionsRequestApprovalParams__FileSystemSpecialPath,
-    }).annotate({ title: "SpecialFileSystemPath" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type PermissionsRequestApprovalResponse__FileSystemPath =
-  | {
-      readonly path: PermissionsRequestApprovalResponse__LegacyAppPathString;
-      readonly type: "path";
-    }
-  | { readonly pattern: string; readonly type: "glob_pattern" }
-  | {
-      readonly type: "special";
-      readonly value: PermissionsRequestApprovalResponse__FileSystemSpecialPath;
-    };
-export const PermissionsRequestApprovalResponse__FileSystemPath = Schema.Union(
-  [
+    }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
-      path: PermissionsRequestApprovalResponse__LegacyAppPathString,
-      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
-    }).annotate({ title: "PathFileSystemPath" }),
+      action: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__WebSearchAction, Schema.Null]),
+      ),
+      id: Schema.String,
+      query: Schema.String,
+      results: Schema.optionalKey(
+        Schema.Union([
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
+            description:
+              "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("webSearch").annotate({ title: "WebSearchThreadItemType" }),
+    }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
-      pattern: Schema.String,
-      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
-    }).annotate({ title: "GlobPatternFileSystemPath" }),
+      id: Schema.String,
+      path: V2ItemCompletedNotification__LegacyAppPathString,
+      type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
+    }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
-      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
-      value: PermissionsRequestApprovalResponse__FileSystemSpecialPath,
-    }).annotate({ title: "SpecialFileSystemPath" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type ServerNotification__AppInfo = {
-  readonly appMetadata?: ServerNotification__AppMetadata | null;
-  readonly branding?: ServerNotification__AppBranding | null;
-  readonly description?: string | null;
-  readonly distributionChannel?: string | null;
-  readonly iconAssets?: { readonly [x: string]: string } | null;
-  readonly iconDarkAssets?: { readonly [x: string]: string } | null;
-  readonly id: string;
-  readonly installUrl?: string | null;
-  readonly isAccessible?: boolean;
-  readonly isEnabled?: boolean;
-  readonly labels?: { readonly [x: string]: string } | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly name: string;
-  readonly pluginDisplayNames?: ReadonlyArray<string>;
-};
-export const ServerNotification__AppInfo = Schema.Struct({
-  appMetadata: Schema.optionalKey(Schema.Union([ServerNotification__AppMetadata, Schema.Null])),
-  branding: Schema.optionalKey(Schema.Union([ServerNotification__AppBranding, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  distributionChannel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  iconAssets: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  iconDarkAssets: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  id: Schema.String,
-  installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  isAccessible: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  isEnabled: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description:
-        "Whether this app is enabled in config.toml. Example: ```toml [apps.bad_app] enabled = false ```",
-      default: true,
+      durationMs: Schema.Number.annotate({ format: "uint64" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      id: Schema.String,
+      type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
+    }).annotate({
+      title: "SleepThreadItem",
+      description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
-  ),
-  labels: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  name: Schema.String,
-  pluginDisplayNames: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-}).annotate({ description: "EXPERIMENTAL - app metadata returned by app-list APIs." });
-
-export type ServerNotification__ExternalAgentConfigImportTypeResult = {
-  readonly failures: ReadonlyArray<ServerNotification__ExternalAgentConfigImportItemTypeFailure>;
-  readonly itemType: ServerNotification__ExternalAgentConfigMigrationItemType;
-  readonly successes: ReadonlyArray<ServerNotification__ExternalAgentConfigImportItemTypeSuccess>;
-};
-export const ServerNotification__ExternalAgentConfigImportTypeResult = Schema.Struct({
-  failures: Schema.Array(ServerNotification__ExternalAgentConfigImportItemTypeFailure),
-  itemType: ServerNotification__ExternalAgentConfigMigrationItemType,
-  successes: Schema.Array(ServerNotification__ExternalAgentConfigImportItemTypeSuccess),
-});
-
-export type ServerNotification__FuzzyFileSearchSessionUpdatedNotification = {
-  readonly files: ReadonlyArray<ServerNotification__FuzzyFileSearchResult>;
-  readonly query: string;
-  readonly sessionId: string;
-};
-export const ServerNotification__FuzzyFileSearchSessionUpdatedNotification = Schema.Struct({
-  files: Schema.Array(ServerNotification__FuzzyFileSearchResult),
-  query: Schema.String,
-  sessionId: Schema.String,
-});
-
-export type ServerNotification__HookRunSummary = {
-  readonly completedAt?: number | null;
-  readonly displayOrder: number;
-  readonly durationMs?: number | null;
-  readonly entries: ReadonlyArray<ServerNotification__HookOutputEntry>;
-  readonly eventName: ServerNotification__HookEventName;
-  readonly executionMode: ServerNotification__HookExecutionMode;
-  readonly handlerType: ServerNotification__HookHandlerType;
-  readonly id: string;
-  readonly scope: ServerNotification__HookScope;
-  readonly source?:
-    | "system"
-    | "user"
-    | "project"
-    | "mdm"
-    | "sessionFlags"
-    | "plugin"
-    | "cloudRequirements"
-    | "cloudManagedConfig"
-    | "legacyManagedConfigFile"
-    | "legacyManagedConfigMdm"
-    | "unknown";
-  readonly sourcePath: ServerNotification__AbsolutePathBuf;
-  readonly startedAt: number;
-  readonly status: ServerNotification__HookRunStatus;
-  readonly statusMessage?: string | null;
-};
-export const ServerNotification__HookRunSummary = Schema.Struct({
-  completedAt: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  displayOrder: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  durationMs: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  entries: Schema.Array(ServerNotification__HookOutputEntry),
-  eventName: ServerNotification__HookEventName,
-  executionMode: ServerNotification__HookExecutionMode,
-  handlerType: ServerNotification__HookHandlerType,
-  id: Schema.String,
-  scope: ServerNotification__HookScope,
-  source: Schema.optionalKey(
-    Schema.Literals([
-      "system",
-      "user",
-      "project",
-      "mdm",
-      "sessionFlags",
-      "plugin",
-      "cloudRequirements",
-      "cloudManagedConfig",
-      "legacyManagedConfigFile",
-      "legacyManagedConfigMdm",
-      "unknown",
-    ]).annotate({ default: "unknown" }),
-  ),
-  sourcePath: ServerNotification__AbsolutePathBuf,
-  startedAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  status: ServerNotification__HookRunStatus,
-  statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type ServerNotification__FileSystemPath =
-  | { readonly path: ServerNotification__LegacyAppPathString; readonly type: "path" }
-  | { readonly pattern: string; readonly type: "glob_pattern" }
-  | { readonly type: "special"; readonly value: ServerNotification__FileSystemSpecialPath };
-export const ServerNotification__FileSystemPath = Schema.Union(
-  [
     Schema.Struct({
-      path: ServerNotification__LegacyAppPathString,
-      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
-    }).annotate({ title: "PathFileSystemPath" }),
+      failure: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__ImageGenerationFailure, Schema.Null]),
+      ),
+      id: Schema.String,
+      result: Schema.String,
+      revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      savedPath: Schema.optionalKey(
+        Schema.Union([V2ItemCompletedNotification__AbsolutePathBuf, Schema.Null]),
+      ),
+      status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+      type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+    }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
-      pattern: Schema.String,
-      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
-    }).annotate({ title: "GlobPatternFileSystemPath" }),
+      id: Schema.String,
+      review: Schema.String,
+      type: Schema.Literal("enteredReviewMode").annotate({
+        title: "EnteredReviewModeThreadItemType",
+      }),
+    }).annotate({ title: "EnteredReviewModeThreadItem" }),
     Schema.Struct({
-      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
-      value: ServerNotification__FileSystemSpecialPath,
-    }).annotate({ title: "SpecialFileSystemPath" }),
+      id: Schema.String,
+      review: Schema.String,
+      type: Schema.Literal("exitedReviewMode").annotate({
+        title: "ExitedReviewModeThreadItemType",
+      }),
+    }).annotate({ title: "ExitedReviewModeThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      type: Schema.Literal("contextCompaction").annotate({
+        title: "ContextCompactionThreadItemType",
+      }),
+    }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type ServerNotification__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: ServerNotification__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const ServerNotification__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([ServerNotification__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
-
-export type ServerNotification__FileChangePatchUpdatedNotification = {
-  readonly changes: ReadonlyArray<ServerNotification__FileUpdateChange>;
-  readonly itemId: string;
-  readonly threadId: string;
-  readonly turnId: string;
-};
-export const ServerNotification__FileChangePatchUpdatedNotification = Schema.Struct({
-  changes: Schema.Array(ServerNotification__FileUpdateChange),
-  itemId: Schema.String,
-  threadId: Schema.String,
-  turnId: Schema.String,
-});
+).annotate({ identifier: "V2ItemCompletedNotification__ThreadItem" });
 
-export type ServerNotification__CollaborationMode = {
-  readonly mode: ServerNotification__ModeKind;
-  readonly settings: ServerNotification__Settings;
+export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry = {
+  readonly access: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode;
+  readonly path: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath;
 };
-export const ServerNotification__CollaborationMode = Schema.Struct({
-  mode: ServerNotification__ModeKind,
-  settings: ServerNotification__Settings,
-}).annotate({ description: "Collaboration mode for a Codex session." });
+export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry =
+  Schema.Struct({
+    access: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode,
+    path: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath,
+  }).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry",
+  });
 
-export type ServerNotification__AccountRateLimitsUpdatedNotification = {
-  readonly rateLimits: ServerNotification__RateLimitSnapshot;
+export type V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry = {
+  readonly access: V2ItemGuardianApprovalReviewStartedNotification__FileSystemAccessMode;
+  readonly path: V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath;
 };
-export const ServerNotification__AccountRateLimitsUpdatedNotification = Schema.Struct({
-  rateLimits: ServerNotification__RateLimitSnapshot,
-}).annotate({
-  description:
-    "Sparse rolling rate-limit update.\n\nClients should merge available values into the most recent `account/rateLimits/read` response or refetch that snapshot. Nullable account metadata may be unavailable in a rolling update and does not clear a previously observed value.",
-});
+export const V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry =
+  Schema.Struct({
+    access: V2ItemGuardianApprovalReviewStartedNotification__FileSystemAccessMode,
+    path: V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath,
+  }).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry",
+  });
 
-export type ServerNotification__ThreadItem =
+export type V2ItemStartedNotification__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<ServerNotification__UserInput>;
+      readonly content: ReadonlyArray<V2ItemStartedNotification__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<ServerNotification__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ItemStartedNotification__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ItemStartedNotification__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: ServerNotification__MemoryCitation | null;
-      readonly phase?: ServerNotification__MessagePhase | null;
+      readonly memoryCitation?: V2ItemStartedNotification__MemoryCitation | null;
+      readonly phase?: V2ItemStartedNotification__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ItemStartedNotification__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ItemStartedNotification__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -20442,133 +34447,138 @@ export type ServerNotification__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<ServerNotification__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ItemStartedNotification__CommandAction>;
+      readonly cwd: V2ItemStartedNotification__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: ServerNotification__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ItemStartedNotification__CommandExecutionSource;
+      readonly status: V2ItemStartedNotification__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<ServerNotification__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ItemStartedNotification__FileUpdateChange>;
       readonly id: string;
-      readonly status: ServerNotification__PatchApplyStatus;
+      readonly status: V2ItemStartedNotification__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: ServerNotification__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ItemStartedNotification__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: ServerNotification__McpToolCallError | null;
+      readonly error?: V2ItemStartedNotification__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ItemStartedNotification__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: ServerNotification__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ItemStartedNotification__McpToolCallResult | null;
       readonly server: string;
-      readonly status: ServerNotification__McpToolCallStatus;
+      readonly status: V2ItemStartedNotification__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<ServerNotification__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ItemStartedNotification__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: ServerNotification__DynamicToolCallStatus;
+      readonly status: V2ItemStartedNotification__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: ServerNotification__CollabAgentState };
+      readonly agentsStates: { readonly [x: string]: V2ItemStartedNotification__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: ServerNotification__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ItemStartedNotification__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ItemStartedNotification__CollabAgentToolCallStatus;
+      readonly tool: V2ItemStartedNotification__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: ServerNotification__SubAgentActivityKind;
+      readonly kind: V2ItemStartedNotification__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: ServerNotification__WebSearchAction | null;
+      readonly action?: V2ItemStartedNotification__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: ServerNotification__LegacyAppPathString;
+      readonly path: V2ItemStartedNotification__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ItemStartedNotification__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: ServerNotification__AbsolutePathBuf | null;
+      readonly savedPath?: V2ItemStartedNotification__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const ServerNotification__ThreadItem = Schema.Union(
+export const V2ItemStartedNotification__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(ServerNotification__UserInput),
+      content: Schema.Array(V2ItemStartedNotification__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(ServerNotification__HookPromptFragment),
+      fragments: Schema.Array(V2ItemStartedNotification__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ItemStartedNotification__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([ServerNotification__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ItemStartedNotification__MemoryCitation, Schema.Null]),
+      ),
+      phase: Schema.optionalKey(
+        Schema.Union([V2ItemStartedNotification__MessagePhase, Schema.Null]),
       ),
-      phase: Schema.optionalKey(Schema.Union([ServerNotification__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2ItemStartedNotification__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ItemStartedNotification__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -20594,17 +34604,20 @@ export const ServerNotification__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(ServerNotification__CommandAction).annotate({
+      commandActions: Schema.Array(V2ItemStartedNotification__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ItemStartedNotification__LegacyAppPathString> =>
+          V2ItemStartedNotification__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -20613,11 +34626,20 @@ export const ServerNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -20626,63 +34648,80 @@ export const ServerNotification__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ItemStartedNotification__CommandExecutionSource> =>
+            V2ItemStartedNotification__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: ServerNotification__CommandExecutionStatus,
+      status: V2ItemStartedNotification__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(ServerNotification__FileUpdateChange),
+      changes: Schema.Array(V2ItemStartedNotification__FileUpdateChange),
       id: Schema.String,
-      status: ServerNotification__PatchApplyStatus,
+      status: V2ItemStartedNotification__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([ServerNotification__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ItemStartedNotification__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
-      error: Schema.optionalKey(Schema.Union([ServerNotification__McpToolCallError, Schema.Null])),
+      error: Schema.optionalKey(
+        Schema.Union([V2ItemStartedNotification__McpToolCallError, Schema.Null]),
+      ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ItemStartedNotification__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([ServerNotification__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ItemStartedNotification__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: ServerNotification__McpToolCallStatus,
+      status: V2ItemStartedNotification__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(ServerNotification__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ItemStartedNotification__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -20691,21 +34730,22 @@ export const ServerNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: ServerNotification__DynamicToolCallStatus,
+      status: V2ItemStartedNotification__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(Schema.String, ServerNotification__CollabAgentState).annotate({
-        description: "Last known status of the target agents, when available.",
-      }),
+      agentsStates: Schema.Record(
+        Schema.String,
+        V2ItemStartedNotification__CollabAgentState,
+      ).annotate({ description: "Last known status of the target agents, when available." }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -20724,7 +34764,7 @@ export const ServerNotification__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([ServerNotification__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ItemStartedNotification__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -20735,20 +34775,14 @@ export const ServerNotification__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ItemStartedNotification__CollabAgentToolCallStatus> =>
+          V2ItemStartedNotification__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ItemStartedNotification__CollabAgentTool> =>
+          V2ItemStartedNotification__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -20757,18 +34791,20 @@ export const ServerNotification__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: ServerNotification__SubAgentActivityKind,
+      kind: V2ItemStartedNotification__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
-      action: Schema.optionalKey(Schema.Union([ServerNotification__WebSearchAction, Schema.Null])),
+      action: Schema.optionalKey(
+        Schema.Union([V2ItemStartedNotification__WebSearchAction, Schema.Null]),
+      ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -20779,13 +34815,17 @@ export const ServerNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: ServerNotification__LegacyAppPathString,
+      path: V2ItemStartedNotification__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -20793,13 +34833,17 @@ export const ServerNotification__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ItemStartedNotification__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([ServerNotification__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ItemStartedNotification__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -20824,725 +34868,794 @@ export const ServerNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ItemStartedNotification__ThreadItem" });
 
-export type ServerNotification__ConfigWarningNotification = {
-  readonly details?: string | null;
-  readonly path?: string | null;
-  readonly range?: ServerNotification__TextRange | null;
-  readonly summary: string;
+export type V2PluginInstalledResponse__PluginSummary = {
+  readonly authPolicy: V2PluginInstalledResponse__PluginAuthPolicy;
+  readonly availability?: V2PluginInstalledResponse__PluginAvailability;
+  readonly disabledReason?: V2PluginInstalledResponse__PluginDisabledReason | null;
+  readonly eligiblePlanTypes?: ReadonlyArray<string> | null;
+  readonly enabled: boolean;
+  readonly id: string;
+  readonly installPolicy: V2PluginInstalledResponse__PluginInstallPolicy;
+  readonly installPolicySource?: V2PluginInstalledResponse__PluginInstallPolicySource | null;
+  readonly installed: boolean;
+  readonly installedAt?: number | null;
+  readonly interface?: V2PluginInstalledResponse__PluginInterface | null;
+  readonly keywords?: ReadonlyArray<string>;
+  readonly localVersion?: string | null;
+  readonly mustShowInstallationInterstitial?: boolean | null;
+  readonly name: string;
+  readonly remotePluginId?: string | null;
+  readonly shareContext?: V2PluginInstalledResponse__PluginShareContext | null;
+  readonly source: V2PluginInstalledResponse__PluginSource;
+  readonly version?: string | null;
 };
-export const ServerNotification__ConfigWarningNotification = Schema.Struct({
-  details: Schema.optionalKey(
+export const V2PluginInstalledResponse__PluginSummary = Schema.Struct({
+  authPolicy: V2PluginInstalledResponse__PluginAuthPolicy,
+  availability: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2PluginInstalledResponse__PluginAvailability> =>
+        V2PluginInstalledResponse__PluginAvailability,
+    ).annotate({
+      description: "Availability state for installing and using the plugin.",
+      default: "AVAILABLE",
+    }),
+  ),
+  disabledReason: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__PluginDisabledReason, Schema.Null]).annotate({
+      description: "Why the remote plugin is unavailable, when provided by plugin-service.",
+    }),
+  ),
+  eligiblePlanTypes: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Optional extra guidance or error details." }),
+      Schema.Array(Schema.String).annotate({
+        description: "Raw plugin-service plan identifiers eligible to install the plugin.",
+      }),
       Schema.Null,
     ]),
   ),
-  path: Schema.optionalKey(
+  enabled: Schema.Boolean,
+  id: Schema.String,
+  installPolicy: V2PluginInstalledResponse__PluginInstallPolicy,
+  installPolicySource: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__PluginInstallPolicySource, Schema.Null]),
+  ),
+  installed: Schema.Boolean,
+  installedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Unix timestamp in seconds when the remote plugin was installed, when available.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  interface: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__PluginInterface, Schema.Null]),
+  ),
+  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+  localVersion: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional path to the config file that triggered the warning.",
+        description: "Version of the locally materialized plugin package when available.",
       }),
       Schema.Null,
     ]),
   ),
-  range: Schema.optionalKey(
-    Schema.Union([ServerNotification__TextRange, Schema.Null]).annotate({
-      description: "Optional range for the error location inside the config file.",
+  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  name: Schema.String,
+  remotePluginId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
+      Schema.Null,
+    ]),
+  ),
+  shareContext: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__PluginShareContext, Schema.Null]).annotate({
+      description: "Remote sharing context associated with this plugin when available.",
     }),
   ),
-  summary: Schema.String.annotate({ description: "Concise summary of the warning." }),
-});
-
-export type ServerNotification__ThreadStatusChangedNotification = {
-  readonly status: ServerNotification__ThreadStatus;
-  readonly threadId: string;
-};
-export const ServerNotification__ThreadStatusChangedNotification = Schema.Struct({
-  status: ServerNotification__ThreadStatus,
-  threadId: Schema.String,
-});
-
-export type ServerNotification__ThreadGoalUpdatedNotification = {
-  readonly goal: ServerNotification__ThreadGoal;
-  readonly threadId: string;
-  readonly turnId?: string | null;
-};
-export const ServerNotification__ThreadGoalUpdatedNotification = Schema.Struct({
-  goal: ServerNotification__ThreadGoal,
-  threadId: Schema.String,
-  turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type ServerNotification__ThreadTokenUsageUpdatedNotification = {
-  readonly threadId: string;
-  readonly tokenUsage: ServerNotification__ThreadTokenUsage;
-  readonly turnId: string;
-};
-export const ServerNotification__ThreadTokenUsageUpdatedNotification = Schema.Struct({
-  threadId: Schema.String,
-  tokenUsage: ServerNotification__ThreadTokenUsage,
-  turnId: Schema.String,
-});
-
-export type ServerNotification__TurnPlanUpdatedNotification = {
-  readonly explanation?: string | null;
-  readonly plan: ReadonlyArray<ServerNotification__TurnPlanStep>;
-  readonly threadId: string;
-  readonly turnId: string;
-};
-export const ServerNotification__TurnPlanUpdatedNotification = Schema.Struct({
-  explanation: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  plan: Schema.Array(ServerNotification__TurnPlanStep),
-  threadId: Schema.String,
-  turnId: Schema.String,
-});
-
-export type ServerRequest__FileSystemPath =
-  | { readonly path: ServerRequest__LegacyAppPathString; readonly type: "path" }
-  | { readonly pattern: string; readonly type: "glob_pattern" }
-  | { readonly type: "special"; readonly value: ServerRequest__FileSystemSpecialPath };
-export const ServerRequest__FileSystemPath = Schema.Union(
-  [
-    Schema.Struct({
-      path: ServerRequest__LegacyAppPathString,
-      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
-    }).annotate({ title: "PathFileSystemPath" }),
-    Schema.Struct({
-      pattern: Schema.String,
-      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
-    }).annotate({ title: "GlobPatternFileSystemPath" }),
-    Schema.Struct({
-      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
-      value: ServerRequest__FileSystemSpecialPath,
-    }).annotate({ title: "SpecialFileSystemPath" }),
-  ],
-  { mode: "oneOf" },
-);
+  source: V2PluginInstalledResponse__PluginSource,
+  version: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Version advertised by the remote marketplace backend when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2PluginInstalledResponse__PluginSummary" });
 
-export type ServerRequest__McpElicitationTitledMultiSelectEnumSchema = {
-  readonly default?: ReadonlyArray<string> | null;
-  readonly description?: string | null;
-  readonly items: ServerRequest__McpElicitationTitledEnumItems;
-  readonly maxItems?: number | null;
-  readonly minItems?: number | null;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationArrayType;
+export type V2PluginListResponse__PluginSummary = {
+  readonly authPolicy: V2PluginListResponse__PluginAuthPolicy;
+  readonly availability?: V2PluginListResponse__PluginAvailability;
+  readonly disabledReason?: V2PluginListResponse__PluginDisabledReason | null;
+  readonly eligiblePlanTypes?: ReadonlyArray<string> | null;
+  readonly enabled: boolean;
+  readonly id: string;
+  readonly installPolicy: V2PluginListResponse__PluginInstallPolicy;
+  readonly installPolicySource?: V2PluginListResponse__PluginInstallPolicySource | null;
+  readonly installed: boolean;
+  readonly installedAt?: number | null;
+  readonly interface?: V2PluginListResponse__PluginInterface | null;
+  readonly keywords?: ReadonlyArray<string>;
+  readonly localVersion?: string | null;
+  readonly mustShowInstallationInterstitial?: boolean | null;
+  readonly name: string;
+  readonly remotePluginId?: string | null;
+  readonly shareContext?: V2PluginListResponse__PluginShareContext | null;
+  readonly source: V2PluginListResponse__PluginSource;
+  readonly version?: string | null;
 };
-export const ServerRequest__McpElicitationTitledMultiSelectEnumSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  items: ServerRequest__McpElicitationTitledEnumItems,
-  maxItems: Schema.optionalKey(
+export const V2PluginListResponse__PluginSummary = Schema.Struct({
+  authPolicy: V2PluginListResponse__PluginAuthPolicy,
+  availability: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2PluginListResponse__PluginAvailability> =>
+        V2PluginListResponse__PluginAvailability,
+    ).annotate({
+      description: "Availability state for installing and using the plugin.",
+      default: "AVAILABLE",
+    }),
+  ),
+  disabledReason: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__PluginDisabledReason, Schema.Null]).annotate({
+      description: "Why the remote plugin is unavailable, when provided by plugin-service.",
+    }),
+  ),
+  eligiblePlanTypes: Schema.optionalKey(
     Schema.Union([
-      Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+      Schema.Array(Schema.String).annotate({
+        description: "Raw plugin-service plan identifiers eligible to install the plugin.",
+      }),
       Schema.Null,
     ]),
   ),
-  minItems: Schema.optionalKey(
+  enabled: Schema.Boolean,
+  id: Schema.String,
+  installPolicy: V2PluginListResponse__PluginInstallPolicy,
+  installPolicySource: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__PluginInstallPolicySource, Schema.Null]),
+  ),
+  installed: Schema.Boolean,
+  installedAt: Schema.optionalKey(
     Schema.Union([
-      Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+      Schema.Number.annotate({
+        description:
+          "Unix timestamp in seconds when the remote plugin was installed, when available.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationArrayType,
-});
-
-export type ServerRequest__McpElicitationUntitledMultiSelectEnumSchema = {
-  readonly default?: ReadonlyArray<string> | null;
-  readonly description?: string | null;
-  readonly items: ServerRequest__McpElicitationUntitledEnumItems;
-  readonly maxItems?: number | null;
-  readonly minItems?: number | null;
-  readonly title?: string | null;
-  readonly type: ServerRequest__McpElicitationArrayType;
-};
-export const ServerRequest__McpElicitationUntitledMultiSelectEnumSchema = Schema.Struct({
-  default: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  items: ServerRequest__McpElicitationUntitledEnumItems,
-  maxItems: Schema.optionalKey(
+  interface: Schema.optionalKey(Schema.Union([V2PluginListResponse__PluginInterface, Schema.Null])),
+  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+  localVersion: Schema.optionalKey(
     Schema.Union([
-      Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+      Schema.String.annotate({
+        description: "Version of the locally materialized plugin package when available.",
+      }),
       Schema.Null,
     ]),
   ),
-  minItems: Schema.optionalKey(
+  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  name: Schema.String,
+  remotePluginId: Schema.optionalKey(
     Schema.Union([
-      Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
       Schema.Null,
     ]),
   ),
-  title: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  type: ServerRequest__McpElicitationArrayType,
-});
-
-export type ServerRequest__McpElicitationSingleSelectEnumSchema =
-  | ServerRequest__McpElicitationUntitledSingleSelectEnumSchema
-  | ServerRequest__McpElicitationTitledSingleSelectEnumSchema;
-export const ServerRequest__McpElicitationSingleSelectEnumSchema = Schema.Union([
-  ServerRequest__McpElicitationUntitledSingleSelectEnumSchema,
-  ServerRequest__McpElicitationTitledSingleSelectEnumSchema,
-]);
+  shareContext: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__PluginShareContext, Schema.Null]).annotate({
+      description: "Remote sharing context associated with this plugin when available.",
+    }),
+  ),
+  source: V2PluginListResponse__PluginSource,
+  version: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Version advertised by the remote marketplace backend when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2PluginListResponse__PluginSummary" });
 
-export type ServerRequest__CommandExecutionRequestApprovalParams = {
-  readonly approvalId?: string | null;
-  readonly command?: string | null;
-  readonly commandActions?: ReadonlyArray<ServerRequest__CommandAction> | null;
-  readonly cwd?: ServerRequest__LegacyAppPathString | null;
-  readonly environmentId?: string | null;
-  readonly itemId: string;
-  readonly networkApprovalContext?: ServerRequest__NetworkApprovalContext | null;
-  readonly proposedExecpolicyAmendment?: ReadonlyArray<string> | null;
-  readonly proposedNetworkPolicyAmendments?: ReadonlyArray<ServerRequest__NetworkPolicyAmendment> | null;
-  readonly reason?: string | null;
-  readonly startedAtMs: number;
-  readonly threadId: string;
-  readonly turnId: string;
+export type V2PluginReadResponse__PluginSummary = {
+  readonly authPolicy: V2PluginReadResponse__PluginAuthPolicy;
+  readonly availability?: V2PluginReadResponse__PluginAvailability;
+  readonly disabledReason?: V2PluginReadResponse__PluginDisabledReason | null;
+  readonly eligiblePlanTypes?: ReadonlyArray<string> | null;
+  readonly enabled: boolean;
+  readonly id: string;
+  readonly installPolicy: V2PluginReadResponse__PluginInstallPolicy;
+  readonly installPolicySource?: V2PluginReadResponse__PluginInstallPolicySource | null;
+  readonly installed: boolean;
+  readonly installedAt?: number | null;
+  readonly interface?: V2PluginReadResponse__PluginInterface | null;
+  readonly keywords?: ReadonlyArray<string>;
+  readonly localVersion?: string | null;
+  readonly mustShowInstallationInterstitial?: boolean | null;
+  readonly name: string;
+  readonly remotePluginId?: string | null;
+  readonly shareContext?: V2PluginReadResponse__PluginShareContext | null;
+  readonly source: V2PluginReadResponse__PluginSource;
+  readonly version?: string | null;
 };
-export const ServerRequest__CommandExecutionRequestApprovalParams = Schema.Struct({
-  approvalId: Schema.optionalKey(
+export const V2PluginReadResponse__PluginSummary = Schema.Struct({
+  authPolicy: V2PluginReadResponse__PluginAuthPolicy,
+  availability: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2PluginReadResponse__PluginAvailability> =>
+        V2PluginReadResponse__PluginAvailability,
+    ).annotate({
+      description: "Availability state for installing and using the plugin.",
+      default: "AVAILABLE",
+    }),
+  ),
+  disabledReason: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__PluginDisabledReason, Schema.Null]).annotate({
+      description: "Why the remote plugin is unavailable, when provided by plugin-service.",
+    }),
+  ),
+  eligiblePlanTypes: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({
+      Schema.Array(Schema.String).annotate({
+        description: "Raw plugin-service plan identifiers eligible to install the plugin.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  enabled: Schema.Boolean,
+  id: Schema.String,
+  installPolicy: V2PluginReadResponse__PluginInstallPolicy,
+  installPolicySource: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__PluginInstallPolicySource, Schema.Null]),
+  ),
+  installed: Schema.Boolean,
+  installedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
         description:
-          "Unique identifier for this specific approval callback.\n\nFor regular shell/unified_exec approvals, this is null.\n\nFor zsh-exec-bridge subcommand approvals, multiple callbacks can belong to one parent `itemId`, so `approvalId` is a distinct opaque callback id (a UUID) used to disambiguate routing.",
+          "Unix timestamp in seconds when the remote plugin was installed, when available.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  interface: Schema.optionalKey(Schema.Union([V2PluginReadResponse__PluginInterface, Schema.Null])),
+  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+  localVersion: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Version of the locally materialized plugin package when available.",
       }),
       Schema.Null,
     ]),
   ),
-  command: Schema.optionalKey(
+  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  name: Schema.String,
+  remotePluginId: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "The command to be executed." }),
+      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
       Schema.Null,
     ]),
   ),
-  commandActions: Schema.optionalKey(
+  shareContext: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__PluginShareContext, Schema.Null]).annotate({
+      description: "Remote sharing context associated with this plugin when available.",
+    }),
+  ),
+  source: V2PluginReadResponse__PluginSource,
+  version: Schema.optionalKey(
     Schema.Union([
-      Schema.Array(ServerRequest__CommandAction).annotate({
-        description: "Best-effort parsed command actions for friendly display.",
+      Schema.String.annotate({
+        description: "Version advertised by the remote marketplace backend when available.",
       }),
       Schema.Null,
     ]),
   ),
-  cwd: Schema.optionalKey(
-    Schema.Union([ServerRequest__LegacyAppPathString, Schema.Null]).annotate({
-      description: "The command's working directory.",
+}).annotate({ identifier: "V2PluginReadResponse__PluginSummary" });
+
+export type V2PluginShareListResponse__PluginSummary = {
+  readonly authPolicy: V2PluginShareListResponse__PluginAuthPolicy;
+  readonly availability?: V2PluginShareListResponse__PluginAvailability;
+  readonly disabledReason?: V2PluginShareListResponse__PluginDisabledReason | null;
+  readonly eligiblePlanTypes?: ReadonlyArray<string> | null;
+  readonly enabled: boolean;
+  readonly id: string;
+  readonly installPolicy: V2PluginShareListResponse__PluginInstallPolicy;
+  readonly installPolicySource?: V2PluginShareListResponse__PluginInstallPolicySource | null;
+  readonly installed: boolean;
+  readonly installedAt?: number | null;
+  readonly interface?: V2PluginShareListResponse__PluginInterface | null;
+  readonly keywords?: ReadonlyArray<string>;
+  readonly localVersion?: string | null;
+  readonly mustShowInstallationInterstitial?: boolean | null;
+  readonly name: string;
+  readonly remotePluginId?: string | null;
+  readonly shareContext?: V2PluginShareListResponse__PluginShareContext | null;
+  readonly source: V2PluginShareListResponse__PluginSource;
+  readonly version?: string | null;
+};
+export const V2PluginShareListResponse__PluginSummary = Schema.Struct({
+  authPolicy: V2PluginShareListResponse__PluginAuthPolicy,
+  availability: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2PluginShareListResponse__PluginAvailability> =>
+        V2PluginShareListResponse__PluginAvailability,
+    ).annotate({
+      description: "Availability state for installing and using the plugin.",
+      default: "AVAILABLE",
     }),
   ),
-  environmentId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({ description: "Environment in which the command will run." }),
-      Schema.Null,
-    ]),
-  ),
-  itemId: Schema.String,
-  networkApprovalContext: Schema.optionalKey(
-    Schema.Union([ServerRequest__NetworkApprovalContext, Schema.Null]).annotate({
-      description: "Optional context for a managed-network approval prompt.",
+  disabledReason: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__PluginDisabledReason, Schema.Null]).annotate({
+      description: "Why the remote plugin is unavailable, when provided by plugin-service.",
     }),
   ),
-  proposedExecpolicyAmendment: Schema.optionalKey(
+  eligiblePlanTypes: Schema.optionalKey(
     Schema.Union([
       Schema.Array(Schema.String).annotate({
-        description:
-          "Optional proposed execpolicy amendment to allow similar commands without prompting.",
+        description: "Raw plugin-service plan identifiers eligible to install the plugin.",
       }),
       Schema.Null,
     ]),
   ),
-  proposedNetworkPolicyAmendments: Schema.optionalKey(
+  enabled: Schema.Boolean,
+  id: Schema.String,
+  installPolicy: V2PluginShareListResponse__PluginInstallPolicy,
+  installPolicySource: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__PluginInstallPolicySource, Schema.Null]),
+  ),
+  installed: Schema.Boolean,
+  installedAt: Schema.optionalKey(
     Schema.Union([
-      Schema.Array(ServerRequest__NetworkPolicyAmendment).annotate({
+      Schema.Number.annotate({
         description:
-          "Optional proposed network policy amendments (allow/deny host) for future requests.",
-      }),
+          "Unix timestamp in seconds when the remote plugin was installed, when available.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
-  reason: Schema.optionalKey(
+  interface: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__PluginInterface, Schema.Null]),
+  ),
+  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
+  localVersion: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional explanatory reason (e.g. request for network access).",
+        description: "Version of the locally materialized plugin package when available.",
       }),
       Schema.Null,
     ]),
   ),
-  startedAtMs: Schema.Number.annotate({
-    description: "Unix timestamp (in milliseconds) when this approval request started.",
-    format: "int64",
-  }).check(Schema.isInt()),
-  threadId: Schema.String,
-  turnId: Schema.String,
-});
-
-export type ServerRequest__ToolRequestUserInputParams = {
-  readonly autoResolutionMs?: number | null;
-  readonly itemId: string;
-  readonly questions: ReadonlyArray<ServerRequest__ToolRequestUserInputQuestion>;
-  readonly threadId: string;
-  readonly turnId: string;
-};
-export const ServerRequest__ToolRequestUserInputParams = Schema.Struct({
-  autoResolutionMs: Schema.optionalKey(
+  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  name: Schema.String,
+  remotePluginId: Schema.optionalKey(
     Schema.Union([
-      Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
       Schema.Null,
     ]),
   ),
-  itemId: Schema.String,
-  questions: Schema.Array(ServerRequest__ToolRequestUserInputQuestion),
-  threadId: Schema.String,
-  turnId: Schema.String,
-}).annotate({ description: "EXPERIMENTAL. Params sent with a request_user_input event." });
-
-export type V2AppListUpdatedNotification__AppInfo = {
-  readonly appMetadata?: V2AppListUpdatedNotification__AppMetadata | null;
-  readonly branding?: V2AppListUpdatedNotification__AppBranding | null;
-  readonly description?: string | null;
-  readonly distributionChannel?: string | null;
-  readonly iconAssets?: { readonly [x: string]: string } | null;
-  readonly iconDarkAssets?: { readonly [x: string]: string } | null;
-  readonly id: string;
-  readonly installUrl?: string | null;
-  readonly isAccessible?: boolean;
-  readonly isEnabled?: boolean;
-  readonly labels?: { readonly [x: string]: string } | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly name: string;
-  readonly pluginDisplayNames?: ReadonlyArray<string>;
-};
-export const V2AppListUpdatedNotification__AppInfo = Schema.Struct({
-  appMetadata: Schema.optionalKey(
-    Schema.Union([V2AppListUpdatedNotification__AppMetadata, Schema.Null]),
-  ),
-  branding: Schema.optionalKey(
-    Schema.Union([V2AppListUpdatedNotification__AppBranding, Schema.Null]),
-  ),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  distributionChannel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  iconAssets: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  iconDarkAssets: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  id: Schema.String,
-  installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  isAccessible: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  isEnabled: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description:
-        "Whether this app is enabled in config.toml. Example: ```toml [apps.bad_app] enabled = false ```",
-      default: true,
-    }),
-  ),
-  labels: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  name: Schema.String,
-  pluginDisplayNames: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-}).annotate({ description: "EXPERIMENTAL - app metadata returned by app-list APIs." });
-
-export type V2AppsListResponse__AppInfo = {
-  readonly appMetadata?: V2AppsListResponse__AppMetadata | null;
-  readonly branding?: V2AppsListResponse__AppBranding | null;
-  readonly description?: string | null;
-  readonly distributionChannel?: string | null;
-  readonly iconAssets?: { readonly [x: string]: string } | null;
-  readonly iconDarkAssets?: { readonly [x: string]: string } | null;
-  readonly id: string;
-  readonly installUrl?: string | null;
-  readonly isAccessible?: boolean;
-  readonly isEnabled?: boolean;
-  readonly labels?: { readonly [x: string]: string } | null;
-  readonly logoUrl?: string | null;
-  readonly logoUrlDark?: string | null;
-  readonly name: string;
-  readonly pluginDisplayNames?: ReadonlyArray<string>;
-};
-export const V2AppsListResponse__AppInfo = Schema.Struct({
-  appMetadata: Schema.optionalKey(Schema.Union([V2AppsListResponse__AppMetadata, Schema.Null])),
-  branding: Schema.optionalKey(Schema.Union([V2AppsListResponse__AppBranding, Schema.Null])),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  distributionChannel: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  iconAssets: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  iconDarkAssets: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  id: Schema.String,
-  installUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  isAccessible: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  isEnabled: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description:
-        "Whether this app is enabled in config.toml. Example: ```toml [apps.bad_app] enabled = false ```",
-      default: true,
+  shareContext: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__PluginShareContext, Schema.Null]).annotate({
+      description: "Remote sharing context associated with this plugin when available.",
     }),
   ),
-  labels: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.String), Schema.Null]),
-  ),
-  logoUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  logoUrlDark: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  name: Schema.String,
-  pluginDisplayNames: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-}).annotate({ description: "EXPERIMENTAL - app metadata returned by app-list APIs." });
-
-export type V2ConfigReadResponse__ConfigLayer = {
-  readonly config: unknown;
-  readonly disabledReason?: string | null;
-  readonly name: V2ConfigReadResponse__ConfigLayerSource;
-  readonly version: string;
-};
-export const V2ConfigReadResponse__ConfigLayer = Schema.Struct({
-  config: Schema.Unknown,
-  disabledReason: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  name: V2ConfigReadResponse__ConfigLayerSource,
-  version: Schema.String,
-});
-
-export type V2ConfigReadResponse__ConfigLayerMetadata = {
-  readonly name: V2ConfigReadResponse__ConfigLayerSource;
-  readonly version: string;
-};
-export const V2ConfigReadResponse__ConfigLayerMetadata = Schema.Struct({
-  name: V2ConfigReadResponse__ConfigLayerSource,
-  version: Schema.String,
-});
-
-export type V2ConfigReadResponse__ToolsV2 = {
-  readonly web_search?: V2ConfigReadResponse__WebSearchToolConfig | null;
-};
-export const V2ConfigReadResponse__ToolsV2 = Schema.Struct({
-  web_search: Schema.optionalKey(
-    Schema.Union([V2ConfigReadResponse__WebSearchToolConfig, Schema.Null]),
-  ),
-});
-
-export type V2ConfigRequirementsReadResponse__ModelsRequirements = {
-  readonly newThread?: V2ConfigRequirementsReadResponse__NewThreadModelDefaults | null;
-};
-export const V2ConfigRequirementsReadResponse__ModelsRequirements = Schema.Struct({
-  newThread: Schema.optionalKey(
-    Schema.Union([V2ConfigRequirementsReadResponse__NewThreadModelDefaults, Schema.Null]),
-  ),
-});
-
-export type V2ConfigWriteResponse__ConfigLayerMetadata = {
-  readonly name: V2ConfigWriteResponse__ConfigLayerSource;
-  readonly version: string;
-};
-export const V2ConfigWriteResponse__ConfigLayerMetadata = Schema.Struct({
-  name: V2ConfigWriteResponse__ConfigLayerSource,
-  version: Schema.String,
-});
-
-export type V2ErrorNotification__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ErrorNotification__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ErrorNotification__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ErrorNotification__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
-
-export type V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItem = {
-  readonly cwd?: string | null;
-  readonly description: string;
-  readonly details?: V2ExternalAgentConfigDetectResponse__MigrationDetails | null;
-  readonly itemType: V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType;
-};
-export const V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItem = Schema.Struct({
-  cwd: Schema.optionalKey(
+  source: V2PluginShareListResponse__PluginSource,
+  version: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description:
-          "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
+        description: "Version advertised by the remote marketplace backend when available.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "V2PluginShareListResponse__PluginSummary" });
+
+export type V2RawResponseItemCompletedNotification__ResponseItem =
+  | {
+      readonly content: ReadonlyArray<V2RawResponseItemCompletedNotification__ContentItem>;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly phase?: V2RawResponseItemCompletedNotification__MessagePhase | null;
+      readonly role: string;
+      readonly type: "message";
+    }
+  | {
+      readonly author: string;
+      readonly content: ReadonlyArray<V2RawResponseItemCompletedNotification__AgentMessageInputContent>;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly recipient: string;
+      readonly type: "agent_message";
+    }
+  | {
+      readonly content?: ReadonlyArray<V2RawResponseItemCompletedNotification__ReasoningItemContent> | null;
+      readonly encrypted_content?: string | null;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly summary: ReadonlyArray<V2RawResponseItemCompletedNotification__ReasoningItemReasoningSummary>;
+      readonly type: "reasoning";
+    }
+  | {
+      readonly action: V2RawResponseItemCompletedNotification__LocalShellAction;
+      readonly call_id?: string | null;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly status: V2RawResponseItemCompletedNotification__LocalShellStatus;
+      readonly type: "local_shell_call";
+    }
+  | {
+      readonly arguments: string;
+      readonly call_id: string;
+      readonly encrypted_function_args?: ReadonlyArray<string> | null;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly type: "function_call";
+    }
+  | {
+      readonly arguments: Schema.Json;
+      readonly call_id?: string | null;
+      readonly execution: string;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly status?: string | null;
+      readonly type: "tool_search_call";
+    }
+  | {
+      readonly call_id?: string | null;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly name?: string | null;
+      readonly namespace?: string | null;
+      readonly output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody;
+      readonly type: "function_call_output";
+    }
+  | {
+      readonly call_id: string;
+      readonly id?: string | null;
+      readonly input: string;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly status?: string | null;
+      readonly type: "custom_tool_call";
+    }
+  | {
+      readonly call_id: string;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly name?: string | null;
+      readonly output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody;
+      readonly type: "custom_tool_call_output";
+    }
+  | {
+      readonly call_id?: string | null;
+      readonly execution: string;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly status: string;
+      readonly tools: ReadonlyArray<Schema.Json>;
+      readonly type: "tool_search_output";
+    }
+  | {
+      readonly action?: V2RawResponseItemCompletedNotification__ResponsesApiWebSearchAction | null;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly status?: string | null;
+      readonly type: "web_search_call";
+    }
+  | {
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly result: string;
+      readonly revised_prompt?: string | null;
+      readonly status: string;
+      readonly type: "image_generation_call";
+    }
+  | {
+      readonly encrypted_content: string;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly type: "compaction";
+    }
+  | {
+      readonly reasoning: V2RawResponseItemCompletedNotification__ConfigurationReasoning;
+      readonly type: "configuration_update";
+    }
+  | { readonly type: "compaction_trigger" }
+  | {
+      readonly encrypted_content?: string | null;
+      readonly id?: string | null;
+      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
+      readonly type: "context_compaction";
+    }
+  | { readonly type: "other" };
+export const V2RawResponseItemCompletedNotification__ResponseItem = Schema.Union(
+  [
+    Schema.Struct({
+      content: Schema.Array(V2RawResponseItemCompletedNotification__ContentItem),
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      phase: Schema.optionalKey(
+        Schema.Union([V2RawResponseItemCompletedNotification__MessagePhase, Schema.Null]),
+      ),
+      role: Schema.String,
+      type: Schema.Literal("message").annotate({ title: "MessageResponseItemType" }),
+    }).annotate({ title: "MessageResponseItem" }),
+    Schema.Struct({
+      author: Schema.String,
+      content: Schema.Array(V2RawResponseItemCompletedNotification__AgentMessageInputContent),
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      recipient: Schema.String,
+      type: Schema.Literal("agent_message").annotate({ title: "AgentMessageResponseItemType" }),
+    }).annotate({ title: "AgentMessageResponseItem" }),
+    Schema.Struct({
+      content: Schema.optionalKey(
+        Schema.Union([
+          Schema.Array(V2RawResponseItemCompletedNotification__ReasoningItemContent),
+          Schema.Null,
+        ]),
+      ),
+      encrypted_content: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      summary: Schema.Array(V2RawResponseItemCompletedNotification__ReasoningItemReasoningSummary),
+      type: Schema.Literal("reasoning").annotate({ title: "ReasoningResponseItemType" }),
+    }).annotate({ title: "ReasoningResponseItem" }),
+    Schema.Struct({
+      action: V2RawResponseItemCompletedNotification__LocalShellAction,
+      call_id: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({ description: "Set when using the Responses API." }),
+          Schema.Null,
+        ]),
+      ),
+      id: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description: "Legacy id field retained for compatibility with older payloads.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      status: V2RawResponseItemCompletedNotification__LocalShellStatus,
+      type: Schema.Literal("local_shell_call").annotate({
+        title: "LocalShellCallResponseItemType",
+      }),
+    }).annotate({ title: "LocalShellCallResponseItem" }),
+    Schema.Struct({
+      arguments: Schema.String,
+      call_id: Schema.String,
+      encrypted_function_args: Schema.optionalKey(
+        Schema.Union([Schema.Array(Schema.String), Schema.Null]),
+      ),
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("function_call").annotate({ title: "FunctionCallResponseItemType" }),
+    }).annotate({ title: "FunctionCallResponseItem" }),
+    Schema.Struct({
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
+      call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      execution: Schema.String,
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      status: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("tool_search_call").annotate({
+        title: "ToolSearchCallResponseItemType",
+      }),
+    }).annotate({ title: "ToolSearchCallResponseItem" }),
+    Schema.Struct({
+      call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      name: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody,
+      type: Schema.Literal("function_call_output").annotate({
+        title: "FunctionCallOutputResponseItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputResponseItem" }),
+    Schema.Struct({
+      call_id: Schema.String,
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      input: Schema.String,
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      status: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("custom_tool_call").annotate({
+        title: "CustomToolCallResponseItemType",
+      }),
+    }).annotate({ title: "CustomToolCallResponseItem" }),
+    Schema.Struct({
+      call_id: Schema.String,
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      name: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody,
+      type: Schema.Literal("custom_tool_call_output").annotate({
+        title: "CustomToolCallOutputResponseItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-  description: Schema.String,
-  details: Schema.optionalKey(
-    Schema.Union([V2ExternalAgentConfigDetectResponse__MigrationDetails, Schema.Null]),
-  ),
-  itemType: V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItemType,
-});
-
-export type V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportTypeResult =
-  {
-    readonly failures: ReadonlyArray<V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure>;
-    readonly itemType: V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType;
-    readonly successes: ReadonlyArray<V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess>;
-  };
-export const V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportTypeResult =
-  Schema.Struct({
-    failures: Schema.Array(
-      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeFailure,
-    ),
-    itemType:
-      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigMigrationItemType,
-    successes: Schema.Array(
-      V2ExternalAgentConfigImportCompletedNotification__ExternalAgentConfigImportItemTypeSuccess,
-    ),
-  });
-
-export type V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportHistory = {
-  readonly completedAtMs: number;
-  readonly failures: ReadonlyArray<V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure>;
-  readonly importId: string;
-  readonly successes: ReadonlyArray<V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess>;
-};
-export const V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportHistory =
-  Schema.Struct({
-    completedAtMs: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-    failures: Schema.Array(
-      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeFailure,
-    ),
-    importId: Schema.String,
-    successes: Schema.Array(
-      V2ExternalAgentConfigImportHistoriesReadResponse__ExternalAgentConfigImportItemTypeSuccess,
-    ),
-  });
-
-export type V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItem = {
-  readonly cwd?: string | null;
-  readonly description: string;
-  readonly details?: V2ExternalAgentConfigImportParams__MigrationDetails | null;
-  readonly itemType: V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType;
-};
-export const V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItem = Schema.Struct({
-  cwd: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Null or empty means home-scoped migration; non-empty means repo-scoped migration.",
+    }).annotate({ title: "CustomToolCallOutputResponseItem" }),
+    Schema.Struct({
+      call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      execution: Schema.String,
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      status: Schema.String,
+      tools: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
+      type: Schema.Literal("tool_search_output").annotate({
+        title: "ToolSearchOutputResponseItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-  description: Schema.String,
-  details: Schema.optionalKey(
-    Schema.Union([V2ExternalAgentConfigImportParams__MigrationDetails, Schema.Null]),
-  ),
-  itemType: V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItemType,
-});
-
-export type V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportTypeResult = {
-  readonly failures: ReadonlyArray<V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure>;
-  readonly itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType;
-  readonly successes: ReadonlyArray<V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess>;
-};
-export const V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportTypeResult =
-  Schema.Struct({
-    failures: Schema.Array(
-      V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeFailure,
-    ),
-    itemType: V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigMigrationItemType,
-    successes: Schema.Array(
-      V2ExternalAgentConfigImportProgressNotification__ExternalAgentConfigImportItemTypeSuccess,
-    ),
-  });
-
-export type V2GetAccountRateLimitsResponse__RateLimitResetCreditsSummary = {
-  readonly availableCount: number;
-  readonly credits?: ReadonlyArray<V2GetAccountRateLimitsResponse__RateLimitResetCredit> | null;
-};
-export const V2GetAccountRateLimitsResponse__RateLimitResetCreditsSummary = Schema.Struct({
-  availableCount: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  credits: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(V2GetAccountRateLimitsResponse__RateLimitResetCredit).annotate({
-        description:
-          "Detail rows for available reset credits, when the backend provides them.\n\n`null` means only `availableCount` is known, while an empty array means details were fetched and no available credits were returned. The backend may cap this list, so its length can be less than `availableCount`.",
+    }).annotate({ title: "ToolSearchOutputResponseItem" }),
+    Schema.Struct({
+      action: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__ResponsesApiWebSearchAction,
+          Schema.Null,
+        ]),
+      ),
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      status: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("web_search_call").annotate({ title: "WebSearchCallResponseItemType" }),
+    }).annotate({ title: "WebSearchCallResponseItem" }),
+    Schema.Struct({
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      result: Schema.String,
+      revised_prompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      status: Schema.String,
+      type: Schema.Literal("image_generation_call").annotate({
+        title: "ImageGenerationCallResponseItemType",
       }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2HookCompletedNotification__HookRunSummary = {
-  readonly completedAt?: number | null;
-  readonly displayOrder: number;
-  readonly durationMs?: number | null;
-  readonly entries: ReadonlyArray<V2HookCompletedNotification__HookOutputEntry>;
-  readonly eventName: V2HookCompletedNotification__HookEventName;
-  readonly executionMode: V2HookCompletedNotification__HookExecutionMode;
-  readonly handlerType: V2HookCompletedNotification__HookHandlerType;
-  readonly id: string;
-  readonly scope: V2HookCompletedNotification__HookScope;
-  readonly source?:
-    | "system"
-    | "user"
-    | "project"
-    | "mdm"
-    | "sessionFlags"
-    | "plugin"
-    | "cloudRequirements"
-    | "cloudManagedConfig"
-    | "legacyManagedConfigFile"
-    | "legacyManagedConfigMdm"
-    | "unknown";
-  readonly sourcePath: V2HookCompletedNotification__AbsolutePathBuf;
-  readonly startedAt: number;
-  readonly status: V2HookCompletedNotification__HookRunStatus;
-  readonly statusMessage?: string | null;
-};
-export const V2HookCompletedNotification__HookRunSummary = Schema.Struct({
-  completedAt: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  displayOrder: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  durationMs: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  entries: Schema.Array(V2HookCompletedNotification__HookOutputEntry),
-  eventName: V2HookCompletedNotification__HookEventName,
-  executionMode: V2HookCompletedNotification__HookExecutionMode,
-  handlerType: V2HookCompletedNotification__HookHandlerType,
-  id: Schema.String,
-  scope: V2HookCompletedNotification__HookScope,
-  source: Schema.optionalKey(
-    Schema.Literals([
-      "system",
-      "user",
-      "project",
-      "mdm",
-      "sessionFlags",
-      "plugin",
-      "cloudRequirements",
-      "cloudManagedConfig",
-      "legacyManagedConfigFile",
-      "legacyManagedConfigMdm",
-      "unknown",
-    ]).annotate({ default: "unknown" }),
-  ),
-  sourcePath: V2HookCompletedNotification__AbsolutePathBuf,
-  startedAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  status: V2HookCompletedNotification__HookRunStatus,
-  statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2HooksListResponse__HooksListEntry = {
-  readonly cwd: string;
-  readonly errors: ReadonlyArray<V2HooksListResponse__HookErrorInfo>;
-  readonly hooks: ReadonlyArray<V2HooksListResponse__HookMetadata>;
-  readonly warnings: ReadonlyArray<string>;
-};
-export const V2HooksListResponse__HooksListEntry = Schema.Struct({
-  cwd: Schema.String,
-  errors: Schema.Array(V2HooksListResponse__HookErrorInfo),
-  hooks: Schema.Array(V2HooksListResponse__HookMetadata),
-  warnings: Schema.Array(Schema.String),
-});
-
-export type V2HookStartedNotification__HookRunSummary = {
-  readonly completedAt?: number | null;
-  readonly displayOrder: number;
-  readonly durationMs?: number | null;
-  readonly entries: ReadonlyArray<V2HookStartedNotification__HookOutputEntry>;
-  readonly eventName: V2HookStartedNotification__HookEventName;
-  readonly executionMode: V2HookStartedNotification__HookExecutionMode;
-  readonly handlerType: V2HookStartedNotification__HookHandlerType;
-  readonly id: string;
-  readonly scope: V2HookStartedNotification__HookScope;
-  readonly source?:
-    | "system"
-    | "user"
-    | "project"
-    | "mdm"
-    | "sessionFlags"
-    | "plugin"
-    | "cloudRequirements"
-    | "cloudManagedConfig"
-    | "legacyManagedConfigFile"
-    | "legacyManagedConfigMdm"
-    | "unknown";
-  readonly sourcePath: V2HookStartedNotification__AbsolutePathBuf;
-  readonly startedAt: number;
-  readonly status: V2HookStartedNotification__HookRunStatus;
-  readonly statusMessage?: string | null;
-};
-export const V2HookStartedNotification__HookRunSummary = Schema.Struct({
-  completedAt: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  displayOrder: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  durationMs: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
-  ),
-  entries: Schema.Array(V2HookStartedNotification__HookOutputEntry),
-  eventName: V2HookStartedNotification__HookEventName,
-  executionMode: V2HookStartedNotification__HookExecutionMode,
-  handlerType: V2HookStartedNotification__HookHandlerType,
-  id: Schema.String,
-  scope: V2HookStartedNotification__HookScope,
-  source: Schema.optionalKey(
-    Schema.Literals([
-      "system",
-      "user",
-      "project",
-      "mdm",
-      "sessionFlags",
-      "plugin",
-      "cloudRequirements",
-      "cloudManagedConfig",
-      "legacyManagedConfigFile",
-      "legacyManagedConfigMdm",
-      "unknown",
-    ]).annotate({ default: "unknown" }),
-  ),
-  sourcePath: V2HookStartedNotification__AbsolutePathBuf,
-  startedAt: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  status: V2HookStartedNotification__HookRunStatus,
-  statusMessage: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+    }).annotate({ title: "ImageGenerationCallResponseItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.String,
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("compaction").annotate({ title: "CompactionResponseItemType" }),
+    }).annotate({ title: "CompactionResponseItem" }),
+    Schema.Struct({
+      reasoning: V2RawResponseItemCompletedNotification__ConfigurationReasoning,
+      type: Schema.Literal("configuration_update").annotate({
+        title: "ConfigurationUpdateResponseItemType",
+      }),
+    }).annotate({
+      title: "ConfigurationUpdateResponseItem",
+      description: "A durable input control interpreted by the backend at its position in history.",
+    }),
+    Schema.Struct({
+      type: Schema.Literal("compaction_trigger").annotate({
+        title: "CompactionTriggerResponseItemType",
+      }),
+    }).annotate({ title: "CompactionTriggerResponseItem" }),
+    Schema.Struct({
+      encrypted_content: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      internal_chat_message_metadata_passthrough: Schema.optionalKey(
+        Schema.Union([
+          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
+          Schema.Null,
+        ]),
+      ),
+      type: Schema.Literal("context_compaction").annotate({
+        title: "ContextCompactionResponseItemType",
+      }),
+    }).annotate({ title: "ContextCompactionResponseItem" }),
+    Schema.Struct({
+      type: Schema.Literal("other").annotate({ title: "OtherResponseItemType" }),
+    }).annotate({ title: "OtherResponseItem" }),
+  ],
+  { mode: "oneOf" },
+).annotate({ identifier: "V2RawResponseItemCompletedNotification__ResponseItem" });
 
-export type V2ItemCompletedNotification__ThreadItem =
+export type V2ReviewStartResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ItemCompletedNotification__UserInput>;
+      readonly content: ReadonlyArray<V2ReviewStartResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ItemCompletedNotification__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ReviewStartResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ReviewStartResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ItemCompletedNotification__MemoryCitation | null;
-      readonly phase?: V2ItemCompletedNotification__MessagePhase | null;
+      readonly memoryCitation?: V2ReviewStartResponse__MemoryCitation | null;
+      readonly phase?: V2ReviewStartResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ReviewStartResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ReviewStartResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -21553,137 +35666,133 @@ export type V2ItemCompletedNotification__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ItemCompletedNotification__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ReviewStartResponse__CommandAction>;
+      readonly cwd: V2ReviewStartResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ItemCompletedNotification__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ReviewStartResponse__CommandExecutionSource;
+      readonly status: V2ReviewStartResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ItemCompletedNotification__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ReviewStartResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ItemCompletedNotification__PatchApplyStatus;
+      readonly status: V2ReviewStartResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ItemCompletedNotification__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ReviewStartResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ItemCompletedNotification__McpToolCallError | null;
+      readonly error?: V2ReviewStartResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ReviewStartResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ItemCompletedNotification__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ReviewStartResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ItemCompletedNotification__McpToolCallStatus;
+      readonly status: V2ReviewStartResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ItemCompletedNotification__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ReviewStartResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ItemCompletedNotification__DynamicToolCallStatus;
+      readonly status: V2ReviewStartResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: {
-        readonly [x: string]: V2ItemCompletedNotification__CollabAgentState;
-      };
+      readonly agentsStates: { readonly [x: string]: V2ReviewStartResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ItemCompletedNotification__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ReviewStartResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ReviewStartResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ReviewStartResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ItemCompletedNotification__SubAgentActivityKind;
+      readonly kind: V2ReviewStartResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ItemCompletedNotification__WebSearchAction | null;
+      readonly action?: V2ReviewStartResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ItemCompletedNotification__LegacyAppPathString;
+      readonly path: V2ReviewStartResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ReviewStartResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ItemCompletedNotification__AbsolutePathBuf | null;
+      readonly savedPath?: V2ReviewStartResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
+export const V2ReviewStartResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ItemCompletedNotification__UserInput),
+      content: Schema.Array(V2ReviewStartResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ItemCompletedNotification__HookPromptFragment),
+      fragments: Schema.Array(V2ReviewStartResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ReviewStartResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__MemoryCitation, Schema.Null]),
-      ),
-      phase: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__MessagePhase, Schema.Null]),
+        Schema.Union([V2ReviewStartResponse__MemoryCitation, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
+      phase: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__MessagePhase, Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2ReviewStartResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ReviewStartResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -21709,17 +35818,20 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ItemCompletedNotification__CommandAction).annotate({
+      commandActions: Schema.Array(V2ReviewStartResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ReviewStartResponse__LegacyAppPathString> =>
+          V2ReviewStartResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -21728,11 +35840,20 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -21741,65 +35862,80 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ReviewStartResponse__CommandExecutionSource> =>
+            V2ReviewStartResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ItemCompletedNotification__CommandExecutionStatus,
+      status: V2ReviewStartResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ItemCompletedNotification__FileUpdateChange),
+      changes: Schema.Array(V2ReviewStartResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ItemCompletedNotification__PatchApplyStatus,
+      status: V2ReviewStartResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ReviewStartResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ReviewStartResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ReviewStartResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ReviewStartResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ItemCompletedNotification__McpToolCallStatus,
+      status: V2ReviewStartResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ItemCompletedNotification__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ReviewStartResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -21808,22 +35944,21 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ItemCompletedNotification__DynamicToolCallStatus,
+      status: V2ReviewStartResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(
-        Schema.String,
-        V2ItemCompletedNotification__CollabAgentState,
-      ).annotate({ description: "Last known status of the target agents, when available." }),
+      agentsStates: Schema.Record(Schema.String, V2ReviewStartResponse__CollabAgentState).annotate({
+        description: "Last known status of the target agents, when available.",
+      }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -21842,7 +35977,7 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ReviewStartResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -21853,20 +35988,14 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ReviewStartResponse__CollabAgentToolCallStatus> =>
+          V2ReviewStartResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ReviewStartResponse__CollabAgentTool> =>
+          V2ReviewStartResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -21875,20 +36004,20 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ItemCompletedNotification__SubAgentActivityKind,
+      kind: V2ReviewStartResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ReviewStartResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -21899,13 +36028,17 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ItemCompletedNotification__LegacyAppPathString,
+      path: V2ReviewStartResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -21913,13 +36046,17 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ReviewStartResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ItemCompletedNotification__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ReviewStartResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -21944,88 +36081,47 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath =
-  | {
-      readonly path: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString;
-      readonly type: "path";
-    }
-  | { readonly pattern: string; readonly type: "glob_pattern" }
-  | {
-      readonly type: "special";
-      readonly value: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath;
-    };
-export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath = Schema.Union(
-  [
-    Schema.Struct({
-      path: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
-      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
-    }).annotate({ title: "PathFileSystemPath" }),
-    Schema.Struct({
-      pattern: Schema.String,
-      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
-    }).annotate({ title: "GlobPatternFileSystemPath" }),
-    Schema.Struct({
-      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
-      value: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSpecialPath,
-    }).annotate({ title: "SpecialFileSystemPath" }),
-  ],
-  { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ReviewStartResponse__ThreadItem" });
 
-export type V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath =
-  | {
-      readonly path: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString;
-      readonly type: "path";
-    }
-  | { readonly pattern: string; readonly type: "glob_pattern" }
-  | {
-      readonly type: "special";
-      readonly value: V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath;
-    };
-export const V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath = Schema.Union(
-  [
-    Schema.Struct({
-      path: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
-      type: Schema.Literal("path").annotate({ title: "PathFileSystemPathType" }),
-    }).annotate({ title: "PathFileSystemPath" }),
-    Schema.Struct({
-      pattern: Schema.String,
-      type: Schema.Literal("glob_pattern").annotate({ title: "GlobPatternFileSystemPathType" }),
-    }).annotate({ title: "GlobPatternFileSystemPath" }),
-    Schema.Struct({
-      type: Schema.Literal("special").annotate({ title: "SpecialFileSystemPathType" }),
-      value: V2ItemGuardianApprovalReviewStartedNotification__FileSystemSpecialPath,
-    }).annotate({ title: "SpecialFileSystemPath" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2SkillsListResponse__SkillsListEntry = {
+  readonly cwd: string;
+  readonly errors: ReadonlyArray<V2SkillsListResponse__SkillErrorInfo>;
+  readonly skills: ReadonlyArray<V2SkillsListResponse__SkillMetadata>;
+};
+export const V2SkillsListResponse__SkillsListEntry = Schema.Struct({
+  cwd: Schema.String,
+  errors: Schema.Array(V2SkillsListResponse__SkillErrorInfo),
+  skills: Schema.Array(V2SkillsListResponse__SkillMetadata),
+}).annotate({ identifier: "V2SkillsListResponse__SkillsListEntry" });
 
-export type V2ItemStartedNotification__ThreadItem =
+export type V2ThreadForkResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ItemStartedNotification__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadForkResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ItemStartedNotification__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadForkResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadForkResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ItemStartedNotification__MemoryCitation | null;
-      readonly phase?: V2ItemStartedNotification__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadForkResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadForkResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadForkResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadForkResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -22036,135 +36132,133 @@ export type V2ItemStartedNotification__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ItemStartedNotification__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadForkResponse__CommandAction>;
+      readonly cwd: V2ThreadForkResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ItemStartedNotification__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadForkResponse__CommandExecutionSource;
+      readonly status: V2ThreadForkResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ItemStartedNotification__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadForkResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ItemStartedNotification__PatchApplyStatus;
+      readonly status: V2ThreadForkResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ItemStartedNotification__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadForkResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ItemStartedNotification__McpToolCallError | null;
+      readonly error?: V2ThreadForkResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadForkResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ItemStartedNotification__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadForkResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ItemStartedNotification__McpToolCallStatus;
+      readonly status: V2ThreadForkResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ItemStartedNotification__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadForkResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ItemStartedNotification__DynamicToolCallStatus;
+      readonly status: V2ThreadForkResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ItemStartedNotification__CollabAgentState };
+      readonly agentsStates: { readonly [x: string]: V2ThreadForkResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ItemStartedNotification__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadForkResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadForkResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadForkResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ItemStartedNotification__SubAgentActivityKind;
+      readonly kind: V2ThreadForkResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ItemStartedNotification__WebSearchAction | null;
+      readonly action?: V2ThreadForkResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ItemStartedNotification__LegacyAppPathString;
+      readonly path: V2ThreadForkResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadForkResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ItemStartedNotification__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadForkResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ItemStartedNotification__ThreadItem = Schema.Union(
+export const V2ThreadForkResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ItemStartedNotification__UserInput),
+      content: Schema.Array(V2ThreadForkResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ItemStartedNotification__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadForkResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadForkResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__MemoryCitation, Schema.Null]),
-      ),
-      phase: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__MessagePhase, Schema.Null]),
+        Schema.Union([V2ThreadForkResponse__MemoryCitation, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
+      phase: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__MessagePhase, Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2ThreadForkResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadForkResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -22190,17 +36284,20 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ItemStartedNotification__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadForkResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadForkResponse__LegacyAppPathString> =>
+          V2ThreadForkResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -22209,11 +36306,20 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -22222,65 +36328,80 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadForkResponse__CommandExecutionSource> =>
+            V2ThreadForkResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ItemStartedNotification__CommandExecutionStatus,
+      status: V2ThreadForkResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ItemStartedNotification__FileUpdateChange),
+      changes: Schema.Array(V2ThreadForkResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ItemStartedNotification__PatchApplyStatus,
+      status: V2ThreadForkResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadForkResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadForkResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadForkResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadForkResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ItemStartedNotification__McpToolCallStatus,
+      status: V2ThreadForkResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ItemStartedNotification__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadForkResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -22289,22 +36410,21 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ItemStartedNotification__DynamicToolCallStatus,
+      status: V2ThreadForkResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(
-        Schema.String,
-        V2ItemStartedNotification__CollabAgentState,
-      ).annotate({ description: "Last known status of the target agents, when available." }),
+      agentsStates: Schema.Record(Schema.String, V2ThreadForkResponse__CollabAgentState).annotate({
+        description: "Last known status of the target agents, when available.",
+      }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -22323,7 +36443,7 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadForkResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -22334,20 +36454,14 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadForkResponse__CollabAgentToolCallStatus> =>
+          V2ThreadForkResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadForkResponse__CollabAgentTool> =>
+          V2ThreadForkResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -22356,20 +36470,20 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ItemStartedNotification__SubAgentActivityKind,
+      kind: V2ThreadForkResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadForkResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -22380,13 +36494,17 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ItemStartedNotification__LegacyAppPathString,
+      path: V2ThreadForkResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -22394,13 +36512,17 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadForkResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ItemStartedNotification__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadForkResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -22425,260 +36547,36 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ModelListResponse__Model = {
-  readonly additionalSpeedTiers?: ReadonlyArray<string>;
-  readonly availabilityNux?: V2ModelListResponse__ModelAvailabilityNux | null;
-  readonly defaultReasoningEffort: V2ModelListResponse__ReasoningEffort;
-  readonly defaultServiceTier?: string | null;
-  readonly description: string;
-  readonly displayName: string;
-  readonly hidden: boolean;
-  readonly id: string;
-  readonly inputModalities?: ReadonlyArray<V2ModelListResponse__InputModality>;
-  readonly isDefault: boolean;
-  readonly model: string;
-  readonly serviceTiers?: ReadonlyArray<V2ModelListResponse__ModelServiceTier>;
-  readonly supportedReasoningEfforts: ReadonlyArray<V2ModelListResponse__ReasoningEffortOption>;
-  readonly supportsPersonality?: boolean;
-  readonly upgrade?: string | null;
-  readonly upgradeInfo?: V2ModelListResponse__ModelUpgradeInfo | null;
-};
-export const V2ModelListResponse__Model = Schema.Struct({
-  additionalSpeedTiers: Schema.optionalKey(
-    Schema.Array(Schema.String).annotate({
-      description: "Deprecated: use `serviceTiers` instead.",
-      default: [],
-    }),
-  ),
-  availabilityNux: Schema.optionalKey(
-    Schema.Union([V2ModelListResponse__ModelAvailabilityNux, Schema.Null]),
-  ),
-  defaultReasoningEffort: V2ModelListResponse__ReasoningEffort,
-  defaultServiceTier: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Catalog default service tier id for this model, when one is configured.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  description: Schema.String,
-  displayName: Schema.String,
-  hidden: Schema.Boolean,
-  id: Schema.String,
-  inputModalities: Schema.optionalKey(
-    Schema.Array(V2ModelListResponse__InputModality).annotate({ default: ["text", "image"] }),
-  ),
-  isDefault: Schema.Boolean,
-  model: Schema.String,
-  serviceTiers: Schema.optionalKey(
-    Schema.Array(V2ModelListResponse__ModelServiceTier).annotate({ default: [] }),
-  ),
-  supportedReasoningEfforts: Schema.Array(V2ModelListResponse__ReasoningEffortOption),
-  supportsPersonality: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-  upgrade: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  upgradeInfo: Schema.optionalKey(
-    Schema.Union([V2ModelListResponse__ModelUpgradeInfo, Schema.Null]),
-  ),
-});
-
-export type V2PluginInstalledResponse__PluginShareContext = {
-  readonly creatorAccountUserId?: string | null;
-  readonly creatorName?: string | null;
-  readonly discoverability?: V2PluginInstalledResponse__PluginShareDiscoverability | null;
-  readonly remotePluginId: string;
-  readonly remoteVersion?: string | null;
-  readonly sharePrincipals?: ReadonlyArray<V2PluginInstalledResponse__PluginSharePrincipal> | null;
-  readonly shareUrl?: string | null;
-};
-export const V2PluginInstalledResponse__PluginShareContext = Schema.Struct({
-  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  discoverability: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__PluginShareDiscoverability, Schema.Null]),
-  ),
-  remotePluginId: Schema.String,
-  remoteVersion: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version of the remote shared plugin release when available.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  sharePrincipals: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2PluginInstalledResponse__PluginSharePrincipal), Schema.Null]),
-  ),
-  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2PluginListResponse__PluginShareContext = {
-  readonly creatorAccountUserId?: string | null;
-  readonly creatorName?: string | null;
-  readonly discoverability?: V2PluginListResponse__PluginShareDiscoverability | null;
-  readonly remotePluginId: string;
-  readonly remoteVersion?: string | null;
-  readonly sharePrincipals?: ReadonlyArray<V2PluginListResponse__PluginSharePrincipal> | null;
-  readonly shareUrl?: string | null;
-};
-export const V2PluginListResponse__PluginShareContext = Schema.Struct({
-  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  discoverability: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__PluginShareDiscoverability, Schema.Null]),
-  ),
-  remotePluginId: Schema.String,
-  remoteVersion: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version of the remote shared plugin release when available.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  sharePrincipals: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2PluginListResponse__PluginSharePrincipal), Schema.Null]),
-  ),
-  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2PluginReadResponse__SkillSummary = {
-  readonly description: string;
-  readonly enabled: boolean;
-  readonly interface?: V2PluginReadResponse__SkillInterface | null;
-  readonly name: string;
-  readonly path?: V2PluginReadResponse__AbsolutePathBuf | null;
-  readonly shortDescription?: string | null;
-};
-export const V2PluginReadResponse__SkillSummary = Schema.Struct({
-  description: Schema.String,
-  enabled: Schema.Boolean,
-  interface: Schema.optionalKey(Schema.Union([V2PluginReadResponse__SkillInterface, Schema.Null])),
-  name: Schema.String,
-  path: Schema.optionalKey(Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null])),
-  shortDescription: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2PluginReadResponse__PluginShareContext = {
-  readonly creatorAccountUserId?: string | null;
-  readonly creatorName?: string | null;
-  readonly discoverability?: V2PluginReadResponse__PluginShareDiscoverability | null;
-  readonly remotePluginId: string;
-  readonly remoteVersion?: string | null;
-  readonly sharePrincipals?: ReadonlyArray<V2PluginReadResponse__PluginSharePrincipal> | null;
-  readonly shareUrl?: string | null;
-};
-export const V2PluginReadResponse__PluginShareContext = Schema.Struct({
-  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  discoverability: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__PluginShareDiscoverability, Schema.Null]),
-  ),
-  remotePluginId: Schema.String,
-  remoteVersion: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version of the remote shared plugin release when available.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  sharePrincipals: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2PluginReadResponse__PluginSharePrincipal), Schema.Null]),
-  ),
-  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2PluginReadResponse__ScheduledTaskSummary = {
-  readonly key: string;
-  readonly name: string;
-  readonly prompt: string;
-  readonly schedule: V2PluginReadResponse__ScheduledTaskSchedule;
-};
-export const V2PluginReadResponse__ScheduledTaskSummary = Schema.Struct({
-  key: Schema.String,
-  name: Schema.String,
-  prompt: Schema.String,
-  schedule: V2PluginReadResponse__ScheduledTaskSchedule,
-});
-
-export type V2PluginShareListResponse__PluginShareContext = {
-  readonly creatorAccountUserId?: string | null;
-  readonly creatorName?: string | null;
-  readonly discoverability?: V2PluginShareListResponse__PluginShareDiscoverability | null;
-  readonly remotePluginId: string;
-  readonly remoteVersion?: string | null;
-  readonly sharePrincipals?: ReadonlyArray<V2PluginShareListResponse__PluginSharePrincipal> | null;
-  readonly shareUrl?: string | null;
-};
-export const V2PluginShareListResponse__PluginShareContext = Schema.Struct({
-  creatorAccountUserId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  creatorName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  discoverability: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__PluginShareDiscoverability, Schema.Null]),
-  ),
-  remotePluginId: Schema.String,
-  remoteVersion: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version of the remote shared plugin release when available.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  sharePrincipals: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2PluginShareListResponse__PluginSharePrincipal), Schema.Null]),
-  ),
-  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2RawResponseItemCompletedNotification__FunctionCallOutputBody =
-  | string
-  | ReadonlyArray<V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem>;
-export const V2RawResponseItemCompletedNotification__FunctionCallOutputBody = Schema.Union([
-  Schema.String,
-  Schema.Array(V2RawResponseItemCompletedNotification__FunctionCallOutputContentItem),
-]);
-
-export type V2ReviewStartResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ReviewStartResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ReviewStartResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ReviewStartResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+).annotate({ identifier: "V2ThreadForkResponse__ThreadItem" });
 
-export type V2ReviewStartResponse__ThreadItem =
+export type V2ThreadItemsListResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ReviewStartResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadItemsListResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ReviewStartResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadItemsListResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadItemsListResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ReviewStartResponse__MemoryCitation | null;
-      readonly phase?: V2ReviewStartResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadItemsListResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadItemsListResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadItemsListResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadItemsListResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -22689,133 +36587,138 @@ export type V2ReviewStartResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ReviewStartResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadItemsListResponse__CommandAction>;
+      readonly cwd: V2ThreadItemsListResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ReviewStartResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadItemsListResponse__CommandExecutionSource;
+      readonly status: V2ThreadItemsListResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ReviewStartResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadItemsListResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ReviewStartResponse__PatchApplyStatus;
+      readonly status: V2ThreadItemsListResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ReviewStartResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadItemsListResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ReviewStartResponse__McpToolCallError | null;
+      readonly error?: V2ThreadItemsListResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadItemsListResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ReviewStartResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadItemsListResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ReviewStartResponse__McpToolCallStatus;
+      readonly status: V2ThreadItemsListResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ReviewStartResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadItemsListResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ReviewStartResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadItemsListResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ReviewStartResponse__CollabAgentState };
+      readonly agentsStates: { readonly [x: string]: V2ThreadItemsListResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ReviewStartResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadItemsListResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadItemsListResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadItemsListResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ReviewStartResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadItemsListResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ReviewStartResponse__WebSearchAction | null;
+      readonly action?: V2ThreadItemsListResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ReviewStartResponse__LegacyAppPathString;
+      readonly path: V2ThreadItemsListResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadItemsListResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ReviewStartResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadItemsListResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ReviewStartResponse__ThreadItem = Schema.Union(
+export const V2ThreadItemsListResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ReviewStartResponse__UserInput),
+      content: Schema.Array(V2ThreadItemsListResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ReviewStartResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadItemsListResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadItemsListResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ReviewStartResponse__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ThreadItemsListResponse__MemoryCitation, Schema.Null]),
+      ),
+      phase: Schema.optionalKey(
+        Schema.Union([V2ThreadItemsListResponse__MessagePhase, Schema.Null]),
       ),
-      phase: Schema.optionalKey(Schema.Union([V2ReviewStartResponse__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2ThreadItemsListResponse__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadItemsListResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -22841,17 +36744,20 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ReviewStartResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadItemsListResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadItemsListResponse__LegacyAppPathString> =>
+          V2ThreadItemsListResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -22860,11 +36766,20 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -22873,65 +36788,80 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadItemsListResponse__CommandExecutionSource> =>
+            V2ThreadItemsListResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ReviewStartResponse__CommandExecutionStatus,
+      status: V2ThreadItemsListResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ReviewStartResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadItemsListResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ReviewStartResponse__PatchApplyStatus,
+      status: V2ThreadItemsListResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ReviewStartResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadItemsListResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ReviewStartResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadItemsListResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadItemsListResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ReviewStartResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadItemsListResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ReviewStartResponse__McpToolCallStatus,
+      status: V2ThreadItemsListResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ReviewStartResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadItemsListResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -22940,21 +36870,22 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ReviewStartResponse__DynamicToolCallStatus,
+      status: V2ThreadItemsListResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(Schema.String, V2ReviewStartResponse__CollabAgentState).annotate({
-        description: "Last known status of the target agents, when available.",
-      }),
+      agentsStates: Schema.Record(
+        Schema.String,
+        V2ThreadItemsListResponse__CollabAgentState,
+      ).annotate({ description: "Last known status of the target agents, when available." }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -22973,7 +36904,7 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ReviewStartResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadItemsListResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -22984,20 +36915,14 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadItemsListResponse__CollabAgentToolCallStatus> =>
+          V2ThreadItemsListResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadItemsListResponse__CollabAgentTool> =>
+          V2ThreadItemsListResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -23006,20 +36931,20 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ReviewStartResponse__SubAgentActivityKind,
+      kind: V2ThreadItemsListResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ReviewStartResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadItemsListResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -23030,13 +36955,17 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ReviewStartResponse__LegacyAppPathString,
+      path: V2ThreadItemsListResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -23044,13 +36973,17 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadItemsListResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ReviewStartResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadItemsListResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -23075,76 +37008,36 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2SkillsListResponse__SkillMetadata = {
-  readonly dependencies?: V2SkillsListResponse__SkillDependencies | null;
-  readonly description: string;
-  readonly enabled: boolean;
-  readonly interface?: V2SkillsListResponse__SkillInterface | null;
-  readonly name: string;
-  readonly path: V2SkillsListResponse__AbsolutePathBuf;
-  readonly scope: V2SkillsListResponse__SkillScope;
-  readonly shortDescription?: string | null;
-};
-export const V2SkillsListResponse__SkillMetadata = Schema.Struct({
-  dependencies: Schema.optionalKey(
-    Schema.Union([V2SkillsListResponse__SkillDependencies, Schema.Null]),
-  ),
-  description: Schema.String,
-  enabled: Schema.Boolean,
-  interface: Schema.optionalKey(Schema.Union([V2SkillsListResponse__SkillInterface, Schema.Null])),
-  name: Schema.String,
-  path: V2SkillsListResponse__AbsolutePathBuf,
-  scope: V2SkillsListResponse__SkillScope,
-  shortDescription: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Legacy short_description from SKILL.md. Prefer SKILL.json interface.short_description.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
-
-export type V2ThreadForkResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadForkResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadForkResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadForkResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+).annotate({ identifier: "V2ThreadItemsListResponse__ThreadItem" });
 
-export type V2ThreadForkResponse__ThreadItem =
+export type V2ThreadListResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadForkResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadListResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadForkResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadListResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadListResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadForkResponse__MemoryCitation | null;
-      readonly phase?: V2ThreadForkResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadListResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadListResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadListResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadListResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -23155,133 +37048,133 @@ export type V2ThreadForkResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadForkResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadListResponse__CommandAction>;
+      readonly cwd: V2ThreadListResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadForkResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadListResponse__CommandExecutionSource;
+      readonly status: V2ThreadListResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadForkResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadListResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadForkResponse__PatchApplyStatus;
+      readonly status: V2ThreadListResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadForkResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadListResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadForkResponse__McpToolCallError | null;
+      readonly error?: V2ThreadListResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadListResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadForkResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadListResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadForkResponse__McpToolCallStatus;
+      readonly status: V2ThreadListResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadForkResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadListResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadForkResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadListResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ThreadForkResponse__CollabAgentState };
+      readonly agentsStates: { readonly [x: string]: V2ThreadListResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadForkResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadListResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadListResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadListResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadForkResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadListResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadForkResponse__WebSearchAction | null;
+      readonly action?: V2ThreadListResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadForkResponse__LegacyAppPathString;
+      readonly path: V2ThreadListResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadListResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadForkResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadListResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadForkResponse__ThreadItem = Schema.Union(
+export const V2ThreadListResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadForkResponse__UserInput),
+      content: Schema.Array(V2ThreadListResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadForkResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadListResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadListResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadForkResponse__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ThreadListResponse__MemoryCitation, Schema.Null]),
       ),
-      phase: Schema.optionalKey(Schema.Union([V2ThreadForkResponse__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
+      phase: Schema.optionalKey(Schema.Union([V2ThreadListResponse__MessagePhase, Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2ThreadListResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadListResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -23307,17 +37200,20 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadForkResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadListResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadListResponse__LegacyAppPathString> =>
+          V2ThreadListResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -23326,11 +37222,20 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -23339,65 +37244,80 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadListResponse__CommandExecutionSource> =>
+            V2ThreadListResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ThreadForkResponse__CommandExecutionStatus,
+      status: V2ThreadListResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadForkResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadListResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadForkResponse__PatchApplyStatus,
+      status: V2ThreadListResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadForkResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadListResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadForkResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadListResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadListResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadForkResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadListResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadForkResponse__McpToolCallStatus,
+      status: V2ThreadListResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadForkResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadListResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -23406,19 +37326,19 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadForkResponse__DynamicToolCallStatus,
+      status: V2ThreadListResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(Schema.String, V2ThreadForkResponse__CollabAgentState).annotate({
+      agentsStates: Schema.Record(Schema.String, V2ThreadListResponse__CollabAgentState).annotate({
         description: "Last known status of the target agents, when available.",
       }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
@@ -23439,7 +37359,7 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadForkResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadListResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -23450,20 +37370,14 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadListResponse__CollabAgentToolCallStatus> =>
+          V2ThreadListResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadListResponse__CollabAgentTool> =>
+          V2ThreadListResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -23472,20 +37386,20 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadForkResponse__SubAgentActivityKind,
+      kind: V2ThreadListResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadForkResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadListResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -23496,13 +37410,17 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadForkResponse__LegacyAppPathString,
+      path: V2ThreadListResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -23510,13 +37428,17 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadListResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadForkResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadListResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -23541,45 +37463,36 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadListResponse__ThreadItem" });
 
-export type V2ThreadListResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadListResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadListResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadListResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
-
-export type V2ThreadListResponse__ThreadItem =
+export type V2ThreadMetadataUpdateResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadListResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadMetadataUpdateResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadListResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadMetadataUpdateResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadMetadataUpdateResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadListResponse__MemoryCitation | null;
-      readonly phase?: V2ThreadListResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadMetadataUpdateResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadMetadataUpdateResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadMetadataUpdateResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadMetadataUpdateResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -23590,133 +37503,140 @@ export type V2ThreadListResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadListResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadMetadataUpdateResponse__CommandAction>;
+      readonly cwd: V2ThreadMetadataUpdateResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadListResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadMetadataUpdateResponse__CommandExecutionSource;
+      readonly status: V2ThreadMetadataUpdateResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadListResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadMetadataUpdateResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadListResponse__PatchApplyStatus;
+      readonly status: V2ThreadMetadataUpdateResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadListResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadMetadataUpdateResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadListResponse__McpToolCallError | null;
+      readonly error?: V2ThreadMetadataUpdateResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadMetadataUpdateResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadListResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadMetadataUpdateResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadListResponse__McpToolCallStatus;
+      readonly status: V2ThreadMetadataUpdateResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadListResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadListResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadMetadataUpdateResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ThreadListResponse__CollabAgentState };
+      readonly agentsStates: {
+        readonly [x: string]: V2ThreadMetadataUpdateResponse__CollabAgentState;
+      };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadListResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadMetadataUpdateResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadMetadataUpdateResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadListResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadMetadataUpdateResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadListResponse__WebSearchAction | null;
+      readonly action?: V2ThreadMetadataUpdateResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadListResponse__LegacyAppPathString;
+      readonly path: V2ThreadMetadataUpdateResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadMetadataUpdateResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadListResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadMetadataUpdateResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadListResponse__ThreadItem = Schema.Union(
+export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadListResponse__UserInput),
+      content: Schema.Array(V2ThreadMetadataUpdateResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadListResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadMetadataUpdateResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadMetadataUpdateResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadListResponse__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ThreadMetadataUpdateResponse__MemoryCitation, Schema.Null]),
+      ),
+      phase: Schema.optionalKey(
+        Schema.Union([V2ThreadMetadataUpdateResponse__MessagePhase, Schema.Null]),
       ),
-      phase: Schema.optionalKey(Schema.Union([V2ThreadListResponse__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2ThreadMetadataUpdateResponse__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadMetadataUpdateResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -23742,17 +37662,20 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadListResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadMetadataUpdateResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadMetadataUpdateResponse__LegacyAppPathString> =>
+          V2ThreadMetadataUpdateResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -23761,11 +37684,20 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -23774,65 +37706,80 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadMetadataUpdateResponse__CommandExecutionSource> =>
+            V2ThreadMetadataUpdateResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ThreadListResponse__CommandExecutionStatus,
+      status: V2ThreadMetadataUpdateResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadListResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadMetadataUpdateResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadListResponse__PatchApplyStatus,
+      status: V2ThreadMetadataUpdateResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadListResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadMetadataUpdateResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadListResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadMetadataUpdateResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadMetadataUpdateResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadListResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadMetadataUpdateResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadListResponse__McpToolCallStatus,
+      status: V2ThreadMetadataUpdateResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadListResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -23841,21 +37788,22 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadListResponse__DynamicToolCallStatus,
+      status: V2ThreadMetadataUpdateResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(Schema.String, V2ThreadListResponse__CollabAgentState).annotate({
-        description: "Last known status of the target agents, when available.",
-      }),
+      agentsStates: Schema.Record(
+        Schema.String,
+        V2ThreadMetadataUpdateResponse__CollabAgentState,
+      ).annotate({ description: "Last known status of the target agents, when available." }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -23874,7 +37822,7 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadListResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadMetadataUpdateResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -23885,20 +37833,14 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus> =>
+          V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadMetadataUpdateResponse__CollabAgentTool> =>
+          V2ThreadMetadataUpdateResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -23907,20 +37849,20 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadListResponse__SubAgentActivityKind,
+      kind: V2ThreadMetadataUpdateResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadListResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadMetadataUpdateResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -23931,13 +37873,17 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadListResponse__LegacyAppPathString,
+      path: V2ThreadMetadataUpdateResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -23945,13 +37891,17 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadMetadataUpdateResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadListResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadMetadataUpdateResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -23976,45 +37926,36 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadMetadataUpdateResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadMetadataUpdateResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadMetadataUpdateResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadMetadataUpdateResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+).annotate({ identifier: "V2ThreadMetadataUpdateResponse__ThreadItem" });
 
-export type V2ThreadMetadataUpdateResponse__ThreadItem =
+export type V2ThreadReadResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadMetadataUpdateResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadReadResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadMetadataUpdateResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadReadResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadReadResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadMetadataUpdateResponse__MemoryCitation | null;
-      readonly phase?: V2ThreadMetadataUpdateResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadReadResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadReadResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadReadResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadReadResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -24025,137 +37966,133 @@ export type V2ThreadMetadataUpdateResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadMetadataUpdateResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadReadResponse__CommandAction>;
+      readonly cwd: V2ThreadReadResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadMetadataUpdateResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadReadResponse__CommandExecutionSource;
+      readonly status: V2ThreadReadResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadMetadataUpdateResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadReadResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadMetadataUpdateResponse__PatchApplyStatus;
+      readonly status: V2ThreadReadResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadMetadataUpdateResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadReadResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadMetadataUpdateResponse__McpToolCallError | null;
+      readonly error?: V2ThreadReadResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadReadResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadMetadataUpdateResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadReadResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadMetadataUpdateResponse__McpToolCallStatus;
+      readonly status: V2ThreadReadResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadReadResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadMetadataUpdateResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadReadResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: {
-        readonly [x: string]: V2ThreadMetadataUpdateResponse__CollabAgentState;
-      };
+      readonly agentsStates: { readonly [x: string]: V2ThreadReadResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadMetadataUpdateResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadReadResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadReadResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadReadResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadMetadataUpdateResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadReadResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadMetadataUpdateResponse__WebSearchAction | null;
+      readonly action?: V2ThreadReadResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadMetadataUpdateResponse__LegacyAppPathString;
+      readonly path: V2ThreadReadResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadReadResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadMetadataUpdateResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadReadResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
+export const V2ThreadReadResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadMetadataUpdateResponse__UserInput),
+      content: Schema.Array(V2ThreadReadResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadMetadataUpdateResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadReadResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadReadResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__MemoryCitation, Schema.Null]),
-      ),
-      phase: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__MessagePhase, Schema.Null]),
+        Schema.Union([V2ThreadReadResponse__MemoryCitation, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
+      phase: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__MessagePhase, Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2ThreadReadResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadReadResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -24181,17 +38118,20 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadMetadataUpdateResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadReadResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadReadResponse__LegacyAppPathString> =>
+          V2ThreadReadResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -24200,11 +38140,20 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -24213,65 +38162,80 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadReadResponse__CommandExecutionSource> =>
+            V2ThreadReadResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ThreadMetadataUpdateResponse__CommandExecutionStatus,
+      status: V2ThreadReadResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadMetadataUpdateResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadReadResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadMetadataUpdateResponse__PatchApplyStatus,
+      status: V2ThreadReadResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadReadResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadReadResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadReadResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadReadResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadMetadataUpdateResponse__McpToolCallStatus,
+      status: V2ThreadReadResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadMetadataUpdateResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadReadResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -24280,22 +38244,21 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadMetadataUpdateResponse__DynamicToolCallStatus,
+      status: V2ThreadReadResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(
-        Schema.String,
-        V2ThreadMetadataUpdateResponse__CollabAgentState,
-      ).annotate({ description: "Last known status of the target agents, when available." }),
+      agentsStates: Schema.Record(Schema.String, V2ThreadReadResponse__CollabAgentState).annotate({
+        description: "Last known status of the target agents, when available.",
+      }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -24314,7 +38277,7 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadReadResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -24325,20 +38288,14 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadReadResponse__CollabAgentToolCallStatus> =>
+          V2ThreadReadResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadReadResponse__CollabAgentTool> =>
+          V2ThreadReadResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -24347,20 +38304,20 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadMetadataUpdateResponse__SubAgentActivityKind,
+      kind: V2ThreadReadResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadReadResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -24371,13 +38328,17 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadMetadataUpdateResponse__LegacyAppPathString,
+      path: V2ThreadReadResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -24385,13 +38346,17 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadReadResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadMetadataUpdateResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadReadResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -24416,45 +38381,36 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadReadResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadReadResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadReadResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadReadResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+).annotate({ identifier: "V2ThreadReadResponse__ThreadItem" });
 
-export type V2ThreadReadResponse__ThreadItem =
+export type V2ThreadResumeResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadReadResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadResumeResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadReadResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadResumeResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadResumeResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadReadResponse__MemoryCitation | null;
-      readonly phase?: V2ThreadReadResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadResumeResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadResumeResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadResumeResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadResumeResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -24465,133 +38421,133 @@ export type V2ThreadReadResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadReadResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadResumeResponse__CommandAction>;
+      readonly cwd: V2ThreadResumeResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadReadResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadResumeResponse__CommandExecutionSource;
+      readonly status: V2ThreadResumeResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadReadResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadResumeResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadReadResponse__PatchApplyStatus;
+      readonly status: V2ThreadResumeResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadReadResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadResumeResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadReadResponse__McpToolCallError | null;
+      readonly error?: V2ThreadResumeResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadResumeResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadReadResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadResumeResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadReadResponse__McpToolCallStatus;
+      readonly status: V2ThreadResumeResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadReadResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadResumeResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadReadResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadResumeResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ThreadReadResponse__CollabAgentState };
+      readonly agentsStates: { readonly [x: string]: V2ThreadResumeResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadReadResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadResumeResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadResumeResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadResumeResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadReadResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadResumeResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadReadResponse__WebSearchAction | null;
+      readonly action?: V2ThreadResumeResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadReadResponse__LegacyAppPathString;
+      readonly path: V2ThreadResumeResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadResumeResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadReadResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadResumeResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadReadResponse__ThreadItem = Schema.Union(
+export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadReadResponse__UserInput),
+      content: Schema.Array(V2ThreadResumeResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadReadResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadResumeResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadResumeResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadReadResponse__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ThreadResumeResponse__MemoryCitation, Schema.Null]),
       ),
-      phase: Schema.optionalKey(Schema.Union([V2ThreadReadResponse__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
+      phase: Schema.optionalKey(Schema.Union([V2ThreadResumeResponse__MessagePhase, Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2ThreadResumeResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadResumeResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -24617,17 +38573,20 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadReadResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadResumeResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadResumeResponse__LegacyAppPathString> =>
+          V2ThreadResumeResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -24636,11 +38595,20 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -24649,65 +38617,80 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadResumeResponse__CommandExecutionSource> =>
+            V2ThreadResumeResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ThreadReadResponse__CommandExecutionStatus,
+      status: V2ThreadResumeResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadReadResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadResumeResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadReadResponse__PatchApplyStatus,
+      status: V2ThreadResumeResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadReadResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadResumeResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadReadResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadResumeResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadResumeResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadReadResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadResumeResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadReadResponse__McpToolCallStatus,
+      status: V2ThreadResumeResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadReadResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadResumeResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -24716,21 +38699,21 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadReadResponse__DynamicToolCallStatus,
+      status: V2ThreadResumeResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(Schema.String, V2ThreadReadResponse__CollabAgentState).annotate({
-        description: "Last known status of the target agents, when available.",
-      }),
+      agentsStates: Schema.Record(Schema.String, V2ThreadResumeResponse__CollabAgentState).annotate(
+        { description: "Last known status of the target agents, when available." },
+      ),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -24749,7 +38732,7 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadReadResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadResumeResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -24760,20 +38743,14 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadResumeResponse__CollabAgentToolCallStatus> =>
+          V2ThreadResumeResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadResumeResponse__CollabAgentTool> =>
+          V2ThreadResumeResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -24782,20 +38759,20 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadReadResponse__SubAgentActivityKind,
+      kind: V2ThreadResumeResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadReadResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadResumeResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -24806,13 +38783,17 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadReadResponse__LegacyAppPathString,
+      path: V2ThreadResumeResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -24820,13 +38801,17 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadResumeResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadReadResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadResumeResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -24851,53 +38836,36 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadResumeResponse__ThreadItem" });
 
-export type V2ThreadResumeParams__FunctionCallOutputBody =
-  | string
-  | ReadonlyArray<V2ThreadResumeParams__FunctionCallOutputContentItem>;
-export const V2ThreadResumeParams__FunctionCallOutputBody = Schema.Union([
-  Schema.String,
-  Schema.Array(V2ThreadResumeParams__FunctionCallOutputContentItem),
-]);
-
-export type V2ThreadResumeResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadResumeResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadResumeResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadResumeResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
-
-export type V2ThreadResumeResponse__ThreadItem =
+export type V2ThreadRevertResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadResumeResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadRevertResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadResumeResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadRevertResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadRevertResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadResumeResponse__MemoryCitation | null;
-      readonly phase?: V2ThreadResumeResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadRevertResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadRevertResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadRevertResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadRevertResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -24908,133 +38876,133 @@ export type V2ThreadResumeResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadResumeResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadRevertResponse__CommandAction>;
+      readonly cwd: V2ThreadRevertResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadResumeResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadRevertResponse__CommandExecutionSource;
+      readonly status: V2ThreadRevertResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadResumeResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadRevertResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadResumeResponse__PatchApplyStatus;
+      readonly status: V2ThreadRevertResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadResumeResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadRevertResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadResumeResponse__McpToolCallError | null;
+      readonly error?: V2ThreadRevertResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadRevertResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadResumeResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadRevertResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadResumeResponse__McpToolCallStatus;
+      readonly status: V2ThreadRevertResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadResumeResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadRevertResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadResumeResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadRevertResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ThreadResumeResponse__CollabAgentState };
+      readonly agentsStates: { readonly [x: string]: V2ThreadRevertResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadResumeResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadRevertResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadRevertResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadRevertResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadResumeResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadRevertResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadResumeResponse__WebSearchAction | null;
+      readonly action?: V2ThreadRevertResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadResumeResponse__LegacyAppPathString;
+      readonly path: V2ThreadRevertResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadRevertResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadResumeResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadRevertResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
+export const V2ThreadRevertResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadResumeResponse__UserInput),
+      content: Schema.Array(V2ThreadRevertResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadResumeResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadRevertResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadRevertResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadResumeResponse__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ThreadRevertResponse__MemoryCitation, Schema.Null]),
       ),
-      phase: Schema.optionalKey(Schema.Union([V2ThreadResumeResponse__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
+      phase: Schema.optionalKey(Schema.Union([V2ThreadRevertResponse__MessagePhase, Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2ThreadRevertResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadRevertResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -25060,17 +39028,20 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadResumeResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadRevertResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadRevertResponse__LegacyAppPathString> =>
+          V2ThreadRevertResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -25079,11 +39050,20 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -25092,65 +39072,80 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadRevertResponse__CommandExecutionSource> =>
+            V2ThreadRevertResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ThreadResumeResponse__CommandExecutionStatus,
+      status: V2ThreadRevertResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadResumeResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadRevertResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadResumeResponse__PatchApplyStatus,
+      status: V2ThreadRevertResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadResumeResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadRevertResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadResumeResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadRevertResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadRevertResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadResumeResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadRevertResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadResumeResponse__McpToolCallStatus,
+      status: V2ThreadRevertResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadResumeResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadRevertResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -25159,19 +39154,19 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadResumeResponse__DynamicToolCallStatus,
+      status: V2ThreadRevertResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(Schema.String, V2ThreadResumeResponse__CollabAgentState).annotate(
+      agentsStates: Schema.Record(Schema.String, V2ThreadRevertResponse__CollabAgentState).annotate(
         { description: "Last known status of the target agents, when available." },
       ),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
@@ -25192,7 +39187,7 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadResumeResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadRevertResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -25203,20 +39198,14 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadRevertResponse__CollabAgentToolCallStatus> =>
+          V2ThreadRevertResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadRevertResponse__CollabAgentTool> =>
+          V2ThreadRevertResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -25225,20 +39214,20 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadResumeResponse__SubAgentActivityKind,
+      kind: V2ThreadRevertResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadResumeResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadRevertResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -25249,13 +39238,17 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadResumeResponse__LegacyAppPathString,
+      path: V2ThreadRevertResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -25263,13 +39256,17 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadRevertResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadResumeResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadRevertResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -25294,45 +39291,83 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadRevertResponse__ThreadItem" });
 
-export type V2ThreadRollbackResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadRollbackResponse__CodexErrorInfo | null;
-  readonly message: string;
+export type V2ThreadSettingsUpdatedNotification__ThreadSettings = {
+  readonly activePermissionProfile?: V2ThreadSettingsUpdatedNotification__ActivePermissionProfile | null;
+  readonly approvalPolicy: V2ThreadSettingsUpdatedNotification__AskForApproval;
+  readonly approvalsReviewer: V2ThreadSettingsUpdatedNotification__ApprovalsReviewer;
+  readonly collaborationMode: V2ThreadSettingsUpdatedNotification__CollaborationMode;
+  readonly cwd: V2ThreadSettingsUpdatedNotification__AbsolutePathBuf;
+  readonly disabledPluginIds?: ReadonlyArray<string>;
+  readonly effort?: V2ThreadSettingsUpdatedNotification__ReasoningEffort | null;
+  readonly model: string;
+  readonly modelProvider: string;
+  readonly personality?: V2ThreadSettingsUpdatedNotification__Personality | null;
+  readonly sandboxPolicy: V2ThreadSettingsUpdatedNotification__SandboxPolicy;
+  readonly serviceTier?: string | null;
+  readonly summary?: V2ThreadSettingsUpdatedNotification__ReasoningSummary | null;
 };
-export const V2ThreadRollbackResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadRollbackResponse__CodexErrorInfo, Schema.Null]),
+export const V2ThreadSettingsUpdatedNotification__ThreadSettings = Schema.Struct({
+  activePermissionProfile: Schema.optionalKey(
+    Schema.Union([V2ThreadSettingsUpdatedNotification__ActivePermissionProfile, Schema.Null]),
   ),
-  message: Schema.String,
-});
+  approvalPolicy: V2ThreadSettingsUpdatedNotification__AskForApproval,
+  approvalsReviewer: V2ThreadSettingsUpdatedNotification__ApprovalsReviewer,
+  collaborationMode: V2ThreadSettingsUpdatedNotification__CollaborationMode,
+  cwd: V2ThreadSettingsUpdatedNotification__AbsolutePathBuf,
+  disabledPluginIds: Schema.optionalKey(
+    Schema.Array(Schema.String).annotate({
+      description: "Saved list of disabled plugin IDs. Does not yet filter plugin capabilities.",
+      default: [],
+    }),
+  ),
+  effort: Schema.optionalKey(
+    Schema.Union([V2ThreadSettingsUpdatedNotification__ReasoningEffort, Schema.Null]),
+  ),
+  model: Schema.String,
+  modelProvider: Schema.String,
+  personality: Schema.optionalKey(
+    Schema.Union([V2ThreadSettingsUpdatedNotification__Personality, Schema.Null]).annotate({
+      description:
+        "@deprecated Reports the saved setting; `friendly` and `pragmatic` no longer select a style.",
+    }),
+  ),
+  sandboxPolicy: V2ThreadSettingsUpdatedNotification__SandboxPolicy,
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  summary: Schema.optionalKey(
+    Schema.Union([V2ThreadSettingsUpdatedNotification__ReasoningSummary, Schema.Null]),
+  ),
+}).annotate({ identifier: "V2ThreadSettingsUpdatedNotification__ThreadSettings" });
 
-export type V2ThreadRollbackResponse__ThreadItem =
+export type V2ThreadStartedNotification__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadRollbackResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadStartedNotification__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadRollbackResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadStartedNotification__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadStartedNotification__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadRollbackResponse__MemoryCitation | null;
-      readonly phase?: V2ThreadRollbackResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadStartedNotification__MemoryCitation | null;
+      readonly phase?: V2ThreadStartedNotification__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadStartedNotification__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadStartedNotification__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -25343,135 +39378,140 @@ export type V2ThreadRollbackResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadRollbackResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadStartedNotification__CommandAction>;
+      readonly cwd: V2ThreadStartedNotification__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadRollbackResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadStartedNotification__CommandExecutionSource;
+      readonly status: V2ThreadStartedNotification__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadRollbackResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadStartedNotification__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadRollbackResponse__PatchApplyStatus;
+      readonly status: V2ThreadStartedNotification__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadRollbackResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadStartedNotification__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadRollbackResponse__McpToolCallError | null;
+      readonly error?: V2ThreadStartedNotification__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadStartedNotification__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadRollbackResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadStartedNotification__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadRollbackResponse__McpToolCallStatus;
+      readonly status: V2ThreadStartedNotification__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadRollbackResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadStartedNotification__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadRollbackResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadStartedNotification__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ThreadRollbackResponse__CollabAgentState };
+      readonly agentsStates: {
+        readonly [x: string]: V2ThreadStartedNotification__CollabAgentState;
+      };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadRollbackResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadStartedNotification__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadStartedNotification__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadStartedNotification__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadRollbackResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadStartedNotification__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadRollbackResponse__WebSearchAction | null;
+      readonly action?: V2ThreadStartedNotification__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadRollbackResponse__LegacyAppPathString;
+      readonly path: V2ThreadStartedNotification__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadStartedNotification__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadRollbackResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadStartedNotification__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
+export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadRollbackResponse__UserInput),
+      content: Schema.Array(V2ThreadStartedNotification__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadRollbackResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadStartedNotification__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadStartedNotification__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__MemoryCitation, Schema.Null]),
       ),
       phase: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__MessagePhase, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__MessagePhase, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2ThreadStartedNotification__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadStartedNotification__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -25497,17 +39537,20 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadRollbackResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadStartedNotification__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadStartedNotification__LegacyAppPathString> =>
+          V2ThreadStartedNotification__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -25516,11 +39559,20 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -25529,65 +39581,80 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
-      ),
-      status: V2ThreadRollbackResponse__CommandExecutionStatus,
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadStartedNotification__CommandExecutionSource> =>
+            V2ThreadStartedNotification__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
+      ),
+      status: V2ThreadStartedNotification__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadRollbackResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadStartedNotification__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadRollbackResponse__PatchApplyStatus,
+      status: V2ThreadStartedNotification__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadStartedNotification__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadRollbackResponse__McpToolCallStatus,
+      status: V2ThreadStartedNotification__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadRollbackResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadStartedNotification__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -25596,13 +39663,13 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadRollbackResponse__DynamicToolCallStatus,
+      status: V2ThreadStartedNotification__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
@@ -25610,7 +39677,7 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
     Schema.Struct({
       agentsStates: Schema.Record(
         Schema.String,
-        V2ThreadRollbackResponse__CollabAgentState,
+        V2ThreadStartedNotification__CollabAgentState,
       ).annotate({ description: "Last known status of the target agents, when available." }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
@@ -25630,7 +39697,7 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadStartedNotification__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -25641,20 +39708,14 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadStartedNotification__CollabAgentToolCallStatus> =>
+          V2ThreadStartedNotification__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadStartedNotification__CollabAgentTool> =>
+          V2ThreadStartedNotification__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -25663,20 +39724,20 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadRollbackResponse__SubAgentActivityKind,
+      kind: V2ThreadStartedNotification__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -25687,13 +39748,17 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadRollbackResponse__LegacyAppPathString,
+      path: V2ThreadStartedNotification__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -25701,13 +39766,17 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadStartedNotification__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadRollbackResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadStartedNotification__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -25732,54 +39801,36 @@ export const V2ThreadRollbackResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartedNotification__ThreadItem" });
 
-export type V2ThreadSettingsUpdatedNotification__CollaborationMode = {
-  readonly mode: V2ThreadSettingsUpdatedNotification__ModeKind;
-  readonly settings: V2ThreadSettingsUpdatedNotification__Settings;
-};
-export const V2ThreadSettingsUpdatedNotification__CollaborationMode = Schema.Struct({
-  mode: V2ThreadSettingsUpdatedNotification__ModeKind,
-  settings: V2ThreadSettingsUpdatedNotification__Settings,
-}).annotate({ description: "Collaboration mode for a Codex session." });
-
-export type V2ThreadStartedNotification__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadStartedNotification__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadStartedNotification__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadStartedNotification__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
-
-export type V2ThreadStartedNotification__ThreadItem =
+export type V2ThreadStartResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadStartedNotification__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadStartResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadStartedNotification__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadStartResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadStartResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadStartedNotification__MemoryCitation | null;
-      readonly phase?: V2ThreadStartedNotification__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadStartResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadStartResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadStartResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadStartResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -25790,137 +39841,133 @@ export type V2ThreadStartedNotification__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadStartedNotification__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadStartResponse__CommandAction>;
+      readonly cwd: V2ThreadStartResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadStartedNotification__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadStartResponse__CommandExecutionSource;
+      readonly status: V2ThreadStartResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadStartedNotification__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadStartResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadStartedNotification__PatchApplyStatus;
+      readonly status: V2ThreadStartResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadStartedNotification__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadStartResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadStartedNotification__McpToolCallError | null;
+      readonly error?: V2ThreadStartResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadStartResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadStartedNotification__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadStartResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadStartedNotification__McpToolCallStatus;
+      readonly status: V2ThreadStartResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadStartedNotification__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadStartResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadStartedNotification__DynamicToolCallStatus;
+      readonly status: V2ThreadStartResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: {
-        readonly [x: string]: V2ThreadStartedNotification__CollabAgentState;
-      };
+      readonly agentsStates: { readonly [x: string]: V2ThreadStartResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadStartedNotification__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadStartResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadStartResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadStartResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadStartedNotification__SubAgentActivityKind;
+      readonly kind: V2ThreadStartResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadStartedNotification__WebSearchAction | null;
+      readonly action?: V2ThreadStartResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadStartedNotification__LegacyAppPathString;
+      readonly path: V2ThreadStartResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadStartResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadStartedNotification__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadStartResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
+export const V2ThreadStartResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadStartedNotification__UserInput),
+      content: Schema.Array(V2ThreadStartResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadStartedNotification__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadStartResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadStartResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__MemoryCitation, Schema.Null]),
-      ),
-      phase: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__MessagePhase, Schema.Null]),
+        Schema.Union([V2ThreadStartResponse__MemoryCitation, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
+      phase: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__MessagePhase, Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2ThreadStartResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadStartResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -25946,17 +39993,20 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadStartedNotification__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadStartResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadStartResponse__LegacyAppPathString> =>
+          V2ThreadStartResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -25965,11 +40015,20 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -25978,65 +40037,80 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadStartResponse__CommandExecutionSource> =>
+            V2ThreadStartResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ThreadStartedNotification__CommandExecutionStatus,
+      status: V2ThreadStartResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadStartedNotification__FileUpdateChange),
+      changes: Schema.Array(V2ThreadStartResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadStartedNotification__PatchApplyStatus,
+      status: V2ThreadStartResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadStartResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadStartResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadStartResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadStartResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadStartedNotification__McpToolCallStatus,
+      status: V2ThreadStartResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadStartedNotification__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadStartResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -26045,22 +40119,21 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadStartedNotification__DynamicToolCallStatus,
+      status: V2ThreadStartResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(
-        Schema.String,
-        V2ThreadStartedNotification__CollabAgentState,
-      ).annotate({ description: "Last known status of the target agents, when available." }),
+      agentsStates: Schema.Record(Schema.String, V2ThreadStartResponse__CollabAgentState).annotate({
+        description: "Last known status of the target agents, when available.",
+      }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -26079,7 +40152,7 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadStartResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -26090,20 +40163,14 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadStartResponse__CollabAgentToolCallStatus> =>
+          V2ThreadStartResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadStartResponse__CollabAgentTool> =>
+          V2ThreadStartResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -26112,20 +40179,20 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadStartedNotification__SubAgentActivityKind,
+      kind: V2ThreadStartResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadStartResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -26136,13 +40203,17 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadStartedNotification__LegacyAppPathString,
+      path: V2ThreadStartResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -26150,13 +40221,17 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadStartResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadStartedNotification__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadStartResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -26181,45 +40256,36 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2ThreadStartResponse__ThreadItem" });
 
-export type V2ThreadStartResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadStartResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadStartResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadStartResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
-
-export type V2ThreadStartResponse__ThreadItem =
+export type V2ThreadTurnsListResponse__ThreadItem =
   | {
       readonly clientId?: string | null;
-      readonly content: ReadonlyArray<V2ThreadStartResponse__UserInput>;
+      readonly content: ReadonlyArray<V2ThreadTurnsListResponse__UserInput>;
       readonly id: string;
       readonly type: "userMessage";
     }
   | {
-      readonly fragments: ReadonlyArray<V2ThreadStartResponse__HookPromptFragment>;
+      readonly fragments: ReadonlyArray<V2ThreadTurnsListResponse__HookPromptFragment>;
       readonly id: string;
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadTurnsListResponse__AgentMessageDelivery | null;
       readonly id: string;
-      readonly memoryCitation?: V2ThreadStartResponse__MemoryCitation | null;
-      readonly phase?: V2ThreadStartResponse__MessagePhase | null;
+      readonly memoryCitation?: V2ThreadTurnsListResponse__MemoryCitation | null;
+      readonly phase?: V2ThreadTurnsListResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadTurnsListResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadTurnsListResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -26230,133 +40296,138 @@ export type V2ThreadStartResponse__ThreadItem =
   | {
       readonly aggregatedOutput?: string | null;
       readonly command: string;
-      readonly commandActions: ReadonlyArray<V2ThreadStartResponse__CommandAction>;
-      readonly cwd: string;
+      readonly commandActions: ReadonlyArray<V2ThreadTurnsListResponse__CommandAction>;
+      readonly cwd: V2ThreadTurnsListResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
-      readonly status: V2ThreadStartResponse__CommandExecutionStatus;
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadTurnsListResponse__CommandExecutionSource;
+      readonly status: V2ThreadTurnsListResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
   | {
-      readonly changes: ReadonlyArray<V2ThreadStartResponse__FileUpdateChange>;
+      readonly changes: ReadonlyArray<V2ThreadTurnsListResponse__FileUpdateChange>;
       readonly id: string;
-      readonly status: V2ThreadStartResponse__PatchApplyStatus;
+      readonly status: V2ThreadTurnsListResponse__PatchApplyStatus;
       readonly type: "fileChange";
     }
   | {
-      readonly appContext?: V2ThreadStartResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly appContext?: V2ThreadTurnsListResponse__McpToolCallAppContext | null;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
-      readonly error?: V2ThreadStartResponse__McpToolCallError | null;
+      readonly error?: V2ThreadTurnsListResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadTurnsListResponse__McpAppUi | null;
       readonly pluginId?: string | null;
-      readonly result?: V2ThreadStartResponse__McpToolCallResult | null;
+      readonly readOnlyHint?: boolean | null;
+      readonly result?: V2ThreadTurnsListResponse__McpToolCallResult | null;
       readonly server: string;
-      readonly status: V2ThreadStartResponse__McpToolCallStatus;
+      readonly status: V2ThreadTurnsListResponse__McpToolCallStatus;
       readonly tool: string;
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
-      readonly contentItems?: ReadonlyArray<V2ThreadStartResponse__DynamicToolCallOutputContentItem> | null;
+      readonly arguments: Schema.Json;
+      readonly contentItems?: ReadonlyArray<V2ThreadTurnsListResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
       readonly namespace?: string | null;
-      readonly status: V2ThreadStartResponse__DynamicToolCallStatus;
+      readonly status: V2ThreadTurnsListResponse__DynamicToolCallStatus;
       readonly success?: boolean | null;
       readonly tool: string;
       readonly type: "dynamicToolCall";
     }
   | {
-      readonly agentsStates: { readonly [x: string]: V2ThreadStartResponse__CollabAgentState };
+      readonly agentsStates: { readonly [x: string]: V2ThreadTurnsListResponse__CollabAgentState };
       readonly id: string;
       readonly model?: string | null;
       readonly prompt?: string | null;
-      readonly reasoningEffort?: V2ThreadStartResponse__ReasoningEffort | null;
+      readonly reasoningEffort?: V2ThreadTurnsListResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadTurnsListResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadTurnsListResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
       readonly agentPath: string;
       readonly agentThreadId: string;
       readonly id: string;
-      readonly kind: V2ThreadStartResponse__SubAgentActivityKind;
+      readonly kind: V2ThreadTurnsListResponse__SubAgentActivityKind;
       readonly type: "subAgentActivity";
     }
   | {
-      readonly action?: V2ThreadStartResponse__WebSearchAction | null;
+      readonly action?: V2ThreadTurnsListResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
       readonly id: string;
-      readonly path: V2ThreadStartResponse__LegacyAppPathString;
+      readonly path: V2ThreadTurnsListResponse__LegacyAppPathString;
       readonly type: "imageView";
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadTurnsListResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
-      readonly savedPath?: V2ThreadStartResponse__AbsolutePathBuf | null;
+      readonly savedPath?: V2ThreadTurnsListResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
   | { readonly id: string; readonly type: "contextCompaction" };
-export const V2ThreadStartResponse__ThreadItem = Schema.Union(
+export const V2ThreadTurnsListResponse__ThreadItem = Schema.Union(
   [
     Schema.Struct({
       clientId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      content: Schema.Array(V2ThreadStartResponse__UserInput),
+      content: Schema.Array(V2ThreadTurnsListResponse__UserInput),
       id: Schema.String,
       type: Schema.Literal("userMessage").annotate({ title: "UserMessageThreadItemType" }),
     }).annotate({ title: "UserMessageThreadItem" }),
     Schema.Struct({
-      fragments: Schema.Array(V2ThreadStartResponse__HookPromptFragment),
+      fragments: Schema.Array(V2ThreadTurnsListResponse__HookPromptFragment),
       id: Schema.String,
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadTurnsListResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
-        Schema.Union([V2ThreadStartResponse__MemoryCitation, Schema.Null]),
+        Schema.Union([V2ThreadTurnsListResponse__MemoryCitation, Schema.Null]),
+      ),
+      phase: Schema.optionalKey(
+        Schema.Union([V2ThreadTurnsListResponse__MessagePhase, Schema.Null]),
       ),
-      phase: Schema.optionalKey(Schema.Union([V2ThreadStartResponse__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2ThreadTurnsListResponse__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadTurnsListResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -26382,17 +40453,20 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
         ]),
       ),
       command: Schema.String.annotate({ description: "The command to be executed." }),
-      commandActions: Schema.Array(V2ThreadStartResponse__CommandAction).annotate({
+      commandActions: Schema.Array(V2ThreadTurnsListResponse__CommandAction).annotate({
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadTurnsListResponse__LegacyAppPathString> =>
+          V2ThreadTurnsListResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -26401,11 +40475,20 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -26414,65 +40497,80 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadTurnsListResponse__CommandExecutionSource> =>
+            V2ThreadTurnsListResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
-      status: V2ThreadStartResponse__CommandExecutionStatus,
+      status: V2ThreadTurnsListResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
         title: "CommandExecutionThreadItemType",
       }),
     }).annotate({ title: "CommandExecutionThreadItem" }),
     Schema.Struct({
-      changes: Schema.Array(V2ThreadStartResponse__FileUpdateChange),
+      changes: Schema.Array(V2ThreadTurnsListResponse__FileUpdateChange),
       id: Schema.String,
-      status: V2ThreadStartResponse__PatchApplyStatus,
+      status: V2ThreadTurnsListResponse__PatchApplyStatus,
       type: Schema.Literal("fileChange").annotate({ title: "FileChangeThreadItemType" }),
     }).annotate({ title: "FileChangeThreadItem" }),
     Schema.Struct({
       appContext: Schema.optionalKey(
-        Schema.Union([V2ThreadStartResponse__McpToolCallAppContext, Schema.Null]),
+        Schema.Union([V2ThreadTurnsListResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       error: Schema.optionalKey(
-        Schema.Union([V2ThreadStartResponse__McpToolCallError, Schema.Null]),
+        Schema.Union([V2ThreadTurnsListResponse__McpToolCallError, Schema.Null]),
       ),
       id: Schema.String,
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadTurnsListResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
-        Schema.Union([V2ThreadStartResponse__McpToolCallResult, Schema.Null]),
+        Schema.Union([V2ThreadTurnsListResponse__McpToolCallResult, Schema.Null]),
       ),
       server: Schema.String,
-      status: V2ThreadStartResponse__McpToolCallStatus,
+      status: V2ThreadTurnsListResponse__McpToolCallStatus,
       tool: Schema.String,
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(V2ThreadStartResponse__DynamicToolCallOutputContentItem),
+          Schema.Array(V2ThreadTurnsListResponse__DynamicToolCallOutputContentItem),
           Schema.Null,
         ]),
       ),
@@ -26481,21 +40579,22 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
       namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: V2ThreadStartResponse__DynamicToolCallStatus,
+      status: V2ThreadTurnsListResponse__DynamicToolCallStatus,
       success: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       tool: Schema.String,
       type: Schema.Literal("dynamicToolCall").annotate({ title: "DynamicToolCallThreadItemType" }),
     }).annotate({ title: "DynamicToolCallThreadItem" }),
     Schema.Struct({
-      agentsStates: Schema.Record(Schema.String, V2ThreadStartResponse__CollabAgentState).annotate({
-        description: "Last known status of the target agents, when available.",
-      }),
+      agentsStates: Schema.Record(
+        Schema.String,
+        V2ThreadTurnsListResponse__CollabAgentState,
+      ).annotate({ description: "Last known status of the target agents, when available." }),
       id: Schema.String.annotate({ description: "Unique identifier for this collab tool call." }),
       model: Schema.optionalKey(
         Schema.Union([
@@ -26514,7 +40613,7 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
         ]),
       ),
       reasoningEffort: Schema.optionalKey(
-        Schema.Union([V2ThreadStartResponse__ReasoningEffort, Schema.Null]).annotate({
+        Schema.Union([V2ThreadTurnsListResponse__ReasoningEffort, Schema.Null]).annotate({
           description: "Reasoning effort requested for the spawned agent, when applicable.",
         }),
       ),
@@ -26525,20 +40624,14 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadTurnsListResponse__CollabAgentToolCallStatus> =>
+          V2ThreadTurnsListResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadTurnsListResponse__CollabAgentTool> =>
+          V2ThreadTurnsListResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -26547,20 +40640,20 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
       agentPath: Schema.String,
       agentThreadId: Schema.String,
       id: Schema.String,
-      kind: V2ThreadStartResponse__SubAgentActivityKind,
+      kind: V2ThreadTurnsListResponse__SubAgentActivityKind,
       type: Schema.Literal("subAgentActivity").annotate({
         title: "SubAgentActivityThreadItemType",
       }),
     }).annotate({ title: "SubAgentActivityThreadItem" }),
     Schema.Struct({
       action: Schema.optionalKey(
-        Schema.Union([V2ThreadStartResponse__WebSearchAction, Schema.Null]),
+        Schema.Union([V2ThreadTurnsListResponse__WebSearchAction, Schema.Null]),
       ),
       id: Schema.String,
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -26571,13 +40664,17 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "WebSearchThreadItem" }),
     Schema.Struct({
       id: Schema.String,
-      path: V2ThreadStartResponse__LegacyAppPathString,
+      path: V2ThreadTurnsListResponse__LegacyAppPathString,
       type: Schema.Literal("imageView").annotate({ title: "ImageViewThreadItemType" }),
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -26585,13 +40682,17 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadTurnsListResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
-        Schema.Union([V2ThreadStartResponse__AbsolutePathBuf, Schema.Null]),
+        Schema.Union([V2ThreadTurnsListResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -26616,20 +40717,7 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2ThreadUnarchiveResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2ThreadUnarchiveResponse__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2ThreadUnarchiveResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadUnarchiveResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+).annotate({ identifier: "V2ThreadTurnsListResponse__ThreadItem" });
 
 export type V2ThreadUnarchiveResponse__ThreadItem =
   | {
@@ -26644,17 +40732,21 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2ThreadUnarchiveResponse__AgentMessageDelivery | null;
       readonly id: string;
       readonly memoryCitation?: V2ThreadUnarchiveResponse__MemoryCitation | null;
       readonly phase?: V2ThreadUnarchiveResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2ThreadUnarchiveResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2ThreadUnarchiveResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -26666,12 +40758,14 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
       readonly aggregatedOutput?: string | null;
       readonly command: string;
       readonly commandActions: ReadonlyArray<V2ThreadUnarchiveResponse__CommandAction>;
-      readonly cwd: string;
+      readonly cwd: V2ThreadUnarchiveResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
+      readonly scriptPath?: string | null;
+      readonly source?: V2ThreadUnarchiveResponse__CommandExecutionSource;
       readonly status: V2ThreadUnarchiveResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
@@ -26683,12 +40777,14 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
     }
   | {
       readonly appContext?: V2ThreadUnarchiveResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
       readonly error?: V2ThreadUnarchiveResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2ThreadUnarchiveResponse__McpAppUi | null;
       readonly pluginId?: string | null;
+      readonly readOnlyHint?: boolean | null;
       readonly result?: V2ThreadUnarchiveResponse__McpToolCallResult | null;
       readonly server: string;
       readonly status: V2ThreadUnarchiveResponse__McpToolCallStatus;
@@ -26696,7 +40792,7 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly contentItems?: ReadonlyArray<V2ThreadUnarchiveResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
@@ -26714,17 +40810,8 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
       readonly reasoningEffort?: V2ThreadUnarchiveResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2ThreadUnarchiveResponse__CollabAgentToolCallStatus;
+      readonly tool: V2ThreadUnarchiveResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
@@ -26738,7 +40825,7 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
       readonly action?: V2ThreadUnarchiveResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
@@ -26748,11 +40835,13 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2ThreadUnarchiveResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadUnarchiveResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
@@ -26772,6 +40861,9 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2ThreadUnarchiveResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
         Schema.Union([V2ThreadUnarchiveResponse__MemoryCitation, Schema.Null]),
@@ -26779,21 +40871,24 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       phase: Schema.optionalKey(
         Schema.Union([V2ThreadUnarchiveResponse__MessagePhase, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2ThreadUnarchiveResponse__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2ThreadUnarchiveResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -26823,13 +40918,16 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2ThreadUnarchiveResponse__LegacyAppPathString> =>
+          V2ThreadUnarchiveResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -26838,11 +40936,20 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -26851,13 +40958,20 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2ThreadUnarchiveResponse__CommandExecutionSource> =>
+            V2ThreadUnarchiveResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
       status: V2ThreadUnarchiveResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
@@ -26874,13 +40988,13 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       appContext: Schema.optionalKey(
         Schema.Union([V2ThreadUnarchiveResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -26891,12 +41005,20 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2ThreadUnarchiveResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
         Schema.Union([V2ThreadUnarchiveResponse__McpToolCallResult, Schema.Null]),
       ),
@@ -26906,7 +41028,7 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
           Schema.Array(V2ThreadUnarchiveResponse__DynamicToolCallOutputContentItem),
@@ -26918,7 +41040,7 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -26963,20 +41085,14 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2ThreadUnarchiveResponse__CollabAgentToolCallStatus> =>
+          V2ThreadUnarchiveResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2ThreadUnarchiveResponse__CollabAgentTool> =>
+          V2ThreadUnarchiveResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -26998,7 +41114,7 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -27014,8 +41130,12 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -27023,6 +41143,9 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2ThreadUnarchiveResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -27030,6 +41153,7 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadUnarchiveResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -27054,20 +41178,7 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnCompletedNotification__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2TurnCompletedNotification__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2TurnCompletedNotification__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2TurnCompletedNotification__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+).annotate({ identifier: "V2ThreadUnarchiveResponse__ThreadItem" });
 
 export type V2TurnCompletedNotification__ThreadItem =
   | {
@@ -27082,17 +41193,21 @@ export type V2TurnCompletedNotification__ThreadItem =
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2TurnCompletedNotification__AgentMessageDelivery | null;
       readonly id: string;
       readonly memoryCitation?: V2TurnCompletedNotification__MemoryCitation | null;
       readonly phase?: V2TurnCompletedNotification__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2TurnCompletedNotification__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2TurnCompletedNotification__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -27104,12 +41219,14 @@ export type V2TurnCompletedNotification__ThreadItem =
       readonly aggregatedOutput?: string | null;
       readonly command: string;
       readonly commandActions: ReadonlyArray<V2TurnCompletedNotification__CommandAction>;
-      readonly cwd: string;
+      readonly cwd: V2TurnCompletedNotification__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
+      readonly scriptPath?: string | null;
+      readonly source?: V2TurnCompletedNotification__CommandExecutionSource;
       readonly status: V2TurnCompletedNotification__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
@@ -27121,12 +41238,14 @@ export type V2TurnCompletedNotification__ThreadItem =
     }
   | {
       readonly appContext?: V2TurnCompletedNotification__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
       readonly error?: V2TurnCompletedNotification__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2TurnCompletedNotification__McpAppUi | null;
       readonly pluginId?: string | null;
+      readonly readOnlyHint?: boolean | null;
       readonly result?: V2TurnCompletedNotification__McpToolCallResult | null;
       readonly server: string;
       readonly status: V2TurnCompletedNotification__McpToolCallStatus;
@@ -27134,7 +41253,7 @@ export type V2TurnCompletedNotification__ThreadItem =
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly contentItems?: ReadonlyArray<V2TurnCompletedNotification__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
@@ -27154,17 +41273,8 @@ export type V2TurnCompletedNotification__ThreadItem =
       readonly reasoningEffort?: V2TurnCompletedNotification__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2TurnCompletedNotification__CollabAgentToolCallStatus;
+      readonly tool: V2TurnCompletedNotification__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
@@ -27178,7 +41288,7 @@ export type V2TurnCompletedNotification__ThreadItem =
       readonly action?: V2TurnCompletedNotification__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
@@ -27188,11 +41298,13 @@ export type V2TurnCompletedNotification__ThreadItem =
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2TurnCompletedNotification__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2TurnCompletedNotification__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
@@ -27212,6 +41324,9 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2TurnCompletedNotification__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
         Schema.Union([V2TurnCompletedNotification__MemoryCitation, Schema.Null]),
@@ -27219,21 +41334,24 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       phase: Schema.optionalKey(
         Schema.Union([V2TurnCompletedNotification__MessagePhase, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2TurnCompletedNotification__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2TurnCompletedNotification__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -27263,13 +41381,16 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2TurnCompletedNotification__LegacyAppPathString> =>
+          V2TurnCompletedNotification__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -27278,11 +41399,20 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -27291,13 +41421,20 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2TurnCompletedNotification__CommandExecutionSource> =>
+            V2TurnCompletedNotification__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
       status: V2TurnCompletedNotification__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
@@ -27314,13 +41451,13 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       appContext: Schema.optionalKey(
         Schema.Union([V2TurnCompletedNotification__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -27331,12 +41468,20 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2TurnCompletedNotification__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
         Schema.Union([V2TurnCompletedNotification__McpToolCallResult, Schema.Null]),
       ),
@@ -27346,7 +41491,7 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
           Schema.Array(V2TurnCompletedNotification__DynamicToolCallOutputContentItem),
@@ -27358,7 +41503,7 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -27403,20 +41548,14 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2TurnCompletedNotification__CollabAgentToolCallStatus> =>
+          V2TurnCompletedNotification__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2TurnCompletedNotification__CollabAgentTool> =>
+          V2TurnCompletedNotification__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -27438,7 +41577,7 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -27454,8 +41593,12 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -27463,6 +41606,9 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2TurnCompletedNotification__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -27470,6 +41616,7 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
         Schema.Union([V2TurnCompletedNotification__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -27494,20 +41641,7 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
-
-export type V2TurnStartedNotification__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2TurnStartedNotification__CodexErrorInfo | null;
-  readonly message: string;
-};
-export const V2TurnStartedNotification__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2TurnStartedNotification__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+).annotate({ identifier: "V2TurnCompletedNotification__ThreadItem" });
 
 export type V2TurnStartedNotification__ThreadItem =
   | {
@@ -27522,17 +41656,21 @@ export type V2TurnStartedNotification__ThreadItem =
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2TurnStartedNotification__AgentMessageDelivery | null;
       readonly id: string;
       readonly memoryCitation?: V2TurnStartedNotification__MemoryCitation | null;
       readonly phase?: V2TurnStartedNotification__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2TurnStartedNotification__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2TurnStartedNotification__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -27544,12 +41682,14 @@ export type V2TurnStartedNotification__ThreadItem =
       readonly aggregatedOutput?: string | null;
       readonly command: string;
       readonly commandActions: ReadonlyArray<V2TurnStartedNotification__CommandAction>;
-      readonly cwd: string;
+      readonly cwd: V2TurnStartedNotification__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
+      readonly scriptPath?: string | null;
+      readonly source?: V2TurnStartedNotification__CommandExecutionSource;
       readonly status: V2TurnStartedNotification__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
@@ -27561,12 +41701,14 @@ export type V2TurnStartedNotification__ThreadItem =
     }
   | {
       readonly appContext?: V2TurnStartedNotification__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
       readonly error?: V2TurnStartedNotification__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2TurnStartedNotification__McpAppUi | null;
       readonly pluginId?: string | null;
+      readonly readOnlyHint?: boolean | null;
       readonly result?: V2TurnStartedNotification__McpToolCallResult | null;
       readonly server: string;
       readonly status: V2TurnStartedNotification__McpToolCallStatus;
@@ -27574,7 +41716,7 @@ export type V2TurnStartedNotification__ThreadItem =
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly contentItems?: ReadonlyArray<V2TurnStartedNotification__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
@@ -27592,17 +41734,8 @@ export type V2TurnStartedNotification__ThreadItem =
       readonly reasoningEffort?: V2TurnStartedNotification__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2TurnStartedNotification__CollabAgentToolCallStatus;
+      readonly tool: V2TurnStartedNotification__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
@@ -27616,7 +41749,7 @@ export type V2TurnStartedNotification__ThreadItem =
       readonly action?: V2TurnStartedNotification__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
@@ -27626,11 +41759,13 @@ export type V2TurnStartedNotification__ThreadItem =
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2TurnStartedNotification__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2TurnStartedNotification__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
@@ -27650,6 +41785,9 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2TurnStartedNotification__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
         Schema.Union([V2TurnStartedNotification__MemoryCitation, Schema.Null]),
@@ -27657,21 +41795,24 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       phase: Schema.optionalKey(
         Schema.Union([V2TurnStartedNotification__MessagePhase, Schema.Null]),
       ),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
+          Schema.Array(V2TurnStartedNotification__AsyncUserInputQuestion),
           Schema.Null,
         ]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2TurnStartedNotification__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -27701,13 +41842,16 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2TurnStartedNotification__LegacyAppPathString> =>
+          V2TurnStartedNotification__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -27716,11 +41860,20 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -27729,13 +41882,20 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2TurnStartedNotification__CommandExecutionSource> =>
+            V2TurnStartedNotification__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
       status: V2TurnStartedNotification__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
@@ -27752,13 +41912,13 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       appContext: Schema.optionalKey(
         Schema.Union([V2TurnStartedNotification__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -27769,12 +41929,20 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2TurnStartedNotification__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
         Schema.Union([V2TurnStartedNotification__McpToolCallResult, Schema.Null]),
       ),
@@ -27784,7 +41952,7 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
           Schema.Array(V2TurnStartedNotification__DynamicToolCallOutputContentItem),
@@ -27796,7 +41964,7 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -27841,20 +42009,14 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2TurnStartedNotification__CollabAgentToolCallStatus> =>
+          V2TurnStartedNotification__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2TurnStartedNotification__CollabAgentTool> =>
+          V2TurnStartedNotification__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -27876,7 +42038,7 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -27892,8 +42054,12 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -27901,6 +42067,9 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2TurnStartedNotification__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -27908,6 +42077,7 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
         Schema.Union([V2TurnStartedNotification__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -27932,20 +42102,18 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartedNotification__ThreadItem" });
 
-export type V2TurnStartResponse__TurnError = {
-  readonly additionalDetails?: string | null;
-  readonly codexErrorInfo?: V2TurnStartResponse__CodexErrorInfo | null;
-  readonly message: string;
+export type V2TurnStartParams__TurnToolOutput = {
+  readonly name: string;
+  readonly namespace?: string | null;
+  readonly output: V2TurnStartParams__FunctionCallOutputBody;
 };
-export const V2TurnStartResponse__TurnError = Schema.Struct({
-  additionalDetails: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  codexErrorInfo: Schema.optionalKey(
-    Schema.Union([V2TurnStartResponse__CodexErrorInfo, Schema.Null]),
-  ),
-  message: Schema.String,
-});
+export const V2TurnStartParams__TurnToolOutput = Schema.Struct({
+  name: Schema.String,
+  namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  output: V2TurnStartParams__FunctionCallOutputBody,
+}).annotate({ identifier: "V2TurnStartParams__TurnToolOutput" });
 
 export type V2TurnStartResponse__ThreadItem =
   | {
@@ -27960,17 +42128,21 @@ export type V2TurnStartResponse__ThreadItem =
       readonly type: "hookPrompt";
     }
   | {
+      readonly delivery?: V2TurnStartResponse__AgentMessageDelivery | null;
       readonly id: string;
       readonly memoryCitation?: V2TurnStartResponse__MemoryCitation | null;
       readonly phase?: V2TurnStartResponse__MessagePhase | null;
+      readonly questions?: ReadonlyArray<V2TurnStartResponse__AsyncUserInputQuestion> | null;
       readonly text: string;
-      readonly delivery?: "async" | null;
-      readonly questions?: ReadonlyArray<{
-        readonly title: string;
-        readonly options?: ReadonlyArray<string> | null;
-      }> | null;
       readonly type: "agentMessage";
     }
+  | {
+      readonly id: string;
+      readonly name: string;
+      readonly namespace?: string | null;
+      readonly output: V2TurnStartResponse__FunctionCallOutputBody;
+      readonly type: "functionCallOutput";
+    }
   | { readonly id: string; readonly text: string; readonly type: "plan" }
   | {
       readonly content?: ReadonlyArray<string>;
@@ -27982,12 +42154,14 @@ export type V2TurnStartResponse__ThreadItem =
       readonly aggregatedOutput?: string | null;
       readonly command: string;
       readonly commandActions: ReadonlyArray<V2TurnStartResponse__CommandAction>;
-      readonly cwd: string;
+      readonly cwd: V2TurnStartResponse__LegacyAppPathString;
       readonly durationMs?: number | null;
       readonly exitCode?: number | null;
       readonly id: string;
+      readonly pluginId?: string | null;
       readonly processId?: string | null;
-      readonly source?: "agent" | "userShell" | "unifiedExecStartup" | "unifiedExecInteraction";
+      readonly scriptPath?: string | null;
+      readonly source?: V2TurnStartResponse__CommandExecutionSource;
       readonly status: V2TurnStartResponse__CommandExecutionStatus;
       readonly type: "commandExecution";
     }
@@ -27999,12 +42173,14 @@ export type V2TurnStartResponse__ThreadItem =
     }
   | {
       readonly appContext?: V2TurnStartResponse__McpToolCallAppContext | null;
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly durationMs?: number | null;
       readonly error?: V2TurnStartResponse__McpToolCallError | null;
       readonly id: string;
       readonly mcpAppResourceUri?: string | null;
+      readonly mcpAppUi?: V2TurnStartResponse__McpAppUi | null;
       readonly pluginId?: string | null;
+      readonly readOnlyHint?: boolean | null;
       readonly result?: V2TurnStartResponse__McpToolCallResult | null;
       readonly server: string;
       readonly status: V2TurnStartResponse__McpToolCallStatus;
@@ -28012,7 +42188,7 @@ export type V2TurnStartResponse__ThreadItem =
       readonly type: "mcpToolCall";
     }
   | {
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly contentItems?: ReadonlyArray<V2TurnStartResponse__DynamicToolCallOutputContentItem> | null;
       readonly durationMs?: number | null;
       readonly id: string;
@@ -28030,17 +42206,8 @@ export type V2TurnStartResponse__ThreadItem =
       readonly reasoningEffort?: V2TurnStartResponse__ReasoningEffort | null;
       readonly receiverThreadIds: ReadonlyArray<string>;
       readonly senderThreadId: string;
-      readonly status: "inProgress" | "completed" | "failed" | "interrupted";
-      readonly tool:
-        | "spawnAgent"
-        | "sendInput"
-        | "resumeAgent"
-        | "wait"
-        | "closeAgent"
-        | "sendMessage"
-        | "followupTask"
-        | "interruptAgent"
-        | "listAgents";
+      readonly status: V2TurnStartResponse__CollabAgentToolCallStatus;
+      readonly tool: V2TurnStartResponse__CollabAgentTool;
       readonly type: "collabAgentToolCall";
     }
   | {
@@ -28054,7 +42221,7 @@ export type V2TurnStartResponse__ThreadItem =
       readonly action?: V2TurnStartResponse__WebSearchAction | null;
       readonly id: string;
       readonly query: string;
-      readonly results?: ReadonlyArray<unknown> | null;
+      readonly results?: ReadonlyArray<Schema.Json> | null;
       readonly type: "webSearch";
     }
   | {
@@ -28064,11 +42231,13 @@ export type V2TurnStartResponse__ThreadItem =
     }
   | { readonly durationMs: number; readonly id: string; readonly type: "sleep" }
   | {
+      readonly failure?: V2TurnStartResponse__ImageGenerationFailure | null;
       readonly id: string;
       readonly result: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2TurnStartResponse__AbsolutePathBuf | null;
       readonly status: string;
+      readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
@@ -28088,26 +42257,29 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       type: Schema.Literal("hookPrompt").annotate({ title: "HookPromptThreadItemType" }),
     }).annotate({ title: "HookPromptThreadItem" }),
     Schema.Struct({
+      delivery: Schema.optionalKey(
+        Schema.Union([V2TurnStartResponse__AgentMessageDelivery, Schema.Null]),
+      ),
       id: Schema.String,
       memoryCitation: Schema.optionalKey(
         Schema.Union([V2TurnStartResponse__MemoryCitation, Schema.Null]),
       ),
       phase: Schema.optionalKey(Schema.Union([V2TurnStartResponse__MessagePhase, Schema.Null])),
-      text: Schema.String,
-      delivery: Schema.optionalKey(Schema.Union([Schema.Literal("async"), Schema.Null])),
       questions: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(
-            Schema.Struct({
-              title: Schema.String,
-              options: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
-            }),
-          ),
-          Schema.Null,
-        ]),
+        Schema.Union([Schema.Array(V2TurnStartResponse__AsyncUserInputQuestion), Schema.Null]),
       ),
+      text: Schema.String,
       type: Schema.Literal("agentMessage").annotate({ title: "AgentMessageThreadItemType" }),
     }).annotate({ title: "AgentMessageThreadItem" }),
+    Schema.Struct({
+      id: Schema.String,
+      name: Schema.String,
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      output: V2TurnStartResponse__FunctionCallOutputBody,
+      type: Schema.Literal("functionCallOutput").annotate({
+        title: "FunctionCallOutputThreadItemType",
+      }),
+    }).annotate({ title: "FunctionCallOutputThreadItem" }),
     Schema.Struct({
       id: Schema.String,
       text: Schema.String,
@@ -28137,13 +42309,16 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
         description:
           "A best-effort parsing of the command to understand the action(s) it will perform. This returns a list of CommandAction objects because a single shell command may be composed of many commands piped together.",
       }),
-      cwd: Schema.String.annotate({ description: "The command's working directory." }),
+      cwd: Schema.suspend(
+        (): Schema.Codec<V2TurnStartResponse__LegacyAppPathString> =>
+          V2TurnStartResponse__LegacyAppPathString,
+      ).annotate({ description: "The command's working directory." }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the command execution in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -28152,11 +42327,20 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The command's exit code.",
             format: "int32",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
       id: Schema.String,
+      pluginId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Trusted first-party plugin id when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       processId: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
@@ -28165,13 +42349,20 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
           Schema.Null,
         ]),
       ),
+      scriptPath: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Safe plugin-relative path when this command resolves to one plugin script.",
+          }),
+          Schema.Null,
+        ]),
+      ),
       source: Schema.optionalKey(
-        Schema.Literals([
-          "agent",
-          "userShell",
-          "unifiedExecStartup",
-          "unifiedExecInteraction",
-        ]).annotate({ default: "agent" }),
+        Schema.suspend(
+          (): Schema.Codec<V2TurnStartResponse__CommandExecutionSource> =>
+            V2TurnStartResponse__CommandExecutionSource,
+        ).annotate({ default: "agent" }),
       ),
       status: V2TurnStartResponse__CommandExecutionStatus,
       type: Schema.Literal("commandExecution").annotate({
@@ -28188,13 +42379,13 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       appContext: Schema.optionalKey(
         Schema.Union([V2TurnStartResponse__McpToolCallAppContext, Schema.Null]),
       ),
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       durationMs: Schema.optionalKey(
         Schema.Union([
           Schema.Number.annotate({
             description: "The duration of the MCP tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -28203,12 +42394,20 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       mcpAppResourceUri: Schema.optionalKey(
         Schema.Union([
           Schema.String.annotate({
-            description: "Deprecated: use `appContext.resourceUri` instead.",
+            description:
+              "Legacy compatibility field; prefer `mcpAppUi.resourceUri` when available.",
           }),
           Schema.Null,
         ]),
       ),
+      mcpAppUi: Schema.optionalKey(
+        Schema.Union([V2TurnStartResponse__McpAppUi, Schema.Null]).annotate({
+          description:
+            "Presentation captured from the invoked descriptor; absent in older history.",
+        }),
+      ),
       pluginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      readOnlyHint: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       result: Schema.optionalKey(
         Schema.Union([V2TurnStartResponse__McpToolCallResult, Schema.Null]),
       ),
@@ -28218,7 +42417,7 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       type: Schema.Literal("mcpToolCall").annotate({ title: "McpToolCallThreadItemType" }),
     }).annotate({ title: "McpToolCallThreadItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       contentItems: Schema.optionalKey(
         Schema.Union([
           Schema.Array(V2TurnStartResponse__DynamicToolCallOutputContentItem),
@@ -28230,7 +42429,7 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
           Schema.Number.annotate({
             description: "The duration of the dynamic tool call in milliseconds.",
             format: "int64",
-          }).check(Schema.isInt()),
+          }).check(Schema.isInt().annotate({ expected: "an integer" })),
           Schema.Null,
         ]),
       ),
@@ -28274,20 +42473,14 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       senderThreadId: Schema.String.annotate({
         description: "Thread ID of the agent issuing the collab request.",
       }),
-      status: Schema.Literals(["inProgress", "completed", "failed", "interrupted"]).annotate({
-        description: "Current status of the collab tool call.",
-      }),
-      tool: Schema.Literals([
-        "spawnAgent",
-        "sendInput",
-        "resumeAgent",
-        "wait",
-        "closeAgent",
-        "sendMessage",
-        "followupTask",
-        "interruptAgent",
-        "listAgents",
-      ]).annotate({ description: "Name of the collab tool that was invoked." }),
+      status: Schema.suspend(
+        (): Schema.Codec<V2TurnStartResponse__CollabAgentToolCallStatus> =>
+          V2TurnStartResponse__CollabAgentToolCallStatus,
+      ).annotate({ description: "Current status of the collab tool call." }),
+      tool: Schema.suspend(
+        (): Schema.Codec<V2TurnStartResponse__CollabAgentTool> =>
+          V2TurnStartResponse__CollabAgentTool,
+      ).annotate({ description: "Name of the collab tool that was invoked." }),
       type: Schema.Literal("collabAgentToolCall").annotate({
         title: "CollabAgentToolCallThreadItemType",
       }),
@@ -28307,7 +42500,7 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       query: Schema.String,
       results: Schema.optionalKey(
         Schema.Union([
-          Schema.Array(Schema.Unknown).annotate({
+          Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
             description:
               "Structured search results returned out-of-band by standalone web search.\n\nThese stay as opaque JSON at the extension/app-server boundary so new result fields and result types can pass through without a Codex release.",
           }),
@@ -28323,8 +42516,12 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ImageViewThreadItem" }),
     Schema.Struct({
       durationMs: Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       id: Schema.String,
       type: Schema.Literal("sleep").annotate({ title: "SleepThreadItemType" }),
     }).annotate({
@@ -28332,6 +42529,9 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       description: "Display item emitted by the interruptible `clock.sleep` tool.",
     }),
     Schema.Struct({
+      failure: Schema.optionalKey(
+        Schema.Union([V2TurnStartResponse__ImageGenerationFailure, Schema.Null]),
+      ),
       id: Schema.String,
       result: Schema.String,
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -28339,6 +42539,7 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
         Schema.Union([V2TurnStartResponse__AbsolutePathBuf, Schema.Null]),
       ),
       status: Schema.String,
+      transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
@@ -28363,200 +42564,275 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
     }).annotate({ title: "ContextCompactionThreadItem" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "V2TurnStartResponse__ThreadItem" });
 
-export type ClientRequest__ExternalAgentConfigImportParams = {
-  readonly migrationItems: ReadonlyArray<ClientRequest__ExternalAgentConfigMigrationItem>;
-  readonly migrationSource?: string | null;
-  readonly source?: string | null;
+export type ClientRequest__TurnStartParams = {
+  readonly approvalPolicy?: ClientRequest__AskForApproval | null;
+  readonly approvalsReviewer?: ClientRequest__ApprovalsReviewer | null;
+  readonly clientUserMessageId?: string | null;
+  readonly cwd?: string | null;
+  readonly disabledPluginIds?: ReadonlyArray<string> | null;
+  readonly effort?: ClientRequest__ReasoningEffort | null;
+  readonly input: ReadonlyArray<ClientRequest__UserInput>;
+  readonly model?: string | null;
+  readonly outputSchema?: Schema.Json;
+  readonly personality?: ClientRequest__Personality | null;
+  readonly sandboxPolicy?: ClientRequest__SandboxPolicy | null;
+  readonly serviceTier?: string | null;
+  readonly serviceTierForTurn?: string | null;
+  readonly summary?: ClientRequest__ReasoningSummary | null;
+  readonly threadId: string;
+  readonly toolOutput?: ClientRequest__TurnToolOutput | null;
+  readonly turnTrigger?: string | null;
 };
-export const ClientRequest__ExternalAgentConfigImportParams = Schema.Struct({
-  migrationItems: Schema.Array(ClientRequest__ExternalAgentConfigMigrationItem),
-  migrationSource: Schema.optionalKey(
+export const ClientRequest__TurnStartParams = Schema.Struct({
+  approvalPolicy: Schema.optionalKey(
+    Schema.Union([ClientRequest__AskForApproval, Schema.Null]).annotate({
+      description: "Override the approval policy for this turn and subsequent turns.",
+    }),
+  ),
+  approvalsReviewer: Schema.optionalKey(
+    Schema.Union([ClientRequest__ApprovalsReviewer, Schema.Null]).annotate({
+      description:
+        "Override where approval requests are routed for review on this turn and subsequent turns.",
+    }),
+  ),
+  clientUserMessageId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  cwd: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
+        description: "Override the working directory for this turn and subsequent turns.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  disabledPluginIds: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
         description:
-          "Migration-source selector used to produce the migration items. Pass the same value to detection and import; missing or unrecognized values use the default source.",
+          "Replace this thread's disabled plugin IDs. Omitted/null preserves the list; [] clears it.",
       }),
       Schema.Null,
     ]),
   ),
-  source: Schema.optionalKey(
+  effort: Schema.optionalKey(
+    Schema.Union([ClientRequest__ReasoningEffort, Schema.Null]).annotate({
+      description: "Override the reasoning effort for this turn and subsequent turns.",
+    }),
+  ),
+  input: Schema.Array(ClientRequest__UserInput),
+  model: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional identifier for the product that initiated the import.",
+        description: "Override the model for this turn and subsequent turns.",
       }),
       Schema.Null,
     ]),
   ),
-});
-
-export type CommandExecutionRequestApprovalParams__FileSystemSandboxEntry = {
-  readonly access: CommandExecutionRequestApprovalParams__FileSystemAccessMode;
-  readonly path: CommandExecutionRequestApprovalParams__FileSystemPath;
-};
-export const CommandExecutionRequestApprovalParams__FileSystemSandboxEntry = Schema.Struct({
-  access: CommandExecutionRequestApprovalParams__FileSystemAccessMode,
-  path: CommandExecutionRequestApprovalParams__FileSystemPath,
-});
-
-export type McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema =
-  | McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema
-  | McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema;
-export const McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema = Schema.Union([
-  McpServerElicitationRequestParams__McpElicitationUntitledMultiSelectEnumSchema,
-  McpServerElicitationRequestParams__McpElicitationTitledMultiSelectEnumSchema,
-]);
-
-export type PermissionsRequestApprovalParams__FileSystemSandboxEntry = {
-  readonly access: PermissionsRequestApprovalParams__FileSystemAccessMode;
-  readonly path: PermissionsRequestApprovalParams__FileSystemPath;
-};
-export const PermissionsRequestApprovalParams__FileSystemSandboxEntry = Schema.Struct({
-  access: PermissionsRequestApprovalParams__FileSystemAccessMode,
-  path: PermissionsRequestApprovalParams__FileSystemPath,
-});
-
-export type PermissionsRequestApprovalResponse__FileSystemSandboxEntry = {
-  readonly access: PermissionsRequestApprovalResponse__FileSystemAccessMode;
-  readonly path: PermissionsRequestApprovalResponse__FileSystemPath;
-};
-export const PermissionsRequestApprovalResponse__FileSystemSandboxEntry = Schema.Struct({
-  access: PermissionsRequestApprovalResponse__FileSystemAccessMode,
-  path: PermissionsRequestApprovalResponse__FileSystemPath,
-});
-
-export type ServerNotification__AppListUpdatedNotification = {
-  readonly data: ReadonlyArray<ServerNotification__AppInfo>;
-};
-export const ServerNotification__AppListUpdatedNotification = Schema.Struct({
-  data: Schema.Array(ServerNotification__AppInfo),
-}).annotate({ description: "EXPERIMENTAL - notification emitted when the app list changes." });
-
-export type ServerNotification__ExternalAgentConfigImportCompletedNotification = {
-  readonly importId: string;
-  readonly itemTypeResults: ReadonlyArray<ServerNotification__ExternalAgentConfigImportTypeResult>;
-};
-export const ServerNotification__ExternalAgentConfigImportCompletedNotification = Schema.Struct({
-  importId: Schema.String,
-  itemTypeResults: Schema.Array(ServerNotification__ExternalAgentConfigImportTypeResult),
-});
-
-export type ServerNotification__ExternalAgentConfigImportProgressNotification = {
-  readonly importId: string;
-  readonly itemTypeResults: ReadonlyArray<ServerNotification__ExternalAgentConfigImportTypeResult>;
-};
-export const ServerNotification__ExternalAgentConfigImportProgressNotification = Schema.Struct({
-  importId: Schema.String,
-  itemTypeResults: Schema.Array(ServerNotification__ExternalAgentConfigImportTypeResult),
-});
-
-export type ServerNotification__HookCompletedNotification = {
-  readonly run: ServerNotification__HookRunSummary;
-  readonly threadId: string;
-  readonly turnId?: string | null;
-};
-export const ServerNotification__HookCompletedNotification = Schema.Struct({
-  run: ServerNotification__HookRunSummary,
-  threadId: Schema.String,
-  turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type ServerNotification__HookStartedNotification = {
-  readonly run: ServerNotification__HookRunSummary;
-  readonly threadId: string;
-  readonly turnId?: string | null;
-};
-export const ServerNotification__HookStartedNotification = Schema.Struct({
-  run: ServerNotification__HookRunSummary,
+  outputSchema: Schema.optionalKey(
+    Schema.Json.annotate({
+      expected: "JSON value",
+      description:
+        "Optional JSON Schema used to constrain the final assistant message for this turn.",
+    }),
+  ),
+  personality: Schema.optionalKey(
+    Schema.Union([ClientRequest__Personality, Schema.Null]).annotate({
+      description:
+        "@deprecated `friendly` and `pragmatic` no longer select a style. Changing this does not rewrite the thread's existing instructions.",
+    }),
+  ),
+  sandboxPolicy: Schema.optionalKey(
+    Schema.Union([ClientRequest__SandboxPolicy, Schema.Null]).annotate({
+      description: "Override the sandbox policy for this turn and subsequent turns.",
+    }),
+  ),
+  serviceTier: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Override the service tier for this turn and subsequent turns.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  serviceTierForTurn: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Override the service tier only when this request starts a new turn. Use \"default\" for standard speed. Omitted or null inherits the thread's tier. Does not change the thread's tier or a turn being steered.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  summary: Schema.optionalKey(
+    Schema.Union([ClientRequest__ReasoningSummary, Schema.Null]).annotate({
+      description: "Override the reasoning summary for this turn and subsequent turns.",
+    }),
+  ),
   threadId: Schema.String,
-  turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
+  toolOutput: Schema.optionalKey(Schema.Union([ClientRequest__TurnToolOutput, Schema.Null])),
+  turnTrigger: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional source classification for the caller that starts this turn. Ignored when this request steers an already-active turn.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ClientRequest__TurnStartParams" });
 
-export type ServerNotification__FileSystemSandboxEntry = {
-  readonly access: ServerNotification__FileSystemAccessMode;
-  readonly path: ServerNotification__FileSystemPath;
+export type CommandExecutionRequestApprovalParams__AdditionalFileSystemPermissions = {
+  readonly entries?: ReadonlyArray<CommandExecutionRequestApprovalParams__FileSystemSandboxEntry> | null;
+  readonly globScanMaxDepth?: number | null;
+  readonly read?: ReadonlyArray<CommandExecutionRequestApprovalParams__LegacyAppPathString> | null;
+  readonly write?: ReadonlyArray<CommandExecutionRequestApprovalParams__LegacyAppPathString> | null;
 };
-export const ServerNotification__FileSystemSandboxEntry = Schema.Struct({
-  access: ServerNotification__FileSystemAccessMode,
-  path: ServerNotification__FileSystemPath,
+export const CommandExecutionRequestApprovalParams__AdditionalFileSystemPermissions = Schema.Struct(
+  {
+    entries: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(CommandExecutionRequestApprovalParams__FileSystemSandboxEntry),
+        Schema.Null,
+      ]),
+    ),
+    globScanMaxDepth: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(1).annotate({
+              expected: "a value greater than or equal to 1",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+    read: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(CommandExecutionRequestApprovalParams__LegacyAppPathString).annotate({
+          description: "This will be removed in favor of `entries`.",
+        }),
+        Schema.Null,
+      ]),
+    ),
+    write: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(CommandExecutionRequestApprovalParams__LegacyAppPathString).annotate({
+          description: "This will be removed in favor of `entries`.",
+        }),
+        Schema.Null,
+      ]),
+    ),
+  },
+).annotate({
+  identifier: "CommandExecutionRequestApprovalParams__AdditionalFileSystemPermissions",
 });
 
-export type ServerNotification__ErrorNotification = {
-  readonly error: ServerNotification__TurnError;
-  readonly threadId: string;
-  readonly turnId: string;
-  readonly willRetry: boolean;
-};
-export const ServerNotification__ErrorNotification = Schema.Struct({
-  error: ServerNotification__TurnError,
-  threadId: Schema.String,
-  turnId: Schema.String,
-  willRetry: Schema.Boolean,
-});
+export type McpServerElicitationRequestParams__McpElicitationEnumSchema =
+  | McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema
+  | McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema
+  | McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema;
+export const McpServerElicitationRequestParams__McpElicitationEnumSchema = Schema.Union([
+  McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema,
+  McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema,
+  McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema,
+]).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationEnumSchema" });
 
-export type ServerNotification__ThreadSettings = {
-  readonly activePermissionProfile?: ServerNotification__ActivePermissionProfile | null;
-  readonly approvalPolicy: ServerNotification__AskForApproval;
-  readonly approvalsReviewer: ServerNotification__ApprovalsReviewer;
-  readonly collaborationMode: ServerNotification__CollaborationMode;
-  readonly cwd: ServerNotification__AbsolutePathBuf;
-  readonly effort?: ServerNotification__ReasoningEffort | null;
-  readonly model: string;
-  readonly modelProvider: string;
-  readonly personality?: ServerNotification__Personality | null;
-  readonly sandboxPolicy: ServerNotification__SandboxPolicy;
-  readonly serviceTier?: string | null;
-  readonly summary?: ServerNotification__ReasoningSummary | null;
+export type PermissionsRequestApprovalParams__AdditionalFileSystemPermissions = {
+  readonly entries?: ReadonlyArray<PermissionsRequestApprovalParams__FileSystemSandboxEntry> | null;
+  readonly globScanMaxDepth?: number | null;
+  readonly read?: ReadonlyArray<PermissionsRequestApprovalParams__LegacyAppPathString> | null;
+  readonly write?: ReadonlyArray<PermissionsRequestApprovalParams__LegacyAppPathString> | null;
 };
-export const ServerNotification__ThreadSettings = Schema.Struct({
-  activePermissionProfile: Schema.optionalKey(
-    Schema.Union([ServerNotification__ActivePermissionProfile, Schema.Null]),
+export const PermissionsRequestApprovalParams__AdditionalFileSystemPermissions = Schema.Struct({
+  entries: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(PermissionsRequestApprovalParams__FileSystemSandboxEntry),
+      Schema.Null,
+    ]),
+  ),
+  globScanMaxDepth: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(1).annotate({
+            expected: "a value greater than or equal to 1",
+          }),
+        ),
+      Schema.Null,
+    ]),
   ),
-  approvalPolicy: ServerNotification__AskForApproval,
-  approvalsReviewer: ServerNotification__ApprovalsReviewer,
-  collaborationMode: ServerNotification__CollaborationMode,
-  cwd: ServerNotification__AbsolutePathBuf,
-  effort: Schema.optionalKey(Schema.Union([ServerNotification__ReasoningEffort, Schema.Null])),
-  model: Schema.String,
-  modelProvider: Schema.String,
-  personality: Schema.optionalKey(Schema.Union([ServerNotification__Personality, Schema.Null])),
-  sandboxPolicy: ServerNotification__SandboxPolicy,
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  summary: Schema.optionalKey(Schema.Union([ServerNotification__ReasoningSummary, Schema.Null])),
-});
+  read: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(PermissionsRequestApprovalParams__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  write: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(PermissionsRequestApprovalParams__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "PermissionsRequestApprovalParams__AdditionalFileSystemPermissions" });
 
-export type ServerNotification__ItemCompletedNotification = {
-  readonly completedAtMs: number;
-  readonly item: ServerNotification__ThreadItem;
-  readonly threadId: string;
-  readonly turnId: string;
+export type PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions = {
+  readonly entries?: ReadonlyArray<PermissionsRequestApprovalResponse__FileSystemSandboxEntry> | null;
+  readonly globScanMaxDepth?: number | null;
+  readonly read?: ReadonlyArray<PermissionsRequestApprovalResponse__LegacyAppPathString> | null;
+  readonly write?: ReadonlyArray<PermissionsRequestApprovalResponse__LegacyAppPathString> | null;
 };
-export const ServerNotification__ItemCompletedNotification = Schema.Struct({
-  completedAtMs: Schema.Number.annotate({
-    description: "Unix timestamp (in milliseconds) when this item lifecycle completed.",
-    format: "int64",
-  }).check(Schema.isInt()),
-  item: ServerNotification__ThreadItem,
-  threadId: Schema.String,
-  turnId: Schema.String,
-});
+export const PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions = Schema.Struct({
+  entries: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(PermissionsRequestApprovalResponse__FileSystemSandboxEntry),
+      Schema.Null,
+    ]),
+  ),
+  globScanMaxDepth: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(1).annotate({
+            expected: "a value greater than or equal to 1",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  read: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(PermissionsRequestApprovalResponse__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  write: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(PermissionsRequestApprovalResponse__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions" });
 
-export type ServerNotification__ItemStartedNotification = {
-  readonly item: ServerNotification__ThreadItem;
-  readonly startedAtMs: number;
+export type ServerNotification__ThreadSettingsUpdatedNotification = {
   readonly threadId: string;
-  readonly turnId: string;
+  readonly threadSettings: ServerNotification__ThreadSettings;
 };
-export const ServerNotification__ItemStartedNotification = Schema.Struct({
-  item: ServerNotification__ThreadItem,
-  startedAtMs: Schema.Number.annotate({
-    description: "Unix timestamp (in milliseconds) when this item lifecycle started.",
-    format: "int64",
-  }).check(Schema.isInt()),
+export const ServerNotification__ThreadSettingsUpdatedNotification = Schema.Struct({
   threadId: Schema.String,
-  turnId: Schema.String,
-});
+  threadSettings: ServerNotification__ThreadSettings,
+}).annotate({ identifier: "ServerNotification__ThreadSettingsUpdatedNotification" });
 
 export type ServerNotification__Turn = {
   readonly completedAt?: number | null;
@@ -28564,7 +42840,7 @@ export type ServerNotification__Turn = {
   readonly error?: ServerNotification__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<ServerNotification__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: ServerNotification__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: ServerNotification__TurnStatus;
 };
@@ -28574,7 +42850,7 @@ export const ServerNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -28583,13 +42859,13 @@ export const ServerNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([ServerNotification__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -28599,7 +42875,9 @@ export const ServerNotification__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<ServerNotification__TurnItemsView> => ServerNotification__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -28609,36 +42887,143 @@ export const ServerNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: ServerNotification__TurnStatus,
-});
+}).annotate({ identifier: "ServerNotification__Turn" });
 
-export type ServerRequest__FileSystemSandboxEntry = {
-  readonly access: ServerRequest__FileSystemAccessMode;
-  readonly path: ServerRequest__FileSystemPath;
+export type ServerNotification__ItemStartedNotification = {
+  readonly item: ServerNotification__ThreadItem;
+  readonly startedAtMs: number;
+  readonly threadId: string;
+  readonly turnId: string;
 };
-export const ServerRequest__FileSystemSandboxEntry = Schema.Struct({
-  access: ServerRequest__FileSystemAccessMode,
-  path: ServerRequest__FileSystemPath,
-});
+export const ServerNotification__ItemStartedNotification = Schema.Struct({
+  item: ServerNotification__ThreadItem,
+  startedAtMs: Schema.Number.annotate({
+    description: "Unix timestamp (in milliseconds) when this item lifecycle started.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ItemStartedNotification" });
 
-export type ServerRequest__McpElicitationMultiSelectEnumSchema =
-  | ServerRequest__McpElicitationUntitledMultiSelectEnumSchema
-  | ServerRequest__McpElicitationTitledMultiSelectEnumSchema;
-export const ServerRequest__McpElicitationMultiSelectEnumSchema = Schema.Union([
-  ServerRequest__McpElicitationUntitledMultiSelectEnumSchema,
-  ServerRequest__McpElicitationTitledMultiSelectEnumSchema,
-]);
+export type ServerNotification__ItemCompletedNotification = {
+  readonly completedAtMs: number;
+  readonly item: ServerNotification__ThreadItem;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const ServerNotification__ItemCompletedNotification = Schema.Struct({
+  completedAtMs: Schema.Number.annotate({
+    description: "Unix timestamp (in milliseconds) when this item lifecycle completed.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  item: ServerNotification__ThreadItem,
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ identifier: "ServerNotification__ItemCompletedNotification" });
+
+export type ServerNotification__AdditionalFileSystemPermissions = {
+  readonly entries?: ReadonlyArray<ServerNotification__FileSystemSandboxEntry> | null;
+  readonly globScanMaxDepth?: number | null;
+  readonly read?: ReadonlyArray<ServerNotification__LegacyAppPathString> | null;
+  readonly write?: ReadonlyArray<ServerNotification__LegacyAppPathString> | null;
+};
+export const ServerNotification__AdditionalFileSystemPermissions = Schema.Struct({
+  entries: Schema.optionalKey(
+    Schema.Union([Schema.Array(ServerNotification__FileSystemSandboxEntry), Schema.Null]),
+  ),
+  globScanMaxDepth: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(1).annotate({
+            expected: "a value greater than or equal to 1",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  read: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ServerNotification__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  write: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ServerNotification__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerNotification__AdditionalFileSystemPermissions" });
+
+export type ServerRequest__AdditionalFileSystemPermissions = {
+  readonly entries?: ReadonlyArray<ServerRequest__FileSystemSandboxEntry> | null;
+  readonly globScanMaxDepth?: number | null;
+  readonly read?: ReadonlyArray<ServerRequest__LegacyAppPathString> | null;
+  readonly write?: ReadonlyArray<ServerRequest__LegacyAppPathString> | null;
+};
+export const ServerRequest__AdditionalFileSystemPermissions = Schema.Struct({
+  entries: Schema.optionalKey(
+    Schema.Union([Schema.Array(ServerRequest__FileSystemSandboxEntry), Schema.Null]),
+  ),
+  globScanMaxDepth: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(1).annotate({
+            expected: "a value greater than or equal to 1",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  read: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ServerRequest__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  write: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(ServerRequest__LegacyAppPathString).annotate({
+        description: "This will be removed in favor of `entries`.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ identifier: "ServerRequest__AdditionalFileSystemPermissions" });
+
+export type ServerRequest__McpElicitationEnumSchema =
+  | ServerRequest__McpElicitationSingleSelectEnumSchema
+  | ServerRequest__McpElicitationMultiSelectEnumSchema
+  | ServerRequest__McpElicitationLegacyTitledEnumSchema;
+export const ServerRequest__McpElicitationEnumSchema = Schema.Union([
+  ServerRequest__McpElicitationSingleSelectEnumSchema,
+  ServerRequest__McpElicitationMultiSelectEnumSchema,
+  ServerRequest__McpElicitationLegacyTitledEnumSchema,
+]).annotate({ identifier: "ServerRequest__McpElicitationEnumSchema" });
 
 export type V2ConfigReadResponse__Config = {
   readonly analytics?: V2ConfigReadResponse__AnalyticsConfig | null;
   readonly approval_policy?: V2ConfigReadResponse__AskForApproval | null;
   readonly approvals_reviewer?: V2ConfigReadResponse__ApprovalsReviewer | null;
+  readonly browser_use?: V2ConfigReadResponse__BrowserUseConfig | null;
   readonly compact_prompt?: string | null;
-  readonly desktop?: { readonly [x: string]: unknown } | null;
+  readonly computer_use?: V2ConfigReadResponse__ComputerUseConfig | null;
+  readonly desktop?: { readonly [x: string]: Schema.Json } | null;
   readonly developer_instructions?: string | null;
   readonly forced_chatgpt_workspace_id?: V2ConfigReadResponse__ForcedChatgptWorkspaceIds | null;
   readonly forced_login_method?: V2ConfigReadResponse__ForcedLoginMethod | null;
@@ -28657,8 +43042,7 @@ export type V2ConfigReadResponse__Config = {
   readonly service_tier?: string | null;
   readonly tools?: V2ConfigReadResponse__ToolsV2 | null;
   readonly web_search?: V2ConfigReadResponse__WebSearchMode | null;
-  readonly [x: string]: unknown;
-};
+} & { readonly [x: string]: Schema.Json };
 export const V2ConfigReadResponse__Config = Schema.StructWithRest(
   Schema.Struct({
     analytics: Schema.optionalKey(
@@ -28673,9 +43057,18 @@ export const V2ConfigReadResponse__Config = Schema.StructWithRest(
           "[UNSTABLE] Optional default for where approval requests are routed for review.",
       }),
     ),
+    browser_use: Schema.optionalKey(
+      Schema.Union([V2ConfigReadResponse__BrowserUseConfig, Schema.Null]),
+    ),
     compact_prompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+    computer_use: Schema.optionalKey(
+      Schema.Union([V2ConfigReadResponse__ComputerUseConfig, Schema.Null]),
+    ),
     desktop: Schema.optionalKey(
-      Schema.Union([Schema.Record(Schema.String, Schema.Unknown), Schema.Null]),
+      Schema.Union([
+        Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
+        Schema.Null,
+      ]),
     ),
     developer_instructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
     forced_chatgpt_workspace_id: Schema.optionalKey(
@@ -28688,7 +43081,9 @@ export const V2ConfigReadResponse__Config = Schema.StructWithRest(
     model: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
     model_auto_compact_token_limit: Schema.optionalKey(
       Schema.Union([
-        Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+        Schema.Number.annotate({ format: "int64" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
         Schema.Null,
       ]),
     ),
@@ -28697,7 +43092,9 @@ export const V2ConfigReadResponse__Config = Schema.StructWithRest(
     ),
     model_context_window: Schema.optionalKey(
       Schema.Union([
-        Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+        Schema.Number.annotate({ format: "int64" }).check(
+          Schema.isInt().annotate({ expected: "an integer" }),
+        ),
         Schema.Null,
       ]),
     ),
@@ -28724,31 +43121,59 @@ export const V2ConfigReadResponse__Config = Schema.StructWithRest(
       Schema.Union([V2ConfigReadResponse__WebSearchMode, Schema.Null]),
     ),
   }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-);
+  [Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" }))],
+).annotate({ identifier: "V2ConfigReadResponse__Config" });
 
 export type V2ConfigRequirementsReadResponse__ConfigRequirements = {
+  readonly additionalDeveloperInstructions?: string | null;
   readonly allowAppshots?: boolean | null;
+  readonly allowBrowserAndComputerUse?: boolean | null;
+  readonly allowLoginShell?: boolean | null;
   readonly allowManagedHooksOnly?: boolean | null;
   readonly allowRemoteControl?: boolean | null;
   readonly allowedApprovalPolicies?: ReadonlyArray<V2ConfigRequirementsReadResponse__AskForApproval> | null;
+  readonly allowedLoginMethods?: ReadonlyArray<V2ConfigRequirementsReadResponse__ForcedLoginMethod> | null;
   readonly allowedPermissionProfiles?: { readonly [x: string]: boolean } | null;
   readonly allowedSandboxModes?: ReadonlyArray<V2ConfigRequirementsReadResponse__SandboxMode> | null;
   readonly allowedWebSearchModes?: ReadonlyArray<V2ConfigRequirementsReadResponse__WebSearchMode> | null;
-  readonly allowedWindowsSandboxImplementations?: ReadonlyArray<V2ConfigRequirementsReadResponse__WindowsSandboxSetupMode> | null;
+  readonly allowedWindowsSandboxImplementations?: ReadonlyArray<V2ConfigRequirementsReadResponse__WindowsSandboxImplementation> | null;
+  readonly autoReview?: V2ConfigRequirementsReadResponse__AutoReviewRequirements | null;
+  readonly browserUse?: V2ConfigRequirementsReadResponse__BrowserUseRequirements | null;
+  readonly chatgptBaseUrl?: string | null;
+  readonly checkForUpdateOnStartup?: boolean | null;
+  readonly cliAuthCredentialsStore?: V2ConfigRequirementsReadResponse__CliAuthCredentialsStoreMode | null;
   readonly computerUse?: V2ConfigRequirementsReadResponse__ComputerUseRequirements | null;
   readonly defaultPermissions?: string | null;
   readonly enforceResidency?: V2ConfigRequirementsReadResponse__ResidencyRequirement | null;
   readonly featureRequirements?: { readonly [x: string]: boolean } | null;
+  readonly feedback?: V2ConfigRequirementsReadResponse__FeedbackRequirements | null;
+  readonly inAppBrowser?: V2ConfigRequirementsReadResponse__InAppBrowserRequirements | null;
+  readonly logDir?: string | null;
+  readonly modelCatalogJson?: string | null;
+  readonly modelProvider?: string | null;
+  readonly modelProviders?: { readonly [x: string]: Schema.Json } | null;
   readonly models?: V2ConfigRequirementsReadResponse__ModelsRequirements | null;
+  readonly sqliteHome?: string | null;
 };
 export const V2ConfigRequirementsReadResponse__ConfigRequirements = Schema.Struct({
+  additionalDeveloperInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   allowAppshots: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  allowBrowserAndComputerUse: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  allowLoginShell: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   allowManagedHooksOnly: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   allowRemoteControl: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   allowedApprovalPolicies: Schema.optionalKey(
     Schema.Union([Schema.Array(V2ConfigRequirementsReadResponse__AskForApproval), Schema.Null]),
   ),
+  allowedLoginMethods: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(V2ConfigRequirementsReadResponse__ForcedLoginMethod).annotate({
+        description:
+          "Effective login methods after managed, forced-login, and workspace restrictions. An empty list permits no login method. Older servers may omit this field.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   allowedPermissionProfiles: Schema.optionalKey(
     Schema.Union([Schema.Record(Schema.String, Schema.Boolean), Schema.Null]),
   ),
@@ -28760,10 +43185,21 @@ export const V2ConfigRequirementsReadResponse__ConfigRequirements = Schema.Struc
   ),
   allowedWindowsSandboxImplementations: Schema.optionalKey(
     Schema.Union([
-      Schema.Array(V2ConfigRequirementsReadResponse__WindowsSandboxSetupMode),
+      Schema.Array(V2ConfigRequirementsReadResponse__WindowsSandboxImplementation),
       Schema.Null,
     ]),
   ),
+  autoReview: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__AutoReviewRequirements, Schema.Null]),
+  ),
+  browserUse: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__BrowserUseRequirements, Schema.Null]),
+  ),
+  chatgptBaseUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  checkForUpdateOnStartup: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
+  cliAuthCredentialsStore: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__CliAuthCredentialsStoreMode, Schema.Null]),
+  ),
   computerUse: Schema.optionalKey(
     Schema.Union([V2ConfigRequirementsReadResponse__ComputerUseRequirements, Schema.Null]),
   ),
@@ -28774,662 +43210,216 @@ export const V2ConfigRequirementsReadResponse__ConfigRequirements = Schema.Struc
   featureRequirements: Schema.optionalKey(
     Schema.Union([Schema.Record(Schema.String, Schema.Boolean), Schema.Null]),
   ),
-  models: Schema.optionalKey(
-    Schema.Union([V2ConfigRequirementsReadResponse__ModelsRequirements, Schema.Null]),
-  ),
-});
-
-export type V2ConfigWriteResponse__OverriddenMetadata = {
-  readonly effectiveValue: unknown;
-  readonly message: string;
-  readonly overridingLayer: V2ConfigWriteResponse__ConfigLayerMetadata;
-};
-export const V2ConfigWriteResponse__OverriddenMetadata = Schema.Struct({
-  effectiveValue: Schema.Unknown,
-  message: Schema.String,
-  overridingLayer: V2ConfigWriteResponse__ConfigLayerMetadata,
-});
-
-export type V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry = {
-  readonly access: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode;
-  readonly path: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath;
-};
-export const V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry =
-  Schema.Struct({
-    access: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemAccessMode,
-    path: V2ItemGuardianApprovalReviewCompletedNotification__FileSystemPath,
-  });
-
-export type V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry = {
-  readonly access: V2ItemGuardianApprovalReviewStartedNotification__FileSystemAccessMode;
-  readonly path: V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath;
-};
-export const V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry =
-  Schema.Struct({
-    access: V2ItemGuardianApprovalReviewStartedNotification__FileSystemAccessMode,
-    path: V2ItemGuardianApprovalReviewStartedNotification__FileSystemPath,
-  });
-
-export type V2PluginInstalledResponse__PluginSummary = {
-  readonly authPolicy: V2PluginInstalledResponse__PluginAuthPolicy;
-  readonly availability?: "DISABLED_BY_ADMIN" | "AVAILABLE";
-  readonly enabled: boolean;
-  readonly id: string;
-  readonly installPolicy: V2PluginInstalledResponse__PluginInstallPolicy;
-  readonly installPolicySource?: V2PluginInstalledResponse__PluginInstallPolicySource | null;
-  readonly installed: boolean;
-  readonly interface?: V2PluginInstalledResponse__PluginInterface | null;
-  readonly keywords?: ReadonlyArray<string>;
-  readonly localVersion?: string | null;
-  readonly mustShowInstallationInterstitial?: boolean | null;
-  readonly name: string;
-  readonly remotePluginId?: string | null;
-  readonly shareContext?: V2PluginInstalledResponse__PluginShareContext | null;
-  readonly source: V2PluginInstalledResponse__PluginSource;
-  readonly version?: string | null;
-};
-export const V2PluginInstalledResponse__PluginSummary = Schema.Struct({
-  authPolicy: V2PluginInstalledResponse__PluginAuthPolicy,
-  availability: Schema.optionalKey(
-    Schema.Literals(["DISABLED_BY_ADMIN", "AVAILABLE"]).annotate({
-      description: "Availability state for installing and using the plugin.",
-      default: "AVAILABLE",
-    }),
-  ),
-  enabled: Schema.Boolean,
-  id: Schema.String,
-  installPolicy: V2PluginInstalledResponse__PluginInstallPolicy,
-  installPolicySource: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__PluginInstallPolicySource, Schema.Null]),
+  feedback: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__FeedbackRequirements, Schema.Null]),
   ),
-  installed: Schema.Boolean,
-  interface: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__PluginInterface, Schema.Null]),
+  inAppBrowser: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__InAppBrowserRequirements, Schema.Null]),
   ),
-  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-  localVersion: Schema.optionalKey(
+  logDir: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  modelCatalogJson: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  modelProvider: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Version of the locally materialized plugin package when available.",
+        description: "Exact provider selection required by managed policy.",
       }),
       Schema.Null,
     ]),
   ),
-  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  name: Schema.String,
-  remotePluginId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
-      Schema.Null,
-    ]),
-  ),
-  shareContext: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__PluginShareContext, Schema.Null]).annotate({
-      description: "Remote sharing context associated with this plugin when available.",
-    }),
-  ),
-  source: V2PluginInstalledResponse__PluginSource,
-  version: Schema.optionalKey(
+  modelProviders: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({
-        description: "Version advertised by the remote marketplace backend when available.",
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })).annotate({
+        description: "Complete required provider definitions, using config.toml field names.",
       }),
       Schema.Null,
     ]),
   ),
-});
+  models: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__ModelsRequirements, Schema.Null]),
+  ),
+  sqliteHome: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ identifier: "V2ConfigRequirementsReadResponse__ConfigRequirements" });
 
-export type V2PluginListResponse__PluginSummary = {
-  readonly authPolicy: V2PluginListResponse__PluginAuthPolicy;
-  readonly availability?: "DISABLED_BY_ADMIN" | "AVAILABLE";
-  readonly enabled: boolean;
-  readonly id: string;
-  readonly installPolicy: V2PluginListResponse__PluginInstallPolicy;
-  readonly installPolicySource?: V2PluginListResponse__PluginInstallPolicySource | null;
-  readonly installed: boolean;
-  readonly interface?: V2PluginListResponse__PluginInterface | null;
-  readonly keywords?: ReadonlyArray<string>;
-  readonly localVersion?: string | null;
-  readonly mustShowInstallationInterstitial?: boolean | null;
-  readonly name: string;
-  readonly remotePluginId?: string | null;
-  readonly shareContext?: V2PluginListResponse__PluginShareContext | null;
-  readonly source: V2PluginListResponse__PluginSource;
-  readonly version?: string | null;
+export type V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions = {
+  readonly entries?: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry> | null;
+  readonly globScanMaxDepth?: number | null;
+  readonly read?: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString> | null;
+  readonly write?: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString> | null;
 };
-export const V2PluginListResponse__PluginSummary = Schema.Struct({
-  authPolicy: V2PluginListResponse__PluginAuthPolicy,
-  availability: Schema.optionalKey(
-    Schema.Literals(["DISABLED_BY_ADMIN", "AVAILABLE"]).annotate({
-      description: "Availability state for installing and using the plugin.",
-      default: "AVAILABLE",
-    }),
-  ),
-  enabled: Schema.Boolean,
-  id: Schema.String,
-  installPolicy: V2PluginListResponse__PluginInstallPolicy,
-  installPolicySource: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__PluginInstallPolicySource, Schema.Null]),
-  ),
-  installed: Schema.Boolean,
-  interface: Schema.optionalKey(Schema.Union([V2PluginListResponse__PluginInterface, Schema.Null])),
-  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-  localVersion: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version of the locally materialized plugin package when available.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  name: Schema.String,
-  remotePluginId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
-      Schema.Null,
-    ]),
-  ),
-  shareContext: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__PluginShareContext, Schema.Null]).annotate({
-      description: "Remote sharing context associated with this plugin when available.",
-    }),
-  ),
-  source: V2PluginListResponse__PluginSource,
-  version: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version advertised by the remote marketplace backend when available.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export const V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions =
+  Schema.Struct({
+    entries: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry),
+        Schema.Null,
+      ]),
+    ),
+    globScanMaxDepth: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(1).annotate({
+              expected: "a value greater than or equal to 1",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+    read: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(
+          V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
+        ).annotate({ description: "This will be removed in favor of `entries`." }),
+        Schema.Null,
+      ]),
+    ),
+    write: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(
+          V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
+        ).annotate({ description: "This will be removed in favor of `entries`." }),
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    identifier:
+      "V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions",
+  });
 
-export type V2PluginReadResponse__PluginSummary = {
-  readonly authPolicy: V2PluginReadResponse__PluginAuthPolicy;
-  readonly availability?: "DISABLED_BY_ADMIN" | "AVAILABLE";
-  readonly enabled: boolean;
-  readonly id: string;
-  readonly installPolicy: V2PluginReadResponse__PluginInstallPolicy;
-  readonly installPolicySource?: V2PluginReadResponse__PluginInstallPolicySource | null;
-  readonly installed: boolean;
-  readonly interface?: V2PluginReadResponse__PluginInterface | null;
-  readonly keywords?: ReadonlyArray<string>;
-  readonly localVersion?: string | null;
-  readonly mustShowInstallationInterstitial?: boolean | null;
+export type V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions = {
+  readonly entries?: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry> | null;
+  readonly globScanMaxDepth?: number | null;
+  readonly read?: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString> | null;
+  readonly write?: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString> | null;
+};
+export const V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions =
+  Schema.Struct({
+    entries: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry),
+        Schema.Null,
+      ]),
+    ),
+    globScanMaxDepth: Schema.optionalKey(
+      Schema.Union([
+        Schema.Number.annotate({ format: "uint" })
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(1).annotate({
+              expected: "a value greater than or equal to 1",
+            }),
+          ),
+        Schema.Null,
+      ]),
+    ),
+    read: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString).annotate(
+          { description: "This will be removed in favor of `entries`." },
+        ),
+        Schema.Null,
+      ]),
+    ),
+    write: Schema.optionalKey(
+      Schema.Union([
+        Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString).annotate(
+          { description: "This will be removed in favor of `entries`." },
+        ),
+        Schema.Null,
+      ]),
+    ),
+  }).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions",
+  });
+
+export type V2PluginInstalledResponse__PluginMarketplaceEntry = {
+  readonly interface?: V2PluginInstalledResponse__MarketplaceInterface | null;
   readonly name: string;
-  readonly remotePluginId?: string | null;
-  readonly shareContext?: V2PluginReadResponse__PluginShareContext | null;
-  readonly source: V2PluginReadResponse__PluginSource;
-  readonly version?: string | null;
+  readonly path?: V2PluginInstalledResponse__AbsolutePathBuf | null;
+  readonly plugins: ReadonlyArray<V2PluginInstalledResponse__PluginSummary>;
 };
-export const V2PluginReadResponse__PluginSummary = Schema.Struct({
-  authPolicy: V2PluginReadResponse__PluginAuthPolicy,
-  availability: Schema.optionalKey(
-    Schema.Literals(["DISABLED_BY_ADMIN", "AVAILABLE"]).annotate({
-      description: "Availability state for installing and using the plugin.",
-      default: "AVAILABLE",
-    }),
-  ),
-  enabled: Schema.Boolean,
-  id: Schema.String,
-  installPolicy: V2PluginReadResponse__PluginInstallPolicy,
-  installPolicySource: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__PluginInstallPolicySource, Schema.Null]),
-  ),
-  installed: Schema.Boolean,
-  interface: Schema.optionalKey(Schema.Union([V2PluginReadResponse__PluginInterface, Schema.Null])),
-  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-  localVersion: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version of the locally materialized plugin package when available.",
-      }),
-      Schema.Null,
-    ]),
+export const V2PluginInstalledResponse__PluginMarketplaceEntry = Schema.Struct({
+  interface: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__MarketplaceInterface, Schema.Null]),
   ),
-  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   name: Schema.String,
-  remotePluginId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
-      Schema.Null,
-    ]),
-  ),
-  shareContext: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__PluginShareContext, Schema.Null]).annotate({
-      description: "Remote sharing context associated with this plugin when available.",
+  path: Schema.optionalKey(
+    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description:
+        "Local marketplace file path when the marketplace is backed by a local file. Remote-only catalog marketplaces do not have a local path.",
     }),
   ),
-  source: V2PluginReadResponse__PluginSource,
-  version: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version advertised by the remote marketplace backend when available.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+  plugins: Schema.Array(V2PluginInstalledResponse__PluginSummary),
+}).annotate({ identifier: "V2PluginInstalledResponse__PluginMarketplaceEntry" });
 
-export type V2PluginShareListResponse__PluginSummary = {
-  readonly authPolicy: V2PluginShareListResponse__PluginAuthPolicy;
-  readonly availability?: "DISABLED_BY_ADMIN" | "AVAILABLE";
-  readonly enabled: boolean;
-  readonly id: string;
-  readonly installPolicy: V2PluginShareListResponse__PluginInstallPolicy;
-  readonly installPolicySource?: V2PluginShareListResponse__PluginInstallPolicySource | null;
-  readonly installed: boolean;
-  readonly interface?: V2PluginShareListResponse__PluginInterface | null;
-  readonly keywords?: ReadonlyArray<string>;
-  readonly localVersion?: string | null;
-  readonly mustShowInstallationInterstitial?: boolean | null;
+export type V2PluginListResponse__PluginMarketplaceEntry = {
+  readonly interface?: V2PluginListResponse__MarketplaceInterface | null;
   readonly name: string;
-  readonly remotePluginId?: string | null;
-  readonly shareContext?: V2PluginShareListResponse__PluginShareContext | null;
-  readonly source: V2PluginShareListResponse__PluginSource;
-  readonly version?: string | null;
+  readonly path?: V2PluginListResponse__AbsolutePathBuf | null;
+  readonly plugins: ReadonlyArray<V2PluginListResponse__PluginSummary>;
 };
-export const V2PluginShareListResponse__PluginSummary = Schema.Struct({
-  authPolicy: V2PluginShareListResponse__PluginAuthPolicy,
-  availability: Schema.optionalKey(
-    Schema.Literals(["DISABLED_BY_ADMIN", "AVAILABLE"]).annotate({
-      description: "Availability state for installing and using the plugin.",
-      default: "AVAILABLE",
-    }),
-  ),
-  enabled: Schema.Boolean,
-  id: Schema.String,
-  installPolicy: V2PluginShareListResponse__PluginInstallPolicy,
-  installPolicySource: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__PluginInstallPolicySource, Schema.Null]),
-  ),
-  installed: Schema.Boolean,
+export const V2PluginListResponse__PluginMarketplaceEntry = Schema.Struct({
   interface: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__PluginInterface, Schema.Null]),
-  ),
-  keywords: Schema.optionalKey(Schema.Array(Schema.String).annotate({ default: [] })),
-  localVersion: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version of the locally materialized plugin package when available.",
-      }),
-      Schema.Null,
-    ]),
+    Schema.Union([V2PluginListResponse__MarketplaceInterface, Schema.Null]),
   ),
-  mustShowInstallationInterstitial: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   name: Schema.String,
-  remotePluginId: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({ description: "Backend remote plugin identifier when available." }),
-      Schema.Null,
-    ]),
+  path: Schema.optionalKey(
+    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
+      description:
+        "Local marketplace file path when the marketplace is backed by a local file. Remote-only catalog marketplaces do not have a local path.",
+    }),
   ),
-  shareContext: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__PluginShareContext, Schema.Null]).annotate({
-      description: "Remote sharing context associated with this plugin when available.",
+  plugins: Schema.Array(V2PluginListResponse__PluginSummary),
+}).annotate({ identifier: "V2PluginListResponse__PluginMarketplaceEntry" });
+
+export type V2PluginReadResponse__PluginDetail = {
+  readonly appTemplates: ReadonlyArray<V2PluginReadResponse__AppTemplateSummary>;
+  readonly apps: ReadonlyArray<V2PluginReadResponse__AppSummary>;
+  readonly description?: string | null;
+  readonly hooks: ReadonlyArray<V2PluginReadResponse__PluginHookSummary>;
+  readonly marketplaceName: string;
+  readonly marketplacePath?: V2PluginReadResponse__AbsolutePathBuf | null;
+  readonly mcpServers: ReadonlyArray<string>;
+  readonly onboardingSkill?: V2PluginReadResponse__SkillSummary | null;
+  readonly scheduledTasks?: ReadonlyArray<V2PluginReadResponse__ScheduledTaskSummary> | null;
+  readonly shareUrl?: string | null;
+  readonly skills: ReadonlyArray<V2PluginReadResponse__SkillSummary>;
+  readonly summary: V2PluginReadResponse__PluginSummary;
+};
+export const V2PluginReadResponse__PluginDetail = Schema.Struct({
+  appTemplates: Schema.Array(V2PluginReadResponse__AppTemplateSummary),
+  apps: Schema.Array(V2PluginReadResponse__AppSummary),
+  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  hooks: Schema.Array(V2PluginReadResponse__PluginHookSummary),
+  marketplaceName: Schema.String,
+  marketplacePath: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]),
+  ),
+  mcpServers: Schema.Array(Schema.String),
+  onboardingSkill: Schema.optionalKey(
+    Schema.Union([V2PluginReadResponse__SkillSummary, Schema.Null]).annotate({
+      description: "The declared onboarding skill, when the plugin and visible skill are enabled.",
     }),
   ),
-  source: V2PluginShareListResponse__PluginSource,
-  version: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description: "Version advertised by the remote marketplace backend when available.",
-      }),
-      Schema.Null,
-    ]),
+  scheduledTasks: Schema.optionalKey(
+    Schema.Union([Schema.Array(V2PluginReadResponse__ScheduledTaskSummary), Schema.Null]),
   ),
-});
+  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  skills: Schema.Array(V2PluginReadResponse__SkillSummary),
+  summary: V2PluginReadResponse__PluginSummary,
+}).annotate({ identifier: "V2PluginReadResponse__PluginDetail" });
 
-export type V2RawResponseItemCompletedNotification__ResponseItem =
-  | {
-      readonly content: ReadonlyArray<V2RawResponseItemCompletedNotification__ContentItem>;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly phase?: V2RawResponseItemCompletedNotification__MessagePhase | null;
-      readonly role: string;
-      readonly type: "message";
-    }
-  | {
-      readonly author: string;
-      readonly content: ReadonlyArray<V2RawResponseItemCompletedNotification__AgentMessageInputContent>;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly recipient: string;
-      readonly type: "agent_message";
-    }
-  | {
-      readonly content?: ReadonlyArray<V2RawResponseItemCompletedNotification__ReasoningItemContent> | null;
-      readonly encrypted_content?: string | null;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly summary: ReadonlyArray<V2RawResponseItemCompletedNotification__ReasoningItemReasoningSummary>;
-      readonly type: "reasoning";
-    }
-  | {
-      readonly action: V2RawResponseItemCompletedNotification__LocalShellAction;
-      readonly call_id?: string | null;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly status: V2RawResponseItemCompletedNotification__LocalShellStatus;
-      readonly type: "local_shell_call";
-    }
-  | {
-      readonly arguments: string;
-      readonly call_id: string;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly name: string;
-      readonly namespace?: string | null;
-      readonly type: "function_call";
-    }
-  | {
-      readonly arguments: unknown;
-      readonly call_id?: string | null;
-      readonly execution: string;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly status?: string | null;
-      readonly type: "tool_search_call";
-    }
-  | {
-      readonly call_id: string;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody;
-      readonly type: "function_call_output";
-    }
-  | {
-      readonly call_id: string;
-      readonly id?: string | null;
-      readonly input: string;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly name: string;
-      readonly namespace?: string | null;
-      readonly status?: string | null;
-      readonly type: "custom_tool_call";
-    }
-  | {
-      readonly call_id: string;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly name?: string | null;
-      readonly output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody;
-      readonly type: "custom_tool_call_output";
-    }
-  | {
-      readonly call_id?: string | null;
-      readonly execution: string;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly status: string;
-      readonly tools: ReadonlyArray<unknown>;
-      readonly type: "tool_search_output";
-    }
-  | {
-      readonly action?: V2RawResponseItemCompletedNotification__ResponsesApiWebSearchAction | null;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly status?: string | null;
-      readonly type: "web_search_call";
-    }
-  | {
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly result: string;
-      readonly revised_prompt?: string | null;
-      readonly status: string;
-      readonly type: "image_generation_call";
-    }
-  | {
-      readonly encrypted_content: string;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly type: "compaction";
-    }
-  | { readonly type: "compaction_trigger" }
-  | {
-      readonly encrypted_content?: string | null;
-      readonly id?: string | null;
-      readonly internal_chat_message_metadata_passthrough?: V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough | null;
-      readonly type: "context_compaction";
-    }
-  | { readonly type: "other" };
-export const V2RawResponseItemCompletedNotification__ResponseItem = Schema.Union(
-  [
-    Schema.Struct({
-      content: Schema.Array(V2RawResponseItemCompletedNotification__ContentItem),
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      phase: Schema.optionalKey(
-        Schema.Union([V2RawResponseItemCompletedNotification__MessagePhase, Schema.Null]),
-      ),
-      role: Schema.String,
-      type: Schema.Literal("message").annotate({ title: "MessageResponseItemType" }),
-    }).annotate({ title: "MessageResponseItem" }),
-    Schema.Struct({
-      author: Schema.String,
-      content: Schema.Array(V2RawResponseItemCompletedNotification__AgentMessageInputContent),
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      recipient: Schema.String,
-      type: Schema.Literal("agent_message").annotate({ title: "AgentMessageResponseItemType" }),
-    }).annotate({ title: "AgentMessageResponseItem" }),
-    Schema.Struct({
-      content: Schema.optionalKey(
-        Schema.Union([
-          Schema.Array(V2RawResponseItemCompletedNotification__ReasoningItemContent),
-          Schema.Null,
-        ]),
-      ),
-      encrypted_content: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      summary: Schema.Array(V2RawResponseItemCompletedNotification__ReasoningItemReasoningSummary),
-      type: Schema.Literal("reasoning").annotate({ title: "ReasoningResponseItemType" }),
-    }).annotate({ title: "ReasoningResponseItem" }),
-    Schema.Struct({
-      action: V2RawResponseItemCompletedNotification__LocalShellAction,
-      call_id: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({ description: "Set when using the Responses API." }),
-          Schema.Null,
-        ]),
-      ),
-      id: Schema.optionalKey(
-        Schema.Union([
-          Schema.String.annotate({
-            description: "Legacy id field retained for compatibility with older payloads.",
-          }),
-          Schema.Null,
-        ]),
-      ),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      status: V2RawResponseItemCompletedNotification__LocalShellStatus,
-      type: Schema.Literal("local_shell_call").annotate({
-        title: "LocalShellCallResponseItemType",
-      }),
-    }).annotate({ title: "LocalShellCallResponseItem" }),
-    Schema.Struct({
-      arguments: Schema.String,
-      call_id: Schema.String,
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      name: Schema.String,
-      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("function_call").annotate({ title: "FunctionCallResponseItemType" }),
-    }).annotate({ title: "FunctionCallResponseItem" }),
-    Schema.Struct({
-      arguments: Schema.Unknown,
-      call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      execution: Schema.String,
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      status: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("tool_search_call").annotate({
-        title: "ToolSearchCallResponseItemType",
-      }),
-    }).annotate({ title: "ToolSearchCallResponseItem" }),
-    Schema.Struct({
-      call_id: Schema.String,
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody,
-      type: Schema.Literal("function_call_output").annotate({
-        title: "FunctionCallOutputResponseItemType",
-      }),
-    }).annotate({ title: "FunctionCallOutputResponseItem" }),
-    Schema.Struct({
-      call_id: Schema.String,
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      input: Schema.String,
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      name: Schema.String,
-      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("custom_tool_call").annotate({
-        title: "CustomToolCallResponseItemType",
-      }),
-    }).annotate({ title: "CustomToolCallResponseItem" }),
-    Schema.Struct({
-      call_id: Schema.String,
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      name: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      output: V2RawResponseItemCompletedNotification__FunctionCallOutputBody,
-      type: Schema.Literal("custom_tool_call_output").annotate({
-        title: "CustomToolCallOutputResponseItemType",
-      }),
-    }).annotate({ title: "CustomToolCallOutputResponseItem" }),
-    Schema.Struct({
-      call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      execution: Schema.String,
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      status: Schema.String,
-      tools: Schema.Array(Schema.Unknown),
-      type: Schema.Literal("tool_search_output").annotate({
-        title: "ToolSearchOutputResponseItemType",
-      }),
-    }).annotate({ title: "ToolSearchOutputResponseItem" }),
-    Schema.Struct({
-      action: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__ResponsesApiWebSearchAction,
-          Schema.Null,
-        ]),
-      ),
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      status: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      type: Schema.Literal("web_search_call").annotate({ title: "WebSearchCallResponseItemType" }),
-    }).annotate({ title: "WebSearchCallResponseItem" }),
-    Schema.Struct({
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      result: Schema.String,
-      revised_prompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      status: Schema.String,
-      type: Schema.Literal("image_generation_call").annotate({
-        title: "ImageGenerationCallResponseItemType",
-      }),
-    }).annotate({ title: "ImageGenerationCallResponseItem" }),
-    Schema.Struct({
-      encrypted_content: Schema.String,
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("compaction").annotate({ title: "CompactionResponseItemType" }),
-    }).annotate({ title: "CompactionResponseItem" }),
-    Schema.Struct({
-      type: Schema.Literal("compaction_trigger").annotate({
-        title: "CompactionTriggerResponseItemType",
-      }),
-    }).annotate({ title: "CompactionTriggerResponseItem" }),
-    Schema.Struct({
-      encrypted_content: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-      internal_chat_message_metadata_passthrough: Schema.optionalKey(
-        Schema.Union([
-          V2RawResponseItemCompletedNotification__InternalChatMessageMetadataPassthrough,
-          Schema.Null,
-        ]),
-      ),
-      type: Schema.Literal("context_compaction").annotate({
-        title: "ContextCompactionResponseItemType",
-      }),
-    }).annotate({ title: "ContextCompactionResponseItem" }),
-    Schema.Struct({
-      type: Schema.Literal("other").annotate({ title: "OtherResponseItemType" }),
-    }).annotate({ title: "OtherResponseItem" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2PluginShareListResponse__PluginShareListItem = {
+  readonly localPluginPath?: V2PluginShareListResponse__AbsolutePathBuf | null;
+  readonly plugin: V2PluginShareListResponse__PluginSummary;
+};
+export const V2PluginShareListResponse__PluginShareListItem = Schema.Struct({
+  localPluginPath: Schema.optionalKey(
+    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]),
+  ),
+  plugin: V2PluginShareListResponse__PluginSummary,
+}).annotate({ identifier: "V2PluginShareListResponse__PluginShareListItem" });
 
 export type V2ReviewStartResponse__Turn = {
   readonly completedAt?: number | null;
@@ -29437,7 +43427,7 @@ export type V2ReviewStartResponse__Turn = {
   readonly error?: V2ReviewStartResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ReviewStartResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ReviewStartResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ReviewStartResponse__TurnStatus;
 };
@@ -29447,7 +43437,7 @@ export const V2ReviewStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29456,13 +43446,13 @@ export const V2ReviewStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ReviewStartResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29472,7 +43462,10 @@ export const V2ReviewStartResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ReviewStartResponse__TurnItemsView> =>
+        V2ReviewStartResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29482,23 +43475,12 @@ export const V2ReviewStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ReviewStartResponse__TurnStatus,
-});
-
-export type V2SkillsListResponse__SkillsListEntry = {
-  readonly cwd: string;
-  readonly errors: ReadonlyArray<V2SkillsListResponse__SkillErrorInfo>;
-  readonly skills: ReadonlyArray<V2SkillsListResponse__SkillMetadata>;
-};
-export const V2SkillsListResponse__SkillsListEntry = Schema.Struct({
-  cwd: Schema.String,
-  errors: Schema.Array(V2SkillsListResponse__SkillErrorInfo),
-  skills: Schema.Array(V2SkillsListResponse__SkillMetadata),
-});
+}).annotate({ identifier: "V2ReviewStartResponse__Turn" });
 
 export type V2ThreadForkResponse__Turn = {
   readonly completedAt?: number | null;
@@ -29506,7 +43488,7 @@ export type V2ThreadForkResponse__Turn = {
   readonly error?: V2ThreadForkResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadForkResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadForkResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadForkResponse__TurnStatus;
 };
@@ -29516,7 +43498,7 @@ export const V2ThreadForkResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29525,13 +43507,13 @@ export const V2ThreadForkResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadForkResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29541,7 +43523,9 @@ export const V2ThreadForkResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadForkResponse__TurnItemsView> => V2ThreadForkResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29551,12 +43535,43 @@ export const V2ThreadForkResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadForkResponse__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadForkResponse__Turn" });
+
+export type V2ThreadItemsListResponse__ThreadItemEntry = {
+  readonly completedAtMs?: number | null;
+  readonly item: V2ThreadItemsListResponse__ThreadItem;
+  readonly startedAtMs?: number | null;
+  readonly turnId: string;
+};
+export const V2ThreadItemsListResponse__ThreadItemEntry = Schema.Struct({
+  completedAtMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Unix timestamp (milliseconds) when the item completed, if recorded by the producer.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  item: V2ThreadItemsListResponse__ThreadItem,
+  startedAtMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Unix timestamp (milliseconds) when the item started, if recorded by the producer.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  turnId: Schema.String.annotate({ description: "Turn containing this item." }),
+}).annotate({ identifier: "V2ThreadItemsListResponse__ThreadItemEntry" });
 
 export type V2ThreadListResponse__Turn = {
   readonly completedAt?: number | null;
@@ -29564,7 +43579,7 @@ export type V2ThreadListResponse__Turn = {
   readonly error?: V2ThreadListResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadListResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadListResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadListResponse__TurnStatus;
 };
@@ -29574,7 +43589,7 @@ export const V2ThreadListResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29583,13 +43598,13 @@ export const V2ThreadListResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadListResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29599,7 +43614,9 @@ export const V2ThreadListResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadListResponse__TurnItemsView> => V2ThreadListResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29609,12 +43626,12 @@ export const V2ThreadListResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadListResponse__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadListResponse__Turn" });
 
 export type V2ThreadMetadataUpdateResponse__Turn = {
   readonly completedAt?: number | null;
@@ -29622,7 +43639,7 @@ export type V2ThreadMetadataUpdateResponse__Turn = {
   readonly error?: V2ThreadMetadataUpdateResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadMetadataUpdateResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadMetadataUpdateResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadMetadataUpdateResponse__TurnStatus;
 };
@@ -29632,7 +43649,7 @@ export const V2ThreadMetadataUpdateResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29641,13 +43658,13 @@ export const V2ThreadMetadataUpdateResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadMetadataUpdateResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29657,7 +43674,10 @@ export const V2ThreadMetadataUpdateResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadMetadataUpdateResponse__TurnItemsView> =>
+        V2ThreadMetadataUpdateResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29667,12 +43687,12 @@ export const V2ThreadMetadataUpdateResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadMetadataUpdateResponse__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__Turn" });
 
 export type V2ThreadReadResponse__Turn = {
   readonly completedAt?: number | null;
@@ -29680,7 +43700,7 @@ export type V2ThreadReadResponse__Turn = {
   readonly error?: V2ThreadReadResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadReadResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadReadResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadReadResponse__TurnStatus;
 };
@@ -29690,7 +43710,7 @@ export const V2ThreadReadResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29699,13 +43719,13 @@ export const V2ThreadReadResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadReadResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29715,7 +43735,9 @@ export const V2ThreadReadResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadReadResponse__TurnItemsView> => V2ThreadReadResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29725,12 +43747,12 @@ export const V2ThreadReadResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadReadResponse__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadReadResponse__Turn" });
 
 export type V2ThreadResumeResponse__Turn = {
   readonly completedAt?: number | null;
@@ -29738,7 +43760,7 @@ export type V2ThreadResumeResponse__Turn = {
   readonly error?: V2ThreadResumeResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadResumeResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadResumeResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadResumeResponse__TurnStatus;
 };
@@ -29748,7 +43770,7 @@ export const V2ThreadResumeResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29757,13 +43779,13 @@ export const V2ThreadResumeResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadResumeResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29773,7 +43795,10 @@ export const V2ThreadResumeResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadResumeResponse__TurnItemsView> =>
+        V2ThreadResumeResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29783,30 +43808,30 @@ export const V2ThreadResumeResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadResumeResponse__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadResumeResponse__Turn" });
 
-export type V2ThreadRollbackResponse__Turn = {
+export type V2ThreadRevertResponse__Turn = {
   readonly completedAt?: number | null;
   readonly durationMs?: number | null;
-  readonly error?: V2ThreadRollbackResponse__TurnError | null;
+  readonly error?: V2ThreadRevertResponse__TurnError | null;
   readonly id: string;
-  readonly items: ReadonlyArray<V2ThreadRollbackResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly items: ReadonlyArray<V2ThreadRevertResponse__ThreadItem>;
+  readonly itemsView?: V2ThreadRevertResponse__TurnItemsView;
   readonly startedAt?: number | null;
-  readonly status: V2ThreadRollbackResponse__TurnStatus;
+  readonly status: V2ThreadRevertResponse__TurnStatus;
 };
-export const V2ThreadRollbackResponse__Turn = Schema.Struct({
+export const V2ThreadRevertResponse__Turn = Schema.Struct({
   completedAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29815,23 +43840,26 @@ export const V2ThreadRollbackResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
-    Schema.Union([V2ThreadRollbackResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+    Schema.Union([V2ThreadRevertResponse__TurnError, Schema.Null]).annotate({
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
     description: "Identifier for this turn. Codex-generated turn IDs are UUIDv7.",
   }),
-  items: Schema.Array(V2ThreadRollbackResponse__ThreadItem).annotate({
+  items: Schema.Array(V2ThreadRevertResponse__ThreadItem).annotate({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadRevertResponse__TurnItemsView> =>
+        V2ThreadRevertResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29841,49 +43869,12 @@ export const V2ThreadRollbackResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
-  status: V2ThreadRollbackResponse__TurnStatus,
-});
-
-export type V2ThreadSettingsUpdatedNotification__ThreadSettings = {
-  readonly activePermissionProfile?: V2ThreadSettingsUpdatedNotification__ActivePermissionProfile | null;
-  readonly approvalPolicy: V2ThreadSettingsUpdatedNotification__AskForApproval;
-  readonly approvalsReviewer: V2ThreadSettingsUpdatedNotification__ApprovalsReviewer;
-  readonly collaborationMode: V2ThreadSettingsUpdatedNotification__CollaborationMode;
-  readonly cwd: V2ThreadSettingsUpdatedNotification__AbsolutePathBuf;
-  readonly effort?: V2ThreadSettingsUpdatedNotification__ReasoningEffort | null;
-  readonly model: string;
-  readonly modelProvider: string;
-  readonly personality?: V2ThreadSettingsUpdatedNotification__Personality | null;
-  readonly sandboxPolicy: V2ThreadSettingsUpdatedNotification__SandboxPolicy;
-  readonly serviceTier?: string | null;
-  readonly summary?: V2ThreadSettingsUpdatedNotification__ReasoningSummary | null;
-};
-export const V2ThreadSettingsUpdatedNotification__ThreadSettings = Schema.Struct({
-  activePermissionProfile: Schema.optionalKey(
-    Schema.Union([V2ThreadSettingsUpdatedNotification__ActivePermissionProfile, Schema.Null]),
-  ),
-  approvalPolicy: V2ThreadSettingsUpdatedNotification__AskForApproval,
-  approvalsReviewer: V2ThreadSettingsUpdatedNotification__ApprovalsReviewer,
-  collaborationMode: V2ThreadSettingsUpdatedNotification__CollaborationMode,
-  cwd: V2ThreadSettingsUpdatedNotification__AbsolutePathBuf,
-  effort: Schema.optionalKey(
-    Schema.Union([V2ThreadSettingsUpdatedNotification__ReasoningEffort, Schema.Null]),
-  ),
-  model: Schema.String,
-  modelProvider: Schema.String,
-  personality: Schema.optionalKey(
-    Schema.Union([V2ThreadSettingsUpdatedNotification__Personality, Schema.Null]),
-  ),
-  sandboxPolicy: V2ThreadSettingsUpdatedNotification__SandboxPolicy,
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  summary: Schema.optionalKey(
-    Schema.Union([V2ThreadSettingsUpdatedNotification__ReasoningSummary, Schema.Null]),
-  ),
-});
+  status: V2ThreadRevertResponse__TurnStatus,
+}).annotate({ identifier: "V2ThreadRevertResponse__Turn" });
 
 export type V2ThreadStartedNotification__Turn = {
   readonly completedAt?: number | null;
@@ -29891,7 +43882,7 @@ export type V2ThreadStartedNotification__Turn = {
   readonly error?: V2ThreadStartedNotification__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadStartedNotification__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadStartedNotification__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadStartedNotification__TurnStatus;
 };
@@ -29901,7 +43892,7 @@ export const V2ThreadStartedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29910,13 +43901,13 @@ export const V2ThreadStartedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadStartedNotification__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29926,7 +43917,10 @@ export const V2ThreadStartedNotification__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadStartedNotification__TurnItemsView> =>
+        V2ThreadStartedNotification__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29936,12 +43930,12 @@ export const V2ThreadStartedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadStartedNotification__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadStartedNotification__Turn" });
 
 export type V2ThreadStartResponse__Turn = {
   readonly completedAt?: number | null;
@@ -29949,7 +43943,7 @@ export type V2ThreadStartResponse__Turn = {
   readonly error?: V2ThreadStartResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadStartResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadStartResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadStartResponse__TurnStatus;
 };
@@ -29959,7 +43953,7 @@ export const V2ThreadStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -29968,13 +43962,13 @@ export const V2ThreadStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadStartResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -29984,7 +43978,10 @@ export const V2ThreadStartResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadStartResponse__TurnItemsView> =>
+        V2ThreadStartResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -29994,12 +43991,73 @@ export const V2ThreadStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadStartResponse__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadStartResponse__Turn" });
+
+export type V2ThreadTurnsListResponse__Turn = {
+  readonly completedAt?: number | null;
+  readonly durationMs?: number | null;
+  readonly error?: V2ThreadTurnsListResponse__TurnError | null;
+  readonly id: string;
+  readonly items: ReadonlyArray<V2ThreadTurnsListResponse__ThreadItem>;
+  readonly itemsView?: V2ThreadTurnsListResponse__TurnItemsView;
+  readonly startedAt?: number | null;
+  readonly status: V2ThreadTurnsListResponse__TurnStatus;
+};
+export const V2ThreadTurnsListResponse__Turn = Schema.Struct({
+  completedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp (in seconds) when the turn completed.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  durationMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Duration between turn start and completion in milliseconds, if known.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  error: Schema.optionalKey(
+    Schema.Union([V2ThreadTurnsListResponse__TurnError, Schema.Null]).annotate({
+      description: "Error associated with a failed or interrupted turn.",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Identifier for this turn. Codex-generated turn IDs are UUIDv7.",
+  }),
+  items: Schema.Array(V2ThreadTurnsListResponse__ThreadItem).annotate({
+    description: "Thread items currently included in this turn payload.",
+  }),
+  itemsView: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadTurnsListResponse__TurnItemsView> =>
+        V2ThreadTurnsListResponse__TurnItemsView,
+    ).annotate({
+      description: "Describes how much of `items` has been loaded for this turn.",
+      default: "full",
+    }),
+  ),
+  startedAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp (in seconds) when the turn started.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  status: V2ThreadTurnsListResponse__TurnStatus,
+}).annotate({ identifier: "V2ThreadTurnsListResponse__Turn" });
 
 export type V2ThreadUnarchiveResponse__Turn = {
   readonly completedAt?: number | null;
@@ -30007,7 +44065,7 @@ export type V2ThreadUnarchiveResponse__Turn = {
   readonly error?: V2ThreadUnarchiveResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2ThreadUnarchiveResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2ThreadUnarchiveResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2ThreadUnarchiveResponse__TurnStatus;
 };
@@ -30017,7 +44075,7 @@ export const V2ThreadUnarchiveResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -30026,13 +44084,13 @@ export const V2ThreadUnarchiveResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2ThreadUnarchiveResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -30042,7 +44100,10 @@ export const V2ThreadUnarchiveResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadUnarchiveResponse__TurnItemsView> =>
+        V2ThreadUnarchiveResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -30052,12 +44113,12 @@ export const V2ThreadUnarchiveResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2ThreadUnarchiveResponse__TurnStatus,
-});
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__Turn" });
 
 export type V2TurnCompletedNotification__Turn = {
   readonly completedAt?: number | null;
@@ -30065,7 +44126,7 @@ export type V2TurnCompletedNotification__Turn = {
   readonly error?: V2TurnCompletedNotification__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2TurnCompletedNotification__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2TurnCompletedNotification__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2TurnCompletedNotification__TurnStatus;
 };
@@ -30075,7 +44136,7 @@ export const V2TurnCompletedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -30084,13 +44145,13 @@ export const V2TurnCompletedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2TurnCompletedNotification__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -30100,7 +44161,10 @@ export const V2TurnCompletedNotification__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2TurnCompletedNotification__TurnItemsView> =>
+        V2TurnCompletedNotification__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -30110,12 +44174,12 @@ export const V2TurnCompletedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2TurnCompletedNotification__TurnStatus,
-});
+}).annotate({ identifier: "V2TurnCompletedNotification__Turn" });
 
 export type V2TurnStartedNotification__Turn = {
   readonly completedAt?: number | null;
@@ -30123,7 +44187,7 @@ export type V2TurnStartedNotification__Turn = {
   readonly error?: V2TurnStartedNotification__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2TurnStartedNotification__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2TurnStartedNotification__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2TurnStartedNotification__TurnStatus;
 };
@@ -30133,7 +44197,7 @@ export const V2TurnStartedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -30142,13 +44206,13 @@ export const V2TurnStartedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2TurnStartedNotification__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -30158,7 +44222,10 @@ export const V2TurnStartedNotification__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2TurnStartedNotification__TurnItemsView> =>
+        V2TurnStartedNotification__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -30168,12 +44235,12 @@ export const V2TurnStartedNotification__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2TurnStartedNotification__TurnStatus,
-});
+}).annotate({ identifier: "V2TurnStartedNotification__Turn" });
 
 export type V2TurnStartResponse__Turn = {
   readonly completedAt?: number | null;
@@ -30181,7 +44248,7 @@ export type V2TurnStartResponse__Turn = {
   readonly error?: V2TurnStartResponse__TurnError | null;
   readonly id: string;
   readonly items: ReadonlyArray<V2TurnStartResponse__ThreadItem>;
-  readonly itemsView?: "notLoaded" | "summary" | "full";
+  readonly itemsView?: V2TurnStartResponse__TurnItemsView;
   readonly startedAt?: number | null;
   readonly status: V2TurnStartResponse__TurnStatus;
 };
@@ -30191,7 +44258,7 @@ export const V2TurnStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn completed.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -30200,13 +44267,13 @@ export const V2TurnStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Duration between turn start and completion in milliseconds, if known.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   error: Schema.optionalKey(
     Schema.Union([V2TurnStartResponse__TurnError, Schema.Null]).annotate({
-      description: "Only populated when the Turn's status is failed.",
+      description: "Error associated with a failed or interrupted turn.",
     }),
   ),
   id: Schema.String.annotate({
@@ -30216,7 +44283,9 @@ export const V2TurnStartResponse__Turn = Schema.Struct({
     description: "Thread items currently included in this turn payload.",
   }),
   itemsView: Schema.optionalKey(
-    Schema.Literals(["notLoaded", "summary", "full"]).annotate({
+    Schema.suspend(
+      (): Schema.Codec<V2TurnStartResponse__TurnItemsView> => V2TurnStartResponse__TurnItemsView,
+    ).annotate({
       description: "Describes how much of `items` has been loaded for this turn.",
       default: "full",
     }),
@@ -30226,220 +44295,80 @@ export const V2TurnStartResponse__Turn = Schema.Struct({
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) when the turn started.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   status: V2TurnStartResponse__TurnStatus,
-});
-
-export type CommandExecutionRequestApprovalParams__AdditionalFileSystemPermissions = {
-  readonly entries?: ReadonlyArray<CommandExecutionRequestApprovalParams__FileSystemSandboxEntry> | null;
-  readonly globScanMaxDepth?: number | null;
-  readonly read?: ReadonlyArray<CommandExecutionRequestApprovalParams__LegacyAppPathString> | null;
-  readonly write?: ReadonlyArray<CommandExecutionRequestApprovalParams__LegacyAppPathString> | null;
-};
-export const CommandExecutionRequestApprovalParams__AdditionalFileSystemPermissions = Schema.Struct(
-  {
-    entries: Schema.optionalKey(
-      Schema.Union([
-        Schema.Array(CommandExecutionRequestApprovalParams__FileSystemSandboxEntry),
-        Schema.Null,
-      ]),
-    ),
-    globScanMaxDepth: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(1)),
-        Schema.Null,
-      ]),
-    ),
-    read: Schema.optionalKey(
-      Schema.Union([
-        Schema.Array(CommandExecutionRequestApprovalParams__LegacyAppPathString).annotate({
-          description: "This will be removed in favor of `entries`.",
-        }),
-        Schema.Null,
-      ]),
-    ),
-    write: Schema.optionalKey(
-      Schema.Union([
-        Schema.Array(CommandExecutionRequestApprovalParams__LegacyAppPathString).annotate({
-          description: "This will be removed in favor of `entries`.",
-        }),
-        Schema.Null,
-      ]),
-    ),
-  },
-);
+}).annotate({ identifier: "V2TurnStartResponse__Turn" });
 
-export type McpServerElicitationRequestParams__McpElicitationEnumSchema =
-  | McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema
-  | McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema
-  | McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema;
-export const McpServerElicitationRequestParams__McpElicitationEnumSchema = Schema.Union([
-  McpServerElicitationRequestParams__McpElicitationSingleSelectEnumSchema,
-  McpServerElicitationRequestParams__McpElicitationMultiSelectEnumSchema,
-  McpServerElicitationRequestParams__McpElicitationLegacyTitledEnumSchema,
-]);
-
-export type PermissionsRequestApprovalParams__AdditionalFileSystemPermissions = {
-  readonly entries?: ReadonlyArray<PermissionsRequestApprovalParams__FileSystemSandboxEntry> | null;
-  readonly globScanMaxDepth?: number | null;
-  readonly read?: ReadonlyArray<PermissionsRequestApprovalParams__LegacyAppPathString> | null;
-  readonly write?: ReadonlyArray<PermissionsRequestApprovalParams__LegacyAppPathString> | null;
-};
-export const PermissionsRequestApprovalParams__AdditionalFileSystemPermissions = Schema.Struct({
-  entries: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(PermissionsRequestApprovalParams__FileSystemSandboxEntry),
-      Schema.Null,
-    ]),
-  ),
-  globScanMaxDepth: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(1)),
-      Schema.Null,
-    ]),
-  ),
-  read: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(PermissionsRequestApprovalParams__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  write: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(PermissionsRequestApprovalParams__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-});
+export type McpServerElicitationRequestParams__McpElicitationPrimitiveSchema =
+  | McpServerElicitationRequestParams__McpElicitationEnumSchema
+  | McpServerElicitationRequestParams__McpElicitationStringSchema
+  | McpServerElicitationRequestParams__McpElicitationNumberSchema
+  | McpServerElicitationRequestParams__McpElicitationBooleanSchema;
+export const McpServerElicitationRequestParams__McpElicitationPrimitiveSchema = Schema.Union([
+  McpServerElicitationRequestParams__McpElicitationEnumSchema,
+  McpServerElicitationRequestParams__McpElicitationStringSchema,
+  McpServerElicitationRequestParams__McpElicitationNumberSchema,
+  McpServerElicitationRequestParams__McpElicitationBooleanSchema,
+]).annotate({ identifier: "McpServerElicitationRequestParams__McpElicitationPrimitiveSchema" });
 
-export type PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions = {
-  readonly entries?: ReadonlyArray<PermissionsRequestApprovalResponse__FileSystemSandboxEntry> | null;
-  readonly globScanMaxDepth?: number | null;
-  readonly read?: ReadonlyArray<PermissionsRequestApprovalResponse__LegacyAppPathString> | null;
-  readonly write?: ReadonlyArray<PermissionsRequestApprovalResponse__LegacyAppPathString> | null;
+export type PermissionsRequestApprovalParams__RequestPermissionProfile = {
+  readonly fileSystem?: PermissionsRequestApprovalParams__AdditionalFileSystemPermissions | null;
+  readonly network?: PermissionsRequestApprovalParams__AdditionalNetworkPermissions | null;
 };
-export const PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions = Schema.Struct({
-  entries: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(PermissionsRequestApprovalResponse__FileSystemSandboxEntry),
-      Schema.Null,
-    ]),
-  ),
-  globScanMaxDepth: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(1)),
-      Schema.Null,
-    ]),
-  ),
-  read: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(PermissionsRequestApprovalResponse__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
-      Schema.Null,
-    ]),
+export const PermissionsRequestApprovalParams__RequestPermissionProfile = Schema.Struct({
+  fileSystem: Schema.optionalKey(
+    Schema.Union([PermissionsRequestApprovalParams__AdditionalFileSystemPermissions, Schema.Null]),
   ),
-  write: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(PermissionsRequestApprovalResponse__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
-      Schema.Null,
-    ]),
+  network: Schema.optionalKey(
+    Schema.Union([PermissionsRequestApprovalParams__AdditionalNetworkPermissions, Schema.Null]),
   ),
-});
+}).annotate({ identifier: "PermissionsRequestApprovalParams__RequestPermissionProfile" });
 
-export type ServerNotification__AdditionalFileSystemPermissions = {
-  readonly entries?: ReadonlyArray<ServerNotification__FileSystemSandboxEntry> | null;
-  readonly globScanMaxDepth?: number | null;
-  readonly read?: ReadonlyArray<ServerNotification__LegacyAppPathString> | null;
-  readonly write?: ReadonlyArray<ServerNotification__LegacyAppPathString> | null;
+export type PermissionsRequestApprovalResponse__GrantedPermissionProfile = {
+  readonly fileSystem?: PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions | null;
+  readonly network?: PermissionsRequestApprovalResponse__AdditionalNetworkPermissions | null;
 };
-export const ServerNotification__AdditionalFileSystemPermissions = Schema.Struct({
-  entries: Schema.optionalKey(
-    Schema.Union([Schema.Array(ServerNotification__FileSystemSandboxEntry), Schema.Null]),
-  ),
-  globScanMaxDepth: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(1)),
-      Schema.Null,
-    ]),
-  ),
-  read: Schema.optionalKey(
+export const PermissionsRequestApprovalResponse__GrantedPermissionProfile = Schema.Struct({
+  fileSystem: Schema.optionalKey(
     Schema.Union([
-      Schema.Array(ServerNotification__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
+      PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions,
       Schema.Null,
     ]),
   ),
-  write: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ServerNotification__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
-      Schema.Null,
-    ]),
+  network: Schema.optionalKey(
+    Schema.Union([PermissionsRequestApprovalResponse__AdditionalNetworkPermissions, Schema.Null]),
   ),
-});
-
-export type ServerNotification__ThreadSettingsUpdatedNotification = {
-  readonly threadId: string;
-  readonly threadSettings: ServerNotification__ThreadSettings;
-};
-export const ServerNotification__ThreadSettingsUpdatedNotification = Schema.Struct({
-  threadId: Schema.String,
-  threadSettings: ServerNotification__ThreadSettings,
-});
+}).annotate({ identifier: "PermissionsRequestApprovalResponse__GrantedPermissionProfile" });
 
 export type ServerNotification__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: ServerNotification__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
   readonly gitInfo?: ServerNotification__GitInfo | null;
+  readonly historyMode?: ServerNotification__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: ServerNotification__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: ServerNotification__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: ServerNotification__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<ServerNotification__ThreadActiveFlag>;
-        readonly type: "active";
-      };
+  readonly source: ServerNotification__SessionSource;
+  readonly status: ServerNotification__ThreadStatus;
   readonly threadSource?: ServerNotification__ThreadSource | null;
   readonly turns: ReadonlyArray<ServerNotification__Turn>;
   readonly updatedAt: number;
@@ -30468,11 +44397,10 @@ export const ServerNotification__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<ServerNotification__AbsolutePathBuf> => ServerNotification__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -30489,9 +44417,27 @@ export const ServerNotification__Thread = Schema.Struct({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<ServerNotification__ThreadHistoryMode> =>
+        ServerNotification__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -30501,6 +44447,15 @@ export const ServerNotification__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -30519,47 +44474,51 @@ export const ServerNotification__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([ServerNotification__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([ServerNotification__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: ServerNotification__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<ServerNotification__SessionSource> => ServerNotification__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(ServerNotification__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<ServerNotification__ThreadStatus> => ServerNotification__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
     Schema.Union([ServerNotification__ThreadSource, Schema.Null]).annotate({
@@ -30568,273 +44527,140 @@ export const ServerNotification__Thread = Schema.Struct({
   ),
   turns: Schema.Array(ServerNotification__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "ServerNotification__Thread" });
 
-export type ServerNotification__TurnCompletedNotification = {
+export type ServerNotification__TurnStartedNotification = {
   readonly threadId: string;
   readonly turn: ServerNotification__Turn;
 };
-export const ServerNotification__TurnCompletedNotification = Schema.Struct({
+export const ServerNotification__TurnStartedNotification = Schema.Struct({
   threadId: Schema.String,
   turn: ServerNotification__Turn,
-});
+}).annotate({ identifier: "ServerNotification__TurnStartedNotification" });
 
-export type ServerNotification__TurnStartedNotification = {
+export type ServerNotification__TurnCompletedNotification = {
   readonly threadId: string;
   readonly turn: ServerNotification__Turn;
 };
-export const ServerNotification__TurnStartedNotification = Schema.Struct({
+export const ServerNotification__TurnCompletedNotification = Schema.Struct({
   threadId: Schema.String,
   turn: ServerNotification__Turn,
-});
+}).annotate({ identifier: "ServerNotification__TurnCompletedNotification" });
 
-export type ServerRequest__AdditionalFileSystemPermissions = {
-  readonly entries?: ReadonlyArray<ServerRequest__FileSystemSandboxEntry> | null;
-  readonly globScanMaxDepth?: number | null;
-  readonly read?: ReadonlyArray<ServerRequest__LegacyAppPathString> | null;
-  readonly write?: ReadonlyArray<ServerRequest__LegacyAppPathString> | null;
+export type ServerNotification__RequestPermissionProfile = {
+  readonly fileSystem?: ServerNotification__AdditionalFileSystemPermissions | null;
+  readonly network?: ServerNotification__AdditionalNetworkPermissions | null;
 };
-export const ServerRequest__AdditionalFileSystemPermissions = Schema.Struct({
-  entries: Schema.optionalKey(
-    Schema.Union([Schema.Array(ServerRequest__FileSystemSandboxEntry), Schema.Null]),
+export const ServerNotification__RequestPermissionProfile = Schema.Struct({
+  fileSystem: Schema.optionalKey(
+    Schema.Union([ServerNotification__AdditionalFileSystemPermissions, Schema.Null]),
   ),
-  globScanMaxDepth: Schema.optionalKey(
-    Schema.Union([
-      Schema.Number.annotate({ format: "uint" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(1)),
-      Schema.Null,
-    ]),
+  network: Schema.optionalKey(
+    Schema.Union([ServerNotification__AdditionalNetworkPermissions, Schema.Null]),
   ),
-  read: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ServerRequest__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
-      Schema.Null,
-    ]),
+}).annotate({ identifier: "ServerNotification__RequestPermissionProfile" });
+
+export type ServerRequest__RequestPermissionProfile = {
+  readonly fileSystem?: ServerRequest__AdditionalFileSystemPermissions | null;
+  readonly network?: ServerRequest__AdditionalNetworkPermissions | null;
+};
+export const ServerRequest__RequestPermissionProfile = Schema.Struct({
+  fileSystem: Schema.optionalKey(
+    Schema.Union([ServerRequest__AdditionalFileSystemPermissions, Schema.Null]),
   ),
-  write: Schema.optionalKey(
-    Schema.Union([
-      Schema.Array(ServerRequest__LegacyAppPathString).annotate({
-        description: "This will be removed in favor of `entries`.",
-      }),
-      Schema.Null,
-    ]),
+  network: Schema.optionalKey(
+    Schema.Union([ServerRequest__AdditionalNetworkPermissions, Schema.Null]),
   ),
-});
+}).annotate({ identifier: "ServerRequest__RequestPermissionProfile" });
 
-export type ServerRequest__McpElicitationEnumSchema =
-  | ServerRequest__McpElicitationSingleSelectEnumSchema
-  | ServerRequest__McpElicitationMultiSelectEnumSchema
-  | ServerRequest__McpElicitationLegacyTitledEnumSchema;
-export const ServerRequest__McpElicitationEnumSchema = Schema.Union([
-  ServerRequest__McpElicitationSingleSelectEnumSchema,
-  ServerRequest__McpElicitationMultiSelectEnumSchema,
-  ServerRequest__McpElicitationLegacyTitledEnumSchema,
-]);
+export type ServerRequest__McpElicitationPrimitiveSchema =
+  | ServerRequest__McpElicitationEnumSchema
+  | ServerRequest__McpElicitationStringSchema
+  | ServerRequest__McpElicitationNumberSchema
+  | ServerRequest__McpElicitationBooleanSchema;
+export const ServerRequest__McpElicitationPrimitiveSchema = Schema.Union([
+  ServerRequest__McpElicitationEnumSchema,
+  ServerRequest__McpElicitationStringSchema,
+  ServerRequest__McpElicitationNumberSchema,
+  ServerRequest__McpElicitationBooleanSchema,
+]).annotate({ identifier: "ServerRequest__McpElicitationPrimitiveSchema" });
 
-export type V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions = {
-  readonly entries?: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry> | null;
-  readonly globScanMaxDepth?: number | null;
-  readonly read?: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString> | null;
-  readonly write?: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString> | null;
+export type V2ItemGuardianApprovalReviewCompletedNotification__RequestPermissionProfile = {
+  readonly fileSystem?: V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions | null;
+  readonly network?: V2ItemGuardianApprovalReviewCompletedNotification__AdditionalNetworkPermissions | null;
 };
-export const V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions =
+export const V2ItemGuardianApprovalReviewCompletedNotification__RequestPermissionProfile =
   Schema.Struct({
-    entries: Schema.optionalKey(
-      Schema.Union([
-        Schema.Array(V2ItemGuardianApprovalReviewCompletedNotification__FileSystemSandboxEntry),
-        Schema.Null,
-      ]),
-    ),
-    globScanMaxDepth: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(1)),
-        Schema.Null,
-      ]),
-    ),
-    read: Schema.optionalKey(
+    fileSystem: Schema.optionalKey(
       Schema.Union([
-        Schema.Array(
-          V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
-        ).annotate({ description: "This will be removed in favor of `entries`." }),
+        V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions,
         Schema.Null,
       ]),
     ),
-    write: Schema.optionalKey(
+    network: Schema.optionalKey(
       Schema.Union([
-        Schema.Array(
-          V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
-        ).annotate({ description: "This will be removed in favor of `entries`." }),
+        V2ItemGuardianApprovalReviewCompletedNotification__AdditionalNetworkPermissions,
         Schema.Null,
       ]),
     ),
+  }).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__RequestPermissionProfile",
   });
 
-export type V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions = {
-  readonly entries?: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry> | null;
-  readonly globScanMaxDepth?: number | null;
-  readonly read?: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString> | null;
-  readonly write?: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString> | null;
+export type V2ItemGuardianApprovalReviewStartedNotification__RequestPermissionProfile = {
+  readonly fileSystem?: V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions | null;
+  readonly network?: V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions | null;
 };
-export const V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions =
+export const V2ItemGuardianApprovalReviewStartedNotification__RequestPermissionProfile =
   Schema.Struct({
-    entries: Schema.optionalKey(
-      Schema.Union([
-        Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__FileSystemSandboxEntry),
-        Schema.Null,
-      ]),
-    ),
-    globScanMaxDepth: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({ format: "uint" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(1)),
-        Schema.Null,
-      ]),
-    ),
-    read: Schema.optionalKey(
+    fileSystem: Schema.optionalKey(
       Schema.Union([
-        Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString).annotate(
-          { description: "This will be removed in favor of `entries`." },
-        ),
+        V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions,
         Schema.Null,
       ]),
     ),
-    write: Schema.optionalKey(
+    network: Schema.optionalKey(
       Schema.Union([
-        Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString).annotate(
-          { description: "This will be removed in favor of `entries`." },
-        ),
+        V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions,
         Schema.Null,
       ]),
     ),
+  }).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__RequestPermissionProfile",
   });
 
-export type V2PluginInstalledResponse__PluginMarketplaceEntry = {
-  readonly interface?: V2PluginInstalledResponse__MarketplaceInterface | null;
-  readonly name: string;
-  readonly path?: V2PluginInstalledResponse__AbsolutePathBuf | null;
-  readonly plugins: ReadonlyArray<V2PluginInstalledResponse__PluginSummary>;
-};
-export const V2PluginInstalledResponse__PluginMarketplaceEntry = Schema.Struct({
-  interface: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__MarketplaceInterface, Schema.Null]),
-  ),
-  name: Schema.String,
-  path: Schema.optionalKey(
-    Schema.Union([V2PluginInstalledResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description:
-        "Local marketplace file path when the marketplace is backed by a local file. Remote-only catalog marketplaces do not have a local path.",
-    }),
-  ),
-  plugins: Schema.Array(V2PluginInstalledResponse__PluginSummary),
-});
-
-export type V2PluginListResponse__PluginMarketplaceEntry = {
-  readonly interface?: V2PluginListResponse__MarketplaceInterface | null;
-  readonly name: string;
-  readonly path?: V2PluginListResponse__AbsolutePathBuf | null;
-  readonly plugins: ReadonlyArray<V2PluginListResponse__PluginSummary>;
-};
-export const V2PluginListResponse__PluginMarketplaceEntry = Schema.Struct({
-  interface: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__MarketplaceInterface, Schema.Null]),
-  ),
-  name: Schema.String,
-  path: Schema.optionalKey(
-    Schema.Union([V2PluginListResponse__AbsolutePathBuf, Schema.Null]).annotate({
-      description:
-        "Local marketplace file path when the marketplace is backed by a local file. Remote-only catalog marketplaces do not have a local path.",
-    }),
-  ),
-  plugins: Schema.Array(V2PluginListResponse__PluginSummary),
-});
-
-export type V2PluginReadResponse__PluginDetail = {
-  readonly appTemplates: ReadonlyArray<V2PluginReadResponse__AppTemplateSummary>;
-  readonly apps: ReadonlyArray<V2PluginReadResponse__AppSummary>;
-  readonly description?: string | null;
-  readonly hooks: ReadonlyArray<V2PluginReadResponse__PluginHookSummary>;
-  readonly marketplaceName: string;
-  readonly marketplacePath?: V2PluginReadResponse__AbsolutePathBuf | null;
-  readonly mcpServers: ReadonlyArray<string>;
-  readonly scheduledTasks?: ReadonlyArray<V2PluginReadResponse__ScheduledTaskSummary> | null;
-  readonly shareUrl?: string | null;
-  readonly skills: ReadonlyArray<V2PluginReadResponse__SkillSummary>;
-  readonly summary: V2PluginReadResponse__PluginSummary;
-};
-export const V2PluginReadResponse__PluginDetail = Schema.Struct({
-  appTemplates: Schema.Array(V2PluginReadResponse__AppTemplateSummary),
-  apps: Schema.Array(V2PluginReadResponse__AppSummary),
-  description: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  hooks: Schema.Array(V2PluginReadResponse__PluginHookSummary),
-  marketplaceName: Schema.String,
-  marketplacePath: Schema.optionalKey(
-    Schema.Union([V2PluginReadResponse__AbsolutePathBuf, Schema.Null]),
-  ),
-  mcpServers: Schema.Array(Schema.String),
-  scheduledTasks: Schema.optionalKey(
-    Schema.Union([Schema.Array(V2PluginReadResponse__ScheduledTaskSummary), Schema.Null]),
-  ),
-  shareUrl: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  skills: Schema.Array(V2PluginReadResponse__SkillSummary),
-  summary: V2PluginReadResponse__PluginSummary,
-});
-
-export type V2PluginShareListResponse__PluginShareListItem = {
-  readonly localPluginPath?: V2PluginShareListResponse__AbsolutePathBuf | null;
-  readonly plugin: V2PluginShareListResponse__PluginSummary;
-};
-export const V2PluginShareListResponse__PluginShareListItem = Schema.Struct({
-  localPluginPath: Schema.optionalKey(
-    Schema.Union([V2PluginShareListResponse__AbsolutePathBuf, Schema.Null]),
-  ),
-  plugin: V2PluginShareListResponse__PluginSummary,
-});
-
 export type V2ThreadForkResponse__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadForkResponse__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
   readonly gitInfo?: V2ThreadForkResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadForkResponse__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadForkResponse__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadForkResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadForkResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadForkResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
+  readonly source: V2ThreadForkResponse__SessionSource;
+  readonly status: V2ThreadForkResponse__ThreadStatus;
   readonly threadSource?: V2ThreadForkResponse__ThreadSource | null;
   readonly turns: ReadonlyArray<V2ThreadForkResponse__Turn>;
   readonly updatedAt: number;
@@ -30863,11 +44689,11 @@ export const V2ThreadForkResponse__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadForkResponse__AbsolutePathBuf> =>
+      V2ThreadForkResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -30884,9 +44710,27 @@ export const V2ThreadForkResponse__Thread = Schema.Struct({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadForkResponse__ThreadHistoryMode> =>
+        V2ThreadForkResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -30896,6 +44740,15 @@ export const V2ThreadForkResponse__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -30914,47 +44767,51 @@ export const V2ThreadForkResponse__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadForkResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadForkResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadForkResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadForkResponse__SessionSource> => V2ThreadForkResponse__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadForkResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadForkResponse__ThreadStatus> => V2ThreadForkResponse__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
     Schema.Union([V2ThreadForkResponse__ThreadSource, Schema.Null]).annotate({
@@ -30963,47 +44820,40 @@ export const V2ThreadForkResponse__Thread = Schema.Struct({
   ),
   turns: Schema.Array(V2ThreadForkResponse__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadForkResponse__Thread" });
 
 export type V2ThreadListResponse__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadListResponse__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
   readonly gitInfo?: V2ThreadListResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadListResponse__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadListResponse__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadListResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadListResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadListResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
+  readonly source: V2ThreadListResponse__SessionSource;
+  readonly status: V2ThreadListResponse__ThreadStatus;
   readonly threadSource?: V2ThreadListResponse__ThreadSource | null;
   readonly turns: ReadonlyArray<V2ThreadListResponse__Turn>;
   readonly updatedAt: number;
@@ -31032,11 +44882,204 @@ export const V2ThreadListResponse__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadListResponse__AbsolutePathBuf> =>
+      V2ThreadListResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
+  ephemeral: Schema.Boolean.annotate({
+    description: "Whether the thread is ephemeral and should not be materialized on disk.",
+  }),
+  forkedFromId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Source thread id when this thread was created by forking another thread.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  gitInfo: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__GitInfo, Schema.Null]).annotate({
+      description: "Optional Git metadata captured when the thread was created.",
+    }),
+  ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadListResponse__ThreadHistoryMode> =>
+        V2ThreadListResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
+  id: Schema.String.annotate({
+    description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
+  }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  modelProvider: Schema.String.annotate({
+    description: "Model provider used for this thread (for example, 'openai').",
+  }),
+  name: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "Optional user-facing thread title." }),
+      Schema.Null,
+    ]),
+  ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  parentThreadId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "The ID of the parent thread. This will only be set if this thread is a subagent.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  path: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({ description: "[UNSTABLE] Path to the thread on disk." }),
+      Schema.Null,
+    ]),
+  ),
+  preview: Schema.String.annotate({
+    description: "Usually the first user message in the thread, if available.",
+  }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
+  recencyAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp (in seconds) used for thread recency ordering.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  sessionId: Schema.String.annotate({
+    description: "Session id shared by threads that belong to the same session tree.",
+  }),
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadListResponse__SessionSource> => V2ThreadListResponse__SessionSource,
+  ).annotate({
+    description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
+  }),
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadListResponse__ThreadStatus> => V2ThreadListResponse__ThreadStatus,
+  ).annotate({ description: "Current runtime status for the thread." }),
+  threadSource: Schema.optionalKey(
+    Schema.Union([V2ThreadListResponse__ThreadSource, Schema.Null]).annotate({
+      description: "Optional analytics source classification for this thread.",
+    }),
+  ),
+  turns: Schema.Array(V2ThreadListResponse__Turn).annotate({
     description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+  }),
+  updatedAt: Schema.Number.annotate({
+    description: "Unix timestamp (in seconds) when the thread was last updated.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadListResponse__Thread" });
+
+export type V2ThreadMetadataUpdateResponse__Thread = {
+  readonly agentNickname?: string | null;
+  readonly agentRole?: string | null;
+  readonly cliVersion: string;
+  readonly createdAt: number;
+  readonly cwd: V2ThreadMetadataUpdateResponse__AbsolutePathBuf;
+  readonly ephemeral: boolean;
+  readonly forkedFromId?: string | null;
+  readonly gitInfo?: V2ThreadMetadataUpdateResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadMetadataUpdateResponse__ThreadHistoryMode;
+  readonly id: string;
+  readonly model?: string | null;
+  readonly modelProvider: string;
+  readonly name?: string | null;
+  readonly originator?: string | null;
+  readonly parentThreadId?: string | null;
+  readonly path?: string | null;
+  readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadMetadataUpdateResponse__ReasoningEffort | null;
+  readonly recencyAt?: number | null;
+  readonly section?: V2ThreadMetadataUpdateResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
+  readonly sessionId: string;
+  readonly source: V2ThreadMetadataUpdateResponse__SessionSource;
+  readonly status: V2ThreadMetadataUpdateResponse__ThreadStatus;
+  readonly threadSource?: V2ThreadMetadataUpdateResponse__ThreadSource | null;
+  readonly turns: ReadonlyArray<V2ThreadMetadataUpdateResponse__Turn>;
+  readonly updatedAt: number;
+};
+export const V2ThreadMetadataUpdateResponse__Thread = Schema.Struct({
+  agentNickname: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional random unique nickname assigned to an AgentControl-spawned sub-agent.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  agentRole: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional role (agent_role) assigned to an AgentControl-spawned sub-agent.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  cliVersion: Schema.String.annotate({
+    description: "Version of the CLI that created the thread.",
   }),
+  createdAt: Schema.Number.annotate({
+    description: "Unix timestamp (in seconds) when the thread was created.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadMetadataUpdateResponse__AbsolutePathBuf> =>
+      V2ThreadMetadataUpdateResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -31049,13 +45092,31 @@ export const V2ThreadListResponse__Thread = Schema.Struct({
     ]),
   ),
   gitInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadListResponse__GitInfo, Schema.Null]).annotate({
+    Schema.Union([V2ThreadMetadataUpdateResponse__GitInfo, Schema.Null]).annotate({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadMetadataUpdateResponse__ThreadHistoryMode> =>
+        V2ThreadMetadataUpdateResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -31065,6 +45126,15 @@ export const V2ThreadListResponse__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31083,101 +45153,100 @@ export const V2ThreadListResponse__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadMetadataUpdateResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadMetadataUpdateResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadListResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadMetadataUpdateResponse__SessionSource> =>
+      V2ThreadMetadataUpdateResponse__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadListResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadMetadataUpdateResponse__ThreadStatus> =>
+      V2ThreadMetadataUpdateResponse__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
-    Schema.Union([V2ThreadListResponse__ThreadSource, Schema.Null]).annotate({
+    Schema.Union([V2ThreadMetadataUpdateResponse__ThreadSource, Schema.Null]).annotate({
       description: "Optional analytics source classification for this thread.",
     }),
   ),
-  turns: Schema.Array(V2ThreadListResponse__Turn).annotate({
+  turns: Schema.Array(V2ThreadMetadataUpdateResponse__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadMetadataUpdateResponse__Thread" });
 
-export type V2ThreadMetadataUpdateResponse__Thread = {
+export type V2ThreadReadResponse__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadReadResponse__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
-  readonly gitInfo?: V2ThreadMetadataUpdateResponse__GitInfo | null;
+  readonly gitInfo?: V2ThreadReadResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadReadResponse__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadReadResponse__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadReadResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadMetadataUpdateResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadMetadataUpdateResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
-  readonly threadSource?: V2ThreadMetadataUpdateResponse__ThreadSource | null;
-  readonly turns: ReadonlyArray<V2ThreadMetadataUpdateResponse__Turn>;
+  readonly source: V2ThreadReadResponse__SessionSource;
+  readonly status: V2ThreadReadResponse__ThreadStatus;
+  readonly threadSource?: V2ThreadReadResponse__ThreadSource | null;
+  readonly turns: ReadonlyArray<V2ThreadReadResponse__Turn>;
   readonly updatedAt: number;
 };
-export const V2ThreadMetadataUpdateResponse__Thread = Schema.Struct({
+export const V2ThreadReadResponse__Thread = Schema.Struct({
   agentNickname: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31201,11 +45270,11 @@ export const V2ThreadMetadataUpdateResponse__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadReadResponse__AbsolutePathBuf> =>
+      V2ThreadReadResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -31218,13 +45287,31 @@ export const V2ThreadMetadataUpdateResponse__Thread = Schema.Struct({
     ]),
   ),
   gitInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadMetadataUpdateResponse__GitInfo, Schema.Null]).annotate({
+    Schema.Union([V2ThreadReadResponse__GitInfo, Schema.Null]).annotate({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadReadResponse__ThreadHistoryMode> =>
+        V2ThreadReadResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -31234,6 +45321,15 @@ export const V2ThreadMetadataUpdateResponse__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31252,101 +45348,98 @@ export const V2ThreadMetadataUpdateResponse__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadReadResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadReadResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadMetadataUpdateResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadReadResponse__SessionSource> => V2ThreadReadResponse__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadMetadataUpdateResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadReadResponse__ThreadStatus> => V2ThreadReadResponse__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
-    Schema.Union([V2ThreadMetadataUpdateResponse__ThreadSource, Schema.Null]).annotate({
+    Schema.Union([V2ThreadReadResponse__ThreadSource, Schema.Null]).annotate({
       description: "Optional analytics source classification for this thread.",
     }),
   ),
-  turns: Schema.Array(V2ThreadMetadataUpdateResponse__Turn).annotate({
+  turns: Schema.Array(V2ThreadReadResponse__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadReadResponse__Thread" });
 
-export type V2ThreadReadResponse__Thread = {
+export type V2ThreadResumeResponse__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadResumeResponse__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
-  readonly gitInfo?: V2ThreadReadResponse__GitInfo | null;
+  readonly gitInfo?: V2ThreadResumeResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadResumeResponse__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadResumeResponse__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadResumeResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadReadResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadReadResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
-  readonly threadSource?: V2ThreadReadResponse__ThreadSource | null;
-  readonly turns: ReadonlyArray<V2ThreadReadResponse__Turn>;
+  readonly source: V2ThreadResumeResponse__SessionSource;
+  readonly status: V2ThreadResumeResponse__ThreadStatus;
+  readonly threadSource?: V2ThreadResumeResponse__ThreadSource | null;
+  readonly turns: ReadonlyArray<V2ThreadResumeResponse__Turn>;
   readonly updatedAt: number;
 };
-export const V2ThreadReadResponse__Thread = Schema.Struct({
+export const V2ThreadResumeResponse__Thread = Schema.Struct({
   agentNickname: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31370,11 +45463,11 @@ export const V2ThreadReadResponse__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadResumeResponse__AbsolutePathBuf> =>
+      V2ThreadResumeResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -31387,13 +45480,31 @@ export const V2ThreadReadResponse__Thread = Schema.Struct({
     ]),
   ),
   gitInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadReadResponse__GitInfo, Schema.Null]).annotate({
+    Schema.Union([V2ThreadResumeResponse__GitInfo, Schema.Null]).annotate({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadResumeResponse__ThreadHistoryMode> =>
+        V2ThreadResumeResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -31403,6 +45514,15 @@ export const V2ThreadReadResponse__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31421,101 +45541,99 @@ export const V2ThreadReadResponse__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadReadResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadResumeResponse__SessionSource> =>
+      V2ThreadResumeResponse__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadReadResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadResumeResponse__ThreadStatus> => V2ThreadResumeResponse__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
-    Schema.Union([V2ThreadReadResponse__ThreadSource, Schema.Null]).annotate({
+    Schema.Union([V2ThreadResumeResponse__ThreadSource, Schema.Null]).annotate({
       description: "Optional analytics source classification for this thread.",
     }),
   ),
-  turns: Schema.Array(V2ThreadReadResponse__Turn).annotate({
+  turns: Schema.Array(V2ThreadResumeResponse__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadResumeResponse__Thread" });
 
-export type V2ThreadResumeResponse__Thread = {
+export type V2ThreadRevertResponse__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadRevertResponse__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
-  readonly gitInfo?: V2ThreadResumeResponse__GitInfo | null;
+  readonly gitInfo?: V2ThreadRevertResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadRevertResponse__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadRevertResponse__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadRevertResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadResumeResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadResumeResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
-  readonly threadSource?: V2ThreadResumeResponse__ThreadSource | null;
-  readonly turns: ReadonlyArray<V2ThreadResumeResponse__Turn>;
+  readonly source: V2ThreadRevertResponse__SessionSource;
+  readonly status: V2ThreadRevertResponse__ThreadStatus;
+  readonly threadSource?: V2ThreadRevertResponse__ThreadSource | null;
+  readonly turns: ReadonlyArray<V2ThreadRevertResponse__Turn>;
   readonly updatedAt: number;
 };
-export const V2ThreadResumeResponse__Thread = Schema.Struct({
+export const V2ThreadRevertResponse__Thread = Schema.Struct({
   agentNickname: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31539,11 +45657,11 @@ export const V2ThreadResumeResponse__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadRevertResponse__AbsolutePathBuf> =>
+      V2ThreadRevertResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -31556,13 +45674,31 @@ export const V2ThreadResumeResponse__Thread = Schema.Struct({
     ]),
   ),
   gitInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadResumeResponse__GitInfo, Schema.Null]).annotate({
+    Schema.Union([V2ThreadRevertResponse__GitInfo, Schema.Null]).annotate({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadRevertResponse__ThreadHistoryMode> =>
+        V2ThreadRevertResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -31572,6 +45708,15 @@ export const V2ThreadResumeResponse__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31590,96 +45735,94 @@ export const V2ThreadResumeResponse__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadRevertResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadRevertResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadResumeResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadRevertResponse__SessionSource> =>
+      V2ThreadRevertResponse__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadResumeResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadRevertResponse__ThreadStatus> => V2ThreadRevertResponse__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
-    Schema.Union([V2ThreadResumeResponse__ThreadSource, Schema.Null]).annotate({
+    Schema.Union([V2ThreadRevertResponse__ThreadSource, Schema.Null]).annotate({
       description: "Optional analytics source classification for this thread.",
     }),
   ),
-  turns: Schema.Array(V2ThreadResumeResponse__Turn).annotate({
+  turns: Schema.Array(V2ThreadRevertResponse__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadRevertResponse__Thread" });
 
 export type V2ThreadStartedNotification__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadStartedNotification__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
   readonly gitInfo?: V2ThreadStartedNotification__GitInfo | null;
+  readonly historyMode?: V2ThreadStartedNotification__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadStartedNotification__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadStartedNotification__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadStartedNotification__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadStartedNotification__ThreadActiveFlag>;
-        readonly type: "active";
-      };
+  readonly source: V2ThreadStartedNotification__SessionSource;
+  readonly status: V2ThreadStartedNotification__ThreadStatus;
   readonly threadSource?: V2ThreadStartedNotification__ThreadSource | null;
   readonly turns: ReadonlyArray<V2ThreadStartedNotification__Turn>;
   readonly updatedAt: number;
@@ -31708,11 +45851,11 @@ export const V2ThreadStartedNotification__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartedNotification__AbsolutePathBuf> =>
+      V2ThreadStartedNotification__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -31729,9 +45872,27 @@ export const V2ThreadStartedNotification__Thread = Schema.Struct({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadStartedNotification__ThreadHistoryMode> =>
+        V2ThreadStartedNotification__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -31741,6 +45902,15 @@ export const V2ThreadStartedNotification__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31759,47 +45929,53 @@ export const V2ThreadStartedNotification__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadStartedNotification__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadStartedNotification__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadStartedNotification__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartedNotification__SessionSource> =>
+      V2ThreadStartedNotification__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadStartedNotification__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartedNotification__ThreadStatus> =>
+      V2ThreadStartedNotification__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
     Schema.Union([V2ThreadStartedNotification__ThreadSource, Schema.Null]).annotate({
@@ -31808,47 +45984,40 @@ export const V2ThreadStartedNotification__Thread = Schema.Struct({
   ),
   turns: Schema.Array(V2ThreadStartedNotification__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadStartedNotification__Thread" });
 
 export type V2ThreadStartResponse__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadStartResponse__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
   readonly gitInfo?: V2ThreadStartResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadStartResponse__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadStartResponse__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadStartResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadStartResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadStartResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
+  readonly source: V2ThreadStartResponse__SessionSource;
+  readonly status: V2ThreadStartResponse__ThreadStatus;
   readonly threadSource?: V2ThreadStartResponse__ThreadSource | null;
   readonly turns: ReadonlyArray<V2ThreadStartResponse__Turn>;
   readonly updatedAt: number;
@@ -31877,11 +46046,11 @@ export const V2ThreadStartResponse__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartResponse__AbsolutePathBuf> =>
+      V2ThreadStartResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -31898,9 +46067,27 @@ export const V2ThreadStartResponse__Thread = Schema.Struct({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadStartResponse__ThreadHistoryMode> =>
+        V2ThreadStartResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -31910,6 +46097,15 @@ export const V2ThreadStartResponse__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -31928,47 +46124,51 @@ export const V2ThreadStartResponse__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadStartResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadStartResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadStartResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartResponse__SessionSource> => V2ThreadStartResponse__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadStartResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartResponse__ThreadStatus> => V2ThreadStartResponse__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
     Schema.Union([V2ThreadStartResponse__ThreadSource, Schema.Null]).annotate({
@@ -31977,47 +46177,40 @@ export const V2ThreadStartResponse__Thread = Schema.Struct({
   ),
   turns: Schema.Array(V2ThreadStartResponse__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadStartResponse__Thread" });
 
 export type V2ThreadUnarchiveResponse__Thread = {
   readonly agentNickname?: string | null;
   readonly agentRole?: string | null;
   readonly cliVersion: string;
   readonly createdAt: number;
-  readonly cwd: string;
+  readonly cwd: V2ThreadUnarchiveResponse__AbsolutePathBuf;
   readonly ephemeral: boolean;
   readonly forkedFromId?: string | null;
   readonly gitInfo?: V2ThreadUnarchiveResponse__GitInfo | null;
+  readonly historyMode?: V2ThreadUnarchiveResponse__ThreadHistoryMode;
   readonly id: string;
+  readonly model?: string | null;
   readonly modelProvider: string;
   readonly name?: string | null;
+  readonly originator?: string | null;
   readonly parentThreadId?: string | null;
   readonly path?: string | null;
   readonly preview: string;
+  readonly projectId: string | null;
+  readonly reasoningEffort?: V2ThreadUnarchiveResponse__ReasoningEffort | null;
   readonly recencyAt?: number | null;
+  readonly section?: V2ThreadUnarchiveResponse__ThreadSection | null;
+  readonly sectionEnteredAt?: number | null;
   readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadUnarchiveResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadUnarchiveResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
+  readonly source: V2ThreadUnarchiveResponse__SessionSource;
+  readonly status: V2ThreadUnarchiveResponse__ThreadStatus;
   readonly threadSource?: V2ThreadUnarchiveResponse__ThreadSource | null;
   readonly turns: ReadonlyArray<V2ThreadUnarchiveResponse__Turn>;
   readonly updatedAt: number;
@@ -32046,11 +46239,11 @@ export const V2ThreadUnarchiveResponse__Thread = Schema.Struct({
   createdAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was created.",
     format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  cwd: Schema.suspend(
+    (): Schema.Codec<V2ThreadUnarchiveResponse__AbsolutePathBuf> =>
+      V2ThreadUnarchiveResponse__AbsolutePathBuf,
+  ).annotate({ description: "Working directory captured for the thread." }),
   ephemeral: Schema.Boolean.annotate({
     description: "Whether the thread is ephemeral and should not be materialized on disk.",
   }),
@@ -32067,9 +46260,27 @@ export const V2ThreadUnarchiveResponse__Thread = Schema.Struct({
       description: "Optional Git metadata captured when the thread was created.",
     }),
   ),
+  historyMode: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<V2ThreadUnarchiveResponse__ThreadHistoryMode> =>
+        V2ThreadUnarchiveResponse__ThreadHistoryMode,
+    ).annotate({
+      description: "Persisted thread history contract selected when this thread was created.",
+      default: "legacy",
+    }),
+  ),
   id: Schema.String.annotate({
     description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
   }),
+  model: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Current configured model when loaded, otherwise the latest persisted model. Null when unavailable. This is not per-turn execution telemetry.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   modelProvider: Schema.String.annotate({
     description: "Model provider used for this thread (for example, 'openai').",
   }),
@@ -32079,6 +46290,15 @@ export const V2ThreadUnarchiveResponse__Thread = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originator: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Originator recorded when the thread was created, independent of its current client or executor. Null when the recorded originator is unavailable.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   parentThreadId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -32097,47 +46317,53 @@ export const V2ThreadUnarchiveResponse__Thread = Schema.Struct({
   preview: Schema.String.annotate({
     description: "Usually the first user message in the thread, if available.",
   }),
+  projectId: Schema.Union([
+    Schema.String.annotate({
+      description: "Canonical project assignment owned by app-server, if any.",
+    }),
+    Schema.Null,
+  ]),
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadUnarchiveResponse__ReasoningEffort, Schema.Null]).annotate({
+      description:
+        "Current configured reasoning effort when loaded, otherwise the latest persisted effort. Null when unset or unavailable. This is not per-turn execution telemetry.",
+    }),
+  ),
   recencyAt: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
         description: "Unix timestamp (in seconds) used for thread recency ordering.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
+  section: Schema.optionalKey(
+    Schema.Union([V2ThreadUnarchiveResponse__ThreadSection, Schema.Null]).annotate({
+      description: "The independently persisted section selected for this thread, if any.",
+    }),
+  ),
+  sectionEnteredAt: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Unix timestamp in seconds when the thread entered its current section.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
   sessionId: Schema.String.annotate({
     description: "Session id shared by threads that belong to the same session tree.",
   }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadUnarchiveResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
-      }),
-    ],
-    { mode: "oneOf" },
+  source: Schema.suspend(
+    (): Schema.Codec<V2ThreadUnarchiveResponse__SessionSource> =>
+      V2ThreadUnarchiveResponse__SessionSource,
   ).annotate({
     description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
   }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadUnarchiveResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
+  status: Schema.suspend(
+    (): Schema.Codec<V2ThreadUnarchiveResponse__ThreadStatus> =>
+      V2ThreadUnarchiveResponse__ThreadStatus,
   ).annotate({ description: "Current runtime status for the thread." }),
   threadSource: Schema.optionalKey(
     Schema.Union([V2ThreadUnarchiveResponse__ThreadSource, Schema.Null]).annotate({
@@ -32146,139 +46372,13 @@ export const V2ThreadUnarchiveResponse__Thread = Schema.Struct({
   ),
   turns: Schema.Array(V2ThreadUnarchiveResponse__Turn).annotate({
     description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
+      "Only populated on `thread/resume`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
   }),
   updatedAt: Schema.Number.annotate({
     description: "Unix timestamp (in seconds) when the thread was last updated.",
     format: "int64",
-  }).check(Schema.isInt()),
-});
-
-export type McpServerElicitationRequestParams__McpElicitationPrimitiveSchema =
-  | McpServerElicitationRequestParams__McpElicitationEnumSchema
-  | McpServerElicitationRequestParams__McpElicitationStringSchema
-  | McpServerElicitationRequestParams__McpElicitationNumberSchema
-  | McpServerElicitationRequestParams__McpElicitationBooleanSchema;
-export const McpServerElicitationRequestParams__McpElicitationPrimitiveSchema = Schema.Union([
-  McpServerElicitationRequestParams__McpElicitationEnumSchema,
-  McpServerElicitationRequestParams__McpElicitationStringSchema,
-  McpServerElicitationRequestParams__McpElicitationNumberSchema,
-  McpServerElicitationRequestParams__McpElicitationBooleanSchema,
-]);
-
-export type PermissionsRequestApprovalParams__RequestPermissionProfile = {
-  readonly fileSystem?: PermissionsRequestApprovalParams__AdditionalFileSystemPermissions | null;
-  readonly network?: PermissionsRequestApprovalParams__AdditionalNetworkPermissions | null;
-};
-export const PermissionsRequestApprovalParams__RequestPermissionProfile = Schema.Struct({
-  fileSystem: Schema.optionalKey(
-    Schema.Union([PermissionsRequestApprovalParams__AdditionalFileSystemPermissions, Schema.Null]),
-  ),
-  network: Schema.optionalKey(
-    Schema.Union([PermissionsRequestApprovalParams__AdditionalNetworkPermissions, Schema.Null]),
-  ),
-});
-
-export type PermissionsRequestApprovalResponse__GrantedPermissionProfile = {
-  readonly fileSystem?: PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions | null;
-  readonly network?: PermissionsRequestApprovalResponse__AdditionalNetworkPermissions | null;
-};
-export const PermissionsRequestApprovalResponse__GrantedPermissionProfile = Schema.Struct({
-  fileSystem: Schema.optionalKey(
-    Schema.Union([
-      PermissionsRequestApprovalResponse__AdditionalFileSystemPermissions,
-      Schema.Null,
-    ]),
-  ),
-  network: Schema.optionalKey(
-    Schema.Union([PermissionsRequestApprovalResponse__AdditionalNetworkPermissions, Schema.Null]),
-  ),
-});
-
-export type ServerNotification__RequestPermissionProfile = {
-  readonly fileSystem?: ServerNotification__AdditionalFileSystemPermissions | null;
-  readonly network?: ServerNotification__AdditionalNetworkPermissions | null;
-};
-export const ServerNotification__RequestPermissionProfile = Schema.Struct({
-  fileSystem: Schema.optionalKey(
-    Schema.Union([ServerNotification__AdditionalFileSystemPermissions, Schema.Null]),
-  ),
-  network: Schema.optionalKey(
-    Schema.Union([ServerNotification__AdditionalNetworkPermissions, Schema.Null]),
-  ),
-});
-
-export type ServerNotification__ThreadStartedNotification = {
-  readonly thread: ServerNotification__Thread;
-};
-export const ServerNotification__ThreadStartedNotification = Schema.Struct({
-  thread: ServerNotification__Thread,
-});
-
-export type ServerRequest__RequestPermissionProfile = {
-  readonly fileSystem?: ServerRequest__AdditionalFileSystemPermissions | null;
-  readonly network?: ServerRequest__AdditionalNetworkPermissions | null;
-};
-export const ServerRequest__RequestPermissionProfile = Schema.Struct({
-  fileSystem: Schema.optionalKey(
-    Schema.Union([ServerRequest__AdditionalFileSystemPermissions, Schema.Null]),
-  ),
-  network: Schema.optionalKey(
-    Schema.Union([ServerRequest__AdditionalNetworkPermissions, Schema.Null]),
-  ),
-});
-
-export type ServerRequest__McpElicitationPrimitiveSchema =
-  | ServerRequest__McpElicitationEnumSchema
-  | ServerRequest__McpElicitationStringSchema
-  | ServerRequest__McpElicitationNumberSchema
-  | ServerRequest__McpElicitationBooleanSchema;
-export const ServerRequest__McpElicitationPrimitiveSchema = Schema.Union([
-  ServerRequest__McpElicitationEnumSchema,
-  ServerRequest__McpElicitationStringSchema,
-  ServerRequest__McpElicitationNumberSchema,
-  ServerRequest__McpElicitationBooleanSchema,
-]);
-
-export type V2ItemGuardianApprovalReviewCompletedNotification__RequestPermissionProfile = {
-  readonly fileSystem?: V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions | null;
-  readonly network?: V2ItemGuardianApprovalReviewCompletedNotification__AdditionalNetworkPermissions | null;
-};
-export const V2ItemGuardianApprovalReviewCompletedNotification__RequestPermissionProfile =
-  Schema.Struct({
-    fileSystem: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewCompletedNotification__AdditionalFileSystemPermissions,
-        Schema.Null,
-      ]),
-    ),
-    network: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewCompletedNotification__AdditionalNetworkPermissions,
-        Schema.Null,
-      ]),
-    ),
-  });
-
-export type V2ItemGuardianApprovalReviewStartedNotification__RequestPermissionProfile = {
-  readonly fileSystem?: V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions | null;
-  readonly network?: V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions | null;
-};
-export const V2ItemGuardianApprovalReviewStartedNotification__RequestPermissionProfile =
-  Schema.Struct({
-    fileSystem: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewStartedNotification__AdditionalFileSystemPermissions,
-        Schema.Null,
-      ]),
-    ),
-    network: Schema.optionalKey(
-      Schema.Union([
-        V2ItemGuardianApprovalReviewStartedNotification__AdditionalNetworkPermissions,
-        Schema.Null,
-      ]),
-    ),
-  });
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+}).annotate({ identifier: "V2ThreadUnarchiveResponse__Thread" });
 
 export type McpServerElicitationRequestParams__McpElicitationSchema = {
   readonly $schema?: string | null;
@@ -32299,12 +46399,20 @@ export const McpServerElicitationRequestParams__McpElicitationSchema = Schema.St
 }).annotate({
   description:
     "Typed form schema for MCP `elicitation/create` requests.\n\nThis matches the `requestedSchema` shape from the MCP 2025-11-25 `ElicitRequestFormParams` schema.",
+  identifier: "McpServerElicitationRequestParams__McpElicitationSchema",
 });
 
+export type ServerNotification__ThreadStartedNotification = {
+  readonly thread: ServerNotification__Thread;
+};
+export const ServerNotification__ThreadStartedNotification = Schema.Struct({
+  thread: ServerNotification__Thread,
+}).annotate({ identifier: "ServerNotification__ThreadStartedNotification" });
+
 export type ServerNotification__GuardianApprovalReviewAction =
   | {
       readonly command: string;
-      readonly cwd: ServerNotification__AbsolutePathBuf;
+      readonly cwd: ServerNotification__LegacyAppPathString;
       readonly source: ServerNotification__GuardianCommandSource;
       readonly type: "command";
     }
@@ -32316,8 +46424,15 @@ export type ServerNotification__GuardianApprovalReviewAction =
       readonly type: "execve";
     }
   | {
-      readonly cwd: ServerNotification__AbsolutePathBuf;
-      readonly files: ReadonlyArray<ServerNotification__AbsolutePathBuf>;
+      readonly approvalId: string;
+      readonly cwd: ServerNotification__LegacyAppPathString;
+      readonly processId: string;
+      readonly stdin: string;
+      readonly type: "writeStdin";
+    }
+  | {
+      readonly cwd: ServerNotification__LegacyAppPathString;
+      readonly files: ReadonlyArray<ServerNotification__LegacyAppPathString>;
       readonly type: "applyPatch";
     }
   | {
@@ -32344,7 +46459,7 @@ export const ServerNotification__GuardianApprovalReviewAction = Schema.Union(
   [
     Schema.Struct({
       command: Schema.String,
-      cwd: ServerNotification__AbsolutePathBuf,
+      cwd: ServerNotification__LegacyAppPathString,
       source: ServerNotification__GuardianCommandSource,
       type: Schema.Literal("command").annotate({
         title: "CommandGuardianApprovalReviewActionType",
@@ -32358,8 +46473,20 @@ export const ServerNotification__GuardianApprovalReviewAction = Schema.Union(
       type: Schema.Literal("execve").annotate({ title: "ExecveGuardianApprovalReviewActionType" }),
     }).annotate({ title: "ExecveGuardianApprovalReviewAction" }),
     Schema.Struct({
-      cwd: ServerNotification__AbsolutePathBuf,
-      files: Schema.Array(ServerNotification__AbsolutePathBuf),
+      approvalId: Schema.String,
+      cwd: ServerNotification__LegacyAppPathString,
+      processId: Schema.String,
+      stdin: Schema.String,
+      type: Schema.Literal("writeStdin").annotate({
+        title: "WriteStdinGuardianApprovalReviewActionType",
+      }),
+    }).annotate({
+      title: "WriteStdinGuardianApprovalReviewAction",
+      description: "A child approval for input to an existing command execution item.",
+    }),
+    Schema.Struct({
+      cwd: ServerNotification__LegacyAppPathString,
+      files: Schema.Array(ServerNotification__LegacyAppPathString),
       type: Schema.Literal("applyPatch").annotate({
         title: "ApplyPatchGuardianApprovalReviewActionType",
       }),
@@ -32367,8 +46494,12 @@ export const ServerNotification__GuardianApprovalReviewAction = Schema.Union(
     Schema.Struct({
       host: Schema.String,
       port: Schema.Number.annotate({ format: "uint16" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       protocol: ServerNotification__NetworkApprovalProtocol,
       target: Schema.String,
       type: Schema.Literal("networkAccess").annotate({
@@ -32394,10 +46525,10 @@ export const ServerNotification__GuardianApprovalReviewAction = Schema.Union(
     }).annotate({ title: "RequestPermissionsGuardianApprovalReviewAction" }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ServerNotification__GuardianApprovalReviewAction" });
 
 export type ServerRequest__PermissionsRequestApprovalParams = {
-  readonly cwd: ServerRequest__AbsolutePathBuf;
+  readonly cwd: ServerRequest__LegacyAppPathString;
   readonly environmentId?: string | null;
   readonly itemId: string;
   readonly permissions: ServerRequest__RequestPermissionProfile;
@@ -32407,7 +46538,7 @@ export type ServerRequest__PermissionsRequestApprovalParams = {
   readonly turnId: string;
 };
 export const ServerRequest__PermissionsRequestApprovalParams = Schema.Struct({
-  cwd: ServerRequest__AbsolutePathBuf,
+  cwd: ServerRequest__LegacyAppPathString,
   environmentId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   itemId: Schema.String,
   permissions: ServerRequest__RequestPermissionProfile,
@@ -32415,10 +46546,10 @@ export const ServerRequest__PermissionsRequestApprovalParams = Schema.Struct({
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this approval request started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   threadId: Schema.String,
   turnId: Schema.String,
-});
+}).annotate({ identifier: "ServerRequest__PermissionsRequestApprovalParams" });
 
 export type ServerRequest__McpElicitationSchema = {
   readonly $schema?: string | null;
@@ -32434,12 +46565,13 @@ export const ServerRequest__McpElicitationSchema = Schema.Struct({
 }).annotate({
   description:
     "Typed form schema for MCP `elicitation/create` requests.\n\nThis matches the `requestedSchema` shape from the MCP 2025-11-25 `ElicitRequestFormParams` schema.",
+  identifier: "ServerRequest__McpElicitationSchema",
 });
 
 export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewAction =
   | {
       readonly command: string;
-      readonly cwd: V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf;
+      readonly cwd: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString;
       readonly source: V2ItemGuardianApprovalReviewCompletedNotification__GuardianCommandSource;
       readonly type: "command";
     }
@@ -32451,8 +46583,15 @@ export type V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalR
       readonly type: "execve";
     }
   | {
-      readonly cwd: V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf;
-      readonly files: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf>;
+      readonly approvalId: string;
+      readonly cwd: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString;
+      readonly processId: string;
+      readonly stdin: string;
+      readonly type: "writeStdin";
+    }
+  | {
+      readonly cwd: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString;
+      readonly files: ReadonlyArray<V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString>;
       readonly type: "applyPatch";
     }
   | {
@@ -32480,7 +46619,7 @@ export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianApproval
     [
       Schema.Struct({
         command: Schema.String,
-        cwd: V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf,
+        cwd: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
         source: V2ItemGuardianApprovalReviewCompletedNotification__GuardianCommandSource,
         type: Schema.Literal("command").annotate({
           title: "CommandGuardianApprovalReviewActionType",
@@ -32496,8 +46635,20 @@ export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianApproval
         }),
       }).annotate({ title: "ExecveGuardianApprovalReviewAction" }),
       Schema.Struct({
-        cwd: V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf,
-        files: Schema.Array(V2ItemGuardianApprovalReviewCompletedNotification__AbsolutePathBuf),
+        approvalId: Schema.String,
+        cwd: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
+        processId: Schema.String,
+        stdin: Schema.String,
+        type: Schema.Literal("writeStdin").annotate({
+          title: "WriteStdinGuardianApprovalReviewActionType",
+        }),
+      }).annotate({
+        title: "WriteStdinGuardianApprovalReviewAction",
+        description: "A child approval for input to an existing command execution item.",
+      }),
+      Schema.Struct({
+        cwd: V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString,
+        files: Schema.Array(V2ItemGuardianApprovalReviewCompletedNotification__LegacyAppPathString),
         type: Schema.Literal("applyPatch").annotate({
           title: "ApplyPatchGuardianApprovalReviewActionType",
         }),
@@ -32505,8 +46656,12 @@ export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianApproval
       Schema.Struct({
         host: Schema.String,
         port: Schema.Number.annotate({ format: "uint16" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
         protocol: V2ItemGuardianApprovalReviewCompletedNotification__NetworkApprovalProtocol,
         target: Schema.String,
         type: Schema.Literal("networkAccess").annotate({
@@ -32532,12 +46687,14 @@ export const V2ItemGuardianApprovalReviewCompletedNotification__GuardianApproval
       }).annotate({ title: "RequestPermissionsGuardianApprovalReviewAction" }),
     ],
     { mode: "oneOf" },
-  );
+  ).annotate({
+    identifier: "V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewAction",
+  });
 
 export type V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewAction =
   | {
       readonly command: string;
-      readonly cwd: V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf;
+      readonly cwd: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString;
       readonly source: V2ItemGuardianApprovalReviewStartedNotification__GuardianCommandSource;
       readonly type: "command";
     }
@@ -32549,8 +46706,15 @@ export type V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalRev
       readonly type: "execve";
     }
   | {
-      readonly cwd: V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf;
-      readonly files: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf>;
+      readonly approvalId: string;
+      readonly cwd: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString;
+      readonly processId: string;
+      readonly stdin: string;
+      readonly type: "writeStdin";
+    }
+  | {
+      readonly cwd: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString;
+      readonly files: ReadonlyArray<V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString>;
       readonly type: "applyPatch";
     }
   | {
@@ -32578,7 +46742,7 @@ export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalRe
     [
       Schema.Struct({
         command: Schema.String,
-        cwd: V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf,
+        cwd: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
         source: V2ItemGuardianApprovalReviewStartedNotification__GuardianCommandSource,
         type: Schema.Literal("command").annotate({
           title: "CommandGuardianApprovalReviewActionType",
@@ -32594,8 +46758,20 @@ export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalRe
         }),
       }).annotate({ title: "ExecveGuardianApprovalReviewAction" }),
       Schema.Struct({
-        cwd: V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf,
-        files: Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__AbsolutePathBuf),
+        approvalId: Schema.String,
+        cwd: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
+        processId: Schema.String,
+        stdin: Schema.String,
+        type: Schema.Literal("writeStdin").annotate({
+          title: "WriteStdinGuardianApprovalReviewActionType",
+        }),
+      }).annotate({
+        title: "WriteStdinGuardianApprovalReviewAction",
+        description: "A child approval for input to an existing command execution item.",
+      }),
+      Schema.Struct({
+        cwd: V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString,
+        files: Schema.Array(V2ItemGuardianApprovalReviewStartedNotification__LegacyAppPathString),
         type: Schema.Literal("applyPatch").annotate({
           title: "ApplyPatchGuardianApprovalReviewActionType",
         }),
@@ -32603,8 +46779,12 @@ export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalRe
       Schema.Struct({
         host: Schema.String,
         port: Schema.Number.annotate({ format: "uint16" })
-          .check(Schema.isInt())
-          .check(Schema.isGreaterThanOrEqualTo(0)),
+          .check(Schema.isInt().annotate({ expected: "an integer" }))
+          .check(
+            Schema.isGreaterThanOrEqualTo(0).annotate({
+              expected: "a value greater than or equal to 0",
+            }),
+          ),
         protocol: V2ItemGuardianApprovalReviewStartedNotification__NetworkApprovalProtocol,
         target: Schema.String,
         type: Schema.Literal("networkAccess").annotate({
@@ -32630,12 +46810,12 @@ export const V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalRe
       }).annotate({ title: "RequestPermissionsGuardianApprovalReviewAction" }),
     ],
     { mode: "oneOf" },
-  );
+  ).annotate({
+    identifier: "V2ItemGuardianApprovalReviewStartedNotification__GuardianApprovalReviewAction",
+  });
 
-export type ServerNotification__ItemGuardianApprovalReviewCompletedNotification = {
+export type ServerNotification__ItemGuardianApprovalReviewStartedNotification = {
   readonly action: ServerNotification__GuardianApprovalReviewAction;
-  readonly completedAtMs: number;
-  readonly decisionSource: ServerNotification__AutoReviewDecisionSource;
   readonly review: ServerNotification__GuardianApprovalReview;
   readonly reviewId: string;
   readonly startedAtMs: number;
@@ -32643,24 +46823,19 @@ export type ServerNotification__ItemGuardianApprovalReviewCompletedNotification
   readonly threadId: string;
   readonly turnId: string;
 };
-export const ServerNotification__ItemGuardianApprovalReviewCompletedNotification = Schema.Struct({
+export const ServerNotification__ItemGuardianApprovalReviewStartedNotification = Schema.Struct({
   action: ServerNotification__GuardianApprovalReviewAction,
-  completedAtMs: Schema.Number.annotate({
-    description: "Unix timestamp (in milliseconds) when this review completed.",
-    format: "int64",
-  }).check(Schema.isInt()),
-  decisionSource: ServerNotification__AutoReviewDecisionSource,
   review: ServerNotification__GuardianApprovalReview,
   reviewId: Schema.String.annotate({ description: "Stable identifier for this review." }),
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this review started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   targetItemId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
         description:
-          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
+          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - stdin reviews, which refer to the existing parent command item and have a separate approval ID in the action payload - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
       }),
       Schema.Null,
     ]),
@@ -32670,10 +46845,13 @@ export const ServerNotification__ItemGuardianApprovalReviewCompletedNotification
 }).annotate({
   description:
     "[UNSTABLE] Temporary notification payload for approval auto-review. This shape is expected to change soon.",
+  identifier: "ServerNotification__ItemGuardianApprovalReviewStartedNotification",
 });
 
-export type ServerNotification__ItemGuardianApprovalReviewStartedNotification = {
+export type ServerNotification__ItemGuardianApprovalReviewCompletedNotification = {
   readonly action: ServerNotification__GuardianApprovalReviewAction;
+  readonly completedAtMs: number;
+  readonly decisionSource: ServerNotification__AutoReviewDecisionSource;
   readonly review: ServerNotification__GuardianApprovalReview;
   readonly reviewId: string;
   readonly startedAtMs: number;
@@ -32681,19 +46859,24 @@ export type ServerNotification__ItemGuardianApprovalReviewStartedNotification =
   readonly threadId: string;
   readonly turnId: string;
 };
-export const ServerNotification__ItemGuardianApprovalReviewStartedNotification = Schema.Struct({
+export const ServerNotification__ItemGuardianApprovalReviewCompletedNotification = Schema.Struct({
   action: ServerNotification__GuardianApprovalReviewAction,
+  completedAtMs: Schema.Number.annotate({
+    description: "Unix timestamp (in milliseconds) when this review completed.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  decisionSource: ServerNotification__AutoReviewDecisionSource,
   review: ServerNotification__GuardianApprovalReview,
   reviewId: Schema.String.annotate({ description: "Stable identifier for this review." }),
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this review started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   targetItemId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
         description:
-          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
+          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - stdin reviews, which refer to the existing parent command item and have a separate approval ID in the action payload - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
       }),
       Schema.Null,
     ]),
@@ -32703,44 +46886,67 @@ export const ServerNotification__ItemGuardianApprovalReviewStartedNotification =
 }).annotate({
   description:
     "[UNSTABLE] Temporary notification payload for approval auto-review. This shape is expected to change soon.",
+  identifier: "ServerNotification__ItemGuardianApprovalReviewCompletedNotification",
 });
 
 export type ServerRequest__McpServerElicitationRequestParams =
   | {
-      readonly _meta?: unknown;
+      readonly serverName: string;
+      readonly threadId: string;
+      readonly turnId?: string | null;
+      readonly _meta?: Schema.Json;
       readonly message: string;
       readonly mode: "form";
       readonly requestedSchema: ServerRequest__McpElicitationSchema;
+    }
+  | {
       readonly serverName: string;
       readonly threadId: string;
       readonly turnId?: string | null;
-    }
-  | {
-      readonly _meta?: unknown;
+      readonly _meta?: Schema.Json;
       readonly message: string;
       readonly mode: "openai/form";
-      readonly requestedSchema: unknown;
+      readonly requestedSchema: Schema.Json;
+    }
+  | {
       readonly serverName: string;
       readonly threadId: string;
       readonly turnId?: string | null;
+      readonly _meta?: Schema.Json;
+      readonly message: string;
+      readonly mode: "openaiForm";
+      readonly requestedSchema: Schema.Json;
     }
   | {
-      readonly _meta?: unknown;
+      readonly serverName: string;
+      readonly threadId: string;
+      readonly turnId?: string | null;
+      readonly _meta?: Schema.Json;
       readonly elicitationId: string;
       readonly message: string;
       readonly mode: "url";
       readonly url: string;
-      readonly serverName: string;
-      readonly threadId: string;
-      readonly turnId?: string | null;
     };
 export const ServerRequest__McpServerElicitationRequestParams = Schema.Union(
   [
     Schema.Struct({
-      _meta: Schema.optionalKey(Schema.Unknown),
+      serverName: Schema.String,
+      threadId: Schema.String,
+      turnId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Active Codex turn when this elicitation was observed, if app-server could correlate one.\n\nThis is nullable because MCP models elicitation as a standalone server-to-client request identified by the MCP server request id. It may be triggered during a turn, but turn context is app-server correlation rather than part of the protocol identity of the elicitation itself.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
       message: Schema.String,
       mode: Schema.Literal("form"),
       requestedSchema: ServerRequest__McpElicitationSchema,
+    }),
+    Schema.Struct({
       serverName: Schema.String,
       threadId: Schema.String,
       turnId: Schema.optionalKey(
@@ -32752,12 +46958,12 @@ export const ServerRequest__McpServerElicitationRequestParams = Schema.Union(
           Schema.Null,
         ]),
       ),
-    }),
-    Schema.Struct({
-      _meta: Schema.optionalKey(Schema.Unknown),
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
       message: Schema.String,
       mode: Schema.Literal("openai/form"),
-      requestedSchema: Schema.Unknown,
+      requestedSchema: Schema.Json.annotate({ expected: "JSON value" }),
+    }),
+    Schema.Struct({
       serverName: Schema.String,
       threadId: Schema.String,
       turnId: Schema.optionalKey(
@@ -32769,13 +46975,12 @@ export const ServerRequest__McpServerElicitationRequestParams = Schema.Union(
           Schema.Null,
         ]),
       ),
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+      message: Schema.String,
+      mode: Schema.Literal("openaiForm"),
+      requestedSchema: Schema.Json.annotate({ expected: "JSON value" }),
     }),
     Schema.Struct({
-      _meta: Schema.optionalKey(Schema.Unknown),
-      elicitationId: Schema.String,
-      message: Schema.String,
-      mode: Schema.Literal("url"),
-      url: Schema.String,
       serverName: Schema.String,
       threadId: Schema.String,
       turnId: Schema.optionalKey(
@@ -32787,10 +46992,15 @@ export const ServerRequest__McpServerElicitationRequestParams = Schema.Union(
           Schema.Null,
         ]),
       ),
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+      elicitationId: Schema.String,
+      message: Schema.String,
+      mode: Schema.Literal("url"),
+      url: Schema.String,
     }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ identifier: "ServerRequest__McpServerElicitationRequestParams" });
 
 export type ApplyPatchApprovalParams = {
   readonly callId: string;
@@ -32832,10 +47042,11 @@ export const ApplyPatchApprovalResponse = Schema.Struct({
   decision: ApplyPatchApprovalResponse__ReviewDecision,
 }).annotate({ title: "ApplyPatchApprovalResponse" });
 
-export type AttestationGenerateParams = {};
-export const AttestationGenerateParams = Schema.Struct({}).annotate({
-  title: "AttestationGenerateParams",
-});
+export type AttestationGenerateParams = { readonly [x: string]: Schema.Json };
+export const AttestationGenerateParams = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "AttestationGenerateParams" });
 
 export type AttestationGenerateResponse = { readonly token: string };
 export const AttestationGenerateResponse = Schema.Struct({
@@ -32941,6 +47152,26 @@ export type ClientRequest =
       readonly method: "thread/metadata/update";
       readonly params: ClientRequest__ThreadMetadataUpdateParams;
     }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "thread/attachment/add";
+      readonly params: ClientRequest__ThreadAttachmentAddParams;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "thread/attachment/list";
+      readonly params: ClientRequest__ThreadAttachmentListParams;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "thread/attachment/remove";
+      readonly params: ClientRequest__ThreadAttachmentRemoveParams;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "thread/section/move";
+      readonly params: ClientRequest__ThreadSectionMoveParams;
+    }
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "thread/unarchive";
@@ -32963,14 +47194,34 @@ export type ClientRequest =
     }
   | {
       readonly id: ClientRequest__RequestId;
-      readonly method: "thread/rollback";
-      readonly params: ClientRequest__ThreadRollbackParams;
+      readonly method: "thread/revert";
+      readonly params: ClientRequest__ThreadRevertParams;
     }
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "thread/list";
       readonly params: ClientRequest__ThreadListParams;
     }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "threadSection/list";
+      readonly params: ClientRequest__ThreadSectionListParams;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "threadSection/create";
+      readonly params: ClientRequest__ThreadSectionCreateParams;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "threadSection/update";
+      readonly params: ClientRequest__ThreadSectionUpdateParams;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "threadSection/delete";
+      readonly params: ClientRequest__ThreadSectionDeleteParams;
+    }
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "thread/loaded/list";
@@ -32981,6 +47232,16 @@ export type ClientRequest =
       readonly method: "thread/read";
       readonly params: ClientRequest__ThreadReadParams;
     }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "thread/turns/list";
+      readonly params: ClientRequest__ThreadTurnsListParams;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "thread/items/list";
+      readonly params: ClientRequest__ThreadItemsListParams;
+    }
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "thread/inject_items";
@@ -33026,6 +47287,11 @@ export type ClientRequest =
       readonly method: "plugin/installed";
       readonly params: ClientRequest__PluginInstalledParams;
     }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "plugin/reconcile";
+      readonly params: ClientRequest__PluginReconcileParams;
+    }
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "plugin/read";
@@ -33161,6 +47427,21 @@ export type ClientRequest =
       readonly method: "model/list";
       readonly params: ClientRequest__ModelListParams;
     }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "account/gatewayOAuth/read";
+      readonly params?: null;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "account/gatewayOAuth/login";
+      readonly params?: null;
+    }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "account/gatewayOAuth/cancel";
+      readonly params?: null;
+    }
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "modelProvider/capabilities/read";
@@ -33234,7 +47515,7 @@ export type ClientRequest =
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "account/rateLimits/read";
-      readonly params?: null;
+      readonly params?: ClientRequest__GetAccountRateLimitsParams | null;
     }
   | {
       readonly id: ClientRequest__RequestId;
@@ -33244,7 +47525,7 @@ export type ClientRequest =
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "account/usage/read";
-      readonly params?: null;
+      readonly params?: ClientRequest__GetAccountTokenUsageParams | null;
     }
   | {
       readonly id: ClientRequest__RequestId;
@@ -33296,6 +47577,11 @@ export type ClientRequest =
       readonly method: "externalAgentConfig/import";
       readonly params: ClientRequest__ExternalAgentConfigImportParams;
     }
+  | {
+      readonly id: ClientRequest__RequestId;
+      readonly method: "externalAgentConfig/import/recordHistory";
+      readonly params: ClientRequest__ExternalAgentConfigImportHistoryRecordParams;
+    }
   | {
       readonly id: ClientRequest__RequestId;
       readonly method: "externalAgentConfig/import/readHistories";
@@ -33394,6 +47680,34 @@ export const ClientRequest = Schema.Union(
       }),
       params: ClientRequest__ThreadMetadataUpdateParams,
     }).annotate({ title: "Thread/metadata/updateRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("thread/attachment/add").annotate({
+        title: "Thread/attachment/addRequestMethod",
+      }),
+      params: ClientRequest__ThreadAttachmentAddParams,
+    }).annotate({ title: "Thread/attachment/addRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("thread/attachment/list").annotate({
+        title: "Thread/attachment/listRequestMethod",
+      }),
+      params: ClientRequest__ThreadAttachmentListParams,
+    }).annotate({ title: "Thread/attachment/listRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("thread/attachment/remove").annotate({
+        title: "Thread/attachment/removeRequestMethod",
+      }),
+      params: ClientRequest__ThreadAttachmentRemoveParams,
+    }).annotate({ title: "Thread/attachment/removeRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("thread/section/move").annotate({
+        title: "Thread/section/moveRequestMethod",
+      }),
+      params: ClientRequest__ThreadSectionMoveParams,
+    }).annotate({ title: "Thread/section/moveRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
       method: Schema.Literal("thread/unarchive").annotate({
@@ -33424,14 +47738,42 @@ export const ClientRequest = Schema.Union(
     }).annotate({ title: "Thread/approveGuardianDeniedActionRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
-      method: Schema.Literal("thread/rollback").annotate({ title: "Thread/rollbackRequestMethod" }),
-      params: ClientRequest__ThreadRollbackParams,
-    }).annotate({ title: "Thread/rollbackRequest" }),
+      method: Schema.Literal("thread/revert").annotate({ title: "Thread/revertRequestMethod" }),
+      params: ClientRequest__ThreadRevertParams,
+    }).annotate({ title: "Thread/revertRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
       method: Schema.Literal("thread/list").annotate({ title: "Thread/listRequestMethod" }),
       params: ClientRequest__ThreadListParams,
     }).annotate({ title: "Thread/listRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("threadSection/list").annotate({
+        title: "ThreadSection/listRequestMethod",
+      }),
+      params: ClientRequest__ThreadSectionListParams,
+    }).annotate({ title: "ThreadSection/listRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("threadSection/create").annotate({
+        title: "ThreadSection/createRequestMethod",
+      }),
+      params: ClientRequest__ThreadSectionCreateParams,
+    }).annotate({ title: "ThreadSection/createRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("threadSection/update").annotate({
+        title: "ThreadSection/updateRequestMethod",
+      }),
+      params: ClientRequest__ThreadSectionUpdateParams,
+    }).annotate({ title: "ThreadSection/updateRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("threadSection/delete").annotate({
+        title: "ThreadSection/deleteRequestMethod",
+      }),
+      params: ClientRequest__ThreadSectionDeleteParams,
+    }).annotate({ title: "ThreadSection/deleteRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
       method: Schema.Literal("thread/loaded/list").annotate({
@@ -33444,6 +47786,20 @@ export const ClientRequest = Schema.Union(
       method: Schema.Literal("thread/read").annotate({ title: "Thread/readRequestMethod" }),
       params: ClientRequest__ThreadReadParams,
     }).annotate({ title: "Thread/readRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("thread/turns/list").annotate({
+        title: "Thread/turns/listRequestMethod",
+      }),
+      params: ClientRequest__ThreadTurnsListParams,
+    }).annotate({ title: "Thread/turns/listRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("thread/items/list").annotate({
+        title: "Thread/items/listRequestMethod",
+      }),
+      params: ClientRequest__ThreadItemsListParams,
+    }).annotate({ title: "Thread/items/listRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
       method: Schema.Literal("thread/inject_items").annotate({
@@ -33503,6 +47859,13 @@ export const ClientRequest = Schema.Union(
       }),
       params: ClientRequest__PluginInstalledParams,
     }).annotate({ title: "Plugin/installedRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("plugin/reconcile").annotate({
+        title: "Plugin/reconcileRequestMethod",
+      }),
+      params: ClientRequest__PluginReconcileParams,
+    }).annotate({ title: "Plugin/reconcileRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
       method: Schema.Literal("plugin/read").annotate({ title: "Plugin/readRequestMethod" }),
@@ -33658,6 +48021,27 @@ export const ClientRequest = Schema.Union(
       method: Schema.Literal("model/list").annotate({ title: "Model/listRequestMethod" }),
       params: ClientRequest__ModelListParams,
     }).annotate({ title: "Model/listRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("account/gatewayOAuth/read").annotate({
+        title: "Account/gatewayOAuth/readRequestMethod",
+      }),
+      params: Schema.optionalKey(Schema.Null),
+    }).annotate({ title: "Account/gatewayOAuth/readRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("account/gatewayOAuth/login").annotate({
+        title: "Account/gatewayOAuth/loginRequestMethod",
+      }),
+      params: Schema.optionalKey(Schema.Null),
+    }).annotate({ title: "Account/gatewayOAuth/loginRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("account/gatewayOAuth/cancel").annotate({
+        title: "Account/gatewayOAuth/cancelRequestMethod",
+      }),
+      params: Schema.optionalKey(Schema.Null),
+    }).annotate({ title: "Account/gatewayOAuth/cancelRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
       method: Schema.Literal("modelProvider/capabilities/read").annotate({
@@ -33759,7 +48143,9 @@ export const ClientRequest = Schema.Union(
       method: Schema.Literal("account/rateLimits/read").annotate({
         title: "Account/rateLimits/readRequestMethod",
       }),
-      params: Schema.optionalKey(Schema.Null),
+      params: Schema.optionalKey(
+        Schema.Union([ClientRequest__GetAccountRateLimitsParams, Schema.Null]),
+      ),
     }).annotate({ title: "Account/rateLimits/readRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
@@ -33773,7 +48159,9 @@ export const ClientRequest = Schema.Union(
       method: Schema.Literal("account/usage/read").annotate({
         title: "Account/usage/readRequestMethod",
       }),
-      params: Schema.optionalKey(Schema.Null),
+      params: Schema.optionalKey(
+        Schema.Union([ClientRequest__GetAccountTokenUsageParams, Schema.Null]),
+      ),
     }).annotate({ title: "Account/usage/readRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
@@ -33852,6 +48240,13 @@ export const ClientRequest = Schema.Union(
       }),
       params: ClientRequest__ExternalAgentConfigImportParams,
     }).annotate({ title: "ExternalAgentConfig/importRequest" }),
+    Schema.Struct({
+      id: ClientRequest__RequestId,
+      method: Schema.Literal("externalAgentConfig/import/recordHistory").annotate({
+        title: "ExternalAgentConfig/import/recordHistoryRequestMethod",
+      }),
+      params: ClientRequest__ExternalAgentConfigImportHistoryRecordParams,
+    }).annotate({ title: "ExternalAgentConfig/import/recordHistoryRequest" }),
     Schema.Struct({
       id: ClientRequest__RequestId,
       method: Schema.Literal("externalAgentConfig/import/readHistories").annotate({
@@ -33903,39 +48298,6 @@ export const ClientRequest__AdditionalContextEntry = Schema.Struct({
   value: Schema.String,
 });
 
-export type ClientRequest__ByteRange = { readonly end: number; readonly start: number };
-export const ClientRequest__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type ClientRequest__CapabilityRootLocation = {
-  readonly environmentId: string;
-  readonly path: string;
-  readonly type: "environment";
-};
-export const ClientRequest__CapabilityRootLocation = Schema.Union(
-  [
-    Schema.Struct({
-      environmentId: Schema.String,
-      path: Schema.String.annotate({
-        description: "Absolute path for the root in the selected environment.",
-      }),
-      type: Schema.Literal("environment").annotate({
-        title: "EnvironmentCapabilityRootLocationType",
-      }),
-    }).annotate({
-      title: "EnvironmentCapabilityRootLocation",
-      description: "A path owned by an execution environment.",
-    }),
-  ],
-  { mode: "oneOf" },
-).annotate({ description: "Location used to resolve a selected capability root." });
-
 export type ClientRequest__CodexResponseHandoffMode = "thinking" | "commentary" | "bemTags";
 export const ClientRequest__CodexResponseHandoffMode = Schema.Literals([
   "thinking",
@@ -33952,11 +48314,21 @@ export const ClientRequest__CollaborationMode = Schema.Struct({
   settings: ClientRequest__Settings,
 }).annotate({ description: "Collaboration mode for a Codex session." });
 
+export type ClientRequest__CyberAccessProgram = "standard" | "daybreakBlue" | "daybreakRed";
+export const ClientRequest__CyberAccessProgram = Schema.Literals([
+  "standard",
+  "daybreakBlue",
+  "daybreakRed",
+]).annotate({
+  description:
+    "Requested cyber treatment for a ChatGPT-authenticated Codex turn. Authorization and model-tier restrictions remain server-owned.",
+});
+
 export type ClientRequest__DynamicToolSpec =
   | {
       readonly deferLoading?: boolean;
       readonly description: string;
-      readonly inputSchema: unknown;
+      readonly inputSchema: Schema.Json;
       readonly name: string;
       readonly type: "function";
     }
@@ -33971,7 +48343,7 @@ export const ClientRequest__DynamicToolSpec = Schema.Union(
     Schema.Struct({
       deferLoading: Schema.optionalKey(Schema.Boolean),
       description: Schema.String,
-      inputSchema: Schema.Unknown,
+      inputSchema: Schema.Json.annotate({ expected: "JSON value" }),
       name: Schema.String,
       type: Schema.Literal("function").annotate({ title: "FunctionDynamicToolSpecType" }),
     }).annotate({ title: "FunctionDynamicToolSpec" }),
@@ -34000,8 +48372,12 @@ export const ClientRequest__MultiAgentMode = Schema.Union(
     "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
 });
 
-export type ClientRequest__NetworkAccess = "restricted" | "enabled";
-export const ClientRequest__NetworkAccess = Schema.Literals(["restricted", "enabled"]);
+export type ClientRequest__PluginSearchScope = "global" | "workspace" | "personal";
+export const ClientRequest__PluginSearchScope = Schema.Literals([
+  "global",
+  "workspace",
+  "personal",
+]);
 
 export type ClientRequest__ProcessTerminalSize = { readonly cols: number; readonly rows: number };
 export const ClientRequest__ProcessTerminalSize = Schema.Struct({
@@ -34009,16 +48385,26 @@ export const ClientRequest__ProcessTerminalSize = Schema.Struct({
     description: "Terminal width in character cells.",
     format: "uint16",
   })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   rows: Schema.Number.annotate({
     description: "Terminal height in character cells.",
     format: "uint16",
   })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
 }).annotate({ description: "PTY size in character cells for `process/spawn` PTY sessions." });
 
+export type ClientRequest__ProjectRoot = { readonly path: ClientRequest__AbsolutePathBuf };
+export const ClientRequest__ProjectRoot = Schema.Struct({ path: ClientRequest__AbsolutePathBuf });
+
+export type ClientRequest__ProjectSortKey = "position" | "recencyAt";
+export const ClientRequest__ProjectSortKey = Schema.Literals(["position", "recencyAt"]);
+
 export type ClientRequest__RealtimeConversationVersion = "v1" | "v2" | "v3";
 export const ClientRequest__RealtimeConversationVersion = Schema.Literals(["v1", "v2", "v3"]);
 
@@ -34113,6 +48499,7 @@ export type ClientRequest__ResponseItem =
   | {
       readonly arguments: string;
       readonly call_id: string;
+      readonly encrypted_function_args?: ReadonlyArray<string> | null;
       readonly id?: string | null;
       readonly internal_chat_message_metadata_passthrough?: ClientRequest__InternalChatMessageMetadataPassthrough | null;
       readonly name: string;
@@ -34120,7 +48507,7 @@ export type ClientRequest__ResponseItem =
       readonly type: "function_call";
     }
   | {
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly call_id?: string | null;
       readonly execution: string;
       readonly id?: string | null;
@@ -34129,9 +48516,11 @@ export type ClientRequest__ResponseItem =
       readonly type: "tool_search_call";
     }
   | {
-      readonly call_id: string;
+      readonly call_id?: string | null;
       readonly id?: string | null;
       readonly internal_chat_message_metadata_passthrough?: ClientRequest__InternalChatMessageMetadataPassthrough | null;
+      readonly name?: string | null;
+      readonly namespace?: string | null;
       readonly output: ClientRequest__FunctionCallOutputBody;
       readonly type: "function_call_output";
     }
@@ -34159,7 +48548,7 @@ export type ClientRequest__ResponseItem =
       readonly id?: string | null;
       readonly internal_chat_message_metadata_passthrough?: ClientRequest__InternalChatMessageMetadataPassthrough | null;
       readonly status: string;
-      readonly tools: ReadonlyArray<unknown>;
+      readonly tools: ReadonlyArray<Schema.Json>;
       readonly type: "tool_search_output";
     }
   | {
@@ -34183,6 +48572,10 @@ export type ClientRequest__ResponseItem =
       readonly internal_chat_message_metadata_passthrough?: ClientRequest__InternalChatMessageMetadataPassthrough | null;
       readonly type: "compaction";
     }
+  | {
+      readonly reasoning: ClientRequest__ConfigurationReasoning;
+      readonly type: "configuration_update";
+    }
   | { readonly type: "compaction_trigger" }
   | {
       readonly encrypted_content?: string | null;
@@ -34252,6 +48645,9 @@ export const ClientRequest__ResponseItem = Schema.Union(
     Schema.Struct({
       arguments: Schema.String,
       call_id: Schema.String,
+      encrypted_function_args: Schema.optionalKey(
+        Schema.Union([Schema.Array(Schema.String), Schema.Null]),
+      ),
       id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       internal_chat_message_metadata_passthrough: Schema.optionalKey(
         Schema.Union([ClientRequest__InternalChatMessageMetadataPassthrough, Schema.Null]),
@@ -34261,7 +48657,7 @@ export const ClientRequest__ResponseItem = Schema.Union(
       type: Schema.Literal("function_call").annotate({ title: "FunctionCallResponseItemType" }),
     }).annotate({ title: "FunctionCallResponseItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       execution: Schema.String,
       id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -34274,11 +48670,13 @@ export const ClientRequest__ResponseItem = Schema.Union(
       }),
     }).annotate({ title: "ToolSearchCallResponseItem" }),
     Schema.Struct({
-      call_id: Schema.String,
+      call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       internal_chat_message_metadata_passthrough: Schema.optionalKey(
         Schema.Union([ClientRequest__InternalChatMessageMetadataPassthrough, Schema.Null]),
       ),
+      name: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       output: ClientRequest__FunctionCallOutputBody,
       type: Schema.Literal("function_call_output").annotate({
         title: "FunctionCallOutputResponseItemType",
@@ -34318,7 +48716,7 @@ export const ClientRequest__ResponseItem = Schema.Union(
         Schema.Union([ClientRequest__InternalChatMessageMetadataPassthrough, Schema.Null]),
       ),
       status: Schema.String,
-      tools: Schema.Array(Schema.Unknown),
+      tools: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
       type: Schema.Literal("tool_search_output").annotate({
         title: "ToolSearchOutputResponseItemType",
       }),
@@ -34354,6 +48752,15 @@ export const ClientRequest__ResponseItem = Schema.Union(
       ),
       type: Schema.Literal("compaction").annotate({ title: "CompactionResponseItemType" }),
     }).annotate({ title: "CompactionResponseItem" }),
+    Schema.Struct({
+      reasoning: ClientRequest__ConfigurationReasoning,
+      type: Schema.Literal("configuration_update").annotate({
+        title: "ConfigurationUpdateResponseItemType",
+      }),
+    }).annotate({
+      title: "ConfigurationUpdateResponseItem",
+      description: "A durable input control interpreted by the backend at its position in history.",
+    }),
     Schema.Struct({
       type: Schema.Literal("compaction_trigger").annotate({
         title: "CompactionTriggerResponseItemType",
@@ -34378,33 +48785,16 @@ export const ClientRequest__ResponseItem = Schema.Union(
 
 export type ClientRequest__SelectedCapabilityRoot = {
   readonly id: string;
-  readonly location: {
-    readonly environmentId: string;
-    readonly path: string;
-    readonly type: "environment";
-  };
+  readonly location: ClientRequest__CapabilityRootLocation;
 };
 export const ClientRequest__SelectedCapabilityRoot = Schema.Struct({
   id: Schema.String.annotate({
     description: "Stable identifier supplied by the capability selection platform.",
   }),
-  location: Schema.Union(
-    [
-      Schema.Struct({
-        environmentId: Schema.String,
-        path: Schema.String.annotate({
-          description: "Absolute path for the root in the selected environment.",
-        }),
-        type: Schema.Literal("environment").annotate({
-          title: "EnvironmentCapabilityRootLocationType",
-        }),
-      }).annotate({
-        title: "EnvironmentCapabilityRootLocation",
-        description: "A path owned by an execution environment.",
-      }),
-    ],
-    { mode: "oneOf" },
-  ).annotate({ description: "Location used to resolve a selected capability root." }),
+  location: Schema.suspend(
+    (): Schema.Codec<ClientRequest__CapabilityRootLocation> =>
+      ClientRequest__CapabilityRootLocation,
+  ).annotate({ description: "Where the selected root can be resolved." }),
 }).annotate({
   description: "A user-selected root that can expose one or more runtime capabilities.",
 });
@@ -34426,16 +48816,24 @@ export const ClientRequest__ThreadRealtimeAudioChunk = Schema.Struct({
   data: Schema.String,
   itemId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   numChannels: Schema.Number.annotate({ format: "uint16" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   sampleRate: Schema.Number.annotate({ format: "uint32" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   samplesPerChannel: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({ format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -34454,7 +48852,8 @@ export const ClientRequest__ThreadRealtimeInitialItem = Schema.Struct({
 
 export type ClientRequest__ThreadRealtimeStartTransport =
   | { readonly type: "websocket" }
-  | { readonly sdp: string; readonly type: "webrtc" };
+  | { readonly sdp: string; readonly type: "webrtc" }
+  | { readonly callId: string; readonly type: "existingCall" };
 export const ClientRequest__ThreadRealtimeStartTransport = Schema.Union(
   [
     Schema.Struct({
@@ -34469,6 +48868,14 @@ export const ClientRequest__ThreadRealtimeStartTransport = Schema.Union(
       }),
       type: Schema.Literal("webrtc").annotate({ title: "WebrtcThreadRealtimeStartTransportType" }),
     }).annotate({ title: "WebrtcThreadRealtimeStartTransport" }),
+    Schema.Struct({
+      callId: Schema.String.annotate({
+        description: "Identifier of a realtime call already created and negotiated by the client.",
+      }),
+      type: Schema.Literal("existingCall").annotate({
+        title: "ExistingCallThreadRealtimeStartTransportType",
+      }),
+    }).annotate({ title: "ExistingCallThreadRealtimeStartTransport" }),
   ],
   { mode: "oneOf" },
 ).annotate({ description: "EXPERIMENTAL - transport used by thread realtime." });
@@ -34487,8 +48894,12 @@ export const ClientRequest__ThreadResumeInitialTurnsPageParams = Schema.Struct({
   limit: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({ description: "Optional turn page size.", format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -34499,6 +48910,13 @@ export const ClientRequest__ThreadResumeInitialTurnsPageParams = Schema.Struct({
   ),
 });
 
+export type ClientRequest__ThreadSearchSortKey = "created_at" | "updated_at" | "recency_at";
+export const ClientRequest__ThreadSearchSortKey = Schema.Literals([
+  "created_at",
+  "updated_at",
+  "recency_at",
+]);
+
 export type ClientRequest__TurnEnvironmentParams = {
   readonly cwd: ClientRequest__LegacyAppPathString;
   readonly environmentId: string;
@@ -34524,6 +48942,7 @@ export type CommandExecutionRequestApprovalParams = {
   readonly cwd?: CommandExecutionRequestApprovalParams__LegacyAppPathString | null;
   readonly environmentId?: string | null;
   readonly itemId: string;
+  readonly kind?: CommandExecutionRequestApprovalParams__CommandExecutionApprovalKind;
   readonly networkApprovalContext?: CommandExecutionRequestApprovalParams__NetworkApprovalContext | null;
   readonly proposedExecpolicyAmendment?: ReadonlyArray<string> | null;
   readonly proposedNetworkPolicyAmendments?: ReadonlyArray<CommandExecutionRequestApprovalParams__NetworkPolicyAmendment> | null;
@@ -34537,7 +48956,7 @@ export const CommandExecutionRequestApprovalParams = Schema.Struct({
     Schema.Union([
       Schema.String.annotate({
         description:
-          "Unique identifier for this specific approval callback.\n\nFor regular shell/unified_exec approvals, this is null.\n\nFor zsh-exec-bridge subcommand approvals, multiple callbacks can belong to one parent `itemId`, so `approvalId` is a distinct opaque callback id (a UUID) used to disambiguate routing.",
+          "Unique identifier for this specific approval callback.\n\nFor regular shell/unified_exec approvals, this is null.\n\nFor zsh-exec-bridge subcommand approvals, multiple callbacks can belong to one parent `itemId`, so `approvalId` is a distinct opaque callback id (a UUID) used to disambiguate routing. Stdin approvals also use a distinct callback id; inspect `kind` to distinguish them.",
       }),
       Schema.Null,
     ]),
@@ -34569,6 +48988,15 @@ export const CommandExecutionRequestApprovalParams = Schema.Struct({
     ]),
   ),
   itemId: Schema.String,
+  kind: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<CommandExecutionRequestApprovalParams__CommandExecutionApprovalKind> =>
+        CommandExecutionRequestApprovalParams__CommandExecutionApprovalKind,
+    ).annotate({
+      description: "Kind of action under review. Defaults to `command` for older servers.",
+      default: "command",
+    }),
+  ),
   networkApprovalContext: Schema.optionalKey(
     Schema.Union([
       CommandExecutionRequestApprovalParams__NetworkApprovalContext,
@@ -34604,7 +49032,7 @@ export const CommandExecutionRequestApprovalParams = Schema.Struct({
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this approval request started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "CommandExecutionRequestApprovalParams" });
@@ -34685,7 +49113,7 @@ export const CommandExecutionRequestApprovalResponse = Schema.Struct({
 }).annotate({ title: "CommandExecutionRequestApprovalResponse" });
 
 export type DynamicToolCallParams = {
-  readonly arguments: unknown;
+  readonly arguments: Schema.Json;
   readonly callId: string;
   readonly namespace?: string | null;
   readonly threadId: string;
@@ -34693,7 +49121,7 @@ export type DynamicToolCallParams = {
   readonly turnId: string;
 };
 export const DynamicToolCallParams = Schema.Struct({
-  arguments: Schema.Unknown,
+  arguments: Schema.Json.annotate({ expected: "JSON value" }),
   callId: Schema.String,
   namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   threadId: Schema.String,
@@ -34774,7 +49202,7 @@ export const FileChangeRequestApprovalParams = Schema.Struct({
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this approval request started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "FileChangeRequestApprovalParams" });
@@ -34830,12 +49258,12 @@ export const GetAuthStatusParams = Schema.Struct({
 }).annotate({ title: "GetAuthStatusParams" });
 
 export type GetAuthStatusResponse = {
-  readonly authMethod: unknown | null;
+  readonly authMethod: Schema.Json | null;
   readonly authToken: string | null;
   readonly requiresOpenaiAuth: boolean | null;
 };
 export const GetAuthStatusResponse = Schema.Struct({
-  authMethod: Schema.Union([Schema.Unknown, Schema.Null]),
+  authMethod: Schema.Union([Schema.Json.annotate({ expected: "JSON value" }), Schema.Null]),
   authToken: Schema.Union([Schema.String, Schema.Null]),
   requiresOpenaiAuth: Schema.Union([Schema.Boolean, Schema.Null]),
 }).annotate({ title: "GetAuthStatusResponse" });
@@ -34848,10 +49276,10 @@ export const GetConversationSummaryParams = Schema.Union(
   { mode: "oneOf" },
 ).annotate({ title: "GetConversationSummaryParams" });
 
-export type GetConversationSummaryResponse = { readonly summary: unknown };
-export const GetConversationSummaryResponse = Schema.Struct({ summary: Schema.Unknown }).annotate({
-  title: "GetConversationSummaryResponse",
-});
+export type GetConversationSummaryResponse = { readonly summary: Schema.Json };
+export const GetConversationSummaryResponse = Schema.Struct({
+  summary: Schema.Json.annotate({ expected: "JSON value" }),
+}).annotate({ title: "GetConversationSummaryResponse" });
 
 export type GitDiffToRemoteParams = { readonly cwd: string };
 export const GitDiffToRemoteParams = Schema.Struct({ cwd: Schema.String }).annotate({
@@ -34878,12 +49306,14 @@ export const JSONRPCError = Schema.Struct({
 
 export type JSONRPCErrorError = {
   readonly code: number;
-  readonly data?: unknown;
+  readonly data?: Schema.Json;
   readonly message: string;
 };
 export const JSONRPCErrorError = Schema.Struct({
-  code: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
-  data: Schema.optionalKey(Schema.Unknown),
+  code: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
+  data: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   message: Schema.String,
 }).annotate({ title: "JSONRPCErrorError" });
 
@@ -34903,10 +49333,10 @@ export const JSONRPCMessage = Schema.Union([
     "Refers to any valid JSON-RPC object that can be decoded off the wire, or encoded to be sent.",
 });
 
-export type JSONRPCNotification = { readonly method: string; readonly params?: unknown };
+export type JSONRPCNotification = { readonly method: string; readonly params?: Schema.Json };
 export const JSONRPCNotification = Schema.Struct({
   method: Schema.String,
-  params: Schema.optionalKey(Schema.Unknown),
+  params: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
 }).annotate({
   title: "JSONRPCNotification",
   description: "A notification which does not expect a response.",
@@ -34915,13 +49345,13 @@ export const JSONRPCNotification = Schema.Struct({
 export type JSONRPCRequest = {
   readonly id: JSONRPCRequest__RequestId;
   readonly method: string;
-  readonly params?: unknown;
+  readonly params?: Schema.Json;
   readonly trace?: JSONRPCRequest__W3cTraceContext | null;
 };
 export const JSONRPCRequest = Schema.Struct({
   id: JSONRPCRequest__RequestId,
   method: Schema.String,
-  params: Schema.optionalKey(Schema.Unknown),
+  params: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   trace: Schema.optionalKey(
     Schema.Union([JSONRPCRequest__W3cTraceContext, Schema.Null]).annotate({
       description: "Optional W3C Trace Context for distributed tracing.",
@@ -34929,10 +49359,13 @@ export const JSONRPCRequest = Schema.Struct({
   ),
 }).annotate({ title: "JSONRPCRequest", description: "A request that expects a response." });
 
-export type JSONRPCResponse = { readonly id: JSONRPCResponse__RequestId; readonly result: unknown };
+export type JSONRPCResponse = {
+  readonly id: JSONRPCResponse__RequestId;
+  readonly result: Schema.Json;
+};
 export const JSONRPCResponse = Schema.Struct({
   id: JSONRPCResponse__RequestId,
-  result: Schema.Unknown,
+  result: Schema.Json.annotate({ expected: "JSON value" }),
 }).annotate({
   title: "JSONRPCResponse",
   description: "A successful (non-error) response to a request.",
@@ -34940,40 +49373,62 @@ export const JSONRPCResponse = Schema.Struct({
 
 export type McpServerElicitationRequestParams =
   | {
-      readonly _meta?: unknown;
+      readonly serverName: string;
+      readonly threadId: string;
+      readonly turnId?: string | null;
+      readonly _meta?: Schema.Json;
       readonly message: string;
       readonly mode: "form";
       readonly requestedSchema: McpServerElicitationRequestParams__McpElicitationSchema;
+    }
+  | {
       readonly serverName: string;
       readonly threadId: string;
       readonly turnId?: string | null;
-    }
-  | {
-      readonly _meta?: unknown;
+      readonly _meta?: Schema.Json;
       readonly message: string;
       readonly mode: "openai/form";
-      readonly requestedSchema: unknown;
+      readonly requestedSchema: Schema.Json;
+    }
+  | {
       readonly serverName: string;
       readonly threadId: string;
       readonly turnId?: string | null;
+      readonly _meta?: Schema.Json;
+      readonly message: string;
+      readonly mode: "openaiForm";
+      readonly requestedSchema: Schema.Json;
     }
   | {
-      readonly _meta?: unknown;
+      readonly serverName: string;
+      readonly threadId: string;
+      readonly turnId?: string | null;
+      readonly _meta?: Schema.Json;
       readonly elicitationId: string;
       readonly message: string;
       readonly mode: "url";
       readonly url: string;
-      readonly serverName: string;
-      readonly threadId: string;
-      readonly turnId?: string | null;
     };
 export const McpServerElicitationRequestParams = Schema.Union(
   [
     Schema.Struct({
-      _meta: Schema.optionalKey(Schema.Unknown),
+      serverName: Schema.String,
+      threadId: Schema.String,
+      turnId: Schema.optionalKey(
+        Schema.Union([
+          Schema.String.annotate({
+            description:
+              "Active Codex turn when this elicitation was observed, if app-server could correlate one.\n\nThis is nullable because MCP models elicitation as a standalone server-to-client request identified by the MCP server request id. It may be triggered during a turn, but turn context is app-server correlation rather than part of the protocol identity of the elicitation itself.",
+          }),
+          Schema.Null,
+        ]),
+      ),
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
       message: Schema.String,
       mode: Schema.Literal("form"),
       requestedSchema: McpServerElicitationRequestParams__McpElicitationSchema,
+    }),
+    Schema.Struct({
       serverName: Schema.String,
       threadId: Schema.String,
       turnId: Schema.optionalKey(
@@ -34985,12 +49440,12 @@ export const McpServerElicitationRequestParams = Schema.Union(
           Schema.Null,
         ]),
       ),
-    }).annotate({ title: "McpServerElicitationRequestParams" }),
-    Schema.Struct({
-      _meta: Schema.optionalKey(Schema.Unknown),
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
       message: Schema.String,
       mode: Schema.Literal("openai/form"),
-      requestedSchema: Schema.Unknown,
+      requestedSchema: Schema.Json.annotate({ expected: "JSON value" }),
+    }),
+    Schema.Struct({
       serverName: Schema.String,
       threadId: Schema.String,
       turnId: Schema.optionalKey(
@@ -35002,13 +49457,12 @@ export const McpServerElicitationRequestParams = Schema.Union(
           Schema.Null,
         ]),
       ),
-    }).annotate({ title: "McpServerElicitationRequestParams" }),
-    Schema.Struct({
-      _meta: Schema.optionalKey(Schema.Unknown),
-      elicitationId: Schema.String,
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
       message: Schema.String,
-      mode: Schema.Literal("url"),
-      url: Schema.String,
+      mode: Schema.Literal("openaiForm"),
+      requestedSchema: Schema.Json.annotate({ expected: "JSON value" }),
+    }),
+    Schema.Struct({
       serverName: Schema.String,
       threadId: Schema.String,
       turnId: Schema.optionalKey(
@@ -35020,25 +49474,32 @@ export const McpServerElicitationRequestParams = Schema.Union(
           Schema.Null,
         ]),
       ),
-    }).annotate({ title: "McpServerElicitationRequestParams" }),
+      _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+      elicitationId: Schema.String,
+      message: Schema.String,
+      mode: Schema.Literal("url"),
+      url: Schema.String,
+    }),
   ],
   { mode: "oneOf" },
-);
+).annotate({ title: "McpServerElicitationRequestParams" });
 
 export type McpServerElicitationRequestResponse = {
-  readonly _meta?: unknown;
+  readonly _meta?: Schema.Json;
   readonly action: McpServerElicitationRequestResponse__McpServerElicitationAction;
-  readonly content?: unknown;
+  readonly content?: Schema.Json;
 };
 export const McpServerElicitationRequestResponse = Schema.Struct({
   _meta: Schema.optionalKey(
-    Schema.Unknown.annotate({
+    Schema.Json.annotate({
+      expected: "JSON value",
       description: "Optional client metadata for form-mode action handling.",
     }),
   ),
   action: McpServerElicitationRequestResponse__McpServerElicitationAction,
   content: Schema.optionalKey(
-    Schema.Unknown.annotate({
+    Schema.Json.annotate({
+      expected: "JSON value",
       description:
         "Structured user input for accepted elicitations, mirroring RMCP `CreateElicitationResult`.\n\nThis is nullable because decline/cancel responses have no content.",
     }),
@@ -35046,7 +49507,7 @@ export const McpServerElicitationRequestResponse = Schema.Struct({
 }).annotate({ title: "McpServerElicitationRequestResponse" });
 
 export type PermissionsRequestApprovalParams = {
-  readonly cwd: PermissionsRequestApprovalParams__AbsolutePathBuf;
+  readonly cwd: PermissionsRequestApprovalParams__LegacyAppPathString;
   readonly environmentId?: string | null;
   readonly itemId: string;
   readonly permissions: PermissionsRequestApprovalParams__RequestPermissionProfile;
@@ -35056,7 +49517,7 @@ export type PermissionsRequestApprovalParams = {
   readonly turnId: string;
 };
 export const PermissionsRequestApprovalParams = Schema.Struct({
-  cwd: PermissionsRequestApprovalParams__AbsolutePathBuf,
+  cwd: PermissionsRequestApprovalParams__LegacyAppPathString,
   environmentId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   itemId: Schema.String,
   permissions: PermissionsRequestApprovalParams__RequestPermissionProfile,
@@ -35064,19 +49525,24 @@ export const PermissionsRequestApprovalParams = Schema.Struct({
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this approval request started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "PermissionsRequestApprovalParams" });
 
 export type PermissionsRequestApprovalResponse = {
   readonly permissions: PermissionsRequestApprovalResponse__GrantedPermissionProfile;
-  readonly scope?: "turn" | "session";
+  readonly scope?: PermissionsRequestApprovalResponse__PermissionGrantScope;
   readonly strictAutoReview?: boolean | null;
 };
 export const PermissionsRequestApprovalResponse = Schema.Struct({
   permissions: PermissionsRequestApprovalResponse__GrantedPermissionProfile,
-  scope: Schema.optionalKey(Schema.Literals(["turn", "session"]).annotate({ default: "turn" })),
+  scope: Schema.optionalKey(
+    Schema.suspend(
+      (): Schema.Codec<PermissionsRequestApprovalResponse__PermissionGrantScope> =>
+        PermissionsRequestApprovalResponse__PermissionGrantScope,
+    ).annotate({ default: "turn" }),
+  ),
   strictAutoReview: Schema.optionalKey(
     Schema.Union([
       Schema.Boolean.annotate({
@@ -35088,1571 +49554,1530 @@ export const PermissionsRequestApprovalResponse = Schema.Struct({
   ),
 }).annotate({ title: "PermissionsRequestApprovalResponse" });
 
-export type PermissionsRequestApprovalResponse__PermissionGrantScope = "turn" | "session";
-export const PermissionsRequestApprovalResponse__PermissionGrantScope = Schema.Literals([
-  "turn",
-  "session",
-]);
-
 export type RequestId = string | number;
 export const RequestId = Schema.Union([
   Schema.String,
-  Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
 ]).annotate({ title: "RequestId" });
 
 export type ServerNotification =
   | {
+      readonly emittedAtMs?: number;
       readonly method: "error";
       readonly params: ServerNotification__ErrorNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/started";
       readonly params: ServerNotification__ThreadStartedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/status/changed";
       readonly params: ServerNotification__ThreadStatusChangedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/archived";
       readonly params: ServerNotification__ThreadArchivedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/deleted";
       readonly params: ServerNotification__ThreadDeletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/unarchived";
       readonly params: ServerNotification__ThreadUnarchivedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/closed";
       readonly params: ServerNotification__ThreadClosedNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "thread/reverted";
+      readonly params: ServerNotification__ThreadRevertedNotification;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "skills/changed";
       readonly params: ServerNotification__SkillsChangedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/name/updated";
       readonly params: ServerNotification__ThreadNameUpdatedNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "thread/attachment/updated";
+      readonly params: ServerNotification__ThreadAttachmentUpdatedNotification;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/goal/updated";
       readonly params: ServerNotification__ThreadGoalUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/goal/cleared";
       readonly params: ServerNotification__ThreadGoalClearedNotification;
+    }
+  | {
+      readonly emittedAtMs?: number;
+      readonly method: "thread/queue/changed";
+      readonly params: ServerNotification__ThreadQueueChangedNotification;
+    }
+  | {
+      readonly emittedAtMs?: number;
+      readonly method: "project/changed";
+      readonly params: ServerNotification__ProjectChangedNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "thread/project/updated";
+      readonly params: ServerNotification__ThreadProjectUpdatedNotification;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/environment/connected";
       readonly params: ServerNotification__EnvironmentConnectionNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/environment/disconnected";
       readonly params: ServerNotification__EnvironmentConnectionNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/settings/updated";
       readonly params: ServerNotification__ThreadSettingsUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/tokenUsage/updated";
       readonly params: ServerNotification__ThreadTokenUsageUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "turn/started";
       readonly params: ServerNotification__TurnStartedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "hook/started";
       readonly params: ServerNotification__HookStartedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "turn/completed";
       readonly params: ServerNotification__TurnCompletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "hook/completed";
       readonly params: ServerNotification__HookCompletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "turn/diff/updated";
       readonly params: ServerNotification__TurnDiffUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "turn/plan/updated";
       readonly params: ServerNotification__TurnPlanUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/started";
       readonly params: ServerNotification__ItemStartedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/autoApprovalReview/started";
       readonly params: ServerNotification__ItemGuardianApprovalReviewStartedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/autoApprovalReview/completed";
       readonly params: ServerNotification__ItemGuardianApprovalReviewCompletedNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "autoApprovalReview/strictReviewRequired";
+      readonly params: ServerNotification__StrictReviewRequiredNotification;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/completed";
       readonly params: ServerNotification__ItemCompletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/agentMessage/delta";
       readonly params: ServerNotification__AgentMessageDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/plan/delta";
       readonly params: ServerNotification__PlanDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "command/exec/outputDelta";
       readonly params: ServerNotification__CommandExecOutputDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "process/outputDelta";
       readonly params: ServerNotification__ProcessOutputDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "process/exited";
       readonly params: ServerNotification__ProcessExitedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/commandExecution/outputDelta";
       readonly params: ServerNotification__CommandExecutionOutputDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/commandExecution/terminalInteraction";
       readonly params: ServerNotification__TerminalInteractionNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/fileChange/outputDelta";
       readonly params: ServerNotification__FileChangeOutputDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/fileChange/patchUpdated";
       readonly params: ServerNotification__FileChangePatchUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "serverRequest/resolved";
       readonly params: ServerNotification__ServerRequestResolvedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/mcpToolCall/progress";
       readonly params: ServerNotification__McpToolCallProgressNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "mcpServer/oauthLogin/completed";
       readonly params: ServerNotification__McpServerOauthLoginCompletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "mcpServer/startupStatus/updated";
       readonly params: ServerNotification__McpServerStatusUpdatedNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "mcpServer/event/stream/notification";
+      readonly params: ServerNotification__McpServerEventStreamNotification;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "account/updated";
       readonly params: ServerNotification__AccountUpdatedNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "account/gatewayOAuth/changed";
+      readonly params: ServerNotification__GatewayOAuthChangedNotification;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "account/rateLimits/updated";
       readonly params: ServerNotification__AccountRateLimitsUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "app/list/updated";
       readonly params: ServerNotification__AppListUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "remoteControl/status/changed";
       readonly params: ServerNotification__RemoteControlStatusChangedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "externalAgentConfig/import/progress";
       readonly params: ServerNotification__ExternalAgentConfigImportProgressNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "externalAgentConfig/import/completed";
       readonly params: ServerNotification__ExternalAgentConfigImportCompletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "fs/changed";
       readonly params: ServerNotification__FsChangedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/reasoning/summaryTextDelta";
       readonly params: ServerNotification__ReasoningSummaryTextDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/reasoning/summaryPartAdded";
       readonly params: ServerNotification__ReasoningSummaryPartAddedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "item/reasoning/textDelta";
       readonly params: ServerNotification__ReasoningTextDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/compacted";
       readonly params: ServerNotification__ContextCompactedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "model/rerouted";
       readonly params: ServerNotification__ModelReroutedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "model/verification";
       readonly params: ServerNotification__ModelVerificationNotification;
+    }
+  | {
+      readonly emittedAtMs?: number;
+      readonly method: "modelProvider/authRecoveryStarted";
+      readonly params: ServerNotification__AuthRecoveryNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "modelProvider/authRecoveryCompleted";
+      readonly params: ServerNotification__AuthRecoveryNotification;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "turn/moderationMetadata";
       readonly params: ServerNotification__TurnModerationMetadataNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "model/safetyBuffering/updated";
       readonly params: ServerNotification__ModelSafetyBufferingUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "warning";
       readonly params: ServerNotification__WarningNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "guardianWarning";
       readonly params: ServerNotification__GuardianWarningNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "deprecationNotice";
       readonly params: ServerNotification__DeprecationNoticeNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "configWarning";
       readonly params: ServerNotification__ConfigWarningNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "fuzzyFileSearch/sessionUpdated";
       readonly params: ServerNotification__FuzzyFileSearchSessionUpdatedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "fuzzyFileSearch/sessionCompleted";
       readonly params: ServerNotification__FuzzyFileSearchSessionCompletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/started";
       readonly params: ServerNotification__ThreadRealtimeStartedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/itemAdded";
       readonly params: ServerNotification__ThreadRealtimeItemAddedNotification;
+    }
+  | {
+      readonly emittedAtMs?: number;
+      readonly method: "thread/realtime/item/started";
+      readonly params: ServerNotification__ThreadRealtimeItemStartedNotification;
+    }
+  | {
       readonly emittedAtMs?: number;
+      readonly method: "thread/realtime/item/transcript/delta";
+      readonly params: ServerNotification__ThreadRealtimeItemTranscriptDeltaNotification;
     }
   | {
+      readonly emittedAtMs?: number;
+      readonly method: "thread/realtime/item/completed";
+      readonly params: ServerNotification__ThreadRealtimeItemCompletedNotification;
+    }
+  | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/transcript/delta";
       readonly params: ServerNotification__ThreadRealtimeTranscriptDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/transcript/done";
       readonly params: ServerNotification__ThreadRealtimeTranscriptDoneNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/outputAudio/delta";
       readonly params: ServerNotification__ThreadRealtimeOutputAudioDeltaNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/sdp";
       readonly params: ServerNotification__ThreadRealtimeSdpNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/error";
       readonly params: ServerNotification__ThreadRealtimeErrorNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "thread/realtime/closed";
       readonly params: ServerNotification__ThreadRealtimeClosedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "windows/worldWritableWarning";
       readonly params: ServerNotification__WindowsWorldWritableWarningNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "windowsSandbox/setupCompleted";
       readonly params: ServerNotification__WindowsSandboxSetupCompletedNotification;
-      readonly emittedAtMs?: number;
     }
   | {
+      readonly emittedAtMs?: number;
       readonly method: "account/login/completed";
       readonly params: ServerNotification__AccountLoginCompletedNotification;
-      readonly emittedAtMs?: number;
     };
 export const ServerNotification = Schema.Union(
   [
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("error").annotate({ title: "ErrorNotificationMethod" }),
       params: ServerNotification__ErrorNotification,
+    }).annotate({ title: "ErrorNotification", description: "NEW NOTIFICATIONS" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/started").annotate({
         title: "Thread/startedNotificationMethod",
       }),
       params: ServerNotification__ThreadStartedNotification,
+    }).annotate({ title: "Thread/startedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/status/changed").annotate({
         title: "Thread/status/changedNotificationMethod",
       }),
       params: ServerNotification__ThreadStatusChangedNotification,
+    }).annotate({ title: "Thread/status/changedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/archived").annotate({
         title: "Thread/archivedNotificationMethod",
       }),
       params: ServerNotification__ThreadArchivedNotification,
+    }).annotate({ title: "Thread/archivedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/deleted").annotate({
         title: "Thread/deletedNotificationMethod",
       }),
       params: ServerNotification__ThreadDeletedNotification,
+    }).annotate({ title: "Thread/deletedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/unarchived").annotate({
         title: "Thread/unarchivedNotificationMethod",
       }),
       params: ServerNotification__ThreadUnarchivedNotification,
+    }).annotate({ title: "Thread/unarchivedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/closed").annotate({
         title: "Thread/closedNotificationMethod",
       }),
       params: ServerNotification__ThreadClosedNotification,
+    }).annotate({ title: "Thread/closedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("thread/reverted").annotate({
+        title: "Thread/revertedNotificationMethod",
+      }),
+      params: ServerNotification__ThreadRevertedNotification,
+    }).annotate({ title: "Thread/revertedNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("skills/changed").annotate({
         title: "Skills/changedNotificationMethod",
       }),
       params: ServerNotification__SkillsChangedNotification,
+    }).annotate({ title: "Skills/changedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/name/updated").annotate({
         title: "Thread/name/updatedNotificationMethod",
       }),
       params: ServerNotification__ThreadNameUpdatedNotification,
+    }).annotate({ title: "Thread/name/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("thread/attachment/updated").annotate({
+        title: "Thread/attachment/updatedNotificationMethod",
+      }),
+      params: ServerNotification__ThreadAttachmentUpdatedNotification,
+    }).annotate({ title: "Thread/attachment/updatedNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("thread/goal/updated").annotate({
         title: "Thread/goal/updatedNotificationMethod",
       }),
       params: ServerNotification__ThreadGoalUpdatedNotification,
+    }).annotate({ title: "Thread/goal/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/goal/cleared").annotate({
         title: "Thread/goal/clearedNotificationMethod",
       }),
       params: ServerNotification__ThreadGoalClearedNotification,
+    }).annotate({ title: "Thread/goal/clearedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("thread/queue/changed").annotate({
+        title: "Thread/queue/changedNotificationMethod",
+      }),
+      params: ServerNotification__ThreadQueueChangedNotification,
+    }).annotate({ title: "Thread/queue/changedNotification" }),
+    Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
+      method: Schema.Literal("project/changed").annotate({
+        title: "Project/changedNotificationMethod",
+      }),
+      params: ServerNotification__ProjectChangedNotification,
+    }).annotate({ title: "Project/changedNotification" }),
+    Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
+      method: Schema.Literal("thread/project/updated").annotate({
+        title: "Thread/project/updatedNotificationMethod",
+      }),
+      params: ServerNotification__ThreadProjectUpdatedNotification,
+    }).annotate({ title: "Thread/project/updatedNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("thread/environment/connected").annotate({
         title: "Thread/environment/connectedNotificationMethod",
       }),
       params: ServerNotification__EnvironmentConnectionNotification,
+    }).annotate({ title: "Thread/environment/connectedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/environment/disconnected").annotate({
         title: "Thread/environment/disconnectedNotificationMethod",
       }),
       params: ServerNotification__EnvironmentConnectionNotification,
+    }).annotate({ title: "Thread/environment/disconnectedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/settings/updated").annotate({
         title: "Thread/settings/updatedNotificationMethod",
       }),
       params: ServerNotification__ThreadSettingsUpdatedNotification,
+    }).annotate({ title: "Thread/settings/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/tokenUsage/updated").annotate({
         title: "Thread/tokenUsage/updatedNotificationMethod",
       }),
       params: ServerNotification__ThreadTokenUsageUpdatedNotification,
+    }).annotate({ title: "Thread/tokenUsage/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("turn/started").annotate({ title: "Turn/startedNotificationMethod" }),
       params: ServerNotification__TurnStartedNotification,
+    }).annotate({ title: "Turn/startedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("hook/started").annotate({ title: "Hook/startedNotificationMethod" }),
       params: ServerNotification__HookStartedNotification,
+    }).annotate({ title: "Hook/startedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("turn/completed").annotate({
         title: "Turn/completedNotificationMethod",
       }),
       params: ServerNotification__TurnCompletedNotification,
+    }).annotate({ title: "Turn/completedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("hook/completed").annotate({
         title: "Hook/completedNotificationMethod",
       }),
       params: ServerNotification__HookCompletedNotification,
+    }).annotate({ title: "Hook/completedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("turn/diff/updated").annotate({
         title: "Turn/diff/updatedNotificationMethod",
       }),
       params: ServerNotification__TurnDiffUpdatedNotification,
+    }).annotate({ title: "Turn/diff/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("turn/plan/updated").annotate({
         title: "Turn/plan/updatedNotificationMethod",
       }),
       params: ServerNotification__TurnPlanUpdatedNotification,
+    }).annotate({ title: "Turn/plan/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/started").annotate({ title: "Item/startedNotificationMethod" }),
       params: ServerNotification__ItemStartedNotification,
+    }).annotate({ title: "Item/startedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/autoApprovalReview/started").annotate({
         title: "Item/autoApprovalReview/startedNotificationMethod",
       }),
       params: ServerNotification__ItemGuardianApprovalReviewStartedNotification,
+    }).annotate({ title: "Item/autoApprovalReview/startedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/autoApprovalReview/completed").annotate({
         title: "Item/autoApprovalReview/completedNotificationMethod",
       }),
       params: ServerNotification__ItemGuardianApprovalReviewCompletedNotification,
+    }).annotate({ title: "Item/autoApprovalReview/completedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("autoApprovalReview/strictReviewRequired").annotate({
+        title: "AutoApprovalReview/strictReviewRequiredNotificationMethod",
+      }),
+      params: ServerNotification__StrictReviewRequiredNotification,
+    }).annotate({ title: "AutoApprovalReview/strictReviewRequiredNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("item/completed").annotate({
         title: "Item/completedNotificationMethod",
       }),
       params: ServerNotification__ItemCompletedNotification,
+    }).annotate({ title: "Item/completedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/agentMessage/delta").annotate({
         title: "Item/agentMessage/deltaNotificationMethod",
       }),
       params: ServerNotification__AgentMessageDeltaNotification,
+    }).annotate({ title: "Item/agentMessage/deltaNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/plan/delta").annotate({
         title: "Item/plan/deltaNotificationMethod",
       }),
       params: ServerNotification__PlanDeltaNotification,
+    }).annotate({
+      title: "Item/plan/deltaNotification",
+      description: "EXPERIMENTAL - proposed plan streaming deltas for plan items.",
+    }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("command/exec/outputDelta").annotate({
         title: "Command/exec/outputDeltaNotificationMethod",
       }),
       params: ServerNotification__CommandExecOutputDeltaNotification,
+    }).annotate({
+      title: "Command/exec/outputDeltaNotification",
+      description:
+        "Stream base64-encoded stdout/stderr chunks for a running `command/exec` session.",
+    }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("process/outputDelta").annotate({
         title: "Process/outputDeltaNotificationMethod",
       }),
       params: ServerNotification__ProcessOutputDeltaNotification,
+    }).annotate({
+      title: "Process/outputDeltaNotification",
+      description:
+        "Stream base64-encoded stdout/stderr chunks for a running `process/spawn` session.",
+    }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("process/exited").annotate({
         title: "Process/exitedNotificationMethod",
       }),
       params: ServerNotification__ProcessExitedNotification,
+    }).annotate({
+      title: "Process/exitedNotification",
+      description: "Final exit notification for a `process/spawn` session.",
+    }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/commandExecution/outputDelta").annotate({
         title: "Item/commandExecution/outputDeltaNotificationMethod",
       }),
       params: ServerNotification__CommandExecutionOutputDeltaNotification,
+    }).annotate({ title: "Item/commandExecution/outputDeltaNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
-          format: "int64",
-        }).check(Schema.isInt()),
-      ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("item/commandExecution/terminalInteraction").annotate({
         title: "Item/commandExecution/terminalInteractionNotificationMethod",
       }),
       params: ServerNotification__TerminalInteractionNotification,
+    }).annotate({ title: "Item/commandExecution/terminalInteractionNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/fileChange/outputDelta").annotate({
         title: "Item/fileChange/outputDeltaNotificationMethod",
       }),
       params: ServerNotification__FileChangeOutputDeltaNotification,
+    }).annotate({
+      title: "Item/fileChange/outputDeltaNotification",
+      description: "Deprecated legacy apply_patch output stream notification.",
+    }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/fileChange/patchUpdated").annotate({
         title: "Item/fileChange/patchUpdatedNotificationMethod",
       }),
       params: ServerNotification__FileChangePatchUpdatedNotification,
+    }).annotate({ title: "Item/fileChange/patchUpdatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("serverRequest/resolved").annotate({
         title: "ServerRequest/resolvedNotificationMethod",
       }),
       params: ServerNotification__ServerRequestResolvedNotification,
+    }).annotate({ title: "ServerRequest/resolvedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/mcpToolCall/progress").annotate({
         title: "Item/mcpToolCall/progressNotificationMethod",
       }),
       params: ServerNotification__McpToolCallProgressNotification,
+    }).annotate({ title: "Item/mcpToolCall/progressNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("mcpServer/oauthLogin/completed").annotate({
         title: "McpServer/oauthLogin/completedNotificationMethod",
       }),
       params: ServerNotification__McpServerOauthLoginCompletedNotification,
+    }).annotate({ title: "McpServer/oauthLogin/completedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("mcpServer/startupStatus/updated").annotate({
         title: "McpServer/startupStatus/updatedNotificationMethod",
       }),
       params: ServerNotification__McpServerStatusUpdatedNotification,
+    }).annotate({ title: "McpServer/startupStatus/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("mcpServer/event/stream/notification").annotate({
+        title: "McpServer/event/stream/notificationNotificationMethod",
+      }),
+      params: ServerNotification__McpServerEventStreamNotification,
+    }).annotate({ title: "McpServer/event/stream/notificationNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("account/updated").annotate({
         title: "Account/updatedNotificationMethod",
       }),
       params: ServerNotification__AccountUpdatedNotification,
+    }).annotate({ title: "Account/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("account/gatewayOAuth/changed").annotate({
+        title: "Account/gatewayOAuth/changedNotificationMethod",
+      }),
+      params: ServerNotification__GatewayOAuthChangedNotification,
+    }).annotate({ title: "Account/gatewayOAuth/changedNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("account/rateLimits/updated").annotate({
         title: "Account/rateLimits/updatedNotificationMethod",
       }),
       params: ServerNotification__AccountRateLimitsUpdatedNotification,
+    }).annotate({ title: "Account/rateLimits/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("app/list/updated").annotate({
         title: "App/list/updatedNotificationMethod",
       }),
       params: ServerNotification__AppListUpdatedNotification,
+    }).annotate({ title: "App/list/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("remoteControl/status/changed").annotate({
         title: "RemoteControl/status/changedNotificationMethod",
       }),
       params: ServerNotification__RemoteControlStatusChangedNotification,
+    }).annotate({ title: "RemoteControl/status/changedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("externalAgentConfig/import/progress").annotate({
         title: "ExternalAgentConfig/import/progressNotificationMethod",
       }),
       params: ServerNotification__ExternalAgentConfigImportProgressNotification,
+    }).annotate({ title: "ExternalAgentConfig/import/progressNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("externalAgentConfig/import/completed").annotate({
         title: "ExternalAgentConfig/import/completedNotificationMethod",
       }),
       params: ServerNotification__ExternalAgentConfigImportCompletedNotification,
+    }).annotate({ title: "ExternalAgentConfig/import/completedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("fs/changed").annotate({ title: "Fs/changedNotificationMethod" }),
       params: ServerNotification__FsChangedNotification,
+    }).annotate({ title: "Fs/changedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/reasoning/summaryTextDelta").annotate({
         title: "Item/reasoning/summaryTextDeltaNotificationMethod",
       }),
       params: ServerNotification__ReasoningSummaryTextDeltaNotification,
+    }).annotate({ title: "Item/reasoning/summaryTextDeltaNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/reasoning/summaryPartAdded").annotate({
         title: "Item/reasoning/summaryPartAddedNotificationMethod",
       }),
       params: ServerNotification__ReasoningSummaryPartAddedNotification,
+    }).annotate({ title: "Item/reasoning/summaryPartAddedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("item/reasoning/textDelta").annotate({
         title: "Item/reasoning/textDeltaNotificationMethod",
       }),
       params: ServerNotification__ReasoningTextDeltaNotification,
+    }).annotate({ title: "Item/reasoning/textDeltaNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/compacted").annotate({
         title: "Thread/compactedNotificationMethod",
       }),
       params: ServerNotification__ContextCompactedNotification,
+    }).annotate({
+      title: "Thread/compactedNotification",
+      description: "Deprecated: Use `ContextCompaction` item type instead.",
+    }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("model/rerouted").annotate({
         title: "Model/reroutedNotificationMethod",
       }),
       params: ServerNotification__ModelReroutedNotification,
+    }).annotate({ title: "Model/reroutedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("model/verification").annotate({
         title: "Model/verificationNotificationMethod",
       }),
       params: ServerNotification__ModelVerificationNotification,
+    }).annotate({ title: "Model/verificationNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("modelProvider/authRecoveryStarted").annotate({
+        title: "ModelProvider/authRecoveryStartedNotificationMethod",
+      }),
+      params: ServerNotification__AuthRecoveryNotification,
+    }).annotate({ title: "ModelProvider/authRecoveryStartedNotification" }),
+    Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
+      method: Schema.Literal("modelProvider/authRecoveryCompleted").annotate({
+        title: "ModelProvider/authRecoveryCompletedNotificationMethod",
+      }),
+      params: ServerNotification__AuthRecoveryNotification,
+    }).annotate({ title: "ModelProvider/authRecoveryCompletedNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("turn/moderationMetadata").annotate({
         title: "Turn/moderationMetadataNotificationMethod",
       }),
       params: ServerNotification__TurnModerationMetadataNotification,
+    }).annotate({ title: "Turn/moderationMetadataNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("model/safetyBuffering/updated").annotate({
         title: "Model/safetyBuffering/updatedNotificationMethod",
       }),
       params: ServerNotification__ModelSafetyBufferingUpdatedNotification,
+    }).annotate({ title: "Model/safetyBuffering/updatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("warning").annotate({ title: "WarningNotificationMethod" }),
       params: ServerNotification__WarningNotification,
+    }).annotate({ title: "WarningNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("guardianWarning").annotate({
         title: "GuardianWarningNotificationMethod",
       }),
       params: ServerNotification__GuardianWarningNotification,
+    }).annotate({ title: "GuardianWarningNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("deprecationNotice").annotate({
         title: "DeprecationNoticeNotificationMethod",
       }),
       params: ServerNotification__DeprecationNoticeNotification,
+    }).annotate({ title: "DeprecationNoticeNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("configWarning").annotate({
         title: "ConfigWarningNotificationMethod",
       }),
       params: ServerNotification__ConfigWarningNotification,
+    }).annotate({ title: "ConfigWarningNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("fuzzyFileSearch/sessionUpdated").annotate({
         title: "FuzzyFileSearch/sessionUpdatedNotificationMethod",
       }),
       params: ServerNotification__FuzzyFileSearchSessionUpdatedNotification,
+    }).annotate({ title: "FuzzyFileSearch/sessionUpdatedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("fuzzyFileSearch/sessionCompleted").annotate({
         title: "FuzzyFileSearch/sessionCompletedNotificationMethod",
       }),
       params: ServerNotification__FuzzyFileSearchSessionCompletedNotification,
+    }).annotate({ title: "FuzzyFileSearch/sessionCompletedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/realtime/started").annotate({
         title: "Thread/realtime/startedNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeStartedNotification,
+    }).annotate({ title: "Thread/realtime/startedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/realtime/itemAdded").annotate({
         title: "Thread/realtime/itemAddedNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeItemAddedNotification,
+    }).annotate({ title: "Thread/realtime/itemAddedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+      method: Schema.Literal("thread/realtime/item/started").annotate({
+        title: "Thread/realtime/item/startedNotificationMethod",
+      }),
+      params: ServerNotification__ThreadRealtimeItemStartedNotification,
+    }).annotate({ title: "Thread/realtime/item/startedNotification" }),
+    Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
+      method: Schema.Literal("thread/realtime/item/transcript/delta").annotate({
+        title: "Thread/realtime/item/transcript/deltaNotificationMethod",
+      }),
+      params: ServerNotification__ThreadRealtimeItemTranscriptDeltaNotification,
+    }).annotate({ title: "Thread/realtime/item/transcript/deltaNotification" }),
     Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
+      method: Schema.Literal("thread/realtime/item/completed").annotate({
+        title: "Thread/realtime/item/completedNotificationMethod",
+      }),
+      params: ServerNotification__ThreadRealtimeItemCompletedNotification,
+    }).annotate({ title: "Thread/realtime/item/completedNotification" }),
+    Schema.Struct({
+      emittedAtMs: Schema.optionalKey(
+        Schema.Number.annotate({
+          description:
+            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
+          format: "int64",
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      ),
       method: Schema.Literal("thread/realtime/transcript/delta").annotate({
         title: "Thread/realtime/transcript/deltaNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeTranscriptDeltaNotification,
+    }).annotate({ title: "Thread/realtime/transcript/deltaNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/realtime/transcript/done").annotate({
         title: "Thread/realtime/transcript/doneNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeTranscriptDoneNotification,
+    }).annotate({ title: "Thread/realtime/transcript/doneNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/realtime/outputAudio/delta").annotate({
         title: "Thread/realtime/outputAudio/deltaNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeOutputAudioDeltaNotification,
+    }).annotate({ title: "Thread/realtime/outputAudio/deltaNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/realtime/sdp").annotate({
         title: "Thread/realtime/sdpNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeSdpNotification,
+    }).annotate({ title: "Thread/realtime/sdpNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/realtime/error").annotate({
         title: "Thread/realtime/errorNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeErrorNotification,
+    }).annotate({ title: "Thread/realtime/errorNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("thread/realtime/closed").annotate({
         title: "Thread/realtime/closedNotificationMethod",
       }),
       params: ServerNotification__ThreadRealtimeClosedNotification,
+    }).annotate({ title: "Thread/realtime/closedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("windows/worldWritableWarning").annotate({
         title: "Windows/worldWritableWarningNotificationMethod",
       }),
       params: ServerNotification__WindowsWorldWritableWarningNotification,
+    }).annotate({
+      title: "Windows/worldWritableWarningNotification",
+      description:
+        "Notifies the user of world-writable directories on Windows, which cannot be protected by the sandbox.",
+    }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("windowsSandbox/setupCompleted").annotate({
         title: "WindowsSandbox/setupCompletedNotificationMethod",
       }),
       params: ServerNotification__WindowsSandboxSetupCompletedNotification,
+    }).annotate({ title: "WindowsSandbox/setupCompletedNotification" }),
+    Schema.Struct({
       emittedAtMs: Schema.optionalKey(
         Schema.Number.annotate({
           description:
             "Unix timestamp (in milliseconds) when app-server emitted this notification.",
           format: "int64",
-        }).check(Schema.isInt()),
+        }).check(Schema.isInt().annotate({ expected: "an integer" })),
       ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
-    Schema.Struct({
       method: Schema.Literal("account/login/completed").annotate({
         title: "Account/login/completedNotificationMethod",
       }),
       params: ServerNotification__AccountLoginCompletedNotification,
-      emittedAtMs: Schema.optionalKey(
-        Schema.Number.annotate({
-          description:
-            "Unix timestamp (in milliseconds) when app-server emitted this notification.",
-          format: "int64",
-        }).check(Schema.isInt()),
-      ),
-    }).annotate({
-      title: "ServerNotification",
-      description: "Notification sent from the server to the client.",
-    }),
+    }).annotate({ title: "Account/login/completedNotification" }),
   ],
   { mode: "oneOf" },
-);
-
-export type ServerNotification__ByteRange = { readonly end: number; readonly start: number };
-export const ServerNotification__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+).annotate({
+  title: "ServerNotification",
+  description: "Notification sent from the server to the client.",
 });
 
-export type ServerNotification__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const ServerNotification__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type ServerNotification__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const ServerNotification__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type ServerNotification__CommandExecOutputStream = "stdout" | "stderr";
-export const ServerNotification__CommandExecOutputStream = Schema.Literals([
-  "stdout",
-  "stderr",
-]).annotate({ description: "Stream label for `command/exec/outputDelta` notifications." });
-
-export type ServerNotification__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const ServerNotification__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type ServerNotification__HookSource =
-  | "system"
-  | "user"
-  | "project"
-  | "mdm"
-  | "sessionFlags"
-  | "plugin"
-  | "cloudRequirements"
-  | "cloudManagedConfig"
-  | "legacyManagedConfigFile"
-  | "legacyManagedConfigMdm"
-  | "unknown";
-export const ServerNotification__HookSource = Schema.Literals([
-  "system",
-  "user",
-  "project",
-  "mdm",
-  "sessionFlags",
-  "plugin",
-  "cloudRequirements",
-  "cloudManagedConfig",
-  "legacyManagedConfigFile",
-  "legacyManagedConfigMdm",
-  "unknown",
-]);
-
 export type ServerNotification__MultiAgentMode =
   | "explicitRequestOnly"
   | "proactive"
@@ -36668,44 +51093,24 @@ export const ServerNotification__MultiAgentMode = Schema.Union(
     "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
 });
 
-export type ServerNotification__NetworkAccess = "restricted" | "enabled";
-export const ServerNotification__NetworkAccess = Schema.Literals(["restricted", "enabled"]);
-
-export type ServerNotification__ProcessOutputStream = "stdout" | "stderr";
-export const ServerNotification__ProcessOutputStream = Schema.Literals([
-  "stdout",
-  "stderr",
-]).annotate({ description: "Stream label for `process/outputDelta` notifications." });
-
-export type ServerNotification__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: ServerNotification__SubAgentSource };
-export const ServerNotification__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: ServerNotification__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type ServerNotification__ThreadExtra = {};
-export const ServerNotification__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export type ServerNotification__ThreadEnvironment = {
+  readonly cwd: ServerNotification__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<ServerNotification__LegacyAppPathString>;
+};
+export const ServerNotification__ThreadEnvironment = Schema.Struct({
+  cwd: ServerNotification__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(ServerNotification__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
 });
 
-export type ServerNotification__ThreadHistoryMode = "legacy" | "paginated";
-export const ServerNotification__ThreadHistoryMode = Schema.Literals(["legacy", "paginated"]);
-
-export type ServerNotification__TurnItemsView = "notLoaded" | "summary" | "full";
-export const ServerNotification__TurnItemsView = Schema.Literals(["notLoaded", "summary", "full"]);
+export type ServerNotification__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const ServerNotification__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
 export type ServerRequest =
   | {
@@ -36932,6 +51337,7 @@ export const ServerRequest__CommandExecutionApprovalDecision = Schema.Union(
 
 export type ToolRequestUserInputParams = {
   readonly autoResolutionMs?: number | null;
+  readonly isBlocking: boolean;
   readonly itemId: string;
   readonly questions: ReadonlyArray<ToolRequestUserInputParams__ToolRequestUserInputQuestion>;
   readonly threadId: string;
@@ -36940,12 +51346,20 @@ export type ToolRequestUserInputParams = {
 export const ToolRequestUserInputParams = Schema.Struct({
   autoResolutionMs: Schema.optionalKey(
     Schema.Union([
-      Schema.Number.annotate({ format: "uint64" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+      Schema.Number.annotate({
+        description: "@deprecated Use `isBlocking` to decide whether the request should block.",
+        format: "uint64",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
+  isBlocking: Schema.Boolean,
   itemId: Schema.String,
   questions: Schema.Array(ToolRequestUserInputParams__ToolRequestUserInputQuestion),
   threadId: Schema.String,
@@ -36979,16 +51393,16 @@ export const V1InitializeParams = Schema.Struct({
 }).annotate({ title: "InitializeParams" });
 
 export type V1InitializeResponse = {
-  readonly codexHome: string;
+  readonly codexHome: V1InitializeResponse__AbsolutePathBuf;
   readonly platformFamily: string;
   readonly platformOs: string;
   readonly userAgent: string;
 };
 export const V1InitializeResponse = Schema.Struct({
-  codexHome: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  codexHome: Schema.suspend(
+    (): Schema.Codec<V1InitializeResponse__AbsolutePathBuf> =>
+      V1InitializeResponse__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to the server's $CODEX_HOME directory." }),
   platformFamily: Schema.String.annotate({
     description:
       'Platform family for the running app-server target, for example `"unix"` or `"windows"`.',
@@ -37000,20 +51414,18 @@ export const V1InitializeResponse = Schema.Struct({
   userAgent: Schema.String,
 }).annotate({ title: "InitializeResponse" });
 
-export type V1InitializeResponse__AbsolutePathBuf = string;
-export const V1InitializeResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
 export type V2AccountLoginCompletedNotification = {
   readonly error?: string | null;
   readonly loginId?: string | null;
+  readonly onboardingEntrypoint?: V2AccountLoginCompletedNotification__DesktopOnboardingEntrypoint | null;
   readonly success: boolean;
 };
 export const V2AccountLoginCompletedNotification = Schema.Struct({
   error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   loginId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  onboardingEntrypoint: Schema.optionalKey(
+    Schema.Union([V2AccountLoginCompletedNotification__DesktopOnboardingEntrypoint, Schema.Null]),
+  ),
   success: Schema.Boolean,
 }).annotate({ title: "AccountLoginCompletedNotification" });
 
@@ -37120,8 +51532,12 @@ export const V2AppsListParams = Schema.Struct({
         description: "Optional page size; defaults to a reasonable server-side value.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -37159,6 +51575,7 @@ export const V2AppsListResponse = Schema.Struct({
 export type V2AppsReadParams = {
   readonly appIds: ReadonlyArray<string>;
   readonly includeTools?: boolean;
+  readonly threadId?: string | null;
 };
 export const V2AppsReadParams = Schema.Struct({
   appIds: Schema.Array(Schema.String).annotate({
@@ -37171,6 +51588,14 @@ export const V2AppsReadParams = Schema.Struct({
         "When true, include display-only public tool summaries in the returned metadata.",
     }),
   ),
+  threadId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional loaded thread id used to evaluate effective app configuration.",
+      }),
+      Schema.Null,
+    ]),
+  ),
 }).annotate({
   title: "AppsReadParams",
   description: "EXPERIMENTAL - read metadata for specific apps/connectors.",
@@ -37185,6 +51610,19 @@ export const V2AppsReadResponse = Schema.Struct({
   missingAppIds: Schema.Array(Schema.String),
 }).annotate({ title: "AppsReadResponse", description: "EXPERIMENTAL - app/read response." });
 
+export type V2AuthRecoveryNotification = {
+  readonly message: string;
+  readonly provider: string;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const V2AuthRecoveryNotification = Schema.Struct({
+  message: Schema.String,
+  provider: Schema.String,
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ title: "AuthRecoveryNotification" });
+
 export type V2CancelLoginAccountParams = { readonly loginId: string };
 export const V2CancelLoginAccountParams = Schema.Struct({ loginId: Schema.String }).annotate({
   title: "CancelLoginAccountParams",
@@ -37201,7 +51639,7 @@ export type V2CommandExecOutputDeltaNotification = {
   readonly capReached: boolean;
   readonly deltaBase64: string;
   readonly processId: string;
-  readonly stream: "stdout" | "stderr";
+  readonly stream: V2CommandExecOutputDeltaNotification__CommandExecOutputStream;
 };
 export const V2CommandExecOutputDeltaNotification = Schema.Struct({
   capReached: Schema.Boolean.annotate({
@@ -37213,21 +51651,16 @@ export const V2CommandExecOutputDeltaNotification = Schema.Struct({
     description:
       "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
   }),
-  stream: Schema.Literals(["stdout", "stderr"]).annotate({
-    description: "Stream label for `command/exec/outputDelta` notifications.",
-  }),
+  stream: Schema.suspend(
+    (): Schema.Codec<V2CommandExecOutputDeltaNotification__CommandExecOutputStream> =>
+      V2CommandExecOutputDeltaNotification__CommandExecOutputStream,
+  ).annotate({ description: "Output stream for this chunk." }),
 }).annotate({
   title: "CommandExecOutputDeltaNotification",
   description:
     "Base64-encoded output chunk emitted for a streaming `command/exec` request.\n\nThese notifications are connection-scoped. If the originating connection closes, the server terminates the process.",
 });
 
-export type V2CommandExecOutputDeltaNotification__CommandExecOutputStream = "stdout" | "stderr";
-export const V2CommandExecOutputDeltaNotification__CommandExecOutputStream = Schema.Literals([
-  "stdout",
-  "stderr",
-]).annotate({ description: "Stream label for `command/exec/outputDelta` notifications." });
-
 export type V2CommandExecParams = {
   readonly command: ReadonlyArray<string>;
   readonly cwd?: string | null;
@@ -37283,8 +51716,12 @@ export const V2CommandExecParams = Schema.Struct({
           "Optional per-stream stdout/stderr capture cap in bytes.\n\nWhen omitted, the server default applies. Cannot be combined with `disableOutputCap`.",
         format: "uint",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -37326,7 +51763,7 @@ export const V2CommandExecParams = Schema.Struct({
         description:
           "Optional timeout in milliseconds.\n\nWhen omitted, the server default applies. Cannot be combined with `disableTimeout`.",
         format: "int64",
-      }).check(Schema.isInt()),
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
       Schema.Null,
     ]),
   ),
@@ -37341,58 +51778,29 @@ export const V2CommandExecParams = Schema.Struct({
     "Run a standalone command (argv vector) in the server sandbox without creating a thread or turn.\n\nThe final `command/exec` response is deferred until the process exits and is sent only after all `command/exec/outputDelta` notifications for that connection have been emitted.",
 });
 
-export type V2CommandExecParams__NetworkAccess = "restricted" | "enabled";
-export const V2CommandExecParams__NetworkAccess = Schema.Literals(["restricted", "enabled"]);
-
 export type V2CommandExecResizeParams = {
   readonly processId: string;
-  readonly size: { readonly cols: number; readonly rows: number };
+  readonly size: V2CommandExecResizeParams__CommandExecTerminalSize;
 };
 export const V2CommandExecResizeParams = Schema.Struct({
   processId: Schema.String.annotate({
     description:
       "Client-supplied, connection-scoped `processId` from the original `command/exec` request.",
   }),
-  size: Schema.Struct({
-    cols: Schema.Number.annotate({
-      description: "Terminal width in character cells.",
-      format: "uint16",
-    })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-    rows: Schema.Number.annotate({
-      description: "Terminal height in character cells.",
-      format: "uint16",
-    })
-      .check(Schema.isInt())
-      .check(Schema.isGreaterThanOrEqualTo(0)),
-  }).annotate({ description: "PTY size in character cells for `command/exec` PTY sessions." }),
+  size: Schema.suspend(
+    (): Schema.Codec<V2CommandExecResizeParams__CommandExecTerminalSize> =>
+      V2CommandExecResizeParams__CommandExecTerminalSize,
+  ).annotate({ description: "New PTY size in character cells." }),
 }).annotate({
   title: "CommandExecResizeParams",
   description: "Resize a running PTY-backed `command/exec` session.",
 });
 
-export type V2CommandExecResizeParams__CommandExecTerminalSize = {
-  readonly cols: number;
-  readonly rows: number;
-};
-export const V2CommandExecResizeParams__CommandExecTerminalSize = Schema.Struct({
-  cols: Schema.Number.annotate({
-    description: "Terminal width in character cells.",
-    format: "uint16",
-  })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  rows: Schema.Number.annotate({
-    description: "Terminal height in character cells.",
-    format: "uint16",
-  })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-}).annotate({ description: "PTY size in character cells for `command/exec` PTY sessions." });
-
-export type V2CommandExecResizeResponse = {};
-export const V2CommandExecResizeResponse = Schema.Struct({}).annotate({
+export type V2CommandExecResizeResponse = { readonly [x: string]: Schema.Json };
+export const V2CommandExecResizeResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
   title: "CommandExecResizeResponse",
   description: "Empty success response for `command/exec/resize`.",
 });
@@ -37404,7 +51812,7 @@ export type V2CommandExecResponse = {
 };
 export const V2CommandExecResponse = Schema.Struct({
   exitCode: Schema.Number.annotate({ description: "Process exit code.", format: "int32" }).check(
-    Schema.isInt(),
+    Schema.isInt().annotate({ expected: "an integer" }),
   ),
   stderr: Schema.String.annotate({
     description:
@@ -37430,8 +51838,11 @@ export const V2CommandExecTerminateParams = Schema.Struct({
   description: "Terminate a running `command/exec` session.",
 });
 
-export type V2CommandExecTerminateResponse = {};
-export const V2CommandExecTerminateResponse = Schema.Struct({}).annotate({
+export type V2CommandExecTerminateResponse = { readonly [x: string]: Schema.Json };
+export const V2CommandExecTerminateResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
   title: "CommandExecTerminateResponse",
   description: "Empty success response for `command/exec/terminate`.",
 });
@@ -37475,8 +51886,11 @@ export const V2CommandExecWriteParams = Schema.Struct({
   description: "Write stdin bytes to a running `command/exec` session, close stdin, or both.",
 });
 
-export type V2CommandExecWriteResponse = {};
-export const V2CommandExecWriteResponse = Schema.Struct({}).annotate({
+export type V2CommandExecWriteResponse = { readonly [x: string]: Schema.Json };
+export const V2CommandExecWriteResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
   title: "CommandExecWriteResponse",
   description: "Empty success response for `command/exec/write`.",
 });
@@ -37502,7 +51916,7 @@ export const V2ConfigBatchWriteParams = Schema.Struct({
   reloadUserConfig: Schema.optionalKey(
     Schema.Boolean.annotate({
       description:
-        "When true, hot-reload the updated user config into all loaded threads after writing.",
+        "When true, hot-reload updated runtime settings into loaded threads after writing. Session-static model, reasoning-effort, Plan-mode reasoning-effort, and service-tier defaults are not reloaded. The deprecated personality setting is also not reloaded.",
     }),
   ),
 }).annotate({ title: "ConfigBatchWriteParams" });
@@ -37540,6 +51954,8 @@ export type V2ConfigReadResponse__AppConfig = {
   readonly default_tools_enabled?: boolean | null;
   readonly destructive_enabled?: boolean | null;
   readonly enabled?: boolean;
+  readonly links?: V2ConfigReadResponse__AppLinksConfig | null;
+  readonly omit_tools_from?: ReadonlyArray<V2ConfigReadResponse__ToolExposureSurface> | null;
   readonly open_world_enabled?: boolean | null;
   readonly tools?: V2ConfigReadResponse__AppToolsConfig | null;
 };
@@ -37553,10 +51969,36 @@ export const V2ConfigReadResponse__AppConfig = Schema.Struct({
   default_tools_enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   destructive_enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   enabled: Schema.optionalKey(Schema.Boolean.annotate({ default: true })),
+  links: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AppLinksConfig, Schema.Null]).annotate({
+      description: "Per-account approval settings keyed by link ID.",
+    }),
+  ),
+  omit_tools_from: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(V2ConfigReadResponse__ToolExposureSurface).annotate({
+        description: "Additional model-facing surfaces omitted for this connector's tools.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   open_world_enabled: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   tools: Schema.optionalKey(Schema.Union([V2ConfigReadResponse__AppToolsConfig, Schema.Null])),
 });
 
+export type V2ConfigReadResponse__AppLinkConfig = {
+  readonly approvals_reviewer?: V2ConfigReadResponse__ApprovalsReviewer | null;
+  readonly default_tools_approval_mode?: V2ConfigReadResponse__AppToolApproval | null;
+};
+export const V2ConfigReadResponse__AppLinkConfig = Schema.Struct({
+  approvals_reviewer: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__ApprovalsReviewer, Schema.Null]),
+  ),
+  default_tools_approval_mode: Schema.optionalKey(
+    Schema.Union([V2ConfigReadResponse__AppToolApproval, Schema.Null]),
+  ),
+}).annotate({ description: "Approval settings for a connected account within an app." });
+
 export type V2ConfigReadResponse__AppsConfig = {
   readonly _default?: V2ConfigReadResponse__AppsDefaultConfig | null;
 };
@@ -37589,6 +52031,15 @@ export const V2ConfigRequirementsReadResponse = Schema.Struct({
   ),
 }).annotate({ title: "ConfigRequirementsReadResponse" });
 
+export type V2ConfigRequirementsReadResponse__ApplicationRequirements = {
+  readonly network?: V2ConfigRequirementsReadResponse__ApplicationNetworkRequirements | null;
+};
+export const V2ConfigRequirementsReadResponse__ApplicationRequirements = Schema.Struct({
+  network: Schema.optionalKey(
+    Schema.Union([V2ConfigRequirementsReadResponse__ApplicationNetworkRequirements, Schema.Null]),
+  ),
+});
+
 export type V2ConfigRequirementsReadResponse__ApprovalsReviewer =
   | "user"
   | "auto_review"
@@ -37603,6 +52054,7 @@ export const V2ConfigRequirementsReadResponse__ApprovalsReviewer = Schema.Litera
 });
 
 export type V2ConfigRequirementsReadResponse__ManagedHooksRequirements = {
+  readonly Interrupt?: ReadonlyArray<V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup>;
   readonly PermissionRequest: ReadonlyArray<V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup>;
   readonly PostCompact: ReadonlyArray<V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup>;
   readonly PostToolUse: ReadonlyArray<V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup>;
@@ -37618,6 +52070,11 @@ export type V2ConfigRequirementsReadResponse__ManagedHooksRequirements = {
   readonly windowsManagedDir?: string | null;
 };
 export const V2ConfigRequirementsReadResponse__ManagedHooksRequirements = Schema.Struct({
+  Interrupt: Schema.optionalKey(
+    Schema.Array(V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup).annotate({
+      default: [],
+    }),
+  ),
   PermissionRequest: Schema.Array(V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup),
   PostCompact: Schema.Array(V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup),
   PostToolUse: Schema.Array(V2ConfigRequirementsReadResponse__ConfiguredHookMatcherGroup),
@@ -37698,8 +52155,12 @@ export const V2ConfigRequirementsReadResponse__NetworkRequirements = Schema.Stru
   httpPort: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({ format: "uint16" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -37715,8 +52176,12 @@ export const V2ConfigRequirementsReadResponse__NetworkRequirements = Schema.Stru
   socksPort: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({ format: "uint16" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -37738,7 +52203,7 @@ export type V2ConfigValueWriteParams = {
   readonly filePath?: string | null;
   readonly keyPath: string;
   readonly mergeStrategy: V2ConfigValueWriteParams__MergeStrategy;
-  readonly value: unknown;
+  readonly value: Schema.Json;
 };
 export const V2ConfigValueWriteParams = Schema.Struct({
   expectedVersion: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -37753,7 +52218,7 @@ export const V2ConfigValueWriteParams = Schema.Struct({
   ),
   keyPath: Schema.String,
   mergeStrategy: V2ConfigValueWriteParams__MergeStrategy,
-  value: Schema.Unknown,
+  value: Schema.Json.annotate({ expected: "JSON value" }),
 }).annotate({ title: "ConfigValueWriteParams" });
 
 export type V2ConfigWarningNotification = {
@@ -37786,16 +52251,16 @@ export const V2ConfigWarningNotification = Schema.Struct({
 }).annotate({ title: "ConfigWarningNotification" });
 
 export type V2ConfigWriteResponse = {
-  readonly filePath: string;
+  readonly filePath: V2ConfigWriteResponse__AbsolutePathBuf;
   readonly overriddenMetadata?: V2ConfigWriteResponse__OverriddenMetadata | null;
   readonly status: V2ConfigWriteResponse__WriteStatus;
   readonly version: string;
 };
 export const V2ConfigWriteResponse = Schema.Struct({
-  filePath: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  filePath: Schema.suspend(
+    (): Schema.Codec<V2ConfigWriteResponse__AbsolutePathBuf> =>
+      V2ConfigWriteResponse__AbsolutePathBuf,
+  ).annotate({ description: "Canonical path to the config file that was written." }),
   overriddenMetadata: Schema.optionalKey(
     Schema.Union([V2ConfigWriteResponse__OverriddenMetadata, Schema.Null]),
   ),
@@ -37916,8 +52381,12 @@ export const V2ExperimentalFeatureListParams = Schema.Struct({
         description: "Optional page size; defaults to a reasonable server-side value.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -37949,23 +52418,11 @@ export const V2ExperimentalFeatureListResponse = Schema.Struct({
   ),
 }).annotate({ title: "ExperimentalFeatureListResponse" });
 
-export type V2ExperimentalFeatureListResponse__ExperimentalFeatureStage =
-  | "beta"
-  | "underDevelopment"
-  | "stable"
-  | "deprecated"
-  | "removed";
-export const V2ExperimentalFeatureListResponse__ExperimentalFeatureStage = Schema.Literals([
-  "beta",
-  "underDevelopment",
-  "stable",
-  "deprecated",
-  "removed",
-]);
-
 export type V2ExternalAgentConfigDetectParams = {
   readonly cwds?: ReadonlyArray<string> | null;
   readonly includeHome?: boolean;
+  readonly maxSessionAgeDays?: number | null;
+  readonly maxSessions?: number | null;
   readonly migrationSource?: string | null;
   readonly source?: string | null;
 };
@@ -37983,6 +52440,37 @@ export const V2ExternalAgentConfigDetectParams = Schema.Struct({
       description: "If true, include detection under the user's home directory.",
     }),
   ),
+  maxSessionAgeDays: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Maximum age in days for detected sessions. Missing values use the default limit.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  maxSessions: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description: "Maximum number of sessions to detect. Missing values use the default limit.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
   migrationSource: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -38004,9 +52492,15 @@ export const V2ExternalAgentConfigDetectParams = Schema.Struct({
 }).annotate({ title: "ExternalAgentConfigDetectParams" });
 
 export type V2ExternalAgentConfigDetectResponse = {
+  readonly connectors?: ReadonlyArray<V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorCandidate>;
   readonly items: ReadonlyArray<V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItem>;
 };
 export const V2ExternalAgentConfigDetectResponse = Schema.Struct({
+  connectors: Schema.optionalKey(
+    Schema.Array(
+      V2ExternalAgentConfigDetectResponse__ExternalAgentDetectedConnectorCandidate,
+    ).annotate({ default: [] }),
+  ),
   items: Schema.Array(V2ExternalAgentConfigDetectResponse__ExternalAgentConfigMigrationItem),
 }).annotate({ title: "ExternalAgentConfigDetectResponse" });
 
@@ -38034,9 +52528,28 @@ export const V2ExternalAgentConfigImportHistoriesReadResponse = Schema.Struct({
   ),
 }).annotate({ title: "ExternalAgentConfigImportHistoriesReadResponse" });
 
+export type V2ExternalAgentConfigImportHistoryRecordParams = {
+  readonly itemTypeResults: ReadonlyArray<V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordTypeResultParams>;
+  readonly providerId: string;
+};
+export const V2ExternalAgentConfigImportHistoryRecordParams = Schema.Struct({
+  itemTypeResults: Schema.Array(
+    V2ExternalAgentConfigImportHistoryRecordParams__ExternalAgentConfigImportHistoryRecordTypeResultParams,
+  ).annotate({ description: "Completed results grouped by imported item type." }),
+  providerId: Schema.String.annotate({
+    description: "Opaque provider identifier for the externally completed import.",
+  }),
+}).annotate({ title: "ExternalAgentConfigImportHistoryRecordParams" });
+
+export type V2ExternalAgentConfigImportHistoryRecordResponse = { readonly importId: string };
+export const V2ExternalAgentConfigImportHistoryRecordResponse = Schema.Struct({
+  importId: Schema.String,
+}).annotate({ title: "ExternalAgentConfigImportHistoryRecordResponse" });
+
 export type V2ExternalAgentConfigImportParams = {
   readonly migrationItems: ReadonlyArray<V2ExternalAgentConfigImportParams__ExternalAgentConfigMigrationItem>;
   readonly migrationSource?: string | null;
+  readonly providerId?: string | null;
   readonly source?: string | null;
 };
 export const V2ExternalAgentConfigImportParams = Schema.Struct({
@@ -38050,6 +52563,15 @@ export const V2ExternalAgentConfigImportParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  providerId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Opaque provider identifier supplied by the caller for analytics attribution and import history display. This does not select the migration source.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   source: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -38095,10 +52617,22 @@ export const V2FeedbackUploadParams = Schema.Struct({
   threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
 }).annotate({ title: "FeedbackUploadParams" });
 
-export type V2FeedbackUploadResponse = { readonly threadId: string };
-export const V2FeedbackUploadResponse = Schema.Struct({ threadId: Schema.String }).annotate({
-  title: "FeedbackUploadResponse",
-});
+export type V2FeedbackUploadResponse = {
+  readonly promptHash?: string | null;
+  readonly threadId: string;
+};
+export const V2FeedbackUploadResponse = Schema.Struct({
+  promptHash: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Whitespace-normalized SHA-256 of the session base instructions, matching the uploaded `prompt_hash` tag. Does not include later developer messages. Null when the reported rollout has no prompt metadata.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  threadId: Schema.String,
+}).annotate({ title: "FeedbackUploadResponse" });
 
 export type V2FileChangeOutputDeltaNotification = {
   readonly delta: string;
@@ -38147,50 +52681,42 @@ export const V2FsChangedNotification = Schema.Struct({
 });
 
 export type V2FsCopyParams = {
-  readonly destinationPath: string;
+  readonly destinationPath: V2FsCopyParams__AbsolutePathBuf;
   readonly recursive?: boolean;
-  readonly sourcePath: string;
+  readonly sourcePath: V2FsCopyParams__AbsolutePathBuf;
 };
 export const V2FsCopyParams = Schema.Struct({
-  destinationPath: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  destinationPath: Schema.suspend(
+    (): Schema.Codec<V2FsCopyParams__AbsolutePathBuf> => V2FsCopyParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute destination path." }),
   recursive: Schema.optionalKey(
     Schema.Boolean.annotate({
       description: "Required for directory copies; ignored for file copies.",
     }),
   ),
-  sourcePath: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  sourcePath: Schema.suspend(
+    (): Schema.Codec<V2FsCopyParams__AbsolutePathBuf> => V2FsCopyParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute source path." }),
 }).annotate({
   title: "FsCopyParams",
   description: "Copy a file or directory tree on the host filesystem.",
 });
 
-export type V2FsCopyParams__AbsolutePathBuf = string;
-export const V2FsCopyParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2FsCopyResponse = {};
-export const V2FsCopyResponse = Schema.Struct({}).annotate({
-  title: "FsCopyResponse",
-  description: "Successful response for `fs/copy`.",
-});
+export type V2FsCopyResponse = { readonly [x: string]: Schema.Json };
+export const V2FsCopyResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "FsCopyResponse", description: "Successful response for `fs/copy`." });
 
 export type V2FsCreateDirectoryParams = {
-  readonly path: string;
+  readonly path: V2FsCreateDirectoryParams__AbsolutePathBuf;
   readonly recursive?: boolean | null;
 };
 export const V2FsCreateDirectoryParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsCreateDirectoryParams__AbsolutePathBuf> =>
+      V2FsCreateDirectoryParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute directory path to create." }),
   recursive: Schema.optionalKey(
     Schema.Union([
       Schema.Boolean.annotate({
@@ -38204,35 +52730,26 @@ export const V2FsCreateDirectoryParams = Schema.Struct({
   description: "Create a directory on the host filesystem.",
 });
 
-export type V2FsCreateDirectoryParams__AbsolutePathBuf = string;
-export const V2FsCreateDirectoryParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2FsCreateDirectoryResponse = {};
-export const V2FsCreateDirectoryResponse = Schema.Struct({}).annotate({
+export type V2FsCreateDirectoryResponse = { readonly [x: string]: Schema.Json };
+export const V2FsCreateDirectoryResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
   title: "FsCreateDirectoryResponse",
   description: "Successful response for `fs/createDirectory`.",
 });
 
-export type V2FsGetMetadataParams = { readonly path: string };
+export type V2FsGetMetadataParams = { readonly path: V2FsGetMetadataParams__AbsolutePathBuf };
 export const V2FsGetMetadataParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsGetMetadataParams__AbsolutePathBuf> =>
+      V2FsGetMetadataParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to inspect." }),
 }).annotate({
   title: "FsGetMetadataParams",
   description: "Request metadata for an absolute path.",
 });
 
-export type V2FsGetMetadataParams__AbsolutePathBuf = string;
-export const V2FsGetMetadataParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
 export type V2FsGetMetadataResponse = {
   readonly createdAtMs: number;
   readonly isDirectory: boolean;
@@ -38244,7 +52761,7 @@ export const V2FsGetMetadataResponse = Schema.Struct({
   createdAtMs: Schema.Number.annotate({
     description: "File creation time in Unix milliseconds when available, otherwise `0`.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   isDirectory: Schema.Boolean.annotate({
     description: "Whether the path resolves to a directory.",
   }),
@@ -38255,29 +52772,23 @@ export const V2FsGetMetadataResponse = Schema.Struct({
   modifiedAtMs: Schema.Number.annotate({
     description: "File modification time in Unix milliseconds when available, otherwise `0`.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
 }).annotate({
   title: "FsGetMetadataResponse",
   description: "Metadata returned by `fs/getMetadata`.",
 });
 
-export type V2FsReadDirectoryParams = { readonly path: string };
+export type V2FsReadDirectoryParams = { readonly path: V2FsReadDirectoryParams__AbsolutePathBuf };
 export const V2FsReadDirectoryParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsReadDirectoryParams__AbsolutePathBuf> =>
+      V2FsReadDirectoryParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute directory path to read." }),
 }).annotate({
   title: "FsReadDirectoryParams",
   description: "List direct child names for a directory.",
 });
 
-export type V2FsReadDirectoryParams__AbsolutePathBuf = string;
-export const V2FsReadDirectoryParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
 export type V2FsReadDirectoryResponse = {
   readonly entries: ReadonlyArray<V2FsReadDirectoryResponse__FsReadDirectoryEntry>;
 };
@@ -38290,20 +52801,13 @@ export const V2FsReadDirectoryResponse = Schema.Struct({
   description: "Directory entries returned by `fs/readDirectory`.",
 });
 
-export type V2FsReadFileParams = { readonly path: string };
+export type V2FsReadFileParams = { readonly path: V2FsReadFileParams__AbsolutePathBuf };
 export const V2FsReadFileParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsReadFileParams__AbsolutePathBuf> => V2FsReadFileParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to read." }),
 }).annotate({ title: "FsReadFileParams", description: "Read a file from the host filesystem." });
 
-export type V2FsReadFileParams__AbsolutePathBuf = string;
-export const V2FsReadFileParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
 export type V2FsReadFileResponse = { readonly dataBase64: string };
 export const V2FsReadFileResponse = Schema.Struct({
   dataBase64: Schema.String.annotate({ description: "File contents encoded as base64." }),
@@ -38314,7 +52818,7 @@ export const V2FsReadFileResponse = Schema.Struct({
 
 export type V2FsRemoveParams = {
   readonly force?: boolean | null;
-  readonly path: string;
+  readonly path: V2FsRemoveParams__AbsolutePathBuf;
   readonly recursive?: boolean | null;
 };
 export const V2FsRemoveParams = Schema.Struct({
@@ -38326,10 +52830,9 @@ export const V2FsRemoveParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsRemoveParams__AbsolutePathBuf> => V2FsRemoveParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to remove." }),
   recursive: Schema.optionalKey(
     Schema.Union([
       Schema.Boolean.annotate({
@@ -38343,17 +52846,11 @@ export const V2FsRemoveParams = Schema.Struct({
   description: "Remove a file or directory tree from the host filesystem.",
 });
 
-export type V2FsRemoveParams__AbsolutePathBuf = string;
-export const V2FsRemoveParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2FsRemoveResponse = {};
-export const V2FsRemoveResponse = Schema.Struct({}).annotate({
-  title: "FsRemoveResponse",
-  description: "Successful response for `fs/remove`.",
-});
+export type V2FsRemoveResponse = { readonly [x: string]: Schema.Json };
+export const V2FsRemoveResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "FsRemoveResponse", description: "Successful response for `fs/remove`." });
 
 export type V2FsUnwatchParams = { readonly watchId: string };
 export const V2FsUnwatchParams = Schema.Struct({
@@ -38365,18 +52862,20 @@ export const V2FsUnwatchParams = Schema.Struct({
   description: "Stop filesystem watch notifications for a prior `fs/watch`.",
 });
 
-export type V2FsUnwatchResponse = {};
-export const V2FsUnwatchResponse = Schema.Struct({}).annotate({
-  title: "FsUnwatchResponse",
-  description: "Successful response for `fs/unwatch`.",
-});
+export type V2FsUnwatchResponse = { readonly [x: string]: Schema.Json };
+export const V2FsUnwatchResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "FsUnwatchResponse", description: "Successful response for `fs/unwatch`." });
 
-export type V2FsWatchParams = { readonly path: string; readonly watchId: string };
+export type V2FsWatchParams = {
+  readonly path: V2FsWatchParams__AbsolutePathBuf;
+  readonly watchId: string;
+};
 export const V2FsWatchParams = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsWatchParams__AbsolutePathBuf> => V2FsWatchParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute file or directory path to watch." }),
   watchId: Schema.String.annotate({
     description: "Connection-scoped watch identifier used for `fs/unwatch` and `fs/changed`.",
   }),
@@ -38385,47 +52884,90 @@ export const V2FsWatchParams = Schema.Struct({
   description: "Start filesystem watch notifications for an absolute path.",
 });
 
-export type V2FsWatchParams__AbsolutePathBuf = string;
-export const V2FsWatchParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2FsWatchResponse = { readonly path: string };
+export type V2FsWatchResponse = { readonly path: V2FsWatchResponse__AbsolutePathBuf };
 export const V2FsWatchResponse = Schema.Struct({
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsWatchResponse__AbsolutePathBuf> => V2FsWatchResponse__AbsolutePathBuf,
+  ).annotate({ description: "Canonicalized path associated with the watch." }),
 }).annotate({ title: "FsWatchResponse", description: "Successful response for `fs/watch`." });
 
-export type V2FsWatchResponse__AbsolutePathBuf = string;
-export const V2FsWatchResponse__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2FsWriteFileParams = { readonly dataBase64: string; readonly path: string };
+export type V2FsWriteFileParams = {
+  readonly dataBase64: string;
+  readonly path: V2FsWriteFileParams__AbsolutePathBuf;
+};
 export const V2FsWriteFileParams = Schema.Struct({
   dataBase64: Schema.String.annotate({ description: "File contents encoded as base64." }),
-  path: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
+  path: Schema.suspend(
+    (): Schema.Codec<V2FsWriteFileParams__AbsolutePathBuf> => V2FsWriteFileParams__AbsolutePathBuf,
+  ).annotate({ description: "Absolute path to write." }),
 }).annotate({ title: "FsWriteFileParams", description: "Write a file on the host filesystem." });
 
-export type V2FsWriteFileParams__AbsolutePathBuf = string;
-export const V2FsWriteFileParams__AbsolutePathBuf = Schema.String.annotate({
-  description:
-    "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-});
-
-export type V2FsWriteFileResponse = {};
-export const V2FsWriteFileResponse = Schema.Struct({}).annotate({
+export type V2FsWriteFileResponse = { readonly [x: string]: Schema.Json };
+export const V2FsWriteFileResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
   title: "FsWriteFileResponse",
   description: "Successful response for `fs/writeFile`.",
 });
 
+export type V2GatewayOAuthCancelResponse = { readonly [x: string]: Schema.Json };
+export const V2GatewayOAuthCancelResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "GatewayOAuthCancelResponse" });
+
+export type V2GatewayOAuthChangedNotification = {
+  readonly authUrl?: string | null;
+  readonly error?: string | null;
+  readonly providerId: string;
+  readonly status: V2GatewayOAuthChangedNotification__GatewayOAuthStatus;
+};
+export const V2GatewayOAuthChangedNotification = Schema.Struct({
+  authUrl: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Authorization handoff, sent only to the connection that started login.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  providerId: Schema.String,
+  status: V2GatewayOAuthChangedNotification__GatewayOAuthStatus,
+}).annotate({ title: "GatewayOAuthChangedNotification" });
+
+export type V2GatewayOAuthLoginResponse = { readonly [x: string]: Schema.Json };
+export const V2GatewayOAuthLoginResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "GatewayOAuthLoginResponse" });
+
+export type V2GatewayOAuthReadResponse = {
+  readonly error?: string | null;
+  readonly providerId: string;
+  readonly providerName: string;
+  readonly required: boolean;
+  readonly status?: V2GatewayOAuthReadResponse__GatewayOAuthStatus | null;
+};
+export const V2GatewayOAuthReadResponse = Schema.Struct({
+  error: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  providerId: Schema.String,
+  providerName: Schema.String,
+  required: Schema.Boolean.annotate({
+    description: "Whether the selected provider uses gateway OAuth, even when already signed in.",
+  }),
+  status: Schema.optionalKey(
+    Schema.Union([V2GatewayOAuthReadResponse__GatewayOAuthStatus, Schema.Null]).annotate({
+      description: "Null when the effective provider does not use gateway OAuth.",
+    }),
+  ),
+}).annotate({
+  title: "GatewayOAuthReadResponse",
+  description:
+    "Current effective gateway policy and credential readiness; never contains credentials.",
+});
+
 export type V2GetAccountParams = { readonly refreshToken?: boolean };
 export const V2GetAccountParams = Schema.Struct({
   refreshToken: Schema.optionalKey(
@@ -38437,57 +52979,47 @@ export const V2GetAccountParams = Schema.Struct({
 }).annotate({ title: "GetAccountParams" });
 
 export type V2GetAccountRateLimitsResponse = {
+  readonly accountId?: string | null;
+  readonly ordinaryUsageAllowed?: boolean | null;
   readonly rateLimitResetCredits?: V2GetAccountRateLimitsResponse__RateLimitResetCreditsSummary | null;
-  readonly rateLimits: {
-    readonly credits?: V2GetAccountRateLimitsResponse__CreditsSnapshot | null;
-    readonly individualLimit?: V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot | null;
-    readonly limitId?: string | null;
-    readonly limitName?: string | null;
-    readonly planType?: V2GetAccountRateLimitsResponse__PlanType | null;
-    readonly primary?: V2GetAccountRateLimitsResponse__RateLimitWindow | null;
-    readonly rateLimitReachedType?: V2GetAccountRateLimitsResponse__RateLimitReachedType | null;
-    readonly secondary?: V2GetAccountRateLimitsResponse__RateLimitWindow | null;
-    readonly spendControlReached?: boolean | null;
-  };
+  readonly rateLimitUpsell?: Schema.Json;
+  readonly rateLimits: V2GetAccountRateLimitsResponse__RateLimitSnapshot;
   readonly rateLimitsByLimitId?: {
     readonly [x: string]: V2GetAccountRateLimitsResponse__RateLimitSnapshot;
   } | null;
 };
 export const V2GetAccountRateLimitsResponse = Schema.Struct({
+  accountId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Account associated with this usage snapshot, when supplied by the backend.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  ordinaryUsageAllowed: Schema.optionalKey(
+    Schema.Union([
+      Schema.Boolean.annotate({
+        description:
+          "Backend permission for ordinary included usage, validated against the active account. Null means unavailable; clients must not infer recovery from percentages or reset times.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   rateLimitResetCredits: Schema.optionalKey(
     Schema.Union([V2GetAccountRateLimitsResponse__RateLimitResetCreditsSummary, Schema.Null]),
   ),
-  rateLimits: Schema.Struct({
-    credits: Schema.optionalKey(
-      Schema.Union([V2GetAccountRateLimitsResponse__CreditsSnapshot, Schema.Null]),
-    ),
-    individualLimit: Schema.optionalKey(
-      Schema.Union([V2GetAccountRateLimitsResponse__SpendControlLimitSnapshot, Schema.Null]),
-    ),
-    limitId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    limitName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-    planType: Schema.optionalKey(
-      Schema.Union([V2GetAccountRateLimitsResponse__PlanType, Schema.Null]),
-    ),
-    primary: Schema.optionalKey(
-      Schema.Union([V2GetAccountRateLimitsResponse__RateLimitWindow, Schema.Null]),
-    ),
-    rateLimitReachedType: Schema.optionalKey(
-      Schema.Union([V2GetAccountRateLimitsResponse__RateLimitReachedType, Schema.Null]),
-    ),
-    secondary: Schema.optionalKey(
-      Schema.Union([V2GetAccountRateLimitsResponse__RateLimitWindow, Schema.Null]),
-    ),
-    spendControlReached: Schema.optionalKey(
-      Schema.Union([
-        Schema.Boolean.annotate({
-          description:
-            "Backend-reported spend-control state. `None` is unavailable, not a sparse-update recovery.",
-        }),
-        Schema.Null,
-      ]),
-    ),
-  }).annotate({
+  rateLimitUpsell: Schema.optionalKey(
+    Schema.Json.annotate({
+      expected: "JSON value",
+      description:
+        "Optional backend-owned banner from the same usage read. Its nested keys retain the backend's snake_case contract; an absent banner leaves the client's existing UI unchanged.",
+    }),
+  ),
+  rateLimits: Schema.suspend(
+    (): Schema.Codec<V2GetAccountRateLimitsResponse__RateLimitSnapshot> =>
+      V2GetAccountRateLimitsResponse__RateLimitSnapshot,
+  ).annotate({
     description: "Backward-compatible single-bucket view; mirrors the historical payload.",
   }),
   rateLimitsByLimitId: Schema.optionalKey(
@@ -38509,9 +53041,21 @@ export const V2GetAccountResponse = Schema.Struct({
   requiresOpenaiAuth: Schema.Boolean,
 }).annotate({ title: "GetAccountResponse" });
 
+export type V2GetAccountResponse__WorkspaceRouting = {
+  readonly accountRoutingOverride: V2GetAccountResponse__AccountRoutingOverride;
+  readonly backendOrigin: string;
+  readonly chatgptAccountId: string;
+};
+export const V2GetAccountResponse__WorkspaceRouting = Schema.Struct({
+  accountRoutingOverride: V2GetAccountResponse__AccountRoutingOverride,
+  backendOrigin: Schema.String,
+  chatgptAccountId: Schema.String,
+});
+
 export type V2GetAccountTokenUsageResponse = {
   readonly dailyUsageBuckets?: ReadonlyArray<V2GetAccountTokenUsageResponse__AccountTokenUsageDailyBucket> | null;
   readonly summary: V2GetAccountTokenUsageResponse__AccountTokenUsageSummary;
+  readonly threadUsage?: V2GetAccountTokenUsageResponse__ThreadUsage | null;
 };
 export const V2GetAccountTokenUsageResponse = Schema.Struct({
   dailyUsageBuckets: Schema.optionalKey(
@@ -38521,6 +53065,12 @@ export const V2GetAccountTokenUsageResponse = Schema.Struct({
     ]),
   ),
   summary: V2GetAccountTokenUsageResponse__AccountTokenUsageSummary,
+  threadUsage: Schema.optionalKey(
+    Schema.Union([V2GetAccountTokenUsageResponse__ThreadUsage, Schema.Null]).annotate({
+      description:
+        "Estimated usage when a thread was requested and its billing route is available.",
+    }),
+  ),
 }).annotate({ title: "GetAccountTokenUsageResponse" });
 
 export type V2GetWorkspaceMessagesResponse = {
@@ -38555,32 +53105,6 @@ export const V2HookCompletedNotification = Schema.Struct({
   turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
 }).annotate({ title: "HookCompletedNotification" });
 
-export type V2HookCompletedNotification__HookSource =
-  | "system"
-  | "user"
-  | "project"
-  | "mdm"
-  | "sessionFlags"
-  | "plugin"
-  | "cloudRequirements"
-  | "cloudManagedConfig"
-  | "legacyManagedConfigFile"
-  | "legacyManagedConfigMdm"
-  | "unknown";
-export const V2HookCompletedNotification__HookSource = Schema.Literals([
-  "system",
-  "user",
-  "project",
-  "mdm",
-  "sessionFlags",
-  "plugin",
-  "cloudRequirements",
-  "cloudManagedConfig",
-  "legacyManagedConfigFile",
-  "legacyManagedConfigMdm",
-  "unknown",
-]);
-
 export type V2HooksListParams = { readonly cwds?: ReadonlyArray<string> };
 export const V2HooksListParams = Schema.Struct({
   cwds: Schema.optionalKey(
@@ -38608,32 +53132,6 @@ export const V2HookStartedNotification = Schema.Struct({
   turnId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
 }).annotate({ title: "HookStartedNotification" });
 
-export type V2HookStartedNotification__HookSource =
-  | "system"
-  | "user"
-  | "project"
-  | "mdm"
-  | "sessionFlags"
-  | "plugin"
-  | "cloudRequirements"
-  | "cloudManagedConfig"
-  | "legacyManagedConfigFile"
-  | "legacyManagedConfigMdm"
-  | "unknown";
-export const V2HookStartedNotification__HookSource = Schema.Literals([
-  "system",
-  "user",
-  "project",
-  "mdm",
-  "sessionFlags",
-  "plugin",
-  "cloudRequirements",
-  "cloudManagedConfig",
-  "legacyManagedConfigFile",
-  "legacyManagedConfigMdm",
-  "unknown",
-]);
-
 export type V2ItemCompletedNotification = {
   readonly completedAtMs: number;
   readonly item: V2ItemCompletedNotification__ThreadItem;
@@ -38644,71 +53142,12 @@ export const V2ItemCompletedNotification = Schema.Struct({
   completedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this item lifecycle completed.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   item: V2ItemCompletedNotification__ThreadItem,
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "ItemCompletedNotification" });
 
-export type V2ItemCompletedNotification__ByteRange = {
-  readonly end: number;
-  readonly start: number;
-};
-export const V2ItemCompletedNotification__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ItemCompletedNotification__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ItemCompletedNotification__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ItemCompletedNotification__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ItemCompletedNotification__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ItemCompletedNotification__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ItemCompletedNotification__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
 export type V2ItemGuardianApprovalReviewCompletedNotification = {
   readonly action: V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReviewAction;
   readonly completedAtMs: number;
@@ -38725,19 +53164,19 @@ export const V2ItemGuardianApprovalReviewCompletedNotification = Schema.Struct({
   completedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this review completed.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   decisionSource: V2ItemGuardianApprovalReviewCompletedNotification__AutoReviewDecisionSource,
   review: V2ItemGuardianApprovalReviewCompletedNotification__GuardianApprovalReview,
   reviewId: Schema.String.annotate({ description: "Stable identifier for this review." }),
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this review started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   targetItemId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
         description:
-          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
+          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - stdin reviews, which refer to the existing parent command item and have a separate approval ID in the action payload - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
       }),
       Schema.Null,
     ]),
@@ -38766,12 +53205,12 @@ export const V2ItemGuardianApprovalReviewStartedNotification = Schema.Struct({
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this review started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   targetItemId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
         description:
-          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
+          "Identifier for the reviewed item or tool call when one exists.\n\nIn most cases, one review maps to one target item. The exceptions are - execve reviews, where a single command may contain multiple execve calls to review (only possible when using the shell_zsh_fork feature) - stdin reviews, which refer to the existing parent command item and have a separate approval ID in the action payload - network policy reviews, where there is no target item\n\nA network call is triggered by a CommandExecution item, so having a target_item_id set to the CommandExecution item would be misleading because the review is about the network call, not the command execution. Therefore, target_item_id is set to None for network policy reviews.",
       }),
       Schema.Null,
     ]),
@@ -38795,71 +53234,16 @@ export const V2ItemStartedNotification = Schema.Struct({
   startedAtMs: Schema.Number.annotate({
     description: "Unix timestamp (in milliseconds) when this item lifecycle started.",
     format: "int64",
-  }).check(Schema.isInt()),
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "ItemStartedNotification" });
 
-export type V2ItemStartedNotification__ByteRange = { readonly end: number; readonly start: number };
-export const V2ItemStartedNotification__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ItemStartedNotification__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ItemStartedNotification__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ItemStartedNotification__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ItemStartedNotification__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ItemStartedNotification__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ItemStartedNotification__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
 export type V2ListMcpServerStatusParams = {
   readonly cursor?: string | null;
   readonly detail?: V2ListMcpServerStatusParams__McpServerStatusDetail | null;
   readonly limit?: number | null;
+  readonly serverName?: string | null;
   readonly threadId?: string | null;
 };
 export const V2ListMcpServerStatusParams = Schema.Struct({
@@ -38883,8 +53267,21 @@ export const V2ListMcpServerStatusParams = Schema.Struct({
         description: "Optional page size; defaults to a server-defined value.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  serverName: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Limit discovery to one server. With a thread ID, reuse that thread's MCP connection.",
+      }),
       Schema.Null,
     ]),
   ),
@@ -38923,7 +53320,14 @@ export type V2LoginAccountParams =
       readonly chatgptPlanType?: string | null;
       readonly type: "chatgptAuthTokens";
     }
-  | { readonly apiKey: string; readonly region: string; readonly type: "amazonBedrock" };
+  | { readonly apiKey: string; readonly region: string; readonly type: "amazonBedrock" }
+  | {
+      readonly accessKeyId: string;
+      readonly region: string;
+      readonly secretAccessKey: string;
+      readonly sessionToken?: string | null;
+      readonly type: "amazonBedrockAccessKeys";
+    };
 export const V2LoginAccountParams = Schema.Union(
   [
     Schema.Struct({
@@ -38978,6 +53382,18 @@ export const V2LoginAccountParams = Schema.Union(
       title: "AmazonBedrockv2::LoginAccountParams",
       description: "[UNSTABLE] Managed Amazon Bedrock login is experimental.",
     }),
+    Schema.Struct({
+      accessKeyId: Schema.String,
+      region: Schema.String,
+      secretAccessKey: Schema.String,
+      sessionToken: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      type: Schema.Literal("amazonBedrockAccessKeys").annotate({
+        title: "AmazonBedrockAccessKeysv2::LoginAccountParamsType",
+      }),
+    }).annotate({
+      title: "AmazonBedrockAccessKeysv2::LoginAccountParams",
+      description: "[UNSTABLE] Managed Amazon Bedrock AWS access key login is experimental.",
+    }),
   ],
   { mode: "oneOf" },
 ).annotate({ title: "LoginAccountParams" });
@@ -39032,10 +53448,11 @@ export const V2LoginAccountResponse = Schema.Union(
   { mode: "oneOf" },
 ).annotate({ title: "LoginAccountResponse" });
 
-export type V2LogoutAccountResponse = {};
-export const V2LogoutAccountResponse = Schema.Struct({}).annotate({
-  title: "LogoutAccountResponse",
-});
+export type V2LogoutAccountResponse = { readonly [x: string]: Schema.Json };
+export const V2LogoutAccountResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "LogoutAccountResponse" });
 
 export type V2MarketplaceAddParams = {
   readonly refName?: string | null;
@@ -39092,23 +53509,58 @@ export const V2MarketplaceUpgradeResponse = Schema.Struct({
 }).annotate({ title: "MarketplaceUpgradeResponse" });
 
 export type V2McpResourceReadParams = {
+  readonly connectorId?: string | null;
+  readonly originCallId?: string | null;
   readonly server: string;
+  readonly target?: V2McpResourceReadParams__McpResourceReadTarget | null;
   readonly threadId?: string | null;
   readonly uri: string;
 };
 export const V2McpResourceReadParams = Schema.Struct({
+  connectorId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  originCallId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Originating MCP tool call used to select the resource's app.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   server: Schema.String,
+  target: Schema.optionalKey(
+    Schema.Union([V2McpResourceReadParams__McpResourceReadTarget, Schema.Null]).annotate({
+      description: "Explicit hosted app/account. Omit to retain legacy resource discovery.",
+    }),
+  ),
   threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   uri: Schema.String,
 }).annotate({ title: "McpResourceReadParams" });
 
 export type V2McpResourceReadResponse = {
   readonly contents: ReadonlyArray<V2McpResourceReadResponse__ResourceContent>;
+  readonly originCallId?: string | null;
 };
 export const V2McpResourceReadResponse = Schema.Struct({
   contents: Schema.Array(V2McpResourceReadResponse__ResourceContent),
+  originCallId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Originating call when the server applied app-specific resource scoping.",
+      }),
+      Schema.Null,
+    ]),
+  ),
 }).annotate({ title: "McpResourceReadResponse" });
 
+export type V2McpServerEventStreamNotification = {
+  readonly notification: V2McpServerEventStreamNotification__McpServerEventNotification;
+  readonly subscriptionId: string;
+};
+export const V2McpServerEventStreamNotification = Schema.Struct({
+  notification: V2McpServerEventStreamNotification__McpServerEventNotification,
+  subscriptionId: Schema.String,
+}).annotate({ title: "McpServerEventStreamNotification" });
+
 export type V2McpServerOauthLoginCompletedNotification = {
   readonly error?: string | null;
   readonly name: string;
@@ -39123,17 +53575,32 @@ export const V2McpServerOauthLoginCompletedNotification = Schema.Struct({
 }).annotate({ title: "McpServerOauthLoginCompletedNotification" });
 
 export type V2McpServerOauthLoginParams = {
+  readonly clientRegistration?: V2McpServerOauthLoginParams__McpServerOauthClientRegistration | null;
   readonly name: string;
   readonly scopes?: ReadonlyArray<string> | null;
   readonly threadId?: string | null;
   readonly timeoutSecs?: number | null;
 };
 export const V2McpServerOauthLoginParams = Schema.Struct({
+  clientRegistration: Schema.optionalKey(
+    Schema.Union([
+      V2McpServerOauthLoginParams__McpServerOauthClientRegistration,
+      Schema.Null,
+    ]).annotate({
+      description:
+        "Registration strategy for this login only; omission selects automatic discovery.",
+    }),
+  ),
   name: Schema.String,
   scopes: Schema.optionalKey(Schema.Union([Schema.Array(Schema.String), Schema.Null])),
   threadId: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   timeoutSecs: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
 }).annotate({ title: "McpServerOauthLoginParams" });
 
@@ -39142,10 +53609,11 @@ export const V2McpServerOauthLoginResponse = Schema.Struct({
   authorizationUrl: Schema.String,
 }).annotate({ title: "McpServerOauthLoginResponse" });
 
-export type V2McpServerRefreshResponse = {};
-export const V2McpServerRefreshResponse = Schema.Struct({}).annotate({
-  title: "McpServerRefreshResponse",
-});
+export type V2McpServerRefreshResponse = { readonly [x: string]: Schema.Json };
+export const V2McpServerRefreshResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "McpServerRefreshResponse" });
 
 export type V2McpServerStatusUpdatedNotification = {
   readonly error?: string | null;
@@ -39168,31 +53636,31 @@ export const V2McpServerStatusUpdatedNotification = Schema.Struct({
 }).annotate({ title: "McpServerStatusUpdatedNotification" });
 
 export type V2McpServerToolCallParams = {
-  readonly _meta?: unknown;
-  readonly arguments?: unknown;
+  readonly _meta?: Schema.Json;
+  readonly arguments?: Schema.Json;
   readonly server: string;
   readonly threadId: string;
   readonly tool: string;
 };
 export const V2McpServerToolCallParams = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  arguments: Schema.optionalKey(Schema.Unknown),
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  arguments: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
   server: Schema.String,
   threadId: Schema.String,
   tool: Schema.String,
 }).annotate({ title: "McpServerToolCallParams" });
 
 export type V2McpServerToolCallResponse = {
-  readonly _meta?: unknown;
-  readonly content: ReadonlyArray<unknown>;
+  readonly _meta?: Schema.Json;
+  readonly content: ReadonlyArray<Schema.Json>;
   readonly isError?: boolean | null;
-  readonly structuredContent?: unknown;
+  readonly structuredContent?: Schema.Json;
 };
 export const V2McpServerToolCallResponse = Schema.Struct({
-  _meta: Schema.optionalKey(Schema.Unknown),
-  content: Schema.Array(Schema.Unknown),
+  _meta: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
+  content: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
   isError: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
-  structuredContent: Schema.optionalKey(Schema.Unknown),
+  structuredContent: Schema.optionalKey(Schema.Json.annotate({ expected: "JSON value" })),
 }).annotate({ title: "McpServerToolCallResponse" });
 
 export type V2McpToolCallProgressNotification = {
@@ -39236,8 +53704,12 @@ export const V2ModelListParams = Schema.Struct({
         description: "Optional page size; defaults to a reasonable server-side value.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -39260,10 +53732,11 @@ export const V2ModelListResponse = Schema.Struct({
   ),
 }).annotate({ title: "ModelListResponse" });
 
-export type V2ModelProviderCapabilitiesReadParams = {};
-export const V2ModelProviderCapabilitiesReadParams = Schema.Struct({}).annotate({
-  title: "ModelProviderCapabilitiesReadParams",
-});
+export type V2ModelProviderCapabilitiesReadParams = { readonly [x: string]: Schema.Json };
+export const V2ModelProviderCapabilitiesReadParams = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ModelProviderCapabilitiesReadParams" });
 
 export type V2ModelProviderCapabilitiesReadResponse = {
   readonly imageGeneration: boolean;
@@ -39321,6 +53794,18 @@ export const V2ModelVerificationNotification = Schema.Struct({
   verifications: Schema.Array(V2ModelVerificationNotification__ModelVerification),
 }).annotate({ title: "ModelVerificationNotification" });
 
+export type V2NullableGetAccountRateLimitsParams = V2NullableGetAccountRateLimitsParams__GetAccountRateLimitsParams | null;
+export const V2NullableGetAccountRateLimitsParams = Schema.Union([
+  V2NullableGetAccountRateLimitsParams__GetAccountRateLimitsParams,
+  Schema.Null,
+]).annotate({ title: "Nullable_GetAccountRateLimitsParams" });
+
+export type V2NullableGetAccountTokenUsageParams = V2NullableGetAccountTokenUsageParams__GetAccountTokenUsageParams | null;
+export const V2NullableGetAccountTokenUsageParams = Schema.Union([
+  V2NullableGetAccountTokenUsageParams__GetAccountTokenUsageParams,
+  Schema.Null,
+]).annotate({ title: "Nullable_GetAccountTokenUsageParams" });
+
 export type V2PermissionProfileListParams = {
   readonly cursor?: string | null;
   readonly cwd?: string | null;
@@ -39349,8 +53834,12 @@ export const V2PermissionProfileListParams = Schema.Struct({
         description: "Optional page size; defaults to the full result set.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -39425,18 +53914,21 @@ export const V2PluginInstalledResponse = Schema.Struct({
   marketplaces: Schema.Array(V2PluginInstalledResponse__PluginMarketplaceEntry),
 }).annotate({ title: "PluginInstalledResponse" });
 
-export type V2PluginInstalledResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
-export const V2PluginInstalledResponse__PluginAvailability = Schema.Literals([
-  "DISABLED_BY_ADMIN",
-  "AVAILABLE",
-]);
-
 export type V2PluginInstallParams = {
+  readonly installAttemptId?: string | null;
   readonly marketplacePath?: V2PluginInstallParams__AbsolutePathBuf | null;
   readonly pluginName: string;
   readonly remoteMarketplaceName?: string | null;
 };
 export const V2PluginInstallParams = Schema.Struct({
+  installAttemptId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Client-generated identifier used to correlate one installation attempt.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   marketplacePath: Schema.optionalKey(
     Schema.Union([V2PluginInstallParams__AbsolutePathBuf, Schema.Null]),
   ),
@@ -39455,6 +53947,7 @@ export const V2PluginInstallResponse = Schema.Struct({
 
 export type V2PluginListParams = {
   readonly cwds?: ReadonlyArray<V2PluginListParams__AbsolutePathBuf> | null;
+  readonly forceRefetch?: boolean;
   readonly marketplaceKinds?: ReadonlyArray<V2PluginListParams__PluginListMarketplaceKind> | null;
 };
 export const V2PluginListParams = Schema.Struct({
@@ -39467,6 +53960,11 @@ export const V2PluginListParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  forceRefetch: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description: "Whether the client requests a fresh remote plugin catalog fetch.",
+    }),
+  ),
   marketplaceKinds: Schema.optionalKey(
     Schema.Union([
       Schema.Array(V2PluginListParams__PluginListMarketplaceKind).annotate({
@@ -39491,12 +53989,6 @@ export const V2PluginListResponse = Schema.Struct({
   marketplaces: Schema.Array(V2PluginListResponse__PluginMarketplaceEntry),
 }).annotate({ title: "PluginListResponse" });
 
-export type V2PluginListResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
-export const V2PluginListResponse__PluginAvailability = Schema.Literals([
-  "DISABLED_BY_ADMIN",
-  "AVAILABLE",
-]);
-
 export type V2PluginReadParams = {
   readonly marketplacePath?: V2PluginReadParams__AbsolutePathBuf | null;
   readonly pluginName: string;
@@ -39515,11 +54007,40 @@ export const V2PluginReadResponse = Schema.Struct({
   plugin: V2PluginReadResponse__PluginDetail,
 }).annotate({ title: "PluginReadResponse" });
 
-export type V2PluginReadResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
-export const V2PluginReadResponse__PluginAvailability = Schema.Literals([
-  "DISABLED_BY_ADMIN",
-  "AVAILABLE",
-]);
+export type V2PluginReconcileParams = { readonly reason?: string | null };
+export const V2PluginReconcileParams = Schema.Struct({
+  reason: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Optional client-provided reason recorded with the reconciliation attempt.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ title: "PluginReconcileParams" });
+
+export type V2PluginReconcileResponse = {
+  readonly changedPlugins: ReadonlyArray<V2PluginReconcileResponse__PluginReconcileChangedPlugin>;
+  readonly failedMaterializationRemotePluginIds: ReadonlyArray<string>;
+  readonly failedRemotePluginIds: ReadonlyArray<string>;
+};
+export const V2PluginReconcileResponse = Schema.Struct({
+  changedPlugins: Schema.Array(V2PluginReconcileResponse__PluginReconcileChangedPlugin).annotate({
+    description:
+      "Plugins affected by bundle changes, enablement changes, or removals. Installed-state changes compare against the previous cached snapshot, including cached reinstalls. Removal hints survive cache cleanup failures; unchanged plugins are omitted.",
+  }),
+  failedMaterializationRemotePluginIds: Schema.Array(Schema.String).annotate({
+    description:
+      "Subset of failures for which the requested bundle could not be materialized. A previously cached version may still be available.",
+  }),
+  failedRemotePluginIds: Schema.Array(Schema.String).annotate({
+    description: "Backend remote plugin IDs whose bundle or identity update failed.",
+  }),
+}).annotate({
+  title: "PluginReconcileResponse",
+  description:
+    "Bundle and installed-state changes observed by this pass, not a runtime-readiness acknowledgement or a cumulative diff since the client's last request. Other metadata-only changes are not listed.",
+});
 
 export type V2PluginShareCheckoutParams = { readonly remotePluginId: string };
 export const V2PluginShareCheckoutParams = Schema.Struct({
@@ -39550,15 +54071,17 @@ export const V2PluginShareDeleteParams = Schema.Struct({ remotePluginId: Schema.
   title: "PluginShareDeleteParams",
 });
 
-export type V2PluginShareDeleteResponse = {};
-export const V2PluginShareDeleteResponse = Schema.Struct({}).annotate({
-  title: "PluginShareDeleteResponse",
-});
+export type V2PluginShareDeleteResponse = { readonly [x: string]: Schema.Json };
+export const V2PluginShareDeleteResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "PluginShareDeleteResponse" });
 
-export type V2PluginShareListParams = {};
-export const V2PluginShareListParams = Schema.Struct({}).annotate({
-  title: "PluginShareListParams",
-});
+export type V2PluginShareListParams = { readonly [x: string]: Schema.Json };
+export const V2PluginShareListParams = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "PluginShareListParams" });
 
 export type V2PluginShareListResponse = {
   readonly data: ReadonlyArray<V2PluginShareListResponse__PluginShareListItem>;
@@ -39567,12 +54090,6 @@ export const V2PluginShareListResponse = Schema.Struct({
   data: Schema.Array(V2PluginShareListResponse__PluginShareListItem),
 }).annotate({ title: "PluginShareListResponse" });
 
-export type V2PluginShareListResponse__PluginAvailability = "DISABLED_BY_ADMIN" | "AVAILABLE";
-export const V2PluginShareListResponse__PluginAvailability = Schema.Literals([
-  "DISABLED_BY_ADMIN",
-  "AVAILABLE",
-]);
-
 export type V2PluginShareSaveParams = {
   readonly discoverability?: V2PluginShareSaveParams__PluginShareDiscoverability | null;
   readonly pluginPath: V2PluginShareSaveParams__AbsolutePathBuf;
@@ -39591,10 +54108,12 @@ export const V2PluginShareSaveParams = Schema.Struct({
 }).annotate({ title: "PluginShareSaveParams" });
 
 export type V2PluginShareSaveResponse = {
+  readonly canPublishToWorkspace?: boolean | null;
   readonly remotePluginId: string;
   readonly shareUrl: string;
 };
 export const V2PluginShareSaveResponse = Schema.Struct({
+  canPublishToWorkspace: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   remotePluginId: Schema.String,
   shareUrl: Schema.String,
 }).annotate({ title: "PluginShareSaveResponse" });
@@ -39640,10 +54159,11 @@ export const V2PluginUninstallParams = Schema.Struct({ pluginId: Schema.String }
   title: "PluginUninstallParams",
 });
 
-export type V2PluginUninstallResponse = {};
-export const V2PluginUninstallResponse = Schema.Struct({}).annotate({
-  title: "PluginUninstallResponse",
-});
+export type V2PluginUninstallResponse = { readonly [x: string]: Schema.Json };
+export const V2PluginUninstallResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "PluginUninstallResponse" });
 
 export type V2ProcessExitedNotification = {
   readonly exitCode: number;
@@ -39655,7 +54175,7 @@ export type V2ProcessExitedNotification = {
 };
 export const V2ProcessExitedNotification = Schema.Struct({
   exitCode: Schema.Number.annotate({ description: "Process exit code.", format: "int32" }).check(
-    Schema.isInt(),
+    Schema.isInt().annotate({ expected: "an integer" }),
   ),
   processHandle: Schema.String.annotate({
     description: "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
@@ -39685,7 +54205,7 @@ export type V2ProcessOutputDeltaNotification = {
   readonly capReached: boolean;
   readonly deltaBase64: string;
   readonly processHandle: string;
-  readonly stream: "stdout" | "stderr";
+  readonly stream: V2ProcessOutputDeltaNotification__ProcessOutputStream;
 };
 export const V2ProcessOutputDeltaNotification = Schema.Struct({
   capReached: Schema.Boolean.annotate({
@@ -39696,25 +54216,30 @@ export const V2ProcessOutputDeltaNotification = Schema.Struct({
   processHandle: Schema.String.annotate({
     description: "Client-supplied, connection-scoped `processHandle` from `process/spawn`.",
   }),
-  stream: Schema.Literals(["stdout", "stderr"]).annotate({
-    description: "Stream label for `process/outputDelta` notifications.",
-  }),
+  stream: Schema.suspend(
+    (): Schema.Codec<V2ProcessOutputDeltaNotification__ProcessOutputStream> =>
+      V2ProcessOutputDeltaNotification__ProcessOutputStream,
+  ).annotate({ description: "Output stream this chunk belongs to." }),
 }).annotate({
   title: "ProcessOutputDeltaNotification",
   description: "Base64-encoded output chunk emitted for a streaming `process/spawn` request.",
 });
 
-export type V2ProcessOutputDeltaNotification__ProcessOutputStream = "stdout" | "stderr";
-export const V2ProcessOutputDeltaNotification__ProcessOutputStream = Schema.Literals([
-  "stdout",
-  "stderr",
-]).annotate({ description: "Stream label for `process/outputDelta` notifications." });
+export type V2ProjectChangedNotification = {
+  readonly changeType: V2ProjectChangedNotification__ProjectChangeType;
+  readonly projectId: string;
+};
+export const V2ProjectChangedNotification = Schema.Struct({
+  changeType: V2ProjectChangedNotification__ProjectChangeType,
+  projectId: Schema.String,
+}).annotate({ title: "ProjectChangedNotification" });
 
 export type V2RawResponseCompletedNotification = {
   readonly responseId: string;
   readonly threadId: string;
   readonly turnId: string;
   readonly usage?: V2RawResponseCompletedNotification__TokenUsageBreakdown | null;
+  readonly usageMetadata?: V2RawResponseCompletedNotification__ResponseUsageMetadata | null;
 };
 export const V2RawResponseCompletedNotification = Schema.Struct({
   responseId: Schema.String,
@@ -39723,6 +54248,9 @@ export const V2RawResponseCompletedNotification = Schema.Struct({
   usage: Schema.optionalKey(
     Schema.Union([V2RawResponseCompletedNotification__TokenUsageBreakdown, Schema.Null]),
   ),
+  usageMetadata: Schema.optionalKey(
+    Schema.Union([V2RawResponseCompletedNotification__ResponseUsageMetadata, Schema.Null]),
+  ),
 }).annotate({
   title: "RawResponseCompletedNotification",
   description:
@@ -39748,7 +54276,9 @@ export type V2ReasoningSummaryPartAddedNotification = {
 };
 export const V2ReasoningSummaryPartAddedNotification = Schema.Struct({
   itemId: Schema.String,
-  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "ReasoningSummaryPartAddedNotification" });
@@ -39763,7 +54293,9 @@ export type V2ReasoningSummaryTextDeltaNotification = {
 export const V2ReasoningSummaryTextDeltaNotification = Schema.Struct({
   delta: Schema.String,
   itemId: Schema.String,
-  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  summaryIndex: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "ReasoningSummaryTextDeltaNotification" });
@@ -39776,7 +54308,9 @@ export type V2ReasoningTextDeltaNotification = {
   readonly turnId: string;
 };
 export const V2ReasoningTextDeltaNotification = Schema.Struct({
-  contentIndex: Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()),
+  contentIndex: Schema.Number.annotate({ format: "int64" }).check(
+    Schema.isInt().annotate({ expected: "an integer" }),
+  ),
   delta: Schema.String,
   itemId: Schema.String,
   threadId: Schema.String,
@@ -39808,7 +54342,7 @@ export const V2ReviewStartParams = Schema.Struct({
   delivery: Schema.optionalKey(
     Schema.Union([V2ReviewStartParams__ReviewDelivery, Schema.Null]).annotate({
       description:
-        "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`).",
+        "Where to run the review: inline (default) on the current thread or detached on a new thread (returned in `reviewThreadId`). Detached delivery is deprecated and emits `deprecationNotice`. Use `thread/start` followed by an inline review for a separate review thread.",
     }),
   ),
   target: V2ReviewStartParams__ReviewTarget,
@@ -39827,69 +54361,6 @@ export const V2ReviewStartResponse = Schema.Struct({
   turn: V2ReviewStartResponse__Turn,
 }).annotate({ title: "ReviewStartResponse" });
 
-export type V2ReviewStartResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ReviewStartResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ReviewStartResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ReviewStartResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ReviewStartResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ReviewStartResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ReviewStartResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ReviewStartResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ReviewStartResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ReviewStartResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
-
 export type V2SendAddCreditsNudgeEmailParams = {
   readonly creditType: V2SendAddCreditsNudgeEmailParams__AddCreditsNudgeCreditType;
 };
@@ -39913,8 +54384,11 @@ export const V2ServerRequestResolvedNotification = Schema.Struct({
   threadId: Schema.String,
 }).annotate({ title: "ServerRequestResolvedNotification" });
 
-export type V2SkillsChangedNotification = {};
-export const V2SkillsChangedNotification = Schema.Struct({}).annotate({
+export type V2SkillsChangedNotification = { readonly [x: string]: Schema.Json };
+export const V2SkillsChangedNotification = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
   title: "SkillsChangedNotification",
   description:
     "Notification emitted when watched local skill files change.\n\nTreat this as an invalidation signal and re-run `skills/list` with the client's current parameters when refreshed skill metadata is needed.",
@@ -39949,10 +54423,11 @@ export const V2SkillsExtraRootsSetParams = Schema.Struct({
   extraRoots: Schema.Array(V2SkillsExtraRootsSetParams__AbsolutePathBuf),
 }).annotate({ title: "SkillsExtraRootsSetParams" });
 
-export type V2SkillsExtraRootsSetResponse = {};
-export const V2SkillsExtraRootsSetResponse = Schema.Struct({}).annotate({
-  title: "SkillsExtraRootsSetResponse",
-});
+export type V2SkillsExtraRootsSetResponse = { readonly [x: string]: Schema.Json };
+export const V2SkillsExtraRootsSetResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "SkillsExtraRootsSetResponse" });
 
 export type V2SkillsListParams = {
   readonly cwds?: ReadonlyArray<string>;
@@ -39978,6 +54453,20 @@ export const V2SkillsListResponse = Schema.Struct({
   data: Schema.Array(V2SkillsListResponse__SkillsListEntry),
 }).annotate({ title: "SkillsListResponse" });
 
+export type V2StrictReviewRequiredNotification = {
+  readonly startedAtMs: number;
+  readonly threadId: string;
+  readonly turnId: string;
+};
+export const V2StrictReviewRequiredNotification = Schema.Struct({
+  startedAtMs: Schema.Number.annotate({
+    description: "Unix timestamp (in milliseconds) when this review started.",
+    format: "int64",
+  }).check(Schema.isInt().annotate({ expected: "an integer" })),
+  threadId: Schema.String,
+  turnId: Schema.String,
+}).annotate({ title: "StrictReviewRequiredNotification" });
+
 export type V2TerminalInteractionNotification = {
   readonly itemId: string;
   readonly processId: string;
@@ -39994,20 +54483,22 @@ export const V2TerminalInteractionNotification = Schema.Struct({
 }).annotate({ title: "TerminalInteractionNotification" });
 
 export type V2ThreadApproveGuardianDeniedActionParams = {
-  readonly event: unknown;
+  readonly event: Schema.Json;
   readonly threadId: string;
 };
 export const V2ThreadApproveGuardianDeniedActionParams = Schema.Struct({
-  event: Schema.Unknown.annotate({
+  event: Schema.Json.annotate({
+    expected: "JSON value",
     description: "Serialized `codex_protocol::protocol::GuardianAssessmentEvent`.",
   }),
   threadId: Schema.String,
 }).annotate({ title: "ThreadApproveGuardianDeniedActionParams" });
 
-export type V2ThreadApproveGuardianDeniedActionResponse = {};
-export const V2ThreadApproveGuardianDeniedActionResponse = Schema.Struct({}).annotate({
-  title: "ThreadApproveGuardianDeniedActionResponse",
-});
+export type V2ThreadApproveGuardianDeniedActionResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadApproveGuardianDeniedActionResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadApproveGuardianDeniedActionResponse" });
 
 export type V2ThreadArchivedNotification = { readonly threadId: string };
 export const V2ThreadArchivedNotification = Schema.Struct({ threadId: Schema.String }).annotate({
@@ -40019,9 +54510,116 @@ export const V2ThreadArchiveParams = Schema.Struct({ threadId: Schema.String }).
   title: "ThreadArchiveParams",
 });
 
-export type V2ThreadArchiveResponse = {};
-export const V2ThreadArchiveResponse = Schema.Struct({}).annotate({
-  title: "ThreadArchiveResponse",
+export type V2ThreadArchiveResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadArchiveResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadArchiveResponse" });
+
+export type V2ThreadAttachmentAddParams = {
+  readonly attachmentType: string;
+  readonly identityKey: string;
+  readonly payload: Schema.Json;
+  readonly threadId: string;
+};
+export const V2ThreadAttachmentAddParams = Schema.Struct({
+  attachmentType: Schema.String,
+  identityKey: Schema.String,
+  payload: Schema.Json.annotate({ expected: "JSON value" }),
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadAttachmentAddParams",
+  description: "Parameters for creating or locating an attachment on its owning thread.",
+});
+
+export type V2ThreadAttachmentAddResponse = {
+  readonly attachment: V2ThreadAttachmentAddResponse__ThreadAttachment;
+  readonly outcome: V2ThreadAttachmentAddResponse__ThreadAttachmentAddOutcome;
+};
+export const V2ThreadAttachmentAddResponse = Schema.Struct({
+  attachment: V2ThreadAttachmentAddResponse__ThreadAttachment,
+  outcome: V2ThreadAttachmentAddResponse__ThreadAttachmentAddOutcome,
+}).annotate({
+  title: "ThreadAttachmentAddResponse",
+  description: "The created or existing attachment.",
+});
+
+export type V2ThreadAttachmentListParams = {
+  readonly cursor?: string | null;
+  readonly limit?: number | null;
+  readonly threadId: string;
+};
+export const V2ThreadAttachmentListParams = Schema.Struct({
+  cursor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  limit: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadAttachmentListParams",
+  description: "Parameters for listing attachments from one thread.",
+});
+
+export type V2ThreadAttachmentListResponse = {
+  readonly data: ReadonlyArray<V2ThreadAttachmentListResponse__ThreadAttachment>;
+  readonly nextCursor?: string | null;
+};
+export const V2ThreadAttachmentListResponse = Schema.Struct({
+  data: Schema.Array(V2ThreadAttachmentListResponse__ThreadAttachment),
+  nextCursor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({
+  title: "ThreadAttachmentListResponse",
+  description: "One page of attachments associated with the requested thread.",
+});
+
+export type V2ThreadAttachmentRemoveParams = {
+  readonly attachmentType: string;
+  readonly identityKey: string;
+  readonly threadId: string;
+};
+export const V2ThreadAttachmentRemoveParams = Schema.Struct({
+  attachmentType: Schema.String,
+  identityKey: Schema.String,
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadAttachmentRemoveParams",
+  description: "Parameters for deleting an attachment by its stable thread-local identity.",
+});
+
+export type V2ThreadAttachmentRemoveResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadAttachmentRemoveResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
+  title: "ThreadAttachmentRemoveResponse",
+  description: "Successful deletion does not return additional attachment data.",
+});
+
+export type V2ThreadAttachmentUpdatedNotification = {
+  readonly attachmentId: string;
+  readonly attachmentType: string;
+  readonly identityKey: string;
+  readonly operation: V2ThreadAttachmentUpdatedNotification__ThreadAttachmentOperation;
+  readonly threadId: string;
+};
+export const V2ThreadAttachmentUpdatedNotification = Schema.Struct({
+  attachmentId: Schema.String,
+  attachmentType: Schema.String,
+  identityKey: Schema.String,
+  operation: V2ThreadAttachmentUpdatedNotification__ThreadAttachmentOperation,
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadAttachmentUpdatedNotification",
+  description: "Notification published after a thread attachment is created or deleted.",
 });
 
 export type V2ThreadClosedNotification = { readonly threadId: string };
@@ -40034,10 +54632,11 @@ export const V2ThreadCompactStartParams = Schema.Struct({ threadId: Schema.Strin
   title: "ThreadCompactStartParams",
 });
 
-export type V2ThreadCompactStartResponse = {};
-export const V2ThreadCompactStartResponse = Schema.Struct({}).annotate({
-  title: "ThreadCompactStartResponse",
-});
+export type V2ThreadCompactStartResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadCompactStartResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadCompactStartResponse" });
 
 export type V2ThreadDeletedNotification = { readonly threadId: string };
 export const V2ThreadDeletedNotification = Schema.Struct({ threadId: Schema.String }).annotate({
@@ -40049,17 +54648,21 @@ export const V2ThreadDeleteParams = Schema.Struct({ threadId: Schema.String }).a
   title: "ThreadDeleteParams",
 });
 
-export type V2ThreadDeleteResponse = {};
-export const V2ThreadDeleteResponse = Schema.Struct({}).annotate({ title: "ThreadDeleteResponse" });
+export type V2ThreadDeleteResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadDeleteResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadDeleteResponse" });
 
 export type V2ThreadForkParams = {
   readonly approvalPolicy?: V2ThreadForkParams__AskForApproval | null;
   readonly approvalsReviewer?: V2ThreadForkParams__ApprovalsReviewer | null;
   readonly baseInstructions?: string | null;
-  readonly config?: { readonly [x: string]: unknown } | null;
+  readonly config?: { readonly [x: string]: Schema.Json } | null;
   readonly cwd?: string | null;
   readonly developerInstructions?: string | null;
   readonly ephemeral?: boolean;
+  readonly excludeTurns?: boolean;
   readonly lastTurnId?: string | null;
   readonly model?: string | null;
   readonly modelProvider?: string | null;
@@ -40080,11 +54683,20 @@ export const V2ThreadForkParams = Schema.Struct({
   ),
   baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   config: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.Unknown), Schema.Null]),
+    Schema.Union([
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
+      Schema.Null,
+    ]),
   ),
   cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   ephemeral: Schema.optionalKey(Schema.Boolean),
+  excludeTurns: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, return only thread metadata and live fork state without populating `thread.turns`. This is useful when the client plans to call `thread/turns/list` immediately after forking. Full-history hydration is deprecated for paginated threads; use this with `thread/turns/list` and `thread/items/list` instead.",
+    }),
+  ),
   lastTurnId: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -40126,33 +54738,30 @@ export const V2ThreadForkParams__AbsolutePathBuf = Schema.String.annotate({
 
 export type V2ThreadForkResponse = {
   readonly approvalPolicy: V2ThreadForkResponse__AskForApproval;
-  readonly approvalsReviewer: "user" | "auto_review" | "guardian_subagent";
+  readonly approvalsReviewer: V2ThreadForkResponse__ApprovalsReviewer;
   readonly cwd: V2ThreadForkResponse__AbsolutePathBuf;
+  readonly disabledPluginIds?: ReadonlyArray<string>;
   readonly instructionSources?: ReadonlyArray<V2ThreadForkResponse__LegacyAppPathString>;
   readonly model: string;
   readonly modelProvider: string;
   readonly reasoningEffort?: V2ThreadForkResponse__ReasoningEffort | null;
-  readonly sandbox:
-    | { readonly type: "dangerFullAccess" }
-    | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-    | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-    | {
-        readonly excludeSlashTmp?: boolean;
-        readonly excludeTmpdirEnvVar?: boolean;
-        readonly networkAccess?: boolean;
-        readonly type: "workspaceWrite";
-        readonly writableRoots?: ReadonlyArray<V2ThreadForkResponse__AbsolutePathBuf>;
-      };
+  readonly sandbox: V2ThreadForkResponse__SandboxPolicy;
   readonly serviceTier?: string | null;
   readonly thread: V2ThreadForkResponse__Thread;
 };
 export const V2ThreadForkResponse = Schema.Struct({
   approvalPolicy: V2ThreadForkResponse__AskForApproval,
-  approvalsReviewer: Schema.Literals(["user", "auto_review", "guardian_subagent"]).annotate({
-    description:
-      "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-  }),
+  approvalsReviewer: Schema.suspend(
+    (): Schema.Codec<V2ThreadForkResponse__ApprovalsReviewer> =>
+      V2ThreadForkResponse__ApprovalsReviewer,
+  ).annotate({ description: "Reviewer currently used for approval requests on this thread." }),
   cwd: V2ThreadForkResponse__AbsolutePathBuf,
+  disabledPluginIds: Schema.optionalKey(
+    Schema.Array(Schema.String).annotate({
+      description: "Saved list of disabled plugin IDs. Does not yet filter plugin capabilities.",
+      default: [],
+    }),
+  ),
   instructionSources: Schema.optionalKey(
     Schema.Array(V2ThreadForkResponse__LegacyAppPathString).annotate({
       description:
@@ -40165,38 +54774,8 @@ export const V2ThreadForkResponse = Schema.Struct({
   reasoningEffort: Schema.optionalKey(
     Schema.Union([V2ThreadForkResponse__ReasoningEffort, Schema.Null]),
   ),
-  sandbox: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("dangerFullAccess").annotate({
-          title: "DangerFullAccessSandboxPolicyType",
-        }),
-      }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-      Schema.Struct({
-        networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-      }).annotate({ title: "ReadOnlySandboxPolicy" }),
-      Schema.Struct({
-        networkAccess: Schema.optionalKey(
-          Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-        ),
-        type: Schema.Literal("externalSandbox").annotate({
-          title: "ExternalSandboxSandboxPolicyType",
-        }),
-      }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-      Schema.Struct({
-        excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        type: Schema.Literal("workspaceWrite").annotate({
-          title: "WorkspaceWriteSandboxPolicyType",
-        }),
-        writableRoots: Schema.optionalKey(
-          Schema.Array(V2ThreadForkResponse__AbsolutePathBuf).annotate({ default: [] }),
-        ),
-      }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
-    ],
-    { mode: "oneOf" },
+  sandbox: Schema.suspend(
+    (): Schema.Codec<V2ThreadForkResponse__SandboxPolicy> => V2ThreadForkResponse__SandboxPolicy,
   ).annotate({
     description:
       "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `activePermissionProfile` for profile provenance.",
@@ -40208,88 +54787,22 @@ export const V2ThreadForkResponse = Schema.Struct({
 export type V2ThreadForkResponse__ActivePermissionProfile = {
   readonly extends?: string | null;
   readonly id: string;
-};
-export const V2ThreadForkResponse__ActivePermissionProfile = Schema.Struct({
-  extends: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  id: Schema.String.annotate({
-    description:
-      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-  }),
-});
-
-export type V2ThreadForkResponse__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const V2ThreadForkResponse__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
-
-export type V2ThreadForkResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ThreadForkResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadForkResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadForkResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadForkResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadForkResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadForkResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadForkResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
+};
+export const V2ThreadForkResponse__ActivePermissionProfile = Schema.Struct({
+  extends: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  id: Schema.String.annotate({
+    description:
+      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
+  }),
+});
 
 export type V2ThreadForkResponse__MultiAgentMode =
   | "explicitRequestOnly"
@@ -40306,112 +54819,24 @@ export const V2ThreadForkResponse__MultiAgentMode = Schema.Union(
     "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
 });
 
-export type V2ThreadForkResponse__NetworkAccess = "restricted" | "enabled";
-export const V2ThreadForkResponse__NetworkAccess = Schema.Literals(["restricted", "enabled"]);
-
-export type V2ThreadForkResponse__SandboxPolicy =
-  | { readonly type: "dangerFullAccess" }
-  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-  | {
-      readonly excludeSlashTmp?: boolean;
-      readonly excludeTmpdirEnvVar?: boolean;
-      readonly networkAccess?: boolean;
-      readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<V2ThreadForkResponse__AbsolutePathBuf>;
-    };
-export const V2ThreadForkResponse__SandboxPolicy = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("dangerFullAccess").annotate({
-        title: "DangerFullAccessSandboxPolicyType",
-      }),
-    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-    }).annotate({ title: "ReadOnlySandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-      ),
-      type: Schema.Literal("externalSandbox").annotate({
-        title: "ExternalSandboxSandboxPolicyType",
-      }),
-    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-    Schema.Struct({
-      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
-      writableRoots: Schema.optionalKey(
-        Schema.Array(V2ThreadForkResponse__AbsolutePathBuf).annotate({ default: [] }),
-      ),
-    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadForkResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadForkResponse__SubAgentSource };
-export const V2ThreadForkResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadForkResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadForkResponse__ThreadExtra = {};
-export const V2ThreadForkResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export type V2ThreadForkResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadForkResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadForkResponse__LegacyAppPathString>;
+};
+export const V2ThreadForkResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadForkResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadForkResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
 });
 
-export type V2ThreadForkResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadForkResponse__ThreadHistoryMode = Schema.Literals(["legacy", "paginated"]);
-
-export type V2ThreadForkResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadForkResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadForkResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadForkResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadForkResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadForkResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
+export type V2ThreadForkResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadForkResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
 export type V2ThreadGoalClearedNotification = { readonly threadId: string };
 export const V2ThreadGoalClearedNotification = Schema.Struct({ threadId: Schema.String }).annotate({
@@ -40451,7 +54876,12 @@ export const V2ThreadGoalSetParams = Schema.Struct({
   status: Schema.optionalKey(Schema.Union([V2ThreadGoalSetParams__ThreadGoalStatus, Schema.Null])),
   threadId: Schema.String,
   tokenBudget: Schema.optionalKey(
-    Schema.Union([Schema.Number.annotate({ format: "int64" }).check(Schema.isInt()), Schema.Null]),
+    Schema.Union([
+      Schema.Number.annotate({ format: "int64" }).check(
+        Schema.isInt().annotate({ expected: "an integer" }),
+      ),
+      Schema.Null,
+    ]),
   ),
 }).annotate({ title: "ThreadGoalSetParams" });
 
@@ -40472,20 +54902,91 @@ export const V2ThreadGoalUpdatedNotification = Schema.Struct({
 }).annotate({ title: "ThreadGoalUpdatedNotification" });
 
 export type V2ThreadInjectItemsParams = {
-  readonly items: ReadonlyArray<unknown>;
+  readonly items: ReadonlyArray<Schema.Json>;
   readonly threadId: string;
 };
 export const V2ThreadInjectItemsParams = Schema.Struct({
-  items: Schema.Array(Schema.Unknown).annotate({
+  items: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })).annotate({
     description: "Raw Responses API items to append to the thread's model-visible history.",
   }),
   threadId: Schema.String,
 }).annotate({ title: "ThreadInjectItemsParams" });
 
-export type V2ThreadInjectItemsResponse = {};
-export const V2ThreadInjectItemsResponse = Schema.Struct({}).annotate({
-  title: "ThreadInjectItemsResponse",
-});
+export type V2ThreadInjectItemsResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadInjectItemsResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadInjectItemsResponse" });
+
+export type V2ThreadItemsListParams = {
+  readonly cursor?: V2ThreadItemsListParams__ThreadItemsListCursor | null;
+  readonly limit?: number | null;
+  readonly sortDirection?: V2ThreadItemsListParams__SortDirection | null;
+  readonly threadId: string;
+  readonly turnId?: string | null;
+};
+export const V2ThreadItemsListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
+    Schema.Union([V2ThreadItemsListParams__ThreadItemsListCursor, Schema.Null]).annotate({
+      description:
+        "Opaque continuation cursor or an exclusive item anchor in the requested visible turn. An item anchor requires a non-empty `turnId`; ascending (the default) returns items after it, and descending returns items before it. Continue with the returned string cursor.",
+    }),
+  ),
+  limit: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ description: "Optional item page size.", format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  sortDirection: Schema.optionalKey(
+    Schema.Union([V2ThreadItemsListParams__SortDirection, Schema.Null]).annotate({
+      description: "Optional item pagination direction; defaults to ascending.",
+    }),
+  ),
+  threadId: Schema.String,
+  turnId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional turn id to filter by. When omitted, returns items across the thread.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ title: "ThreadItemsListParams" });
+
+export type V2ThreadItemsListResponse = {
+  readonly backwardsCursor?: string | null;
+  readonly data: ReadonlyArray<V2ThreadItemsListResponse__ThreadItemEntry>;
+  readonly nextCursor?: string | null;
+};
+export const V2ThreadItemsListResponse = Schema.Struct({
+  backwardsCursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Opaque cursor to pass as `cursor` when reversing `sortDirection`. This is only populated when the page contains at least one item.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  data: Schema.Array(V2ThreadItemsListResponse__ThreadItemEntry),
+  nextCursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Opaque cursor to pass to the next call to continue after the last item. if None, there are no more items to return.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ title: "ThreadItemsListResponse" });
 
 export type V2ThreadListParams = {
   readonly archived?: boolean | null;
@@ -40493,7 +54994,9 @@ export type V2ThreadListParams = {
   readonly cwd?: V2ThreadListParams__ThreadListCwdFilter | null;
   readonly limit?: number | null;
   readonly modelProviders?: ReadonlyArray<string> | null;
+  readonly originators?: ReadonlyArray<string> | null;
   readonly searchTerm?: string | null;
+  readonly sectionId?: string | null;
   readonly sortDirection?: V2ThreadListParams__SortDirection | null;
   readonly sortKey?: V2ThreadListParams__ThreadSortKey | null;
   readonly sourceKinds?: ReadonlyArray<V2ThreadListParams__ThreadSourceKind> | null;
@@ -40529,8 +55032,12 @@ export const V2ThreadListParams = Schema.Struct({
         description: "Optional page size; defaults to a reasonable server-side value.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -40543,6 +55050,15 @@ export const V2ThreadListParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  originators: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Optional originator allowlist, matching any supplied value exactly. Supported by hosted backends only; the local app-server rejects a nonempty list. Omitted or empty lists leave originators unrestricted.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   searchTerm: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -40551,6 +55067,15 @@ export const V2ThreadListParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  sectionId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Omit to include every section, set to `null` for unsectioned threads, or provide a section ID to return only threads in that section.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   sortDirection: Schema.optionalKey(
     Schema.Union([V2ThreadListParams__SortDirection, Schema.Null]).annotate({
       description: "Optional sort direction; defaults to descending (newest first).",
@@ -40605,122 +55130,24 @@ export const V2ThreadListResponse = Schema.Struct({
   ),
 }).annotate({ title: "ThreadListResponse" });
 
-export type V2ThreadListResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ThreadListResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadListResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadListResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadListResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadListResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadListResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadListResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ThreadListResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadListResponse__SubAgentSource };
-export const V2ThreadListResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadListResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadListResponse__ThreadExtra = {};
-export const V2ThreadListResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export type V2ThreadListResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadListResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadListResponse__LegacyAppPathString>;
+};
+export const V2ThreadListResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadListResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadListResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
 });
 
-export type V2ThreadListResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadListResponse__ThreadHistoryMode = Schema.Literals(["legacy", "paginated"]);
-
-export type V2ThreadListResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadListResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadListResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadListResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadListResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadListResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
+export type V2ThreadListResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadListResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
 export type V2ThreadLoadedListParams = {
   readonly cursor?: string | null;
@@ -40741,8 +55168,12 @@ export const V2ThreadLoadedListParams = Schema.Struct({
         description: "Optional page size; defaults to no limit.",
         format: "uint32",
       })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -40784,276 +55215,89 @@ export const V2ThreadMetadataUpdateParams = Schema.Struct({
   threadId: Schema.String,
 }).annotate({ title: "ThreadMetadataUpdateParams" });
 
-export type V2ThreadMetadataUpdateResponse = {
-  readonly thread: V2ThreadMetadataUpdateResponse__Thread;
-};
-export const V2ThreadMetadataUpdateResponse = Schema.Struct({
-  thread: V2ThreadMetadataUpdateResponse__Thread,
-}).annotate({ title: "ThreadMetadataUpdateResponse" });
-
-export type V2ThreadMetadataUpdateResponse__ByteRange = {
-  readonly end: number;
-  readonly start: number;
-};
-export const V2ThreadMetadataUpdateResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadMetadataUpdateResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadMetadataUpdateResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadMetadataUpdateResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadMetadataUpdateResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadMetadataUpdateResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ThreadMetadataUpdateResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadMetadataUpdateResponse__SubAgentSource };
-export const V2ThreadMetadataUpdateResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadMetadataUpdateResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadMetadataUpdateResponse__ThreadExtra = {};
-export const V2ThreadMetadataUpdateResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
-});
-
-export type V2ThreadMetadataUpdateResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadMetadataUpdateResponse__ThreadHistoryMode = Schema.Literals([
-  "legacy",
-  "paginated",
-]);
-
-export type V2ThreadMetadataUpdateResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadMetadataUpdateResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadMetadataUpdateResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadMetadataUpdateResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadMetadataUpdateResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadMetadataUpdateResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
-
-export type V2ThreadNameUpdatedNotification = {
-  readonly threadId: string;
-  readonly threadName?: string | null;
-};
-export const V2ThreadNameUpdatedNotification = Schema.Struct({
-  threadId: Schema.String,
-  threadName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-}).annotate({ title: "ThreadNameUpdatedNotification" });
-
-export type V2ThreadReadParams = { readonly includeTurns?: boolean; readonly threadId: string };
-export const V2ThreadReadParams = Schema.Struct({
-  includeTurns: Schema.optionalKey(
-    Schema.Boolean.annotate({
-      description: "When true, include turns and their items from rollout history.",
-    }),
-  ),
-  threadId: Schema.String,
-}).annotate({ title: "ThreadReadParams" });
-
-export type V2ThreadReadResponse = { readonly thread: V2ThreadReadResponse__Thread };
-export const V2ThreadReadResponse = Schema.Struct({
-  thread: V2ThreadReadResponse__Thread,
-}).annotate({ title: "ThreadReadResponse" });
-
-export type V2ThreadReadResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ThreadReadResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadReadResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadReadResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadReadResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadReadResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadReadResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadReadResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ThreadReadResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadReadResponse__SubAgentSource };
-export const V2ThreadReadResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadReadResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadReadResponse__ThreadExtra = {};
-export const V2ThreadReadResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export type V2ThreadMetadataUpdateResponse = {
+  readonly thread: V2ThreadMetadataUpdateResponse__Thread;
+};
+export const V2ThreadMetadataUpdateResponse = Schema.Struct({
+  thread: V2ThreadMetadataUpdateResponse__Thread,
+}).annotate({ title: "ThreadMetadataUpdateResponse" });
+
+export type V2ThreadMetadataUpdateResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadMetadataUpdateResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadMetadataUpdateResponse__LegacyAppPathString>;
+};
+export const V2ThreadMetadataUpdateResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadMetadataUpdateResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadMetadataUpdateResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
 });
 
-export type V2ThreadReadResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadReadResponse__ThreadHistoryMode = Schema.Literals(["legacy", "paginated"]);
+export type V2ThreadMetadataUpdateResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadMetadataUpdateResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
-export type V2ThreadReadResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadReadResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadReadResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadReadResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
+export type V2ThreadNameUpdatedNotification = {
+  readonly threadId: string;
+  readonly threadName?: string | null;
+};
+export const V2ThreadNameUpdatedNotification = Schema.Struct({
+  threadId: Schema.String,
+  threadName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+}).annotate({ title: "ThreadNameUpdatedNotification" });
+
+export type V2ThreadProjectUpdatedNotification = {
+  readonly projectId: string | null;
+  readonly threadId: string;
+};
+export const V2ThreadProjectUpdatedNotification = Schema.Struct({
+  projectId: Schema.Union([Schema.String, Schema.Null]),
+  threadId: Schema.String,
+}).annotate({ title: "ThreadProjectUpdatedNotification" });
+
+export type V2ThreadQueueChangedNotification = { readonly threadId: string };
+export const V2ThreadQueueChangedNotification = Schema.Struct({ threadId: Schema.String }).annotate(
+  { title: "ThreadQueueChangedNotification" },
 );
 
-export type V2ThreadReadResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadReadResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
+export type V2ThreadReadParams = { readonly includeTurns?: boolean; readonly threadId: string };
+export const V2ThreadReadParams = Schema.Struct({
+  includeTurns: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, include turns and their items from rollout history. Full-history hydration is deprecated for paginated threads; prefer a metadata-only read and page with `thread/turns/list` and `thread/items/list`.",
+    }),
+  ),
+  threadId: Schema.String,
+}).annotate({ title: "ThreadReadParams" });
+
+export type V2ThreadReadResponse = { readonly thread: V2ThreadReadResponse__Thread };
+export const V2ThreadReadResponse = Schema.Struct({
+  thread: V2ThreadReadResponse__Thread,
+}).annotate({ title: "ThreadReadResponse" });
+
+export type V2ThreadReadResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadReadResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadReadResponse__LegacyAppPathString>;
+};
+export const V2ThreadReadResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadReadResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadReadResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
+});
+
+export type V2ThreadReadResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadReadResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
 export type V2ThreadRealtimeClosedNotification = {
   readonly reason?: string | null;
@@ -41080,17 +55324,55 @@ export const V2ThreadRealtimeErrorNotification = Schema.Struct({
 });
 
 export type V2ThreadRealtimeItemAddedNotification = {
-  readonly item: unknown;
+  readonly item: Schema.Json;
   readonly threadId: string;
 };
 export const V2ThreadRealtimeItemAddedNotification = Schema.Struct({
-  item: Schema.Unknown,
+  item: Schema.Json.annotate({ expected: "JSON value" }),
   threadId: Schema.String,
 }).annotate({
   title: "ThreadRealtimeItemAddedNotification",
   description: "EXPERIMENTAL - raw non-audio thread realtime item emitted by the backend.",
 });
 
+export type V2ThreadRealtimeItemCompletedNotification = {
+  readonly item: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeItem;
+  readonly threadId: string;
+};
+export const V2ThreadRealtimeItemCompletedNotification = Schema.Struct({
+  item: V2ThreadRealtimeItemCompletedNotification__ThreadRealtimeItem,
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadRealtimeItemCompletedNotification",
+  description: "EXPERIMENTAL - a realtime timeline item published after canonical commit.",
+});
+
+export type V2ThreadRealtimeItemStartedNotification = {
+  readonly item: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeItem;
+  readonly threadId: string;
+};
+export const V2ThreadRealtimeItemStartedNotification = Schema.Struct({
+  item: V2ThreadRealtimeItemStartedNotification__ThreadRealtimeItem,
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadRealtimeItemStartedNotification",
+  description: "EXPERIMENTAL - a realtime timeline item started before its content streams.",
+});
+
+export type V2ThreadRealtimeItemTranscriptDeltaNotification = {
+  readonly delta: string;
+  readonly itemId: string;
+  readonly threadId: string;
+};
+export const V2ThreadRealtimeItemTranscriptDeltaNotification = Schema.Struct({
+  delta: Schema.String,
+  itemId: Schema.String,
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadRealtimeItemTranscriptDeltaNotification",
+  description: "EXPERIMENTAL - text appended to an active realtime transcript item.",
+});
+
 export type V2ThreadRealtimeOutputAudioDeltaNotification = {
   readonly audio: V2ThreadRealtimeOutputAudioDeltaNotification__ThreadRealtimeAudioChunk;
   readonly threadId: string;
@@ -41160,9 +55442,10 @@ export type V2ThreadResumeParams = {
   readonly approvalPolicy?: V2ThreadResumeParams__AskForApproval | null;
   readonly approvalsReviewer?: V2ThreadResumeParams__ApprovalsReviewer | null;
   readonly baseInstructions?: string | null;
-  readonly config?: { readonly [x: string]: unknown } | null;
+  readonly config?: { readonly [x: string]: Schema.Json } | null;
   readonly cwd?: string | null;
   readonly developerInstructions?: string | null;
+  readonly excludeTurns?: boolean;
   readonly model?: string | null;
   readonly modelProvider?: string | null;
   readonly personality?: V2ThreadResumeParams__Personality | null;
@@ -41182,10 +55465,19 @@ export const V2ThreadResumeParams = Schema.Struct({
   ),
   baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   config: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.Unknown), Schema.Null]),
+    Schema.Union([
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
+      Schema.Null,
+    ]),
   ),
   cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  excludeTurns: Schema.optionalKey(
+    Schema.Boolean.annotate({
+      description:
+        "When true, return only thread metadata and live-resume state without populating `thread.turns`. This is useful when the client plans to call `thread/turns/list` immediately after resuming. Full-history hydration is deprecated for paginated threads; use this with `thread/turns/list` and `thread/items/list` instead.",
+    }),
+  ),
   model: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
@@ -41195,7 +55487,12 @@ export const V2ThreadResumeParams = Schema.Struct({
     ]),
   ),
   modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  personality: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__Personality, Schema.Null])),
+  personality: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeParams__Personality, Schema.Null]).annotate({
+      description:
+        "@deprecated `friendly` and `pragmatic` no longer select a style. Changing this does not rewrite the thread's existing instructions.",
+    }),
+  ),
   sandbox: Schema.optionalKey(Schema.Union([V2ThreadResumeParams__SandboxMode, Schema.Null])),
   serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   threadId: Schema.String,
@@ -41247,6 +55544,7 @@ export type V2ThreadResumeParams__ResponseItem =
   | {
       readonly arguments: string;
       readonly call_id: string;
+      readonly encrypted_function_args?: ReadonlyArray<string> | null;
       readonly id?: string | null;
       readonly internal_chat_message_metadata_passthrough?: V2ThreadResumeParams__InternalChatMessageMetadataPassthrough | null;
       readonly name: string;
@@ -41254,7 +55552,7 @@ export type V2ThreadResumeParams__ResponseItem =
       readonly type: "function_call";
     }
   | {
-      readonly arguments: unknown;
+      readonly arguments: Schema.Json;
       readonly call_id?: string | null;
       readonly execution: string;
       readonly id?: string | null;
@@ -41263,9 +55561,11 @@ export type V2ThreadResumeParams__ResponseItem =
       readonly type: "tool_search_call";
     }
   | {
-      readonly call_id: string;
+      readonly call_id?: string | null;
       readonly id?: string | null;
       readonly internal_chat_message_metadata_passthrough?: V2ThreadResumeParams__InternalChatMessageMetadataPassthrough | null;
+      readonly name?: string | null;
+      readonly namespace?: string | null;
       readonly output: V2ThreadResumeParams__FunctionCallOutputBody;
       readonly type: "function_call_output";
     }
@@ -41293,7 +55593,7 @@ export type V2ThreadResumeParams__ResponseItem =
       readonly id?: string | null;
       readonly internal_chat_message_metadata_passthrough?: V2ThreadResumeParams__InternalChatMessageMetadataPassthrough | null;
       readonly status: string;
-      readonly tools: ReadonlyArray<unknown>;
+      readonly tools: ReadonlyArray<Schema.Json>;
       readonly type: "tool_search_output";
     }
   | {
@@ -41317,6 +55617,10 @@ export type V2ThreadResumeParams__ResponseItem =
       readonly internal_chat_message_metadata_passthrough?: V2ThreadResumeParams__InternalChatMessageMetadataPassthrough | null;
       readonly type: "compaction";
     }
+  | {
+      readonly reasoning: V2ThreadResumeParams__ConfigurationReasoning;
+      readonly type: "configuration_update";
+    }
   | { readonly type: "compaction_trigger" }
   | {
       readonly encrypted_content?: string | null;
@@ -41386,6 +55690,9 @@ export const V2ThreadResumeParams__ResponseItem = Schema.Union(
     Schema.Struct({
       arguments: Schema.String,
       call_id: Schema.String,
+      encrypted_function_args: Schema.optionalKey(
+        Schema.Union([Schema.Array(Schema.String), Schema.Null]),
+      ),
       id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       internal_chat_message_metadata_passthrough: Schema.optionalKey(
         Schema.Union([V2ThreadResumeParams__InternalChatMessageMetadataPassthrough, Schema.Null]),
@@ -41395,7 +55702,7 @@ export const V2ThreadResumeParams__ResponseItem = Schema.Union(
       type: Schema.Literal("function_call").annotate({ title: "FunctionCallResponseItemType" }),
     }).annotate({ title: "FunctionCallResponseItem" }),
     Schema.Struct({
-      arguments: Schema.Unknown,
+      arguments: Schema.Json.annotate({ expected: "JSON value" }),
       call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       execution: Schema.String,
       id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -41408,11 +55715,13 @@ export const V2ThreadResumeParams__ResponseItem = Schema.Union(
       }),
     }).annotate({ title: "ToolSearchCallResponseItem" }),
     Schema.Struct({
-      call_id: Schema.String,
+      call_id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       id: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       internal_chat_message_metadata_passthrough: Schema.optionalKey(
         Schema.Union([V2ThreadResumeParams__InternalChatMessageMetadataPassthrough, Schema.Null]),
       ),
+      name: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+      namespace: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       output: V2ThreadResumeParams__FunctionCallOutputBody,
       type: Schema.Literal("function_call_output").annotate({
         title: "FunctionCallOutputResponseItemType",
@@ -41452,7 +55761,7 @@ export const V2ThreadResumeParams__ResponseItem = Schema.Union(
         Schema.Union([V2ThreadResumeParams__InternalChatMessageMetadataPassthrough, Schema.Null]),
       ),
       status: Schema.String,
-      tools: Schema.Array(Schema.Unknown),
+      tools: Schema.Array(Schema.Json.annotate({ expected: "JSON value" })),
       type: Schema.Literal("tool_search_output").annotate({
         title: "ToolSearchOutputResponseItemType",
       }),
@@ -41488,6 +55797,15 @@ export const V2ThreadResumeParams__ResponseItem = Schema.Union(
       ),
       type: Schema.Literal("compaction").annotate({ title: "CompactionResponseItemType" }),
     }).annotate({ title: "CompactionResponseItem" }),
+    Schema.Struct({
+      reasoning: V2ThreadResumeParams__ConfigurationReasoning,
+      type: Schema.Literal("configuration_update").annotate({
+        title: "ConfigurationUpdateResponseItemType",
+      }),
+    }).annotate({
+      title: "ConfigurationUpdateResponseItem",
+      description: "A durable input control interpreted by the backend at its position in history.",
+    }),
     Schema.Struct({
       type: Schema.Literal("compaction_trigger").annotate({
         title: "CompactionTriggerResponseItemType",
@@ -41524,8 +55842,12 @@ export const V2ThreadResumeParams__ThreadResumeInitialTurnsPageParams = Schema.S
   limit: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({ description: "Optional turn page size.", format: "uint32" })
-        .check(Schema.isInt())
-        .check(Schema.isGreaterThanOrEqualTo(0)),
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
@@ -41538,783 +55860,370 @@ export const V2ThreadResumeParams__ThreadResumeInitialTurnsPageParams = Schema.S
 
 export type V2ThreadResumeResponse = {
   readonly approvalPolicy: V2ThreadResumeResponse__AskForApproval;
-  readonly approvalsReviewer: "user" | "auto_review" | "guardian_subagent";
+  readonly approvalsReviewer: V2ThreadResumeResponse__ApprovalsReviewer;
+  readonly collaborationMode?: V2ThreadResumeResponse__CollaborationMode | null;
   readonly cwd: V2ThreadResumeResponse__AbsolutePathBuf;
+  readonly disabledPluginIds?: ReadonlyArray<string>;
   readonly instructionSources?: ReadonlyArray<V2ThreadResumeResponse__LegacyAppPathString>;
+  readonly itemsBackwardsCursor?: string | null;
   readonly model: string;
   readonly modelProvider: string;
   readonly reasoningEffort?: V2ThreadResumeResponse__ReasoningEffort | null;
-  readonly sandbox:
-    | { readonly type: "dangerFullAccess" }
-    | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-    | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-    | {
-        readonly excludeSlashTmp?: boolean;
-        readonly excludeTmpdirEnvVar?: boolean;
-        readonly networkAccess?: boolean;
-        readonly type: "workspaceWrite";
-        readonly writableRoots?: ReadonlyArray<V2ThreadResumeResponse__AbsolutePathBuf>;
-      };
+  readonly sandbox: V2ThreadResumeResponse__SandboxPolicy;
   readonly serviceTier?: string | null;
   readonly thread: V2ThreadResumeResponse__Thread;
+  readonly turnsBackwardsCursor?: string | null;
 };
 export const V2ThreadResumeResponse = Schema.Struct({
   approvalPolicy: V2ThreadResumeResponse__AskForApproval,
-  approvalsReviewer: Schema.Literals(["user", "auto_review", "guardian_subagent"]).annotate({
-    description:
-      "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-  }),
-  cwd: V2ThreadResumeResponse__AbsolutePathBuf,
-  instructionSources: Schema.optionalKey(
-    Schema.Array(V2ThreadResumeResponse__LegacyAppPathString).annotate({
-      description:
-        "Environment-native paths to instruction source files currently loaded for this thread.",
-      default: [],
+  approvalsReviewer: Schema.suspend(
+    (): Schema.Codec<V2ThreadResumeResponse__ApprovalsReviewer> =>
+      V2ThreadResumeResponse__ApprovalsReviewer,
+  ).annotate({ description: "Reviewer currently used for approval requests on this thread." }),
+  collaborationMode: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__CollaborationMode, Schema.Null]).annotate({
+      description: "Effective collaboration mode. Absent when resuming from an older server.",
     }),
   ),
-  model: Schema.String,
-  modelProvider: Schema.String,
-  reasoningEffort: Schema.optionalKey(
-    Schema.Union([V2ThreadResumeResponse__ReasoningEffort, Schema.Null]),
-  ),
-  sandbox: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("dangerFullAccess").annotate({
-          title: "DangerFullAccessSandboxPolicyType",
-        }),
-      }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-      Schema.Struct({
-        networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-      }).annotate({ title: "ReadOnlySandboxPolicy" }),
-      Schema.Struct({
-        networkAccess: Schema.optionalKey(
-          Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-        ),
-        type: Schema.Literal("externalSandbox").annotate({
-          title: "ExternalSandboxSandboxPolicyType",
-        }),
-      }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-      Schema.Struct({
-        excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        type: Schema.Literal("workspaceWrite").annotate({
-          title: "WorkspaceWriteSandboxPolicyType",
-        }),
-        writableRoots: Schema.optionalKey(
-          Schema.Array(V2ThreadResumeResponse__AbsolutePathBuf).annotate({ default: [] }),
-        ),
-      }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
-    ],
-    { mode: "oneOf" },
-  ).annotate({
-    description:
-      "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `activePermissionProfile` for profile provenance.",
-  }),
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  thread: V2ThreadResumeResponse__Thread,
-}).annotate({ title: "ThreadResumeResponse" });
-
-export type V2ThreadResumeResponse__ActivePermissionProfile = {
-  readonly extends?: string | null;
-  readonly id: string;
-};
-export const V2ThreadResumeResponse__ActivePermissionProfile = Schema.Struct({
-  extends: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  id: Schema.String.annotate({
-    description:
-      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-  }),
-});
-
-export type V2ThreadResumeResponse__ApprovalsReviewer =
-  | "user"
-  | "auto_review"
-  | "guardian_subagent";
-export const V2ThreadResumeResponse__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
-
-export type V2ThreadResumeResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ThreadResumeResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadResumeResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadResumeResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadResumeResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadResumeResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadResumeResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadResumeResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ThreadResumeResponse__MultiAgentMode =
-  | "explicitRequestOnly"
-  | "proactive"
-  | { readonly custom: string };
-export const V2ThreadResumeResponse__MultiAgentMode = Schema.Union(
-  [
-    Schema.Literals(["explicitRequestOnly", "proactive"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomMultiAgentMode" }),
-  ],
-  { mode: "oneOf" },
-).annotate({
-  description:
-    "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
-});
-
-export type V2ThreadResumeResponse__NetworkAccess = "restricted" | "enabled";
-export const V2ThreadResumeResponse__NetworkAccess = Schema.Literals(["restricted", "enabled"]);
-
-export type V2ThreadResumeResponse__SandboxPolicy =
-  | { readonly type: "dangerFullAccess" }
-  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-  | {
-      readonly excludeSlashTmp?: boolean;
-      readonly excludeTmpdirEnvVar?: boolean;
-      readonly networkAccess?: boolean;
-      readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<V2ThreadResumeResponse__AbsolutePathBuf>;
-    };
-export const V2ThreadResumeResponse__SandboxPolicy = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("dangerFullAccess").annotate({
-        title: "DangerFullAccessSandboxPolicyType",
-      }),
-    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-    }).annotate({ title: "ReadOnlySandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-      ),
-      type: Schema.Literal("externalSandbox").annotate({
-        title: "ExternalSandboxSandboxPolicyType",
-      }),
-    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-    Schema.Struct({
-      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
-      writableRoots: Schema.optionalKey(
-        Schema.Array(V2ThreadResumeResponse__AbsolutePathBuf).annotate({ default: [] }),
-      ),
-    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadResumeResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadResumeResponse__SubAgentSource };
-export const V2ThreadResumeResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadResumeResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadResumeResponse__ThreadExtra = {};
-export const V2ThreadResumeResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
-});
-
-export type V2ThreadResumeResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadResumeResponse__ThreadHistoryMode = Schema.Literals(["legacy", "paginated"]);
-
-export type V2ThreadResumeResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadResumeResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadResumeResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadResumeResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadResumeResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadResumeResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
-
-export type V2ThreadResumeResponse__TurnsPage = {
-  readonly backwardsCursor?: string | null;
-  readonly data: ReadonlyArray<V2ThreadResumeResponse__Turn>;
-  readonly nextCursor?: string | null;
-};
-export const V2ThreadResumeResponse__TurnsPage = Schema.Struct({
-  backwardsCursor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  data: Schema.Array(V2ThreadResumeResponse__Turn),
-  nextCursor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-});
-
-export type V2ThreadRollbackParams = { readonly numTurns: number; readonly threadId: string };
-export const V2ThreadRollbackParams = Schema.Struct({
-  numTurns: Schema.Number.annotate({
-    description:
-      "The number of turns to drop from the end of the thread. Must be >= 1.\n\nThis only modifies the thread's history and does not revert local file changes that have been made by the agent. Clients are responsible for reverting these changes.",
-    format: "uint32",
-  })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  threadId: Schema.String,
-}).annotate({
-  title: "ThreadRollbackParams",
-  description: "DEPRECATED: `thread/rollback` will be removed soon.",
-});
-
-export type V2ThreadRollbackResponse = {
-  readonly thread: {
-    readonly agentNickname?: string | null;
-    readonly agentRole?: string | null;
-    readonly cliVersion: string;
-    readonly createdAt: number;
-    readonly cwd: string;
-    readonly ephemeral: boolean;
-    readonly forkedFromId?: string | null;
-    readonly gitInfo?: V2ThreadRollbackResponse__GitInfo | null;
-    readonly id: string;
-    readonly modelProvider: string;
-    readonly name?: string | null;
-    readonly parentThreadId?: string | null;
-    readonly path?: string | null;
-    readonly preview: string;
-    readonly recencyAt?: number | null;
-    readonly sessionId: string;
-    readonly source:
-      | "cli"
-      | "vscode"
-      | "exec"
-      | "appServer"
-      | "unknown"
-      | { readonly custom: string }
-      | { readonly subAgent: V2ThreadRollbackResponse__SubAgentSource };
-    readonly status:
-      | { readonly type: "notLoaded" }
-      | { readonly type: "idle" }
-      | { readonly type: "systemError" }
-      | {
-          readonly activeFlags: ReadonlyArray<V2ThreadRollbackResponse__ThreadActiveFlag>;
-          readonly type: "active";
-        };
-    readonly threadSource?: V2ThreadRollbackResponse__ThreadSource | null;
-    readonly turns: ReadonlyArray<V2ThreadRollbackResponse__Turn>;
-    readonly updatedAt: number;
-  };
-};
-export const V2ThreadRollbackResponse = Schema.Struct({
-  thread: Schema.Struct({
-    agentNickname: Schema.optionalKey(
-      Schema.Union([
-        Schema.String.annotate({
-          description:
-            "Optional random unique nickname assigned to an AgentControl-spawned sub-agent.",
-        }),
-        Schema.Null,
-      ]),
-    ),
-    agentRole: Schema.optionalKey(
-      Schema.Union([
-        Schema.String.annotate({
-          description: "Optional role (agent_role) assigned to an AgentControl-spawned sub-agent.",
-        }),
-        Schema.Null,
-      ]),
-    ),
-    cliVersion: Schema.String.annotate({
-      description: "Version of the CLI that created the thread.",
-    }),
-    createdAt: Schema.Number.annotate({
-      description: "Unix timestamp (in seconds) when the thread was created.",
-      format: "int64",
-    }).check(Schema.isInt()),
-    cwd: Schema.String.annotate({
-      description:
-        "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-    }),
-    ephemeral: Schema.Boolean.annotate({
-      description: "Whether the thread is ephemeral and should not be materialized on disk.",
-    }),
-    forkedFromId: Schema.optionalKey(
-      Schema.Union([
-        Schema.String.annotate({
-          description: "Source thread id when this thread was created by forking another thread.",
-        }),
-        Schema.Null,
-      ]),
-    ),
-    gitInfo: Schema.optionalKey(
-      Schema.Union([V2ThreadRollbackResponse__GitInfo, Schema.Null]).annotate({
-        description: "Optional Git metadata captured when the thread was created.",
-      }),
-    ),
-    id: Schema.String.annotate({
-      description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
-    }),
-    modelProvider: Schema.String.annotate({
-      description: "Model provider used for this thread (for example, 'openai').",
-    }),
-    name: Schema.optionalKey(
-      Schema.Union([
-        Schema.String.annotate({ description: "Optional user-facing thread title." }),
-        Schema.Null,
-      ]),
-    ),
-    parentThreadId: Schema.optionalKey(
-      Schema.Union([
-        Schema.String.annotate({
-          description:
-            "The ID of the parent thread. This will only be set if this thread is a subagent.",
-        }),
-        Schema.Null,
-      ]),
-    ),
-    path: Schema.optionalKey(
-      Schema.Union([
-        Schema.String.annotate({ description: "[UNSTABLE] Path to the thread on disk." }),
-        Schema.Null,
-      ]),
-    ),
-    preview: Schema.String.annotate({
-      description: "Usually the first user message in the thread, if available.",
-    }),
-    recencyAt: Schema.optionalKey(
-      Schema.Union([
-        Schema.Number.annotate({
-          description: "Unix timestamp (in seconds) used for thread recency ordering.",
-          format: "int64",
-        }).check(Schema.isInt()),
-        Schema.Null,
-      ]),
-    ),
-    sessionId: Schema.String.annotate({
-      description: "Session id shared by threads that belong to the same session tree.",
-    }),
-    source: Schema.Union(
-      [
-        Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-        Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-        Schema.Struct({ subAgent: V2ThreadRollbackResponse__SubAgentSource }).annotate({
-          title: "SubAgentSessionSource",
-        }),
-      ],
-      { mode: "oneOf" },
-    ).annotate({
-      description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
-    }),
-    status: Schema.Union(
-      [
-        Schema.Struct({
-          type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-        }).annotate({ title: "NotLoadedThreadStatus" }),
-        Schema.Struct({
-          type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-        }).annotate({ title: "IdleThreadStatus" }),
-        Schema.Struct({
-          type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-        }).annotate({ title: "SystemErrorThreadStatus" }),
-        Schema.Struct({
-          activeFlags: Schema.Array(V2ThreadRollbackResponse__ThreadActiveFlag),
-          type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-        }).annotate({ title: "ActiveThreadStatus" }),
-      ],
-      { mode: "oneOf" },
-    ).annotate({ description: "Current runtime status for the thread." }),
-    threadSource: Schema.optionalKey(
-      Schema.Union([V2ThreadRollbackResponse__ThreadSource, Schema.Null]).annotate({
-        description: "Optional analytics source classification for this thread.",
-      }),
-    ),
-    turns: Schema.Array(V2ThreadRollbackResponse__Turn).annotate({
-      description:
-        "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
-    }),
-    updatedAt: Schema.Number.annotate({
-      description: "Unix timestamp (in seconds) when the thread was last updated.",
-      format: "int64",
-    }).check(Schema.isInt()),
-  }).annotate({
-    description:
-      "The updated thread after applying the rollback, with `turns` populated.\n\nThe ThreadItems stored in each Turn are lossy since we explicitly do not persist all agent interactions, such as command executions. This is the same behavior as `thread/resume`.",
-  }),
-}).annotate({ title: "ThreadRollbackResponse" });
-
-export type V2ThreadRollbackResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ThreadRollbackResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadRollbackResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadRollbackResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadRollbackResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadRollbackResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadRollbackResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadRollbackResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ThreadRollbackResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadRollbackResponse__SubAgentSource };
-export const V2ThreadRollbackResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadRollbackResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadRollbackResponse__Thread = {
-  readonly agentNickname?: string | null;
-  readonly agentRole?: string | null;
-  readonly cliVersion: string;
-  readonly createdAt: number;
-  readonly cwd: string;
-  readonly ephemeral: boolean;
-  readonly forkedFromId?: string | null;
-  readonly gitInfo?: V2ThreadRollbackResponse__GitInfo | null;
-  readonly id: string;
-  readonly modelProvider: string;
-  readonly name?: string | null;
-  readonly parentThreadId?: string | null;
-  readonly path?: string | null;
-  readonly preview: string;
-  readonly recencyAt?: number | null;
-  readonly sessionId: string;
-  readonly source:
-    | "cli"
-    | "vscode"
-    | "exec"
-    | "appServer"
-    | "unknown"
-    | { readonly custom: string }
-    | { readonly subAgent: V2ThreadRollbackResponse__SubAgentSource };
-  readonly status:
-    | { readonly type: "notLoaded" }
-    | { readonly type: "idle" }
-    | { readonly type: "systemError" }
-    | {
-        readonly activeFlags: ReadonlyArray<V2ThreadRollbackResponse__ThreadActiveFlag>;
-        readonly type: "active";
-      };
-  readonly threadSource?: V2ThreadRollbackResponse__ThreadSource | null;
-  readonly turns: ReadonlyArray<V2ThreadRollbackResponse__Turn>;
-  readonly updatedAt: number;
-};
-export const V2ThreadRollbackResponse__Thread = Schema.Struct({
-  agentNickname: Schema.optionalKey(
+  cwd: V2ThreadResumeResponse__AbsolutePathBuf,
+  disabledPluginIds: Schema.optionalKey(
+    Schema.Array(Schema.String).annotate({
+      description: "Saved list of disabled plugin IDs. Does not yet filter plugin capabilities.",
+      default: [],
+    }),
+  ),
+  instructionSources: Schema.optionalKey(
+    Schema.Array(V2ThreadResumeResponse__LegacyAppPathString).annotate({
+      description:
+        "Environment-native paths to instruction source files currently loaded for this thread.",
+      default: [],
+    }),
+  ),
+  itemsBackwardsCursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
         description:
-          "Optional random unique nickname assigned to an AgentControl-spawned sub-agent.",
+          'Opaque cursor for hydrating paginated items backwards.\n\nPass this as `cursor` to `thread/items/list` with `sortDirection: "desc"`. The first page includes the item identified by the cursor.',
       }),
       Schema.Null,
     ]),
   ),
-  agentRole: Schema.optionalKey(
+  model: Schema.String,
+  modelProvider: Schema.String,
+  reasoningEffort: Schema.optionalKey(
+    Schema.Union([V2ThreadResumeResponse__ReasoningEffort, Schema.Null]),
+  ),
+  sandbox: Schema.suspend(
+    (): Schema.Codec<V2ThreadResumeResponse__SandboxPolicy> =>
+      V2ThreadResumeResponse__SandboxPolicy,
+  ).annotate({
+    description:
+      "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `activePermissionProfile` for profile provenance.",
+  }),
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  thread: V2ThreadResumeResponse__Thread,
+  turnsBackwardsCursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Optional role (agent_role) assigned to an AgentControl-spawned sub-agent.",
+        description:
+          'Opaque cursor for hydrating paginated turns backwards.\n\nPass this as `cursor` to `thread/turns/list` with `sortDirection: "desc"`. The first page includes the turn identified by the cursor.',
       }),
       Schema.Null,
     ]),
   ),
-  cliVersion: Schema.String.annotate({
-    description: "Version of the CLI that created the thread.",
-  }),
-  createdAt: Schema.Number.annotate({
-    description: "Unix timestamp (in seconds) when the thread was created.",
-    format: "int64",
-  }).check(Schema.isInt()),
-  cwd: Schema.String.annotate({
-    description:
-      "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
-  }),
-  ephemeral: Schema.Boolean.annotate({
-    description: "Whether the thread is ephemeral and should not be materialized on disk.",
-  }),
-  forkedFromId: Schema.optionalKey(
+}).annotate({ title: "ThreadResumeResponse" });
+
+export type V2ThreadResumeResponse__ActivePermissionProfile = {
+  readonly extends?: string | null;
+  readonly id: string;
+};
+export const V2ThreadResumeResponse__ActivePermissionProfile = Schema.Struct({
+  extends: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
-        description: "Source thread id when this thread was created by forking another thread.",
+        description:
+          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
       }),
       Schema.Null,
     ]),
   ),
-  gitInfo: Schema.optionalKey(
-    Schema.Union([V2ThreadRollbackResponse__GitInfo, Schema.Null]).annotate({
-      description: "Optional Git metadata captured when the thread was created.",
-    }),
-  ),
   id: Schema.String.annotate({
-    description: "Identifier for this thread. Codex-generated thread IDs are UUIDv7.",
+    description:
+      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
   }),
-  modelProvider: Schema.String.annotate({
-    description: "Model provider used for this thread (for example, 'openai').",
+});
+
+export type V2ThreadResumeResponse__MultiAgentMode =
+  | "explicitRequestOnly"
+  | "proactive"
+  | { readonly custom: string };
+export const V2ThreadResumeResponse__MultiAgentMode = Schema.Union(
+  [
+    Schema.Literals(["explicitRequestOnly", "proactive"]),
+    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomMultiAgentMode" }),
+  ],
+  { mode: "oneOf" },
+).annotate({
+  description:
+    "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
+});
+
+export type V2ThreadResumeResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadResumeResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadResumeResponse__LegacyAppPathString>;
+};
+export const V2ThreadResumeResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadResumeResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadResumeResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
+});
+
+export type V2ThreadResumeResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadResumeResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
+
+export type V2ThreadResumeResponse__TurnsPage = {
+  readonly backwardsCursor?: string | null;
+  readonly data: ReadonlyArray<V2ThreadResumeResponse__Turn>;
+  readonly nextCursor?: string | null;
+};
+export const V2ThreadResumeResponse__TurnsPage = Schema.Struct({
+  backwardsCursor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  data: Schema.Array(V2ThreadResumeResponse__Turn),
+  nextCursor: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+});
+
+export type V2ThreadRevertedNotification = { readonly threadId: string };
+export const V2ThreadRevertedNotification = Schema.Struct({ threadId: Schema.String }).annotate({
+  title: "ThreadRevertedNotification",
+});
+
+export type V2ThreadRevertParams = { readonly beforeTurnId: string; readonly threadId: string };
+export const V2ThreadRevertParams = Schema.Struct({
+  beforeTurnId: Schema.String.annotate({
+    description: "Turn excluded from the replacement history, together with every later turn.",
   }),
-  name: Schema.optionalKey(
+  threadId: Schema.String,
+}).annotate({
+  title: "ThreadRevertParams",
+  description:
+    "Replace a paginated thread's durable history with the prefix before one turn.\n\nThis only changes persisted conversation history. It does not revert local file changes.",
+});
+
+export type V2ThreadRevertResponse = {
+  readonly itemsBackwardsCursor?: string | null;
+  readonly thread: V2ThreadRevertResponse__Thread;
+  readonly turnsBackwardsCursor?: string | null;
+};
+export const V2ThreadRevertResponse = Schema.Struct({
+  itemsBackwardsCursor: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "Optional user-facing thread title." }),
+      Schema.String.annotate({
+        description:
+          'Opaque cursor for hydrating paginated items backwards.\n\nPass this as `cursor` to `thread/items/list` with `sortDirection: "desc"`. The first page includes the item identified by the cursor.',
+      }),
       Schema.Null,
     ]),
   ),
-  parentThreadId: Schema.optionalKey(
+  thread: Schema.suspend(
+    (): Schema.Codec<V2ThreadRevertResponse__Thread> => V2ThreadRevertResponse__Thread,
+  ).annotate({
+    description:
+      "Updated loaded thread metadata. `turns` is always empty; hydrate retained history through `thread/turns/list`.",
+  }),
+  turnsBackwardsCursor: Schema.optionalKey(
     Schema.Union([
       Schema.String.annotate({
         description:
-          "The ID of the parent thread. This will only be set if this thread is a subagent.",
+          'Opaque cursor for hydrating paginated turns backwards.\n\nPass this as `cursor` to `thread/turns/list` with `sortDirection: "desc"`. The first page includes the turn identified by the cursor.',
       }),
       Schema.Null,
     ]),
   ),
-  path: Schema.optionalKey(
+}).annotate({ title: "ThreadRevertResponse" });
+
+export type V2ThreadRevertResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadRevertResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadRevertResponse__LegacyAppPathString>;
+};
+export const V2ThreadRevertResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadRevertResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadRevertResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
+});
+
+export type V2ThreadRevertResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadRevertResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
+
+export type V2ThreadSectionCreateParams = {
+  readonly appearance?: V2ThreadSectionCreateParams__ThreadSectionAppearance | null;
+  readonly name: string;
+};
+export const V2ThreadSectionCreateParams = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadSectionCreateParams__ThreadSectionAppearance, Schema.Null]),
+  ),
+  name: Schema.String.annotate({ description: "The user-visible name of the section." }),
+}).annotate({
+  title: "ThreadSectionCreateParams",
+  description: "Parameters for creating an independently persisted thread section.",
+});
+
+export type V2ThreadSectionCreateResponse = {
+  readonly section: V2ThreadSectionCreateResponse__ThreadSection;
+};
+export const V2ThreadSectionCreateResponse = Schema.Struct({
+  section: V2ThreadSectionCreateResponse__ThreadSection,
+}).annotate({
+  title: "ThreadSectionCreateResponse",
+  description: "The independently persisted section created by the server.",
+});
+
+export type V2ThreadSectionDeleteParams = { readonly sectionId: string };
+export const V2ThreadSectionDeleteParams = Schema.Struct({
+  sectionId: Schema.String.annotate({
+    description: "The stable, server-generated identity of the section to delete.",
+  }),
+}).annotate({
+  title: "ThreadSectionDeleteParams",
+  description: "Parameters for deleting an independently persisted thread section.",
+});
+
+export type V2ThreadSectionDeleteResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadSectionDeleteResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({
+  title: "ThreadSectionDeleteResponse",
+  description: "Successful deletion does not return additional section data.",
+});
+
+export type V2ThreadSectionListParams = {
+  readonly cursor?: string | null;
+  readonly limit?: number | null;
+};
+export const V2ThreadSectionListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
     Schema.Union([
-      Schema.String.annotate({ description: "[UNSTABLE] Path to the thread on disk." }),
+      Schema.String.annotate({
+        description: "Opaque pagination cursor returned by a previous call.",
+      }),
       Schema.Null,
     ]),
   ),
-  preview: Schema.String.annotate({
-    description: "Usually the first user message in the thread, if available.",
-  }),
-  recencyAt: Schema.optionalKey(
+  limit: Schema.optionalKey(
     Schema.Union([
       Schema.Number.annotate({
-        description: "Unix timestamp (in seconds) used for thread recency ordering.",
-        format: "int64",
-      }).check(Schema.isInt()),
+        description: "Maximum number of sections to return.",
+        format: "uint32",
+      })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
       Schema.Null,
     ]),
   ),
-  sessionId: Schema.String.annotate({
-    description: "Session id shared by threads that belong to the same session tree.",
-  }),
-  source: Schema.Union(
-    [
-      Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-      Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-      Schema.Struct({ subAgent: V2ThreadRollbackResponse__SubAgentSource }).annotate({
-        title: "SubAgentSessionSource",
+}).annotate({
+  title: "ThreadSectionListParams",
+  description: "Parameters for listing independently persisted thread sections.",
+});
+
+export type V2ThreadSectionListResponse = {
+  readonly data: ReadonlyArray<V2ThreadSectionListResponse__ThreadSection>;
+  readonly nextCursor?: string | null;
+};
+export const V2ThreadSectionListResponse = Schema.Struct({
+  data: Schema.Array(V2ThreadSectionListResponse__ThreadSection),
+  nextCursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Opaque cursor for the next page, or `null` when no sections remain.",
       }),
-    ],
-    { mode: "oneOf" },
-  ).annotate({
-    description: "Origin of the thread (CLI, VSCode, codex exec, codex app-server, etc.).",
-  }),
-  status: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-      }).annotate({ title: "NotLoadedThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-      }).annotate({ title: "IdleThreadStatus" }),
-      Schema.Struct({
-        type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-      }).annotate({ title: "SystemErrorThreadStatus" }),
-      Schema.Struct({
-        activeFlags: Schema.Array(V2ThreadRollbackResponse__ThreadActiveFlag),
-        type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-      }).annotate({ title: "ActiveThreadStatus" }),
-    ],
-    { mode: "oneOf" },
-  ).annotate({ description: "Current runtime status for the thread." }),
-  threadSource: Schema.optionalKey(
-    Schema.Union([V2ThreadRollbackResponse__ThreadSource, Schema.Null]).annotate({
-      description: "Optional analytics source classification for this thread.",
-    }),
+      Schema.Null,
+    ]),
   ),
-  turns: Schema.Array(V2ThreadRollbackResponse__Turn).annotate({
-    description:
-      "Only populated on `thread/resume`, `thread/rollback`, `thread/fork`, and `thread/read` (when `includeTurns` is true) responses. For all other responses and notifications returning a Thread, the turns field will be an empty list.",
-  }),
-  updatedAt: Schema.Number.annotate({
-    description: "Unix timestamp (in seconds) when the thread was last updated.",
-    format: "int64",
-  }).check(Schema.isInt()),
+}).annotate({
+  title: "ThreadSectionListResponse",
+  description: "One page of independently persisted thread sections.",
 });
 
-export type V2ThreadRollbackResponse__ThreadExtra = {};
-export const V2ThreadRollbackResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export type V2ThreadSectionMoveParams = {
+  readonly beforeThreadId?: string | null;
+  readonly sectionId: string | null;
+  readonly threadId: string;
+};
+export const V2ThreadSectionMoveParams = Schema.Struct({
+  beforeThreadId: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Existing thread to insert before; omission or null appends to the section.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  sectionId: Schema.Union([
+    Schema.String.annotate({
+      description: "Destination section, or `null` to remove the thread from its section.",
+    }),
+    Schema.Null,
+  ]),
+  threadId: Schema.String.annotate({
+    description: "Thread to move into, within, or out of a section.",
+  }),
+}).annotate({
+  title: "ThreadSectionMoveParams",
+  description: "Parameters for moving a thread within a server-owned section ordering.",
 });
 
-export type V2ThreadRollbackResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadRollbackResponse__ThreadHistoryMode = Schema.Literals(["legacy", "paginated"]);
+export type V2ThreadSectionMoveResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadSectionMoveResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadSectionMoveResponse" });
 
-export type V2ThreadRollbackResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadRollbackResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadRollbackResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadRollbackResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
+export type V2ThreadSectionUpdateParams = {
+  readonly appearance?: V2ThreadSectionUpdateParams__ThreadSectionAppearance | null;
+  readonly name: string;
+  readonly sectionId: string;
+};
+export const V2ThreadSectionUpdateParams = Schema.Struct({
+  appearance: Schema.optionalKey(
+    Schema.Union([V2ThreadSectionUpdateParams__ThreadSectionAppearance, Schema.Null]).annotate({
+      description: "Omit to preserve appearance, use `null` to clear it, or provide a replacement.",
+    }),
+  ),
+  name: Schema.String.annotate({ description: "The updated user-visible name of the section." }),
+  sectionId: Schema.String.annotate({
+    description: "The stable, server-generated identity of the section to update.",
+  }),
+}).annotate({
+  title: "ThreadSectionUpdateParams",
+  description: "Parameters for updating an independently persisted thread section.",
+});
 
-export type V2ThreadRollbackResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadRollbackResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
+export type V2ThreadSectionUpdateResponse = {
+  readonly section: V2ThreadSectionUpdateResponse__ThreadSection;
+};
+export const V2ThreadSectionUpdateResponse = Schema.Struct({
+  section: V2ThreadSectionUpdateResponse__ThreadSection,
+}).annotate({
+  title: "ThreadSectionUpdateResponse",
+  description: "The independently persisted section after its name is updated.",
+});
 
 export type V2ThreadSetNameParams = { readonly name: string; readonly threadId: string };
 export const V2ThreadSetNameParams = Schema.Struct({
@@ -42322,10 +56231,11 @@ export const V2ThreadSetNameParams = Schema.Struct({
   threadId: Schema.String,
 }).annotate({ title: "ThreadSetNameParams" });
 
-export type V2ThreadSetNameResponse = {};
-export const V2ThreadSetNameResponse = Schema.Struct({}).annotate({
-  title: "ThreadSetNameResponse",
-});
+export type V2ThreadSetNameResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadSetNameResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadSetNameResponse" });
 
 export type V2ThreadSettingsUpdatedNotification = {
   readonly threadId: string;
@@ -42351,159 +56261,64 @@ export const V2ThreadSettingsUpdatedNotification__MultiAgentMode = Schema.Union(
     "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
 });
 
-export type V2ThreadSettingsUpdatedNotification__NetworkAccess = "restricted" | "enabled";
-export const V2ThreadSettingsUpdatedNotification__NetworkAccess = Schema.Literals([
-  "restricted",
-  "enabled",
-]);
-
-export type V2ThreadShellCommandParams = { readonly command: string; readonly threadId: string };
+export type V2ThreadShellCommandParams = {
+  readonly command: string;
+  readonly threadId: string;
+  readonly timeoutMs?: number | null;
+};
 export const V2ThreadShellCommandParams = Schema.Struct({
   command: Schema.String.annotate({
     description:
       "Shell command string evaluated by the thread's configured shell. Unlike `command/exec`, this intentionally preserves shell syntax such as pipes, redirects, and quoting. This runs unsandboxed with full access rather than inheriting the thread sandbox policy.",
   }),
   threadId: Schema.String,
+  timeoutMs: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({
+        description:
+          "Maximum execution time in milliseconds. Defaults to one hour when omitted or null. Must be non-negative; zero requests an immediate timeout, not unlimited execution. Does not affect the immediate RPC acknowledgement.",
+        format: "int64",
+      }).check(Schema.isInt().annotate({ expected: "an integer" })),
+      Schema.Null,
+    ]),
+  ),
 }).annotate({ title: "ThreadShellCommandParams" });
 
-export type V2ThreadShellCommandResponse = {};
-export const V2ThreadShellCommandResponse = Schema.Struct({}).annotate({
-  title: "ThreadShellCommandResponse",
-});
+export type V2ThreadShellCommandResponse = { readonly [x: string]: Schema.Json };
+export const V2ThreadShellCommandResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "ThreadShellCommandResponse" });
 
 export type V2ThreadStartedNotification = { readonly thread: V2ThreadStartedNotification__Thread };
 export const V2ThreadStartedNotification = Schema.Struct({
   thread: V2ThreadStartedNotification__Thread,
 }).annotate({ title: "ThreadStartedNotification" });
 
-export type V2ThreadStartedNotification__ByteRange = {
-  readonly end: number;
-  readonly start: number;
+export type V2ThreadStartedNotification__ThreadEnvironment = {
+  readonly cwd: V2ThreadStartedNotification__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadStartedNotification__LegacyAppPathString>;
 };
-export const V2ThreadStartedNotification__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadStartedNotification__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadStartedNotification__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadStartedNotification__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadStartedNotification__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadStartedNotification__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadStartedNotification__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ThreadStartedNotification__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadStartedNotification__SubAgentSource };
-export const V2ThreadStartedNotification__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadStartedNotification__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartedNotification__ThreadExtra = {};
-export const V2ThreadStartedNotification__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export const V2ThreadStartedNotification__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadStartedNotification__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadStartedNotification__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
 });
 
-export type V2ThreadStartedNotification__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadStartedNotification__ThreadHistoryMode = Schema.Literals([
-  "legacy",
-  "paginated",
-]);
-
-export type V2ThreadStartedNotification__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadStartedNotification__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadStartedNotification__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadStartedNotification__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartedNotification__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadStartedNotification__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
+export type V2ThreadStartedNotification__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadStartedNotification__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
 export type V2ThreadStartParams = {
   readonly approvalPolicy?: V2ThreadStartParams__AskForApproval | null;
   readonly approvalsReviewer?: V2ThreadStartParams__ApprovalsReviewer | null;
   readonly baseInstructions?: string | null;
-  readonly config?: { readonly [x: string]: unknown } | null;
+  readonly config?: { readonly [x: string]: Schema.Json } | null;
   readonly cwd?: string | null;
   readonly developerInstructions?: string | null;
   readonly ephemeral?: boolean | null;
@@ -42528,14 +56343,21 @@ export const V2ThreadStartParams = Schema.Struct({
   ),
   baseInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   config: Schema.optionalKey(
-    Schema.Union([Schema.Record(Schema.String, Schema.Unknown), Schema.Null]),
+    Schema.Union([
+      Schema.Record(Schema.String, Schema.Json.annotate({ expected: "JSON value" })),
+      Schema.Null,
+    ]),
   ),
   cwd: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   developerInstructions: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   ephemeral: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
   model: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   modelProvider: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  personality: Schema.optionalKey(Schema.Union([V2ThreadStartParams__Personality, Schema.Null])),
+  personality: Schema.optionalKey(
+    Schema.Union([V2ThreadStartParams__Personality, Schema.Null]).annotate({
+      description: "@deprecated `friendly` and `pragmatic` no longer select a style.",
+    }),
+  ),
   sandbox: Schema.optionalKey(Schema.Union([V2ThreadStartParams__SandboxMode, Schema.Null])),
   serviceName: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
   serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
@@ -42555,34 +56377,11 @@ export const V2ThreadStartParams__AbsolutePathBuf = Schema.String.annotate({
     "A path that is guaranteed to be absolute and normalized (though it is not guaranteed to be canonicalized or exist on the filesystem).\n\nIMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set using [AbsolutePathBufGuard::new]. If no base path is set, the deserialization will fail unless the path being deserialized is already absolute.",
 });
 
-export type V2ThreadStartParams__CapabilityRootLocation = {
-  readonly environmentId: string;
-  readonly path: string;
-  readonly type: "environment";
-};
-export const V2ThreadStartParams__CapabilityRootLocation = Schema.Union(
-  [
-    Schema.Struct({
-      environmentId: Schema.String,
-      path: Schema.String.annotate({
-        description: "Absolute path for the root in the selected environment.",
-      }),
-      type: Schema.Literal("environment").annotate({
-        title: "EnvironmentCapabilityRootLocationType",
-      }),
-    }).annotate({
-      title: "EnvironmentCapabilityRootLocation",
-      description: "A path owned by an execution environment.",
-    }),
-  ],
-  { mode: "oneOf" },
-).annotate({ description: "Location used to resolve a selected capability root." });
-
 export type V2ThreadStartParams__DynamicToolSpec =
   | {
       readonly deferLoading?: boolean;
       readonly description: string;
-      readonly inputSchema: unknown;
+      readonly inputSchema: Schema.Json;
       readonly name: string;
       readonly type: "function";
     }
@@ -42597,7 +56396,7 @@ export const V2ThreadStartParams__DynamicToolSpec = Schema.Union(
     Schema.Struct({
       deferLoading: Schema.optionalKey(Schema.Boolean),
       description: Schema.String,
-      inputSchema: Schema.Unknown,
+      inputSchema: Schema.Json.annotate({ expected: "JSON value" }),
       name: Schema.String,
       type: Schema.Literal("function").annotate({ title: "FunctionDynamicToolSpecType" }),
     }).annotate({ title: "FunctionDynamicToolSpec" }),
@@ -42628,33 +56427,16 @@ export const V2ThreadStartParams__MultiAgentMode = Schema.Union(
 
 export type V2ThreadStartParams__SelectedCapabilityRoot = {
   readonly id: string;
-  readonly location: {
-    readonly environmentId: string;
-    readonly path: string;
-    readonly type: "environment";
-  };
+  readonly location: V2ThreadStartParams__CapabilityRootLocation;
 };
 export const V2ThreadStartParams__SelectedCapabilityRoot = Schema.Struct({
   id: Schema.String.annotate({
     description: "Stable identifier supplied by the capability selection platform.",
   }),
-  location: Schema.Union(
-    [
-      Schema.Struct({
-        environmentId: Schema.String,
-        path: Schema.String.annotate({
-          description: "Absolute path for the root in the selected environment.",
-        }),
-        type: Schema.Literal("environment").annotate({
-          title: "EnvironmentCapabilityRootLocationType",
-        }),
-      }).annotate({
-        title: "EnvironmentCapabilityRootLocation",
-        description: "A path owned by an execution environment.",
-      }),
-    ],
-    { mode: "oneOf" },
-  ).annotate({ description: "Location used to resolve a selected capability root." }),
+  location: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartParams__CapabilityRootLocation> =>
+      V2ThreadStartParams__CapabilityRootLocation,
+  ).annotate({ description: "Where the selected root can be resolved." }),
 }).annotate({
   description: "A user-selected root that can expose one or more runtime capabilities.",
 });
@@ -42682,33 +56464,30 @@ export const V2ThreadStartParams__TurnEnvironmentParams = Schema.Struct({
 
 export type V2ThreadStartResponse = {
   readonly approvalPolicy: V2ThreadStartResponse__AskForApproval;
-  readonly approvalsReviewer: "user" | "auto_review" | "guardian_subagent";
+  readonly approvalsReviewer: V2ThreadStartResponse__ApprovalsReviewer;
   readonly cwd: V2ThreadStartResponse__AbsolutePathBuf;
+  readonly disabledPluginIds?: ReadonlyArray<string>;
   readonly instructionSources?: ReadonlyArray<V2ThreadStartResponse__LegacyAppPathString>;
   readonly model: string;
   readonly modelProvider: string;
   readonly reasoningEffort?: V2ThreadStartResponse__ReasoningEffort | null;
-  readonly sandbox:
-    | { readonly type: "dangerFullAccess" }
-    | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-    | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-    | {
-        readonly excludeSlashTmp?: boolean;
-        readonly excludeTmpdirEnvVar?: boolean;
-        readonly networkAccess?: boolean;
-        readonly type: "workspaceWrite";
-        readonly writableRoots?: ReadonlyArray<V2ThreadStartResponse__AbsolutePathBuf>;
-      };
+  readonly sandbox: V2ThreadStartResponse__SandboxPolicy;
   readonly serviceTier?: string | null;
   readonly thread: V2ThreadStartResponse__Thread;
 };
 export const V2ThreadStartResponse = Schema.Struct({
   approvalPolicy: V2ThreadStartResponse__AskForApproval,
-  approvalsReviewer: Schema.Literals(["user", "auto_review", "guardian_subagent"]).annotate({
-    description:
-      "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-  }),
+  approvalsReviewer: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartResponse__ApprovalsReviewer> =>
+      V2ThreadStartResponse__ApprovalsReviewer,
+  ).annotate({ description: "Reviewer currently used for approval requests on this thread." }),
   cwd: V2ThreadStartResponse__AbsolutePathBuf,
+  disabledPluginIds: Schema.optionalKey(
+    Schema.Array(Schema.String).annotate({
+      description: "Saved list of disabled plugin IDs. Does not yet filter plugin capabilities.",
+      default: [],
+    }),
+  ),
   instructionSources: Schema.optionalKey(
     Schema.Array(V2ThreadStartResponse__LegacyAppPathString).annotate({
       description:
@@ -42721,131 +56500,35 @@ export const V2ThreadStartResponse = Schema.Struct({
   reasoningEffort: Schema.optionalKey(
     Schema.Union([V2ThreadStartResponse__ReasoningEffort, Schema.Null]),
   ),
-  sandbox: Schema.Union(
-    [
-      Schema.Struct({
-        type: Schema.Literal("dangerFullAccess").annotate({
-          title: "DangerFullAccessSandboxPolicyType",
-        }),
-      }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-      Schema.Struct({
-        networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-      }).annotate({ title: "ReadOnlySandboxPolicy" }),
-      Schema.Struct({
-        networkAccess: Schema.optionalKey(
-          Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-        ),
-        type: Schema.Literal("externalSandbox").annotate({
-          title: "ExternalSandboxSandboxPolicyType",
-        }),
-      }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-      Schema.Struct({
-        excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-        type: Schema.Literal("workspaceWrite").annotate({
-          title: "WorkspaceWriteSandboxPolicyType",
-        }),
-        writableRoots: Schema.optionalKey(
-          Schema.Array(V2ThreadStartResponse__AbsolutePathBuf).annotate({ default: [] }),
-        ),
-      }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
-    ],
-    { mode: "oneOf" },
+  sandbox: Schema.suspend(
+    (): Schema.Codec<V2ThreadStartResponse__SandboxPolicy> => V2ThreadStartResponse__SandboxPolicy,
   ).annotate({
-    description:
-      "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `activePermissionProfile` for profile provenance.",
-  }),
-  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
-  thread: V2ThreadStartResponse__Thread,
-}).annotate({ title: "ThreadStartResponse" });
-
-export type V2ThreadStartResponse__ActivePermissionProfile = {
-  readonly extends?: string | null;
-  readonly id: string;
-};
-export const V2ThreadStartResponse__ActivePermissionProfile = Schema.Struct({
-  extends: Schema.optionalKey(
-    Schema.Union([
-      Schema.String.annotate({
-        description:
-          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
-      }),
-      Schema.Null,
-    ]),
-  ),
-  id: Schema.String.annotate({
-    description:
-      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
-  }),
-});
-
-export type V2ThreadStartResponse__ApprovalsReviewer = "user" | "auto_review" | "guardian_subagent";
-export const V2ThreadStartResponse__ApprovalsReviewer = Schema.Literals([
-  "user",
-  "auto_review",
-  "guardian_subagent",
-]).annotate({
-  description:
-    "Configures who approval requests are routed to for review. Examples include sandbox escapes, blocked network access, MCP approval prompts, and ARC escalations. Defaults to `user`. `auto_review` uses a carefully prompted subagent to gather relevant context and apply a risk-based decision framework before approving or denying the request. The legacy value `guardian_subagent` is accepted for compatibility.",
-});
-
-export type V2ThreadStartResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ThreadStartResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadStartResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadStartResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadStartResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadStartResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
+    description:
+      "Legacy sandbox policy retained for compatibility. Experimental clients should prefer `activePermissionProfile` for profile provenance.",
+  }),
+  serviceTier: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
+  thread: V2ThreadStartResponse__Thread,
+}).annotate({ title: "ThreadStartResponse" });
 
-export type V2ThreadStartResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadStartResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
+export type V2ThreadStartResponse__ActivePermissionProfile = {
+  readonly extends?: string | null;
+  readonly id: string;
+};
+export const V2ThreadStartResponse__ActivePermissionProfile = Schema.Struct({
+  extends: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Parent profile identifier from the selected permissions profile's `extends` setting, when present.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  id: Schema.String.annotate({
+    description:
+      "Identifier from `default_permissions` or the implicit built-in default, such as `:workspace` or a user-defined `[permissions.<id>]` profile.",
+  }),
+});
 
 export type V2ThreadStartResponse__MultiAgentMode =
   | "explicitRequestOnly"
@@ -42862,112 +56545,24 @@ export const V2ThreadStartResponse__MultiAgentMode = Schema.Union(
     "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
 });
 
-export type V2ThreadStartResponse__NetworkAccess = "restricted" | "enabled";
-export const V2ThreadStartResponse__NetworkAccess = Schema.Literals(["restricted", "enabled"]);
-
-export type V2ThreadStartResponse__SandboxPolicy =
-  | { readonly type: "dangerFullAccess" }
-  | { readonly networkAccess?: boolean; readonly type: "readOnly" }
-  | { readonly networkAccess?: "restricted" | "enabled"; readonly type: "externalSandbox" }
-  | {
-      readonly excludeSlashTmp?: boolean;
-      readonly excludeTmpdirEnvVar?: boolean;
-      readonly networkAccess?: boolean;
-      readonly type: "workspaceWrite";
-      readonly writableRoots?: ReadonlyArray<V2ThreadStartResponse__AbsolutePathBuf>;
-    };
-export const V2ThreadStartResponse__SandboxPolicy = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("dangerFullAccess").annotate({
-        title: "DangerFullAccessSandboxPolicyType",
-      }),
-    }).annotate({ title: "DangerFullAccessSandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("readOnly").annotate({ title: "ReadOnlySandboxPolicyType" }),
-    }).annotate({ title: "ReadOnlySandboxPolicy" }),
-    Schema.Struct({
-      networkAccess: Schema.optionalKey(
-        Schema.Literals(["restricted", "enabled"]).annotate({ default: "restricted" }),
-      ),
-      type: Schema.Literal("externalSandbox").annotate({
-        title: "ExternalSandboxSandboxPolicyType",
-      }),
-    }).annotate({ title: "ExternalSandboxSandboxPolicy" }),
-    Schema.Struct({
-      excludeSlashTmp: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      excludeTmpdirEnvVar: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      networkAccess: Schema.optionalKey(Schema.Boolean.annotate({ default: false })),
-      type: Schema.Literal("workspaceWrite").annotate({ title: "WorkspaceWriteSandboxPolicyType" }),
-      writableRoots: Schema.optionalKey(
-        Schema.Array(V2ThreadStartResponse__AbsolutePathBuf).annotate({ default: [] }),
-      ),
-    }).annotate({ title: "WorkspaceWriteSandboxPolicy" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadStartResponse__SubAgentSource };
-export const V2ThreadStartResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadStartResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartResponse__ThreadExtra = {};
-export const V2ThreadStartResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export type V2ThreadStartResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadStartResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadStartResponse__LegacyAppPathString>;
+};
+export const V2ThreadStartResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadStartResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadStartResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
 });
 
-export type V2ThreadStartResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadStartResponse__ThreadHistoryMode = Schema.Literals(["legacy", "paginated"]);
-
-export type V2ThreadStartResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadStartResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadStartResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadStartResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadStartResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadStartResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
+export type V2ThreadStartResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadStartResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
 export type V2ThreadStatusChangedNotification = {
   readonly status: V2ThreadStatusChangedNotification__ThreadStatus;
@@ -42989,6 +56584,74 @@ export const V2ThreadTokenUsageUpdatedNotification = Schema.Struct({
   turnId: Schema.String,
 }).annotate({ title: "ThreadTokenUsageUpdatedNotification" });
 
+export type V2ThreadTurnsListParams = {
+  readonly cursor?: string | null;
+  readonly itemsView?: V2ThreadTurnsListParams__TurnItemsView | null;
+  readonly limit?: number | null;
+  readonly sortDirection?: V2ThreadTurnsListParams__SortDirection | null;
+  readonly threadId: string;
+};
+export const V2ThreadTurnsListParams = Schema.Struct({
+  cursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description: "Opaque cursor to pass to the next call to continue after the last turn.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  itemsView: Schema.optionalKey(
+    Schema.Union([V2ThreadTurnsListParams__TurnItemsView, Schema.Null]).annotate({
+      description: "How much item detail to include for each returned turn; defaults to summary.",
+    }),
+  ),
+  limit: Schema.optionalKey(
+    Schema.Union([
+      Schema.Number.annotate({ description: "Optional turn page size.", format: "uint32" })
+        .check(Schema.isInt().annotate({ expected: "an integer" }))
+        .check(
+          Schema.isGreaterThanOrEqualTo(0).annotate({
+            expected: "a value greater than or equal to 0",
+          }),
+        ),
+      Schema.Null,
+    ]),
+  ),
+  sortDirection: Schema.optionalKey(
+    Schema.Union([V2ThreadTurnsListParams__SortDirection, Schema.Null]).annotate({
+      description: "Optional turn pagination direction; defaults to descending.",
+    }),
+  ),
+  threadId: Schema.String,
+}).annotate({ title: "ThreadTurnsListParams" });
+
+export type V2ThreadTurnsListResponse = {
+  readonly backwardsCursor?: string | null;
+  readonly data: ReadonlyArray<V2ThreadTurnsListResponse__Turn>;
+  readonly nextCursor?: string | null;
+};
+export const V2ThreadTurnsListResponse = Schema.Struct({
+  backwardsCursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Opaque cursor to pass as `cursor` when reversing `sortDirection`. This is only populated when the page contains at least one turn. Use it with the opposite `sortDirection` to include the anchor turn again and catch updates to that turn.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+  data: Schema.Array(V2ThreadTurnsListResponse__Turn),
+  nextCursor: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Opaque cursor to pass to the next call to continue after the last turn. if None, there are no more turns to return.",
+      }),
+      Schema.Null,
+    ]),
+  ),
+}).annotate({ title: "ThreadTurnsListResponse" });
+
 export type V2ThreadUnarchivedNotification = { readonly threadId: string };
 export const V2ThreadUnarchivedNotification = Schema.Struct({ threadId: Schema.String }).annotate({
   title: "ThreadUnarchivedNotification",
@@ -43004,125 +56667,24 @@ export const V2ThreadUnarchiveResponse = Schema.Struct({
   thread: V2ThreadUnarchiveResponse__Thread,
 }).annotate({ title: "ThreadUnarchiveResponse" });
 
-export type V2ThreadUnarchiveResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2ThreadUnarchiveResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2ThreadUnarchiveResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2ThreadUnarchiveResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2ThreadUnarchiveResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2ThreadUnarchiveResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2ThreadUnarchiveResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2ThreadUnarchiveResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2ThreadUnarchiveResponse__SessionSource =
-  | "cli"
-  | "vscode"
-  | "exec"
-  | "appServer"
-  | "unknown"
-  | { readonly custom: string }
-  | { readonly subAgent: V2ThreadUnarchiveResponse__SubAgentSource };
-export const V2ThreadUnarchiveResponse__SessionSource = Schema.Union(
-  [
-    Schema.Literals(["cli", "vscode", "exec", "appServer", "unknown"]),
-    Schema.Struct({ custom: Schema.String }).annotate({ title: "CustomSessionSource" }),
-    Schema.Struct({ subAgent: V2ThreadUnarchiveResponse__SubAgentSource }).annotate({
-      title: "SubAgentSessionSource",
-    }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadUnarchiveResponse__ThreadExtra = {};
-export const V2ThreadUnarchiveResponse__ThreadExtra = Schema.Struct({}).annotate({
-  description: "Extra app-server data for a thread.",
+export type V2ThreadUnarchiveResponse__ThreadEnvironment = {
+  readonly cwd: V2ThreadUnarchiveResponse__LegacyAppPathString;
+  readonly environmentId: string;
+  readonly runtimeWorkspaceRoots: ReadonlyArray<V2ThreadUnarchiveResponse__LegacyAppPathString>;
+};
+export const V2ThreadUnarchiveResponse__ThreadEnvironment = Schema.Struct({
+  cwd: V2ThreadUnarchiveResponse__LegacyAppPathString,
+  environmentId: Schema.String,
+  runtimeWorkspaceRoots: Schema.Array(V2ThreadUnarchiveResponse__LegacyAppPathString),
+}).annotate({
+  description: "An environment selected by a loaded thread, independent of connection status.",
 });
 
-export type V2ThreadUnarchiveResponse__ThreadHistoryMode = "legacy" | "paginated";
-export const V2ThreadUnarchiveResponse__ThreadHistoryMode = Schema.Literals([
-  "legacy",
-  "paginated",
-]);
-
-export type V2ThreadUnarchiveResponse__ThreadStatus =
-  | { readonly type: "notLoaded" }
-  | { readonly type: "idle" }
-  | { readonly type: "systemError" }
-  | {
-      readonly activeFlags: ReadonlyArray<V2ThreadUnarchiveResponse__ThreadActiveFlag>;
-      readonly type: "active";
-    };
-export const V2ThreadUnarchiveResponse__ThreadStatus = Schema.Union(
-  [
-    Schema.Struct({
-      type: Schema.Literal("notLoaded").annotate({ title: "NotLoadedThreadStatusType" }),
-    }).annotate({ title: "NotLoadedThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("idle").annotate({ title: "IdleThreadStatusType" }),
-    }).annotate({ title: "IdleThreadStatus" }),
-    Schema.Struct({
-      type: Schema.Literal("systemError").annotate({ title: "SystemErrorThreadStatusType" }),
-    }).annotate({ title: "SystemErrorThreadStatus" }),
-    Schema.Struct({
-      activeFlags: Schema.Array(V2ThreadUnarchiveResponse__ThreadActiveFlag),
-      type: Schema.Literal("active").annotate({ title: "ActiveThreadStatusType" }),
-    }).annotate({ title: "ActiveThreadStatus" }),
-  ],
-  { mode: "oneOf" },
-);
-
-export type V2ThreadUnarchiveResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2ThreadUnarchiveResponse__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
+export type V2ThreadUnarchiveResponse__ThreadExtra = { readonly [x: string]: Schema.Json };
+export const V2ThreadUnarchiveResponse__ThreadExtra = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ description: "Extra app-server data for a thread." });
 
 export type V2ThreadUnsubscribeParams = { readonly threadId: string };
 export const V2ThreadUnsubscribeParams = Schema.Struct({ threadId: Schema.String }).annotate({
@@ -43145,72 +56707,6 @@ export const V2TurnCompletedNotification = Schema.Struct({
   turn: V2TurnCompletedNotification__Turn,
 }).annotate({ title: "TurnCompletedNotification" });
 
-export type V2TurnCompletedNotification__ByteRange = {
-  readonly end: number;
-  readonly start: number;
-};
-export const V2TurnCompletedNotification__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2TurnCompletedNotification__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2TurnCompletedNotification__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2TurnCompletedNotification__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2TurnCompletedNotification__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2TurnCompletedNotification__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2TurnCompletedNotification__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2TurnCompletedNotification__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2TurnCompletedNotification__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
-
 export type V2TurnDiffUpdatedNotification = {
   readonly diff: string;
   readonly threadId: string;
@@ -43232,18 +56728,19 @@ export const V2TurnInterruptParams = Schema.Struct({
   turnId: Schema.String,
 }).annotate({ title: "TurnInterruptParams" });
 
-export type V2TurnInterruptResponse = {};
-export const V2TurnInterruptResponse = Schema.Struct({}).annotate({
-  title: "TurnInterruptResponse",
-});
+export type V2TurnInterruptResponse = { readonly [x: string]: Schema.Json };
+export const V2TurnInterruptResponse = Schema.Record(
+  Schema.String,
+  Schema.Json.annotate({ expected: "JSON value" }),
+).annotate({ title: "TurnInterruptResponse" });
 
 export type V2TurnModerationMetadataNotification = {
-  readonly metadata: unknown;
+  readonly metadata: Schema.Json;
   readonly threadId: string;
   readonly turnId: string;
 };
 export const V2TurnModerationMetadataNotification = Schema.Struct({
-  metadata: Schema.Unknown,
+  metadata: Schema.Json.annotate({ expected: "JSON value" }),
   threadId: Schema.String,
   turnId: Schema.String,
 }).annotate({ title: "TurnModerationMetadataNotification" });
@@ -43270,83 +56767,24 @@ export const V2TurnStartedNotification = Schema.Struct({
   turn: V2TurnStartedNotification__Turn,
 }).annotate({ title: "TurnStartedNotification" });
 
-export type V2TurnStartedNotification__ByteRange = { readonly end: number; readonly start: number };
-export const V2TurnStartedNotification__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2TurnStartedNotification__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2TurnStartedNotification__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2TurnStartedNotification__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2TurnStartedNotification__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2TurnStartedNotification__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2TurnStartedNotification__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2TurnStartedNotification__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2TurnStartedNotification__TurnItemsView = Schema.Literals([
-  "notLoaded",
-  "summary",
-  "full",
-]);
-
 export type V2TurnStartParams = {
   readonly approvalPolicy?: V2TurnStartParams__AskForApproval | null;
   readonly approvalsReviewer?: V2TurnStartParams__ApprovalsReviewer | null;
   readonly clientUserMessageId?: string | null;
   readonly cwd?: string | null;
+  readonly disabledPluginIds?: ReadonlyArray<string> | null;
   readonly effort?: V2TurnStartParams__ReasoningEffort | null;
   readonly input: ReadonlyArray<V2TurnStartParams__UserInput>;
   readonly model?: string | null;
-  readonly outputSchema?: unknown;
+  readonly outputSchema?: Schema.Json;
   readonly personality?: V2TurnStartParams__Personality | null;
   readonly sandboxPolicy?: V2TurnStartParams__SandboxPolicy | null;
   readonly serviceTier?: string | null;
+  readonly serviceTierForTurn?: string | null;
   readonly summary?: V2TurnStartParams__ReasoningSummary | null;
   readonly threadId: string;
+  readonly toolOutput?: V2TurnStartParams__TurnToolOutput | null;
+  readonly turnTrigger?: string | null;
 };
 export const V2TurnStartParams = Schema.Struct({
   approvalPolicy: Schema.optionalKey(
@@ -43369,6 +56807,15 @@ export const V2TurnStartParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  disabledPluginIds: Schema.optionalKey(
+    Schema.Union([
+      Schema.Array(Schema.String).annotate({
+        description:
+          "Replace this thread's disabled plugin IDs. Omitted/null preserves the list; [] clears it.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   effort: Schema.optionalKey(
     Schema.Union([V2TurnStartParams__ReasoningEffort, Schema.Null]).annotate({
       description: "Override the reasoning effort for this turn and subsequent turns.",
@@ -43384,14 +56831,16 @@ export const V2TurnStartParams = Schema.Struct({
     ]),
   ),
   outputSchema: Schema.optionalKey(
-    Schema.Unknown.annotate({
+    Schema.Json.annotate({
+      expected: "JSON value",
       description:
         "Optional JSON Schema used to constrain the final assistant message for this turn.",
     }),
   ),
   personality: Schema.optionalKey(
     Schema.Union([V2TurnStartParams__Personality, Schema.Null]).annotate({
-      description: "Override the personality for this turn and subsequent turns.",
+      description:
+        "@deprecated `friendly` and `pragmatic` no longer select a style. Changing this does not rewrite the thread's existing instructions.",
     }),
   ),
   sandboxPolicy: Schema.optionalKey(
@@ -43407,12 +56856,31 @@ export const V2TurnStartParams = Schema.Struct({
       Schema.Null,
     ]),
   ),
+  serviceTierForTurn: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Override the service tier only when this request starts a new turn. Use \"default\" for standard speed. Omitted or null inherits the thread's tier. Does not change the thread's tier or a turn being steered.",
+      }),
+      Schema.Null,
+    ]),
+  ),
   summary: Schema.optionalKey(
     Schema.Union([V2TurnStartParams__ReasoningSummary, Schema.Null]).annotate({
       description: "Override the reasoning summary for this turn and subsequent turns.",
     }),
   ),
   threadId: Schema.String,
+  toolOutput: Schema.optionalKey(Schema.Union([V2TurnStartParams__TurnToolOutput, Schema.Null])),
+  turnTrigger: Schema.optionalKey(
+    Schema.Union([
+      Schema.String.annotate({
+        description:
+          "Optional source classification for the caller that starts this turn. Ignored when this request steers an already-active turn.",
+      }),
+      Schema.Null,
+    ]),
+  ),
 }).annotate({ title: "TurnStartParams" });
 
 export type V2TurnStartParams__AdditionalContextEntry = {
@@ -43424,16 +56892,6 @@ export const V2TurnStartParams__AdditionalContextEntry = Schema.Struct({
   value: Schema.String,
 });
 
-export type V2TurnStartParams__ByteRange = { readonly end: number; readonly start: number };
-export const V2TurnStartParams__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
 export type V2TurnStartParams__CollaborationMode = {
   readonly mode: V2TurnStartParams__ModeKind;
   readonly settings: V2TurnStartParams__Settings;
@@ -43443,6 +56901,16 @@ export const V2TurnStartParams__CollaborationMode = Schema.Struct({
   settings: V2TurnStartParams__Settings,
 }).annotate({ description: "Collaboration mode for a Codex session." });
 
+export type V2TurnStartParams__CyberAccessProgram = "standard" | "daybreakBlue" | "daybreakRed";
+export const V2TurnStartParams__CyberAccessProgram = Schema.Literals([
+  "standard",
+  "daybreakBlue",
+  "daybreakRed",
+]).annotate({
+  description:
+    "Requested cyber treatment for a ChatGPT-authenticated Codex turn. Authorization and model-tier restrictions remain server-owned.",
+});
+
 export type V2TurnStartParams__MultiAgentMode =
   | "explicitRequestOnly"
   | "proactive"
@@ -43458,9 +56926,6 @@ export const V2TurnStartParams__MultiAgentMode = Schema.Union(
     "Controls the effective multi-agent delegation instructions for a turn. `custom` means the configured mode hint defines the policy instead of a built-in policy.",
 });
 
-export type V2TurnStartParams__NetworkAccess = "restricted" | "enabled";
-export const V2TurnStartParams__NetworkAccess = Schema.Literals(["restricted", "enabled"]);
-
 export type V2TurnStartParams__TurnEnvironmentParams = {
   readonly cwd: V2TurnStartParams__LegacyAppPathString;
   readonly environmentId: string;
@@ -43484,65 +56949,6 @@ export const V2TurnStartResponse = Schema.Struct({ turn: V2TurnStartResponse__Tu
   title: "TurnStartResponse",
 });
 
-export type V2TurnStartResponse__ByteRange = { readonly end: number; readonly start: number };
-export const V2TurnStartResponse__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
-export type V2TurnStartResponse__CollabAgentTool =
-  | "spawnAgent"
-  | "sendInput"
-  | "resumeAgent"
-  | "wait"
-  | "closeAgent"
-  | "sendMessage"
-  | "followupTask"
-  | "interruptAgent"
-  | "listAgents";
-export const V2TurnStartResponse__CollabAgentTool = Schema.Literals([
-  "spawnAgent",
-  "sendInput",
-  "resumeAgent",
-  "wait",
-  "closeAgent",
-  "sendMessage",
-  "followupTask",
-  "interruptAgent",
-  "listAgents",
-]);
-
-export type V2TurnStartResponse__CollabAgentToolCallStatus =
-  | "inProgress"
-  | "completed"
-  | "failed"
-  | "interrupted";
-export const V2TurnStartResponse__CollabAgentToolCallStatus = Schema.Literals([
-  "inProgress",
-  "completed",
-  "failed",
-  "interrupted",
-]);
-
-export type V2TurnStartResponse__CommandExecutionSource =
-  | "agent"
-  | "userShell"
-  | "unifiedExecStartup"
-  | "unifiedExecInteraction";
-export const V2TurnStartResponse__CommandExecutionSource = Schema.Literals([
-  "agent",
-  "userShell",
-  "unifiedExecStartup",
-  "unifiedExecInteraction",
-]);
-
-export type V2TurnStartResponse__TurnItemsView = "notLoaded" | "summary" | "full";
-export const V2TurnStartResponse__TurnItemsView = Schema.Literals(["notLoaded", "summary", "full"]);
-
 export type V2TurnSteerParams = {
   readonly clientUserMessageId?: string | null;
   readonly expectedTurnId: string;
@@ -43568,16 +56974,6 @@ export const V2TurnSteerParams__AdditionalContextEntry = Schema.Struct({
   value: Schema.String,
 });
 
-export type V2TurnSteerParams__ByteRange = { readonly end: number; readonly start: number };
-export const V2TurnSteerParams__ByteRange = Schema.Struct({
-  end: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-  start: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
-});
-
 export type V2TurnSteerResponse = { readonly turnId: string };
 export const V2TurnSteerResponse = Schema.Struct({ turnId: Schema.String }).annotate({
   title: "TurnSteerResponse",
@@ -43637,8 +57033,10 @@ export type V2WindowsWorldWritableWarningNotification = {
 };
 export const V2WindowsWorldWritableWarningNotification = Schema.Struct({
   extraCount: Schema.Number.annotate({ format: "uint" })
-    .check(Schema.isInt())
-    .check(Schema.isGreaterThanOrEqualTo(0)),
+    .check(Schema.isInt().annotate({ expected: "an integer" }))
+    .check(
+      Schema.isGreaterThanOrEqualTo(0).annotate({ expected: "a value greater than or equal to 0" }),
+    ),
   failedScan: Schema.Boolean,
   samplePaths: Schema.Array(Schema.String),
 }).annotate({ title: "WindowsWorldWritableWarningNotification" });
diff --git a/packages/effect-codex-app-server/src/_internal/shared.ts b/packages/effect-codex-app-server/src/_internal/shared.ts
index 8bcb59467d3d..334dc4a43bd3 100644
--- a/packages/effect-codex-app-server/src/_internal/shared.ts
+++ b/packages/effect-codex-app-server/src/_internal/shared.ts
@@ -45,7 +45,7 @@ export const encodeOptionalPayload = <A, I>(
 ): Effect.Effect<I | undefined, CodexError.CodexAppServerRequestError> => {
   if (!schema) {
     if (payload === undefined) {
-      return Effect.sync(() => undefined);
+      return Effect.undefined;
     }
     return Effect.fail(
       CodexError.CodexAppServerRequestError.unexpectedPayload(method, "encode-payload", payload),
diff --git a/packages/effect-codex-app-server/src/client.test.ts b/packages/effect-codex-app-server/src/client.test.ts
index 3830c5fc5f6f..f7eca6207ca7 100644
--- a/packages/effect-codex-app-server/src/client.test.ts
+++ b/packages/effect-codex-app-server/src/client.test.ts
@@ -95,6 +95,7 @@ it.layer(NodeServices.layer)("effect-codex-app-server client", (it) => {
       assert.equal(result.skills.data[0]?.skills.length, 0);
       assert.deepEqual(yield* Ref.get(userInputRequests), [
         {
+          isBlocking: true,
           itemId: "item-approval-1",
           threadId: "thread-1",
           turnId: "turn-1",
diff --git a/packages/effect-codex-app-server/src/client.ts b/packages/effect-codex-app-server/src/client.ts
index 78d719626139..d4ff21b8c59e 100644
--- a/packages/effect-codex-app-server/src/client.ts
+++ b/packages/effect-codex-app-server/src/client.ts
@@ -153,14 +153,12 @@ const make = Effect.fn("effect-codex-app-server/CodexAppServerClient.make")(func
         Effect.flatMap((decoded) =>
           Effect.forEach(handlers, (handler) => handler(decoded), { discard: true }),
         ),
-        Effect.catch(() => Effect.void),
+        Effect.ignore,
       );
     }
 
     return unknownNotificationHandler
-      ? unknownNotificationHandler(notification.method, notification.params).pipe(
-          Effect.catch(() => Effect.void),
-        )
+      ? unknownNotificationHandler(notification.method, notification.params).pipe(Effect.ignore)
       : Effect.void;
   };
 
diff --git a/packages/effect-codex-app-server/src/schema.test.ts b/packages/effect-codex-app-server/src/schema.test.ts
index 0c9fc3561002..cc88b9e38363 100644
--- a/packages/effect-codex-app-server/src/schema.test.ts
+++ b/packages/effect-codex-app-server/src/schema.test.ts
@@ -6,7 +6,6 @@ import * as CodexSchema from "./schema.ts";
 const isGetAccountResponse = Schema.is(CodexSchema.V2GetAccountResponse);
 const isThreadReadResponse = Schema.is(CodexSchema.V2ThreadReadResponse);
 const isThreadResumeResponse = Schema.is(CodexSchema.V2ThreadResumeResponse);
-const isThreadRollbackResponse = Schema.is(CodexSchema.V2ThreadRollbackResponse);
 const isThreadForkResponse = Schema.is(CodexSchema.V2ThreadForkResponse);
 const isTurnCompletedNotification = Schema.is(CodexSchema.V2TurnCompletedNotification);
 const decodeThreadResumeResponse = Schema.decodeUnknownSync(CodexSchema.V2ThreadResumeResponse);
@@ -30,7 +29,7 @@ it("keeps async questions in live notifications and thread history", () => {
     CodexSchema.V2ThreadReadResponse__ThreadItem,
     CodexSchema.V2ThreadResumeResponse__ThreadItem,
   ]) {
-    assert.deepEqual(Schema.decodeUnknownSync(schema)(item), item);
+    assert.deepEqual(Schema.decodeSync(schema)(item), item);
   }
 });
 
@@ -76,6 +75,7 @@ it("accepts Codex 0.150 multi-agent values", () => {
       id: "root-thread",
       modelProvider: "openai",
       preview: "",
+      projectId: null,
       sessionId: "session-1",
       source: "cli",
       status: { type: "idle" },
@@ -112,6 +112,7 @@ it("accepts Codex rate limit errors for thread responses", () => {
     id: "thread-1",
     modelProvider: "openai",
     preview: "",
+    projectId: null,
     sessionId: "session-1",
     source: "cli",
     status: { type: "idle" },
@@ -141,7 +142,6 @@ it("accepts Codex rate limit errors for thread responses", () => {
     }),
     true,
   );
-  assert.equal(isThreadRollbackResponse({ thread: failedThread }), true);
 });
 
 it("accepts Codex misalignment policy errors for thread responses", () => {
@@ -153,6 +153,7 @@ it("accepts Codex misalignment policy errors for thread responses", () => {
     id: "thread-1",
     modelProvider: "openai",
     preview: "",
+    projectId: null,
     sessionId: "session-1",
     source: "cli",
     status: { type: "idle" },
@@ -180,7 +181,6 @@ it("accepts Codex misalignment policy errors for thread responses", () => {
   };
   assert.equal(isThreadReadResponse({ thread: failedThread }), true);
   assert.equal(isThreadResumeResponse(resumeLikeResponse), true);
-  assert.equal(isThreadRollbackResponse({ thread: failedThread }), true);
   assert.equal(isThreadForkResponse(resumeLikeResponse), true);
   const decodedResume = decodeThreadResumeResponse(resumeLikeResponse);
   assert.equal(decodedResume.thread.turns[0]?.error?.codexErrorInfo, "misalignmentPolicyViolation");
@@ -201,13 +201,15 @@ it("accepts Codex misalignment policy errors for thread responses", () => {
   );
 });
 
-it("accepts Codex 0.150 account plan values", () => {
+it("accepts account plan slugs newer than the pinned protocol", () => {
   const planTypes = [
     "self_serve_business_prolite",
     "ent26",
     "enterprise_cbp_automation",
     "edu_plus",
     "edu_pro",
+    "promax",
+    "some_future_plan",
   ];
 
   for (const planType of planTypes) {
diff --git a/packages/effect-codex-app-server/test/fixtures/codex-app-server-mock-peer.ts b/packages/effect-codex-app-server/test/fixtures/codex-app-server-mock-peer.ts
index 3f2a213d38c7..59e5eb28faf9 100644
--- a/packages/effect-codex-app-server/test/fixtures/codex-app-server-mock-peer.ts
+++ b/packages/effect-codex-app-server/test/fixtures/codex-app-server-mock-peer.ts
@@ -84,6 +84,7 @@ const handleMethod = (message: Record<string, unknown>) => {
     case "skills/list": {
       pendingSkillsListRequestId = message.id as number | string;
       pendingUserInputRequestId = sendRequest("item/tool/requestUserInput", {
+        isBlocking: true,
         itemId: "item-approval-1",
         threadId: "thread-1",
         turnId: "turn-1",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index e53452dd663c..4fe10f091525 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -59,6 +59,10 @@
       "types": "./src/observability.ts",
       "import": "./src/observability.ts"
     },
+    "./otelEnvironment": {
+      "types": "./src/otelEnvironment.ts",
+      "import": "./src/otelEnvironment.ts"
+    },
     "./httpObservability": {
       "types": "./src/httpObservability.ts",
       "import": "./src/httpObservability.ts"
@@ -346,6 +350,18 @@
     "./gitPatchPath": {
       "types": "./src/gitPatchPath.ts",
       "import": "./src/gitPatchPath.ts"
+    },
+    "./providerAuthReturnUrl": {
+      "types": "./src/providerAuthReturnUrl.ts",
+      "import": "./src/providerAuthReturnUrl.ts"
+    },
+    "./codexAuthCallback": {
+      "types": "./src/codexAuthCallback.ts",
+      "import": "./src/codexAuthCallback.ts"
+    },
+    "./codexAuthHandoff": {
+      "types": "./src/codexAuthHandoff.ts",
+      "import": "./src/codexAuthHandoff.ts"
     }
   },
   "scripts": {
diff --git a/packages/shared/src/codexAuthCallback.ts b/packages/shared/src/codexAuthCallback.ts
new file mode 100644
index 000000000000..e668340a2752
--- /dev/null
+++ b/packages/shared/src/codexAuthCallback.ts
@@ -0,0 +1,100 @@
+// @effect-diagnostics nodeBuiltinImport:off globalTimers:off - Native loopback helper uses a bounded Node listener with AbortController cleanup.
+import * as Schema from "effect/Schema";
+import * as NodeHttp from "node:http";
+import { codexAuthorizationRequest, codexCallbackUrl } from "@t3tools/shared/codexAuthHandoff";
+
+export class CodexAuthCallbackError extends Schema.TaggedError<CodexAuthCallbackError>()(
+  "CodexAuthCallbackError",
+  { detail: Schema.String },
+) {
+  override get message() {
+    return this.detail;
+  }
+}
+
+const listeners = new Map<string, AbortController>();
+
+export function cancelCodexAuthCallback(authorizationUrl: string) {
+  const { state } = codexAuthorizationRequest(authorizationUrl);
+  listeners.get(state)?.abort();
+}
+
+/** Receive an authorization code locally. Credentials and PKCE stay on the target environment. */
+export async function receiveCodexAuthCallback(
+  authorizationUrl: string,
+  openBrowser: (url: string) => Promise<boolean>,
+  destination?: (callbackUrl: string) => string,
+  signal?: AbortSignal,
+) {
+  const request = codexAuthorizationRequest(authorizationUrl);
+  if (listeners.has(request.state))
+    throw new Error("This sign-in is already open on this computer.");
+  const abort = new AbortController();
+  const interrupted = () => abort.abort();
+  signal?.addEventListener("abort", interrupted, { once: true });
+  listeners.set(request.state, abort);
+  const callback = Promise.withResolvers<string>();
+  // Keep early open/bind failures from leaving an unobserved rejection behind.
+  void callback.promise.catch(() => undefined);
+  const server = NodeHttp.createServer((incoming, response) => {
+    try {
+      if (incoming.method !== "GET") throw new Error("method");
+      const url = codexCallbackUrl(
+        new URL(incoming.url ?? "/", request.redirectUri).toString(),
+        request.redirectUri,
+        request.state,
+      ).toString();
+      const returnUrl = destination?.(url);
+      response.setHeader("cache-control", "no-store");
+      response.setHeader("referrer-policy", "no-referrer");
+      response.setHeader("x-content-type-options", "nosniff");
+      if (returnUrl) {
+        response.writeHead(303, { location: returnUrl }).end();
+      } else {
+        response.setHeader(
+          "content-security-policy",
+          "default-src 'none'; style-src 'unsafe-inline'; frame-ancestors 'none'",
+        );
+        response
+          .writeHead(200, { "content-type": "text/html; charset=utf-8" })
+          .end(
+            '<!doctype html><html><head><meta name="viewport" content="width=device-width,initial-scale=1"><meta name="color-scheme" content="light dark"><title>T3 Code</title><style>body{font-family:system-ui;display:grid;place-items:center;min-height:90vh;margin:0}main{max-width:360px;padding:32px}h1{font-size:24px}p{line-height:1.6;opacity:.7}</style></head><body><main><h1>Return to T3 Code</h1><p>Your sign-in response has been received. T3 Code is finishing the connection. You can close this tab.</p></main></body></html>',
+          );
+      }
+      callback.resolve(url);
+    } catch {
+      response.writeHead(400).end("This response does not belong to the active sign-in.");
+    }
+  });
+  const cancelled = () => callback.reject(new Error("Sign-in cancelled on this computer."));
+  abort.signal.addEventListener("abort", cancelled, { once: true });
+  const timer = setTimeout(
+    () => callback.reject(new Error("Sign-in expired. Try again.")),
+    300_000,
+  );
+  timer.unref();
+  try {
+    if (signal?.aborted) throw new Error("Sign-in cancelled on this computer.");
+    await new Promise<void>((resolve, reject) => {
+      server.once("error", () =>
+        reject(
+          new Error(
+            "The ChatGPT callback port is in use on this computer. Close the other sign-in and try again, or paste the redirect URL in T3 Code.",
+          ),
+        ),
+      );
+      server.listen(Number(new URL(request.redirectUri).port), "127.0.0.1", resolve);
+    });
+    if (abort.signal.aborted) throw new Error("Sign-in cancelled on this computer.");
+    if (!(await openBrowser(request.authorizationUrl)))
+      throw new Error("Could not open your sign-in browser.");
+    return await callback.promise;
+  } finally {
+    clearTimeout(timer);
+    signal?.removeEventListener("abort", interrupted);
+    abort.signal.removeEventListener("abort", cancelled);
+    listeners.delete(request.state);
+    server.closeAllConnections();
+    await new Promise<void>((resolve) => server.close(() => resolve()));
+  }
+}
diff --git a/packages/shared/src/codexAuthHandoff.test.ts b/packages/shared/src/codexAuthHandoff.test.ts
new file mode 100644
index 000000000000..687103cfe6e6
--- /dev/null
+++ b/packages/shared/src/codexAuthHandoff.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it } from "vite-plus/test";
+import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
+import {
+  codexAuthorizationRequest,
+  codexAuthDeliveryUrl,
+  codexAuthHandoffUrl,
+  readCodexAuthDelivery,
+  readCodexAuthHandoff,
+} from "./codexAuthHandoff.ts";
+
+const authorizationUrl = () => {
+  const url = new URL("https://auth.openai.com/api/accounts/authorize");
+  url.search = new URLSearchParams({
+    client_id: "dynamic_agent_client",
+    response_type: "code",
+    redirect_uri: "http://127.0.0.1:54213/auth/callback",
+    state: "a".repeat(43),
+    code_challenge_method: "S256",
+    code_challenge: "b".repeat(43),
+  }).toString();
+  return url.toString();
+};
+const input = {
+  authorizationUrl: authorizationUrl(),
+  returnUrl: "https://app.t3.codes/welcome#agents:remote-environment",
+  environmentId: EnvironmentId.make("remote-environment"),
+  instanceId: ProviderInstanceId.make("work-codex"),
+  flowId: "flow-one",
+};
+const callbackUrl = `http://127.0.0.1:54213/auth/callback?state=${"a".repeat(43)}&code=one-time-code&client_id=oaiapp_test`;
+
+describe("Codex desktop handoff", () => {
+  it("keeps the hosted return route, account, and environment with the code in a fragment", () => {
+    expect(readCodexAuthHandoff(codexAuthHandoffUrl(input), false)).toEqual(input);
+    const delivery = codexAuthDeliveryUrl(input, callbackUrl);
+    expect(new URL(delivery).search).toBe("");
+    expect(readCodexAuthDelivery(delivery)).toEqual({
+      callbackUrl,
+      environmentId: input.environmentId,
+      instanceId: input.instanceId,
+      flowId: input.flowId,
+      returnHash: "#agents:remote-environment",
+      returnUrl: input.returnUrl,
+    });
+  });
+  it("rejects other handlers, schemes, arbitrary return sites, and non-OpenAI authorization", () => {
+    const link = codexAuthHandoffUrl(input);
+    expect(readCodexAuthHandoff(link, true)).toBeUndefined();
+    expect(readCodexAuthHandoff(link.replace("auth/codex", "auth/other"), false)).toBeUndefined();
+    expect(
+      readCodexAuthHandoff(
+        codexAuthHandoffUrl({ ...input, returnUrl: "https://attacker.example/welcome" }),
+        false,
+      ),
+    ).toBeUndefined();
+    expect(
+      readCodexAuthHandoff(
+        codexAuthHandoffUrl({
+          ...input,
+          authorizationUrl: input.authorizationUrl.replace("auth.openai.com", "attacker.example"),
+        }),
+        false,
+      ),
+    ).toBeUndefined();
+  });
+  it("rejects duplicated authorization parameters and non-loopback callback addresses", () => {
+    expect(() =>
+      codexAuthorizationRequest(
+        input.authorizationUrl + "&redirect_uri=http://localhost:1/auth/callback",
+      ),
+    ).toThrow();
+    const url = new URL(input.authorizationUrl);
+    url.searchParams.set("redirect_uri", "http://localhost:54213/auth/callback");
+    expect(() => codexAuthorizationRequest(url.toString())).toThrow();
+    url.searchParams.set("redirect_uri", "https://attacker.example/auth/callback");
+    expect(() => codexAuthorizationRequest(url.toString())).toThrow();
+    expect(() => codexAuthDeliveryUrl(input, callbackUrl + "&state=another")).toThrow();
+  });
+});
diff --git a/packages/shared/src/codexAuthHandoff.ts b/packages/shared/src/codexAuthHandoff.ts
new file mode 100644
index 000000000000..d6632355e363
--- /dev/null
+++ b/packages/shared/src/codexAuthHandoff.ts
@@ -0,0 +1,149 @@
+import { EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
+import * as Schema from "effect/Schema";
+import { providerAuthReturnUrl } from "./providerAuthReturnUrl.ts";
+
+export const CodexAuthHandoff = Schema.Struct({
+  authorizationUrl: Schema.String.check(Schema.isMaxLength(16_384)),
+  returnUrl: Schema.String.check(Schema.isMaxLength(4_096)),
+  environmentId: EnvironmentId,
+  instanceId: ProviderInstanceId,
+  flowId: Schema.NonEmptyString.check(Schema.isMaxLength(128)),
+});
+export type CodexAuthHandoff = typeof CodexAuthHandoff.Type;
+const Delivery = Schema.Struct({
+  environmentId: EnvironmentId,
+  instanceId: ProviderInstanceId,
+  flowId: Schema.NonEmptyString.check(Schema.isMaxLength(128)),
+  callbackUrl: Schema.String.check(Schema.isMaxLength(16_384)),
+  returnHash: Schema.String.check(Schema.isMaxLength(128)),
+});
+
+const encodeHandoff = Schema.encodeSync(Schema.fromJsonString(CodexAuthHandoff));
+const decodeHandoff = Schema.decodeUnknownSync(Schema.fromJsonString(CodexAuthHandoff));
+const encodeDelivery = Schema.encodeSync(Schema.fromJsonString(Delivery));
+const decodeDelivery = Schema.decodeUnknownSync(Schema.fromJsonString(Delivery));
+
+/** The helper only opens OpenAI's authorize endpoint and receives a loopback callback. */
+export function codexAuthorizationRequest(value: string) {
+  const url = new URL(value);
+  if (
+    value.length > 16_384 ||
+    url.origin !== "https://auth.openai.com" ||
+    url.pathname !== "/api/accounts/authorize" ||
+    url.username ||
+    url.password ||
+    url.hash
+  )
+    throw new Error("Invalid ChatGPT sign-in request.");
+  const single = (key: string) => {
+    const values = url.searchParams.getAll(key);
+    if (values.length !== 1 || !values[0]) throw new Error("Invalid ChatGPT sign-in request.");
+    return values[0];
+  };
+  const redirectUri = single("redirect_uri");
+  const redirect = new URL(redirectUri);
+  const state = single("state");
+  if (
+    !/^http:\/\/127\.0\.0\.1:[1-9]\d{0,4}\/auth\/callback$/u.test(redirectUri) ||
+    Number(redirect.port) > 65_535 ||
+    !/^[\w-]{16,128}$/u.test(state) ||
+    single("response_type") !== "code" ||
+    single("code_challenge_method") !== "S256" ||
+    !/^[\w-]{43}$/u.test(single("code_challenge")) ||
+    !/^(dynamic_agent_client|oaiapp_[\w-]+)$/u.test(single("client_id"))
+  )
+    throw new Error("Invalid ChatGPT sign-in request.");
+  return { authorizationUrl: url.toString(), redirectUri, state };
+}
+
+/** Validation is shared by the desktop listener and the environment receiving the code. */
+export function codexCallbackUrl(value: string, redirectUri: string, state: string) {
+  const callback = new URL(value);
+  const expected = new URL(redirectUri);
+  const states = callback.searchParams.getAll("state");
+  const codes = callback.searchParams.getAll("code");
+  const errors = callback.searchParams.getAll("error");
+  const clients = callback.searchParams.getAll("client_id");
+  if (
+    value.length > 16_384 ||
+    callback.origin !== expected.origin ||
+    callback.pathname !== expected.pathname ||
+    callback.username ||
+    callback.password ||
+    callback.hash ||
+    states.length !== 1 ||
+    states[0] !== state ||
+    clients.length > 1 ||
+    (clients.length === 1 && !/^oaiapp_[\w-]+$/u.test(clients[0]!)) ||
+    !(
+      (codes.length === 1 && Boolean(codes[0]) && errors.length === 0) ||
+      (errors.length === 1 && Boolean(errors[0]) && codes.length === 0)
+    )
+  )
+    throw new Error("This redirect URL does not belong to the current sign-in.");
+  return callback;
+}
+
+export function codexAuthHandoffUrl(input: CodexAuthHandoff, development = false) {
+  const url = new URL(`${development ? "t3code-dev" : "t3code"}://auth/codex`);
+  url.searchParams.set("request", encodeHandoff(input));
+  return url.toString();
+}
+
+export function readCodexAuthHandoff(value: string, development: boolean) {
+  try {
+    const url = new URL(value);
+    if (
+      value.length > 32_768 ||
+      url.protocol !== (development ? "t3code-dev:" : "t3code:") ||
+      url.host !== "auth" ||
+      url.pathname !== "/codex" ||
+      url.username ||
+      url.password ||
+      url.hash ||
+      url.searchParams.getAll("request").length !== 1
+    )
+      return undefined;
+    const input = decodeHandoff(url.searchParams.get("request"));
+    codexAuthorizationRequest(input.authorizationUrl);
+    if (!providerAuthReturnUrl(input.returnUrl)) return undefined;
+    return input;
+  } catch {
+    return undefined;
+  }
+}
+
+/** Codes travel in a fragment, never in hosted web requests or a token store on the helper. */
+export function codexAuthDeliveryUrl(input: CodexAuthHandoff, callbackUrl: string) {
+  const request = codexAuthorizationRequest(input.authorizationUrl);
+  codexCallbackUrl(callbackUrl, request.redirectUri, request.state);
+  const destination = providerAuthReturnUrl(input.returnUrl);
+  if (!destination) throw new Error("Invalid T3 Code return address.");
+  const url = new URL(destination);
+  const delivery = {
+    environmentId: input.environmentId,
+    instanceId: input.instanceId,
+    flowId: input.flowId,
+    callbackUrl,
+    returnHash: url.hash,
+  };
+  url.hash = `codex-auth=${encodeURIComponent(encodeDelivery(delivery))}`;
+  return url.toString();
+}
+
+export function readCodexAuthDelivery(value: string) {
+  try {
+    const url = new URL(value);
+    if (!url.hash.startsWith("#codex-auth=") || url.hash.length > 32_768) return undefined;
+    const input = decodeDelivery(decodeURIComponent(url.hash.slice("#codex-auth=".length)));
+    const destination = providerAuthReturnUrl(value);
+    if (!destination) return undefined;
+    const returnUrl = new URL(destination);
+    returnUrl.hash = input.returnHash;
+    const sanitized = providerAuthReturnUrl(returnUrl.toString());
+    if (!sanitized) return undefined;
+    return { ...input, returnUrl: sanitized };
+  } catch {
+    return undefined;
+  }
+}
diff --git a/packages/shared/src/delimitedPreview.test.ts b/packages/shared/src/delimitedPreview.test.ts
index 303e9042855c..0188f9da5023 100644
--- a/packages/shared/src/delimitedPreview.test.ts
+++ b/packages/shared/src/delimitedPreview.test.ts
@@ -21,6 +21,35 @@ describe("delimited file previews", () => {
       ["", "three"],
     ]);
   });
+  describe.each([",", "\t"] as const)("with delimiter %j", (delimiter) => {
+    it("preserves a final quoted empty record without requiring a line ending", () => {
+      for (const ending of ["", "\n", "\r\n"]) {
+        expect(parseDelimitedPreview(`name\r\nAlice\r\n""${ending}`, delimiter)).toEqual({
+          rows: [["name"], ["Alice"], [""]],
+          truncated: false,
+        });
+      }
+      expect(parseDelimitedPreview('""', delimiter)).toEqual({
+        rows: [[""]],
+        truncated: false,
+      });
+    });
+    it("does not invent records for empty input or a trailing line ending", () => {
+      for (const prefix of ["", "\ufeff"]) {
+        expect(parseDelimitedPreview(prefix, delimiter).rows).toEqual([]);
+        expect(parseDelimitedPreview(`${prefix}name\r\n`, delimiter).rows).toEqual([["name"]]);
+        expect(parseDelimitedPreview(`${prefix}""`, delimiter).rows).toEqual([[""]]);
+      }
+    });
+    it("keeps a quoted empty record at the row limit", () => {
+      const text = `${"name\n".repeat(99)}""`;
+      const preview = parseDelimitedPreview(text, delimiter);
+      expect(preview.rows).toHaveLength(100);
+      expect(preview.rows.at(-1)).toEqual([""]);
+      expect(preview.truncated).toBe(false);
+      expect(parseDelimitedPreview(`${text}\nextra`, delimiter).truncated).toBe(true);
+    });
+  });
   it("bounds rows, columns and cell length and reports partial content", () => {
     const table = parseDelimitedPreview(
       Array.from({ length: 101 }, () =>
diff --git a/packages/shared/src/delimitedPreview.ts b/packages/shared/src/delimitedPreview.ts
index d4e24409a06a..1cfbd41a7812 100644
--- a/packages/shared/src/delimitedPreview.ts
+++ b/packages/shared/src/delimitedPreview.ts
@@ -16,12 +16,13 @@ export function parseDelimitedPreview(text: string, delimiter: "," | "\t") {
   let cell = "";
   let quoted = false;
   let truncated = false;
+  let rowStart = text.charCodeAt(0) === 0xfeff ? 1 : 0;
   const endCell = () => {
     if (row.length < 30) row.push(cell);
     else truncated = true;
     cell = "";
   };
-  for (let index = text.charCodeAt(0) === 0xfeff ? 1 : 0; index < text.length; index++) {
+  for (let index = rowStart; index < text.length; index++) {
     const char = text[index];
     if (char === '"') {
       if (quoted && text[index + 1] === '"') {
@@ -41,12 +42,13 @@ export function parseDelimitedPreview(text: string, delimiter: "," | "\t") {
         rows.push(row);
         row = [];
         if (char === "\r" && text[index + 1] === "\n") index++;
+        rowStart = index + 1;
         if (rows.length === 100) return { rows, truncated: truncated || index < text.length - 1 };
       }
     } else if (cell.length < 2000) cell += char;
     else truncated = true;
   }
-  if (cell.length || row.length) {
+  if (rowStart < text.length) {
     endCell();
     rows.push(row);
   }
diff --git a/packages/shared/src/editor.ts b/packages/shared/src/editor.ts
index cc6def9d01e9..1584f3a201d9 100644
--- a/packages/shared/src/editor.ts
+++ b/packages/shared/src/editor.ts
@@ -12,6 +12,8 @@ type Editor = (typeof EDITORS)[number];
 const installNames: Partial<Record<Editor["id"], ReadonlyArray<string>>> = {
   vscode: ["Visual Studio Code"],
   "vscode-insiders": ["Visual Studio Code - Insiders"],
+  // `Antigravity.app` is the separate Hub, not the IDE.
+  antigravity: ["Antigravity IDE"],
   idea: ["IntelliJ IDEA", "IntelliJ IDEA CE", "IntelliJ IDEA Ultimate"],
   pycharm: ["PyCharm", "PyCharm CE"],
   rider: ["Rider", "JetBrains Rider"],
diff --git a/packages/shared/src/git.ts b/packages/shared/src/git.ts
index 0c7279551751..61d183141797 100644
--- a/packages/shared/src/git.ts
+++ b/packages/shared/src/git.ts
@@ -265,6 +265,19 @@ function deriveLocalBranchNameCandidatesFromRemoteRef(
   return [...candidates];
 }
 
+// Git rejects ASCII space and the ASCII control characters (tab, newline and
+// friends) in ref names, so the picker's "Create new ref" entry can only fail
+// for a typed name like "new branch". Replacing runs of those with a dash makes
+// the name usable without reimplementing check-ref-format: names invalid for
+// other reasons still surface the git error. Only the whitespace git actually
+// rejects is replaced — git accepts U+00A0 and friends, and rewriting those
+// would silently create a ref the user never asked for. Case and existing
+// dashes are left alone, since ref names are case sensitive and consecutive
+// dashes are valid.
+export function sanitizeNewRefName(rawName: string): string {
+  return rawName.trim().replace(/[ \t\n\r\f\v]+/g, "-");
+}
+
 /**
  * Hide `origin/*` remote refs when a matching local refName already exists.
  */
diff --git a/packages/shared/src/httpReadiness.ts b/packages/shared/src/httpReadiness.ts
index 5aad9d488aae..4aeda1c4757a 100644
--- a/packages/shared/src/httpReadiness.ts
+++ b/packages/shared/src/httpReadiness.ts
@@ -106,17 +106,13 @@ export const waitForHttpReady = Effect.fn("shared.httpReadiness.waitForHttpReady
           Effect.timeoutOption(Duration.millis(probeTimeoutMs)),
           Effect.mapError((cause) => fail(cause)),
         );
-        return yield* Option.match(responseOption, {
-          onSome: Effect.succeed,
-          onNone: () =>
-            Effect.fail(
-              fail({
-                kind: "probe-timeout",
-                attempt,
-                probeTimeoutMs,
-              }),
-            ),
-        });
+        return yield* Effect.fromOption(responseOption, () =>
+          fail({
+            kind: "probe-timeout",
+            attempt,
+            probeTimeoutMs,
+          }),
+        );
       }).pipe(
         Effect.mapError((cause) => (isMadeError(cause) ? cause : fail(cause))),
         Effect.tapError((cause) =>
diff --git a/packages/shared/src/keybindings.ts b/packages/shared/src/keybindings.ts
index ee159b6838a3..8029be96f939 100644
--- a/packages/shared/src/keybindings.ts
+++ b/packages/shared/src/keybindings.ts
@@ -20,6 +20,8 @@ type WhenToken =
 
 export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [
   { key: "mod+b", command: "sidebar.toggle" },
+  { key: "mod+[", command: "navigation.back", when: "!terminalFocus" },
+  { key: "mod+]", command: "navigation.forward", when: "!terminalFocus" },
   { key: "mod+j", command: "terminal.toggle" },
   { key: "mod+alt+b", command: "rightPanel.toggle" },
   { key: "mod+d", command: "terminal.split", when: "terminalFocus" },
@@ -38,6 +40,7 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [
   { key: "mod+k", command: "commandPalette.toggle", when: "!terminalFocus" },
   { key: "mod+p", command: "filePicker.toggle", when: "!terminalFocus" },
   { key: "mod+shift+f", command: "projectSearch.toggle", when: "!terminalFocus" },
+  { key: "mod+u", command: "usage.open", when: "!terminalFocus" },
   { key: "mod+alt+a", command: "theme.select", when: "!terminalFocus" },
   { key: "mod+alt+shift+a", command: "appearance.cycle", when: "!terminalFocus" },
   { key: "mod+alt+shift+t", command: "themeEditor.toggle" },
@@ -73,6 +76,13 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [
     command,
     when: "modelPickerOpen && isDesktop",
   })),
+  { key: "c", command: "usage.cost", when: "usagePageOpen" },
+  { key: "t", command: "usage.tokens", when: "usagePageOpen" },
+  { key: "l", command: "usage.limits", when: "usagePageOpen" },
+  { key: "mod+shift+1", command: "usage.period.day", when: "usagePageOpen" },
+  { key: "mod+shift+2", command: "usage.period.week", when: "usagePageOpen" },
+  { key: "mod+shift+3", command: "usage.period.month", when: "usagePageOpen" },
+  { key: "mod+shift+4", command: "usage.period.quarter", when: "usagePageOpen" },
 ];
 
 function normalizeKeyToken(token: string): string {
diff --git a/packages/shared/src/nodeSqliteClient.test.ts b/packages/shared/src/nodeSqliteClient.test.ts
index 25b0ba2d38e8..bbdaa4624901 100644
--- a/packages/shared/src/nodeSqliteClient.test.ts
+++ b/packages/shared/src/nodeSqliteClient.test.ts
@@ -1,6 +1,10 @@
+import * as NodeSqlite from "node:sqlite";
+import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
 import * as SqlClient from "effect/unstable/sql/SqlClient";
 
 import * as SqliteClient from "./nodeSqliteClient.ts";
@@ -8,6 +12,21 @@ import * as SqliteClient from "./nodeSqliteClient.ts";
 const layer = it.layer(SqliteClient.layer({ filename: ":memory:" }));
 
 layer("NodeSqliteClient", (it) => {
+  it.effect("retries preparing a query after the missing schema becomes available", () =>
+    Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      const select = sql<{ name: string }>`SELECT name FROM created_after_prepare_failure`;
+      const error = yield* select.pipe(Effect.flip);
+      assert.equal(error._tag, "SqlError");
+      assert.equal(error.reason.operation, "prepare");
+
+      yield* sql`CREATE TABLE created_after_prepare_failure(name TEXT NOT NULL)`;
+      yield* sql`INSERT INTO created_after_prepare_failure VALUES ('recovered')`;
+      assert.deepEqual(yield* select, [{ name: "recovered" }]);
+      assert.deepEqual(yield* select.values, [["recovered"]]);
+    }),
+  );
+
   it.effect("runs prepared queries and returns positional values", () =>
     Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
@@ -54,3 +73,32 @@ it.effect("returns a typed failure when the database cannot be opened", () =>
     assert.equal(error.reason.operation, "open");
   }),
 );
+
+it.effect(
+  "recovers a prepared query immediately after an exclusive database lock is released",
+  () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-sqlite-prepare-" });
+      const filename = path.join(directory, "state.sqlite");
+      const blocker = yield* Effect.acquireRelease(
+        Effect.sync(() => new NodeSqlite.DatabaseSync(filename)),
+        (database) => Effect.sync(() => database.close()),
+      );
+      yield* Effect.sync(() => {
+        blocker.exec("CREATE TABLE entries(value TEXT); INSERT INTO entries VALUES ('retained')");
+      });
+      yield* Effect.gen(function* () {
+        const sql = yield* SqlClient.SqlClient;
+        yield* Effect.sync(() => blocker.exec("BEGIN EXCLUSIVE"));
+        const select = sql`SELECT value FROM entries`;
+        const error = yield* select.values.pipe(Effect.flip);
+        assert.equal(error._tag, "SqlError");
+        assert.equal(error.reason.operation, "prepare");
+        yield* Effect.sync(() => blocker.exec("ROLLBACK"));
+        assert.deepEqual(yield* select.values, [["retained"]]);
+        assert.deepEqual(yield* select, [{ value: "retained" }]);
+      }).pipe(Effect.provide(SqliteClient.layer({ filename })));
+    }).pipe(Effect.provide(NodeServices.layer)),
+);
diff --git a/packages/shared/src/nodeSqliteClient.ts b/packages/shared/src/nodeSqliteClient.ts
index 71ba11884626..047de403ed8c 100644
--- a/packages/shared/src/nodeSqliteClient.ts
+++ b/packages/shared/src/nodeSqliteClient.ts
@@ -9,6 +9,7 @@ import * as NodeSqlite from "node:sqlite";
 import * as Cache from "effect/Cache";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
+import * as Exit from "effect/Exit";
 import * as Fiber from "effect/Fiber";
 import { identity } from "effect/Function";
 import * as Layer from "effect/Layer";
@@ -144,10 +145,11 @@ const make = Effect.fn("makeWithDatabase")(function* (
           }),
       });
 
-    const prepareCache = yield* Cache.make({
+    const prepareCache = yield* Cache.makeWith(prepare, {
       capacity: options.prepareCacheSize ?? 200,
-      timeToLive: options.prepareCacheTTL ?? Duration.minutes(10),
-      lookup: prepare,
+      // A transient prepare failure must not outlive the lock or missing schema.
+      timeToLive: (exit) =>
+        Exit.isSuccess(exit) ? (options.prepareCacheTTL ?? Duration.minutes(10)) : Duration.zero,
     });
 
     const runStatement = (
diff --git a/packages/shared/src/observability.test.ts b/packages/shared/src/observability.test.ts
index 081291f34b86..b9bf4ef1375d 100644
--- a/packages/shared/src/observability.test.ts
+++ b/packages/shared/src/observability.test.ts
@@ -16,6 +16,7 @@ import * as Tracer from "effect/Tracer";
 import {
   causeErrorTag,
   compactTraceAttributes,
+  decodeOtlpTraceRecords,
   errorTag,
   makeLocalFileTracer,
   makeTraceSink,
@@ -138,6 +139,53 @@ describe("truncateTraceAttributes", () => {
   });
 });
 
+describe("decodeOtlpTraceRecords", () => {
+  it("clamps oversized renderer span and event attributes", () => {
+    const long = "x".repeat(2_000);
+    const clamped = `${"x".repeat(500)}…[truncated]`;
+    const [record] = decodeOtlpTraceRecords({
+      resourceSpans: [
+        {
+          resource: { attributes: [], droppedAttributesCount: 0 },
+          scopeSpans: [
+            {
+              scope: { name: "effect" },
+              spans: [
+                {
+                  traceId: "11111111111111111111111111111111",
+                  spanId: "2222222222222222",
+                  parentSpanId: undefined,
+                  name: "client.span",
+                  kind: 1,
+                  startTimeUnixNano: "1000000",
+                  endTimeUnixNano: "2000000",
+                  attributes: [{ key: "payload", value: { stringValue: long } }],
+                  droppedAttributesCount: 0,
+                  events: [
+                    {
+                      name: "log",
+                      timeUnixNano: "1500000",
+                      attributes: [{ key: "effect.cause", value: { stringValue: long } }],
+                      droppedAttributesCount: 0,
+                    },
+                  ],
+                  droppedEventsCount: 0,
+                  status: { code: 1 },
+                  links: [],
+                  droppedLinksCount: 0,
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    });
+
+    assert.equal(record?.attributes["payload"], clamped);
+    assert.equal(record?.events[0]?.attributes["effect.cause"], clamped);
+  });
+});
+
 describe("observability", () => {
   it("normalizes circular arrays, maps, and sets without recursing forever", () => {
     const array: Array<unknown> = ["alpha"];
diff --git a/packages/shared/src/observability.ts b/packages/shared/src/observability.ts
index 6393ed0879db..b4dbdf88651a 100644
--- a/packages/shared/src/observability.ts
+++ b/packages/shared/src/observability.ts
@@ -668,7 +668,7 @@ function decodeAttributes(
     entries[attribute.key] = decodeValue(attribute.value);
   }
 
-  return compactTraceAttributes(entries);
+  return truncateTraceAttributes(compactTraceAttributes(entries));
 }
 
 function decodeValue(input: OtlpResource.AnyValue | null | undefined): unknown {
diff --git a/packages/shared/src/otelEnvironment.test.ts b/packages/shared/src/otelEnvironment.test.ts
new file mode 100644
index 000000000000..e436c64c6360
--- /dev/null
+++ b/packages/shared/src/otelEnvironment.test.ts
@@ -0,0 +1,507 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as ConfigProvider from "effect/ConfigProvider";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as OtlpResource from "effect/unstable/observability/OtlpResource";
+
+import * as OtelEnvironment from "./otelEnvironment.ts";
+
+const load = (env: Record<string, string>) =>
+  OtelEnvironment.load.pipe(Effect.provide(ConfigProvider.layer(ConfigProvider.fromEnv({ env }))));
+
+const SPEC_OFF =
+  "OTEL_SDK_DISABLED is set, so no telemetry is exported, whatever configured it; set T3CODE_OTEL_SDK_DISABLED=false to export anyway";
+const T3_OFF =
+  "T3CODE_OTEL_SDK_DISABLED is set, so no telemetry is exported, whatever configured it";
+const specIgnored = (value: string) =>
+  `OTEL_SDK_DISABLED=${value} was read as false; the OpenTelemetry specification recognizes only the string true, so use OTEL_SDK_DISABLED=true or T3CODE_OTEL_SDK_DISABLED to say it any other way`;
+
+describe("OtelEnvironment", () => {
+  it.effect.each([
+    { name: "nothing set", env: {}, disabled: false, warnings: [] },
+    // OTEL_SDK_DISABLED follows the specification: only `true`, case-insensitively.
+    { name: "spec true", env: { OTEL_SDK_DISABLED: "true" }, disabled: true, warnings: [SPEC_OFF] },
+    { name: "spec True", env: { OTEL_SDK_DISABLED: "True" }, disabled: true, warnings: [SPEC_OFF] },
+    {
+      name: "spec padded",
+      env: { OTEL_SDK_DISABLED: " true " },
+      disabled: true,
+      warnings: [SPEC_OFF],
+    },
+    { name: "spec false", env: { OTEL_SDK_DISABLED: "false" }, disabled: false, warnings: [] },
+    {
+      name: "spec 1",
+      env: { OTEL_SDK_DISABLED: "1" },
+      disabled: false,
+      warnings: [specIgnored("1")],
+    },
+    {
+      name: "spec padded yes",
+      env: { OTEL_SDK_DISABLED: " yes " },
+      disabled: false,
+      warnings: [specIgnored("yes")],
+    },
+    // T3CODE_OTEL_SDK_DISABLED takes Config.Boolean's values, case-insensitively.
+    { name: "t3 1", env: { T3CODE_OTEL_SDK_DISABLED: "1" }, disabled: true, warnings: [T3_OFF] },
+    {
+      name: "t3 TRUE",
+      env: { T3CODE_OTEL_SDK_DISABLED: "TRUE" },
+      disabled: true,
+      warnings: [T3_OFF],
+    },
+    { name: "t3 n", env: { T3CODE_OTEL_SDK_DISABLED: "n" }, disabled: false, warnings: [] },
+    {
+      name: "t3 false overrides spec true",
+      env: { T3CODE_OTEL_SDK_DISABLED: "false", OTEL_SDK_DISABLED: "true" },
+      disabled: false,
+      warnings: [],
+    },
+    {
+      name: "blank t3 falls through",
+      env: { T3CODE_OTEL_SDK_DISABLED: "  ", OTEL_SDK_DISABLED: "true" },
+      disabled: true,
+      warnings: [SPEC_OFF],
+    },
+    {
+      name: "unreadable t3 warns and falls through",
+      env: { T3CODE_OTEL_SDK_DISABLED: "maybe", OTEL_SDK_DISABLED: "true" },
+      disabled: true,
+      warnings: ["T3CODE_OTEL_SDK_DISABLED=maybe is not a yes or a no and was ignored", SPEC_OFF],
+    },
+    {
+      name: "bad spec value still warns when t3 answered",
+      env: { T3CODE_OTEL_SDK_DISABLED: "false", OTEL_SDK_DISABLED: "yes" },
+      disabled: false,
+      warnings: [specIgnored("yes")],
+    },
+  ])("$name", ({ env, disabled, warnings }) =>
+    Effect.gen(function* () {
+      const resolved = yield* load(env);
+      assert.strictEqual(resolved.disabled, disabled);
+      assert.deepStrictEqual(resolved.warnings, warnings);
+    }),
+  );
+
+  it.effect.each([
+    { name: "unset", env: {}, resourceAttributes: {}, warnings: [] },
+    {
+      name: "a percent-encoded list",
+      env: { OTEL_RESOURCE_ATTRIBUTES: "team=core,message=hello%20world" },
+      resourceAttributes: { team: "core", message: "hello world" },
+      warnings: [],
+    },
+    {
+      name: "a list that does not decode",
+      env: { OTEL_RESOURCE_ATTRIBUTES: "team=core,broken=%zz" },
+      resourceAttributes: {},
+      warnings: [
+        "OTEL_RESOURCE_ATTRIBUTES is not a list of percent-encoded key=value pairs and was ignored",
+      ],
+    },
+  ])("resource attributes: $name", ({ env, resourceAttributes, warnings }) =>
+    Effect.gen(function* () {
+      const resolved = yield* load(env);
+      assert.deepStrictEqual(resolved.resourceAttributes, resourceAttributes);
+      assert.deepStrictEqual(resolved.warnings, warnings);
+    }),
+  );
+
+  describe("endpoints", () => {
+    const urlOf = (signal: OtelEnvironment.OtelSignal) =>
+      OtelEnvironment.OtelSignal.$match(signal, {
+        Export: ({ url }) => url,
+        Off: () => "Off",
+        Unset: () => "Unset",
+      });
+    it.effect.each([
+      {
+        name: "nothing set",
+        env: {},
+        traces: "Unset",
+        metrics: "Unset",
+        logs: "Unset",
+        warnings: [],
+      },
+      {
+        name: "generic endpoint appends each signal's path, keeping the query",
+        env: { OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318/base?api_key=secret" },
+        traces: "https://collector:4318/base/v1/traces?api_key=secret",
+        metrics: "https://collector:4318/base/v1/metrics?api_key=secret",
+        logs: "https://collector:4318/base/v1/logs?api_key=secret",
+        warnings: [],
+      },
+      {
+        name: "a per-signal endpoint is used verbatim",
+        env: { OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "https://tempo:4318/custom" },
+        traces: "https://tempo:4318/custom",
+        metrics: "Unset",
+        logs: "Unset",
+        warnings: [],
+      },
+      {
+        name: "a per-signal endpoint beats the generic one",
+        env: {
+          OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "https://tempo:4318/custom",
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318/base",
+        },
+        traces: "https://tempo:4318/custom",
+        metrics: "https://collector:4318/base/v1/metrics",
+        logs: "https://collector:4318/base/v1/logs",
+        warnings: [],
+      },
+      {
+        name: "a blank per-signal endpoint falls through to the generic one",
+        env: {
+          OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "  ",
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318/base",
+        },
+        traces: "https://collector:4318/base/v1/traces",
+        metrics: "https://collector:4318/base/v1/metrics",
+        logs: "https://collector:4318/base/v1/logs",
+        warnings: [],
+      },
+      {
+        name: "an invalid per-signal endpoint warns and does not fall through",
+        env: {
+          OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "not-a-url",
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318/base",
+        },
+        traces: "Off",
+        metrics: "https://collector:4318/base/v1/metrics",
+        logs: "https://collector:4318/base/v1/logs",
+        warnings: [
+          "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT is not an http or https URL, so the signals it configures are not exported",
+        ],
+      },
+      {
+        name: "an invalid generic endpoint warns without leaking its query",
+        env: { OTEL_EXPORTER_OTLP_ENDPOINT: "not-a-url?api_key=secret" },
+        traces: "Off",
+        metrics: "Off",
+        logs: "Off",
+        warnings: [
+          "OTEL_EXPORTER_OTLP_ENDPOINT is not an http or https URL, so the signals it configures are not exported",
+        ],
+      },
+      {
+        name: "an endpoint without a scheme is not an http URL",
+        env: { OTEL_EXPORTER_OTLP_ENDPOINT: "localhost:4318" },
+        traces: "Off",
+        metrics: "Off",
+        logs: "Off",
+        warnings: [
+          "OTEL_EXPORTER_OTLP_ENDPOINT is not an http or https URL, so the signals it configures are not exported",
+        ],
+      },
+      {
+        name: "the kill switch wins outright over a valid endpoint",
+        env: {
+          T3CODE_OTEL_SDK_DISABLED: "true",
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318/base",
+        },
+        traces: "Unset",
+        metrics: "Unset",
+        logs: "Unset",
+        warnings: [T3_OFF],
+      },
+      {
+        name: "an exporter of none turns off only its signal",
+        env: {
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318",
+          OTEL_LOGS_EXPORTER: "none",
+        },
+        traces: "https://collector:4318/v1/traces",
+        metrics: "https://collector:4318/v1/metrics",
+        logs: "Off",
+        warnings: [],
+      },
+      {
+        name: "an exporter of none turns its signal off with no endpoint named",
+        env: { OTEL_METRICS_EXPORTER: " NONE " },
+        traces: "Unset",
+        metrics: "Off",
+        logs: "Unset",
+        warnings: [],
+      },
+      {
+        name: "an exporter of none leaves its signal's endpoint unread",
+        env: { OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "not-a-url", OTEL_TRACES_EXPORTER: "none" },
+        traces: "Off",
+        metrics: "Unset",
+        logs: "Unset",
+        warnings: [],
+      },
+      {
+        name: "an exporter of otlp or blank is the default",
+        env: {
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318",
+          OTEL_TRACES_EXPORTER: "OTLP",
+          OTEL_LOGS_EXPORTER: "  ",
+        },
+        traces: "https://collector:4318/v1/traces",
+        metrics: "https://collector:4318/v1/metrics",
+        logs: "https://collector:4318/v1/logs",
+        warnings: [],
+      },
+      {
+        name: "an exporter T3 Code does not have is ignored with a warning",
+        env: {
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318",
+          OTEL_METRICS_EXPORTER: "prometheus",
+        },
+        traces: "https://collector:4318/v1/traces",
+        metrics: "https://collector:4318/v1/metrics",
+        logs: "https://collector:4318/v1/logs",
+        warnings: [
+          "OTEL_METRICS_EXPORTER names prometheus, which T3 Code does not export to, so it was ignored",
+        ],
+      },
+      {
+        name: "a list honors none and otlp and names what it ignored",
+        env: {
+          OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318",
+          OTEL_TRACES_EXPORTER: "console,none",
+          OTEL_LOGS_EXPORTER: "otlp,console,otlpp",
+        },
+        traces: "Off",
+        metrics: "https://collector:4318/v1/metrics",
+        logs: "https://collector:4318/v1/logs",
+        warnings: [
+          "OTEL_TRACES_EXPORTER names console, which T3 Code does not export to, so it was ignored",
+          "OTEL_LOGS_EXPORTER names console, otlpp, which T3 Code does not export to, so they were ignored",
+        ],
+      },
+    ])("$name", ({ env, traces, metrics, logs, warnings }) =>
+      Effect.gen(function* () {
+        const resolved = yield* load(env);
+        assert.strictEqual(urlOf(resolved.traces), traces);
+        assert.strictEqual(urlOf(resolved.metrics), metrics);
+        assert.strictEqual(urlOf(resolved.logs), logs);
+        assert.deepStrictEqual(resolved.warnings, warnings);
+      }),
+    );
+
+    const ENDPOINT = { OTEL_EXPORTER_OTLP_ENDPOINT: "https://collector:4318" };
+    const exportOf = (signal: OtelEnvironment.OtelSignal): unknown =>
+      OtelEnvironment.OtelSignal.$match(signal, {
+        Export: ({ protocol, headers }) => ({ protocol, headers }),
+        Off: () => "Off",
+        Unset: () => "Unset",
+      });
+    it.effect.each([
+      {
+        name: "nothing else set takes the specification's default protocol",
+        env: ENDPOINT,
+        traces: { protocol: "http/protobuf", headers: undefined },
+        logs: { protocol: "http/protobuf", headers: undefined },
+        warnings: [],
+      },
+      {
+        name: "headers are comma-separated pairs with percent-encoded values",
+        env: { ...ENDPOINT, OTEL_EXPORTER_OTLP_HEADERS: "api-key=a%20b,tenant=t3" },
+        traces: { protocol: "http/protobuf", headers: { "api-key": "a b", tenant: "t3" } },
+        logs: { protocol: "http/protobuf", headers: { "api-key": "a b", tenant: "t3" } },
+        warnings: [],
+      },
+      {
+        name: "a per-signal protocol and headers beat the generic ones",
+        env: {
+          ...ENDPOINT,
+          OTEL_EXPORTER_OTLP_PROTOCOL: "http/json",
+          OTEL_EXPORTER_OTLP_HEADERS: "api-key=shared",
+          OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: "http/protobuf",
+          OTEL_EXPORTER_OTLP_TRACES_HEADERS: "api-key=traces%20only",
+        },
+        traces: { protocol: "http/protobuf", headers: { "api-key": "traces only" } },
+        logs: { protocol: "http/json", headers: { "api-key": "shared" } },
+        warnings: [],
+      },
+      {
+        name: "an unsupported protocol turns off the signals it configures",
+        env: { ...ENDPOINT, OTEL_EXPORTER_OTLP_LOGS_PROTOCOL: "grpc" },
+        traces: { protocol: "http/protobuf", headers: undefined },
+        logs: "Off",
+        warnings: [
+          "OTEL_EXPORTER_OTLP_LOGS_PROTOCOL is not http/protobuf or http/json, so the signals it configures are not exported",
+        ],
+      },
+      {
+        name: "a protocol reads case-insensitively",
+        env: { ...ENDPOINT, OTEL_EXPORTER_OTLP_PROTOCOL: "HTTP/JSON" },
+        traces: { protocol: "http/json", headers: undefined },
+        logs: { protocol: "http/json", headers: undefined },
+        warnings: [],
+      },
+      {
+        name: "undecodable headers turn off every signal once, without leaking them",
+        env: { ...ENDPOINT, OTEL_EXPORTER_OTLP_HEADERS: "api-key=%zz" },
+        traces: "Off",
+        logs: "Off",
+        warnings: [
+          "OTEL_EXPORTER_OTLP_HEADERS is not a list of key=value pairs with percent-encoded values, so the signals it configures are not exported",
+        ],
+      },
+      {
+        name: "a header without a value separator turns its signal off",
+        env: { ...ENDPOINT, OTEL_EXPORTER_OTLP_LOGS_HEADERS: "Authorization" },
+        traces: { protocol: "http/protobuf", headers: undefined },
+        logs: "Off",
+        warnings: [
+          "OTEL_EXPORTER_OTLP_LOGS_HEADERS is not a list of key=value pairs with percent-encoded values, so the signals it configures are not exported",
+        ],
+      },
+      {
+        name: "blank per-signal headers leave the generic ones in charge",
+        env: {
+          ...ENDPOINT,
+          OTEL_EXPORTER_OTLP_HEADERS: "api-key=shared",
+          OTEL_EXPORTER_OTLP_LOGS_HEADERS: "  ",
+        },
+        traces: { protocol: "http/protobuf", headers: { "api-key": "shared" } },
+        logs: { protocol: "http/protobuf", headers: { "api-key": "shared" } },
+        warnings: [],
+      },
+      {
+        name: "generic headers every signal overrides say nothing",
+        env: {
+          OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: "https://tempo:4318/v1/traces",
+          OTEL_EXPORTER_OTLP_TRACES_HEADERS: "api-key=traces",
+          OTEL_EXPORTER_OTLP_HEADERS: "api-key=%zz",
+        },
+        traces: { protocol: "http/protobuf", headers: { "api-key": "traces" } },
+        logs: "Unset",
+        warnings: [],
+      },
+      {
+        name: "protocol and headers say nothing for a signal no endpoint names",
+        env: { OTEL_EXPORTER_OTLP_PROTOCOL: "grpc", OTEL_EXPORTER_OTLP_HEADERS: "api-key=%zz" },
+        traces: "Unset",
+        logs: "Unset",
+        warnings: [],
+      },
+    ])("$name", ({ env, traces, logs, warnings }) =>
+      Effect.gen(function* () {
+        const resolved = yield* load(env);
+        assert.deepStrictEqual(exportOf(resolved.traces), traces);
+        assert.deepStrictEqual(exportOf(resolved.logs), logs);
+        assert.deepStrictEqual(resolved.warnings, warnings);
+      }),
+    );
+  });
+
+  describe("resolveSignalEndpoint", () => {
+    const t3Export = {
+      protocol: "http/json",
+      headers: { "x-key": "t3" },
+      exportIntervalMs: 5_000,
+    } as const;
+    const withLogs = (logs: OtelEnvironment.OtelSignal, disabled = false) => ({
+      ...OtelEnvironment.none,
+      disabled,
+      logs,
+    });
+    const otelExport = OtelEnvironment.OtelSignal.Export({
+      url: "http://otel:4318/v1/logs",
+      protocol: "http/protobuf",
+      headers: { "x-key": "otel" },
+    });
+    it.each([
+      {
+        name: "T3CODE_OTLP_*_URL wins over an OTEL endpoint",
+        otel: withLogs(otelExport),
+        t3Url: "http://t3:4318/v1/logs",
+        expected: { url: "http://t3:4318/v1/logs", export: t3Export },
+      },
+      {
+        name: "T3CODE_OTLP_*_URL wins over a signal the OTEL variables turned off",
+        otel: withLogs(OtelEnvironment.OtelSignal.Off()),
+        t3Url: "http://t3:4318/v1/logs",
+        expected: { url: "http://t3:4318/v1/logs", export: t3Export },
+      },
+      {
+        name: "an OTEL endpoint brings its headers and protocol over the fallback",
+        otel: withLogs(otelExport),
+        t3Url: " ",
+        expected: {
+          url: "http://otel:4318/v1/logs",
+          export: {
+            protocol: "http/protobuf" as const,
+            headers: { "x-key": "otel" },
+            exportIntervalMs: 5_000,
+          },
+        },
+      },
+      {
+        name: "a signal the OTEL variables turned off does not fall through",
+        otel: withLogs(OtelEnvironment.OtelSignal.Off()),
+        t3Url: undefined,
+        expected: undefined,
+      },
+      {
+        name: "an unset signal takes the first non-blank fallback",
+        otel: withLogs(OtelEnvironment.OtelSignal.Unset()),
+        t3Url: undefined,
+        expected: { url: "http://settings:4318/v1/logs", export: t3Export },
+      },
+      {
+        name: "the kill switch wins over everything",
+        otel: withLogs(otelExport, true),
+        t3Url: "http://t3:4318/v1/logs",
+        expected: undefined,
+      },
+    ])("$name", ({ otel, t3Url, expected }) => {
+      assert.deepStrictEqual(
+        OtelEnvironment.resolveSignalEndpoint(
+          otel,
+          "logs",
+          { url: t3Url, export: t3Export },
+          "",
+          "http://settings:4318/v1/logs",
+        ),
+        expected,
+      );
+    });
+  });
+
+  it.effect("an exporter of none keeps the Settings endpoint from re-enabling its signal", () =>
+    Effect.gen(function* () {
+      const otel = yield* load({ OTEL_LOGS_EXPORTER: "none" });
+      const t3 = {
+        url: undefined,
+        export: { protocol: "http/json", headers: undefined, exportIntervalMs: 10_000 },
+      } as const;
+      assert.strictEqual(
+        OtelEnvironment.resolveSignalEndpoint(otel, "logs", t3, "http://settings:4318/v1/logs"),
+        undefined,
+      );
+      assert.strictEqual(
+        OtelEnvironment.resolveSignalEndpoint(otel, "traces", t3, "http://settings:4318/v1/traces")
+          ?.url,
+        "http://settings:4318/v1/traces",
+      );
+    }),
+  );
+
+  describe("layerResourceAttributes", () => {
+    it.effect.each([
+      { name: "a list that does not decode", raw: "team=%zz", attributes: [] },
+      { name: "encoded separators", raw: "a%2Cb=x%3Dy", attributes: ["a,b"] },
+    ])("lets the exporters' own read succeed with $name", ({ raw, attributes }) =>
+      Effect.gen(function* () {
+        const env = ConfigProvider.layer(
+          ConfigProvider.fromEnv({ env: { OTEL_RESOURCE_ATTRIBUTES: raw } }),
+        );
+        const otel = yield* OtelEnvironment.load.pipe(Effect.provide(env));
+        const resource = yield* OtlpResource.fromConfig({ serviceName: "t3" }).pipe(
+          Effect.provide(
+            Layer.provide(OtelEnvironment.layerResourceAttributes(otel.resourceAttributes), env),
+          ),
+        );
+        assert.deepStrictEqual(
+          resource.attributes.map((attribute) => attribute.key),
+          [...attributes, "service.name"],
+        );
+      }),
+    );
+  });
+});
diff --git a/packages/shared/src/otelEnvironment.ts b/packages/shared/src/otelEnvironment.ts
new file mode 100644
index 000000000000..c2496bd28a52
--- /dev/null
+++ b/packages/shared/src/otelEnvironment.ts
@@ -0,0 +1,425 @@
+/**
+ * otelEnvironment: the OpenTelemetry kill switch, exporter, and endpoint variables,
+ * shared by the server and the desktop main process so both agree on what
+ * turns export off and where it goes.
+ *
+ * `T3CODE_OTEL_SDK_DISABLED` is read first, so a machine that sets
+ * `OTEL_SDK_DISABLED` for everything else can still opt T3 Code back in.
+ *
+ * @module otelEnvironment
+ */
+import * as Config from "effect/Config";
+import * as ConfigProvider from "effect/ConfigProvider";
+import * as Data from "effect/Data";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+import * as SchemaTransformation from "effect/SchemaTransformation";
+
+import { OtlpHeadersFromString, OtlpProtocol, type SignalExport } from "./observability.ts";
+
+/** The signals T3 Code exports, spelled as the variable names spell them. */
+type OtlpSignalName = "TRACES" | "METRICS" | "LOGS";
+
+/**
+ * What the OTEL variables say about one signal. `Off` is a signal they
+ * claimed with an endpoint, protocol, or headers that do not read, or turned
+ * off with `OTEL_<SIGNAL>_EXPORTER=none`, so it is exported nowhere rather
+ * than to the bootstrap or Settings collector.
+ */
+export type OtelSignal = Data.TaggedEnum<{
+  Unset: {};
+  Off: {};
+  Export: {
+    readonly url: string;
+    readonly protocol: OtlpProtocol;
+    readonly headers: Readonly<Record<string, string>> | undefined;
+  };
+}>;
+export const OtelSignal = Data.taggedEnum<OtelSignal>();
+
+export interface OtelEnvironment {
+  /** Whether OTLP export is off, whatever endpoint is configured. */
+  readonly disabled: boolean;
+  /** Messages for the caller to log once at startup. */
+  readonly warnings: ReadonlyArray<string>;
+  /** `OTEL_RESOURCE_ATTRIBUTES`, or nothing when it could not be read. */
+  readonly resourceAttributes: Readonly<Record<string, string>>;
+  readonly traces: OtelSignal;
+  readonly metrics: OtelSignal;
+  readonly logs: OtelSignal;
+}
+
+/** A set but blank value reads as unset, so the source under it can answer. */
+const blankAsUnset = (value: string | undefined): string | undefined => {
+  const trimmed = value?.trim();
+  return trimmed === undefined || trimmed === "" ? undefined : trimmed;
+};
+
+interface Flag {
+  /** `undefined` when the variable is unset, blank, or unreadable. */
+  readonly value: boolean | undefined;
+  readonly warning?: string;
+}
+
+const TrimmedLowercase = Schema.String.pipe(
+  Schema.decodeTo(
+    Schema.String,
+    SchemaTransformation.trim().compose(SchemaTransformation.toLowerCase()),
+  ),
+);
+
+/**
+ * Reads a boolean that accepts `truthy` and `falsy`, ignoring case and padding.
+ * Any other value is ignored with a warning rather than failing startup.
+ */
+const flag = (
+  name: string,
+  truthy: ReadonlyArray<string>,
+  falsy: ReadonlyArray<string>,
+  invalid: (value: string) => string,
+) =>
+  Config.schema(
+    TrimmedLowercase.pipe(Schema.decodeTo(Schema.Literals([...truthy, ...falsy]))),
+    name,
+  ).pipe(
+    Config.map((value): Flag => ({ value: truthy.includes(value) })),
+    Config.orElse(() =>
+      Config.String(name).pipe(
+        Config.map((raw): Flag => {
+          const value = raw.trim();
+          return value === ""
+            ? { value: undefined }
+            : { value: undefined, warning: invalid(value) };
+        }),
+      ),
+    ),
+    Config.withDefault<Flag>({ value: undefined }),
+  );
+
+// `Config.Boolean`'s literals, which effect does not export on their own.
+const T3CODE_TRUE = ["true", "yes", "on", "1", "y"];
+const T3CODE_FALSE = ["false", "no", "off", "0", "n"];
+
+const RESOURCE_ATTRIBUTES = "OTEL_RESOURCE_ATTRIBUTES";
+
+interface ResourceAttributes {
+  readonly value: Readonly<Record<string, string>>;
+  readonly warning?: string;
+}
+
+// The schema Effect's OTLP exporters read this variable with.
+const resourceAttributes = Config.Record(
+  Schema.StringFromUriComponent,
+  Schema.StringFromUriComponent,
+  RESOURCE_ATTRIBUTES,
+).pipe(
+  Config.map((value): ResourceAttributes => ({ value })),
+  Config.orElse(() =>
+    Config.String(RESOURCE_ATTRIBUTES).pipe(
+      // The value is left out because attributes can carry credentials.
+      Config.map((): ResourceAttributes => ({
+        value: {},
+        warning: `${RESOURCE_ATTRIBUTES} is not a list of percent-encoded key=value pairs and was ignored`,
+      })),
+    ),
+  ),
+  Config.withDefault<ResourceAttributes>({ value: {} }),
+);
+
+interface Setting<A> {
+  readonly value: A | undefined;
+  readonly warning?: string;
+}
+
+/**
+ * Reads one variable. Blank reads as unset, and a value `parse` rejects warns
+ * without echoing it, since these variables carry credentials.
+ */
+const readOrWarn = <A>(
+  name: string,
+  parse: (raw: string) => Option.Option<A>,
+  warning: string,
+): Config.Config<Setting<A>> =>
+  Config.String(name).pipe(
+    Config.option,
+    Config.map((option): Setting<A> => {
+      const raw = blankAsUnset(Option.getOrUndefined(option));
+      if (raw === undefined) {
+        return { value: undefined };
+      }
+      return Option.match(parse(raw), {
+        onNone: () => ({ value: undefined, warning }),
+        onSome: (value) => ({ value }),
+      });
+    }),
+  );
+
+const parseHttpUrl = (raw: string) =>
+  Option.liftThrowable((value: string) => new URL(value))(raw).pipe(
+    Option.filter((url) => url.protocol === "http:" || url.protocol === "https:"),
+  );
+
+const NOT_EXPORTED = "so the signals it configures are not exported";
+
+const endpoint = (name: string) =>
+  readOrWarn(name, parseHttpUrl, `${name} is not an http or https URL, ${NOT_EXPORTED}`);
+
+// The specification reads enum values case-insensitively.
+const protocol = (name: string) =>
+  readOrWarn(
+    name,
+    (raw) => Schema.decodeUnknownOption(OtlpProtocol)(raw.toLowerCase()),
+    `${name} is not http/protobuf or http/json, ${NOT_EXPORTED}`,
+  );
+
+const headers = (name: string) =>
+  readOrWarn(
+    name,
+    Schema.decodeUnknownOption(OtlpHeadersFromString),
+    `${name} is not a list of key=value pairs with percent-encoded values, ${NOT_EXPORTED}`,
+  );
+
+type Exporter = "otlp" | "none";
+
+const EXPORTERS: ReadonlySet<string> = new Set<Exporter>(["otlp", "none"]);
+
+const isExporter = (entry: string): entry is Exporter => EXPORTERS.has(entry);
+
+/**
+ * `OTEL_<SIGNAL>_EXPORTER`, a case-insensitive list whose default is `otlp`.
+ * Entries T3 Code has no exporter for are named in a warning and dropped, and
+ * a list left with nothing to honor reads as unset, as the specification asks
+ * of any enum value an implementation does not recognize.
+ */
+const exporter = (name: string): Config.Config<Setting<Exporter>> =>
+  Config.String(name).pipe(
+    Config.option,
+    Config.map((option): Setting<Exporter> => {
+      const entries = (Option.getOrUndefined(option) ?? "")
+        .split(",")
+        .map((entry) => entry.trim().toLowerCase())
+        .filter((entry) => entry !== "");
+      const ignored = [...new Set(entries.filter((entry) => !isExporter(entry)))];
+      const known = new Set(entries.filter(isExporter));
+      const value = known.has("otlp") ? "otlp" : known.has("none") ? "none" : undefined;
+      return ignored.length === 0
+        ? { value }
+        : {
+            value,
+            warning: `${name} names ${ignored.join(", ")}, which T3 Code does not export to, so ${ignored.length === 1 ? "it was" : "they were"} ignored`,
+          };
+    }),
+  );
+
+interface Settings {
+  readonly endpoint: Setting<URL>;
+  readonly protocol: Setting<OtlpProtocol>;
+  readonly headers: Setting<Readonly<Record<string, string>>>;
+}
+
+const settings = (prefix: string): Config.Config<Settings> =>
+  Config.all({
+    endpoint: endpoint(`${prefix}ENDPOINT`),
+    protocol: protocol(`${prefix}PROTOCOL`),
+    headers: headers(`${prefix}HEADERS`),
+  });
+
+/** The signal's own variable claims the signal once set, valid or not. */
+const isClaimed = (setting: Setting<unknown>) =>
+  setting.value !== undefined || setting.warning !== undefined;
+
+const claimed = <A>(own: Setting<A>, generic: Setting<A>) => (isClaimed(own) ? own : generic);
+
+/** Appends the signal's path, keeping the query an intake may take its API key in. */
+const withSignalPath = (signal: OtlpSignalName, base: URL) => {
+  const url = new URL(base);
+  const slash = url.pathname.endsWith("/") ? "" : "/";
+  url.pathname += `${slash}v1/${signal.toLowerCase()}`;
+  return url;
+};
+
+interface ResolvedSignal {
+  readonly signal: OtelSignal;
+  /** The settings this signal read, whose warnings are the signal's to report. */
+  readonly used: ReadonlyArray<Setting<unknown>>;
+}
+
+/**
+ * A signal whose endpoint, protocol, or headers do not read is not exported
+ * rather than sent somewhere, in a format, or without the credentials its
+ * collector expects. `none` turns the signal off before any of those are read,
+ * whether or not an endpoint was named.
+ */
+const signal = (
+  name: OtlpSignalName,
+  exporter: Setting<Exporter>,
+  own: Settings,
+  generic: Settings,
+): ResolvedSignal => {
+  if (exporter.value === "none") {
+    return { signal: OtelSignal.Off(), used: [exporter] };
+  }
+  const resolved = endpointSignal(name, own, generic);
+  return { signal: resolved.signal, used: [exporter, ...resolved.used] };
+};
+
+const endpointSignal = (name: OtlpSignalName, own: Settings, generic: Settings): ResolvedSignal => {
+  const ownEndpoint = isClaimed(own.endpoint);
+  const endpoint = ownEndpoint ? own.endpoint : generic.endpoint;
+  if (endpoint.value === undefined) {
+    const signal = endpoint.warning === undefined ? OtelSignal.Unset() : OtelSignal.Off();
+    return { signal, used: [endpoint] };
+  }
+  const protocol = claimed(own.protocol, generic.protocol);
+  const headers = claimed(own.headers, generic.headers);
+  const used = [endpoint, protocol, headers];
+  if (protocol.warning !== undefined || headers.warning !== undefined) {
+    return { signal: OtelSignal.Off(), used };
+  }
+  const url = ownEndpoint ? endpoint.value : withSignalPath(name, endpoint.value);
+  return {
+    signal: OtelSignal.Export({
+      url: url.toString(),
+      protocol: protocol.value ?? "http/protobuf",
+      headers: headers.value,
+    }),
+    used,
+  };
+};
+
+export const load: Effect.Effect<OtelEnvironment> = Config.all({
+  t3: flag(
+    "T3CODE_OTEL_SDK_DISABLED",
+    T3CODE_TRUE,
+    T3CODE_FALSE,
+    (value) => `T3CODE_OTEL_SDK_DISABLED=${value} is not a yes or a no and was ignored`,
+  ),
+  // The specification: a boolean it defines is true "only by the
+  // case-insensitive string `true`", implementations "MUST NOT" accept other
+  // values as true, and should warn about unrecognized ones.
+  spec: flag(
+    "OTEL_SDK_DISABLED",
+    ["true"],
+    ["false"],
+    (value) =>
+      `OTEL_SDK_DISABLED=${value} was read as false; the OpenTelemetry specification recognizes only the string true, so use OTEL_SDK_DISABLED=true or T3CODE_OTEL_SDK_DISABLED to say it any other way`,
+  ),
+  resource: resourceAttributes,
+  generic: settings("OTEL_EXPORTER_OTLP_"),
+  traces: settings("OTEL_EXPORTER_OTLP_TRACES_"),
+  metrics: settings("OTEL_EXPORTER_OTLP_METRICS_"),
+  logs: settings("OTEL_EXPORTER_OTLP_LOGS_"),
+  exporters: Config.all({
+    traces: exporter("OTEL_TRACES_EXPORTER"),
+    metrics: exporter("OTEL_METRICS_EXPORTER"),
+    logs: exporter("OTEL_LOGS_EXPORTER"),
+  }),
+}).pipe(
+  Effect.map(({ t3, spec, resource, generic, exporters, ...own }) => {
+    const disabled = t3.value ?? spec.value ?? false;
+    // The kill switch wins outright, so the signals say nothing once it is set.
+    const signals = disabled
+      ? undefined
+      : {
+          traces: signal("TRACES", exporters.traces, own.traces, generic),
+          metrics: signal("METRICS", exporters.metrics, own.metrics, generic),
+          logs: signal("LOGS", exporters.logs, own.logs, generic),
+        };
+    // A generic variable read by several signals warns once.
+    const used = new Set(
+      signals === undefined ? [] : Object.values(signals).flatMap((resolved) => resolved.used),
+    );
+    const warnings = [
+      t3.warning,
+      spec.warning,
+      resource.warning,
+      ...Array.from(used, (setting) => setting.warning),
+    ].filter((warning) => warning !== undefined);
+    if (disabled) {
+      warnings.push(
+        t3.value
+          ? "T3CODE_OTEL_SDK_DISABLED is set, so no telemetry is exported, whatever configured it"
+          : "OTEL_SDK_DISABLED is set, so no telemetry is exported, whatever configured it; set T3CODE_OTEL_SDK_DISABLED=false to export anyway",
+      );
+    }
+    return {
+      disabled,
+      warnings,
+      resourceAttributes: resource.value,
+      traces: signals?.traces.signal ?? OtelSignal.Unset(),
+      metrics: signals?.metrics.signal ?? OtelSignal.Unset(),
+      logs: signals?.logs.signal ?? OtelSignal.Unset(),
+    };
+  }),
+  // Every read above falls back instead of failing, so this cannot happen.
+  Effect.orDie,
+);
+
+export type SignalName = "traces" | "metrics" | "logs";
+
+export interface SignalEndpoint {
+  readonly url: string;
+  readonly export: SignalExport;
+}
+
+/**
+ * Where one signal exports and how. `T3CODE_OTLP_*_URL` wins outright with
+ * T3 Code's own export, then an OTEL endpoint with its own headers and
+ * protocol, since `T3CODE_OTLP_HEADERS` was written for a different
+ * collector, then the first of `fallbackUrls` with T3 Code's own export.
+ */
+export const resolveSignalEndpoint = (
+  otel: OtelEnvironment,
+  signal: SignalName,
+  t3: { readonly url: string | undefined; readonly export: SignalExport },
+  ...fallbackUrls: ReadonlyArray<string | undefined>
+): SignalEndpoint | undefined => {
+  if (otel.disabled) {
+    return undefined;
+  }
+  const t3Url = blankAsUnset(t3.url);
+  if (t3Url !== undefined) {
+    return { url: t3Url, export: t3.export };
+  }
+  return OtelSignal.$match(otel[signal], {
+    Export: ({ url, protocol, headers }): SignalEndpoint => ({
+      url,
+      export: { protocol, headers, exportIntervalMs: t3.export.exportIntervalMs },
+    }),
+    Off: () => undefined,
+    Unset: () => {
+      const url = fallbackUrls.map(blankAsUnset).find((candidate) => candidate !== undefined);
+      return url === undefined ? undefined : { url, export: t3.export };
+    },
+  });
+};
+
+/**
+ * Provide this around Effect's OTLP exporters, which read
+ * `OTEL_RESOURCE_ATTRIBUTES` for themselves and die when it does not decode,
+ * so they see what `load` accepted instead.
+ */
+export const layerResourceAttributes = (attributes: Readonly<Record<string, string>>) =>
+  ConfigProvider.layerAdd(
+    ConfigProvider.fromEnv({
+      env: {
+        [RESOURCE_ATTRIBUTES]: Object.entries(attributes)
+          .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+          .join(","),
+      },
+      // Keeps an emptied list from falling through to the raw value.
+      preserveEmptyStrings: true,
+    }),
+    { asPrimary: true },
+  );
+
+/** An environment that asked for nothing, for tests and for the pairing CLI. */
+export const none: OtelEnvironment = {
+  disabled: false,
+  warnings: [],
+  resourceAttributes: {},
+  traces: OtelSignal.Unset(),
+  metrics: OtelSignal.Unset(),
+  logs: OtelSignal.Unset(),
+};
diff --git a/packages/shared/src/providerAuthReturnUrl.test.ts b/packages/shared/src/providerAuthReturnUrl.test.ts
new file mode 100644
index 000000000000..f90736738e73
--- /dev/null
+++ b/packages/shared/src/providerAuthReturnUrl.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, it } from "vite-plus/test";
+import { providerAuthReturnUrl } from "./providerAuthReturnUrl.ts";
+
+describe("provider auth return destinations", () => {
+  it.each(["t3code", "t3code-dev"])(
+    "returns to %s Welcome and the selected settings instance",
+    (scheme) => {
+      expect(providerAuthReturnUrl(`${scheme}://app/welcome?code=secret#agents:machine-id`)).toBe(
+        `${scheme}://app/welcome#agents:machine-id`,
+      );
+      expect(
+        providerAuthReturnUrl(`${scheme}://app/settings/providers?instanceId=work&code=secret`),
+      ).toBe(`${scheme}://app/settings/providers?instanceId=work`);
+    },
+  );
+  it.each([
+    "t3code://attacker/welcome",
+    "t3code://app:123/welcome",
+    "t3code://app/auth/callback",
+    "t3code://user@ app/welcome",
+    "t3code://app/welcome/../evil",
+    "https://attacker.example/welcome",
+    "file:///welcome",
+    "javascript:alert(1)",
+  ])("rejects %s", (url) => expect(providerAuthReturnUrl(url)).toBeUndefined());
+});
diff --git a/packages/shared/src/providerAuthReturnUrl.ts b/packages/shared/src/providerAuthReturnUrl.ts
new file mode 100644
index 000000000000..5a0e825117ee
--- /dev/null
+++ b/packages/shared/src/providerAuthReturnUrl.ts
@@ -0,0 +1,34 @@
+import { isLoopbackHost } from "./preview.ts";
+
+/** Only return to a local client or the hosted T3 client, never an arbitrary OAuth-supplied URL. */
+export function providerAuthReturnUrl(value: string | undefined): string | undefined {
+  if (!value) return undefined;
+  try {
+    const url = new URL(value);
+    const desktop = ["t3code:", "t3code-dev:"].includes(url.protocol) && url.host === "app";
+    const web =
+      ["http:", "https:"].includes(url.protocol) &&
+      (isLoopbackHost(url.hostname) || url.origin === "https://app.t3.codes");
+    if (
+      url.username ||
+      url.password ||
+      (!desktop && !web) ||
+      (url.pathname !== "/welcome" &&
+        url.pathname !== "/settings" &&
+        !url.pathname.startsWith("/settings/"))
+    )
+      return undefined;
+    for (const key of Array.from(url.searchParams.keys())) {
+      if (
+        url.pathname === "/welcome" ||
+        !["machine", "project", "checkout", "environmentId", "instanceId"].includes(key)
+      ) {
+        url.searchParams.delete(key);
+      }
+    }
+    if (url.pathname !== "/welcome" || !/^#agents:[\w-]+$/u.test(url.hash)) url.hash = "";
+    return url.toString();
+  } catch {
+    return undefined;
+  }
+}
diff --git a/packages/shared/src/relayClient.ts b/packages/shared/src/relayClient.ts
index 704488cdd669..849257b5b169 100644
--- a/packages/shared/src/relayClient.ts
+++ b/packages/shared/src/relayClient.ts
@@ -331,9 +331,7 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function
     for (let attempt = 0; attempt < INSTALL_LOCK_RETRY_COUNT; attempt += 1) {
       const acquired = yield* fileSystem.writeFileString(lockPath, "", { flag: "wx" }).pipe(
         Effect.as(true),
-        Effect.catch((error) =>
-          isAlreadyExists(error) ? Effect.succeed(false) : Effect.fail(error),
-        ),
+        Effect.catchIf(isAlreadyExists, () => Effect.succeed(false)),
       );
       if (acquired) return;
 
@@ -445,16 +443,16 @@ export const makeCloudflaredRelayClient = Effect.fn("cloudflared.make")(function
     }).pipe(
       Effect.scoped,
       Effect.ensuring(fileSystem.remove(lockPath, { force: true }).pipe(Effect.ignore)),
-      Effect.catch((cause) =>
-        cause instanceof RelayClientInstallError
-          ? Effect.fail(cause)
-          : Effect.fail(
-              new RelayClientInstallError({
-                reason: "write_failed",
-                message: "Could not install the relay client.",
-                cause,
-              }),
-            ),
+      Effect.catchIf(
+        (cause) => !(cause instanceof RelayClientInstallError),
+        (cause) =>
+          Effect.fail(
+            new RelayClientInstallError({
+              reason: "write_failed",
+              message: "Could not install the relay client.",
+              cause,
+            }),
+          ),
       ),
     );
   });
diff --git a/packages/shared/src/relayJwt.ts b/packages/shared/src/relayJwt.ts
index f63f458a2253..cabe340d7009 100644
--- a/packages/shared/src/relayJwt.ts
+++ b/packages/shared/src/relayJwt.ts
@@ -10,6 +10,7 @@ export const RELAY_HEALTH_REQUEST_TYP = "t3-cloud-health+jwt";
 export const RELAY_MINT_RESPONSE_TYP = "t3-env-mint+jwt";
 export const RELAY_HEALTH_RESPONSE_TYP = "t3-env-health+jwt";
 export const RELAY_ACTIVITY_PUBLISH_TYP = "t3-env-activity+jwt";
+export const RELAY_MANAGED_TUNNEL_RECOVERY_TYP = "t3-env-managed-tunnel-recovery+jwt";
 
 export class RelayJwtError extends Schema.TaggedError<RelayJwtError>()("RelayJwtError", {
   operation: Schema.Literals(["sign", "verify"]),
diff --git a/packages/shared/src/relayTracing.test.ts b/packages/shared/src/relayTracing.test.ts
index 3bb7f1ea1ac2..f96dfea8bb3b 100644
--- a/packages/shared/src/relayTracing.test.ts
+++ b/packages/shared/src/relayTracing.test.ts
@@ -97,6 +97,8 @@ describe("withRelayClientTracing", () => {
           const payload = new TextDecoder().decode(fetchFn.mock.calls[0]?.[1]?.body as Uint8Array);
           expect(payload).toContain("relay request failed");
           expect(payload).toContain("relay socket closed");
+          expect(payload).toContain('"key":"service.name","value":{"stringValue":"relay-test"}');
+          expect(payload).toContain('"key":"service.namespace","value":{"stringValue":"t3code"}');
         }),
       ),
     );
diff --git a/packages/shared/src/relayTracing.ts b/packages/shared/src/relayTracing.ts
index 1259984ea3c9..76954558eb07 100644
--- a/packages/shared/src/relayTracing.ts
+++ b/packages/shared/src/relayTracing.ts
@@ -142,6 +142,7 @@ export function makeRelayClientTracingLayer(
       serviceName: resource.serviceName,
       serviceVersion: resource.serviceVersion,
       attributes: {
+        "service.namespace": "t3code",
         "service.runtime": resource.runtime,
         "service.component": resource.component ?? "relay-client",
         "t3.client.surface": resource.client,
@@ -151,6 +152,6 @@ export function makeRelayClientTracingLayer(
 
   return Layer.effect(
     RelayClientTracer,
-    Tracer.Tracer.pipe(Effect.map(nonInterferingTracer), Effect.map(Option.some)),
+    Tracer.Tracer.pipe(Effect.map(nonInterferingTracer), Effect.asSome),
   ).pipe(Layer.provide(tracerLayer));
 }
diff --git a/packages/shared/src/schemaJson.ts b/packages/shared/src/schemaJson.ts
index 076ff67b62df..c811c1da1081 100644
--- a/packages/shared/src/schemaJson.ts
+++ b/packages/shared/src/schemaJson.ts
@@ -1,7 +1,6 @@
 import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
-import * as Option from "effect/Option";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import * as SchemaGetter from "effect/SchemaGetter";
@@ -187,7 +186,7 @@ const parseLenientJsonGetter = SchemaGetter.onSome((input: string) => {
   );
 
   return decodeJsonString(stripped).pipe(
-    Effect.map(Option.some),
+    Effect.asSome,
     Effect.mapError((error) => error.issue),
   );
 });
diff --git a/packages/shared/src/shell.test.ts b/packages/shared/src/shell.test.ts
index ad9e89719871..90bb46c45d0c 100644
--- a/packages/shared/src/shell.test.ts
+++ b/packages/shared/src/shell.test.ts
@@ -28,6 +28,7 @@ import {
   resolveWindowsEnvironment,
   SpawnExecutableResolution,
   WindowsShellEnvironment,
+  withPathDirectoryListings,
   type WindowsShellEnvironmentReader,
 } from "./shell.ts";
 
@@ -543,6 +544,40 @@ effectIt.layer(NodeServices.layer)("resolveCommandPath", (it) => {
       expect(probed.filter((filePath) => /\.(com|exe|bat|cmd)$/.test(filePath))).toHaveLength(4);
     }),
   );
+
+  it.effect("probes only listed PATH names and relists a directory that changes", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const first = yield* fs.makeTempDirectoryScoped();
+      const second = yield* fs.makeTempDirectoryScoped();
+      yield* fs.writeFileString(path.join(first, "cursor.CMD"), "");
+      yield* fs.writeFileString(path.join(second, "cursor.EXE"), "");
+      const env = { PATH: `${first};${second}`, PATHEXT: ".EXE;.CMD" };
+      const probed: Array<string> = [];
+      yield* Effect.gen(function* () {
+        expect(yield* resolveCommandPath("cursor", { env })).toBe(path.join(first, "cursor.CMD"));
+        expect(yield* isCommandAvailable("absent", { env })).toBe(false);
+        yield* fs.writeFileString(path.join(second, "late.EXE"), "");
+        yield* fs.utimes(second, 4_102_444_800, 4_102_444_800); // seconds: 2100-01-01
+        expect(yield* resolveCommandPath("late", { env })).toBe(path.join(second, "late.EXE"));
+      }).pipe(
+        withPathDirectoryListings,
+        Effect.provideService(FileSystem.FileSystem, {
+          ...fs,
+          stat: (file) => {
+            // Record candidate probes, not the per-lookup directory mtime checks.
+            if (file !== first && file !== second) probed.push(file);
+            return fs.stat(file);
+          },
+        }),
+      );
+      expect(probed).toEqual([path.join(first, "cursor.CMD"), path.join(second, "late.EXE")]);
+    }).pipe(
+      Effect.provideService(HostProcessPlatform, "win32"),
+      Effect.provideService(CommandResolutionCache, new Map()),
+    ),
+  );
 });
 
 describe("resolveCommandPath explicit-path cache", () => {
diff --git a/packages/shared/src/shell.ts b/packages/shared/src/shell.ts
index 070a3dcbd961..4980a98beb34 100644
--- a/packages/shared/src/shell.ts
+++ b/packages/shared/src/shell.ts
@@ -3,10 +3,12 @@ import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
 import * as NodeChildProcess from "node:child_process";
 import * as NodeFS from "node:fs";
+import * as Cache from "effect/Cache";
 import * as Clock from "effect/Clock";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 
 import { HostProcessEnvironment, HostProcessPlatform } from "./hostProcess.ts";
@@ -565,6 +567,52 @@ export const CommandResolutionCache = Context.Reference<Map<string, CommandResol
   },
 );
 
+interface PathDirectoryListing {
+  readonly modified: number | null | undefined;
+  readonly names: ReadonlySet<string> | undefined;
+}
+
+// mtime of a PATH directory; null when missing, undefined when unreadable.
+const directoryMtime = (directory: string) =>
+  FileSystem.FileSystem.use((fileSystem) => fileSystem.stat(directory)).pipe(
+    Effect.map((info) =>
+      info.type === "Directory" ? Option.getOrUndefined(info.mtime)?.getTime() : undefined,
+    ),
+    Effect.catch((error) => Effect.succeed(error.reason._tag === "NotFound" ? null : undefined)),
+  );
+
+// Dated before it is read, so an entry added in between changes the mtime seen
+// on the next check. Without names, lookups probe candidates directly.
+const listPathDirectory = Effect.fnUntraced(function* (
+  directory: string,
+): Effect.fn.Return<PathDirectoryListing, never, FileSystem.FileSystem> {
+  const modified = yield* directoryMtime(directory);
+  if (modified == null) return { modified, names: modified === null ? new Set() : undefined };
+  const entries = yield* FileSystem.FileSystem.use((fileSystem) =>
+    fileSystem.readDirectory(directory),
+  ).pipe(Effect.orElseSucceed(() => undefined));
+  return { modified, names: entries && new Set(entries.map((entry) => entry.toLowerCase())) };
+});
+
+const PathDirectoryListings = Context.Reference<
+  Cache.Cache<string, PathDirectoryListing, never, FileSystem.FileSystem> | undefined
+>("@t3tools/shared/shell/PathDirectoryListings", { defaultValue: () => undefined });
+
+/**
+ * Run a batch of command lookups (e.g. editor discovery) that lists each PATH
+ * directory once, relisting it if its mtime changes, and probes only listed
+ * names instead of every PATH x PATHEXT candidate per command.
+ */
+export const withPathDirectoryListings = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+  Effect.gen(function* () {
+    const listings = yield* Cache.make({
+      capacity: 1024,
+      lookup: listPathDirectory,
+      requireServicesAt: "lookup",
+    });
+    return yield* effect.pipe(Effect.provideService(PathDirectoryListings, listings));
+  });
+
 function cacheCommandResolution(
   cache: Map<string, CommandResolutionCacheEntry>,
   cacheKey: string,
@@ -675,8 +723,16 @@ const resolveCommandPathForPlatform = Effect.fn("shell.resolveCommandPathForPlat
     pathEntries.push(pathEntry);
   }
 
+  const listings = yield* PathDirectoryListings;
   for (const pathEntry of pathEntries) {
+    let listing = listings && (yield* Cache.get(listings, pathEntry));
+    if (listings && listing?.names && listing.modified !== (yield* directoryMtime(pathEntry))) {
+      yield* Cache.invalidate(listings, pathEntry);
+      listing = yield* Cache.get(listings, pathEntry);
+    }
     for (const candidate of commandCandidates) {
+      // The stat below still checks exact case and rejects non-files.
+      if (listing?.names && !listing.names.has(candidate.toLowerCase())) continue;
       const candidatePath = path.join(pathEntry, candidate);
       if (yield* isExecutableFile(candidatePath, platform, windowsPathExtensions)) {
         cacheCommandResolution(cache, cacheKey, candidatePath, nowNanos);
@@ -698,7 +754,8 @@ export const resolveCommandPath = Effect.fn("shell.resolveCommandPath")(function
   });
 });
 
-export const resolveSpawnCommand = Effect.fn("shell.resolveSpawnCommand")(function* (
+// Untraced because it runs before most spawns and returns at once off Windows.
+export const resolveSpawnCommand = Effect.fnUntraced(function* (
   command: string,
   args: ReadonlyArray<string>,
   options: CommandAvailabilityOptions = {},
diff --git a/packages/shared/src/sourceControl.test.ts b/packages/shared/src/sourceControl.test.ts
index d6c3bc5e1f81..b72f35793de5 100644
--- a/packages/shared/src/sourceControl.test.ts
+++ b/packages/shared/src/sourceControl.test.ts
@@ -110,6 +110,23 @@ describe("detectSourceControlProviderFromRemoteUrl", () => {
     });
   });
 
+  it("does not reuse SSH ports for HTTPS provider URLs", () => {
+    expect(
+      detectSourceControlProviderFromRemoteUrl("ssh://git@gitlab.example.test:24/group/repo.git"),
+    ).toEqual({
+      kind: "gitlab",
+      name: "GitLab Self-Hosted",
+      baseUrl: "https://gitlab.example.test",
+    });
+    expect(
+      detectSourceControlProviderFromRemoteUrl("ssh://git@code.example.test:24/team/project.git"),
+    ).toEqual({
+      kind: "unknown",
+      name: "code.example.test",
+      baseUrl: "https://code.example.test",
+    });
+  });
+
   it("matches self-hosted providers by complete DNS labels", () => {
     expect(
       detectSourceControlProviderFromRemoteUrl("https://github.example.com/owner/repo.git")?.kind,
diff --git a/packages/shared/src/sourceControl.ts b/packages/shared/src/sourceControl.ts
index 0b2e0e2699c6..ddfa3bdf9b46 100644
--- a/packages/shared/src/sourceControl.ts
+++ b/packages/shared/src/sourceControl.ts
@@ -146,6 +146,10 @@ export function isSshRemoteUrl(remoteUrl: string): boolean {
   return SCP_SSH_REMOTE_PATTERN.test(trimmed) || trimmed.toLowerCase().startsWith("ssh://");
 }
 
+/**
+ * Extracts the normalized host used for provider detection. SCP-style and SSH remotes return the
+ * hostname only, while other URL schemes retain explicit ports for non-default web endpoints.
+ */
 function parseRemoteHost(remoteUrl: string): string | null {
   const trimmed = remoteUrl.trim();
   if (trimmed.length === 0) {
@@ -158,7 +162,8 @@ function parseRemoteHost(remoteUrl: string): string | null {
   }
 
   try {
-    return new URL(trimmed).host.toLowerCase();
+    const url = new URL(trimmed);
+    return (url.protocol === "ssh:" ? url.hostname : url.host).toLowerCase();
   } catch {
     return null;
   }
diff --git a/packages/shared/src/threadPullRequests.test.ts b/packages/shared/src/threadPullRequests.test.ts
index 4844df8f7786..a7042a7c8828 100644
--- a/packages/shared/src/threadPullRequests.test.ts
+++ b/packages/shared/src/threadPullRequests.test.ts
@@ -242,6 +242,18 @@ describe("legacyLinkedPullRequestOf", () => {
   it("does not guess when the project identity is unavailable", () => {
     expect(legacyLinkedPullRequestOf([link(7)], "project-1" as never, null)).toBeNull();
   });
+  it("does not route links for a local-path remote with no host or provider", () => {
+    const localIdentity = {
+      canonicalKey: "/tmp/r/remote",
+      displayName: "remote",
+      locator: {
+        source: "git-remote" as const,
+        remoteName: "origin",
+        remoteUrl: "/tmp/r/remote.git",
+      },
+    };
+    expect(legacyLinkedPullRequestOf([link(7)], "project-1" as never, localIdentity)).toBeNull();
+  });
 });
 
 describe("resolveThreadPullRequestChains", () => {
diff --git a/packages/shared/src/threadPullRequests.ts b/packages/shared/src/threadPullRequests.ts
index e747c151bd1c..15b5451adf0a 100644
--- a/packages/shared/src/threadPullRequests.ts
+++ b/packages/shared/src/threadPullRequests.ts
@@ -157,7 +157,9 @@ export function legacyLinkedPullRequestOf(
   identity: RepositoryIdentity | null | undefined,
 ): ThreadLinkedPullRequest | null {
   if (!identity) return null;
+  // A local-path remote has no host segment and no provider, so there is no host to match.
   const host = pullRequestHostOf(identity, identity.provider as SourceControlProviderKind);
+  if (typeof host !== "string") return null;
   const repository = sourceControlRepositorySelector(identity);
   if (repository === null) return null;
   const azureKey =
diff --git a/packages/shared/src/usageFormat.test.ts b/packages/shared/src/usageFormat.test.ts
index 3e92d0b3cb85..3a47ede3bcc8 100644
--- a/packages/shared/src/usageFormat.test.ts
+++ b/packages/shared/src/usageFormat.test.ts
@@ -5,10 +5,22 @@ import {
   enumerateHourStarts,
   formatDateTimeShort,
   formatHourShort,
+  formatPercent,
   formatRelativeHourShort,
   makeWindow,
 } from "./usageFormat.ts";
 
+describe("formatPercent", () => {
+  it("distinguishes a small positive share from zero", () => {
+    expect(formatPercent(0)).toBe("0.0%");
+    expect(formatPercent(0.0004)).toBe("<0.1%");
+    expect(formatPercent(0.0009)).toBe("<0.1%");
+    expect(formatPercent(0.001)).toBe("0.1%");
+    expect(formatPercent(0.023)).toBe("2.3%");
+    expect(formatPercent(0.00004, 2)).toBe("<0.01%");
+  });
+});
+
 describe("hourly usage formatting", () => {
   it("keeps requested zones separate when formatting repeated calls", () => {
     const instant = "2026-08-11T12:37:00.000Z";
diff --git a/packages/shared/src/usageFormat.ts b/packages/shared/src/usageFormat.ts
index 442687308323..83b2d53fb99f 100644
--- a/packages/shared/src/usageFormat.ts
+++ b/packages/shared/src/usageFormat.ts
@@ -6,6 +6,8 @@
  */
 import { UsageDay, type UsageResolution, type UsageSummaryInput } from "@t3tools/contracts";
 
+import type { UsageContractMismatch } from "./usageMerge.ts";
+
 const CURRENCY = new Intl.NumberFormat("en-US", {
   style: "currency",
   currency: "USD",
@@ -43,7 +45,19 @@ function trim(value: number): string {
 }
 
 export function formatPercent(share: number, digits = 1): string {
-  return `${(share * 100).toFixed(digits)}%`;
+  const percent = share * 100;
+  const smallest = 10 ** -digits;
+  if (percent > 0 && percent < smallest) return `<${smallest.toFixed(digits)}%`;
+  return `${percent.toFixed(digits)}%`;
+}
+
+export function formatUsageContractMismatch(
+  environmentLabel: string,
+  mismatch: Pick<UsageContractMismatch, "direction">,
+): string {
+  return mismatch.direction === "serverBehind"
+    ? `${environmentLabel} runs an older server version and is excluded from totals.`
+    : `This client is older than the server on ${environmentLabel}; its usage is excluded from totals.`;
 }
 
 /** `2026-08-07` to `Aug 7`. */
diff --git a/packages/shared/src/usageLimits.test.ts b/packages/shared/src/usageLimits.test.ts
index 0ef53b1e7f55..e93c68d1afdb 100644
--- a/packages/shared/src/usageLimits.test.ts
+++ b/packages/shared/src/usageLimits.test.ts
@@ -3,6 +3,8 @@ import {
   ProviderDriverKind,
   ProviderInstanceId,
   type ServerProvider,
+  EventId,
+  type OrchestrationThreadActivity,
   UsageLimitSourceId,
 } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
@@ -14,14 +16,18 @@ import {
   sameUsageLimitCommandCoverage,
   withUsageLimitsCommands,
   collectLimitAccounts,
+  collectExternalUsageLinks,
   collectLimitNotices,
   collectLimitPools,
+  displayLimitWindows,
   elapsedShare,
   formatResetsIn,
   limitsNotice,
   paceOf,
   providersWithLimits,
   remainingPercent,
+  isChatGptUsageLimitError,
+  usesChatGptSharing,
 } from "./usageLimits.ts";
 
 const now = Date.parse("2026-09-03T12:00:00.000Z");
@@ -201,6 +207,74 @@ describe("pools", () => {
     expect(accounts[0]?.limits.windows[0]?.usedPercent).toBe(55);
   });
 
+  it("merges OpenCode Go limits from machines with the same API key", () => {
+    const go = provider({
+      driver: ProviderDriverKind.make("opencode"),
+      instanceId: ProviderInstanceId.make("opencode"),
+      auth: { status: "authenticated" },
+      usageLimits: {
+        checkedAt,
+        credentialFingerprint: "shared-go-key",
+        windows: [{ ...window, id: "go_rolling", usedPercent: 3 }],
+      },
+    });
+    const input = new Map([
+      [EnvironmentId.make("env-a"), { ...laptop, serverConfig: { providers: [go] } }],
+      [
+        EnvironmentId.make("env-b"),
+        {
+          entry: { target: { label: "Desktop" } },
+          serverConfig: {
+            providers: [
+              {
+                ...go,
+                usageLimits: {
+                  ...go.usageLimits!,
+                  checkedAt: "2026-09-03T11:30:00.000Z",
+                  windows: [{ ...window, id: "go_rolling", usedPercent: 4 }],
+                },
+              },
+            ],
+          },
+        },
+      ],
+    ]);
+    const accounts = collectLimitAccounts(input);
+    expect(accounts).toHaveLength(1);
+    expect(accounts[0]?.environments).toEqual([
+      { environmentId: "env-a", label: "Laptop" },
+      { environmentId: "env-b", label: "Desktop" },
+    ]);
+    expect(collectLimitPools(accounts, now)[0]?.windows[0]?.members).toHaveLength(1);
+    expect(accounts[0]?.limits.windows[0]?.usedPercent).toBe(4);
+
+    const differentKey = {
+      ...go,
+      usageLimits: { ...go.usageLimits!, credentialFingerprint: "other-go-key" },
+    };
+    input.set(EnvironmentId.make("env-b"), {
+      entry: { target: { label: "Desktop" } },
+      serverConfig: { providers: [differentKey] },
+    });
+    expect(collectLimitAccounts(input)).toHaveLength(2);
+
+    input.set(EnvironmentId.make("env-a"), {
+      ...laptop,
+      serverConfig: {
+        providers: [{ ...go, auth: { status: "authenticated", email: "same@example.com" } }],
+      },
+    });
+    input.set(EnvironmentId.make("env-b"), {
+      entry: { target: { label: "Desktop" } },
+      serverConfig: {
+        providers: [
+          { ...differentKey, auth: { status: "authenticated", email: "SAME@example.com" } },
+        ],
+      },
+    });
+    expect(collectLimitAccounts(input)).toHaveLength(1);
+  });
+
   it("takes windows from a fresher hub read but credits and redeem from the native instance", () => {
     const native = provider({
       driver: claude,
@@ -687,6 +761,53 @@ describe("pooled account columns", () => {
   });
 });
 
+describe("Cursor limit presentation", () => {
+  const cursorAccount: LimitAccount = {
+    key: "cursor",
+    driver: ProviderDriverKind.make("cursor"),
+    displayName: "Cursor",
+    email: undefined,
+    plan: undefined,
+    accentColor: undefined,
+    environments: [],
+    sourceLabel: "Cursor",
+    redeem: null,
+    limits: {
+      checkedAt: "2026-09-03T11:00:00.000Z",
+      windows: [
+        { id: "apiPercentUsed", kind: "monthly", label: "Other Models", usedPercent: 49 },
+        { id: "autoPercentUsed", kind: "monthly", label: "Cursor Models", usedPercent: 9 },
+        { id: "totalPercentUsed", kind: "monthly", label: "Overall", usedPercent: 15 },
+      ],
+    },
+  };
+
+  it("hides the combined percentage and orders the two pools", () => {
+    const [pool] = collectLimitPools([cursorAccount], now);
+    const display = displayLimitWindows(pool!);
+    expect(display.map((window) => window.id)).toEqual(["autoPercentUsed", "apiPercentUsed"]);
+  });
+
+  it("keeps the combined percentage as a card if either allowance is missing", () => {
+    const [pool] = collectLimitPools(
+      [
+        {
+          ...cursorAccount,
+          limits: {
+            ...cursorAccount.limits,
+            windows: cursorAccount.limits.windows.filter(
+              (window) => window.id !== "apiPercentUsed",
+            ),
+          },
+        },
+      ],
+      now,
+    );
+    const display = displayLimitWindows(pool!);
+    expect(display.map((window) => window.id)).toEqual(["totalPercentUsed", "autoPercentUsed"]);
+  });
+});
+
 describe("collectLimitNotices", () => {
   const checkedAt = "2026-09-03T11:00:00.000Z";
   const claude = ProviderDriverKind.make("claudeAgent");
@@ -1008,3 +1129,108 @@ describe("isUsageLimitsCommand", () => {
     expect(isUsageLimitsCommand("/usage")).toBe(false);
   });
 });
+
+describe("external usage settings", () => {
+  it("deduplicates destinations across accounts and environments without inventing quota pools", () => {
+    const managed = provider({
+      usageLimits: {
+        checkedAt: "2026-09-03T11:00:00.000Z",
+        windows: [],
+        unavailable: { reason: "unsupported", message: "Track usage in ChatGPT." },
+        externalUsage: { label: "ChatGPT usage", url: "https://chatgpt.com/#settings/Usage" },
+      },
+    });
+    const presentations = new Map([
+      [
+        EnvironmentId.make("a"),
+        {
+          entry: { target: { label: "A" } },
+          serverConfig: {
+            providers: [managed, { ...managed, instanceId: ProviderInstanceId.make("personal") }],
+          },
+        },
+      ],
+      [
+        EnvironmentId.make("b"),
+        { entry: { target: { label: "B" } }, serverConfig: { providers: [managed] } },
+      ],
+    ]);
+    expect(collectExternalUsageLinks(presentations)).toEqual([
+      {
+        ...managed.usageLimits!.externalUsage,
+        message: "Track usage in ChatGPT.",
+        accounts: [`${managed.instanceId} on A`, "personal on A", `${managed.instanceId} on B`],
+      },
+    ]);
+    expect(collectLimitAccounts(presentations)).toEqual([]);
+    expect(collectLimitNotices(presentations)).toEqual([]);
+  });
+  it("omits disabled, uninstalled and signed-out providers", () => {
+    const managed = provider({
+      usageLimits: {
+        checkedAt: "2026-09-03T11:00:00.000Z",
+        windows: [],
+        externalUsage: { label: "ChatGPT usage", url: "https://chatgpt.com/#settings/Usage" },
+      },
+    });
+    const presentations = new Map([
+      [
+        EnvironmentId.make("a"),
+        {
+          entry: { target: { label: "A" } },
+          serverConfig: {
+            providers: [
+              { ...managed, enabled: false },
+              { ...managed, installed: false },
+              { ...managed, auth: { status: "unauthenticated" as const } },
+              provider({}),
+            ],
+          },
+        },
+      ],
+    ]);
+    expect(collectExternalUsageLinks(presentations)).toEqual([]);
+  });
+});
+
+describe("ChatGPT sharing presentation", () => {
+  it("requires verified sharing metadata rather than the Codex driver or login type", () => {
+    const codex = provider({ auth: { status: "authenticated", type: "chatgpt" } });
+    expect(usesChatGptSharing(codex)).toBe(false);
+    expect(
+      usesChatGptSharing({ ...codex, auth: { ...codex.auth, subscriptionSharing: true } }),
+    ).toBe(true);
+    expect(
+      usesChatGptSharing({
+        ...codex,
+        auth: { status: "unauthenticated", subscriptionSharing: true },
+      }),
+    ).toBe(false);
+  });
+  it("only gives the matching current structured limit error a management action", () => {
+    const limit: OrchestrationThreadActivity = {
+      id: EventId.make("sharing-limit"),
+      tone: "error",
+      kind: "runtime.error",
+      summary: "Runtime error",
+      turnId: null,
+      createdAt: "2026-09-03T12:00:00.000Z",
+      payload: { code: "subscription_sharing_usage_limit_exceeded", message: "Limit reached" },
+    };
+    expect(isChatGptUsageLimitError([limit], "Limit reached")).toBe(true);
+    expect(isChatGptUsageLimitError([limit], "A different failure")).toBe(false);
+    expect(isChatGptUsageLimitError([limit], null)).toBe(false);
+    expect(
+      isChatGptUsageLimitError(
+        [{ ...limit, payload: { message: "Limit reached" } }],
+        "Limit reached",
+      ),
+    ).toBe(false);
+    expect(
+      isChatGptUsageLimitError(
+        [limit, { ...limit, payload: { code: "unrelated", message: "Limit reached" } }],
+        "Limit reached",
+      ),
+    ).toBe(false);
+  });
+});
diff --git a/packages/shared/src/usageLimits.ts b/packages/shared/src/usageLimits.ts
index 17ba1feab5d6..b969ffb1c531 100644
--- a/packages/shared/src/usageLimits.ts
+++ b/packages/shared/src/usageLimits.ts
@@ -13,6 +13,7 @@ import {
   type ServerProviderSlashCommand,
   isProviderAvailable,
   type ServerProvider,
+  type OrchestrationThreadActivity,
   type ServerProviderUsageLimits,
   type ServerProviderUsageWindow,
   type UsageLimitSourceSnapshots,
@@ -24,6 +25,62 @@ const MINUTE = 60_000;
 const HOUR = 60 * MINUTE;
 const DAY = 24 * HOUR;
 
+export const CHATGPT_USAGE_URL = "https://chatgpt.com/#settings/Usage";
+const CHATGPT_USAGE_LIMIT_CODE = "subscription_sharing_usage_limit_exceeded";
+
+export function usesChatGptSharing(provider: ServerProvider | null | undefined): boolean {
+  return provider?.auth.status === "authenticated" && provider.auth.subscriptionSharing === true;
+}
+
+/** A historical limit must not turn an unrelated current failure into a usage notice. */
+export function isChatGptUsageLimitError(
+  activities: readonly OrchestrationThreadActivity[],
+  error: string | null | undefined,
+): boolean {
+  if (!error) return false;
+  for (let index = activities.length - 1; index >= 0; index--) {
+    const activity = activities[index]!;
+    if (activity.kind !== "runtime.error") continue;
+    const payload = activity.payload;
+    return (
+      typeof payload === "object" &&
+      payload !== null &&
+      "code" in payload &&
+      payload.code === CHATGPT_USAGE_LIMIT_CODE &&
+      "message" in payload &&
+      payload.message === error
+    );
+  }
+  return false;
+}
+
+export const CURSOR_USAGE_WINDOWS = [
+  {
+    id: "totalPercentUsed",
+    label: "Overall",
+    description: "Combined usage across both allowances, not a third quota.",
+  },
+  {
+    id: "autoPercentUsed",
+    label: "Cursor Models",
+    description: "Grok and Composer use this first. Auto can use either pool.",
+  },
+  {
+    id: "apiPercentUsed",
+    label: "Other Models",
+    description: "Claude, GPT, and Gemini use this pool. Grok and Composer fall back here.",
+  },
+] as const;
+
+export function cursorUsageWindowDetails(id: string) {
+  return CURSOR_USAGE_WINDOWS.find((window) => window.id === id);
+}
+
+function cursorUsageWindowRank(id: string): number {
+  const rank = CURSOR_USAGE_WINDOWS.findIndex((window) => window.id === id);
+  return rank < 0 ? CURSOR_USAGE_WINDOWS.length : rank;
+}
+
 /**
  * Providers that belong on the Limits view: enabled, installed, and one whose
  * driver reports subscription usage at all. A driver with no notion of usage
@@ -52,16 +109,51 @@ export type LimitPresentations = ReadonlyMap<
   }
 >;
 
-function accountKey(driver: ServerProvider["driver"], email: string | undefined): string | null {
+/** One destination per service, even when several accounts or environments use it. */
+export function collectExternalUsageLinks(presentations: LimitPresentations) {
+  const links = new Map<
+    string,
+    {
+      readonly label: string;
+      readonly url: string;
+      readonly message: string | undefined;
+      readonly accounts: readonly string[];
+    }
+  >();
+  for (const presentation of presentations.values()) {
+    for (const provider of providersWithLimits(presentation.serverConfig?.providers ?? [])) {
+      const external = provider.usageLimits?.externalUsage;
+      if (external && provider.auth.status === "authenticated") {
+        const account = `${provider.displayName ?? provider.instanceId} on ${presentation.entry.target.label}`;
+        links.set(external.url, {
+          ...external,
+          message: provider.usageLimits?.unavailable?.message,
+          accounts: [...new Set([...(links.get(external.url)?.accounts ?? []), account])],
+        });
+      }
+    }
+  }
+  return [...links.values()];
+}
+
+/** Prefer the reported email; use an identical credential when no email is available. */
+function accountKey(
+  driver: ServerProvider["driver"],
+  email: string | undefined,
+  limits?: ServerProviderUsageLimits,
+): string | null {
   const normalizedEmail = email?.trim().toLowerCase();
-  return normalizedEmail ? `${driver}:${normalizedEmail}` : null;
+  if (normalizedEmail) return `${driver}:${normalizedEmail}`;
+  return limits?.credentialFingerprint
+    ? `${driver}:credential:${limits.credentialFingerprint}`
+    : null;
 }
 
 /**
  * One subscription account as the pooled views see it, whichever way it was
- * reported. The same email signed in natively on two environments, or reported
- * by a hub as well as natively, is one account: its quota is one bucket, so
- * counting it twice would misstate what is left.
+ * reported. Matching emails or credentials across environments name
+ * one account. Its quota is one bucket, so counting it twice would misstate
+ * what is left.
  */
 export interface LimitAccount {
   readonly key: string;
@@ -159,7 +251,7 @@ export function collectLimitAccounts(presentations: LimitPresentations): readonl
     for (const provider of providersWithLimits(presentation.serverConfig?.providers ?? [])) {
       if (!provider.usageLimits || limitsNotice(provider.usageLimits) !== null) continue;
       merge(
-        accountKey(provider.driver, provider.auth.email) ??
+        accountKey(provider.driver, provider.auth.email, provider.usageLimits) ??
           `${environmentId}:${provider.instanceId}`,
         {
           key: `${environmentId}:${provider.instanceId}`,
@@ -187,27 +279,31 @@ export function collectLimitAccounts(presentations: LimitPresentations): readonl
         : source.label;
       for (const account of source.accounts) {
         if (limitsNotice(account.usageLimits) !== null) continue;
-        merge(accountKey(account.driver, account.email) ?? `${source.id}:${account.id}`, {
-          key: `${source.id}:${account.id}`,
-          driver: account.driver,
-          displayName: account.email ? null : account.id.replace(/\.json$/i, ""),
-          email: account.email,
-          plan: account.plan,
-          accentColor: undefined,
-          environments: [],
-          sourceLabel,
-          redeem: account.usageLimits.resetCredits?.nextCreditId
-            ? {
-                environmentId,
-                input: {
-                  sourceId: source.id,
-                  accountId: account.id,
-                  creditId: account.usageLimits.resetCredits.nextCreditId,
-                },
-              }
-            : null,
-          limits: account.usageLimits,
-        });
+        merge(
+          accountKey(account.driver, account.email, account.usageLimits) ??
+            `${source.id}:${account.id}`,
+          {
+            key: `${source.id}:${account.id}`,
+            driver: account.driver,
+            displayName: account.email ? null : account.id.replace(/\.json$/i, ""),
+            email: account.email,
+            plan: account.plan,
+            accentColor: undefined,
+            environments: [],
+            sourceLabel,
+            redeem: account.usageLimits.resetCredits?.nextCreditId
+              ? {
+                  environmentId,
+                  input: {
+                    sourceId: source.id,
+                    accountId: account.id,
+                    creditId: account.usageLimits.resetCredits.nextCreditId,
+                  },
+                }
+              : null,
+            limits: account.usageLimits,
+          },
+        );
       }
     }
   }
@@ -282,6 +378,17 @@ export interface LimitPool {
   readonly windows: readonly LimitPoolWindow[];
 }
 
+/** Show Cursor's two usable pools instead of a combined percentage when both are available. */
+export function displayLimitWindows(pool: LimitPool) {
+  if (pool.driver !== "cursor") return pool.windows;
+  const hasAuto = pool.windows.some((window) => window.id === "autoPercentUsed");
+  const hasApi = pool.windows.some((window) => window.id === "apiPercentUsed");
+  const hasBothPools = hasAuto && hasApi;
+  return pool.windows
+    .filter((window) => !hasBothPools || window.id !== "totalPercentUsed")
+    .sort((left, right) => cursorUsageWindowRank(left.id) - cursorUsageWindowRank(right.id));
+}
+
 const WINDOW_KIND_ORDER: Record<ServerProviderUsageWindow["kind"], number> = {
   session: 0,
   weekly: 1,
@@ -552,7 +659,7 @@ export function collectProviderUsageLimits(
   );
   const nativeAccounts = new Set(
     native.flatMap((provider) => {
-      const key = accountKey(provider.driver, provider.auth.email);
+      const key = accountKey(provider.driver, provider.auth.email, provider.usageLimits);
       return key && provider.usageLimits?.windows.length && !provider.usageLimits.unavailable
         ? [key]
         : [];
@@ -562,13 +669,13 @@ export function collectProviderUsageLimits(
   const notices: string[] = [];
   for (const provider of native) {
     if (!provider.usageLimits) continue;
-    const key = accountKey(provider.driver, provider.auth.email);
+    const key = accountKey(provider.driver, provider.auth.email, provider.usageLimits);
     const hubCredits = sources
       .flatMap((source) => source.accounts.map((account) => ({ source, account })))
       .filter(
         ({ account }) =>
           key !== null &&
-          accountKey(account.driver, account.email) === key &&
+          accountKey(account.driver, account.email, account.usageLimits) === key &&
           account.usageLimits.resetCredits &&
           !limitsNotice(account.usageLimits),
       )
@@ -615,7 +722,7 @@ export function collectProviderUsageLimits(
   for (const source of sources) {
     const matching = source.accounts.filter((account) => account.driver === selected.driver);
     for (const account of matching) {
-      const key = accountKey(account.driver, account.email);
+      const key = accountKey(account.driver, account.email, account.usageLimits);
       if (key && nativeAccounts.has(key)) continue;
       accounts.push({
         id: `${source.id}:${account.id}`,
diff --git a/packages/shared/src/usageMerge.test.ts b/packages/shared/src/usageMerge.test.ts
index 142d6922f0c4..81d1e8565a6c 100644
--- a/packages/shared/src/usageMerge.test.ts
+++ b/packages/shared/src/usageMerge.test.ts
@@ -1,15 +1,20 @@
 import {
   USAGE_CONTRACT_VERSION,
+  USAGE_MERGE_COMPATIBLE_SINCE,
   type EnvironmentId,
   type UsageBucket,
   type UsageDay,
   type UsageProviderKind,
-  type UsageSummary,
+  UsageSummary,
 } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
+import * as Schema from "effect/Schema";
 
 import { isModelCostUnknown, mergeUsage, type EnvironmentUsage } from "./usageMerge.ts";
 
+const decodeSummary = Schema.decodeUnknownSync(UsageSummary);
+const encodeSummary = Schema.encodeSync(UsageSummary);
+
 function bucket(overrides: Partial<UsageBucket> = {}): UsageBucket {
   return {
     day: "2026-08-07" as UsageDay,
@@ -74,6 +79,41 @@ function environment(id: string, usageSummary: UsageSummary): EnvironmentUsage {
 }
 
 describe("mergeUsage", () => {
+  it("counts a Cursor account once across servers while retaining each server's other providers", () => {
+    const account = {
+      provider: "cursor" as const,
+      hostId: "cursor.com",
+      homePath: "cursor-account:account-hash",
+      volumeId: "account-hash",
+    };
+    const merged = mergeUsage(
+      [
+        environment(
+          "mac",
+          summary([bucket({ provider: "cursor", sourcePath: account.homePath })], [account]),
+        ),
+        environment(
+          "linux",
+          summary(
+            [
+              bucket({ provider: "cursor", sourcePath: account.homePath }),
+              bucket({ provider: "opencode", sourcePath: "/opencode" }),
+            ],
+            [account, { provider: "opencode", hostId: "linux", homePath: "/opencode" }],
+          ),
+        ),
+      ],
+      USAGE_CONTRACT_VERSION,
+    );
+    expect(
+      merged.providers.map((provider) => [provider.provider, provider.costUsd]).sort(),
+    ).toEqual([
+      ["cursor", 10],
+      ["opencode", 10],
+    ]);
+    expect(merged.duplicateSources).toHaveLength(1);
+  });
+
   it("sums environments that read different transcript directories", () => {
     const merged = mergeUsage(
       [
@@ -146,6 +186,31 @@ describe("mergeUsage", () => {
     ).toEqual({ claude: 1, codex: 1 });
   });
 
+  it("counts overlapping provider roots once while keeping each environment's unique root", () => {
+    const source = (homePath: string) => ({
+      provider: "opencode" as const,
+      hostId: "host",
+      homePath,
+    });
+    const usage = (sourcePath: string, costUsd: number) =>
+      bucket({ provider: "opencode", sourcePath, costUsd });
+    const merged = mergeUsage(
+      [
+        environment(
+          "env-a",
+          summary([usage("/shared", 10), usage("/a", 2)], [source("/shared"), source("/a")]),
+        ),
+        environment(
+          "env-b",
+          summary([usage("/shared", 10), usage("/b", 3)], [source("/shared"), source("/b")]),
+        ),
+      ],
+      USAGE_CONTRACT_VERSION,
+    );
+    expect(merged.costUsd).toBe(15);
+    expect(merged.sessions).toBe(3);
+  });
+
   it("uses the newest scan when environments share the same transcript directory", () => {
     const source = { provider: "claude" as const, hostId: "mac", homePath: "/home/theo/.claude" };
     const environments = [
@@ -166,7 +231,105 @@ describe("mergeUsage", () => {
     }
   });
 
-  it("excludes an environment reporting an older contract version", () => {
+  it("prefers a complete scan over a newer partial scan of the same directory", () => {
+    const source = { provider: "claude" as const, hostId: "mac", homePath: "/home/theo/.claude" };
+    const incomplete = summary([bucket({ costUsd: 4, records: 2 })], [source]);
+    const partial = environment("new", {
+      ...incomplete,
+      readAt: "2026-08-07T01:00:00.000Z",
+      sources: incomplete.sources.map((entry) => ({ ...entry, status: "partial" as const })),
+    });
+    const complete = environment("old", summary([bucket()], [source]));
+
+    for (const ordered of [
+      [partial, complete],
+      [complete, partial],
+    ]) {
+      const merged = mergeUsage(ordered, USAGE_CONTRACT_VERSION);
+      expect(merged.costUsd).toBe(10);
+      expect(merged.contributingEnvironments).toEqual(["old"]);
+      expect(merged.duplicateSources).toEqual(["new: /home/theo/.claude"]);
+    }
+    expect(mergeUsage([partial], USAGE_CONTRACT_VERSION).costUsd).toBe(4);
+  });
+
+  it("keeps new cells from a later partial scan without recounting older cells", () => {
+    const source = { provider: "claude" as const, hostId: "mac", homePath: "/home/theo/.claude" };
+    const complete = environment(
+      "old",
+      summary([bucket()], [source], USAGE_MERGE_COMPATIBLE_SINCE),
+    );
+    const partialSummary = summary(
+      [
+        bucket({ sourcePath: source.homePath, costUsd: 4, records: 2 }),
+        bucket({
+          day: "2026-08-08" as UsageDay,
+          sourcePath: source.homePath,
+          costUsd: 3,
+          records: 1,
+        }),
+      ],
+      [{ ...source, distinctSessions: 2 }],
+    );
+    const partial = environment("new", {
+      ...partialSummary,
+      readAt: "2026-08-08T01:00:00.000Z",
+      sources: partialSummary.sources.map((entry) => ({ ...entry, status: "partial" as const })),
+    });
+
+    for (const ordered of [
+      [complete, partial],
+      [partial, complete],
+    ]) {
+      const merged = mergeUsage(ordered, USAGE_CONTRACT_VERSION);
+      expect(merged.costUsd).toBe(13);
+      expect(merged.records).toBe(6);
+      expect(merged.sessions).toBe(2);
+      expect(merged.daily.map(({ day, costUsd }) => [day, costUsd])).toEqual([
+        ["2026-08-07", 10],
+        ["2026-08-08", 3],
+      ]);
+      expect(merged.contributingEnvironments).toEqual(
+        ordered.map(({ environmentId }) => environmentId),
+      );
+      expect(merged.duplicateSources).toEqual(["new: /home/theo/.claude"]);
+    }
+  });
+
+  it("retains a complete cell when a larger partial cell may have skipped old records", () => {
+    const source = { provider: "claude" as const, hostId: "mac", homePath: "/home/theo/.claude" };
+    const complete = environment("old", summary([bucket()], [source]));
+    const partialSummary = summary(
+      [
+        bucket({
+          costUsd: 4,
+          records: 6,
+          totals: {
+            uncachedInputTokens: 80,
+            cachedInputTokens: 500,
+            cacheCreationTokens: 10,
+            outputTokens: 30,
+            reasoningTokens: 0,
+          },
+        }),
+      ],
+      [{ ...source, distinctSessions: 2 }],
+    );
+    const partial = environment("new", {
+      ...partialSummary,
+      readAt: "2026-08-07T01:00:00.000Z",
+      sources: partialSummary.sources.map((entry) => ({ ...entry, status: "partial" as const })),
+    });
+
+    const merged = mergeUsage([complete, partial], USAGE_CONTRACT_VERSION);
+    expect(merged.costUsd).toBe(10);
+    expect(merged.totalTokens).toBe(1160);
+    expect(merged.records).toBe(5);
+    expect(merged.sessions).toBe(1);
+    expect(merged.contributingEnvironments).toEqual(["old"]);
+  });
+
+  it("identifies an environment reporting an older contract version", () => {
     const merged = mergeUsage(
       [
         environment(
@@ -178,7 +341,7 @@ describe("mergeUsage", () => {
           summary(
             [bucket()],
             [{ provider: "claude", hostId: "linux", homePath: "/b" }],
-            USAGE_CONTRACT_VERSION - 2,
+            USAGE_MERGE_COMPATIBLE_SINCE - 1,
           ),
         ),
       ],
@@ -186,7 +349,38 @@ describe("mergeUsage", () => {
     );
 
     expect(merged.costUsd).toBe(10);
-    expect(merged.staleEnvironments).toEqual(["env-b"]);
+    expect(merged.contractMismatches).toEqual([
+      {
+        environmentId: "env-b",
+        direction: "serverBehind",
+        contractVersion: USAGE_MERGE_COMPATIBLE_SINCE - 1,
+      },
+    ]);
+  });
+
+  it("identifies an environment reporting a newer contract version", () => {
+    const merged = mergeUsage(
+      [
+        environment(
+          "env-a",
+          summary(
+            [bucket()],
+            [{ provider: "claude", hostId: "mac", homePath: "/a" }],
+            USAGE_CONTRACT_VERSION + 1,
+          ),
+        ),
+      ],
+      USAGE_CONTRACT_VERSION,
+    );
+
+    expect(merged.costUsd).toBe(0);
+    expect(merged.contractMismatches).toEqual([
+      {
+        environmentId: "env-a",
+        direction: "clientBehind",
+        contractVersion: USAGE_CONTRACT_VERSION + 1,
+      },
+    ]);
   });
 
   it("keeps the previous compatible contract version so additive provider expansions still merge", () => {
@@ -212,7 +406,86 @@ describe("mergeUsage", () => {
     );
 
     expect(merged.costUsd).toBe(14);
-    expect(merged.staleEnvironments).toEqual([]);
+    expect(merged.contractMismatches).toEqual([]);
+  });
+
+  it("keeps known usage when newer providers and bucket variants cannot be decoded", () => {
+    const known = summary([bucket()], [{ provider: "claude", hostId: "mac", homePath: "/a" }]);
+    const decoded = decodeSummary({
+      ...known,
+      buckets: [
+        ...known.buckets,
+        { ...bucket(), provider: "future-provider", costUsd: 100 },
+        { ...bucket(), costSource: "future-pricing", costUsd: 200 },
+      ],
+      sources: [
+        ...known.sources,
+        {
+          ...known.sources[0],
+          fingerprint: {
+            ...known.sources[0]?.fingerprint,
+            provider: "future-provider",
+          },
+        },
+      ],
+    });
+    expect(decoded).toEqual(known);
+    const merged = mergeUsage([environment("env-a", decoded)], USAGE_CONTRACT_VERSION);
+    expect(merged.costUsd).toBe(10);
+    expect(merged.totalTokens).toBe(1160);
+    expect(merged.contractMismatches).toEqual([]);
+  });
+
+  it("normalizes model names during decoding before grouping usage", () => {
+    const decoded = decodeSummary(
+      summary(
+        [
+          bucket({ provider: "codex", model: " gpt-5 " }),
+          bucket({ provider: "codex", model: "gpt-5" }),
+        ],
+        [{ provider: "codex", hostId: "mac", homePath: "/a" }],
+      ),
+    );
+
+    expect(decoded.buckets.map((entry) => entry.model)).toEqual(["gpt-5", "gpt-5"]);
+    const merged = mergeUsage([environment("env-a", decoded)], USAGE_CONTRACT_VERSION);
+    expect(merged.models).toHaveLength(1);
+    expect(merged.models[0]).toMatchObject({ model: "gpt-5", costUsd: 20, totalTokens: 2320 });
+  });
+
+  it("keeps all supported providers when encoding a response", () => {
+    const current = summary(
+      [bucket(), bucket({ provider: "grok" })],
+      [
+        { provider: "claude", hostId: "mac", homePath: "/a" },
+        { provider: "grok", hostId: "mac", homePath: "/b" },
+      ],
+    );
+    expect(encodeSummary(current)).toEqual(current);
+    expect(decodeSummary(encodeSummary(current))).toEqual(current);
+  });
+
+  it("still rejects a malformed summary envelope", () => {
+    expect(() => decodeSummary({ ...summary([], []), buckets: null })).toThrow();
+  });
+
+  it("excludes a future incompatible contract even when its buckets still decode", () => {
+    const decoded = decodeSummary(
+      summary(
+        [bucket()],
+        [{ provider: "claude", hostId: "mac", homePath: "/a" }],
+        USAGE_CONTRACT_VERSION + 1,
+      ),
+    );
+    const merged = mergeUsage([environment("env-a", decoded)], USAGE_CONTRACT_VERSION);
+    expect(merged.costUsd).toBe(0);
+    expect(merged.contractMismatches).toEqual([
+      {
+        environmentId: "env-a",
+        direction: "clientBehind",
+        contractVersion: USAGE_CONTRACT_VERSION + 1,
+      },
+    ]);
   });
 
   it("derives provider shares and cost quality", () => {
@@ -273,6 +546,29 @@ describe("mergeUsage", () => {
     ]);
   });
 
+  it("orders models by cost descending", () => {
+    const merged = mergeUsage(
+      [
+        environment(
+          "env-a",
+          summary(
+            [
+              bucket({ provider: "claude", model: "lower-cost", costUsd: 4 }),
+              bucket({ provider: "codex", model: "higher-cost", costUsd: 9 }),
+            ],
+            [
+              { provider: "claude", hostId: "mac", homePath: "/a/.claude" },
+              { provider: "codex", hostId: "mac", homePath: "/a/.codex" },
+            ],
+          ),
+        ),
+      ],
+      USAGE_CONTRACT_VERSION,
+    );
+
+    expect(merged.models.map((model) => model.model)).toEqual(["higher-cost", "lower-cost"]);
+  });
+
   it("keeps two machines apart when hostname and home path collide", () => {
     // Every Mac resolves /Users/theo/.claude, so a hostname clash used to make
     // one machine's usage vanish. Filesystem identity separates them.
diff --git a/packages/shared/src/usageMerge.ts b/packages/shared/src/usageMerge.ts
index fee8e9c95666..90c9a1ff4261 100644
--- a/packages/shared/src/usageMerge.ts
+++ b/packages/shared/src/usageMerge.ts
@@ -11,6 +11,7 @@ import {
   type EnvironmentId,
   type UsageBucket,
   type UsageProviderKind,
+  type UsageSource,
   type UsageSourceFingerprint,
   type UsageSummary,
 } from "@t3tools/contracts";
@@ -75,6 +76,12 @@ export interface CostQuality {
   readonly cacheSavingsUsd: number;
 }
 
+export interface UsageContractMismatch {
+  readonly environmentId: EnvironmentId;
+  readonly direction: "serverBehind" | "clientBehind";
+  readonly contractVersion: number;
+}
+
 export interface MergedUsage {
   readonly costUsd: number;
   readonly uncachedInputTokens: number;
@@ -93,7 +100,7 @@ export interface MergedUsage {
   /** Environments whose data was dropped as a duplicate of another's. */
   readonly duplicateSources: readonly string[];
   readonly contributingEnvironments: readonly EnvironmentId[];
-  readonly staleEnvironments: readonly EnvironmentId[];
+  readonly contractMismatches: readonly UsageContractMismatch[];
 }
 
 /**
@@ -113,20 +120,46 @@ function fingerprintKey(fingerprint: UsageSourceFingerprint): string {
   ].join(" ");
 }
 
+function bucketsForSource(summary: UsageSummary, source: UsageSource): readonly UsageBucket[] {
+  const providerSources = summary.sources.filter(
+    (entry) => entry.fingerprint.provider === source.fingerprint.provider,
+  );
+  return summary.buckets.filter(
+    (bucket) =>
+      bucket.provider === source.fingerprint.provider &&
+      (bucket.sourcePath === source.fingerprint.resolvedHomePath ||
+        (bucket.sourcePath === undefined && providerSources.length === 1)),
+  );
+}
+
+function bucketKey(bucket: UsageBucket): string {
+  return JSON.stringify([bucket.day, bucket.hourStart ?? null, bucket.provider, bucket.model]);
+}
+
 /**
  * Decides which environment owns each physical transcript directory.
  *
  * Several environments on one machine (worktree servers, for instance) resolve
  * the same provider home and would otherwise double count every token. The
- * most recently read summary claims a fingerprint; the rest have that provider's
- * buckets dropped. Environment ids break ties so the winner is stable when
- * summaries have the same read time.
+ * Complete scans claim a fingerprint ahead of partial scans, then the most
+ * recently read scan wins within each status. A newer partial scan can still
+ * contribute cells absent from an older complete scan. Environment ids break
+ * ties so the result is stable when summaries have the same read time.
  */
 function claimSources(environments: readonly EnvironmentUsage[]): {
   readonly ownerByFingerprint: ReadonlyMap<string, EnvironmentId>;
+  readonly supplementalBucketsByEnvironment: ReadonlyMap<EnvironmentId, ReadonlySet<UsageBucket>>;
+  readonly sessionsByFingerprint: ReadonlyMap<string, number>;
   readonly duplicates: readonly string[];
 } {
   const ownerByFingerprint = new Map<string, EnvironmentId>();
+  const ownerScanByFingerprint = new Map<
+    string,
+    { environment: EnvironmentUsage; source: UsageSource }
+  >();
+  const seenBucketKeysByFingerprint = new Map<string, Set<string>>();
+  const supplementalBucketsByEnvironment = new Map<EnvironmentId, Set<UsageBucket>>();
+  const sessionsByFingerprint = new Map<string, number>();
   const duplicates: string[] = [];
 
   const ordered = [...environments].sort(
@@ -135,30 +168,82 @@ function claimSources(environments: readonly EnvironmentUsage[]): {
       a.environmentId.localeCompare(b.environmentId),
   );
 
+  // A complete scan takes precedence over a newer partial scan of the same
+  // directory. Partial history still contributes when no complete copy exists.
+  for (const status of ["ok", "partial", "failed"] as const) {
+    for (const environment of ordered) {
+      for (const source of environment.summary.sources) {
+        if (source.status !== status) continue;
+        const key = fingerprintKey(source.fingerprint);
+        if (ownerByFingerprint.has(key)) {
+          duplicates.push(`${environment.label}: ${source.fingerprint.resolvedHomePath}`);
+          continue;
+        }
+        ownerByFingerprint.set(key, environment.environmentId);
+        ownerScanByFingerprint.set(key, { environment, source });
+        sessionsByFingerprint.set(key, source.distinctSessions);
+      }
+    }
+  }
+
+  // A newer partial scan may contain usage recorded after an older complete
+  // scan. Keep cells absent from the complete scan. Aggregated cells do not
+  // reveal enough to reconcile overlapping records without double counting.
   for (const environment of ordered) {
     for (const source of environment.summary.sources) {
-      if (source.status === "missing") continue;
+      if (source.status !== "partial") continue;
       const key = fingerprintKey(source.fingerprint);
-      if (ownerByFingerprint.has(key)) {
-        duplicates.push(`${environment.label}: ${source.fingerprint.resolvedHomePath}`);
+      const owner = ownerScanByFingerprint.get(key);
+      if (
+        owner?.source.status !== "ok" ||
+        Date.parse(environment.summary.readAt) <= Date.parse(owner.environment.summary.readAt)
+      ) {
         continue;
       }
-      ownerByFingerprint.set(key, environment.environmentId);
+      let seen = seenBucketKeysByFingerprint.get(key);
+      if (seen === undefined) {
+        seen = new Set(bucketsForSource(owner.environment.summary, owner.source).map(bucketKey));
+        seenBucketKeysByFingerprint.set(key, seen);
+      }
+      const supplemental =
+        supplementalBucketsByEnvironment.get(environment.environmentId) ?? new Set<UsageBucket>();
+      let added = false;
+      for (const bucket of bucketsForSource(environment.summary, source)) {
+        const cell = bucketKey(bucket);
+        if (seen.has(cell)) continue;
+        seen.add(cell);
+        supplemental.add(bucket);
+        added = true;
+      }
+      if (!added) continue;
+      supplementalBucketsByEnvironment.set(environment.environmentId, supplemental);
+      sessionsByFingerprint.set(
+        key,
+        Math.max(sessionsByFingerprint.get(key) ?? 0, source.distinctSessions),
+      );
     }
   }
 
-  return { ownerByFingerprint, duplicates };
+  return {
+    ownerByFingerprint,
+    supplementalBucketsByEnvironment,
+    sessionsByFingerprint,
+    duplicates,
+  };
 }
 
 /** Sources this environment owns after fingerprint claims, plus their buckets. */
 function ownedContribution(
   environment: EnvironmentUsage,
   ownerByFingerprint: ReadonlyMap<string, EnvironmentId>,
+  supplementalBuckets: ReadonlySet<UsageBucket>,
+  sessionsByFingerprint: ReadonlyMap<string, number>,
 ): {
   readonly buckets: readonly UsageBucket[];
   readonly sessionsByProvider: ReadonlyMap<UsageProviderKind, number>;
 } {
   const ownedProviders = new Set<UsageProviderKind>();
+  const ownedSources = new Set<string>();
   const sessionsByProvider = new Map<UsageProviderKind, number>();
   for (const source of environment.summary.sources) {
     if (source.status === "missing") continue;
@@ -166,16 +251,24 @@ function ownedContribution(
     if (ownerByFingerprint.get(key) === environment.environmentId) {
       const provider = source.fingerprint.provider;
       ownedProviders.add(provider);
+      ownedSources.add(`${provider}\u0000${source.fingerprint.resolvedHomePath}`);
       // Distinct within a directory. Summing per-bucket session counts instead
       // would count a session once per day and model it spans.
       sessionsByProvider.set(
         provider,
-        (sessionsByProvider.get(provider) ?? 0) + source.distinctSessions,
+        (sessionsByProvider.get(provider) ?? 0) +
+          (sessionsByFingerprint.get(key) ?? source.distinctSessions),
       );
     }
   }
   return {
-    buckets: environment.summary.buckets.filter((bucket) => ownedProviders.has(bucket.provider)),
+    buckets: environment.summary.buckets.filter(
+      (bucket) =>
+        supplementalBuckets.has(bucket) ||
+        (bucket.sourcePath === undefined
+          ? ownedProviders.has(bucket.provider)
+          : ownedSources.has(`${bucket.provider}\u0000${bucket.sourcePath}`)),
+    ),
     sessionsByProvider,
   };
 }
@@ -216,15 +309,15 @@ const EMPTY_MERGED: MergedUsage = {
   },
   duplicateSources: [],
   contributingEnvironments: [],
-  staleEnvironments: [],
+  contractMismatches: [],
 };
 
 /**
  * Merges every connected environment's summary.
  *
- * `expectedContractVersion` guards against an environment running older server
- * code: rather than blocking the page, incompatible data is excluded and its
- * id is reported so the UI can say coverage is partial. Versions in
+ * `expectedContractVersion` guards against incompatible server code: rather
+ * than blocking the page, its data is excluded and the mismatch direction is
+ * reported so the UI can identify which side needs updating. Versions in
  * [{@link USAGE_MERGE_COMPATIBLE_SINCE}, expected] still merge, so an additive
  * provider expansion does not drop Claude/Codex totals from older servers.
  */
@@ -235,18 +328,30 @@ export function mergeUsage(
   if (environments.length === 0) return EMPTY_MERGED;
 
   const current: EnvironmentUsage[] = [];
-  const staleEnvironments: EnvironmentId[] = [];
+  const contractMismatches: UsageContractMismatch[] = [];
   for (const environment of environments) {
     if (
       isCompatibleUsageContractVersion(environment.summary.contractVersion, expectedContractVersion)
     ) {
       current.push(environment);
     } else {
-      staleEnvironments.push(environment.environmentId);
+      contractMismatches.push({
+        environmentId: environment.environmentId,
+        direction:
+          environment.summary.contractVersion < expectedContractVersion
+            ? "serverBehind"
+            : "clientBehind",
+        contractVersion: environment.summary.contractVersion,
+      });
     }
   }
 
-  const { ownerByFingerprint, duplicates } = claimSources(current);
+  const {
+    ownerByFingerprint,
+    supplementalBucketsByEnvironment,
+    sessionsByFingerprint,
+    duplicates,
+  } = claimSources(current);
 
   let costUsd = 0;
   let uncachedInputTokens = 0;
@@ -295,7 +400,12 @@ export function mergeUsage(
   const contributingEnvironments: EnvironmentId[] = [];
 
   for (const environment of current) {
-    const { buckets, sessionsByProvider } = ownedContribution(environment, ownerByFingerprint);
+    const { buckets, sessionsByProvider } = ownedContribution(
+      environment,
+      ownerByFingerprint,
+      supplementalBucketsByEnvironment.get(environment.environmentId) ?? new Set(),
+      sessionsByFingerprint,
+    );
     if (buckets.length > 0) contributingEnvironments.push(environment.environmentId);
 
     for (const [providerKind, providerSessions] of sessionsByProvider) {
@@ -447,6 +557,6 @@ export function mergeUsage(
     },
     duplicateSources: duplicates,
     contributingEnvironments,
-    staleEnvironments,
+    contractMismatches,
   };
 }
diff --git a/packages/ssh/src/tunnel.test.ts b/packages/ssh/src/tunnel.test.ts
index 980107d19a82..a3c049323bce 100644
--- a/packages/ssh/src/tunnel.test.ts
+++ b/packages/ssh/src/tunnel.test.ts
@@ -227,6 +227,7 @@ describe("ssh tunnel scripts", () => {
     assert.include(script, "remote_node_satisfies_engine()");
     assert.include(script, "function satisfiesSemverRange");
     assert.include(script, "satisfiesSemverRange(rawVersion, range)");
+    assert.include(script, 'prepend_path_if_dir "/home/linuxbrew/.linuxbrew/bin"');
     assert.include(script, 'prepend_path_if_dir "$VOLTA_HOME/bin"');
     assert.include(script, 'prepend_path_if_dir "$HOME/.asdf/shims"');
     assert.include(script, 'prepend_path_if_dir "$HOME/.local/share/mise/shims"');
diff --git a/packages/ssh/src/tunnel.ts b/packages/ssh/src/tunnel.ts
index 135cb7decae9..0473ffeceae2 100644
--- a/packages/ssh/src/tunnel.ts
+++ b/packages/ssh/src/tunnel.ts
@@ -360,6 +360,7 @@ ensure_remote_node_path() {
   prepend_path_if_dir "$HOME/.local/bin"
   prepend_path_if_dir "$HOME/bin"
   prepend_path_if_dir "/opt/homebrew/bin"
+  prepend_path_if_dir "/home/linuxbrew/.linuxbrew/bin"
   prepend_path_if_dir "/usr/local/bin"
   prepend_path_if_dir "/usr/bin"
   prepend_path_if_dir "/bin"
diff --git a/patches/node-pty@1.2.0-beta.15.patch b/patches/node-pty@1.2.0-beta.15.patch
new file mode 100644
index 000000000000..2232766cdb65
--- /dev/null
+++ b/patches/node-pty@1.2.0-beta.15.patch
@@ -0,0 +1,35 @@
+diff --git a/lib/windowsConoutConnection.js b/lib/windowsConoutConnection.js
+--- a/lib/windowsConoutConnection.js
++++ b/lib/windowsConoutConnection.js
+@@ -63,7 +63,11 @@
+             conoutPipeName: _conoutPipeName
+         };
+         var scriptPath = __dirname.replace('node_modules.asar', 'node_modules.asar.unpacked');
+-        this._worker = new worker_threads_1.Worker((0, path_1.join)(scriptPath, 'worker/conoutSocketWorker.js'), { workerData: workerData });
++        // Node's watch mode reports dependencies through worker messages.
++        // Keep the host's watch environment out of this protocol worker.
++        var workerEnv = Object.assign({}, process.env);
++        delete workerEnv.WATCH_REPORT_DEPENDENCIES;
++        this._worker = new worker_threads_1.Worker((0, path_1.join)(scriptPath, 'worker/conoutSocketWorker.js'), { workerData: workerData, env: workerEnv, execArgv: [] });
+         this._worker.on('message', function (message) {
+             switch (message) {
+                 case 1 /* ConoutWorkerMessage.READY */:
+diff --git a/lib/windowsPtyAgent.js b/lib/windowsPtyAgent.js
+--- a/lib/windowsPtyAgent.js
++++ b/lib/windowsPtyAgent.js
+@@ -218,8 +218,14 @@
+             return Promise.resolve([]);
+         }
+         return new Promise(function (resolve) {
+-            var agent = (0, child_process_1.fork)(path.join(__dirname, 'conpty_console_list_agent'), [_this._innerPid.toString()]);
++            // Node's watch mode sends its own messages over the helper's IPC channel.
++            var agentEnv = Object.assign({}, process.env);
++            delete agentEnv.WATCH_REPORT_DEPENDENCIES;
++            var agent = (0, child_process_1.fork)(path.join(__dirname, 'conpty_console_list_agent'), [_this._innerPid.toString()], { env: agentEnv, execArgv: [] });
+             agent.on('message', function (message) {
++                if (!Array.isArray(message.consoleProcessList)) {
++                    return;
++                }
+                 clearTimeout(timeout);
+                 resolve(message.consoleProcessList);
+             });
diff --git a/patches/react-native-nitro-markdown@0.5.8.patch b/patches/react-native-nitro-markdown@0.5.8.patch
new file mode 100644
index 000000000000..3bf3788bdd3f
--- /dev/null
+++ b/patches/react-native-nitro-markdown@0.5.8.patch
@@ -0,0 +1,70 @@
+diff --git a/cpp/md4c/md4c.c b/cpp/md4c/md4c.c
+--- a/cpp/md4c/md4c.c
++++ b/cpp/md4c/md4c.c
+@@ -3908,10 +3908,10 @@
+         int min_components;
+         const MD_CHAR optional_end_char;
+     } URL_MAP[] = {
+-        { _T('\0'), _T('.'),  _T(".-_"),      2, _T('\0') },    /* host, mandatory */
+-        { _T('/'),  _T('/'),  _T("/.-_"),     0, _T('/') },     /* path */
+-        { _T('?'),  _T('&'),  _T("&.-+_=()"), 1, _T('\0') },    /* query */
+-        { _T('#'),  _T('\0'), _T(".-+_") ,    1, _T('\0') }     /* fragment */
++        { _T('\0'), _T('.'),  _T(".-_"),           2, _T('\0') },    /* host, mandatory */
++        { _T('/'),  _T('/'),  _T("/.-_():~%+@&!,;"), 0, _T('/') }, /* path */
++        { _T('?'),  _T('&'),  _T("&.-+_=().:!~%,;@"), 1, _T('\0') }, /* query */
++        { _T('#'),  _T('\0'), _T(".-+_:%~") ,    1, _T('\0') }     /* fragment */
+     };
+ 
+     MD_MARK* opener = &ctx->marks[mark_index];
+@@ -3981,8 +3981,11 @@
+             } else if(end < line_end  &&
+                         ISANYOF(end, URL_MAP[i].allowed_nonalnum_chars)  &&
+                         md_scan_right_for_resolved_mark(ctx, right_cursor, end, &right_cursor) == NULL  &&
+-                        ((end > line_beg && (ISALNUM(end-1) || CH(end-1) == _T(')')))  ||  CH(end) == _T('('))  &&
+-                        ((end+1 < line_end && (ISALNUM(end+1) || CH(end+1) == _T('(')))  ||  CH(end) == _T(')')))
++                        /* Scheme URLs keep '...' and ':' in the path and query.
++                         * Host, e-mail, and www labels stay flanked by alphanumerics. */
++                        ((opener->ch == _T(':') && i > 0)  ||
++                         (((end > line_beg && (ISALNUM(end-1) || CH(end-1) == _T(')')))  ||  CH(end) == _T('('))  &&
++                          ((end+1 < line_end && (ISALNUM(end+1) || CH(end+1) == _T('(')))  ||  CH(end) == _T(')')))))
+             {
+                 if(CH(end) == URL_MAP[i].delim_char)
+                     n_components++;
+@@ -4006,16 +4009,35 @@
+                 CH(end) == URL_MAP[i].optional_end_char)
+             end++;
+ 
+-        if(n_components < URL_MAP[i].min_components  ||  n_open_brackets != 0)
++        /* Scheme autolinks allow one host label, so localhost and devbox link.
++         * E-mail and www autolinks still require a dotted host. */
++        if(n_components < (i == 0 && opener->ch == ':' ? 1 : URL_MAP[i].min_components)  ||
++                n_open_brackets != 0)
+             return;
+ 
++        /* Optional port on a scheme autolink: ':' followed by digits. */
++        if(i == 0 && opener->ch == ':' && end + 1 < line_end &&
++                CH(end) == _T(':') && ISDIGIT(end + 1)) {
++            end++;
++            while(end < line_end && ISDIGIT(end))
++                end++;
++        }
++
+         if(opener->ch == '@')   /* E-mail autolinks wants only the host. */
+             break;
++    }
++
++    /* GFM leaves a trailing run of punctuation outside the link, including
++     * the sentence dots in "https://example.com/a...". */
++    if(opener->ch == _T(':')) {
++        while(end > opener->end && ISANYOF(end - 1, _T("?!.,:*")))
++            end--;
+     }
+ 
+     /* Verify there's line boundary, whitespace, allowed punctuation or
+      * resolved emphasis mark just after the suspected autolink. */
+-    if(end == line_end  ||  ISUNICODEWHITESPACE(end)  ||  ISANYOF(end, _T(")}].!?,;"))) {
++    if(end == line_end  ||  ISUNICODEWHITESPACE(end)  ||
++            ISANYOF(end, opener->ch == _T(':') ? _T(")}].!?,;:*_~'\"`<>") : _T(")}].!?,;"))) {
+         right_boundary_ok = TRUE;
+     } else {
+         MD_MARK* right_mark;
diff --git a/patches/uniwind@1.11.0.patch b/patches/uniwind@1.11.0.patch
index abf0b7b10746..4a418bf6b077 100644
--- a/patches/uniwind@1.11.0.patch
+++ b/patches/uniwind@1.11.0.patch
@@ -1,5 +1,5 @@
 diff --git a/dist/common/bundler/css-processor/processor.js b/dist/common/bundler/css-processor/processor.js
-index 7dd369fa3197dbd622832c89ac3854c401e55c3e..ab3ea1a9520907321f9c21c2a3a859262fe5075b 100644
+index 7dd369f..48321d1 100644
 --- a/dist/common/bundler/css-processor/processor.js
 +++ b/dist/common/bundler/css-processor/processor.js
 @@ -105,6 +105,64 @@ class ProcessorBuilder {
@@ -154,8 +154,27 @@ index 7dd369fa3197dbd622832c89ac3854c401e55c3e..ab3ea1a9520907321f9c21c2a3a85926
            return;
          }
          selector.forEach(selectorToken => {
+@@ -199,11 +223,16 @@ class ProcessorBuilder {
+       const {
+         mediaQueries
+       } = rule.value.query;
+-      this.declarationConfig.mediaQueries.push(...mediaQueries);
++      const outerConfig = this.declarationConfig;
++      const blockMediaQueries = [...outerConfig.mediaQueries, ...mediaQueries];
+       rule.value.rules.forEach(rule2 => {
++        this.declarationConfig = {
++          ...outerConfig,
++          mediaQueries: blockMediaQueries
++        };
+         this.parseRuleRec(rule2);
+-        this.declarationConfig = this.getDeclarationConfig();
+       });
++      this.declarationConfig = outerConfig;
+       return;
+     }
+     if (rule.type === "layer-block") {
 diff --git a/dist/metro/transformer.cjs b/dist/metro/transformer.cjs
-index d57ca8161f411f0dc7df827132586e428cafdf1b..3650a353b0db269ad4fc51b70a7158885c992e36 100644
+index d57ca81..83b58d1 100644
 --- a/dist/metro/transformer.cjs
 +++ b/dist/metro/transformer.cjs
 @@ -7,6 +7,7 @@ const culori = require('culori');
@@ -318,7 +337,23 @@ index d57ca8161f411f0dc7df827132586e428cafdf1b..3650a353b0db269ad4fc51b70a715888
            return;
          }
          selector.forEach((selectorToken) => {
-@@ -1753,10 +1778,11 @@ const transform = async (config$1, projectRoot, filePath, data, options) => {
+@@ -1629,11 +1654,13 @@ class ProcessorBuilder {
+     }
+     if (rule.type === "media") {
+       const { mediaQueries } = rule.value.query;
+-      this.declarationConfig.mediaQueries.push(...mediaQueries);
++      const outerConfig = this.declarationConfig;
++      const blockMediaQueries = [...outerConfig.mediaQueries, ...mediaQueries];
+       rule.value.rules.forEach((rule2) => {
++        this.declarationConfig = { ...outerConfig, mediaQueries: blockMediaQueries };
+         this.parseRuleRec(rule2);
+-        this.declarationConfig = this.getDeclarationConfig();
+       });
++      this.declarationConfig = outerConfig;
+       return;
+     }
+     if (rule.type === "layer-block") {
+@@ -1753,10 +1780,11 @@ const transform = async (config$1, projectRoot, filePath, data, options) => {
    await bundlerConfig.generateArtifacts(cssArtifactPath);
    const virtualCode = await compileCSS(bundlerConfig);
    const isWeb = bundlerConfig.platform === config.Platform.Web;
@@ -332,7 +367,7 @@ index d57ca8161f411f0dc7df827132586e428cafdf1b..3650a353b0db269ad4fc51b70a715888
      "utf-8"
    );
 diff --git a/dist/metro/transformer.mjs b/dist/metro/transformer.mjs
-index d3e7475f8f0aaba510b318657dc8374e6c6097cb..6ff8cffc4bb703521b6d86f0ac14be054ba5b9ce 100644
+index d3e7475..f92b73b 100644
 --- a/dist/metro/transformer.mjs
 +++ b/dist/metro/transformer.mjs
 @@ -5,6 +5,7 @@ import { converter, parse, formatHex, formatHex8 } from 'culori';
@@ -495,7 +530,23 @@ index d3e7475f8f0aaba510b318657dc8374e6c6097cb..6ff8cffc4bb703521b6d86f0ac14be05
            return;
          }
          selector.forEach((selectorToken) => {
-@@ -1746,10 +1771,11 @@ const transform = async (config, projectRoot, filePath, data, options) => {
+@@ -1622,11 +1647,13 @@ class ProcessorBuilder {
+     }
+     if (rule.type === "media") {
+       const { mediaQueries } = rule.value.query;
+-      this.declarationConfig.mediaQueries.push(...mediaQueries);
++      const outerConfig = this.declarationConfig;
++      const blockMediaQueries = [...outerConfig.mediaQueries, ...mediaQueries];
+       rule.value.rules.forEach((rule2) => {
++        this.declarationConfig = { ...outerConfig, mediaQueries: blockMediaQueries };
+         this.parseRuleRec(rule2);
+-        this.declarationConfig = this.getDeclarationConfig();
+       });
++      this.declarationConfig = outerConfig;
+       return;
+     }
+     if (rule.type === "layer-block") {
+@@ -1746,10 +1773,11 @@ const transform = async (config, projectRoot, filePath, data, options) => {
    await bundlerConfig.generateArtifacts(cssArtifactPath);
    const virtualCode = await compileCSS(bundlerConfig);
    const isWeb = bundlerConfig.platform === Platform.Web;
@@ -509,7 +560,7 @@ index d3e7475f8f0aaba510b318657dc8374e6c6097cb..6ff8cffc4bb703521b6d86f0ac14be05
      "utf-8"
    );
 diff --git a/dist/module/bundler/css-processor/processor.js b/dist/module/bundler/css-processor/processor.js
-index 58c96b6ab642c2b724d1868d0d48b77bad33be6f..70b759b04913a0e9028c936827b4578d628b4728 100644
+index 58c96b6..6849ca7 100644
 --- a/dist/module/bundler/css-processor/processor.js
 +++ b/dist/module/bundler/css-processor/processor.js
 @@ -99,6 +99,64 @@ export class ProcessorBuilder {
@@ -664,8 +715,24 @@ index 58c96b6ab642c2b724d1868d0d48b77bad33be6f..70b759b04913a0e9028c936827b4578d
            return;
          }
          selector.forEach((selectorToken) => {
+@@ -191,11 +215,13 @@ export class ProcessorBuilder {
+     }
+     if (rule.type === "media") {
+       const { mediaQueries } = rule.value.query;
+-      this.declarationConfig.mediaQueries.push(...mediaQueries);
++      const outerConfig = this.declarationConfig;
++      const blockMediaQueries = [...outerConfig.mediaQueries, ...mediaQueries];
+       rule.value.rules.forEach((rule2) => {
++        this.declarationConfig = { ...outerConfig, mediaQueries: blockMediaQueries };
+         this.parseRuleRec(rule2);
+-        this.declarationConfig = this.getDeclarationConfig();
+       });
++      this.declarationConfig = outerConfig;
+       return;
+     }
+     if (rule.type === "layer-block") {
 diff --git a/src/bundler/adapters/metro/transformer.ts b/src/bundler/adapters/metro/transformer.ts
-index 08059b0fb2394effd2553086216d8933a53fad84..05c051595bfffd313f1d731fcedc1e991af720e1 100644
+index 08059b0..05c0515 100644
 --- a/src/bundler/adapters/metro/transformer.ts
 +++ b/src/bundler/adapters/metro/transformer.ts
 @@ -5,6 +5,7 @@ import { Platform } from '@/common/consts'
@@ -699,7 +766,7 @@ index 08059b0fb2394effd2553086216d8933a53fad84..05c051595bfffd313f1d731fcedc1e99
          'utf-8',
      )
 diff --git a/src/bundler/css-processor/processor.ts b/src/bundler/css-processor/processor.ts
-index c8b3bb86e2a50c16ebc3f0404f4d9ac050aba61d..b5e185469733aca4289b7b07bc76dbfcd8fd5788 100644
+index c8b3bb8..4af4199 100644
 --- a/src/bundler/css-processor/processor.ts
 +++ b/src/bundler/css-processor/processor.ts
 @@ -123,6 +123,77 @@ export class ProcessorBuilder {
@@ -885,8 +952,32 @@ index c8b3bb86e2a50c16ebc3f0404f4d9ac050aba61d..b5e185469733aca4289b7b07bc76dbfc
  
                      return
                  }
+@@ -241,13 +275,21 @@ export class ProcessorBuilder {
+ 
+         if (rule.type === 'media') {
+             const { mediaQueries } = rule.value.query
++            // Media queries have to outlive the reset between the block's sibling
++            // rules: resetting only after each parse left every rule past the first
++            // without the block's queries, shipping ios:/android: variants and later
++            // utilities of a width breakpoint unguarded to every platform. Reset to
++            // the outer config instead of a fresh one so media nested inside a class
++            // rule keeps writing into that class.
++            const outerConfig = this.declarationConfig
++            const blockMediaQueries = [...outerConfig.mediaQueries, ...mediaQueries]
+ 
+-            this.declarationConfig.mediaQueries.push(...mediaQueries)
+             rule.value.rules.forEach(rule => {
++                this.declarationConfig = { ...outerConfig, mediaQueries: blockMediaQueries }
+                 this.parseRuleRec(rule)
+-                this.declarationConfig = this.getDeclarationConfig()
+             })
+ 
++            this.declarationConfig = outerConfig
+             return
+         }
+ 
 diff --git a/src/core/config/config.native.ts b/src/core/config/config.native.ts
-index 5e0832b5913df6f02604020d7ff5caf3b6a8d912..01aed1be25ca928f3a802996f41cb6b841aaed86 100644
+index 5e0832b..01aed1b 100644
 --- a/src/core/config/config.native.ts
 +++ b/src/core/config/config.native.ts
 @@ -8,6 +8,8 @@ import type { CSSVariables, GenerateStyleSheetsCallback, ThemeName } from '../ty
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aae2d8562abf..1aa705a1f333 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,6 +35,7 @@ catalogs:
       version: 0.3.3
 
 overrides:
+  '@exodus/bytes>@noble/hashes': 1.8.0
   '@react-navigation/core': 7.21.13
   dbus-next>usocket: '-'
   '@anthropic-ai/claude-agent-sdk>@anthropic-ai/claude-agent-sdk-darwin-arm64': '-'
@@ -106,12 +107,14 @@ patchedDependencies:
   expo-notifications@57.0.15: f89252c2c08dc7b3acb8415f319ebbe15fff8c9f88a64ebe1830cd5ac5c9ac40
   expo-sharing@57.0.17: 8d2e3b10eb3f52036a9a086800180ec6cebf3b75bccc5b1775117a7244d4ac45
   expo-widgets@57.0.15: 319a9ded5db49c5b5215c511a138b33f44c7ea2972eb418192e8d5342fe75ce6
+  node-pty@1.2.0-beta.15: f2fe901c61cde17986240002d05c172d5d0272d83ffaab8d0ebeb922763be414
   react-native-gesture-handler@2.32.0: 0579f8e4dad02bf3183d95b02620358412983c36f9bda7425dc8bcb9643b5ce2
   react-native-keyboard-controller@1.21.13: 6e4339347bc5bb3c9ea67d85ff5c814058b211c5750f247aba59d07869a2e787
+  react-native-nitro-markdown@0.5.8: 642b47830730acff3761fe29cf54271d18b493c0070c750097850b7ea032e00c
   react-native-nitro-modules@0.35.9: 825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675
   react-native-reanimated@4.5.5: bae9878a5bdba94e11c890e5ee164542feb622624fc81c13890063094608216d
   react-native-screens@4.26.2: 595114f3f9ce8b9f0d99d1aafe5c12c997b7d75ca9add31d46cbedbfe347b8e0
-  uniwind@1.11.0: 17d92be2eec71bb6396b402e8d034968e54b28746876d7977cb3139655f42b90
+  uniwind@1.11.0: a91f3953483cfd434436de6358ff5b63c49974ef148fad91246c26ba95332625
 
 importers:
 
@@ -134,7 +137,7 @@ importers:
         version: 7.0.2
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/desktop:
     dependencies:
@@ -213,7 +216,7 @@ importers:
         version: 4.3.3
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/marketing:
     dependencies:
@@ -248,9 +251,6 @@ importers:
       '@expo-google-fonts/dm-sans':
         specifier: ^0.4.2
         version: 0.4.2
-      '@expo/metro-runtime':
-        specifier: ~57.0.14
-        version: 57.0.14(@expo/log-box@57.0.4)(expo@57.0.18)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@expo/ui':
         specifier: ~57.0.14
         version: 57.0.14(@babel/core@7.29.7)(@types/react-dom@19.2.3(@types/react@19.2.16))(@types/react@19.2.16)(expo@57.0.18)(react-dom@19.2.3(react@19.2.3))(react-native-worklets@0.11.4(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
@@ -301,7 +301,7 @@ importers:
         version: link:../../packages/contracts
       '@t3tools/mobile-markdown-text':
         specifier: file:./modules/t3-markdown-text
-        version: file:apps/mobile/modules/t3-markdown-text(6f0a94b6f541bbd4be3f343e27991996)
+        version: file:apps/mobile/modules/t3-markdown-text(c883758f8793b29a89016166016b354e)
       '@t3tools/mobile-review-diff-native':
         specifier: file:./modules/t3-review-diff
         version: file:apps/mobile/modules/t3-review-diff
@@ -448,7 +448,7 @@ importers:
         version: 1.21.13(patch_hash=6e4339347bc5bb3c9ea67d85ff5c814058b211c5750f247aba59d07869a2e787)(react-native-reanimated@4.5.5(patch_hash=bae9878a5bdba94e11c890e5ee164542feb622624fc81c13890063094608216d)(react-native-worklets@0.11.4(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-nitro-markdown:
         specifier: ^0.5.0
-        version: 0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 0.5.8(patch_hash=642b47830730acff3761fe29cf54271d18b493c0070c750097850b7ea032e00c)(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-nitro-modules:
         specifier: 0.35.9
         version: 0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
@@ -481,7 +481,7 @@ importers:
         version: 3.6.0
       uniwind:
         specifier: 1.11.0
-        version: 1.11.0(patch_hash=17d92be2eec71bb6396b402e8d034968e54b28746876d7977cb3139655f42b90)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@7.0.2)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.3)
+        version: 1.11.0(patch_hash=a91f3953483cfd434436de6358ff5b63c49974ef148fad91246c26ba95332625)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@7.0.2)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.3)
     devDependencies:
       '@effect/vitest':
         specifier: 4.0.0-rc.115
@@ -519,6 +519,9 @@ importers:
       '@ff-labs/fff-node':
         specifier: 0.9.4
         version: 0.9.4(patch_hash=c4e3cc2420ceb9dc650f9d189e9c24baf7e83f342998bacda5f459a4ce7927a8)
+      '@napi-rs/keyring':
+        specifier: ^1.3.0
+        version: 1.3.0
       '@opencode-ai/sdk':
         specifier: ^1.3.15
         version: 1.15.13
@@ -528,9 +531,15 @@ importers:
       effect:
         specifier: 4.0.0-rc.115
         version: 4.0.0-rc.115(patch_hash=0dfc4bb8ebd80fb3e06b91ef61346f5259517ab0f2437644fe95ae531084b1f5)
+      jose:
+        specifier: 'catalog:'
+        version: 6.2.2
       node-pty:
-        specifier: ^1.1.0
-        version: 1.1.0
+        specifier: ^1.2.0-beta.15
+        version: 1.2.0-beta.15(patch_hash=f2fe901c61cde17986240002d05c172d5d0272d83ffaab8d0ebeb922763be414)
+      proper-lockfile:
+        specifier: 4.1.2
+        version: 4.1.2
       stream-chain:
         specifier: ^4.2.5
         version: 4.2.5
@@ -565,6 +574,9 @@ importers:
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
+      '@types/proper-lockfile':
+        specifier: ^4.1.4
+        version: 4.1.4
       '@types/yauzl':
         specifier: ^3.4.0
         version: 3.4.0
@@ -576,7 +588,7 @@ importers:
         version: link:../../packages/effect-codex-app-server
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   apps/web:
     dependencies:
@@ -767,6 +779,9 @@ importers:
       compression:
         specifier: ^1.8.1
         version: 1.8.1
+      jsdom:
+        specifier: ^30.0.1
+        version: 30.1.0(@noble/hashes@1.8.0)
       react-test-renderer:
         specifier: 19.2.6
         version: 19.2.6(react@19.2.6)
@@ -781,7 +796,7 @@ importers:
         version: '@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   infra/relay:
     dependencies:
@@ -836,7 +851,7 @@ importers:
         version: '@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   oxlint-plugin-t3code:
     dependencies:
@@ -855,7 +870,7 @@ importers:
         version: 4.0.0-rc.115(patch_hash=172bd95ef73a13d322888984415d5d18d9d2aa8e13fa529eac235efac837e902)(effect@4.0.0-rc.115(patch_hash=0dfc4bb8ebd80fb3e06b91ef61346f5259517ab0f2437644fe95ae531084b1f5))
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/client-runtime:
     dependencies:
@@ -880,6 +895,9 @@ importers:
       remark-parse:
         specifier: ^11.0.0
         version: 11.0.0
+      three:
+        specifier: 0.180.0
+        version: 0.180.0
       unified:
         specifier: ^11.0.5
         version: 11.0.5
@@ -887,12 +905,15 @@ importers:
       '@effect/vitest':
         specifier: 4.0.0-rc.115
         version: 4.0.0-rc.115(patch_hash=172bd95ef73a13d322888984415d5d18d9d2aa8e13fa529eac235efac837e902)(effect@4.0.0-rc.115(patch_hash=0dfc4bb8ebd80fb3e06b91ef61346f5259517ab0f2437644fe95ae531084b1f5))
+      '@types/three':
+        specifier: 0.180.0
+        version: 0.180.0
       micromark-util-types:
         specifier: ^2.0.2
         version: 2.0.2
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/contracts:
     dependencies:
@@ -905,7 +926,7 @@ importers:
         version: 4.0.0-rc.115(patch_hash=172bd95ef73a13d322888984415d5d18d9d2aa8e13fa529eac235efac837e902)(effect@4.0.0-rc.115(patch_hash=0dfc4bb8ebd80fb3e06b91ef61346f5259517ab0f2437644fe95ae531084b1f5))
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/effect-acp:
     dependencies:
@@ -927,7 +948,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/effect-codex-app-server:
     dependencies:
@@ -949,7 +970,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/shared:
     dependencies:
@@ -983,7 +1004,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/ssh:
     dependencies:
@@ -1008,7 +1029,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   packages/tailscale:
     dependencies:
@@ -1027,7 +1048,7 @@ importers:
         version: 24.12.4
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   scripts:
     dependencies:
@@ -1070,7 +1091,7 @@ importers:
         version: typescript@6.0.3
       vite-plus:
         specifier: 'catalog:'
-        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
 packages:
 
@@ -1140,6 +1161,14 @@ packages:
       zod:
         optional: true
 
+  '@asamuzakjp/css-color@7.0.1':
+    resolution: {integrity: sha512-C9duntabagkBZ1LebM7FKmphR4Q1pBclLxVbZETQV0akkFjV0ooFxo8FlvAQyKj9F6l8rEnmidgcTlpyxFYizg==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
+
+  '@asamuzakjp/dom-selector@9.2.1':
+    resolution: {integrity: sha512-NT4s3yZLjovPpliRpTvdsdzyPjqRqiCZj9MxnarBihbaY5MbAG7DWAJcrLlhmC7xKTNCXsTELcqB8YsqpLnUFQ==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
+
   '@astrojs/check@0.9.10':
     resolution: {integrity: sha512-zgx/UQMozdjOa3bOxjgeCFdtpE3c9rRX6xHwa+2QXvy8z8Akifu2AtubHyv/zzC2znO8dl8fFWL4K+Ba9kS8HQ==}
     hasBin: true
@@ -1768,6 +1797,10 @@ packages:
   '@blazediff/core@1.9.1':
     resolution: {integrity: sha512-ehg3jIkYKulZh+8om/O25vkvSsXXwC+skXmyA87FFx6A/45eqOkZsBltMw/TVteb0mloiGT8oGRTcjRAz66zaA==}
 
+  '@bramus/specificity@2.4.2':
+    resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==}
+    hasBin: true
+
   '@bruits/satteri-darwin-arm64@0.10.5':
     resolution: {integrity: sha512-27KTVl4TJkVahMy/ohyA7qd4938G5UNneFUz/PsScYfpIhj0IVAS23mpcJXdPF44sa6nva198lmV/cKIb2YPyA==}
     cpu: [arm64]
@@ -2023,6 +2056,42 @@ packages:
     resolution: {integrity: sha512-WTYHwlBhImGmmMt81crxaRvNdZXlBNemFyrP5GGHj2WeDTJMBrHgHTaladTypXHXrviFFBBGROl5moijRQ4ODA==}
     engines: {node: '>=18'}
 
+  '@csstools/color-helpers@6.1.1':
+    resolution: {integrity: sha512-gLNsunvwf3mCi5u5o46/Z/JcJMnhbHSaZ69rkgPzNM3J4s8hWwpPUQB6/tt0EDFyCiWzxANlx+2LJwpYj4zS1w==}
+    engines: {node: '>=20.19.0'}
+
+  '@csstools/css-calc@3.4.0':
+    resolution: {integrity: sha512-XQKj5B7QiZcHiegCOCAzcAOJdhGgWOHbbu62h5e5mkHnn8lWcfiJhllkqWmxu5zWR9jucPHuo1iTB56P033hcg==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-color-parser@4.2.3':
+    resolution: {integrity: sha512-y4LpL+lmpuyKDiEFq2PnZUVFdAjsoB/qQJod79yLNokXyW7jewi+/WJ69EfItj8A2unWtxXnGjw6LYXgXu5ZjA==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-parser-algorithms': ^4.0.0
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-parser-algorithms@4.0.0':
+    resolution: {integrity: sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==}
+    engines: {node: '>=20.19.0'}
+    peerDependencies:
+      '@csstools/css-tokenizer': ^4.0.0
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.14':
+    resolution: {integrity: sha512-HpbVXyrofRXpHpgkNIjU/3EWR4WJvOkO3emNK/L6X/mTJU7bGUI3AkkpoTNXznQLp0KRjLHELTGeKI5dIkI9JQ==}
+    peerDependencies:
+      css-tree: ^3.2.1
+    peerDependenciesMeta:
+      css-tree:
+        optional: true
+
+  '@csstools/css-tokenizer@4.0.1':
+    resolution: {integrity: sha512-bPlN9S9O1A0euCpEWE4qnvB5YDuyYVsUTrxSgmAM1Is0j4tICHoVyOVAXfWMP/kS9ZrjvyIXWV2PmomiAXXqOw==}
+    engines: {node: '>=20.19.0'}
+
   '@date-fns/tz@1.5.0':
     resolution: {integrity: sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg==}
 
@@ -2036,6 +2105,9 @@ packages:
       '@types/react':
         optional: true
 
+  '@dimforge/rapier3d-compat@0.12.0':
+    resolution: {integrity: sha512-uekIGetywIgopfD97oDL5PfeezkFpNhwlzlaEYNOA0N6ghdsOvh/HYjSMek5Q2O1PYvRSDFcqFVJl4r4ZBwOow==}
+
   '@distilled.cloud/aws@1.0.0-rc.12':
     resolution: {integrity: sha512-L4TTEwMKB1ymXbYUqvYeoy5UWgmJtqQSzry2qWtAvD2ccwVGy0F7cFViEIYQk7boF4ZIP6SfhAls4+y1fVIi/g==}
     peerDependencies:
@@ -2641,6 +2713,15 @@ packages:
     resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
+  '@exodus/bytes@1.15.1':
+    resolution: {integrity: sha512-S6mL0yNB/Abt9Ei4tq8gDhcczc4S3+vQ4ra7vxnAf+YHC02srtqxKKZghx2Dq6p0e66THKwR6r8N6P95wEty7Q==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+    peerDependencies:
+      '@noble/hashes': 1.8.0
+    peerDependenciesMeta:
+      '@noble/hashes':
+        optional: true
+
   '@exodus/schemasafe@1.3.0':
     resolution: {integrity: sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==}
 
@@ -5228,6 +5309,9 @@ packages:
   '@tiptap/starter-kit@3.31.3':
     resolution: {integrity: sha512-WKof9RewdmGHvWJ1wn0/HVNG2mV+HOgVRyJkKekuM9fgr6BZAAH/xZsWE1eon+94JnQ+KtK2ThydXQM/qc6b2A==}
 
+  '@tweenjs/tween.js@23.1.3':
+    resolution: {integrity: sha512-vJmvvwFxYuGnF2axRtPYocag6Clbb5YS7kLL+SO/TeVFzHqDIWrNKYtcsPMibjDx9O+bu+psAy9NKfWklassUA==}
+
   '@tybys/wasm-util@0.10.3':
     resolution: {integrity: sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==}
 
@@ -5339,6 +5423,9 @@ packages:
   '@types/pngjs@6.0.5':
     resolution: {integrity: sha512-0k5eKfrA83JOZPppLtS2C7OUtyNAl2wKNxfyYl9Q5g9lPkgBl/9hNyAu6HuEH2J4XmIv2znEpkDd0SaZVxW6iQ==}
 
+  '@types/proper-lockfile@4.1.4':
+    resolution: {integrity: sha512-uo2ABllncSqg9F1D4nugVl9v93RmjxF6LJzQLMLDdPaXCUIDPeOJ21Gbqi43xNKzBi/WQ0Q0dICqufzQbMjipQ==}
+
   '@types/qs@6.15.1':
     resolution: {integrity: sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==}
 
@@ -5359,15 +5446,24 @@ packages:
   '@types/responselike@1.0.3':
     resolution: {integrity: sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==}
 
+  '@types/retry@0.12.5':
+    resolution: {integrity: sha512-3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw==}
+
   '@types/send@1.2.1':
     resolution: {integrity: sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==}
 
   '@types/serve-static@2.2.0':
     resolution: {integrity: sha512-8mam4H1NHLtu7nmtalF7eyBH14QyOASmcxHhSfEoRyr0nP/YdoesEtU+uSRvMe96TW/HPTtkoKqQLl53N7UXMQ==}
 
+  '@types/stats.js@0.17.4':
+    resolution: {integrity: sha512-jIBvWWShCvlBqBNIZt0KAshWpvSjhkwkEu4ZUcASoAvhmrgAUI2t1dXrjSL4xXVLB4FznPrIsX3nKXFl/Dt4vA==}
+
   '@types/statuses@2.0.6':
     resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==}
 
+  '@types/three@0.180.0':
+    resolution: {integrity: sha512-ykFtgCqNnY0IPvDro7h+9ZeLY+qjgUWv+qEvUt84grhenO60Hqd4hScHE7VTB9nOQ/3QM8lkbNE+4vKjEpUxKg==}
+
   '@types/unist@2.0.11':
     resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==}
 
@@ -5380,6 +5476,9 @@ packages:
   '@types/webidl-conversions@7.0.3':
     resolution: {integrity: sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==}
 
+  '@types/webxr@0.5.24':
+    resolution: {integrity: sha512-h8fgEd/DpoS9CBrjEQXR+dIDraopAEfu4wYVNY2tEPwk60stPWhvZMf4Foo5FakuQ7HFZoa8WceaWFervK2Ovg==}
+
   '@types/whatwg-url@11.0.5':
     resolution: {integrity: sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==}
 
@@ -5712,6 +5811,9 @@ packages:
   '@vscode/l10n@0.0.18':
     resolution: {integrity: sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==}
 
+  '@webgpu/types@0.1.74':
+    resolution: {integrity: sha512-lgiI4hbuLcI9unnm2cL/tvCaQU45dp0xcLWJh5uB/9MBGvIA4F8XIk7nSiBeg+K4xWGYwgZKn80LmERI5CxoTA==}
+
   '@xmldom/xmldom@0.8.15':
     resolution: {integrity: sha512-/5NV/vDALVFDXgLmfsy9TRCBlKwO2LNBFzpzvb9iIj+jR+eSc6DLYYvVOdivT/jm7MtU6TebYuRmzEOI7w40UA==}
     engines: {node: '>=10.0.0'}
@@ -6259,6 +6361,9 @@ packages:
   before-after-hook@4.0.0:
     resolution: {integrity: sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==}
 
+  bidi-js@1.1.0:
+    resolution: {integrity: sha512-fX1Onk0tdVPC7obPWB5EbJ1z7NVhLq4m2xZLq2YXBkxzMXIGRpNMU88n0EPgWseKl12J7zXs7qrDxPK4sRs2fg==}
+
   big-integer@1.6.52:
     resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==}
     engines: {node: '>=0.6'}
@@ -6700,6 +6805,10 @@ packages:
     resolution: {integrity: sha512-1+BhOB8ahCn4O0cep0Sh2l9KCOfOdY+BXJnKMHFFzDEouSr/el18QwXEMRlOj9UY5nCeA8UN3a/82rUWRBeyBw==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  data-urls@7.0.0:
+    resolution: {integrity: sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   date-fns@4.4.0:
     resolution: {integrity: sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==}
 
@@ -6735,6 +6844,9 @@ packages:
       supports-color:
         optional: true
 
+  decimal.js@10.6.0:
+    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}
+
   decode-named-character-reference@1.3.0:
     resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
 
@@ -7098,6 +7210,10 @@ packages:
     resolution: {integrity: sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==}
     engines: {node: '>=0.12'}
 
+  entities@8.1.0:
+    resolution: {integrity: sha512-kxL7msIffSuh9aaFAMD7rxAIuTRMAHMeBtgHW2yUdWw732ZNh4MehkF2gdjvtdmikkaIP9bFDDJOPlsvm7avrA==}
+    engines: {node: '>=20.19.0'}
+
   env-paths@2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
@@ -7887,6 +8003,10 @@ packages:
     resolution: {integrity: sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==}
     engines: {node: ^16.14.0 || >=18.0.0}
 
+  html-encoding-sniffer@6.0.0:
+    resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
   html-escaper@3.0.3:
     resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==}
 
@@ -8025,6 +8145,9 @@ packages:
     resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==}
     engines: {node: '>=12'}
 
+  is-potential-custom-element-name@1.0.1:
+    resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==}
+
   is-promise@4.0.0:
     resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
 
@@ -8121,6 +8244,15 @@ packages:
   jsc-safe-url@0.2.4:
     resolution: {integrity: sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q==}
 
+  jsdom@30.1.0:
+    resolution: {integrity: sha512-h/Q+H+KmlGf49ITw3TrykSVbg04S75S2O7ZtJc9gMGOWBrQRZmx5AJIKLtJ01e6Kszl+/tpFthCVqxNifxhoqg==}
+    engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0}
+    peerDependencies:
+      canvas: ^3.2.3
+    peerDependenciesMeta:
+      canvas:
+        optional: true
+
   jsesc@3.1.0:
     resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
     engines: {node: '>=6'}
@@ -8344,6 +8476,10 @@ packages:
     resolution: {integrity: sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==}
     engines: {node: 20 || >=22}
 
+  lru-cache@11.5.3:
+    resolution: {integrity: sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==}
+    engines: {node: 20 || >=22}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -8469,6 +8605,9 @@ packages:
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
+  meshoptimizer@0.22.0:
+    resolution: {integrity: sha512-IebiK79sqIy+E4EgOr+CAw+Ke8hAspXKzBd0JdgEmPHiAwmvEj2S4h1rfvo+o/BnfEYd/jAOg5IeeIjzlzSnDg==}
+
   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}
@@ -8899,8 +9038,8 @@ packages:
   node-mock-http@1.0.5:
     resolution: {integrity: sha512-KQyt/wLjG3TAc7DOUhpqWzgd4ERxR80JOlTK5VE5R1S12IaPVN5qkj4klBce9HPG1Njuup4Sb5bljaT34lIyjw==}
 
-  node-pty@1.1.0:
-    resolution: {integrity: sha512-20JqtutY6JPXTUnL0ij1uad7Qe1baT46lyolh2sSENDd4sTzKZ4nmAFkeAARDKwmlLjPx6XKRlwRUxwjOy+lUg==}
+  node-pty@1.2.0-beta.15:
+    resolution: {integrity: sha512-vORSzHXi4Ofl7HemVWpuudLqCPdaQb4LfpRCUpE5HPxhp4JYscl8zZwxh11p26v2wvW24WMwnMfLjhRLixrfxA==}
 
   node-readfiles@0.2.0:
     resolution: {integrity: sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==}
@@ -9125,6 +9264,9 @@ packages:
   parse5@7.3.0:
     resolution: {integrity: sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==}
 
+  parse5@8.0.1:
+    resolution: {integrity: sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==}
+
   parseurl@1.3.3:
     resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
     engines: {node: '>= 0.8'}
@@ -9849,6 +9991,10 @@ packages:
     resolution: {integrity: sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==}
     engines: {node: '>=11.0.0'}
 
+  saxes@6.0.0:
+    resolution: {integrity: sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==}
+    engines: {node: '>=v12.22.7'}
+
   scheduler@0.27.0:
     resolution: {integrity: sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==}
 
@@ -10236,6 +10382,9 @@ packages:
       react: '>=18.0.0'
       react-dom: '>=18.0.0'
 
+  three@0.180.0:
+    resolution: {integrity: sha512-o+qycAMZrh+TsE01GqWUxUIKR1AL0S8pq7zDkYOQw8GqfX8b8VoCKYUoHbhiX5j+7hr8XsuHDVU6+gkQJQKg9w==}
+
   throat@5.0.0:
     resolution: {integrity: sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==}
 
@@ -10314,8 +10463,8 @@ packages:
     resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
     engines: {node: '>=6'}
 
-  tough-cookie@6.0.1:
-    resolution: {integrity: sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==}
+  tough-cookie@6.0.2:
+    resolution: {integrity: sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==}
     engines: {node: '>=16'}
 
   tr46@0.0.3:
@@ -10325,6 +10474,10 @@ packages:
     resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
     engines: {node: '>=18'}
 
+  tr46@6.0.0:
+    resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
+    engines: {node: '>=20'}
+
   trim-lines@3.0.1:
     resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
 
@@ -10815,6 +10968,10 @@ packages:
   w3c-keyname@2.2.8:
     resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
 
+  w3c-xmlserializer@5.0.0:
+    resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==}
+    engines: {node: '>=18'}
+
   walk-up-path@4.0.0:
     resolution: {integrity: sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==}
     engines: {node: 20 || >=22}
@@ -10841,12 +10998,20 @@ packages:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
 
+  webidl-conversions@8.0.1:
+    resolution: {integrity: sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==}
+    engines: {node: '>=20'}
+
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
   whatwg-fetch@3.6.20:
     resolution: {integrity: sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==}
 
+  whatwg-mimetype@5.0.0:
+    resolution: {integrity: sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==}
+    engines: {node: '>=20'}
+
   whatwg-url-minimum@0.1.2:
     resolution: {integrity: sha512-XPEm0XFQWNVG292lII1PrRRJl3sItrs7CettZ4ncYxuDVpLyy+NwlGyut2hXI0JswcJUxeCH+CyOJK0ZzAXD6A==}
 
@@ -10854,6 +11019,14 @@ packages:
     resolution: {integrity: sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==}
     engines: {node: '>=18'}
 
+  whatwg-url@16.0.1:
+    resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
+    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}
+
+  whatwg-url@17.1.2:
+    resolution: {integrity: sha512-TEZA+Zqxin7Jjsm2cjRohCmen5awh+hT6Zi3VZdqZlNRk7zvOI/9WpBFg/DWlA56bWnzwm6DuB8NS0EsxQH9uQ==}
+    engines: {node: ^22.14.0 || >=24.0.0}
+
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
@@ -10925,6 +11098,10 @@ packages:
     resolution: {integrity: sha512-kCz5k7J7XbJtjABOvkc5lJmkiDh8VhjVCGNiqdKCscmVpdVUpEAyXv1xmCLkQJ5dsHqx3IPO4XW+NTDhU/fatA==}
     engines: {node: '>=10.0.0'}
 
+  xml-name-validator@5.0.0:
+    resolution: {integrity: sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==}
+    engines: {node: '>=18'}
+
   xml-naming@0.1.0:
     resolution: {integrity: sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==}
     engines: {node: '>=16.0.0'}
@@ -10949,6 +11126,9 @@ packages:
     resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}
     engines: {node: '>=8.0'}
 
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
   xtend@4.0.2:
     resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
     engines: {node: '>=0.4'}
@@ -11127,6 +11307,21 @@ snapshots:
     optionalDependencies:
       zod: 4.6.5
 
+  '@asamuzakjp/css-color@7.0.1':
+    dependencies:
+      '@csstools/css-calc': 3.4.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.1))(@csstools/css-tokenizer@4.0.1)
+      '@csstools/css-color-parser': 4.2.3(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.1))(@csstools/css-tokenizer@4.0.1)
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.1)
+      '@csstools/css-tokenizer': 4.0.1
+      lru-cache: 11.5.3
+
+  '@asamuzakjp/dom-selector@9.2.1':
+    dependencies:
+      bidi-js: 1.1.0
+      css-tree: 3.2.1
+      is-potential-custom-element-name: 1.0.1
+      lru-cache: 11.5.3
+
   '@astrojs/check@0.9.10(prettier@3.8.3)(typescript@6.0.3)':
     dependencies:
       '@astrojs/language-server': 2.16.10(prettier@3.8.3)(typescript@6.0.3)
@@ -11995,6 +12190,10 @@ snapshots:
 
   '@blazediff/core@1.9.1': {}
 
+  '@bramus/specificity@2.4.2':
+    dependencies:
+      css-tree: 3.2.1
+
   '@bruits/satteri-darwin-arm64@0.10.5':
     optional: true
 
@@ -12226,6 +12425,30 @@ snapshots:
       '@crowecawcaw/xa11y-win32-arm64-msvc': 0.13.0
       '@crowecawcaw/xa11y-win32-x64-msvc': 0.13.0
 
+  '@csstools/color-helpers@6.1.1': {}
+
+  '@csstools/css-calc@3.4.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.1))(@csstools/css-tokenizer@4.0.1)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.1)
+      '@csstools/css-tokenizer': 4.0.1
+
+  '@csstools/css-color-parser@4.2.3(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.1))(@csstools/css-tokenizer@4.0.1)':
+    dependencies:
+      '@csstools/color-helpers': 6.1.1
+      '@csstools/css-calc': 3.4.0(@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.1))(@csstools/css-tokenizer@4.0.1)
+      '@csstools/css-parser-algorithms': 4.0.0(@csstools/css-tokenizer@4.0.1)
+      '@csstools/css-tokenizer': 4.0.1
+
+  '@csstools/css-parser-algorithms@4.0.0(@csstools/css-tokenizer@4.0.1)':
+    dependencies:
+      '@csstools/css-tokenizer': 4.0.1
+
+  '@csstools/css-syntax-patches-for-csstree@1.1.14(css-tree@3.2.1)':
+    optionalDependencies:
+      css-tree: 3.2.1
+
+  '@csstools/css-tokenizer@4.0.1': {}
+
   '@date-fns/tz@1.5.0': {}
 
   '@daypicker/react@10.0.1(@types/react@19.2.16)(react@19.2.6)':
@@ -12235,6 +12458,8 @@ snapshots:
     optionalDependencies:
       '@types/react': 19.2.16
 
+  '@dimforge/rapier3d-compat@0.12.0': {}
+
   '@distilled.cloud/aws@1.0.0-rc.12(effect@4.0.0-rc.115(patch_hash=0dfc4bb8ebd80fb3e06b91ef61346f5259517ab0f2437644fe95ae531084b1f5))':
     dependencies:
       '@aws-sdk/types': 3.974.5
@@ -12769,6 +12994,10 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
+  '@exodus/bytes@1.15.1(@noble/hashes@1.8.0)':
+    optionalDependencies:
+      '@noble/hashes': 1.8.0
+
   '@exodus/schemasafe@1.3.0': {}
 
   '@expo-google-fonts/dm-sans@0.4.2': {}
@@ -13255,6 +13484,7 @@ snapshots:
       whatwg-fetch: 3.6.20
     optionalDependencies:
       react-dom: 19.2.3(react@19.2.3)
+    optional: true
 
   '@expo/metro-runtime@57.0.14(@expo/log-box@57.0.4)(expo@57.0.18)(react-dom@19.2.6(react@19.2.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.6)(utf-8-validate@6.0.6))(react@19.2.6)':
     dependencies:
@@ -15058,7 +15288,7 @@ snapshots:
     dependencies:
       defer-to-connect: 2.0.1
 
-  '@t3tools/mobile-markdown-text@file:apps/mobile/modules/t3-markdown-text(6f0a94b6f541bbd4be3f343e27991996)':
+  '@t3tools/mobile-markdown-text@file:apps/mobile/modules/t3-markdown-text(c883758f8793b29a89016166016b354e)':
     dependencies:
       '@t3tools/client-runtime': link:packages/client-runtime
       '@t3tools/shared': link:packages/shared
@@ -15069,7 +15299,7 @@ snapshots:
       expo-symbols: 57.0.2(expo-font@57.0.2(expo@57.0.18)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(expo@57.0.18)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react: 19.2.3
       react-native: 0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
-      react-native-nitro-markdown: 0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+      react-native-nitro-markdown: 0.5.8(patch_hash=642b47830730acff3761fe29cf54271d18b493c0070c750097850b7ea032e00c)(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
 
   '@t3tools/mobile-review-diff-native@file:apps/mobile/modules/t3-review-diff': {}
 
@@ -15449,6 +15679,8 @@ snapshots:
       '@tiptap/extensions': 3.31.3(@tiptap/core@3.31.3(@tiptap/pm@3.31.3))(@tiptap/pm@3.31.3)
       '@tiptap/pm': 3.31.3
 
+  '@tweenjs/tween.js@23.1.3': {}
+
   '@tybys/wasm-util@0.10.3':
     dependencies:
       tslib: 2.8.1
@@ -15591,6 +15823,10 @@ snapshots:
     dependencies:
       '@types/node': 24.12.4
 
+  '@types/proper-lockfile@4.1.4':
+    dependencies:
+      '@types/retry': 0.12.5
+
   '@types/qs@6.15.1': {}
 
   '@types/range-parser@1.2.7': {}
@@ -15611,6 +15847,8 @@ snapshots:
     dependencies:
       '@types/node': 24.12.4
 
+  '@types/retry@0.12.5': {}
+
   '@types/send@1.2.1':
     dependencies:
       '@types/node': 24.12.4
@@ -15620,9 +15858,21 @@ snapshots:
       '@types/http-errors': 2.0.5
       '@types/node': 24.12.4
 
+  '@types/stats.js@0.17.4': {}
+
   '@types/statuses@2.0.6':
     optional: true
 
+  '@types/three@0.180.0':
+    dependencies:
+      '@dimforge/rapier3d-compat': 0.12.0
+      '@tweenjs/tween.js': 23.1.3
+      '@types/stats.js': 0.17.4
+      '@types/webxr': 0.5.24
+      '@webgpu/types': 0.1.74
+      fflate: 0.8.3
+      meshoptimizer: 0.22.0
+
   '@types/unist@2.0.11': {}
 
   '@types/unist@3.0.3': {}
@@ -15632,6 +15882,8 @@ snapshots:
   '@types/webidl-conversions@7.0.3':
     optional: true
 
+  '@types/webxr@0.5.24': {}
+
   '@types/whatwg-url@11.0.5':
     dependencies:
       '@types/webidl-conversions': 7.0.3
@@ -15734,12 +15986,12 @@ snapshots:
       '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.7)(@babel/plugin-transform-runtime@7.29.7(@babel/core@7.29.7))(@babel/runtime@7.29.7)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(rolldown@1.2.5)
       babel-plugin-react-compiler: 1.0.0
 
-  '@vitest/browser-preview@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))':
+  '@vitest/browser-preview@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))':
     dependencies:
       '@testing-library/dom': 10.4.1
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
-      '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))
-      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
+      '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
     transitivePeerDependencies:
       - bufferutil
       - msw
@@ -15751,14 +16003,14 @@ snapshots:
       '@testing-library/dom': 10.4.1
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
       '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(utf-8-validate@6.0.6)(vitest@4.1.11)
-      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
     transitivePeerDependencies:
       - bufferutil
       - msw
       - utf-8-validate
       - vite
 
-  '@vitest/browser@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))':
+  '@vitest/browser@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))':
     dependencies:
       '@blazediff/core': 1.9.1
       '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
@@ -15767,7 +16019,7 @@ snapshots:
       pngjs: 7.0.0
       sirv: 3.0.2
       tinyrainbow: 3.1.0
-      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
       ws: 8.21.3(bufferutil@4.1.0)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - bufferutil
@@ -15784,7 +16036,7 @@ snapshots:
       pngjs: 7.0.0
       sirv: 3.0.2
       tinyrainbow: 3.1.0
-      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
       ws: 8.21.3(bufferutil@4.1.0)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - bufferutil
@@ -15969,6 +16221,8 @@ snapshots:
 
   '@vscode/l10n@0.0.18': {}
 
+  '@webgpu/types@0.1.74': {}
+
   '@xmldom/xmldom@0.8.15': {}
 
   '@xmldom/xmldom@0.9.12': {}
@@ -16558,6 +16812,10 @@ snapshots:
 
   before-after-hook@4.0.0: {}
 
+  bidi-js@1.1.0:
+    dependencies:
+      require-from-string: 2.0.2
+
   big-integer@1.6.52: {}
 
   bippy@0.5.41(react@19.2.6):
@@ -17005,6 +17263,13 @@ snapshots:
 
   culori@4.0.2: {}
 
+  data-urls@7.0.0(@noble/hashes@1.8.0):
+    dependencies:
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 16.0.1(@noble/hashes@1.8.0)
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   date-fns@4.4.0: {}
 
   dbus-next@0.10.2(patch_hash=cfff57561b0ee59b5addb3b2e6c6f20906e967507a530ab67e8db8108e520ba4):
@@ -17033,6 +17298,8 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  decimal.js@10.6.0: {}
+
   decode-named-character-reference@1.3.0:
     dependencies:
       character-entities: 2.0.2
@@ -17302,6 +17569,8 @@ snapshots:
 
   entities@6.0.1: {}
 
+  entities@8.1.0: {}
+
   env-paths@2.2.1: {}
 
   env-paths@3.0.0: {}
@@ -18440,6 +18709,12 @@ snapshots:
     dependencies:
       lru-cache: 10.4.3
 
+  html-encoding-sniffer@6.0.0(@noble/hashes@1.8.0):
+    dependencies:
+      '@exodus/bytes': 1.15.1(@noble/hashes@1.8.0)
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   html-escaper@3.0.3: {}
 
   html-url-attributes@3.0.1: {}
@@ -18565,6 +18840,8 @@ snapshots:
 
   is-plain-obj@4.1.0: {}
 
+  is-potential-custom-element-name@1.0.1: {}
+
   is-promise@4.0.0: {}
 
   is-unicode-supported@2.1.0: {}
@@ -18646,6 +18923,31 @@ snapshots:
 
   jsc-safe-url@0.2.4: {}
 
+  jsdom@30.1.0(@noble/hashes@1.8.0):
+    dependencies:
+      '@asamuzakjp/css-color': 7.0.1
+      '@asamuzakjp/dom-selector': 9.2.1
+      '@bramus/specificity': 2.4.2
+      '@csstools/css-syntax-patches-for-csstree': 1.1.14(css-tree@3.2.1)
+      '@exodus/bytes': 1.15.1(@noble/hashes@1.8.0)
+      css-tree: 3.2.1
+      data-urls: 7.0.0(@noble/hashes@1.8.0)
+      decimal.js: 10.6.0
+      html-encoding-sniffer: 6.0.0(@noble/hashes@1.8.0)
+      is-potential-custom-element-name: 1.0.1
+      lru-cache: 11.5.3
+      parse5: 8.0.1
+      saxes: 6.0.0
+      tough-cookie: 6.0.2
+      undici: 8.10.2
+      w3c-xmlserializer: 5.0.0
+      webidl-conversions: 8.0.1
+      whatwg-mimetype: 5.0.0
+      whatwg-url: 17.1.2(@noble/hashes@1.8.0)
+      xml-name-validator: 5.0.0
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   jsesc@3.1.0: {}
 
   json-buffer@3.0.1: {}
@@ -18845,6 +19147,8 @@ snapshots:
 
   lru-cache@11.5.2: {}
 
+  lru-cache@11.5.3: {}
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
@@ -19081,6 +19385,8 @@ snapshots:
 
   merge-stream@2.0.0: {}
 
+  meshoptimizer@0.22.0: {}
+
   metro-babel-transformer@0.84.4:
     dependencies:
       '@babel/core': 7.29.7
@@ -19734,7 +20040,7 @@ snapshots:
       rettime: 0.10.1
       statuses: 2.0.2
       strict-event-emitter: 0.5.1
-      tough-cookie: 6.0.1
+      tough-cookie: 6.0.2
       type-fest: 5.7.0
       until-async: 3.0.2
       yargs: 17.7.2
@@ -19760,7 +20066,7 @@ snapshots:
       rettime: 0.10.1
       statuses: 2.0.2
       strict-event-emitter: 0.5.1
-      tough-cookie: 6.0.1
+      tough-cookie: 6.0.2
       type-fest: 5.7.0
       until-async: 3.0.2
       yargs: 17.7.2
@@ -19835,7 +20141,7 @@ snapshots:
 
   node-mock-http@1.0.5: {}
 
-  node-pty@1.1.0:
+  node-pty@1.2.0-beta.15(patch_hash=f2fe901c61cde17986240002d05c172d5d0272d83ffaab8d0ebeb922763be414):
     dependencies:
       node-addon-api: 7.1.1
 
@@ -20059,7 +20365,7 @@ snapshots:
       '@oxc-resolver/binding-win32-arm64-msvc': 11.24.2
       '@oxc-resolver/binding-win32-x64-msvc': 11.24.2
 
-  oxfmt@0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+  oxfmt@0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     dependencies:
       tinypool: 2.1.2
     optionalDependencies:
@@ -20082,9 +20388,9 @@ snapshots:
       '@oxfmt/binding-win32-arm64-msvc': 0.68.0
       '@oxfmt/binding-win32-ia32-msvc': 0.68.0
       '@oxfmt/binding-win32-x64-msvc': 0.68.0
-      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
-  oxfmt@0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+  oxfmt@0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     dependencies:
       tinypool: 2.1.2
     optionalDependencies:
@@ -20107,7 +20413,7 @@ snapshots:
       '@oxfmt/binding-win32-arm64-msvc': 0.68.0
       '@oxfmt/binding-win32-ia32-msvc': 0.68.0
       '@oxfmt/binding-win32-x64-msvc': 0.68.0
-      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   oxlint-tsgolint@7.0.2001:
     optionalDependencies:
@@ -20118,7 +20424,7 @@ snapshots:
       '@oxlint-tsgolint/win32-arm64': 7.0.2001
       '@oxlint-tsgolint/win32-x64': 7.0.2001
 
-  oxlint@1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+  oxlint@1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     optionalDependencies:
       '@oxlint/binding-android-arm-eabi': 1.83.0
       '@oxlint/binding-android-arm64': 1.83.0
@@ -20140,9 +20446,9 @@ snapshots:
       '@oxlint/binding-win32-ia32-msvc': 1.83.0
       '@oxlint/binding-win32-x64-msvc': 1.83.0
       oxlint-tsgolint: 7.0.2001
-      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
-  oxlint@1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
+  oxlint@1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)):
     optionalDependencies:
       '@oxlint/binding-android-arm-eabi': 1.83.0
       '@oxlint/binding-android-arm64': 1.83.0
@@ -20164,7 +20470,7 @@ snapshots:
       '@oxlint/binding-win32-ia32-msvc': 1.83.0
       '@oxlint/binding-win32-x64-msvc': 1.83.0
       oxlint-tsgolint: 7.0.2001
-      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      vite-plus: 0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
 
   p-cancelable@2.1.1: {}
 
@@ -20217,6 +20523,10 @@ snapshots:
     dependencies:
       entities: 6.0.1
 
+  parse5@8.0.1:
+    dependencies:
+      entities: 8.1.0
+
   parseurl@1.3.3: {}
 
   path-browserify@1.0.1: {}
@@ -20233,7 +20543,7 @@ snapshots:
 
   path-scurry@2.0.2:
     dependencies:
-      lru-cache: 11.5.2
+      lru-cache: 11.5.3
       minipass: 7.1.3
 
   path-to-regexp@6.1.0: {}
@@ -20506,8 +20816,7 @@ snapshots:
       end-of-stream: 1.4.5
       once: 1.4.0
 
-  punycode@2.3.1:
-    optional: true
+  punycode@2.3.1: {}
 
   pvtsutils@1.3.6:
     dependencies:
@@ -20633,7 +20942,7 @@ snapshots:
       react-native-is-edge-to-edge: 1.3.1(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       react-native-reanimated: 4.5.5(patch_hash=bae9878a5bdba94e11c890e5ee164542feb622624fc81c13890063094608216d)(react-native-worklets@0.11.4(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
 
-  react-native-nitro-markdown@0.5.8(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
+  react-native-nitro-markdown@0.5.8(patch_hash=642b47830730acff3761fe29cf54271d18b493c0070c750097850b7ea032e00c)(react-native-nitro-modules@0.35.9(patch_hash=825622aae63a8fb5b904f3c77908a0e216261d727ea171709f2c0b6088422675)(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native-svg@15.15.4(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3):
     dependencies:
       react: 19.2.3
       react-native: 0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
@@ -21154,6 +21463,10 @@ snapshots:
 
   sax@1.6.1: {}
 
+  saxes@6.0.0:
+    dependencies:
+      xmlchars: 2.2.0
+
   scheduler@0.27.0: {}
 
   schema-utils@4.3.3:
@@ -21615,6 +21928,8 @@ snapshots:
       react: 19.2.6
       react-dom: 19.2.6(react@19.2.6)
 
+  three@0.180.0: {}
+
   throat@5.0.0: {}
 
   through@2.3.8: {}
@@ -21646,13 +21961,11 @@ snapshots:
 
   tinyrainbow@3.1.0: {}
 
-  tldts-core@7.4.2:
-    optional: true
+  tldts-core@7.4.2: {}
 
   tldts@7.4.2:
     dependencies:
       tldts-core: 7.4.2
-    optional: true
 
   tmp-promise@3.0.3:
     dependencies:
@@ -21672,10 +21985,9 @@ snapshots:
 
   totalist@3.0.1: {}
 
-  tough-cookie@6.0.1:
+  tough-cookie@6.0.2:
     dependencies:
       tldts: 7.4.2
-    optional: true
 
   tr46@0.0.3: {}
 
@@ -21684,6 +21996,10 @@ snapshots:
       punycode: 2.3.1
     optional: true
 
+  tr46@6.0.0:
+    dependencies:
+      punycode: 2.3.1
+
   trim-lines@3.0.1: {}
 
   trough@2.2.0: {}
@@ -21824,7 +22140,7 @@ snapshots:
 
   universalify@2.0.1: {}
 
-  uniwind@1.11.0(patch_hash=17d92be2eec71bb6396b402e8d034968e54b28746876d7977cb3139655f42b90)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@7.0.2)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.3):
+  uniwind@1.11.0(patch_hash=a91f3953483cfd434436de6358ff5b63c49974ef148fad91246c26ba95332625)(@expo/metro-config@57.0.12(patch_hash=96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2)(bufferutil@4.1.0)(expo@57.0.18)(typescript@7.0.2)(utf-8-validate@6.0.6))(metro-cache@0.84.5)(metro-transform-worker@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(metro@0.84.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)(tailwindcss@4.3.3):
     dependencies:
       '@tailwindcss/node': 4.3.3
       '@tailwindcss/oxide': 4.3.3
@@ -21962,12 +22278,12 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
+  vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
     dependencies:
       '@oxc-project/types': 0.150.0
       '@oxlint/plugins': 1.79.0
-      '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))
-      '@vitest/browser-preview': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))
+      '@vitest/browser': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))
+      '@vitest/browser-preview': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(utf-8-validate@6.0.6)(vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)))
       '@vitest/expect': 4.1.11
       '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
       '@vitest/pretty-format': 4.1.11
@@ -21975,11 +22291,11 @@ snapshots:
       '@vitest/snapshot': 4.1.11
       '@vitest/spy': 4.1.11
       '@vitest/utils': 4.1.11
-      oxfmt: 0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
-      oxlint: 1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxfmt: 0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxlint: 1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
       oxlint-tsgolint: 7.0.2001
       vite: '@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
-      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(utf-8-validate@6.0.6)(vitest@4.1.11))(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(utf-8-validate@6.0.6)(vitest@4.1.11))(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
     optionalDependencies:
       '@voidzero-dev/vite-plus-darwin-arm64': 0.3.3
       '@voidzero-dev/vite-plus-darwin-x64': 0.3.3
@@ -22019,7 +22335,7 @@ snapshots:
       - utf-8-validate
       - yaml
 
-  vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
+  vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0):
     dependencies:
       '@oxc-project/types': 0.150.0
       '@oxlint/plugins': 1.79.0
@@ -22032,11 +22348,11 @@ snapshots:
       '@vitest/snapshot': 4.1.11
       '@vitest/spy': 4.1.11
       '@vitest/utils': 4.1.11
-      oxfmt: 0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
-      oxlint: 1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxfmt: 0.68.0(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
+      oxlint: 1.83.0(oxlint-tsgolint@7.0.2001)(vite-plus@0.3.3(@types/node@24.12.4)(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0))
       oxlint-tsgolint: 7.0.2001
       vite: '@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0)'
-      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
+      vitest: 4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
     optionalDependencies:
       '@voidzero-dev/vite-plus-darwin-arm64': 0.3.3
       '@voidzero-dev/vite-plus-darwin-x64': 0.3.3
@@ -22080,7 +22396,7 @@ snapshots:
     optionalDependencies:
       vite: '@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
 
-  vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(utf-8-validate@6.0.6)(vitest@4.1.11))(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3)):
+  vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(utf-8-validate@6.0.6)(vitest@4.1.11))(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3)):
     dependencies:
       '@vitest/expect': 4.1.11
       '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@6.0.3))
@@ -22105,10 +22421,11 @@ snapshots:
     optionalDependencies:
       '@types/node': 24.12.4
       '@vitest/browser-preview': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(utf-8-validate@6.0.6)(vitest@4.1.11)
+      jsdom: 30.1.0(@noble/hashes@1.8.0)
     transitivePeerDependencies:
       - msw
 
-  vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)):
+  vitest@4.1.11(@types/node@24.12.4)(@vitest/browser-preview@4.1.11)(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(jsdom@30.1.0(@noble/hashes@1.8.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2)):
     dependencies:
       '@vitest/expect': 4.1.11
       '@vitest/mocker': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))
@@ -22133,6 +22450,7 @@ snapshots:
     optionalDependencies:
       '@types/node': 24.12.4
       '@vitest/browser-preview': 4.1.11(@voidzero-dev/vite-plus-core@0.3.3(@types/node@24.12.4)(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@7.0.2)(unrun@0.2.39)(yaml@2.9.0))(bufferutil@4.1.0)(msw@2.12.11(@types/node@24.12.4)(typescript@7.0.2))(utf-8-validate@6.0.6)(vitest@4.1.11)
+      jsdom: 30.1.0(@noble/hashes@1.8.0)
     transitivePeerDependencies:
       - msw
 
@@ -22237,6 +22555,10 @@ snapshots:
 
   w3c-keyname@2.2.8: {}
 
+  w3c-xmlserializer@5.0.0:
+    dependencies:
+      xml-name-validator: 5.0.0
+
   walk-up-path@4.0.0: {}
 
   walker@1.0.8:
@@ -22264,10 +22586,14 @@ snapshots:
   webidl-conversions@7.0.0:
     optional: true
 
+  webidl-conversions@8.0.1: {}
+
   webpack-virtual-modules@0.6.2: {}
 
   whatwg-fetch@3.6.20: {}
 
+  whatwg-mimetype@5.0.0: {}
+
   whatwg-url-minimum@0.1.2: {}
 
   whatwg-url@14.2.0:
@@ -22276,6 +22602,22 @@ snapshots:
       webidl-conversions: 7.0.0
     optional: true
 
+  whatwg-url@16.0.1(@noble/hashes@1.8.0):
+    dependencies:
+      '@exodus/bytes': 1.15.1(@noble/hashes@1.8.0)
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
+  whatwg-url@17.1.2(@noble/hashes@1.8.0):
+    dependencies:
+      '@exodus/bytes': 1.15.1(@noble/hashes@1.8.0)
+      tr46: 6.0.0
+      webidl-conversions: 8.0.1
+    transitivePeerDependencies:
+      - '@noble/hashes'
+
   whatwg-url@5.0.0:
     dependencies:
       tr46: 0.0.3
@@ -22342,6 +22684,8 @@ snapshots:
       simple-plist: 1.3.1
       uuid: 7.0.3
 
+  xml-name-validator@5.0.0: {}
+
   xml-naming@0.1.0: {}
 
   xml-naming@0.3.0: {}
@@ -22360,6 +22704,8 @@ snapshots:
 
   xmlbuilder@15.1.1: {}
 
+  xmlchars@2.2.0: {}
+
   xtend@4.0.2:
     optional: true
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 0ccd9e4436a3..8313ab360b27 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -98,6 +98,8 @@ minimumReleaseAgeExclude:
   - cn@0.3.2
 
 overrides:
+  # Keep jsdom's optional peer consistent so Vite+ has one test-runner instance.
+  "@exodus/bytes>@noble/hashes": "1.8.0"
   # Earlier React Navigation declarations create a circular type alias in TypeScript 7.
   "@react-navigation/core": 7.21.13
   # The dbus-next patch drops usocket from the package, but pnpm resolves from the
@@ -194,9 +196,12 @@ patchedDependencies:
   expo-notifications@57.0.15: patches/expo-notifications@57.0.15.patch
   expo-sharing@57.0.17: patches/expo-sharing@57.0.17.patch
   expo-widgets@57.0.15: patches/expo-widgets@57.0.15.patch
+  node-pty@1.2.0-beta.15: patches/node-pty@1.2.0-beta.15.patch
   react-native-gesture-handler@2.32.0: patches/react-native-gesture-handler@2.32.0.patch
   react-native-keyboard-controller@1.21.13: patches/react-native-keyboard-controller@1.21.13.patch
   react-native-nitro-modules@0.35.9: patches/react-native-nitro-modules@0.35.9.patch
+  # Link http(s) URLs with a port or a single-label host. md4c otherwise requires a dotted host and stops at ':'.
+  react-native-nitro-markdown@0.5.8: patches/react-native-nitro-markdown@0.5.8.patch
   # Preserve the final layout frame. Backport of [#10171](https://github.com/software-mansion/react-native-reanimated/pull/10171).
   react-native-reanimated@4.5.5: patches/react-native-reanimated@4.5.5.patch
   react-native-screens@4.26.2: patches/react-native-screens@4.26.2.patch
diff --git a/scripts/build-desktop-artifact.test.ts b/scripts/build-desktop-artifact.test.ts
index 7fa7c2d37d96..7e59f6ce8a61 100644
--- a/scripts/build-desktop-artifact.test.ts
+++ b/scripts/build-desktop-artifact.test.ts
@@ -177,6 +177,8 @@ const makeWindowsPayloadFixture = Effect.fn("test.makeWindowsPayloadFixture")(fu
   readonly copyUnpackedNatives: boolean;
   readonly serverEntrySource?: string;
   readonly wslRuntime?: "valid" | "loose-server-tree" | "missing-pty" | "bad-digest";
+  readonly targetArch?: "x64" | "arm64";
+  readonly ptyPrebuildArch?: "x64" | "arm64";
 }) {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
@@ -214,7 +216,7 @@ const makeWindowsPayloadFixture = Effect.fn("test.makeWindowsPayloadFixture")(fu
   yield* fs.writeFileString(path.join(packagedAppDir, "chrome_crashpad_handler.exe"), "crashpad");
 
   if (input.wslRuntime !== undefined) {
-    const stem = wslRuntimeArchiveStem(WINDOWS_PAYLOAD_FIXTURE_VERSION, "x64");
+    const stem = wslRuntimeArchiveStem(WINDOWS_PAYLOAD_FIXTURE_VERSION, input.targetArch ?? "x64");
     const sourceArchivePath =
       input.wslRuntime === "loose-server-tree"
         ? // The old hand-rolled runtime: apps/server/dist + node_modules at the
@@ -228,9 +230,16 @@ const makeWindowsPayloadFixture = Effect.fn("test.makeWindowsPayloadFixture")(fu
         : yield* makeLinuxCliArchiveFixture({
             root: path.join(tempDir, "wsl-runtime"),
             stem,
-            ...(input.wslRuntime === "missing-pty"
+            ...(input.wslRuntime === "missing-pty" || input.ptyPrebuildArch !== undefined
               ? { omitMembers: [`${stem}/node_modules/node-pty/build/Release/pty.node`] }
               : {}),
+            ...(input.ptyPrebuildArch !== undefined
+              ? {
+                  extraMembers: [
+                    `${stem}/node_modules/node-pty/prebuilds/linux-${input.ptyPrebuildArch}/pty.node`,
+                  ],
+                }
+              : {}),
           });
     const archivePath = path.join(resourcesDir, WSL_RUNTIME_ARCHIVE_NAME);
     const hashPath = path.join(resourcesDir, WSL_RUNTIME_ARCHIVE_HASH_NAME);
@@ -729,6 +738,8 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
       assert.equal(win.appId, "com.gabef.t3turbo");
       assert.equal(win.productName, "T3 Turbo");
       assert.equal(win.artifactName, "T3-Turbo-${version}-${arch}.${ext}");
+      // A Linux AppImage build also emits the .deb from the same run.
+      assert.deepStrictEqual((linux.linux as Record<string, unknown>).target, ["AppImage", "deb"]);
       // Linux must register the renderer schemes so the generated .desktop
       // entry advertises MimeType=x-scheme-handler/t3code; for OAuth deep links.
       assert.deepStrictEqual((linux.linux as Record<string, unknown>).protocols, [
@@ -1265,6 +1276,55 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
     ).pipe(Effect.provideService(HostProcessPlatform, "linux")),
   );
 
+  for (const targetArch of ["x64", "arm64"] as const) {
+    it.effect(`accepts an embedded archive with the Linux ${targetArch} node-pty prebuild`, () =>
+      Effect.scoped(
+        Effect.gen(function* () {
+          const fixture = yield* makeWindowsPayloadFixture({
+            copyUnpackedNatives: true,
+            wslRuntime: "valid",
+            targetArch,
+            ptyPrebuildArch: targetArch,
+          });
+          const result = yield* validateWindowsPackagedPayload({
+            stageDistDir: fixture.stageDistDir,
+            appExecutableName: fixture.appExecutableName,
+            targetArch,
+            appVersion: WINDOWS_PAYLOAD_FIXTURE_VERSION,
+            expectWslRuntime: true,
+          });
+
+          assert.equal(result.packagedAppDir, fixture.packagedAppDir);
+        }),
+      ).pipe(Effect.provideService(HostProcessPlatform, "linux")),
+    );
+
+    it.effect(
+      `rejects a node-pty prebuild for the wrong architecture in a Linux ${targetArch} archive`,
+      () =>
+        Effect.scoped(
+          Effect.gen(function* () {
+            const fixture = yield* makeWindowsPayloadFixture({
+              copyUnpackedNatives: true,
+              wslRuntime: "valid",
+              targetArch,
+              ptyPrebuildArch: targetArch === "x64" ? "arm64" : "x64",
+            });
+            const error = yield* validateWindowsPackagedPayload({
+              stageDistDir: fixture.stageDistDir,
+              appExecutableName: fixture.appExecutableName,
+              targetArch,
+              appVersion: WINDOWS_PAYLOAD_FIXTURE_VERSION,
+              expectWslRuntime: true,
+            }).pipe(Effect.flip);
+
+            assert.instanceOf(error, WindowsPackagedPayloadValidationError);
+            assert.equal(error.reason, "wsl-runtime-invalid");
+          }),
+        ),
+    );
+  }
+
   it.effect("rejects an embedded archive built for a different release version", () =>
     Effect.scoped(
       Effect.gen(function* () {
@@ -1344,6 +1404,7 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
         assert.equal(error.reason, "wsl-runtime-invalid");
         assert.deepStrictEqual(error.missingFiles, [
           `${wslRuntimeArchiveStem(WINDOWS_PAYLOAD_FIXTURE_VERSION, "x64")}/node_modules/node-pty/build/Release/pty.node`,
+          `${wslRuntimeArchiveStem(WINDOWS_PAYLOAD_FIXTURE_VERSION, "x64")}/node_modules/node-pty/prebuilds/linux-x64/pty.node`,
         ]);
       }),
     ),
diff --git a/scripts/build-desktop-artifact.ts b/scripts/build-desktop-artifact.ts
index 5f766a964afc..de117fb6b92e 100644
--- a/scripts/build-desktop-artifact.ts
+++ b/scripts/build-desktop-artifact.ts
@@ -930,6 +930,7 @@ interface StagePackageJson {
   readonly private: true;
   readonly packageManager: string;
   readonly description: string;
+  readonly homepage: string;
   readonly author: string;
   readonly main: string;
   readonly build: Record<string, unknown>;
@@ -2732,10 +2733,17 @@ export const createBuildConfig = Effect.fn("createBuildConfig")(function* (
 
   if (platform === "linux") {
     buildConfig.linux = {
-      target: [target],
+      // The .deb is built from the same unpacked app after the AppImage.
+      // electron-builder lists both in latest-linux.yml and writes
+      // resources/package-type into the .deb only, so electron-updater updates
+      // each install in its own format.
+      target: target === "AppImage" ? [target, "deb"] : [target],
       executableName: "t3-turbo",
       icon: "icons",
       category: "Development",
+      synopsis: "Desktop GUI for coding agents",
+      // Required by the .deb control file.
+      maintainer: "T3 Tools <hello@t3.codes>",
       // electron-builder turns these into MimeType=x-scheme-handler/<scheme>;
       // in the .desktop entry (Exec already gets %U), so browsers can hand
       // t3code:// OAuth callbacks to the app.
@@ -2751,6 +2759,23 @@ export const createBuildConfig = Effect.fn("createBuildConfig")(function* (
         },
       },
     };
+    buildConfig.deb = {
+      // Electron's runtime libraries. Debian 13 and Ubuntu 24.04 renamed some
+      // for 64-bit time; the old name is the fallback for older releases.
+      depends: [
+        "libasound2t64 | libasound2",
+        "libatspi2.0-0t64 | libatspi2.0-0",
+        "libgbm1",
+        "libgtk-3-0t64 | libgtk-3-0",
+        "libnotify4",
+        "libnss3",
+        "libsecret-1-0",
+        "libuuid1",
+        "libxss1",
+        "libxtst6",
+        "xdg-utils",
+      ],
+    };
   }
 
   if (platform === "win") {
@@ -3281,13 +3306,16 @@ export const validateWindowsPackagedPayload = Effect.fn(
         ),
       );
     }
-    const requiredMembers = [
-      `${stem}/t3`,
-      `${stem}/client`,
-      `${stem}/node_modules`,
+    const requiredMembers = [`${stem}/t3`, `${stem}/client`, `${stem}/node_modules`];
+    const missingMembers = requiredMembers.filter((member) => !members.includes(member));
+    // node-pty can load a source build or the prebuild for the WSL target.
+    const ptyCandidates = [
       `${stem}/node_modules/node-pty/build/Release/pty.node`,
+      `${stem}/node_modules/node-pty/prebuilds/linux-${input.targetArch}/pty.node`,
     ];
-    const missingMembers = requiredMembers.filter((member) => !members.includes(member));
+    if (!ptyCandidates.some((member) => members.includes(member))) {
+      missingMembers.push(...ptyCandidates);
+    }
     if (missingMembers.length > 0) {
       return yield* new WindowsPackagedPayloadValidationError({
         reason: "wsl-runtime-invalid",
@@ -3657,8 +3685,10 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
     private: true,
     packageManager: rootPackageJson.packageManager,
     description: DESKTOP_STAGE_PACKAGE_DESCRIPTION,
+    // Required by the .deb control file.
+    homepage: "https://t3.codes",
     author: "T3 Tools",
-    main: "apps/desktop/dist-electron/main.cjs",
+    main: "apps/desktop/dist-electron/boot.cjs",
     build: yield* createBuildConfig(
       options.platform,
       options.target,
@@ -3753,6 +3783,11 @@ const buildDesktopArtifact = Effect.fn("buildDesktopArtifact")(function* (
       delete buildEnv[key];
     }
   }
+  if (options.platform === "linux") {
+    // fpm compresses the .deb with the system xz through tar. Threaded mode
+    // takes seconds on a many-core runner instead of about two minutes.
+    buildEnv.XZ_DEFAULTS = "-T0";
+  }
   if (!options.signed) {
     buildEnv.CSC_IDENTITY_AUTO_DISCOVERY = "false";
     delete buildEnv.CSC_LINK;
diff --git a/scripts/convert-device-model.py b/scripts/convert-device-model.py
new file mode 100644
index 000000000000..cba2d9c98ed4
--- /dev/null
+++ b/scripts/convert-device-model.py
@@ -0,0 +1,108 @@
+# Run with Blender 4.5.9:
+# blender --background --python scripts/convert-device-model.py -- <model-id> <source.usdz> <output.glb>
+# Then optimize using @gltf-transform/cli 4.2.1 with --compress false --simplify false
+# --join false --palette false --flatten false --texture-size 1024 --texture-compress webp.
+import hashlib
+import json
+import sys
+from pathlib import Path
+
+import bpy
+import numpy as np
+from mathutils import Matrix, Vector
+
+model_id, source, output = sys.argv[sys.argv.index("--") + 1 :]
+manifest_path = (
+    Path(__file__).resolve().parents[1]
+    / "apps/web/src/components/device/models/sources.json"
+)
+manifest = json.loads(manifest_path.read_text())
+model = next(m for m in manifest["models"] if m["id"] == model_id)
+if hashlib.sha256(Path(source).read_bytes()).hexdigest() != model["sourceSha256"]:
+    raise ValueError("Source checksum differs from the recorded Apple asset")
+body_name, screen_name = model["bodyNode"], model["screenNode"]
+bpy.ops.wm.read_factory_settings(use_empty=True)
+bpy.ops.wm.usd_import(filepath=source, import_materials=True)
+body = bpy.data.objects[model.get("accessoryNode", body_name)]
+screen = bpy.data.objects[screen_name]
+objects = [o for o in body.children_recursive if o.type == "MESH"]
+if body.type == "MESH":
+    objects.append(body)
+uv = screen.data.uv_layers.active
+points = []
+coords = []
+for loop in screen.data.loops:
+    points.append(
+        tuple(screen.matrix_world @ screen.data.vertices[loop.vertex_index].co)
+    )
+    coords.append((*uv.data[loop.index].uv, 1))
+coef = np.linalg.lstsq(np.array(coords), np.array(points), rcond=None)[0]
+right = Vector(coef[0]).normalized()
+up = Vector(coef[1]).normalized()
+normal = right.cross(up).normalized()
+# The authored UVs establish the device's front and its physical portrait axes.
+# No body proportions are changed. The runtime uses a standard planar framebuffer UV.
+rot = Matrix((right, up, normal)).to_4x4()
+world = [rot @ Vector(p) for p in points]
+lo = Vector(tuple(min(p[i] for p in world) for i in range(3)))
+hi = Vector(tuple(max(p[i] for p in world) for i in range(3)))
+center = (lo + hi) / 2
+scale = 2.2 / (hi.y - lo.y)
+transform = (
+    Matrix.Translation(Vector((0, 0, 0.043)))
+    @ Matrix.Diagonal(Vector((scale, scale, scale, 1)))
+    @ Matrix.Translation(-center)
+    @ rot
+)
+for o in objects:
+    matrix = transform @ o.matrix_world
+    o.parent = None
+    o.matrix_world = Matrix.Identity(4)
+    o.data.transform(matrix)
+    # Blender is Z-up; glTF export converts to Y-up. Store canonical Y-up geometry as Blender Z-up.
+    o.data.transform(Matrix.Rotation(np.pi / 2, 4, "X"))
+    if o == screen:
+        o.name = "device-screen"
+        o.data.name = "device-screen"
+        for loop in o.data.loops:
+            p = o.data.vertices[loop.vertex_index].co
+            uv.data[loop.index].uv = (
+                (p.x / ((hi.x - lo.x) * scale)) + 0.5,
+                p.z / 2.2 + 0.5,
+            )
+        # This material is replaced by the viewer and must not retain the marketing screenshot.
+        mat = bpy.data.materials.new("device-screen")
+        mat.diffuse_color = (0, 0, 0, 1)
+        o.data.materials.clear()
+        o.data.materials.append(mat)
+for o in list(bpy.data.objects):
+    if o not in objects:
+        bpy.data.objects.remove(o, do_unlink=True)
+for image in bpy.data.images:
+    if image.size[0] > 1024 or image.size[1] > 1024:
+        k = 1024 / max(image.size)
+        image.scale(max(1, round(image.size[0] * k)), max(1, round(image.size[1] * k)))
+for o in objects:
+    o.select_set(True)
+bpy.ops.export_scene.gltf(
+    filepath=output,
+    export_format="GLB",
+    use_selection=True,
+    export_yup=True,
+    export_animations=False,
+    export_extras=False,
+    export_image_format="AUTO",
+    export_copyright="Apple Inc. Original device assets; see models/sources.json for provenance.",
+)
+print(
+    "MODEL_METRICS",
+    json.dumps(
+        {
+            "width": (hi.x - lo.x) * scale,
+            "height": 2.2,
+            "bodyMeshes": len(objects),
+            "screen": screen.name,
+            "source": source,
+        }
+    ),
+)
diff --git a/scripts/lib/cli-external-packages.test.ts b/scripts/lib/cli-external-packages.test.ts
index ebcc81020bfe..5168e770a114 100644
--- a/scripts/lib/cli-external-packages.test.ts
+++ b/scripts/lib/cli-external-packages.test.ts
@@ -49,6 +49,7 @@ describe("shouldBundleCliDependency", () => {
       "ffi-rs",
       "@yuuang/ffi-rs-win32-x64-msvc",
       "@ff-labs/fff-node",
+      "@napi-rs/keyring",
       "@clerk/electron-passkeys",
       "node-addon-api",
     ]) {
@@ -82,7 +83,7 @@ describe("selectCliRuntimeExternalDependencies", () => {
   it("selects every external root declared by the server", () => {
     assert.deepStrictEqual(
       Object.keys(selectCliRuntimeExternalDependencies(serverPackageJson.dependencies)).sort(),
-      ["@ff-labs/fff-node", "node-pty"],
+      ["@ff-labs/fff-node", "@napi-rs/keyring", "node-pty"],
     );
   });
 });
diff --git a/scripts/lib/cli-external-packages.ts b/scripts/lib/cli-external-packages.ts
index 5cafee960675..c158ccaff7f4 100644
--- a/scripts/lib/cli-external-packages.ts
+++ b/scripts/lib/cli-external-packages.ts
@@ -30,6 +30,7 @@ export const CLI_RUNTIME_EXTERNAL_PREFIXES = [
   "ffi-rs",
   "@yuuang/",
   "@ff-labs/",
+  "@napi-rs/keyring",
   "@clerk/electron-passkeys",
   "node-gyp-build",
   "node-addon-api",
diff --git a/scripts/lint-restyle-ceiling.test.ts b/scripts/lint-restyle-ceiling.test.ts
deleted file mode 100644
index 24a92e10cb22..000000000000
--- a/scripts/lint-restyle-ceiling.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { assert, describe, it } from "@effect/vitest";
-
-import { countRestyleFindings, evaluateCeiling } from "./lint-restyle-ceiling.ts";
-
-describe("lint-restyle-ceiling", () => {
-  it("counts only no-restyle diagnostics", () => {
-    const count = countRestyleFindings({
-      diagnostics: [
-        { code: "shadcn(no-restyle)" },
-        { code: "react(refs)" },
-        { code: "shadcn(no-restyle)" },
-      ],
-    });
-    assert.strictEqual(count, 2);
-  });
-
-  it("fails above the ceiling and passes at or below it", () => {
-    assert.isFalse(evaluateCeiling(11, 10).ok);
-    assert.isTrue(evaluateCeiling(10, 10).ok);
-    const below = evaluateCeiling(7, 10);
-    assert.isTrue(below.ok);
-    assert.include(below.message, "Lower RESTYLE_CEILING");
-  });
-});
diff --git a/scripts/lint-restyle-ceiling.ts b/scripts/lint-restyle-ceiling.ts
deleted file mode 100644
index f0f5b96b3859..000000000000
--- a/scripts/lint-restyle-ceiling.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env node
-// @effect-diagnostics nodeBuiltinImport:off - one-shot CI gate over a child process.
-import * as NodeChildProcess from "node:child_process";
-import * as NodePath from "node:path";
-import * as NodeURL from "node:url";
-
-// `shadcn/no-restyle` stays a warning while the existing className overrides on
-// components/ui exports are migrated to variants (see vite.config.ts). This gate keeps the
-// count from growing: CI fails when findings exceed the ceiling. Lower the ceiling when you
-// migrate a file, and delete this script when the rule becomes an error.
-// T3 Turbo: upstream's ceiling counts upstream code only. The fork's own UI (chat panes, the
-// T3 Turbo settings page, the environment switcher) adds six overrides on top, so the fork
-// ceiling is upstream's + 6. When upstream lowers its number, lower this one by the same amount.
-export const UPSTREAM_RESTYLE_CEILING = 1207;
-export const TURBO_RESTYLE_OVERRIDES = 6;
-export const RESTYLE_CEILING = UPSTREAM_RESTYLE_CEILING + TURBO_RESTYLE_OVERRIDES;
-
-const RULE = "shadcn(no-restyle)";
-
-const repoRoot = NodePath.resolve(NodePath.dirname(NodeURL.fileURLToPath(import.meta.url)), "..");
-
-interface LintReport {
-  readonly diagnostics: ReadonlyArray<{ readonly code: string }>;
-}
-
-export function countRestyleFindings(report: LintReport): number {
-  return report.diagnostics.filter((diagnostic) => diagnostic.code === RULE).length;
-}
-
-export function evaluateCeiling(
-  count: number,
-  ceiling: number,
-): { readonly ok: boolean; readonly message: string } {
-  if (count > ceiling) {
-    return {
-      ok: false,
-      message:
-        `${RULE}: ${count} findings exceed the ceiling of ${ceiling}. ` +
-        "Use a variant or size on the components/ui export instead of a className override " +
-        "(run `vp lint apps/web/src` for the list).",
-    };
-  }
-  const slack = ceiling - count;
-  return {
-    ok: true,
-    message:
-      slack === 0
-        ? `${RULE}: ${count} findings, at the ceiling.`
-        : `${RULE}: ${count} findings, ${slack} below the ceiling of ${ceiling}. Lower RESTYLE_CEILING in scripts/lint-restyle-ceiling.ts to ${count}.`,
-  };
-}
-
-function main() {
-  const result = NodeChildProcess.spawnSync("vp", ["lint", "--format", "json", "apps/web/src"], {
-    cwd: repoRoot,
-    encoding: "utf8",
-    maxBuffer: 256 * 1024 * 1024,
-  });
-  if (result.error) throw result.error;
-  const report = JSON.parse(result.stdout) as LintReport;
-  const verdict = evaluateCeiling(countRestyleFindings(report), RESTYLE_CEILING);
-  process.stdout.write(`${verdict.message}\n`);
-  process.exitCode = verdict.ok ? 0 : 1;
-}
-
-if (
-  process.argv[1] !== undefined &&
-  NodePath.resolve(process.argv[1]) === NodeURL.fileURLToPath(import.meta.url)
-) {
-  main();
-}
diff --git a/scripts/mobile-showcase-environment.ts b/scripts/mobile-showcase-environment.ts
index 93738b61325a..209df77bf808 100644
--- a/scripts/mobile-showcase-environment.ts
+++ b/scripts/mobile-showcase-environment.ts
@@ -11,7 +11,14 @@ export const SHOWCASE_PROJECT_ID = "t3code";
 export const SHOWCASE_THREAD_ID = "remote-command-center";
 export const SHOWCASE_TERMINAL_ID = "term-1";
 
-export const SHOWCASE_SCENES = ["threads", "thread", "terminal", "review", "environments"] as const;
+export const SHOWCASE_SCENES = [
+  "threads",
+  "thread",
+  "terminal",
+  "review",
+  "environments",
+  "agent-activity",
+] as const;
 export type ShowcaseScene = (typeof SHOWCASE_SCENES)[number];
 
 const PROJECTOR_NAMES = [
diff --git a/scripts/mobile-showcase.config.ts b/scripts/mobile-showcase.config.ts
index 45a9f474fa84..544d8056981e 100644
--- a/scripts/mobile-showcase.config.ts
+++ b/scripts/mobile-showcase.config.ts
@@ -104,11 +104,13 @@ const config: ShowcaseConfig = {
     {
       id: "iphone-6.9",
       platform: "ios",
-      simulator: "iPhone 17 Pro Max",
+      // A disposable device lands on the newest runtime, whose default lock
+      // screen wallpaper suits both appearances; a stock one may be older.
+      simulator: "T3 Showcase iPhone 17 Pro Max",
       simulatorDeviceType: "com.apple.CoreSimulator.SimDeviceType.iPhone-17-Pro-Max",
       appearance: "dark",
       theme: DEFAULT_SHOWCASE_THEME,
-      scenes: ["thread", "terminal", "review", "threads", "environments"],
+      scenes: ["thread", "terminal", "review", "threads", "environments", "agent-activity"],
       storeAsset: {
         store: "apple",
         directory: "apple/iphone-6.9",
@@ -125,7 +127,7 @@ const config: ShowcaseConfig = {
       simulatorDeviceType: "com.apple.CoreSimulator.SimDeviceType.iPhone-14-Plus",
       appearance: "dark",
       theme: DEFAULT_SHOWCASE_THEME,
-      scenes: ["thread", "terminal", "review", "threads", "environments"],
+      scenes: ["thread", "terminal", "review", "threads", "environments", "agent-activity"],
       storeAsset: {
         store: "apple",
         directory: "apple/iphone-6.5",
@@ -143,6 +145,8 @@ const config: ShowcaseConfig = {
       appearance: "dark",
       theme: DEFAULT_SHOWCASE_THEME,
       orientation: "landscape",
+      // The lock screen does not follow the app's self-rotation, so a
+      // headless landscape capture of it would come out sideways.
       scenes: ["thread", "terminal", "review", "threads", "environments"],
       storeAsset: {
         store: "apple",
@@ -167,7 +171,7 @@ const config: ShowcaseConfig = {
         height: 1920,
         density: 420,
       },
-      scenes: ["thread", "terminal", "review", "threads", "environments"],
+      scenes: ["thread", "terminal", "review", "threads", "environments", "agent-activity"],
       storeAsset: {
         store: "google-play",
         directory: "google-play/phone",
@@ -190,7 +194,7 @@ const config: ShowcaseConfig = {
         height: 1920,
         density: 288,
       },
-      scenes: ["thread", "terminal", "review", "threads", "environments"],
+      scenes: ["thread", "terminal", "review", "threads", "environments", "agent-activity"],
       storeAsset: {
         store: "google-play",
         directory: "google-play/tablet-7",
@@ -213,7 +217,7 @@ const config: ShowcaseConfig = {
         height: 2560,
         density: 288,
       },
-      scenes: ["thread", "terminal", "review", "threads", "environments"],
+      scenes: ["thread", "terminal", "review", "threads", "environments", "agent-activity"],
       storeAsset: {
         store: "google-play",
         directory: "google-play/tablet-10",
diff --git a/scripts/mobile-showcase.ts b/scripts/mobile-showcase.ts
index ccce919a7443..2b141e12164f 100644
--- a/scripts/mobile-showcase.ts
+++ b/scripts/mobile-showcase.ts
@@ -26,6 +26,7 @@ import showcaseConfig, {
 import {
   SHOWCASE_ENVIRONMENTS,
   SHOWCASE_PROJECTS,
+  SHOWCASE_THREADS,
   seedShowcaseEnvironment,
 } from "./mobile-showcase-environment.ts";
 
@@ -837,6 +838,20 @@ async function suppressIosSystemFollowUps(udid: string): Promise<void> {
 
 async function normalizeIosSimulator(appearance: ShowcaseAppearance, udid: string): Promise<void> {
   await runCommand("xcrun", ["simctl", "ui", udid, "appearance", appearance]);
+  // Always-on displays (Pro Max) dim a locked screen instead of turning it
+  // off, which the lock-screen wake cannot tell from a lit one. Without it the
+  // locked display goes dark and the wake lights it fully.
+  await runCommand("xcrun", [
+    "simctl",
+    "spawn",
+    udid,
+    "defaults",
+    "write",
+    "com.apple.springboard",
+    "SBEnableAlwaysOn",
+    "-bool",
+    "false",
+  ]);
   await runCommand("xcrun", [
     "simctl",
     "status_bar",
@@ -934,6 +949,133 @@ async function waitForIosShowcaseScene(
   throw new Error(`iOS showcase scene '${scene}' did not render within ${timeoutMs}ms.`);
 }
 
+function iosAxe(): string {
+  return NodeProcess.env.AXE_PATH ?? "axe";
+}
+
+async function runAxe(udid: string, args: ReadonlyArray<string>): Promise<void> {
+  // HID events sent right after the simulator settles are dropped without it.
+  await runCommand(iosAxe(), [...args, "--udid", udid], {
+    env: { ...NodeProcess.env, AXE_HID_STABILIZATION_MS: "3000" },
+  }).catch((error: unknown) => {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
+      throw new Error(
+        "The agent-activity scene drives the simulator with AXe. Install it with `brew tap cameroncooke/axe && brew install axe`, or set AXE_PATH.",
+      );
+    }
+    throw error;
+  });
+}
+
+async function iosSimulatorLocked(udid: string): Promise<boolean> {
+  const state = await commandOutput("xcrun", [
+    "simctl",
+    "spawn",
+    udid,
+    "notifyutil",
+    "-g",
+    "com.apple.springboard.lockstate",
+  ]).catch(() => "");
+  return state.trim().endsWith(" 1");
+}
+
+/**
+ * The staging app asks for notification permission; simctl has no privacy
+ * service for it, so answer the prompt until the scene reports ready.
+ */
+async function allowIosNotificationsUntilReady(udid: string, ready: Promise<void>): Promise<void> {
+  const state = { settled: false };
+  const tapping = (async () => {
+    while (!state.settled) {
+      await runAxe(udid, ["tap", "--label", "Allow"]).catch(() => undefined);
+      if (!state.settled) await delay(1_000);
+    }
+  })();
+  try {
+    await ready;
+  } finally {
+    state.settled = true;
+    await tapping;
+  }
+}
+
+/**
+ * Locks the simulator over the staged Live Activity and delivers the alert a
+ * relay push would, so the lock screen shows both.
+ */
+async function presentIosLockScreen(udid: string): Promise<void> {
+  await runAxe(udid, ["button", "lock"]);
+  const deadline = Date.now() + 15_000;
+  while (!(await iosSimulatorLocked(udid))) {
+    if (Date.now() > deadline) throw new Error(`Simulator ${udid} did not lock.`);
+    await delay(500);
+  }
+  const alert = showcaseAgentAlert();
+  await new Promise<void>((resolve, reject) => {
+    const child = NodeChildProcess.execFile(
+      "xcrun",
+      ["simctl", "push", udid, ANDROID_PACKAGE, "-"],
+      { cwd: REPO_ROOT },
+      (error) => (error ? reject(error) : resolve()),
+    );
+    child.stdin?.end(
+      JSON.stringify({
+        aps: { alert: { title: alert.title, body: alert.body }, sound: "default" },
+      }),
+    );
+  });
+  await wakeIosLockScreen(udid);
+  // The first Live Activity on the lock screen asks to keep allowing them.
+  await delay(2_000);
+  await runAxe(udid, ["tap", "--label", "Allow"]).catch(() => undefined);
+}
+
+/**
+ * The alert usually wakes the display, but not always. A home press on a dark
+ * display only wakes it, so press only after a screenshot proves it is dark;
+ * pressing on a lit lock screen would unlock the device instead.
+ */
+async function wakeIosLockScreen(udid: string): Promise<void> {
+  const probe = NodePath.join(NodeOS.tmpdir(), `t3-showcase-wake-${udid}.png`);
+  try {
+    for (let attempt = 0; attempt < 5; attempt += 1) {
+      await delay(2_000);
+      await runCommand("xcrun", ["simctl", "io", udid, "screenshot", probe]);
+      if (!pngIsBlack(await NodeFSP.readFile(probe))) return;
+      await runAxe(udid, ["button", "home"]);
+    }
+    throw new Error(`Simulator ${udid} lock screen stayed dark.`);
+  } finally {
+    await NodeFSP.rm(probe, { force: true });
+  }
+}
+
+function pngIsBlack(bytes: Uint8Array): boolean {
+  const { data } = PNG.sync.read(Buffer.from(bytes));
+  // Sample a sparse grid; a sleeping display is uniformly black.
+  for (let offset = 0; offset < data.length; offset += 4 * 997) {
+    if ((data[offset] ?? 0) > 8 || (data[offset + 1] ?? 0) > 8 || (data[offset + 2] ?? 0) > 8) {
+      return false;
+    }
+  }
+  return true;
+}
+
+async function unlockIosSimulator(udid: string): Promise<void> {
+  // The first press wakes the display, the second dismisses the lock screen.
+  await runAxe(udid, ["button", "home"]);
+  await delay(2_000);
+  await runAxe(udid, ["button", "home"]);
+}
+
+/** Mirrors the app's staged hero row (showcaseAgentActivity.ts). */
+function showcaseAgentAlert(): { readonly title: string; readonly body: string } {
+  const thread = SHOWCASE_THREADS.find((candidate) => candidate.id === "pocket-command-center");
+  const project = SHOWCASE_PROJECTS.find((candidate) => candidate.id === thread?.projectId);
+  if (!thread || !project) throw new Error("The showcase fixture lost its agent-activity thread.");
+  return { title: thread.title, body: `Approval: ${project.title}` };
+}
+
 async function captureIos(
   capture: ShowcaseCapture & { readonly device: ShowcaseIosDevice },
   appPath: string | null,
@@ -1021,6 +1163,12 @@ async function captureIos(
   for (const [sceneIndex, scene] of capture.scenes.entries()) {
     if (sceneIndex > 0) await NodeFSP.rm(readyPath, { force: true });
     await NodeFSP.writeFile(scenePath, scene);
+    const waitForScene = (timeoutMs?: number) => {
+      const ready = waitForIosShowcaseScene(simulator.udid, scene, timeoutMs);
+      return scene === "agent-activity"
+        ? allowIosNotificationsUntilReady(simulator.udid, ready)
+        : ready;
+    };
     if (sceneIndex === 0) {
       for (let attempt = 0; attempt < 2; attempt += 1) {
         const isLastAttempt = attempt === 1;
@@ -1028,7 +1176,7 @@ async function captureIos(
           // A freshly installed Expo development build can spend well over 30s
           // applying an already-bundled update after it reaches 100%. Killing it
           // at that point sends the next capture back to the dev launcher.
-          await waitForIosShowcaseScene(simulator.udid, scene, 120_000);
+          await waitForScene(120_000);
           break;
         } catch (error) {
           if (isLastAttempt) throw error;
@@ -1036,8 +1184,9 @@ async function captureIos(
         }
       }
     } else {
-      await waitForIosShowcaseScene(simulator.udid, scene);
+      await waitForScene();
     }
+    if (scene === "agent-activity") await presentIosLockScreen(simulator.udid);
     await delay(scene === "review" ? Math.max(config.settleDelayMs, 8_000) : config.settleDelayMs);
     const destination = NodePath.join(
       showcaseCaptureDirectory(outputDirectory, capture),
@@ -1053,6 +1202,7 @@ async function captureIos(
         await runCommand("sips", ["--rotate", "270", destination]);
       }
     }
+    if (scene === "agent-activity") await unlockIosSimulator(simulator.udid);
     await finalizeCapture(destination, capture.device);
   }
 }
@@ -1069,6 +1219,22 @@ async function runAdb(serial: string, args: ReadonlyArray<string>): Promise<void
   await runCommand(androidSdkTool("platform-tools/adb"), ["-s", serial, ...args]);
 }
 
+/**
+ * Emulator images post their own ongoing notices (keyboard configured, serial
+ * console enabled) that would share the shade with the app's. Snoozing hides
+ * them for the capture; they come back on their own an hour later.
+ */
+async function snoozeAndroidSystemNotifications(serial: string): Promise<void> {
+  const keys = (await adbOutput(serial, ["shell", "cmd", "notification", "list"]))
+    .split("\n")
+    .map((line) => line.trim())
+    .filter((key) => key.includes("|") && !key.includes(`|${ANDROID_PACKAGE}|`));
+  for (const key of keys) {
+    // adb joins shell args with spaces, so the key needs quoting for the pipes.
+    await runAdb(serial, ["shell", `cmd notification snooze --for 3600000 '${key}'`]);
+  }
+}
+
 async function runningAndroidAvds(): Promise<ReadonlyMap<string, string>> {
   const adb = androidSdkTool("platform-tools/adb");
   const devices = (await commandOutput(adb, ["devices"]))
@@ -1248,6 +1414,15 @@ async function captureAndroid(
     await runAdb(serial, ["install", "-r", apkPath]);
   }
   await runAdb(serial, ["shell", "pm", "clear", ANDROID_PACKAGE]);
+  // The agent-activity scene posts notifications; granting up front keeps the
+  // runtime prompt off every capture.
+  await runAdb(serial, [
+    "shell",
+    "pm",
+    "grant",
+    ANDROID_PACKAGE,
+    "android.permission.POST_NOTIFICATIONS",
+  ]);
   await prepareAndroidShowcaseApp(serial);
   await runAdb(serial, ["reverse", `tcp:${config.metroPort}`, `tcp:${config.metroPort}`]);
   const metroUrl = encodeURIComponent(`http://127.0.0.1:${config.metroPort}?disableOnboarding=1`);
@@ -1275,6 +1450,10 @@ async function captureAndroid(
   for (const [sceneIndex, scene] of capture.scenes.entries()) {
     if (sceneIndex > 0) await writeAndroidShowcaseScene(serial, scene);
     await waitForAndroidShowcaseScene(serial, scene);
+    if (scene === "agent-activity") {
+      await snoozeAndroidSystemNotifications(serial);
+      await runAdb(serial, ["shell", "cmd", "statusbar", "expand-notifications"]);
+    }
     await delay(Math.max(config.settleDelayMs, scene === "review" ? 8_000 : 5_000));
     const destination = NodePath.join(
       showcaseCaptureDirectory(outputDirectory, capture),
@@ -1292,6 +1471,9 @@ async function captureAndroid(
       );
     });
     await NodeFSP.writeFile(destination, png);
+    if (scene === "agent-activity") {
+      await runAdb(serial, ["shell", "cmd", "statusbar", "collapse"]);
+    }
     await finalizeCapture(destination, capture.device);
   }
 }
diff --git a/scripts/release-smoke.ts b/scripts/release-smoke.ts
index 079596c0fc10..0b95ad4558f0 100644
--- a/scripts/release-smoke.ts
+++ b/scripts/release-smoke.ts
@@ -17,7 +17,6 @@ const workspaceFiles = [
   "apps/desktop/package.json",
   "apps/web/package.json",
   "apps/mobile/package.json",
-  "apps/mobile/deps/react-native-nitro-markdown-0.5.0.tgz",
   "apps/mobile/modules/t3-markdown-text/package.json",
   "apps/mobile/modules/t3-review-diff/package.json",
   "apps/mobile/modules/t3-terminal/package.json",
diff --git a/scripts/setup-worktree.ts b/scripts/setup-worktree.ts
new file mode 100644
index 000000000000..ea07a8b65ad8
--- /dev/null
+++ b/scripts/setup-worktree.ts
@@ -0,0 +1,45 @@
+// @effect-diagnostics nodeBuiltinImport:off - runs before `vp i`, so only Node built-ins exist.
+/**
+ * Worktree setup, run by the t3.json "Setup Worktree" action as
+ * `node scripts/setup-worktree.ts`. Plain Node keeps one command working in
+ * every shell T3 Code spawns (zsh, bash, fish, PowerShell): it installs
+ * dependencies, links the main checkout's gitignored env files into this
+ * worktree, then warms the web dependency cache.
+ */
+import * as NodeChildProcess from "node:child_process";
+import * as NodeFS from "node:fs";
+import * as NodePath from "node:path";
+
+const ENV_FILES = [".env", NodePath.join("infra", "relay", ".env")];
+
+const projectRoot = process.env.T3CODE_PROJECT_ROOT;
+if (!projectRoot) {
+  throw new Error("T3CODE_PROJECT_ROOT is not set. Run this through the t3.json setup action.");
+}
+const worktree = NodePath.dirname(import.meta.dirname);
+
+// `shell` resolves `vp` through PATH, including Windows command shims.
+const install = NodeChildProcess.spawnSync("vp i", {
+  cwd: worktree,
+  shell: true,
+  stdio: "inherit",
+});
+if (install.status !== 0) process.exit(install.status ?? 1);
+
+// In the main checkout itself, relinking would replace the real env files.
+if (NodeFS.realpathSync(projectRoot) !== NodeFS.realpathSync(worktree)) {
+  for (const file of ENV_FILES) {
+    const source = NodePath.join(projectRoot, file);
+    if (!NodeFS.existsSync(source)) continue;
+    const target = NodePath.join(worktree, file);
+    NodeFS.rmSync(target, { force: true });
+    NodeFS.symlinkSync(source, target);
+  }
+}
+
+const warm = NodeChildProcess.spawnSync(
+  process.execPath,
+  [NodePath.join(worktree, "apps", "web", "scripts", "warm-dep-cache.ts")],
+  { cwd: worktree, stdio: "inherit" },
+);
+process.exit(warm.status ?? 1);
diff --git a/scripts/turbo-customization-manifest.test.ts b/scripts/turbo-customization-manifest.test.ts
index ca24baa13c2f..2dc1f17151cf 100644
--- a/scripts/turbo-customization-manifest.test.ts
+++ b/scripts/turbo-customization-manifest.test.ts
@@ -163,7 +163,6 @@ it("verifies the checked-in Turbo manifest and tracks the implemented multi-chat
     "relay-policy",
     "relay-request-budget-and-clerk-client",
     "release-from-turbo-branch",
-    "restyle-ceiling-fork-delta",
     "settled-lifecycle-sticky-pin",
     "shared-sha256-base64url",
     "shell-snapshot-budget",
diff --git a/t3.json b/t3.json
index 284d416a6820..d2c55e050776 100644
--- a/t3.json
+++ b/t3.json
@@ -4,13 +4,7 @@
   "scripts": [
     {
       "name": "Setup Worktree",
-      "command": "vp i && ln -sf $T3CODE_PROJECT_ROOT/.env .env && ln -sf $T3CODE_PROJECT_ROOT/infra/relay/.env infra/relay/.env && node apps/web/scripts/warm-dep-cache.ts",
-      "icon": "configure",
-      "runOnWorktreeCreate": true
-    },
-    {
-      "name": "Setup Worktree (Windows)",
-      "command": "vp i && New-Item -ItemType SymbolicLink -Path .env -Target \"$env:T3CODE_PROJECT_ROOT\\.env\" -Force && New-Item -ItemType SymbolicLink -Path \"infra\\relay\\.env\" -Target \"$env:T3CODE_PROJECT_ROOT\\infra\\relay\\.env\" -Force && node apps\\web\\scripts\\warm-dep-cache.ts",
+      "command": "node scripts/setup-worktree.ts",
       "icon": "configure",
       "runOnWorktreeCreate": true
     }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index a84f620ba861..7897a92f557f 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -50,7 +50,8 @@
           "globalTimers": "error",
           "globalTimersInEffect": "error",
           "globalFetch": "error",
-          "globalFetchInEffect": "error"
+          "globalFetchInEffect": "error",
+          "schemaNumber": "off"
         }
       }
     ]
diff --git a/vite.config.ts b/vite.config.ts
index 038116709942..afe23dcb9b8c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -16,6 +16,20 @@ const RESTRICTED_IMPORT_PATHS = [
   },
 ];
 
+/**
+ * The cva functions behind components/ui exports. They style a foreign element to look
+ * like a Button or Toggle, which bypasses the component's variants; render the component
+ * instead (`render={<Button …/>}`, or `SelectButton` for a picker trigger).
+ */
+const RESTRICTED_UI_VARIANT_PATTERNS = [
+  {
+    group: ["**/components/ui/*", "**/ui/*", "./ui/*"],
+    importNames: ["buttonVariants", "toggleVariants", "badgeVariants", "selectTriggerVariants"],
+    message:
+      "Render the components/ui export instead of borrowing its class recipe (render={<Button …/>}, SelectButton, ToggleGroup).",
+  },
+];
+
 /** Lucide's pull-request glyphs, which only `pullRequestIcons.tsx` may name. */
 const RESTRICTED_PULL_REQUEST_GLYPH_IMPORTS = {
   name: "lucide-react",
@@ -160,6 +174,19 @@ export default defineConfig({
         files: ["packages/shared/src/hostProcess.ts"],
         rules: { "t3code/no-global-process-runtime": "off" },
       },
+      {
+        files: ["apps/web/src/**"],
+        excludeFiles: ["apps/web/src/components/ui/**"],
+        rules: {
+          "eslint/no-restricted-imports": [
+            "error",
+            {
+              paths: [...RESTRICTED_IMPORT_PATHS, RESTRICTED_PULL_REQUEST_GLYPH_IMPORTS],
+              patterns: RESTRICTED_UI_VARIANT_PATTERNS,
+            },
+          ],
+        },
+      },
       {
         // The one module allowed to name lucide's pull-request glyphs; everything else picks
         // from its vocabulary. The other import restrictions still apply here.
@@ -170,17 +197,91 @@ export default defineConfig({
         files: ["apps/mobile/src/**"],
         rules: { "t3code/no-mobile-uniwind-theme-escape-hatches": "error" },
       },
+      {
+        // Every class in web code must be one Tailwind generates: a typo or a class nothing
+        // declares ships silently unstyled. JS hooks use data attributes, not class names.
+        files: ["apps/web/src/**"],
+        rules: { "shadcn/no-unknown-classes": "error" },
+      },
+      {
+        // Colors come from theme tokens so status tones follow custom themes. components/ui
+        // has no findings and stays covered too.
+        files: ["apps/web/src/**"],
+        rules: { "shadcn/no-raw-colors": "error" },
+      },
+      {
+        // Third-party marks (brand logos, the macOS permission panes, Codex's Computer Use
+        // mark) must keep their exact colors, so the files that hold them are exempt.
+        files: ["apps/web/src/components/Icons.tsx", "apps/web/src/components/JetBrainsIcons.tsx"],
+        rules: { "shadcn/no-raw-colors": "off" },
+      },
       {
         // components/ui exports own their look. App code picks a variant or size instead
         // of restyling with className; layout classes (width, flex, margin, position) stay
-        // allowed because placement belongs to the parent. Warn-only until the existing
-        // overrides are migrated to variants; the ceiling below stops the count growing.
+        // allowed because placement belongs to the parent. components/ui is for generic
+        // primitives: a look that belongs to one feature stays in that feature's component.
         files: ["apps/web/src/**"],
         excludeFiles: ["apps/web/src/components/ui/**"],
         rules: {
-          "shadcn/no-restyle": ["warn", { allow: ["layout"] }],
+          // A className built at runtime on a ui component is one no-restyle cannot read.
+          "shadcn/require-static-classes": "error",
+          // Appearance values come from the theme and Tailwind's scales. Layout stays free
+          // (placement belongs to the parent); the other entries are values no scale can hold.
+          "shadcn/no-arbitrary-values": [
+            "error",
+            {
+              allow: [
+                "layout",
+                // Which properties an element animates is per-element behaviour, like layout,
+                // not a design value; timing curves and durations still come from the theme.
+                "transition",
+                // Overlays that follow their frame's corner, which is set at runtime
+                // (floating preview) or by the element they decorate (composer outline).
+                "rounded-[inherit]",
+                // Inline chips size in em so they scale with the text they sit in
+                // (the composer honours the prompt font-size preference).
+                "gap-[0.33em]",
+                "px-[0.5em]",
+                "rounded-[0.5em]",
+                "text-[0.86em]",
+                // Project icons render from 14px to 48px and keep one proportional corner.
+                "rounded-[25%]",
+                // An emoji project icon fills its container, whatever size the parent gives it.
+                "text-[length:80cqh]",
+                // The platform's own selection colour on a selected composer chip.
+                "bg-[Highlight]",
+                // Brand marks keep their brand colours (Cursor, Grok, Claude).
+                "fill-[#26251E]",
+                "fill-[#EDECEC]",
+                "fill-[#0F0F0F]",
+                "fill-[#F5F5F5]",
+                "fill-[#d97757]",
+                "text-[#d97757]",
+              ],
+            },
+          ],
+          "shadcn/no-restyle": [
+            "error",
+            {
+              allow: ["layout"],
+              contracts: [
+                {
+                  // CollapsibleTrigger is a bare button with no styled counterpart
+                  // (a disclosure row is not a Button), so its className is the API.
+                  // Every other trigger has one: style them with render={<Button …/>}.
+                  pattern: "^CollapsibleTrigger$",
+                  allow: ["layout", "color", "typography", "spacing", "shape", "effects", "motion"],
+                },
+              ],
+            },
+          ],
         },
       },
+      {
+        // The sign-in masthead is T3 brand artwork: fixed gradients, not theme surfaces.
+        files: ["apps/web/src/components/auth/AuthSurfaceShell.tsx"],
+        rules: { "shadcn/no-arbitrary-values": "off" },
+      },
       {
         // Shared client code must not call APIs missing from Hermes. Our ESNext
         // TypeScript target accepts them even when they would crash mobile at launch.
@@ -201,7 +302,6 @@ export default defineConfig({
           "apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx",
           "apps/mobile/src/features/files/FileMarkdownPreview.tsx",
           "apps/mobile/src/features/files/SourceFileSurface.tsx",
-          "apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx",
           "apps/mobile/src/features/files/AttachmentFileScreen.tsx",
           "apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx",
           "apps/mobile/src/features/files/thread-file-navigator-pane.tsx",
@@ -209,7 +309,6 @@ export default defineConfig({
           "apps/mobile/src/features/review/ReviewSheet.tsx",
           "apps/mobile/src/features/review/useNativeReviewDiffBridge.ts",
           "apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx",
-          "apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx",
           "apps/mobile/src/features/threads/GitActionProgressOverlay.tsx",
           "apps/mobile/src/features/threads/NewTaskDraftScreen.tsx",
           "apps/mobile/src/features/threads/ThreadComposer.tsx",