fix(ci): skip CLI builds after setup failures

2026-08-26 03:26:12 +00:00 · 2026-08-23 23:30:34 +00:00
568 changed files with 8996 additions and 45906 deletions
@@ -135,16 +135,7 @@ jobs:

            const linkedIssues = result.repository.pullRequest.closingIssuesReferences.totalCount;

-            // GitHub only populates closingIssuesReferences when a PR targets the repository's
-            // default branch (dev). PRs targeting other branches like v2 always return totalCount 0.
-            // Fall back to checking the PR description for closing keywords (e.g. Closes #123).
-            const body = pr.body || '';
-            const issueMatch = body.match(/### Issue for this PR\s*\n([\s\S]*?)(?=###|$)/);
-            const issueContent = issueMatch ? issueMatch[1].trim() : body;
-            const hasBodyIssueRef = /(closes|fixes|resolves)\s+#\d+/i.test(issueContent) || /#\d+/.test(issueContent);
-            const hasLinkedIssue = linkedIssues > 0 || hasBodyIssueRef;
-
-            if (!hasLinkedIssue) {
+            if (linkedIssues === 0) {
              await addLabel('needs:issue');
              await comment('issue', `Thanks for your contribution!

@@ -22,36 +22,6 @@ env:
  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true

 jobs:
-  affected:
-    name: affected packages
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    outputs:
-      app: ${{ steps.packages.outputs.app }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-
-      - name: Setup Bun
-        uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
-        with:
-          bun-version-file: package.json
-
-      - name: Find affected packages
-        id: packages
-        env:
-          TURBO_SCM_BASE: ${{ github.event.pull_request.base.sha || github.event.before }}
-          TURBO_SCM_HEAD: ${{ github.sha }}
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "app=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          bun x turbo@2.10.2 ls --affected --filter=@opencode-ai/app --output=json > affected.json
-          bun -e 'const result = await Bun.file("affected.json").json(); console.log(`app=${result.packages.count > 0}`)' >> "$GITHUB_OUTPUT"
-
  unit:
    name: unit (${{ matrix.settings.name }})
    strategy:
@@ -78,6 +48,7 @@ jobs:
          node-version: "24"

      - name: Setup Bun
+        id: setup-bun
        uses: ./.github/actions/setup-bun

      - name: Test Effect simplification rules
@@ -114,19 +85,8 @@ jobs:
        env:
          OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER: ${{ runner.os == 'Windows' && 'true' || 'false' }}

-      - name: Verify published codemode package
-        if: runner.os == 'Linux'
-        working-directory: packages/codemode
-        run: bun run script/publish.ts --dry-run
-
-      - name: Verify packed workerd SDK
-        if: runner.os == 'Linux'
-        timeout-minutes: 15
-        working-directory: packages/sdk
-        run: bun run verify:package
-
      - name: Verify compiled service lifecycle
-        if: always()
+        if: always() && steps.setup-bun.outcome == 'success'
        timeout-minutes: 10
        working-directory: packages/cli
        env:
@@ -142,7 +102,7 @@ jobs:
          node-version: "26.4.0"

      - name: Verify Node build
-        if: always()
+        if: always() && steps.setup-bun.outcome == 'success'
        timeout-minutes: 15
        working-directory: packages/cli
        env:
@@ -163,7 +123,7 @@ jobs:

  e2e:
    name: e2e (${{ matrix.settings.name }})
-    needs: affected
+    if: github.ref_name != 'v2' && github.head_ref != 'v2'
    strategy:
      fail-fast: false
      matrix:
@@ -174,38 +134,32 @@ jobs:
            host: blacksmith-4vcpu-windows-2025
    runs-on: ${{ matrix.settings.host }}
    env:
-      E2E_ENABLED: ${{ needs.affected.outputs.app == 'true' && github.ref_name != 'v2' && github.head_ref != 'v2' }}
      PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/.playwright-browsers
    defaults:
      run:
        shell: bash
    steps:
      - name: Checkout repository
-        if: env.E2E_ENABLED == 'true'
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}

      - name: Setup Node
-        if: env.E2E_ENABLED == 'true'
        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          # Playwright 1.59 hangs while extracting Chromium with Node 24.16.
          node-version: "24.15"

      - name: Setup Bun
-        if: env.E2E_ENABLED == 'true'
        uses: ./.github/actions/setup-bun

      - name: Read Playwright version
-        if: env.E2E_ENABLED == 'true'
        id: playwright-version
        run: |
          version=$(node -e 'console.log(require("./package.json").workspaces.catalog["@playwright/test"])')
          echo "version=$version" >> "$GITHUB_OUTPUT"

      - name: Cache Playwright browsers
-        if: env.E2E_ENABLED == 'true'
        id: playwright-cache
        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
@@ -213,24 +167,23 @@ jobs:
          key: ${{ runner.os }}-${{ runner.arch }}-playwright-${{ steps.playwright-version.outputs.version }}-chromium

      - name: Install Playwright system dependencies
-        if: env.E2E_ENABLED == 'true' && runner.os == 'Linux'
+        if: runner.os == 'Linux'
        working-directory: packages/app
        run: bunx playwright install-deps chromium

      - name: Install Playwright browsers
-        if: env.E2E_ENABLED == 'true' && steps.playwright-cache.outputs.cache-hit != 'true'
+        if: steps.playwright-cache.outputs.cache-hit != 'true'
        working-directory: packages/app
        run: bunx playwright install chromium

      - name: Run app e2e tests
-        if: env.E2E_ENABLED == 'true'
        run: bun --cwd packages/app test:e2e:local
        env:
          CI: true
        timeout-minutes: 30

      - name: Upload Playwright artifacts
-        if: always() && env.E2E_ENABLED == 'true'
+        if: always()
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
        with:
          name: playwright-${{ matrix.settings.name }}-${{ github.run_attempt }}
@@ -71,7 +71,6 @@
        "@solid-primitives/event-bus": "1.1.2",
        "@solid-primitives/event-listener": "2.4.5",
        "@solid-primitives/i18n": "2.2.1",
-        "@solid-primitives/keyed": "1.5.3",
        "@solid-primitives/media": "2.3.3",
        "@solid-primitives/resize-observer": "2.1.5",
        "@solid-primitives/scheduled": "1.5.3",
@@ -430,7 +429,6 @@
      },
      "devDependencies": {
        "@actions/artifact": "4.0.0",
-        "@brendonovich/vite-plugin-opencode": "0.1.1",
        "@lydell/node-pty": "catalog:",
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/client": "workspace:*",
@@ -596,8 +594,8 @@
      },
      "peerDependencies": {
        "@opencode-ai/theme": "workspace:*",
-        "@opentui/core": ">=0.5.8",
-        "@opentui/solid": ">=0.5.8",
+        "@opentui/core": ">=0.5.7",
+        "@opentui/solid": ">=0.5.7",
        "solid-js": ">=1.9.0",
      },
      "optionalPeers": [
@@ -673,7 +671,6 @@
        "effect": "catalog:",
      },
      "devDependencies": {
-        "@opencode-ai/ai": "workspace:*",
        "@opencode-ai/httpapi-codegen": "workspace:*",
        "@opencode-ai/protocol": "workspace:*",
        "@tsconfig/bun": "catalog:",
@@ -686,7 +683,6 @@
      "version": "1.18.4",
      "dependencies": {
        "@effect/platform-node": "catalog:",
-        "@effect/platform-node-shared": "catalog:",
        "@opencode-ai/core": "workspace:*",
        "@opencode-ai/protocol": "workspace:*",
        "@opencode-ai/schema": "workspace:*",
@@ -1058,6 +1054,7 @@
  "patchedDependencies": {
    "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
    "@tanstack/virtual-core@3.17.8": "patches/@tanstack%2Fvirtual-core@3.17.8.patch",
+    "drizzle-orm@1.0.0-rc.2": "patches/drizzle-orm@1.0.0-rc.2.patch",
    "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
    "@ai-sdk/mistral@3.0.51": "patches/@ai-sdk%2Fmistral@3.0.51.patch",
@@ -1092,9 +1089,9 @@
    "@npmcli/arborist": "9.4.0",
    "@octokit/rest": "22.0.0",
    "@openauthjs/openauth": "0.0.0-20250322224806",
-    "@opentui/core": "0.5.8",
-    "@opentui/keymap": "0.5.8",
-    "@opentui/solid": "0.5.8",
+    "@opentui/core": "0.5.7",
+    "@opentui/keymap": "0.5.7",
+    "@opentui/solid": "0.5.7",
    "@pierre/diffs": "1.2.10",
    "@playwright/test": "1.59.1",
    "@sentry/solid": "10.36.0",
@@ -1119,8 +1116,8 @@
    "cross-spawn": "7.0.6",
    "diff": "8.0.2",
    "dompurify": "3.3.1",
-    "drizzle-kit": "1.0.0-rc.5-ab785fc",
-    "drizzle-orm": "1.0.0-rc.5-169397b",
+    "drizzle-kit": "1.0.0-rc.2",
+    "drizzle-orm": "1.0.0-rc.2",
    "effect": "4.0.0-rc.111",
    "fuzzysort": "3.1.0",
    "get-east-asian-width": "1.6.0",
@@ -1612,8 +1609,6 @@

    "@braintree/sanitize-url": ["@braintree/sanitize-url@7.1.2", "", {}, "sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA=="],

-    "@brendonovich/vite-plugin-opencode": ["@brendonovich/vite-plugin-opencode@0.1.1", "", { "dependencies": { "@babel/core": "^7.29.0", "@opencode-ai/client": "0.0.0-beta-18050" }, "peerDependencies": { "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "sha512-aPG0ct8ctxAqndbNOx7NW0GhU6QY6sOUfi/DaKqH9c5WdxICSsUop6uSkJwPDHP9WpN9eg0dd2D2qwYpG6UdHw=="],
-
    "@bruits/satteri-darwin-arm64": ["@bruits/satteri-darwin-arm64@0.9.5", "", { "os": "darwin", "cpu": "arm64" }, "sha512-iw4nZgx9v30lWo/MTngQqi1pI78KI0DnkSm+lVJGYdmPLgAyDNJigVhpG42/Iq55A6c1Ll8q66ljyyRiQUxwow=="],

    "@bruits/satteri-darwin-x64": ["@bruits/satteri-darwin-x64@0.9.5", "", { "os": "darwin", "cpu": "x64" }, "sha512-6T26Z5Kf3cFW2PSlk9p7zT7yVxvuBSiJvYyz9u8KjYwMTqZyIDOj2wDyNpxKV4+6yUVG7rddq2QwvG/8LJA2+Q=="],
@@ -1688,7 +1683,7 @@

    "@dot/log": ["@dot/log@0.1.5", "", { "dependencies": { "chalk": "^4.1.2", "loglevelnext": "^6.0.0", "p-defer": "^3.0.0" } }, "sha512-ECraEVJWv2f2mWK93lYiefUkphStVlKD6yKDzisuoEmxuLKrxO9iGetHK2DoEAkj7sxjE886n0OUVVCUx0YPNg=="],

-    "@drizzle-team/brocli": ["@drizzle-team/brocli@0.12.0", "", {}, "sha512-mlUE+rZ8CatQekLhnaiN91Iemdd+e2gFKooGlnRB3oPTL3VghLfX24dx7HrzMNeC1JrIB/0kpsfyty3f5HNfxQ=="],
+    "@drizzle-team/brocli": ["@drizzle-team/brocli@0.11.0", "", {}, "sha512-hD3pekGiPg0WPCCGAZmusBBJsDqGUR66Y452YgQsZOnkdQ7ViEPKuyP4huUGEZQefp8g34RRodXYmJ2TbCH+tg=="],

    "@effect/opentelemetry": ["@effect/opentelemetry@4.0.0-rc.111", "", { "peerDependencies": { "@opentelemetry/api": ">=1.9.0 <2.0.0", "@opentelemetry/api-logs": ">=0.203.0 <0.300.0", "@opentelemetry/resources": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-logs": ">=0.203.0 <0.300.0", "@opentelemetry/sdk-metrics": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-base": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-node": ">=2.0.0 <3.0.0", "@opentelemetry/sdk-trace-web": ">=2.0.0 <3.0.0", "@opentelemetry/semantic-conventions": ">=1.33.0 <2.0.0", "effect": "^4.0.0-rc.111" }, "optionalPeers": ["@opentelemetry/api", "@opentelemetry/api-logs", "@opentelemetry/resources", "@opentelemetry/sdk-logs", "@opentelemetry/sdk-metrics", "@opentelemetry/sdk-trace-base", "@opentelemetry/sdk-trace-node", "@opentelemetry/sdk-trace-web"] }, "sha512-bztAYpWoipn/a4tFjECMNvtWLkf2TS+Qn23PBI+f4q5DP9cBKfV00uhX8cwEVcfAtZd+lflSbGURHa4xlSewOA=="],

@@ -2222,27 +2217,27 @@

    "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.43.0", "", {}, "sha512-eSYWTm620tTk45EKSedaUL8MFYI8hW164hIXsgIHyxu3VobUB3fFCu5t0hQby6OoWRPsG1KkKUG2M5UadiLiVg=="],

-    "@opentui/core": ["@opentui/core@0.5.8", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.8", "@opentui/core-darwin-x64": "0.5.8", "@opentui/core-linux-arm64": "0.5.8", "@opentui/core-linux-arm64-musl": "0.5.8", "@opentui/core-linux-x64": "0.5.8", "@opentui/core-linux-x64-musl": "0.5.8", "@opentui/core-win32-arm64": "0.5.8", "@opentui/core-win32-x64": "0.5.8" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-GbZ+nSLYZqxj2Z5TU19Mx6IsAvVsn2+7WEXz+6OlMGoootvt3TxP3vWwfGI0jWk9qp1ftRlML1JPNEkzy+9I8g=="],
+    "@opentui/core": ["@opentui/core@0.5.7", "", { "dependencies": { "bun-ffi-structs": "0.3.1", "diff": "9.0.0", "marked": "17.0.1", "string-width": "7.2.0", "strip-ansi": "7.1.2" }, "optionalDependencies": { "@opentui/core-darwin-arm64": "0.5.7", "@opentui/core-darwin-x64": "0.5.7", "@opentui/core-linux-arm64": "0.5.7", "@opentui/core-linux-arm64-musl": "0.5.7", "@opentui/core-linux-x64": "0.5.7", "@opentui/core-linux-x64-musl": "0.5.7", "@opentui/core-win32-arm64": "0.5.7", "@opentui/core-win32-x64": "0.5.7" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-/XDabTkfBs2Wy2FhlC4jvzbpphYAs4SlnCRKYEvi+metlXNTSAshSs43wqZ9O4IPd0E4EcQqdfeQ0sdc3yPpYw=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.8", "", { "os": "darwin", "cpu": "arm64" }, "sha512-c9Y1FBrSnA4sKUCMETsrLYOmsMTyJae8mU9cE6M4o9rXcr3ZLPA7o9AkPA3S0+kH+kZ0o1Fn0wLejgNxvEp5mg=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.5.7", "", { "os": "darwin", "cpu": "arm64" }, "sha512-75TDJgFD6hDoCElIX35Yg3TIRF/jhrtVQO/9snhjGuTsZ7bd0W88jUlvSXSNhqB3CX431rwgi47B+asWPDI1lQ=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.8", "", { "os": "darwin", "cpu": "x64" }, "sha512-oZ/6Iz1KN+4volMFKmmvziYJhMgyyJ99LfK1S+uPRyIRqzT3CESoJ58D4h04M1g0dHeHE4PvkU1p3uQKrXiP3g=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.5.7", "", { "os": "darwin", "cpu": "x64" }, "sha512-j+Dwu2yV8zahBFjnVIssYdPrHz/+pkd7xWxI+nHjV41V3c+scvH6vJY1U85VCVaoQs/zCH5xAJbmAAn7Sgeh8g=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.8", "", { "os": "linux", "cpu": "arm64" }, "sha512-N6i/ocrsTjIq9aUQyrfJkqUo+tc4P5ZS6xz38Cm1MhtDzwBE+CrNIJdHfoJfmRLhJkYHlw6Z0ToICn8ZNj4Bpw=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.5.7", "", { "os": "linux", "cpu": "arm64" }, "sha512-gWO9NWaivXRPc0XhEbxehj3ApyC1SW8Bf1cnHnME1zhw/EZNCNE3TQHgKwOnnNKtvlbhzLQjOI4OqyPYV8UcEQ=="],

-    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.8", "", { "os": "linux", "cpu": "arm64" }, "sha512-eFMB41AWODaYf8PsCx3vtTMX33tFgtSpR9tKNnUErCXlcnZ+WCRHVaJ9F6DrVNX3ir6HmgbwAmaWXvaVF+kLtg=="],
+    "@opentui/core-linux-arm64-musl": ["@opentui/core-linux-arm64-musl@0.5.7", "", { "os": "linux", "cpu": "arm64" }, "sha512-RumSHTasIAWU7jPBKiTuEZG/m+prfQKCHhL3JAQnBLgp7eAB20XZGfSLVWDBgxkyKq1rHCUgLtZktC5ZAyKfTA=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.8", "", { "os": "linux", "cpu": "x64" }, "sha512-/2QM7/wMnML/sxchzbwgoU5tUu/7k836/kSOKMti8opjuecv1K+WWNKGXufhTNeRcXFZaba5rsCdYrf3VqnVsQ=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.5.7", "", { "os": "linux", "cpu": "x64" }, "sha512-fXDmrIlfp9xaoVkk3BNn3yUO/b7plBSOfUh2oWOezRA6E/g5z+hTO1alGFQCy+VV+1kfA6iuYadAww0xNtfACg=="],

-    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.8", "", { "os": "linux", "cpu": "x64" }, "sha512-YXo+qUHYmep2uvv3ECvTeqr10aD7+lBsavYmsTLBzS5hHabbzlQ10oX/99nIRPC3Au1BMWD6d6zQP5czPx23eg=="],
+    "@opentui/core-linux-x64-musl": ["@opentui/core-linux-x64-musl@0.5.7", "", { "os": "linux", "cpu": "x64" }, "sha512-1opDV+W7C1F4iWivCNKuYl5Hen+IeFXAuUPm3hVyN0UtdcP8LESpFJTr8QRwHpGSE9Jz1K2g2S2ipzI3u5mhgw=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.8", "", { "os": "win32", "cpu": "arm64" }, "sha512-7qBdhEAlh4tLFzW7nWLPlREtNiF6NZMDMi+4uDpUlAMhRavLr6wjcIcgfhNAF/puq06DjuZlPTwaMCgB3qOuwA=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.5.7", "", { "os": "win32", "cpu": "arm64" }, "sha512-gbiZUyttjq8s+bsnsaopygWN7LTS/RyzD6GOmpgOB2TVitvo0P6mxM+AebBGuu/7xri17Rqaxf3uqrgdKiJAeg=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.8", "", { "os": "win32", "cpu": "x64" }, "sha512-Z76YaTKnmRDSHKdKa7iTBCXBQdInQLq7UG3qIE84nvyHCDtkhYtPWOaCzDisSgXC8Y6hJt6NiFbaNjQyxPkfpQ=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.5.7", "", { "os": "win32", "cpu": "x64" }, "sha512-bDwon45lUxbV3rMcekTCg4mXcBu9uhdG6HLeLK5TVZf05/h+Ibkf2UeZ8A2jjQt+MK6jpYmxWwDCVCTzZ7EU7Q=="],

-    "@opentui/keymap": ["@opentui/keymap@0.5.8", "", { "dependencies": { "@opentui/core": "0.5.8" }, "peerDependencies": { "@opentui/react": "0.5.8", "@opentui/solid": "0.5.8", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-KQHKRnLZroSZIbHmGmSeDPsXi7Yykdu9x9ACmDzBFkgPGx0EIuXHqRcmrqmUaX485MQEZuCD9t6FdDsOMGyIFg=="],
+    "@opentui/keymap": ["@opentui/keymap@0.5.7", "", { "dependencies": { "@opentui/core": "0.5.7" }, "peerDependencies": { "@opentui/react": "0.5.7", "@opentui/solid": "0.5.7", "react": ">=19.2.0", "solid-js": "1.9.12" }, "optionalPeers": ["@opentui/react", "@opentui/solid", "react", "solid-js"] }, "sha512-BqfSbjlLuctnew2aoPPdK3wpzJfEPp7ttLBkTu1wJTkps9AcfUgXqwloqvY4DUKjUBNFYYEpU/0CPxI4Blj4MA=="],

-    "@opentui/solid": ["@opentui/solid@0.5.8", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.8", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-L0NxuAU8XT+jlE5G90oA3kspqkof48b0hmzi5XLw+1gxnkxrkTb+YfKys+GzVK4UqhgwY9aW+TeDfrKbnfwCMw=="],
+    "@opentui/solid": ["@opentui/solid@0.5.7", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.5.7", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.12", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.12" } }, "sha512-qrKAZd9xt4D67LXZUARg1Aw0dwEWi29GyOxpM6abqmyExGPMS7jih5Z9oMQJ9EXsouDKpW7Mejjq7WbX2AaecQ=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -3222,6 +3217,12 @@

    "@valibot/to-json-schema": ["@valibot/to-json-schema@1.6.0", "", { "peerDependencies": { "valibot": "^1.3.0" } }, "sha512-d6rYyK5KVa2XdqamWgZ4/Nr+cXhxjy7lmpe6Iajw15J/jmU+gyxl2IEd1Otg1d7Rl3gOQL5reulnSypzBtYy1A=="],

+    "@vercel/cli-config": ["@vercel/cli-config@0.2.3", "", { "dependencies": { "xdg-app-paths": "5", "zod": "4.1.11" } }, "sha512-Ggh0Wmi92TUkUexmSUPkkDtvJmbjUr7IvF5T3FkSsWrXXs3GFzOujfxFpECdJZpux1JG4SWDv9BT4w++TDgD6A=="],
+
+    "@vercel/cli-exec": ["@vercel/cli-exec@1.0.1", "", { "dependencies": { "execa": "5.1.1" } }, "sha512-g9XerViJ/paZujufXYcu5XYI2vU2rtB4sgdpjUHde5RnOkdmpu0ngH46LCFGHoPXO/C+qDPSczIHIRN+8Q2YKQ=="],
+
+    "@vercel/functions": ["@vercel/functions@3.9.3", "", { "dependencies": { "@vercel/oidc": "3.8.4" }, "peerDependencies": { "@aws-sdk/credential-provider-web-identity": "*", "ws": ">=8" }, "optionalPeers": ["@aws-sdk/credential-provider-web-identity", "ws"] }, "sha512-cbzTdASCZDnufrABc8oO00e/FqlqFFSdld+iGZPhrWBDHP4Pu8ESKKYIzASqYvbYYUIWujBvEa5LLCcZzm7WEw=="],
+
    "@vercel/oidc": ["@vercel/oidc@3.2.0", "", {}, "sha512-UycprH3T6n3jH0k44NHMa7pnFHGu/N05MjojYr+Mc6I7obkoLIJujSWwin1pCvdy/eOxrI/l3uDLQsmcrOb4ug=="],

    "@vitejs/plugin-react": ["@vitejs/plugin-react@4.7.0", "", { "dependencies": { "@babel/core": "^7.28.0", "@babel/plugin-transform-react-jsx-self": "^7.27.1", "@babel/plugin-transform-react-jsx-source": "^7.27.1", "@rolldown/pluginutils": "1.0.0-beta.27", "@types/babel__core": "^7.20.5", "react-refresh": "^0.17.0" }, "peerDependencies": { "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" } }, "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA=="],
@@ -3834,9 +3835,9 @@

    "dotenv-expand": ["dotenv-expand@11.0.7", "", { "dependencies": { "dotenv": "^16.4.5" } }, "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA=="],

-    "drizzle-kit": ["drizzle-kit@1.0.0-rc.5-ab785fc", "", { "dependencies": { "@drizzle-team/brocli": "^0.12.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "get-tsconfig": "^4.13.6", "jiti": "^2.6.1" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-TSg7sK1finOxdo48O9mDfyMY3lhi/aHCVIil5TFhthyq/H/89H/3nwX5V9Gdp7HYMUGFHyWJD5iowSn98l0elw=="],
+    "drizzle-kit": ["drizzle-kit@1.0.0-rc.2", "", { "dependencies": { "@drizzle-team/brocli": "^0.11.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "get-tsconfig": "^4.13.6", "jiti": "^2.6.1" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-TRxUmj1wDA2QCt3GvuhfamvIa66wJ7+MzSxBMKkpRtYScjHTumT9BE+x6daSzuEacSrPEuUH5/cW1uo5RkoPIg=="],

-    "drizzle-orm": ["drizzle-orm@1.0.0-rc.5-169397b", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@drizzle-team/minipg": ">=0.3.2", "@effect/sql-d1": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-libsql": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-mysql2": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-pg": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-pglite": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-bun": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-do": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-node": ">=4.0.0-beta.105 || >=4.0.0", "@effect/sql-sqlite-wasm": ">=4.0.0-beta.105 || >=4.0.0", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=17", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.7.1", "@tursodatabase/database-common": ">=0.7.1", "@tursodatabase/database-wasm": ">=0.7.1", "@tursodatabase/serverless": ">=1.4.0", "@tursodatabase/sync": ">=0.7.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "effect": ">=4.0.0-beta.105 || >=4.0.0", "expo-sqlite": ">=14.0.0", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.2.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@drizzle-team/minipg", "@effect/sql-d1", "@effect/sql-libsql", "@effect/sql-mysql2", "@effect/sql-pg", "@effect/sql-pglite", "@effect/sql-sqlite-bun", "@effect/sql-sqlite-do", "@effect/sql-sqlite-node", "@effect/sql-sqlite-wasm", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@tursodatabase/serverless", "@tursodatabase/sync", "@types/better-sqlite3", "@types/mssql", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "effect", "expo-sqlite", "mssql", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-xf5TudQhFplMMzjwgmMY5f64Sqbv4iwXxdTHBHqvLMt+SHyY8rAYhzNLQchEkDxiqMclTS/txPEOg5pdQy0Tcw=="],
+    "drizzle-orm": ["drizzle-orm@1.0.0-rc.2", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql-pg": ">=4.0.0-beta.58 || >=4.0.0", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "effect": ">=4.0.0-beta.58 || >=4.0.0", "expo-sqlite": ">=14.0.0", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.0.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/mssql", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "effect", "expo-sqlite", "mssql", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-UXYDkbplF5wX0hwxll+80QhEwUvAJLBu+tAK/d4fna18kLE6VuliAzufF/ieDEIJeSnLRYgtmsXD6x1Xuy1kIg=="],

    "dset": ["dset@3.1.4", "", {}, "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA=="],

@@ -3980,6 +3981,8 @@

    "eventsource-parser": ["eventsource-parser@3.1.1", "", {}, "sha512-EKN1vKAMcZ8MlYMpaNuxN6R9yakzH6uajHcHVTqWJzvu5pWw9DyhbP35HH8MVBQ+dZjAfDxk+A8NiR9KWaXiyQ=="],

+    "execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="],
+
    "exit-hook": ["exit-hook@2.2.1", "", {}, "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw=="],

    "expect-type": ["expect-type@1.4.0", "", {}, "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA=="],
@@ -4254,6 +4257,8 @@

    "https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],

+    "human-signals": ["human-signals@2.1.0", "", {}, "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="],
+
    "humanize-ms": ["humanize-ms@1.2.1", "", { "dependencies": { "ms": "^2.0.0" } }, "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="],

    "husky": ["husky@9.1.7", "", { "bin": { "husky": "bin.js" } }, "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA=="],
@@ -4618,6 +4623,8 @@

    "merge-descriptors": ["merge-descriptors@2.0.0", "", {}, "sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g=="],

+    "merge-stream": ["merge-stream@2.0.0", "", {}, "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="],
+
    "merge2": ["merge2@1.4.1", "", {}, "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="],

    "mermaid": ["mermaid@11.16.1", "", { "dependencies": { "@braintree/sanitize-url": "^7.1.2", "@iconify/utils": "^3.0.2", "@mermaid-js/parser": "^1.2.0", "@types/d3": "^7.4.3", "@upsetjs/venn.js": "^2.0.0", "cytoscape": "^3.33.3", "cytoscape-cose-bilkent": "^4.1.0", "cytoscape-fcose": "^2.2.0", "d3": "^7.9.0", "d3-sankey": "^0.12.3", "dagre-d3-es": "7.0.14", "dayjs": "^1.11.20", "dompurify": "^3.3.3", "es-toolkit": "^1.45.1", "katex": "^0.16.45", "khroma": "^2.1.0", "marked": "^16.3.0", "roughjs": "^4.6.6", "stylis": "^4.3.6", "ts-dedent": "^2.2.0", "uuid": "^11.1.0 || ^12 || ^13 || ^14.0.0" } }, "sha512-TQsq6u22fAn3rek5VOubrhKPo1g5hwC3FXUN9hiyupTckcYiGuuKGkNQrKYwGJkXUxZdojwRG46gsSCFZMDp4g=="],
@@ -4702,6 +4709,8 @@

    "mime-types": ["mime-types@3.0.2", "", { "dependencies": { "mime-db": "^1.54.0" } }, "sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A=="],

+    "mimic-fn": ["mimic-fn@2.1.0", "", {}, "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="],
+
    "mimic-function": ["mimic-function@5.0.1", "", {}, "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA=="],

    "mimic-response": ["mimic-response@3.1.0", "", {}, "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="],
@@ -4818,6 +4827,8 @@

    "npm-registry-fetch": ["npm-registry-fetch@19.1.1", "", { "dependencies": { "@npmcli/redact": "^4.0.0", "jsonparse": "^1.3.1", "make-fetch-happen": "^15.0.0", "minipass": "^7.0.2", "minipass-fetch": "^5.0.0", "minizlib": "^3.0.1", "npm-package-arg": "^13.0.0", "proc-log": "^6.0.0" } }, "sha512-TakBap6OM1w0H73VZVDf44iFXsOS3h+L4wVMXmbWOQroZgFhMch0juN6XSzBNlD965yIKvWg2dfu7NSiaYLxtw=="],

+    "npm-run-path": ["npm-run-path@4.0.1", "", { "dependencies": { "path-key": "^3.0.0" } }, "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="],
+
    "nth-check": ["nth-check@2.1.1", "", { "dependencies": { "boolbase": "^1.0.0" } }, "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="],

    "object-assign": ["object-assign@4.1.1", "", {}, "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="],
@@ -4842,6 +4853,8 @@

    "once": ["once@1.4.0", "", { "dependencies": { "wrappy": "1" } }, "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="],

+    "onetime": ["onetime@5.1.2", "", { "dependencies": { "mimic-fn": "^2.1.0" } }, "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="],
+
    "oniguruma-parser": ["oniguruma-parser@0.12.2", "", {}, "sha512-6HVa5oIrgMC6aA6WF6XyyqbhRPJrKR02L20+2+zpDtO5QAzGHAUGw5TKQvwi5vctNnRHkJYmjAhRVQF2EKdTQw=="],

    "oniguruma-to-es": ["oniguruma-to-es@4.3.6", "", { "dependencies": { "oniguruma-parser": "^0.12.2", "regex": "^6.1.0", "regex-recursion": "^6.0.2" } }, "sha512-csuQ9x3Yr0cEIs/Zgx/OEt9iBw9vqIunAPQkx19R/fiMq2oGVTgcMqO/V3Ybqefr1TBvosI6jU539ksaBULJyA=="],
@@ -4856,6 +4869,8 @@

    "opentui-spinner": ["opentui-spinner@0.0.7", "", { "dependencies": { "cli-spinners": "^3.3.0" }, "peerDependencies": { "@opentui/core": "^0.3.4", "@opentui/react": "^0.3.4", "@opentui/solid": "^0.3.4", "typescript": "^5" }, "optionalPeers": ["@opentui/react", "@opentui/solid"] }, "sha512-nPzwAvJG+y9rVEwwHLHqbsMzLnIk2zw+F9LqwA7aYJvpM5gsrKC2rrGi36A+tZpA+1RnWxXeWEgVZMchnaH18Q=="],

+    "os-paths": ["os-paths@4.4.0", "", {}, "sha512-wrAwOeXp1RRMFfQY8Sy7VaGVmPocaLwSFOYCGKSyo8qmJ+/yaafCl5BCA1IQZWqFSRBrKDYFeR9d/VyQzfH/jg=="],
+
    "own-keys": ["own-keys@1.0.2", "", { "dependencies": { "call-bound": "^1.0.4", "get-intrinsic": "^1.3.0", "object-keys": "^1.1.1", "safe-push-apply": "^1.0.0" } }, "sha512-19YVAg7T+WTrxggPukVq7DjTv6+PJ867TmhCvBsYwmbFCsZd344rq2Ld1p0wo8f8Qrrhgp82c6FJRqdXWtSEhg=="],

    "oxc-minify": ["oxc-minify@0.96.0", "", { "optionalDependencies": { "@oxc-minify/binding-android-arm64": "0.96.0", "@oxc-minify/binding-darwin-arm64": "0.96.0", "@oxc-minify/binding-darwin-x64": "0.96.0", "@oxc-minify/binding-freebsd-x64": "0.96.0", "@oxc-minify/binding-linux-arm-gnueabihf": "0.96.0", "@oxc-minify/binding-linux-arm-musleabihf": "0.96.0", "@oxc-minify/binding-linux-arm64-gnu": "0.96.0", "@oxc-minify/binding-linux-arm64-musl": "0.96.0", "@oxc-minify/binding-linux-riscv64-gnu": "0.96.0", "@oxc-minify/binding-linux-s390x-gnu": "0.96.0", "@oxc-minify/binding-linux-x64-gnu": "0.96.0", "@oxc-minify/binding-linux-x64-musl": "0.96.0", "@oxc-minify/binding-wasm32-wasi": "0.96.0", "@oxc-minify/binding-win32-arm64-msvc": "0.96.0", "@oxc-minify/binding-win32-x64-msvc": "0.96.0" } }, "sha512-dXeeGrfPJJ4rMdw+NrqiCRtbzVX2ogq//R0Xns08zql2HjV3Zi2SBJ65saqfDaJzd2bcHqvGWH+M44EQCHPAcA=="],
@@ -5438,6 +5453,8 @@

    "strip-comments": ["strip-comments@2.0.1", "", {}, "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="],

+    "strip-final-newline": ["strip-final-newline@2.0.0", "", {}, "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="],
+
    "strip-indent": ["strip-indent@3.0.0", "", { "dependencies": { "min-indent": "^1.0.0" } }, "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="],

    "stripe": ["stripe@18.0.0", "", { "dependencies": { "@types/node": ">=8.1.0", "qs": "^6.11.0" } }, "sha512-3Fs33IzKUby//9kCkCa1uRpinAoTvj6rJgQ2jrBEysoxEvfsclvXdna1amyEYbA2EKkjynuB4+L/kleCCaWTpA=="],
@@ -5830,6 +5847,10 @@

    "wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],

+    "xdg-app-paths": ["xdg-app-paths@5.5.1", "", { "dependencies": { "os-paths": "^4.0.1", "xdg-portable": "^7.2.0" } }, "sha512-hI3flOB4PLZIy5prbtTpirobtPE2ZtZ52szO+2mM9Efp6ErM398La+C1lIpNWDfNoQk+6Lsi6nMcCwVB7pxeMQ=="],
+
+    "xdg-portable": ["xdg-portable@7.3.0", "", { "dependencies": { "os-paths": "^4.0.1" } }, "sha512-sqMMuL1rc0FmMBOzCpd0yuy9trqF2yTTVe+E9ogwCSWQCdDEtQUwrZPT6AxqtsFGRNxycgncbP/xmOOSPw5ZUw=="],
+
    "xml-naming": ["xml-naming@0.3.0", "", {}, "sha512-ghig2TBE/H11aOVgmahA3MhimvkBr6JIYknH/Dhdk10nXwdbIqBJsbfMxpvFPG8bAw77gN29aQWvKpmVoPlvPQ=="],

    "xml2js": ["xml2js@0.5.0", "", { "dependencies": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" } }, "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA=="],
@@ -6136,8 +6157,6 @@

    "@babel/preset-env/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],

-    "@brendonovich/vite-plugin-opencode/@opencode-ai/client": ["@opencode-ai/client@0.0.0-beta-18050", "", { "dependencies": { "@opencode-ai/protocol": "0.0.0-beta-18050", "@opencode-ai/schema": "0.0.0-beta-18050" }, "peerDependencies": { "effect": "4.0.0-rc.111", "solid-js": ">=1.9.0" }, "optionalPeers": ["effect", "solid-js"] }, "sha512-zWZv5X23iyx+/mxwiAi18YY/VMjQofTaH7RyKMBt7KL6FmaKAWf9Q05zbQhrLX8DYJD3MOtbjBeQCGLsPUDU8g=="],
-
    "@bruits/satteri-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.11.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.2.2", "tslib": "^2.4.0" } }, "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ=="],

    "@bruits/satteri-wasm32-wasi/@emnapi/runtime": ["@emnapi/runtime@1.11.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw=="],
@@ -6404,6 +6423,10 @@

    "@testing-library/dom/dom-accessibility-api": ["dom-accessibility-api@0.5.16", "", {}, "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg=="],

+    "@vercel/cli-config/zod": ["zod@4.1.11", "", {}, "sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg=="],
+
+    "@vercel/functions/@vercel/oidc": ["@vercel/oidc@3.8.4", "", { "dependencies": { "@vercel/cli-config": "0.2.3", "@vercel/cli-exec": "1.0.1", "jose": "^5.9.6" } }, "sha512-FGNvVZ5pgX9FaBqkPt6VkYFZ6bWAMDzYi7nxW+1Xt+Z4fn5PuTULVwsxjKc+0uKhysyWBQmvsmM50Oh6C2/oMA=="],
+
    "@vitejs/plugin-react/@rolldown/pluginutils": ["@rolldown/pluginutils@1.0.0-beta.27", "", {}, "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA=="],

    "@vitejs/plugin-react/vite": ["vite@7.1.11", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-uzcxnSDVjAopEUjljkWh8EIrg6tlzrjFUfMcR1EVsRDGwf/ccef0qQPRyOrROwhrTDaApueq+ja+KLPlzR/zdg=="],
@@ -6542,6 +6565,10 @@

    "esbuild-plugin-copy/chokidar": ["chokidar@3.6.0", "", { "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", "readdirp": "~3.6.0" }, "optionalDependencies": { "fsevents": "~2.3.2" } }, "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="],

+    "execa/get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="],
+
+    "execa/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],
+
    "express/cookie": ["cookie@0.7.2", "", {}, "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="],

    "fetch-blob/web-streams-polyfill": ["web-streams-polyfill@3.3.3", "", {}, "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="],
@@ -6962,10 +6989,6 @@

    "@babel/helper-compilation-targets/lru-cache/yallist": ["yallist@3.1.1", "", {}, "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="],

-    "@brendonovich/vite-plugin-opencode/@opencode-ai/client/@opencode-ai/protocol": ["@opencode-ai/protocol@0.0.0-beta-18050", "", { "dependencies": { "@opencode-ai/schema": "0.0.0-beta-18050", "effect": "4.0.0-rc.111" } }, "sha512-HDQMnvGp8IU0MdBRbEuydX1WQm09BZ4HJm9iSMQwzweJuQ2HNscgzHJPIH6P02BsbbtfJ8J7sZGPItrz1tWSgw=="],
-
-    "@brendonovich/vite-plugin-opencode/@opencode-ai/client/@opencode-ai/schema": ["@opencode-ai/schema@0.0.0-beta-18050", "", { "dependencies": { "@standard-schema/spec": "1.1.0", "effect": "4.0.0-rc.111" } }, "sha512-/D6VXaWlytTXR3IOiMLIKuPcfp7FQNUzRPm9z3K7UBFd1Bw4q/WZksaf5RVcBGz+0YRxYMc1V4D7MFlceSgtyg=="],
-
    "@bruits/satteri-wasm32-wasi/@emnapi/core/@emnapi/wasi-threads": ["@emnapi/wasi-threads@1.2.2", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA=="],

    "@electron/asar/minimatch/brace-expansion": ["brace-expansion@1.1.18", "", { "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw=="],
@@ -7302,6 +7325,8 @@

    "@tailwindcss/node/lightningcss/lightningcss-win32-x64-msvc": ["lightningcss-win32-x64-msvc@1.32.0", "", { "os": "win32", "cpu": "x64" }, "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q=="],

+    "@vercel/functions/@vercel/oidc/jose": ["jose@5.9.6", "", {}, "sha512-AMlnetc9+CV9asI19zHmrgS/WYsWUwCn2R7RzlbJWD7F9eWYUTGyBmU9o6PxngtLGOiDGPRu+Uc4fhKzbpteZQ=="],
+
    "@vitest/expect/@vitest/utils/@vitest/pretty-format": ["@vitest/pretty-format@3.2.4", "", { "dependencies": { "tinyrainbow": "^2.0.0" } }, "sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA=="],

    "ai-gateway-provider/@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@3.0.14", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-5X1k57JBJ4H7H1QjX7CnJYAB1I19r/trVZTMcSms7/kLNZ8RaU4Nt2agcwZzv82Hfx6Q7/TOLU7agAKeFfc8cA=="],
@@ -2,7 +2,7 @@
 exact = true
 # Only install newly resolved package versions published at least 3 days ago.
 minimumReleaseAge = 259200
-minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@brendonovich/vite-plugin-opencode", "@opencode-ai/sdk", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish", "blume"]
+minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@opencode-ai/sdk", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish", "blume"]

 [test]
 root = "./do-not-run-tests-from-root"
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-3Jx1Q7hl+Y0Log/k2vd5y6dzBpzFKWlhShPESxn1Rm4=",
-    "aarch64-linux": "sha256-EiiI6g01oBIrExCMAUgT3w82P0fvu4FAJhI32C+ze0I=",
-    "aarch64-darwin": "sha256-s+w49HRp1+ewtiTaU65tPWjUiO1NQw3kzfemMEEQZb0=",
-    "x86_64-darwin": "sha256-/Ee5V7pnL/qm3c4ZHeWEjH7FhGVXArXryOugbG5vsz8="
+    "x86_64-linux": "sha256-pnyqHqM8nt1Dh/d6xRm8DploZG9PiaO3HWGVIFyew54=",
+    "aarch64-linux": "sha256-cWPfoDku1bFN7zwCy6rsLP/WMmp6hEpO3Ous3FPGcfo=",
+    "aarch64-darwin": "sha256-2S3opWupuF3AncBbZLd5B7IsrUxYxA4S1mKWy58gMlo=",
+    "x86_64-darwin": "sha256-fu6WCBh9CWqsk8ACvLdeleP55uZ08i8MfEPFqgt7ob0="
  }
 }
@@ -49,9 +49,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.5.8",
-      "@opentui/keymap": "0.5.8",
-      "@opentui/solid": "0.5.8",
+      "@opentui/core": "0.5.7",
+      "@opentui/keymap": "0.5.7",
+      "@opentui/solid": "0.5.7",
      "@tanstack/solid-virtual": "3.13.37",
      "@shikijs/stream": "4.2.0",
      "@standard-schema/spec": "1.1.0",
@@ -71,8 +71,8 @@
      "@tailwindcss/vite": "4.1.11",
      "diff": "8.0.2",
      "dompurify": "3.3.1",
-      "drizzle-kit": "1.0.0-rc.5-ab785fc",
-      "drizzle-orm": "1.0.0-rc.5-169397b",
+      "drizzle-kit": "1.0.0-rc.2",
+      "drizzle-orm": "1.0.0-rc.2",
      "effect": "4.0.0-rc.111",
      "ai": "6.0.168",
      "cross-spawn": "7.0.6",
@@ -166,6 +166,7 @@
    "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
+    "drizzle-orm@1.0.0-rc.2": "patches/drizzle-orm@1.0.0-rc.2.patch",
    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
    "@ai-sdk/mistral@3.0.51": "patches/@ai-sdk%2Fmistral@3.0.51.patch",
    "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
@@ -1,8 +1,7 @@
 import { Context, Effect, Layer } from "effect"
 import { RequestExecutor } from "./route/executor.js"
-import { mergeHttpOptions, type AIError } from "./schema/index.js"
-import { sanitizeSurrogates } from "./utils/sanitize.js"
 import type { ImageOptions, ImageRequest, ImageRequestFor, ImageResponse } from "./image.js"
+import type { AIError } from "./schema/index.js"

 export type Execute = RequestExecutor.Interface["execute"]

@@ -27,18 +26,7 @@ export const layer: Layer.Layer<Service, never, RequestExecutor.Service> = Layer
  Effect.gen(function* () {
    const executor = yield* RequestExecutor.Service
    return Service.of({
-      generate: (request) =>
-        request.model.route.generate(
-          {
-            ...sanitizeSurrogates({
-              ...request,
-              model: undefined,
-              http: mergeHttpOptions(request.model.http, request.http),
-            }),
-            model: request.model,
-          },
-          executor.execute,
-        ),
+      generate: (request) => request.model.route.generate(request, executor.execute),
    })
  }),
 )
@@ -1,5 +1,4 @@
-import { Buffer } from "node:buffer"
-import { Effect, Option, Schema } from "effect"
+import { Effect, Schema } from "effect"
 import { Tool } from "@opencode-ai/schema/tool"
 import { Route } from "../route/client.js"
 import { Auth } from "../route/auth.js"
@@ -55,7 +54,7 @@ export type ThinkingInput =
  | {
      readonly type: "disabled"
    }
-  | ({ readonly type: "enabled"; readonly display?: "summarized" | "omitted" } & (
+  | ({ readonly type: "enabled" } & (
      | { readonly budgetTokens: number; readonly budget_tokens?: number }
      | { readonly budgetTokens?: number; readonly budget_tokens: number }
    ))
@@ -64,19 +63,6 @@ export interface OptionsInput {
  readonly [key: string]: unknown
  readonly thinking?: ThinkingInput
  readonly effort?: string
-  readonly service_tier?: "auto" | "standard_only"
-  readonly serviceTier?: "auto" | "standard_only"
-  // SDK Metadata:2649 {user_id?: string | null}
-  readonly metadata?: { readonly user_id?: string | null }
-  // SDK MessageCreateParamsContainer:2596 ContainerParams|string
-  readonly container?: string | { readonly id?: string | null; readonly skills?: ReadonlyArray<Record<string, unknown>> | null }
-  readonly inference_geo?: string | null
-  readonly inferenceGeo?: string | null
-  readonly cache_control?: { readonly type: "ephemeral"; readonly ttl?: "5m" | "1h" }
-  readonly cacheControl?: { readonly type: "ephemeral"; readonly ttl?: "5m" | "1h" }
-  // SDK OutputConfig:2684 {effort, format: JSONOutputFormat}
-  readonly output_config?: { readonly effort?: string | null; readonly format?: { readonly type: "json_schema"; readonly schema: Record<string, unknown> } | null }
-  readonly outputConfig?: { readonly effort?: string | null; readonly format?: { readonly type: "json_schema"; readonly schema: Record<string, unknown> } | null }
 }

 export type ProviderOptionsInput = OptionsInput
@@ -96,68 +82,32 @@ const AnthropicTextBlock = Schema.Struct({
 })
 type AnthropicTextBlock = Schema.Schema.Type<typeof AnthropicTextBlock>

-// SDK: Base64ImageSource:201 {type:"base64", media_type:"image/jpeg"|... , data}, URLImageSource:3817 {type:"url", url}, FileImageSource:2350 {type:"file", file_id}
-// SDK: ImageBlockParam:2356 {source: Base64|URL|File, cache_control, transformations:2381 {oversized_image?}}
-const AnthropicBase64ImageSource = Schema.Struct({
-  type: Schema.tag("base64"),
-  media_type: Schema.String,
-  data: Schema.String,
-})
-const AnthropicURLImageSource = Schema.Struct({ type: Schema.tag("url"), url: Schema.String })
-const AnthropicFileImageSource = Schema.Struct({ type: Schema.tag("file"), file_id: Schema.String })
-const AnthropicImageSource = Schema.Union([
-  AnthropicBase64ImageSource,
-  AnthropicURLImageSource,
-  AnthropicFileImageSource,
-])
-const AnthropicImageTransformations = Schema.Struct({
-  oversized_image: Schema.optional(Schema.Literals(["downsize", "error"])),
-})
-
 const AnthropicImageBlock = Schema.Struct({
  type: Schema.tag("image"),
-  source: AnthropicImageSource,
+  source: Schema.Struct({
+    type: Schema.tag("base64"),
+    media_type: Schema.String,
+    data: Schema.String,
+  }),
  cache_control: Schema.optional(AnthropicCacheControl),
-  transformations: Schema.optional(AnthropicImageTransformations),
 })
 type AnthropicImageBlock = Schema.Schema.Type<typeof AnthropicImageBlock>

-// SDK: Base64PDFSource:209 {type:"base64", media_type:"application/pdf", data}, PlainTextSource:2716 {type:"text", media_type:"text/plain", data},
-// SDK: URLPDFSource:3823 {type:"url", url}, FileDocumentSource:2344 {type:"file", file_id}, ContentBlockSource:2266 {type:"content", content}
-// SDK: DocumentBlockParam:2297 {source: 5-way union, cache_control, citations, context, title}
-const AnthropicBase64PDFSource = Schema.Struct({
-  type: Schema.tag("base64"),
-  media_type: Schema.Literal("application/pdf"),
-  data: Schema.String,
-})
-const AnthropicPlainTextSource = Schema.Struct({
-  type: Schema.tag("text"),
-  media_type: Schema.Literal("text/plain"),
-  data: Schema.String,
-})
-const AnthropicURLPDFSource = Schema.Struct({ type: Schema.tag("url"), url: Schema.String })
-const AnthropicFileDocumentSource = Schema.Struct({ type: Schema.tag("file"), file_id: Schema.String })
-const AnthropicDocumentSource = Schema.Union([
-  AnthropicBase64PDFSource,
-  AnthropicPlainTextSource,
-  AnthropicURLPDFSource,
-  AnthropicFileDocumentSource,
-])
-
 const AnthropicDocumentBlock = Schema.Struct({
  type: Schema.tag("document"),
-  source: AnthropicDocumentSource,
+  source: Schema.Struct({
+    type: Schema.tag("base64"),
+    media_type: Schema.Literal("application/pdf"),
+    data: Schema.String,
+  }),
  cache_control: Schema.optional(AnthropicCacheControl),
-  title: Schema.optional(Schema.String),
-  context: Schema.optional(Schema.String),
-  citations: Schema.optional(Schema.Struct({ enabled: Schema.Boolean })),
 })
 type AnthropicDocumentBlock = Schema.Schema.Type<typeof AnthropicDocumentBlock>

 const AnthropicThinkingBlock = Schema.Struct({
  type: Schema.tag("thinking"),
  thinking: Schema.String,
-  signature: Schema.String,
+  signature: Schema.optional(Schema.String),
  cache_control: Schema.optional(AnthropicCacheControl),
 })

@@ -255,18 +205,14 @@ const AnthropicTool = Schema.Struct({
 type AnthropicTool = Schema.Schema.Type<typeof AnthropicTool>

 const AnthropicToolChoice = Schema.Union([
-  Schema.Struct({
-    type: Schema.Literals(["auto", "any", "none"]),
-    disable_parallel_tool_use: Schema.optional(Schema.Boolean),
-  }),
-  Schema.Struct({ type: Schema.tag("tool"), name: Schema.String, disable_parallel_tool_use: Schema.optional(Schema.Boolean) }),
+  Schema.Struct({ type: Schema.Literals(["auto", "any", "none"]) }),
+  Schema.Struct({ type: Schema.tag("tool"), name: Schema.String }),
 ])

 const AnthropicThinking = Schema.Union([
  Schema.Struct({
    type: Schema.tag("enabled"),
    budget_tokens: Schema.Number,
-    display: Schema.optional(Schema.Literals(["summarized", "omitted"])),
  }),
  Schema.Struct({
    type: Schema.tag("adaptive"),
@@ -277,28 +223,10 @@ const AnthropicThinking = Schema.Union([
  }),
 ])

-// SDK OutputConfig:2684 {effort?: "low"|"medium"|"high"|"xhigh"|"max"|null, format?: JSONOutputFormat:2399}
-const AnthropicJsonOutputFormat = Schema.Struct({
-  type: Schema.Literal("json_schema"),
-  schema: JsonObject,
-})
 const AnthropicOutputConfig = Schema.Struct({
  effort: Schema.optional(Schema.String),
-  format: Schema.optional(Schema.NullOr(AnthropicJsonOutputFormat)),
 })

-// SDK Metadata:2649 {user_id?: string|null}
-const AnthropicMetadata = Schema.Struct({ user_id: optionalNull(Schema.String) })
-
-// SDK MessageCreateParamsContainer:2596 ContainerParams|string; ContainerParams:2172 {id?, skills?}
-const AnthropicContainer = Schema.Union([
-  Schema.String,
-  Schema.Struct({
-    id: optionalNull(Schema.String),
-    skills: optionalNull(Schema.Array(JsonObject)),
-  }),
-])
-
 const AnthropicBodyFields = {
  model: Schema.String,
  system: optionalArray(AnthropicTextBlock),
@@ -313,12 +241,6 @@ const AnthropicBodyFields = {
  stop_sequences: optionalArray(Schema.String),
  thinking: Schema.optional(AnthropicThinking),
  output_config: Schema.optional(AnthropicOutputConfig),
-  // SDK top-level passthrough: cache_control:4638, container:4643, inference_geo:4649, metadata:4654, service_tier:4670
-  cache_control: Schema.optional(AnthropicCacheControl),
-  container: Schema.optional(Schema.NullOr(AnthropicContainer)),
-  inference_geo: Schema.optional(Schema.NullOr(Schema.String)),
-  metadata: Schema.optional(AnthropicMetadata),
-  service_tier: Schema.optional(Schema.Literals(["auto", "standard_only"])),
 }
 export const AnthropicMessagesBody = Schema.Struct(AnthropicBodyFields)
 export type AnthropicMessagesBody = Schema.Schema.Type<typeof AnthropicMessagesBody>
@@ -361,8 +283,6 @@ const AnthropicStreamBlock = Schema.Struct({
  tool_use_id: Schema.optional(Schema.String),
  content: Schema.optional(Schema.Unknown),
 })
-type AnthropicStreamBlock = Schema.Schema.Type<typeof AnthropicStreamBlock>
-const decodeAnthropicStreamBlock = Schema.decodeUnknownOption(AnthropicStreamBlock)

 const AnthropicStreamDelta = Schema.Struct({
  type: Schema.optional(Schema.String),
@@ -373,15 +293,13 @@ const AnthropicStreamDelta = Schema.Struct({
  stop_reason: optionalNull(Schema.String),
  stop_sequence: optionalNull(Schema.String),
 })
-type AnthropicStreamDelta = Schema.Schema.Type<typeof AnthropicStreamDelta>
-const decodeAnthropicStreamDelta = Schema.decodeUnknownOption(AnthropicStreamDelta)

 const AnthropicEvent = Schema.Struct({
  type: Schema.String,
  index: Schema.optional(Schema.Number),
  message: Schema.optional(Schema.Struct({ usage: Schema.optional(AnthropicUsage) })),
-  content_block: Schema.optional(Schema.Unknown),
-  delta: Schema.optional(Schema.Unknown),
+  content_block: Schema.optional(AnthropicStreamBlock),
+  delta: Schema.optional(AnthropicStreamDelta),
  usage: Schema.optional(AnthropicUsage),
  // `type` and `message` are both required per Anthropic's spec, but
  // OpenAI-compatible proxies and gateway translations occasionally drop one
@@ -451,26 +369,10 @@ const lowerTool = (breakpoints: Cache.Breakpoints, tool: ToolDefinition, inputSc

 const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
  ProviderShared.matchToolChoice("Anthropic Messages", toolChoice, {
-    auto: () => ({
-      type: "auto" as const,
-      ...(toolChoice.disableParallelToolUse === undefined
-        ? {}
-        : { disable_parallel_tool_use: toolChoice.disableParallelToolUse }),
-    }),
+    auto: () => ({ type: "auto" as const }),
    none: () => ({ type: "none" as const }),
-    required: () => ({
-      type: "any" as const,
-      ...(toolChoice.disableParallelToolUse === undefined
-        ? {}
-        : { disable_parallel_tool_use: toolChoice.disableParallelToolUse }),
-    }),
-    tool: (name) => ({
-      type: "tool" as const,
-      name,
-      ...(toolChoice.disableParallelToolUse === undefined
-        ? {}
-        : { disable_parallel_tool_use: toolChoice.disableParallelToolUse }),
-    }),
+    required: () => ({ type: "any" as const }),
+    tool: (name) => ({ type: "tool" as const, name }),
  })

 const scrubToolCallID = (id: string) => id.replace(/[^a-zA-Z0-9_-]/g, "_")
@@ -509,152 +411,7 @@ const lowerServerToolResult = Effect.fn("AnthropicMessages.lowerServerToolResult
  return { type: wireType, tool_use_id: scrubToolCallID(part.id), content: payload } satisfies AnthropicServerToolResultBlock
 })

-const fileIdFromMetadata = (metadata: MediaPart["metadata"]): string | undefined => {
-  if (!ProviderShared.isRecord(metadata)) return undefined
-  const anthropic = metadata.anthropic
-  if (ProviderShared.isRecord(anthropic)) {
-    if (typeof anthropic.file_id === "string") return anthropic.file_id
-    if (typeof anthropic.fileId === "string") return anthropic.fileId
-  }
-  if (typeof metadata.file_id === "string") return metadata.file_id
-  if (typeof metadata.fileId === "string") return metadata.fileId
-  return undefined
-}
-
-const transformationsFromMetadata = (
-  metadata: MediaPart["metadata"],
-): AnthropicImageBlock["transformations"] | undefined => {
-  if (!ProviderShared.isRecord(metadata)) return undefined
-  const anthropic = ProviderShared.isRecord(metadata.anthropic) ? metadata.anthropic : undefined
-  const raw = anthropic?.transformations ?? metadata.transformations
-  if (ProviderShared.isRecord(raw)) {
-    const value = raw.oversized_image
-    if (value === "downsize" || value === "error") return { oversized_image: value }
-  }
-  if (anthropic && (anthropic.oversized_image === "downsize" || anthropic.oversized_image === "error"))
-    return { oversized_image: anthropic.oversized_image }
-  return undefined
-}
-
-const documentTitleFromPart = (part: MediaPart): string | undefined => {
-  if (ProviderShared.isRecord(part.metadata)) {
-    const anthropic = part.metadata.anthropic
-    if (ProviderShared.isRecord(anthropic) && typeof anthropic.title === "string") return anthropic.title
-    if (typeof part.metadata.title === "string") return part.metadata.title
-  }
-  if (typeof part.filename === "string" && part.filename.length > 0) return part.filename
-  return undefined
-}
-
-const documentContextFromMetadata = (metadata: MediaPart["metadata"]): string | undefined => {
-  if (!ProviderShared.isRecord(metadata)) return undefined
-  const anthropic = ProviderShared.isRecord(metadata.anthropic) ? metadata.anthropic : undefined
-  if (anthropic && typeof anthropic.context === "string") return anthropic.context
-  if (typeof metadata.context === "string") return metadata.context
-  return undefined
-}
-
-const citationsFromMetadata = (
-  metadata: MediaPart["metadata"],
-): AnthropicDocumentBlock["citations"] | undefined => {
-  if (!ProviderShared.isRecord(metadata)) return undefined
-  const raw = ProviderShared.isRecord(metadata.anthropic)
-    ? (metadata.anthropic.citations ?? metadata.citations)
-    : metadata.citations
-  if (ProviderShared.isRecord(raw) && typeof raw.enabled === "boolean") return { enabled: raw.enabled }
-  return undefined
-}
-
-const isHttpUrl = (value: string) => /^https?:\/\//i.test(value.trim())
-
-const lowerMedia = Effect.fn("AnthropicMessages.lowerMedia")(function* (
-  part: MediaPart,
-  breakpoints?: Cache.Breakpoints,
-) {
-  const mime = part.mediaType.toLowerCase()
-  const cacheControlValue = breakpoints ? cacheControl(breakpoints, part.cache) : undefined
-  const fileId = fileIdFromMetadata(part.metadata)
-
-  // SDK file sources: FileImageSource:2350 / FileDocumentSource:2344 {type:"file", file_id}
-  if (fileId) {
-    if (mime.startsWith("image/"))
-      return {
-        type: "image" as const,
-        source: { type: "file" as const, file_id: fileId },
-        ...(cacheControlValue === undefined ? {} : { cache_control: cacheControlValue }),
-        ...(transformationsFromMetadata(part.metadata) === undefined
-          ? {}
-          : { transformations: transformationsFromMetadata(part.metadata)! }),
-      } satisfies AnthropicImageBlock
-    return {
-      type: "document" as const,
-      source: { type: "file" as const, file_id: fileId },
-      ...(cacheControlValue === undefined ? {} : { cache_control: cacheControlValue }),
-      ...(documentTitleFromPart(part) === undefined ? {} : { title: documentTitleFromPart(part)! }),
-      ...(documentContextFromMetadata(part.metadata) === undefined
-        ? {}
-        : { context: documentContextFromMetadata(part.metadata)! }),
-      ...(citationsFromMetadata(part.metadata) === undefined
-        ? {}
-        : { citations: citationsFromMetadata(part.metadata)! }),
-    } satisfies AnthropicDocumentBlock
-  }
-
-  const rawString = typeof part.data === "string" ? part.data.trim() : undefined
-  // SDK URL sources: URLImageSource:3817 / URLPDFSource:3823 {type:"url", url}
-  if (rawString && isHttpUrl(rawString) && !rawString.startsWith("data:")) {
-    if (mime.startsWith("image/"))
-      return {
-        type: "image" as const,
-        source: { type: "url" as const, url: rawString },
-        ...(cacheControlValue === undefined ? {} : { cache_control: cacheControlValue }),
-        ...(transformationsFromMetadata(part.metadata) === undefined
-          ? {}
-          : { transformations: transformationsFromMetadata(part.metadata)! }),
-      } satisfies AnthropicImageBlock
-    if (mime === "application/pdf")
-      return {
-        type: "document" as const,
-        source: { type: "url" as const, url: rawString },
-        ...(cacheControlValue === undefined ? {} : { cache_control: cacheControlValue }),
-        ...(documentTitleFromPart(part) === undefined ? {} : { title: documentTitleFromPart(part)! }),
-        ...(documentContextFromMetadata(part.metadata) === undefined
-          ? {}
-          : { context: documentContextFromMetadata(part.metadata)! }),
-        ...(citationsFromMetadata(part.metadata) === undefined
-          ? {}
-          : { citations: citationsFromMetadata(part.metadata)! }),
-      } satisfies AnthropicDocumentBlock
-  }
-
-  // SDK PlainTextSource:2716 {type:"text", media_type:"text/plain", data}
-  if (mime === "text/plain") {
-    const textData =
-      typeof part.data !== "string"
-        ? Buffer.from(part.data).toString("utf8")
-        : part.data.startsWith("data:")
-          ? (() => {
-              const comma = part.data.indexOf(",")
-              const payload = comma >= 0 ? part.data.slice(comma + 1) : part.data
-              return part.data.includes(";base64")
-                ? Buffer.from(payload, "base64").toString("utf8")
-                : decodeURIComponent(payload)
-            })()
-          : part.data
-    return {
-      type: "document" as const,
-      source: { type: "text" as const, media_type: "text/plain" as const, data: textData },
-      ...(cacheControlValue === undefined ? {} : { cache_control: cacheControlValue }),
-      ...(documentTitleFromPart(part) === undefined ? {} : { title: documentTitleFromPart(part)! }),
-      ...(documentContextFromMetadata(part.metadata) === undefined
-        ? {}
-        : { context: documentContextFromMetadata(part.metadata)! }),
-      ...(citationsFromMetadata(part.metadata) === undefined
-        ? {}
-        : { citations: citationsFromMetadata(part.metadata)! }),
-    } satisfies AnthropicDocumentBlock
-  }
-
+const lowerMedia = Effect.fn("AnthropicMessages.lowerMedia")(function* (part: MediaPart) {
  const media = ProviderShared.normalizeMedia(part)
  if (media.mime === "application/pdf")
    return {
@@ -664,14 +421,6 @@ const lowerMedia = Effect.fn("AnthropicMessages.lowerMedia")(function* (
        media_type: "application/pdf" as const,
        data: media.base64,
      },
-      ...(cacheControlValue === undefined ? {} : { cache_control: cacheControlValue }),
-      ...(documentTitleFromPart(part) === undefined ? {} : { title: documentTitleFromPart(part)! }),
-      ...(documentContextFromMetadata(part.metadata) === undefined
-        ? {}
-        : { context: documentContextFromMetadata(part.metadata)! }),
-      ...(citationsFromMetadata(part.metadata) === undefined
-        ? {}
-        : { citations: citationsFromMetadata(part.metadata)! }),
    } satisfies AnthropicDocumentBlock
  if (!media.mime.startsWith("image/"))
    return yield* invalid(`Anthropic Messages does not support media type ${part.mediaType}`)
@@ -682,10 +431,6 @@ const lowerMedia = Effect.fn("AnthropicMessages.lowerMedia")(function* (
      media_type: media.mime,
      data: media.base64,
    },
-    ...(cacheControlValue === undefined ? {} : { cache_control: cacheControlValue }),
-    ...(transformationsFromMetadata(part.metadata) === undefined
-      ? {}
-      : { transformations: transformationsFromMetadata(part.metadata)! }),
  } satisfies AnthropicImageBlock
 })

@@ -705,26 +450,6 @@ const lowerToolResultContent = Effect.fnUntraced(function* (part: ToolResultPart
  return yield* Effect.forEach(content, lowerToolResultContentItem)
 })

-const requireThinkingSignature = (request: LLMRequest) => {
-  if (request.model.compatibility?.requireSignature !== undefined)
-    return request.model.compatibility.requireSignature
-  const provider = request.model.provider.toLowerCase()
-  const model = request.model.id.toLowerCase()
-  const baseURL = (request.model.route.endpoint.baseURL ?? "").toLowerCase()
-  if (
-    provider === "kimi-for-coding" ||
-    provider === "moonshotai" ||
-    provider === "moonshotai-cn" ||
-    model.startsWith("kimi-") ||
-    baseURL.includes("api.kimi.com/coding") ||
-    baseURL.includes("api.moonshot.ai/anthropic") ||
-    baseURL.includes("api.moonshot.cn/anthropic")
-  )
-    return false
-  if (provider.includes("xiaomi") || model.includes("mimo") || baseURL.includes("xiaomimimo.com")) return false
-  return true
-}
-
 // Mid-conversation system messages became available with Opus 4.8 and version
 // 5 of the other supported Claude families. Treat later family versions as
 // compatible without assuming that every Anthropic Messages model is Claude.
@@ -814,7 +539,7 @@ const lowerMessages = Effect.fn("AnthropicMessages.lowerMessages")(function* (
          continue
        }
        if (part.type === "media") {
-          content.push(yield* lowerMedia(part, breakpoints))
+          content.push(yield* lowerMedia(part))
          continue
        }
        return yield* ProviderShared.unsupportedContent("Anthropic Messages", "user", ["text", "media"])
@@ -831,30 +556,15 @@ const lowerMessages = Effect.fn("AnthropicMessages.lowerMessages")(function* (
          continue
        }
        if (part.type === "reasoning") {
-          // A signature marks visible thinking; only signature-less parts carrying
-          // redactedData round-trip as opaque redacted_thinking blocks.
+          // Mirrors Vercel's @ai-sdk/anthropic: a signature marks visible
+          // thinking; only signature-less parts carrying redactedData
+          // round-trip as opaque redacted_thinking blocks.
          const signature = part.encrypted ?? signatureFromMetadata(part.providerMetadata)
          const redactedData = redactedDataFromMetadata(part.providerMetadata)
          if (signature === undefined && redactedData !== undefined) {
            content.push({ type: "redacted_thinking", data: redactedData })
            continue
          }
-          if (typeof signature !== "string" || signature.trim().length === 0) {
-            if (part.text.trim().length === 0) continue
-            if (!requireThinkingSignature(request)) {
-              content.push({ type: "thinking", thinking: part.text, signature: "" })
-              continue
-            }
-            // Without a signature this cannot be a valid thinking block per
-            // the SDK ThinkingBlockParam:3217 — demote to text so the
-            // conversation remains sendable.
-            content.push({
-              type: "text",
-              text: part.text,
-              cache_control: cacheControl(breakpoints, part.cache),
-            })
-            continue
-          }
          content.push({ type: "thinking", thinking: part.text, signature })
          continue
        }
@@ -896,74 +606,24 @@ const lowerMessages = Effect.fn("AnthropicMessages.lowerMessages")(function* (
 })

 const resolveOptions = Effect.fn("AnthropicMessages.resolveOptions")(function* (request: LLMRequest) {
-  const input = request.providerOptions as Record<string, unknown> | undefined
-  const rawServiceTier = (input as Record<string, unknown> | undefined)?.service_tier ?? (input as Record<string, unknown> | undefined)?.serviceTier
-  const service_tier =
-    rawServiceTier === "auto" || rawServiceTier === "standard_only"
-      ? (rawServiceTier as "auto" | "standard_only")
-      : undefined
-  const rawMetadata = (input as Record<string, unknown> | undefined)?.metadata
-  const metadata =
-    ProviderShared.isRecord(rawMetadata) &&
-    (typeof rawMetadata.user_id === "string" || rawMetadata.user_id === null)
-      ? { user_id: rawMetadata.user_id as string | null }
-      : undefined
-  const container =
-    typeof (input as Record<string, unknown> | undefined)?.container === "string" ||
-    ProviderShared.isRecord((input as Record<string, unknown> | undefined)?.container)
-      ? ((input as Record<string, unknown>).container as string | { id?: string | null; skills?: ReadonlyArray<Record<string, unknown>> | null })
-      : undefined
-  const rawInferenceGeo =
-    (input as Record<string, unknown> | undefined)?.inference_geo ??
-    (input as Record<string, unknown> | undefined)?.inferenceGeo
-  const inference_geo = typeof rawInferenceGeo === "string" ? rawInferenceGeo : undefined
-  const rawCacheControl =
-    (input as Record<string, unknown> | undefined)?.cache_control ??
-    (input as Record<string, unknown> | undefined)?.cacheControl
-  const cache_control =
-    ProviderShared.isRecord(rawCacheControl) && rawCacheControl.type === "ephemeral"
-      ? (rawCacheControl as { type: "ephemeral"; ttl?: "5m" | "1h" })
-      : undefined
-  const rawOutputConfig =
-    (input as Record<string, unknown> | undefined)?.output_config ??
-    (input as Record<string, unknown> | undefined)?.outputConfig
-  const outputConfigEffort =
-    typeof (input as Record<string, unknown> | undefined)?.effort === "string"
-      ? ((input as Record<string, unknown>).effort as string)
-      : ProviderShared.isRecord(rawOutputConfig) && typeof rawOutputConfig.effort === "string"
-        ? (rawOutputConfig.effort as string)
-        : undefined
-  const outputConfigFormat =
-    ProviderShared.isRecord(rawOutputConfig) && ProviderShared.isRecord(rawOutputConfig.format)
-      ? (rawOutputConfig.format as { type: "json_schema"; schema: Record<string, unknown> })
-      : undefined
-  const output_config =
-    outputConfigEffort === undefined && outputConfigFormat === undefined
-      ? undefined
-      : {
-          ...(outputConfigEffort === undefined ? {} : { effort: outputConfigEffort }),
-          ...(outputConfigFormat === undefined ? {} : { format: outputConfigFormat }),
-        }
+  const input = request.providerOptions
  return {
    thinking: yield* resolveThinking(input?.thinking),
-    effort: outputConfigEffort,
-    output_config,
-    service_tier,
-    metadata,
-    container,
-    inference_geo,
-    cache_control,
+    effort: typeof input?.effort === "string" ? input.effort : undefined,
  }
 })

 const resolveThinking = Effect.fn("AnthropicMessages.resolveThinking")(function* (input: unknown) {
  if (!ProviderShared.isRecord(input)) return undefined
-  const display =
-    input.display === "summarized" || input.display === "omitted"
-      ? (input.display as "summarized" | "omitted")
-      : undefined
-  if (input.type === "adaptive")
+  if (input.type === "adaptive") {
+    const display =
+      input.display === "summarized"
+        ? ("summarized" as const)
+        : input.display === "omitted"
+          ? ("omitted" as const)
+          : undefined
    return { type: "adaptive" as const, ...(display === undefined ? {} : { display }) }
+  }
  if (input.type === "disabled") return { type: "disabled" as const }
  if (input.type !== "enabled") return undefined
  const budget =
@@ -974,7 +634,7 @@ const resolveThinking = Effect.fn("AnthropicMessages.resolveThinking")(function*
        : undefined
  if (budget === undefined)
    return yield* ProviderShared.invalidRequest("Anthropic thinking provider option requires budgetTokens")
-  return { type: "enabled" as const, budget_tokens: budget, ...(display === undefined ? {} : { display }) }
+  return { type: "enabled" as const, budget_tokens: budget }
 })

 const fromRequest = Effect.fn("AnthropicMessages.fromRequest")(function* (request: LLMRequest) {
@@ -1024,13 +684,7 @@ const fromRequest = Effect.fn("AnthropicMessages.fromRequest")(function* (reques
    top_k: generation?.topK,
    stop_sequences: generation?.stop,
    thinking: options.thinking,
-    output_config: options.output_config,
-    // top-level passthrough per SDK MessageCreateParamsBase:4638,4643,4649,4654,4670
-    cache_control: options.cache_control,
-    container: options.container,
-    inference_geo: options.inference_geo,
-    metadata: options.metadata,
-    service_tier: options.service_tier,
+    output_config: options.effort === undefined ? undefined : { effort: options.effort },
  }
 })

@@ -1110,7 +764,7 @@ const SERVER_TOOL_RESULT_NAMES: Record<AnthropicServerToolResultType, string> =

 const isServerToolResultType = (type: string): type is AnthropicServerToolResultType => type in SERVER_TOOL_RESULT_NAMES

-const serverToolResultEvent = (block: AnthropicStreamBlock): LLMEvent | undefined => {
+const serverToolResultEvent = (block: NonNullable<AnthropicEvent["content_block"]>): LLMEvent | undefined => {
  if (!block.type || !isServerToolResultType(block.type)) return undefined
  const errorPayload =
    typeof block.content === "object" && block.content !== null && "type" in block.content
@@ -1137,15 +791,11 @@ const onMessageStart = (state: ParserState, event: AnthropicEvent): StepResult =
  return [usage ? { ...state, usage: mergeUsage(state.usage, usage) } : state, NO_EVENTS]
 }

-const onContentBlockStart = (
-  state: ParserState,
-  event: AnthropicEvent & { readonly content_block: AnthropicStreamBlock },
-): StepResult => {
+const onContentBlockStart = (state: ParserState, event: AnthropicEvent): StepResult => {
  const block = event.content_block
  if (!block) return [state, NO_EVENTS]

-  if (block.type === "tool_use" || block.type === "server_tool_use") {
-    if (event.index === undefined || !block.id) return [state, NO_EVENTS]
+  if ((block.type === "tool_use" || block.type === "server_tool_use") && event.index !== undefined) {
    const events: LLMEvent[] = []
    const lifecycle = Lifecycle.stepStart(state.lifecycle, events)
    return [
@@ -1153,7 +803,7 @@ const onContentBlockStart = (
        ...state,
        lifecycle,
        tools: ToolStream.start(state.tools, event.index, {
-          id: block.id,
+          id: block.id ?? String(event.index),
          name: block.name ?? "",
          input:
            block.input !== undefined && (!ProviderShared.isRecord(block.input) || Object.keys(block.input).length > 0)
@@ -1165,7 +815,7 @@ const onContentBlockStart = (
      [
        ...events,
        LLMEvent.toolInputStart({
-          id: block.id,
+          id: block.id ?? String(event.index),
          name: block.name ?? "",
          providerExecuted: block.type === "server_tool_use" ? true : undefined,
        }),
@@ -1231,12 +881,11 @@ const onContentBlockStart = (

 const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(function* (
  state: ParserState,
-  event: AnthropicEvent & { readonly delta: AnthropicStreamDelta },
+  event: AnthropicEvent,
 ) {
  const delta = event.delta

  if (delta?.type === "text_delta" && delta.text) {
-    if (!state.lifecycle.text.has(`text-${event.index ?? 0}`)) return [state, NO_EVENTS] satisfies StepResult
    const events: LLMEvent[] = []
    return [
      { ...state, lifecycle: Lifecycle.textDelta(state.lifecycle, events, `text-${event.index ?? 0}`, delta.text) },
@@ -1245,7 +894,6 @@ const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(f
  }

  if (delta?.type === "thinking_delta" && delta.thinking) {
-    if (!state.lifecycle.reasoning.has(`reasoning-${event.index ?? 0}`)) return [state, NO_EVENTS] satisfies StepResult
    const events: LLMEvent[] = []
    return [
      {
@@ -1258,7 +906,6 @@ const onContentBlockDelta = Effect.fn("AnthropicMessages.onContentBlockDelta")(f

  if (delta?.type === "signature_delta" && delta.signature) {
    const index = event.index ?? 0
-    if (!state.lifecycle.reasoning.has(`reasoning-${index}`)) return [state, NO_EVENTS] satisfies StepResult
    return [
      {
        ...state,
@@ -1311,10 +958,7 @@ const onContentBlockStop = Effect.fn("AnthropicMessages.onContentBlockStop")(fun
  return [{ ...state, lifecycle, tools: result.tools, reasoningSignatures }, events] satisfies StepResult
 })

-const onMessageDelta = (
-  state: ParserState,
-  event: AnthropicEvent & { readonly delta?: AnthropicStreamDelta },
-): StepResult => {
+const onMessageDelta = (state: ParserState, event: AnthropicEvent): StepResult => {
  const usage = mergeUsage(state.usage, mapUsage(event.usage))
  return [
    {
@@ -1369,72 +1013,12 @@ const onError = (event: AnthropicEvent) =>
    }),
  )

-const isKnownStreamBlockType = (type: string) =>
-  type === "text" ||
-  type === "thinking" ||
-  type === "redacted_thinking" ||
-  type === "tool_use" ||
-  type === "server_tool_use" ||
-  isServerToolResultType(type)
-
-const isKnownStreamDeltaType = (type: string) =>
-  type === "text_delta" || type === "thinking_delta" || type === "signature_delta" || type === "input_json_delta"
-
-const invalidStreamEvent = (event: AnthropicEvent) =>
-  Effect.fail(
-    ProviderShared.eventError(
-      ADAPTER,
-      "Invalid anthropic/anthropic-messages stream event",
-      ProviderShared.encodeJson(event),
-    ),
-  )
-
 const step = (state: ParserState, event: AnthropicEvent) => {
-  if (!SSE_EVENTS.has(event.type)) return Effect.succeed<StepResult>([state, NO_EVENTS])
-  if (
-    event.type !== "content_block_start" &&
-    event.content_block !== undefined &&
-    Option.isNone(decodeAnthropicStreamBlock(event.content_block))
-  )
-    return invalidStreamEvent(event)
-  if (
-    event.type !== "content_block_delta" &&
-    event.delta !== undefined &&
-    Option.isNone(decodeAnthropicStreamDelta(event.delta))
-  )
-    return invalidStreamEvent(event)
  if (event.type === "message_start") return Effect.succeed(onMessageStart(state, event))
-  if (event.type === "content_block_start") {
-    if (!ProviderShared.isRecord(event.content_block) || typeof event.content_block.type !== "string")
-      return invalidStreamEvent(event)
-    if (!isKnownStreamBlockType(event.content_block.type)) return Effect.succeed<StepResult>([state, NO_EVENTS])
-    const decoded = decodeAnthropicStreamBlock(event.content_block)
-    if (Option.isNone(decoded)) return invalidStreamEvent(event)
-    const block = decoded.value
-    if (block.type === "tool_use" || block.type === "server_tool_use") {
-      if (event.index === undefined)
-        return Effect.fail(ProviderShared.eventError(ADAPTER, `Anthropic ${block.type} missing index`))
-      if (!block.id)
-        return Effect.fail(
-          ProviderShared.eventError(ADAPTER, `Anthropic tool_use missing id at index ${event.index}`),
-        )
-    }
-    return Effect.succeed(onContentBlockStart(state, { ...event, content_block: block }))
-  }
-  if (event.type === "content_block_delta") {
-    if (!ProviderShared.isRecord(event.delta)) return invalidStreamEvent(event)
-    if (typeof event.delta.type === "string" && !isKnownStreamDeltaType(event.delta.type))
-      return Effect.succeed<StepResult>([state, NO_EVENTS])
-    const decoded = decodeAnthropicStreamDelta(event.delta)
-    if (Option.isNone(decoded)) return invalidStreamEvent(event)
-    return onContentBlockDelta(state, { ...event, delta: decoded.value })
-  }
+  if (event.type === "content_block_start") return Effect.succeed(onContentBlockStart(state, event))
+  if (event.type === "content_block_delta") return onContentBlockDelta(state, event)
  if (event.type === "content_block_stop") return onContentBlockStop(state, event)
-  if (event.type === "message_delta") {
-    const decoded = decodeAnthropicStreamDelta(event.delta)
-    if (Option.isNone(decoded)) return invalidStreamEvent(event)
-    return Effect.succeed(onMessageDelta(state, { ...event, delta: decoded.value }))
-  }
+  if (event.type === "message_delta") return Effect.succeed(onMessageDelta(state, event))
  if (event.type === "message_stop") return onMessageStop(state)
  if (event.type === "error") return onError(event)
  return Effect.succeed<StepResult>([state, NO_EVENTS])
@@ -1470,10 +1054,7 @@ export const route = Route.make({
  provider: "anthropic",
  providerMetadataKey: "anthropic",
  protocol,
-  endpoint: Endpoint.path(
-    (input) => (input.request.model.provider === "anthropic" ? `${PATH}?beta=true` : PATH),
-    { baseURL: DEFAULT_BASE_URL },
-  ),
+  endpoint: Endpoint.path(PATH, { baseURL: DEFAULT_BASE_URL }),
  auth: Auth.none,
  framing,
  headers: () => ({ "anthropic-version": "2023-06-01" }),
@@ -212,7 +212,11 @@ const BedrockEvent = Schema.Struct({
      metrics: Schema.optional(Schema.Unknown),
    }),
  ),
-  exception: Schema.optional(Schema.Struct({ type: Schema.String, details: BedrockStreamException })),
+  internalServerException: Schema.optional(BedrockStreamException),
+  modelStreamErrorException: Schema.optional(BedrockStreamException),
+  validationException: Schema.optional(BedrockStreamException),
+  throttlingException: Schema.optional(BedrockStreamException),
+  serviceUnavailableException: Schema.optional(BedrockStreamException),
 })
 type BedrockEvent = Schema.Schema.Type<typeof BedrockEvent>

@@ -646,14 +650,22 @@ const step = (state: ParserState, event: BedrockEvent) =>
      ] as const
    }

-    if (event.exception) {
+    const exception = (
+      [
+        ["internalServerException", event.internalServerException],
+        ["modelStreamErrorException", event.modelStreamErrorException],
+        ["serviceUnavailableException", event.serviceUnavailableException],
+        ["throttlingException", event.throttlingException],
+        ["validationException", event.validationException],
+      ] as const
+    ).find((entry) => entry[1] !== undefined)
+    if (exception) {
      return yield* new AIError({
        module: ADAPTER,
        method: "stream",
        reason: classifyProviderFailure({
-          message:
-            event.exception.details.message ?? event.exception.details.originalMessage ?? "Bedrock Converse stream error",
-          code: event.exception.type,
+          message: exception[1]?.message ?? exception[1]?.originalMessage ?? "Bedrock Converse stream error",
+          code: exception[0],
        }),
      })
    }
@@ -704,7 +716,7 @@ export const protocol = Protocol.make({
      reasoningSignatures: {},
    }),
    step,
-    onHalt: (state) => Effect.succeed(onHalt(state)),
+    onHalt,
  },
 })

@@ -82,7 +82,7 @@ const consumeFrames = (route: string) => (state: FrameBufferState, chunk: Uint8A
        "Failed to parse Bedrock Converse event-stream payload",
      )) as Record<string, unknown>
      delete parsed.p
-      out.push(messageType === "exception" ? { exception: { type: eventType, details: parsed } } : { [eventType]: parsed })
+      out.push({ [eventType]: parsed })
    }
    return [cursor, out] as const
  })
@@ -1,4 +1,4 @@
-import { Effect, Option, Schema } from "effect"
+import { Effect, Schema } from "effect"
 import { Tool } from "@opencode-ai/schema/tool"
 import { Route } from "../route/client.js"
 import { Auth } from "../route/auth.js"
@@ -125,7 +125,6 @@ const GeminiContentPart = Schema.Union([
  GeminiFunctionCallPart,
  GeminiFunctionResponsePart,
 ])
-const decodeGeminiContentPart = Schema.decodeUnknownOption(GeminiContentPart)

 const GeminiContent = Schema.Struct({
  role: optionalNull(Schema.Literals(["user", "model"])),
@@ -133,11 +132,6 @@ const GeminiContent = Schema.Struct({
 })
 type GeminiContent = Schema.Schema.Type<typeof GeminiContent>

-const GeminiResponseContent = Schema.Struct({
-  role: optionalNull(Schema.Literals(["user", "model"])),
-  parts: optionalNull(Schema.Array(Schema.Unknown)),
-})
-
 const GeminiSystemInstruction = Schema.Struct({
  parts: Schema.Array(Schema.Struct({ text: Schema.String })),
 })
@@ -206,7 +200,7 @@ const GeminiUsage = Schema.Struct({
 type GeminiUsage = Schema.Schema.Type<typeof GeminiUsage>

 const GeminiCandidate = Schema.Struct({
-  content: optionalNull(GeminiResponseContent),
+  content: optionalNull(GeminiContent),
  finishReason: optionalNull(Schema.String),
 })

@@ -228,7 +222,6 @@ const GeminiEvent = Schema.Struct({
 type GeminiEvent = Schema.Schema.Type<typeof GeminiEvent>

 interface ParserState {
-  readonly route: string
  readonly finishReason?: string
  readonly hasToolCalls: boolean
  readonly promptFeedback?: GeminiPromptFeedback
@@ -605,21 +598,7 @@ const step = (state: ParserState, event: GeminiEvent) => {
  // Supplier ids must be tracked across chunks of the same response, not just within one event's parts.
  const seenCallIds = new Set(nextState.seenCallIds)

-  for (const input of candidate.content.parts ?? []) {
-    if (
-      ProviderShared.isRecord(input) &&
-      !("text" in input) &&
-      !("inlineData" in input) &&
-      !("functionCall" in input) &&
-      !("functionResponse" in input)
-    )
-      continue
-    const decoded = decodeGeminiContentPart(input)
-    if (Option.isNone(decoded))
-      return Effect.fail(
-        ProviderShared.eventError(ADAPTER, `Invalid ${state.route} stream event`, ProviderShared.encodeJson(event)),
-      )
-    const part = decoded.value
+  for (const part of candidate.content.parts ?? []) {
    const signature = "thoughtSignature" in part && part.thoughtSignature ? part.thoughtSignature : undefined
    // Gemini attaches replay signatures to thought parts, visible text, or function calls;
    // each block kind must retain the signature attached to its own parts.
@@ -712,13 +691,9 @@ export const protocol = Protocol.make({
  },
  stream: {
    event: Protocol.jsonEvent(GeminiEvent),
-    initial: (request) => ({
-      route: `${request.model.provider}/${request.model.route.id}`,
-      hasToolCalls: false,
-      lifecycle: Lifecycle.initial(),
-    }),
+    initial: () => ({ hasToolCalls: false, lifecycle: Lifecycle.initial() }),
    step,
-    onHalt: (state) => Effect.succeed(finish(state)),
+    onHalt: finish,
  },
 })

@@ -112,8 +112,6 @@ const driver = (options: Options, body: string): WebSocketChannelDriver => {
          responseID = created
          return { type: "frame", frame }
        }
-        // Keepalives carry no response state and may arrive before response.created.
-        if (event.type === "keepalive") return { type: "frame", frame }
        if (!responseID)
          return yield* ProviderShared.eventError(
            options.id,
@@ -154,12 +154,7 @@ export const driver = (input: DriverInput): WebSocketChannelDriver => {
          ...observation,
          checkpoint: {
            protocol: PROTOCOL,
-            value: {
-              version: VERSION,
-              responseID,
-              request,
-              output: event.response?.output ? [...event.response.output] : output.slice(),
-            } satisfies CheckpointValue,
+            value: { version: VERSION, responseID, request, output: output.slice() } satisfies CheckpointValue,
          },
        }
      }),
@@ -79,60 +79,10 @@ const OpenResponsesReasoningItem = Schema.Struct({
  encrypted_content: optionalNull(Schema.String),
 })

-const OpenResponsesWebSearchCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("web_search_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    action: optionalNull(JsonObject),
-  }),
-  [JsonObject],
-)
-
-const OpenResponsesFileSearchCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("file_search_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    queries: Schema.optional(Schema.Array(Schema.String)),
-    results: optionalNull(Schema.Array(JsonObject)),
-  }),
-  [JsonObject],
-)
-
-const OpenResponsesCodeInterpreterCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("code_interpreter_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    code: optionalNull(Schema.String),
-    container_id: optionalNull(Schema.String),
-    outputs: optionalNull(Schema.Array(JsonObject)),
-  }),
-  [JsonObject],
-)
-
-const OpenResponsesMCPCall = Schema.StructWithRest(
-  Schema.Struct({
-    type: Schema.tag("mcp_call"),
-    id: Schema.String,
-    status: Schema.optional(Schema.String),
-    server_label: Schema.optional(Schema.String),
-    name: Schema.optional(Schema.String),
-    arguments: Schema.optional(Schema.String),
-    output: optionalNull(Schema.String),
-    error: Schema.optional(Schema.Unknown),
-  }),
-  [JsonObject],
-)
-
-export const HostedToolItem = Schema.Union([
-  OpenResponsesWebSearchCall,
-  OpenResponsesFileSearchCall,
-  OpenResponsesCodeInterpreterCall,
-  OpenResponsesMCPCall,
-])
-export type HostedToolItem = Schema.Schema.Type<typeof HostedToolItem>
+const OpenResponsesItemReference = Schema.Struct({
+  type: Schema.tag("item_reference"),
+  id: Schema.String,
+})

 // `function_call_output.output` accepts either a plain string or an ordered
 // array of content items so tools can return images and files in addition to text.
@@ -161,6 +111,7 @@ export const InputItem = Schema.Union([
    phase: Schema.optionalKey(MessagePhase),
  }),
  OpenResponsesReasoningItem,
+  OpenResponsesItemReference,
  Schema.Struct({
    type: Schema.tag("function_call"),
    id: Schema.optionalKey(Schema.String),
@@ -173,17 +124,10 @@ export const InputItem = Schema.Union([
    call_id: Schema.String,
    output: OpenResponsesFunctionCallOutput,
  }),
-  HostedToolItem,
 ])
 type OpenResponsesInputItem = Schema.Schema.Type<typeof InputItem>
-export type ExtendedHostedToolItem = {
-  readonly type: string
-  readonly id: string
-  readonly [key: string]: unknown
-}
 type LoweredInputItem =
  | OpenResponsesInputItem
-  | ExtendedHostedToolItem
  | {
      readonly type: "message"
      readonly id?: string
@@ -341,10 +285,8 @@ export const Event = Schema.StructWithRest(
  Schema.Struct({
    type: Schema.String,
    delta: Schema.optional(Schema.String),
-    arguments: Schema.optional(Schema.String),
    text: Schema.optional(Schema.String),
    item_id: Schema.optional(Schema.String),
-    output_index: Schema.optional(Schema.Number),
    summary_index: Schema.optional(Schema.Number),
    item: Schema.optional(StreamItem),
    response: Schema.optional(
@@ -353,7 +295,6 @@ export const Event = Schema.StructWithRest(
          id: Schema.optional(Schema.String),
          service_tier: optionalNull(Schema.String),
          incomplete_details: optionalNull(Schema.Struct({ reason: Schema.optional(Schema.String) })),
-          output: Schema.optional(Schema.Array(StreamItem)),
          usage: optionalNull(OpenResponsesUsage),
          error: optionalNull(OpenResponsesErrorPayload),
        }),
@@ -372,9 +313,6 @@ export const Event = Schema.StructWithRest(
 )
 export type Event = Schema.Schema.Type<typeof Event>

-// Which lowered input item a persisted item id is about to be attached to.
-export type ItemKind = "message" | "reasoning" | "function-call" | "hosted-tool"
-
 export interface Extension {
  readonly id: string
  readonly name: string
@@ -383,11 +321,6 @@ export interface Extension {
    readonly media: ProviderShared.NormalizedMedia
    readonly request: LLMRequest
  }) => MediaInput | undefined
-  readonly lowerHostedToolItem?: (item: unknown) => ExtendedHostedToolItem | undefined
-  // Optional grammar check applied before a persisted item id is resent as
-  // part of replayed history. Returning false drops the id; every lowered
-  // item treats a dropped id the same as an absent one.
-  readonly acceptsItemID?: (kind: ItemKind, id: string) => boolean
 }

 const BASE: Extension = { id: ADAPTER, name: NAME }
@@ -399,10 +332,10 @@ export interface ParserState {
  readonly tools: ToolStream.State<string>
  readonly hasFunctionCall: boolean
  readonly lifecycle: Lifecycle.State
-  readonly outputItems: Readonly<Record<number, string>>
  readonly messageItems: ReadonlySet<string>
  readonly messagePhases: Readonly<Record<string, MessagePhase | null>>
  readonly reasoningItems: Readonly<Record<string, ReasoningStreamItem>>
+  readonly store: boolean | undefined
 }

 type ReasoningSummaryStatus = "active" | "can-conclude" | "concluded"
@@ -413,10 +346,6 @@ interface ReasoningStreamItem {
  // strings, but typing the map as `Record<number, ...>` documents intent
  // and matches the wire field.
  readonly summaryParts: Readonly<Record<number, ReasoningSummaryStatus>>
-  // Summary indexes that received at least one streamed delta. The `:0` block
-  // is started eagerly when the item opens, so block existence cannot tell
-  // whether a `.done` final would duplicate streamed text.
-  readonly deltaIndexes: ReadonlySet<number>
 }

 // =============================================================================
@@ -433,7 +362,7 @@ export const lowerTool = Effect.fn("OpenResponses.lowerTool")(function* (
    type: "function" as const,
    name: tool.name,
    description: tool.description,
-    parameters: inputSchema,
+    parameters: ToolSchemaProjection.responses(inputSchema),
    // The common tool definition does not currently express Responses strict-schema policy.
    strict: false,
  }
@@ -447,46 +376,28 @@ export const lowerToolChoice = (protocolName: string, toolChoice: NonNullable<LL
    tool: (toolName) => ({ type: "function" as const, name: toolName }),
  })

-// Servers validate item ids on replayed history, and a malformed or oversized
-// id can fail an otherwise valid request. Only server-issued tokens are worth
-// resending; anything else is treated as absent so the item is resent without
-// an id (or skipped, for items that cannot be expressed without one).
-const ITEM_ID_PATTERN = /^[A-Za-z0-9_-]{1,64}$/
 const itemID = (providerMetadata: ProviderMetadata | undefined, providerMetadataKey: string) => {
  const metadata = providerMetadata?.[providerMetadataKey]
-  return ProviderShared.isRecord(metadata) &&
-    typeof metadata.itemId === "string" &&
-    ITEM_ID_PATTERN.test(metadata.itemId)
+  return ProviderShared.isRecord(metadata) && typeof metadata.itemId === "string" && metadata.itemId.length > 0
    ? metadata.itemId
    : undefined
 }

-const acceptsItemID = (extension: Extension, kind: ItemKind, id: string | undefined): id is string =>
-  id !== undefined && (extension.acceptsItemID?.(kind, id) ?? true)
-
-const lowerToolCall = (
-  part: ToolCallPart,
-  providerMetadataKey: string,
-  extension: Extension,
-): OpenResponsesInputItem => {
+const lowerToolCall = (part: ToolCallPart, providerMetadataKey: string): OpenResponsesInputItem => {
  const id = itemID(part.providerMetadata, providerMetadataKey)
  return {
    type: "function_call",
-    ...(acceptsItemID(extension, "function-call", id) ? { id } : {}),
+    ...(id ? { id } : {}),
    call_id: part.id,
    name: part.name,
    arguments: ProviderShared.encodeJson(part.input),
  }
 }

-const lowerReasoning = (
-  part: ReasoningPart,
-  providerMetadataKey: string,
-  extension: Extension,
-): OpenResponsesReasoningInput | undefined => {
+const lowerReasoning = (part: ReasoningPart, providerMetadataKey: string): OpenResponsesReasoningInput | undefined => {
  const metadata = part.providerMetadata?.[providerMetadataKey]
  const id = itemID(part.providerMetadata, providerMetadataKey)
-  if (!ProviderShared.isRecord(metadata) || !acceptsItemID(extension, "reasoning", id)) return undefined
+  if (!ProviderShared.isRecord(metadata) || !id) return undefined
  const encryptedContent =
    typeof metadata.reasoningEncryptedContent === "string" || metadata.reasoningEncryptedContent === null
      ? metadata.reasoningEncryptedContent
@@ -587,6 +498,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
  const system: LoweredInputItem[] =
    request.system.length === 0 ? [] : [{ role: "system", content: ProviderShared.joinText(request.system) }]
  const input: LoweredInputItem[] = [...system]
+  const store = OpenResponsesOptions.resolve(request).store
  const providerMetadataKey = request.model.route.providerMetadataKey ?? "openresponses"

  for (const message of request.messages) {
@@ -609,15 +521,15 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
    if (message.role === "assistant") {
      const content: TextPart[] = []
      const reasoningItems: Record<string, OpenResponsesReasoningInput> = {}
-      const hostedToolItems = new Set<string>()
+      const reasoningReferences = new Set<string>()
+      const hostedToolReferences = new Set<string>()
      const flushText = () => {
        if (content.length === 0) return
        const groups = content.reduce<
          Array<{ id: string | undefined; phase: MessagePhase | null | undefined; parts: TextPart[] }>
        >((groups, part) => {
          const metadata = part.providerMetadata?.[providerMetadataKey]
-          const rawID = itemID(part.providerMetadata, providerMetadataKey)
-          const id = acceptsItemID(extension, "message", rawID) ? rawID : undefined
+          const id = itemID(part.providerMetadata, providerMetadataKey)
          const phase = ProviderShared.isRecord(metadata) ? messagePhase(metadata.phase) : undefined
          const group = groups.at(-1)
          if (group && group.id === id && group.phase === phase) group.parts.push(part)
@@ -642,8 +554,13 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
        }
        if (part.type === "reasoning") {
          flushText()
-          const reasoning = lowerReasoning(part, providerMetadataKey, extension)
+          const reasoning = lowerReasoning(part, providerMetadataKey)
          if (!reasoning) continue
+          if (store !== false) {
+            if (!reasoningReferences.has(reasoning.id)) input.push({ type: "item_reference", id: reasoning.id })
+            reasoningReferences.add(reasoning.id)
+            continue
+          }
          const existing = reasoningItems[reasoning.id]
          if (existing) {
            existing.summary.push(...reasoning.summary)
@@ -658,35 +575,23 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
        if (part.type === "tool-call") {
          flushText()
          if (part.providerExecuted === true) continue
-          input.push(lowerToolCall(part, providerMetadataKey, extension))
+          input.push(lowerToolCall(part, providerMetadataKey))
          continue
        }
        if (part.type === "tool-result" && part.providerExecuted === true) {
          flushText()
          const id = itemID(part.providerMetadata, providerMetadataKey)
-          const hosted =
-            part.result.type !== "json"
-              ? undefined
-              : Schema.is(HostedToolItem)(part.result.value)
-                ? part.result.value
-                : extension.lowerHostedToolItem?.(part.result.value)
-          if (acceptsItemID(extension, "hosted-tool", id) && hosted?.id === id) {
-            if (!hostedToolItems.has(id)) {
-              input.push(hosted)
-              hostedToolItems.add(id)
-            }
-            continue
+          if (store !== false && id && !hostedToolReferences.has(id)) input.push({ type: "item_reference", id })
+          if (store === false && part.result.type === "content") {
+            const content: ReadonlyArray<Content> = part.result.value
+            input.push({
+              role: "user",
+              content: yield* Effect.forEach(content, (item) =>
+                lowerHostedToolResultContentItem(item, request, extension),
+              ),
+            })
          }
-          const content: ReadonlyArray<Content> =
-            part.result.type === "content"
-              ? part.result.value
-              : [{ type: "text", text: ProviderShared.toolResultText(part) }]
-          input.push({
-            role: "user",
-            content: yield* Effect.forEach(content, (item) =>
-              lowerHostedToolResultContentItem(item, request, extension),
-            ),
-          })
+          if (id) hostedToolReferences.add(id)
          continue
        }
        return yield* ProviderShared.unsupportedContent(extension.name, "assistant", [
@@ -711,13 +616,18 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques
    }
  }

-  return input
+  // With store:false, Responses APIs only accept previous reasoning items when the
+  // complete item has encrypted state. Summary blocks for one item may carry
+  // that state only on the last block, so filter after they have been joined.
+  return store === false
+    ? input.filter(
+        (item) => !("type" in item) || item.type !== "reasoning" || typeof item.encrypted_content === "string",
+      )
+    : input
 })

 const lowerOptions = (request: LLMRequest) => {
  const options = OpenResponsesOptions.resolve(request)
-  const cacheKey = ProviderShared.promptCacheKey(request)
-  const parallelToolCalls = resolveParallelToolCalls(request)
  return {
    ...(options.instructions ? { instructions: options.instructions } : {}),
    ...(options.store !== undefined ? { store: options.store } : {}),
@@ -727,7 +637,7 @@ const lowerOptions = (request: LLMRequest) => {
      ? { stream_options: { include_obfuscation: options.streamOptions.includeObfuscation } }
      : {}),
    ...(options.topLogprobs !== undefined ? { top_logprobs: options.topLogprobs } : {}),
-    ...(cacheKey ? { prompt_cache_key: cacheKey } : {}),
+    ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
    ...(options.include ? { include: options.include } : {}),
    ...(options.reasoningEffort || options.reasoningSummary
      ? { reasoning: { effort: options.reasoningEffort, summary: options.reasoningSummary } }
@@ -735,18 +645,11 @@ const lowerOptions = (request: LLMRequest) => {
    ...(options.textVerbosity ? { text: { verbosity: options.textVerbosity } } : {}),
    ...(options.serviceTier ? { service_tier: options.serviceTier } : {}),
    ...(options.maxToolCalls !== undefined ? { max_tool_calls: options.maxToolCalls } : {}),
-    ...(parallelToolCalls !== undefined ? { parallel_tool_calls: parallelToolCalls } : {}),
+    ...(options.parallelToolCalls !== undefined ? { parallel_tool_calls: options.parallelToolCalls } : {}),
    ...(options.truncation ? { truncation: options.truncation } : {}),
  }
 }

-export const resolveParallelToolCalls = (request: LLMRequest) => {
-  const configured = OpenResponsesOptions.resolve(request).parallelToolCalls
-  if (configured !== undefined) return configured
-  const disabled = request.toolChoice?.disableParallelToolUse
-  return disabled === undefined ? undefined : !disabled
-}
-
 const allowedToolChoice = (request: LLMRequest) => {
  const allowed = OpenResponsesOptions.resolve(request).allowedTools
  if (!allowed) return undefined
@@ -850,7 +753,7 @@ const TERMINAL_TYPES = new Set(["error", "response.completed", "response.incompl
 export const terminal = (event: Event) => TERMINAL_TYPES.has(event.type)

 const onOutputTextDelta = (state: ParserState, event: Event, id: string): StepResult => {
-  if (!event.delta || !state.messageItems.has(id)) return [state, NO_EVENTS]
+  if (!event.delta) return [state, NO_EVENTS]
  const events: LLMEvent[] = []
  const phase = state.messagePhases[id]
  const metadata = providerMetadata(state, { itemId: id, ...(phase === undefined ? {} : { phase }) })
@@ -867,37 +770,21 @@ const onOutputTextDone = (state: ParserState, event: Event, id: string): StepRes
  return [{ ...state, lifecycle: Lifecycle.textEnd(state.lifecycle, events, id) }, events]
 }

-export const outputItemID = (state: ParserState, event: Event) =>
-  event.output_index === undefined ? event.item_id : (state.outputItems[event.output_index] ?? event.item_id)
-
 export const onReasoningDelta = (state: ParserState, event: Event, itemID: string): StepResult => {
-  const item = state.reasoningItems[itemID]
-  if (!event.delta || !item) return [state, NO_EVENTS]
-  const index = event.summary_index ?? 0
+  if (!event.delta) return [state, NO_EVENTS]
  const events: LLMEvent[] = []
+  const id =
+    event.summary_index !== undefined || state.reasoningItems[itemID] ? `${itemID}:${event.summary_index ?? 0}` : itemID
  return [
    {
      ...state,
-      lifecycle: Lifecycle.reasoningDelta(state.lifecycle, events, `${itemID}:${index}`, event.delta),
-      reasoningItems: {
-        ...state.reasoningItems,
-        [itemID]: { ...item, deltaIndexes: new Set([...item.deltaIndexes, index]) },
-      },
+      lifecycle: Lifecycle.reasoningDelta(state.lifecycle, events, id, event.delta),
    },
    events,
  ]
 }

-// Some compatible gateways emit a reasoning final without streaming any
-// deltas, mirroring `response.output_text.done`. Reconcile the complete text
-// as a single delta unless that summary index already streamed one.
-export const onReasoningDone = (state: ParserState, event: Event, itemID: string): StepResult => {
-  const item = state.reasoningItems[itemID]
-  if (!item || typeof event.text !== "string") return [state, NO_EVENTS]
-  const index = event.summary_index ?? 0
-  if (item.deltaIndexes.has(index)) return [state, NO_EVENTS]
-  return onReasoningDelta(state, { ...event, delta: event.text }, itemID)
-}
+export const onReasoningDone = (state: ParserState, _event: Event): StepResult => [state, NO_EVENTS]

 const reasoningMetadata = (state: ParserState, item: StreamItem & { id: string }) =>
  providerMetadata(state, { itemId: item.id, reasoningEncryptedContent: item.encrypted_content ?? null })
@@ -935,11 +822,7 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {
        lifecycle: Lifecycle.reasoningStart(state.lifecycle, events, `${item.id}:0`, reasoningMetadata(state, item)),
        reasoningItems: {
          ...state.reasoningItems,
-          [item.id]: {
-            encryptedContent: item.encrypted_content,
-            summaryParts: { 0: "active" },
-            deltaIndexes: new Set(),
-          },
+          [item.id]: { encryptedContent: item.encrypted_content, summaryParts: { 0: "active" } },
        },
      },
      events,
@@ -969,9 +852,27 @@ const onOutputItemAdded = (state: ParserState, event: Event): StepResult => {

 const onReasoningSummaryPartAdded = (state: ParserState, event: Event): StepResult => {
  if (!event.item_id || event.summary_index === undefined) return [state, NO_EVENTS]
-  const item = state.reasoningItems[event.item_id]
-  if (!item) return [state, NO_EVENTS]
-  if (event.summary_index === 0) return [state, NO_EVENTS]
+  const item = state.reasoningItems[event.item_id] ?? { encryptedContent: undefined, summaryParts: {} }
+  if (event.summary_index === 0) {
+    if (state.reasoningItems[event.item_id]) return [state, NO_EVENTS]
+    const events: LLMEvent[] = []
+    return [
+      {
+        ...state,
+        lifecycle: Lifecycle.reasoningStart(
+          state.lifecycle,
+          events,
+          `${event.item_id}:0`,
+          providerMetadata(state, { itemId: event.item_id, reasoningEncryptedContent: null }),
+        ),
+        reasoningItems: {
+          ...state.reasoningItems,
+          [event.item_id]: { ...item, summaryParts: { 0: "active" } },
+        },
+      },
+      events,
+    ]
+  }

  const events: LLMEvent[] = []
  const closed = Object.entries(item.summaryParts)
@@ -1018,21 +919,31 @@ const onReasoningSummaryPartDone = (state: ParserState, event: Event): StepResul
  if (!event.item_id || event.summary_index === undefined) return [state, NO_EVENTS]
  const item = state.reasoningItems[event.item_id]
  if (!item) return [state, NO_EVENTS]
+  const events: LLMEvent[] = []
  return [
    {
      ...state,
+      lifecycle:
+        state.store !== false
+          ? Lifecycle.reasoningEnd(
+              state.lifecycle,
+              events,
+              `${event.item_id}:${event.summary_index}`,
+              providerMetadata(state, { itemId: event.item_id }),
+            )
+          : state.lifecycle,
      reasoningItems: {
        ...state.reasoningItems,
        [event.item_id]: {
          ...item,
          summaryParts: {
            ...item.summaryParts,
-            [event.summary_index]: "can-conclude",
+            [event.summary_index]: state.store !== false ? "concluded" : "can-conclude",
          },
        },
      },
    },
-    NO_EVENTS,
+    events,
  ]
 }

@@ -1040,24 +951,12 @@ const onFunctionCallArgumentsDelta = Effect.fn("OpenResponses.onFunctionCallArgu
  state: ParserState,
  event: Event,
 ) {
-  if (!event.item_id) return [state, NO_EVENTS] satisfies StepResult
-  const tool = state.tools[event.item_id]
-  if (!tool) return [state, NO_EVENTS] satisfies StepResult
-  const final = event.type === "response.function_call_arguments.done" ? event.arguments : undefined
-  if (event.type === "response.function_call_arguments.done" && final === undefined)
-    return [state, NO_EVENTS] satisfies StepResult
-  if (final !== undefined && !final.startsWith(tool.input))
-    return [
-      { ...state, tools: ToolStream.start(state.tools, event.item_id, { ...tool, input: final }) },
-      NO_EVENTS,
-    ] satisfies StepResult
-  const delta = final === undefined ? event.delta : final.slice(tool.input.length)
-  if (!delta) return [state, NO_EVENTS] satisfies StepResult
+  if (!event.item_id || !event.delta) return [state, NO_EVENTS] satisfies StepResult
  const result = ToolStream.appendExisting(
    state.id,
    state.tools,
    event.item_id,
-    delta,
+    event.delta,
    `${state.name} tool argument delta is missing its tool call`,
  )
  if (ToolStream.isError(result)) return yield* result
@@ -1154,49 +1053,30 @@ const onOutputItemDone = Effect.fn("OpenResponses.onOutputItemDone")(function* (
 })

 const onResponseFinish = Effect.fn("OpenResponses.onResponseFinish")(function* (state: ParserState, event: Event) {
-  const reconciled =
-    event.type === "response.completed"
-      ? yield* Effect.reduce(
-          event.response?.output ?? [],
-          () => [state, NO_EVENTS] satisfies StepResult,
-          ([current, events], item) => {
-            if (
-              !item.id ||
-              ((item.type !== "function_call" || !current.tools[item.id]) &&
-                (item.type !== "reasoning" || !current.reasoningItems[item.id]))
-            )
-              return Effect.succeed([current, events] satisfies StepResult)
-            return onOutputItemDone(current, { type: "response.output_item.done", item }).pipe(
-              Effect.map(([next, emitted]) => [next, [...events, ...emitted]] satisfies StepResult),
-            )
-          },
-        )
-      : ([state, NO_EVENTS] satisfies StepResult)
-  const current = reconciled[0]
  // Some compatible providers omit output_item.done even after completing the response.
  const pending =
    event.type === "response.completed"
-      ? yield* ToolStream.finishAll(current.id, current.tools)
-      : { tools: current.tools, events: NO_EVENTS }
-  const events: LLMEvent[] = [...reconciled[1], ...pending.events]
+      ? yield* ToolStream.finishAll(state.id, state.tools)
+      : { tools: state.tools, events: NO_EVENTS }
+  const events: LLMEvent[] = [...pending.events]
  const hasFunctionCall =
    pending.events.some((event) => LLMEvent.is.toolCall(event) || LLMEvent.is.toolInputError(event)) ||
-    current.hasFunctionCall
-  const lifecycle = Lifecycle.finish(current.lifecycle, events, {
+    state.hasFunctionCall
+  const lifecycle = Lifecycle.finish(state.lifecycle, events, {
    reason: {
      normalized: mapFinishReason(event, hasFunctionCall),
      raw: event.response?.incomplete_details?.reason,
    },
-    usage: mapUsage(event.response?.usage, current.providerMetadataKey),
+    usage: mapUsage(event.response?.usage, state.providerMetadataKey),
    providerMetadata:
      event.response?.id || event.response?.service_tier
-        ? providerMetadata(current, {
+        ? providerMetadata(state, {
            responseId: event.response.id,
            serviceTier: event.response.service_tier,
          })
        : undefined,
  })
-  return [{ ...current, lifecycle, hasFunctionCall, tools: pending.tools }, events] satisfies StepResult
+  return [{ ...state, lifecycle, hasFunctionCall, tools: pending.tools }, events] satisfies StepResult
 })

 // Build the prettiest summary available from whatever the provider supplied.
@@ -1243,11 +1123,7 @@ export const providerFailure = (id: string, event: Event, fallback: string) => {

 const providerError = (state: ParserState, event: Event, fallback: string) => providerFailure(state.id, event, fallback)

-export const step = (state: ParserState, input: Event) => {
-  const event =
-    input.item_id && outputItemID(state, input) !== input.item_id
-      ? { ...input, item_id: outputItemID(state, input) }
-      : input
+export const step = (state: ParserState, event: Event) => {
  if (event.type === "response.output_text.delta" || event.type === "response.output_text.done") {
    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
    return Effect.succeed(
@@ -1270,14 +1146,6 @@ export const step = (state: ParserState, input: Event) => {
    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
    return Effect.succeed(onReasoningDelta(state, event, event.item_id))
  }
-  if (
-    event.type === "response.reasoning.done" ||
-    event.type === "response.reasoning_summary_text.done" ||
-    event.type === "response.reasoning_text.done"
-  ) {
-    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
-    return Effect.succeed(onReasoningDone(state, event, event.item_id))
-  }
  if (event.type === "response.reasoning_summary_part.added")
    return event.item_id
      ? Effect.succeed(onReasoningSummaryPartAdded(state, event))
@@ -1289,19 +1157,9 @@ export const step = (state: ParserState, input: Event) => {
  if (event.type === "response.output_item.added") {
    if (event.item?.type === "message" && !event.item.id)
      return ProviderShared.eventError(state.id, `${event.type} message is missing id`)
-    return Effect.succeed(
-      onOutputItemAdded(
-        event.output_index !== undefined && event.item?.id
-          ? { ...state, outputItems: { ...state.outputItems, [event.output_index]: event.item.id } }
-          : state,
-        event,
-      ),
-    )
+    return Effect.succeed(onOutputItemAdded(state, event))
  }
-  if (event.type === "response.function_call_arguments.delta" || event.type === "response.function_call_arguments.done")
-    return event.item_id
-      ? onFunctionCallArgumentsDelta(state, event)
-      : ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
+  if (event.type === "response.function_call_arguments.delta") return onFunctionCallArgumentsDelta(state, event)
  if (event.type === "response.output_item.done") {
    if (event.item?.type === "message" && !event.item.id)
      return ProviderShared.eventError(state.id, `${event.type} message is missing id`)
@@ -1331,10 +1189,10 @@ export const initial = (request: LLMRequest, extension: Extension = BASE): Parse
  hasFunctionCall: false,
  tools: ToolStream.empty<string>(),
  lifecycle: Lifecycle.initial(),
-  outputItems: {},
  messageItems: new Set<string>(),
  messagePhases: {},
  reasoningItems: {},
+  store: OpenResponsesOptions.resolve(request).store,
 })

 export const protocol = Protocol.make({
@@ -7,10 +7,7 @@ import { HttpTransport } from "../route/transport/index.js"
 import { Protocol } from "../route/protocol.js"
 import {
  AIError,
-  InvalidProviderOutputReason,
  LLMEvent,
-  ProviderInternalReason,
-  UnknownProviderReason,
  Usage,
  type FinishReason,
  type FinishReasonDetails,
@@ -54,12 +51,7 @@ const OpenAIChatFunction = Schema.Struct({

 const OpenAIChatTool = Schema.Struct({
  type: Schema.tag("function"),
-  function: Schema.Struct({
-    name: Schema.String,
-    description: Schema.String,
-    parameters: JsonObject,
-    strict: Schema.optional(Schema.Boolean),
-  }),
+  function: OpenAIChatFunction,
  cache_control: Schema.optional(OpenAIChatCacheControl),
 })
 type OpenAIChatTool = Schema.Schema.Type<typeof OpenAIChatTool>
@@ -141,7 +133,6 @@ export const bodyFields = {
  store: Schema.optional(Schema.Boolean),
  prompt_cache_key: Schema.optional(Schema.String),
  reasoning_effort: Schema.optional(OpenAIOptions.OpenAIReasoningEffort),
-  tool_stream: Schema.optional(Schema.Boolean),
  max_completion_tokens: Schema.optional(Schema.Number),
  max_tokens: Schema.optional(Schema.Number),
  temperature: Schema.optional(Schema.Number),
@@ -227,22 +218,16 @@ const OpenAIChatChoice = Schema.StructWithRest(
  [Schema.Record(Schema.String, Schema.Unknown)],
 )

-const OpenAIChatError = Schema.StructWithRest(
-  Schema.Struct({
-    code: optionalNull(Schema.Union([Schema.String, Schema.Number])),
-    message: Schema.String,
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
+const OpenAIChatError = Schema.Struct({
+  code: optionalNull(Schema.Union([Schema.String, Schema.Number])),
+  message: Schema.String,
+})

-export const OpenAIChatEvent = Schema.StructWithRest(
-  Schema.Struct({
-    choices: optionalNull(Schema.Array(OpenAIChatChoice)),
-    usage: optionalNull(OpenAIChatUsage),
-    error: optionalNull(OpenAIChatError),
-  }),
-  [Schema.Record(Schema.String, Schema.Unknown)],
-)
+export const OpenAIChatEvent = Schema.Struct({
+  choices: optionalNull(Schema.Array(OpenAIChatChoice)),
+  usage: optionalNull(OpenAIChatUsage),
+  error: optionalNull(OpenAIChatError),
+})
 export type OpenAIChatEvent = Schema.Schema.Type<typeof OpenAIChatEvent>
 type OpenAIChatRequestMessage = LLMRequest["messages"][number]

@@ -265,7 +250,6 @@ export interface ParserState {
  readonly reasoningEmitted: boolean
  readonly latestToolIndex?: number
  readonly nextToolIndex: number
-  readonly requireFinishReason: boolean
 }

 // =============================================================================
@@ -278,21 +262,14 @@ interface LoweringOptions {
  readonly cacheControl?: (
    cache: CacheHint | undefined,
  ) => Schema.Schema.Type<typeof OpenAIChatCacheControl> | undefined
-  readonly toolCallID?: (id: string) => string
 }

-const lowerTool = (
-  tool: ToolDefinition,
-  inputSchema: JsonSchema,
-  options: LoweringOptions,
-  supportsStrictMode: boolean,
-): OpenAIChatTool => ({
+const lowerTool = (tool: ToolDefinition, inputSchema: JsonSchema, options: LoweringOptions): OpenAIChatTool => ({
  type: "function",
  function: {
    name: tool.name,
    description: tool.description,
-    parameters: inputSchema,
-    ...(supportsStrictMode ? { strict: false } : {}),
+    parameters: ToolSchemaProjection.openAI(inputSchema),
  },
  cache_control: options.cacheControl?.(tool.cache),
 })
@@ -305,8 +282,8 @@ const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>) =>
    tool: (name) => ({ type: "function" as const, function: { name } }),
  })

-const lowerToolCall = (part: ToolCallPart, options: LoweringOptions): OpenAIChatAssistantToolCall => ({
-  id: options.toolCallID?.(part.id) ?? part.id,
+const lowerToolCall = (part: ToolCallPart): OpenAIChatAssistantToolCall => ({
+  id: part.id,
  type: "function",
  function: {
    name: part.name,
@@ -382,7 +359,7 @@ const lowerAssistantMessage = Effect.fn("OpenAIChat.lowerAssistantMessage")(func
      continue
    }
    if (part.type === "tool-call") {
-      toolCalls.push(lowerToolCall(part, options))
+      toolCalls.push(lowerToolCall(part))
      continue
    }
  }
@@ -428,7 +405,7 @@ const lowerToolMessages = Effect.fn("OpenAIChat.lowerToolMessages")(function* (
    if (part.result.type !== "content") {
      messages.push({
        role: "tool",
-        tool_call_id: options.toolCallID?.(part.id) ?? part.id,
+        tool_call_id: part.id,
        content: ProviderShared.toolResultText(part),
        cache_control: options.cacheControl?.(part.cache),
      })
@@ -438,7 +415,7 @@ const lowerToolMessages = Effect.fn("OpenAIChat.lowerToolMessages")(function* (
    const text = content.filter((item) => item.type === "text").map((item) => item.text)
    messages.push({
      role: "tool",
-      tool_call_id: options.toolCallID?.(part.id) ?? part.id,
+      tool_call_id: part.id,
      content: text.join("\n"),
      cache_control: options.cacheControl?.(part.cache),
    })
@@ -479,30 +456,12 @@ const lowerMessages = Effect.fn("OpenAIChat.lowerMessages")(function* (request:
          ]
        : [{ role: "system", content: ProviderShared.joinText(request.system) }]
  const messages = [...system]
-  const modelID = request.model.id.toLowerCase()
-  const mistral = ["mistral", "devstral", "codestral", "pixtral", "mixtral"].some((family) => modelID.includes(family))
-  const lowering = {
-    ...options,
-    toolCallID: (id: string) => {
-      if (mistral) return id.replace(/[^a-zA-Z0-9]/g, "").slice(0, 9).padEnd(9, "0")
-      if (modelID.includes("claude")) return id.replace(/[^a-zA-Z0-9_-]/g, "_")
-      if (request.model.provider === "openai" || request.model.provider === "azure" || modelID.startsWith("openai/"))
-        return id.slice(0, 40)
-      return id
-    },
-  }
-  const requireAssistantAfterTool = request.model.compatibility?.requireAssistantAfterTool ?? mistral
-  const bridgeTools = () => {
-    if (requireAssistantAfterTool && messages.at(-1)?.role === "tool") messages.push({ role: "assistant", content: "Done." })
-  }
  const pendingImages: Array<Schema.Schema.Type<typeof OpenAIChatUserContent>> = []
  const flushImages = () => {
    if (pendingImages.length === 0) return
-    bridgeTools()
    messages.push({ role: "user", content: pendingImages.splice(0) })
  }
  for (const message of request.messages) {
-    if (message.role === "user") bridgeTools()
    if (message.role === "system") {
      const part = yield* ProviderShared.wrappedSystemUpdate("OpenAI Chat", message)
      if (pendingImages.length > 0) {
@@ -545,16 +504,14 @@ const lowerMessages = Effect.fn("OpenAIChat.lowerMessages")(function* (request:
        )
      continue
    }
-    if (message.role === "assistant" && message.content.every((part) => part.type === "text" && part.text.trim() === ""))
-      continue
    if (message.role === "tool") {
-      const lowered = yield* lowerToolMessages(message, lowering)
+      const lowered = yield* lowerToolMessages(message, options)
      messages.push(...lowered.messages)
      pendingImages.push(...lowered.images)
      continue
    }
    flushImages()
-    messages.push(...(yield* lowerMessage(message, request.model.compatibility?.reasoningField, lowering)))
+    messages.push(...(yield* lowerMessage(message, request.model.compatibility?.reasoningField, options)))
  }
  flushImages()
  return messages
@@ -571,123 +528,11 @@ const hasToolHistory = (messages: ReadonlyArray<LLMRequest["messages"][number]>)
  return false
 }

-// Derive `max_tokens` vs `max_completion_tokens` from provider/baseURL when
-// explicit `compatibility.maxTokensField` is not set. Aligned with
-// models.dev provider naming: DeepSeek, Moonshot AI, Together AI, ZAI
-// (Zhipu + Coding Plan variants), Nvidia, Cerebras, Chutes, etc. still
-// require `max_tokens`.
-const detectMaxTokensField = (provider: string, baseURL: string | undefined): "max_tokens" | "max_completion_tokens" => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  if (
-    p === "deepseek" ||
-    url.includes("deepseek.com") ||
-    p === "moonshotai" ||
-    url.includes("api.moonshot.ai") ||
-    p === "togetherai" ||
-    url.includes("api.together.") ||
-    p === "zai" ||
-    p === "zai-coding-plan" ||
-    p === "zhipuai" ||
-    p === "zhipuai-coding-plan" ||
-    url.includes("api.z.ai") ||
-    url.includes("open.bigmodel.cn") ||
-    p === "nvidia" ||
-    url.includes("integrate.api.nvidia.com") ||
-    p === "cerebras" ||
-    url.includes("cerebras.ai") ||
-    url.includes("llm.chutes.ai") ||
-    p === "chutes" ||
-    p === "cloudflare-ai-gateway" ||
-    url.includes("gateway.ai.cloudflare.com") ||
-    p === "cloudflare-workers-ai" ||
-    url.includes("api.cloudflare.com")
-  )
-    return "max_tokens"
-  return "max_completion_tokens"
-}
-
-const detectSupportsStore = (provider: string, baseURL: string | undefined): boolean => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  const isNvidia = p === "nvidia" || url.includes("integrate.api.nvidia.com")
-  const isMoonshot = p === "moonshotai" || p === "moonshotai-cn" || url.includes("api.moonshot.")
-  const isTogether = p === "togetherai" || p === "together" || url.includes("api.together.")
-  const isZai =
-    p === "zai" ||
-    p === "zai-coding-plan" ||
-    p === "zhipuai" ||
-    p === "zhipuai-coding-plan" ||
-    url.includes("api.z.ai") ||
-    url.includes("open.bigmodel.cn")
-  const isDeepSeek = p === "deepseek" || url.includes("deepseek.com")
-  const isCerebras = p === "cerebras" || url.includes("cerebras.ai")
-  const isXai = p === "xai" || url.includes("api.x.ai")
-  const isChutes = p === "chutes" || url.includes("chutes.ai")
-  const isCloudflareWorkersAI = p === "cloudflare-workers-ai" || url.includes("api.cloudflare.com")
-  const isCloudflareAiGateway = p === "cloudflare-ai-gateway" || url.includes("gateway.ai.cloudflare.com")
-  const isVercelAiGateway = p === "vercel-ai-gateway" || url.includes("ai-gateway.vercel.sh") || url.includes("vercel.sh")
-  const isAntLing = p === "ant-ling" || url.includes("api.ant-ling.com")
-  const isOpencode = p === "opencode" || url.includes("opencode.ai")
-  const isNonStandard =
-    isNvidia ||
-    isCerebras ||
-    isXai ||
-    isTogether ||
-    isChutes ||
-    isDeepSeek ||
-    isZai ||
-    isMoonshot ||
-    isOpencode ||
-    isCloudflareWorkersAI ||
-    isCloudflareAiGateway ||
-    isVercelAiGateway ||
-    isAntLing
-  return !isNonStandard
-}
-
-const detectSupportsUsageInStreaming = (): boolean => true
-
-const detectSupportsStrictMode = (provider: string, baseURL: string | undefined): boolean => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  const isMoonshot = p === "moonshotai" || p === "moonshotai-cn" || url.includes("api.moonshot.")
-  const isTogether = p === "togetherai" || p === "together" || url.includes("api.together.")
-  const isCloudflareAiGateway = p === "cloudflare-ai-gateway" || url.includes("gateway.ai.cloudflare.com")
-  const isNvidia = p === "nvidia" || url.includes("integrate.api.nvidia.com")
-  return !isMoonshot && !isTogether && !isCloudflareAiGateway && !isNvidia
-}
-
-const detectZaiToolStream = (
-  provider: string,
-  baseURL: string | undefined,
-  modelID: string,
-): boolean => {
-  const p = provider.toLowerCase()
-  const url = (baseURL ?? "").toLowerCase()
-  const isZai =
-    p === "zai" ||
-    p === "zai-coding-plan" ||
-    p === "zhipuai" ||
-    p === "zhipuai-coding-plan" ||
-    url.includes("api.z.ai") ||
-    url.includes("open.bigmodel.cn")
-  if (!isZai) return false
-  const id = modelID.toLowerCase()
-  if (id === "glm-4.5" || id === "glm-4.5-air" || id === "glm-4.5-flash" || id === "glm-4.5v") return false
-  return true
-}
-
-const lowerOptions = (request: LLMRequest, supportsStore: boolean) => {
+const lowerOptions = (request: LLMRequest) => {
  const options = OpenAIOptions.resolve(request)
-  const cacheKey = ProviderShared.promptCacheKey(request)
  return {
-    ...(supportsStore && options.store !== undefined ? { store: options.store } : {}),
-    // For providers that support `store`, ensure stateless `store:false` is sent
-    // even when no explicit `providerOptions.store` was supplied, mirroring the
-    // native OpenAI Chat default. Non-standard providers omit `store` entirely.
-    ...(supportsStore && options.store === undefined ? { store: false } : {}),
-    ...(cacheKey ? { prompt_cache_key: cacheKey } : {}),
+    ...(options.store !== undefined ? { store: options.store } : {}),
+    ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
    ...(options.reasoningEffort ? { reasoning_effort: options.reasoningEffort } : {}),
  }
 }
@@ -705,19 +550,8 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
    )
  const generation = request.generation
  const toolSchemaCompatibility = request.model.compatibility?.toolSchema
-  const provider = String(request.model.provider)
-  const baseURL = request.model.route.endpoint.baseURL
-  const detectedMaxTokensField = detectMaxTokensField(provider, baseURL)
-  const maxTokensField = request.model.compatibility?.maxTokensField ?? detectedMaxTokensField
-  const supportsStore = request.model.compatibility?.supportsStore ?? detectSupportsStore(provider, baseURL)
-  const supportsUsageInStreaming =
-    request.model.compatibility?.supportsUsageInStreaming ?? detectSupportsUsageInStreaming()
-  const supportsStrictMode = request.model.compatibility?.supportsStrictMode ?? detectSupportsStrictMode(provider, baseURL)
-  const zaiToolStream =
-    request.model.compatibility?.zaiToolStream ??
-    detectZaiToolStream(provider, baseURL, request.model.id)
+  const maxTokensField = request.model.compatibility?.maxTokensField ?? "max_tokens"
  const hasHistory = hasToolHistory(request.messages)
-  const hasActiveTools = request.tools.length > 0
  return {
    model: request.model.id,
    messages: yield* lowerMessages(request, options),
@@ -731,13 +565,11 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
              tool,
              ToolSchemaProjection.modelCompatibility(tool.inputSchema, toolSchemaCompatibility),
              options,
-              supportsStrictMode,
            ),
          ),
    tool_choice: request.toolChoice ? yield* lowerToolChoice(request.toolChoice) : undefined,
    stream: true as const,
-    ...(supportsUsageInStreaming ? { stream_options: { include_usage: true } } : {}),
-    ...(zaiToolStream && hasActiveTools ? { tool_stream: true } : {}),
+    stream_options: { include_usage: true },
    ...(maxTokensField === "max_completion_tokens"
      ? { max_completion_tokens: generation?.maxTokens }
      : { max_tokens: generation?.maxTokens }),
@@ -747,7 +579,7 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
    presence_penalty: generation?.presencePenalty,
    seed: generation?.seed,
    stop: generation?.stop,
-    ...lowerOptions(request, supportsStore),
+    ...lowerOptions(request),
  }
 })

@@ -757,40 +589,14 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
 // Streaming parsers are small state machines: every event returns a new state
 // plus the common `LLMEvent`s produced by that event. Tool calls are accumulated
 // because OpenAI streams JSON arguments across multiple deltas.
-const finishReasonError = (event: OpenAIChatEvent, reason: AIError["reason"]) =>
-  new AIError({
-    module: ADAPTER,
-    method: "stream",
-    body: ProviderShared.encodeJson(event),
-    reason,
-  })
-
-const mapFinishReason = Effect.fn("OpenAIChat.mapFinishReason")(function* (event: OpenAIChatEvent, reason: string) {
-  switch (reason) {
-    case "error":
-      return yield* finishReasonError(
-        event,
-        new UnknownProviderReason({ message: "Provider reported an error (finish_reason: error)" }),
-      )
-    case "network_error":
-      return yield* finishReasonError(
-        event,
-        new ProviderInternalReason({ message: "Provider reported a network error (finish_reason: network_error)" }),
-      )
-    case "stop":
-    case "end":
-      return "stop" as const
-    case "length":
-      return "length" as const
-    case "content_filter":
-      return "content-filter" as const
-    case "function_call":
-    case "tool_calls":
-      return "tool-calls" as const
-    default:
-      return "unknown" as const
-  }
-})
+const mapFinishReason = (reason: string | null | undefined): FinishReason => {
+  if (reason === "stop") return "stop"
+  if (reason === "length") return "length"
+  if (reason === "content_filter") return "content-filter"
+  if (reason === "function_call" || reason === "tool_calls") return "tool-calls"
+  if (reason === "error") return "error"
+  return "unknown"
+}

 // OpenAI Chat reports `prompt_tokens` (inclusive total) with a
 // cached-read and cache-write subsets, and `completion_tokens` (inclusive
@@ -903,20 +709,16 @@ const reasoningMetadata = (field: ParserState["reasoningField"], details?: Reado

 const step = (state: ParserState, event: OpenAIChatEvent) =>
  Effect.gen(function* () {
-    if (event.error) {
-      const body = ProviderShared.encodeJson(event)
+    if (event.error)
      return yield* new AIError({
        module: ADAPTER,
        method: "stream",
-        body,
        reason: classifyProviderFailure({
          message: event.error.message,
          code: event.error.code === undefined || event.error.code === null ? undefined : String(event.error.code),
          status: typeof event.error.code === "number" ? event.error.code : undefined,
-          rawBody: body,
        }),
      })
-    }
    const events: LLMEvent[] = []
    const choice = event.choices?.[0]
    // Moonshot (and a few other OpenAI-compatible providers) attach usage to
@@ -925,11 +727,8 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
    const usage = mapUsage(event.usage) ?? (choiceUsage ? mapUsage(choiceUsage) : undefined) ?? state.usage
    const rawFinishReason = choice?.finish_reason
    const finishReason =
-      rawFinishReason
-        ? {
-            normalized: yield* mapFinishReason(event, rawFinishReason),
-            raw: choice?.native_finish_reason ?? rawFinishReason,
-          }
+      rawFinishReason !== undefined && rawFinishReason !== null
+        ? { normalized: mapFinishReason(rawFinishReason), raw: choice?.native_finish_reason ?? rawFinishReason }
        : state.finishReason
    const delta = choice?.delta
    const toolDeltas = delta?.tool_calls ?? []
@@ -949,11 +748,7 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
      toolDeltas.some((tool) => Boolean(tool.id) || Boolean(tool.function?.name) || Boolean(tool.function?.arguments))
    if (state.finishReason !== undefined) {
      if (hasLateContent)
-        return yield* ProviderShared.eventError(
-          ADAPTER,
-          "OpenAI Chat received content after the finish reason",
-          ProviderShared.encodeJson(event),
-        )
+        return yield* ProviderShared.eventError(ADAPTER, "OpenAI Chat received content after the finish reason")
      return [{ ...state, usage }, events] as const
    }

@@ -1025,19 +820,14 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
        { id: id || undefined, name: name || undefined, text },
        "OpenAI Chat tool call delta is missing id or name",
      )
-      if (ToolStream.isError(result))
-        return yield* ProviderShared.eventError(ADAPTER, result.reason.message, ProviderShared.encodeJson(event))
+      if (ToolStream.isError(result)) return yield* result
      tools = result.tools
      if (result.events.length) lifecycle = Lifecycle.stepStart(lifecycle, events)
      events.push(...result.events)
    }

    if (finishReason !== undefined && state.finishReason === undefined && Object.keys(pendingTools).length > 0)
-      return yield* ProviderShared.eventError(
-        ADAPTER,
-        "OpenAI Chat tool call delta is missing id or name",
-        ProviderShared.encodeJson(event),
-      )
+      return yield* ProviderShared.eventError(ADAPTER, "OpenAI Chat tool call delta is missing id or name")

    // Finalize accumulated tool inputs eagerly when finish_reason arrives so
    // valid calls and malformed local calls settle independently.
@@ -1060,27 +850,16 @@ const step = (state: ParserState, event: OpenAIChatEvent) =>
        reasoningEmitted,
        latestToolIndex,
        nextToolIndex,
-        requireFinishReason: state.requireFinishReason,
      },
      events,
    ] as const
  })

-const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: ParserState) {
-  if (state.finishReason === undefined && state.requireFinishReason)
-    return yield* new AIError({
-      module: ADAPTER,
-      method: "stream",
-      reason: new InvalidProviderOutputReason({
-        classification: "incomplete-stream",
-        message: "OpenAI Chat stream ended without finish_reason",
-        route: ADAPTER,
-      }),
-    })
+const finishEvents = (state: ParserState): ReadonlyArray<LLMEvent> => {
  const events: LLMEvent[] = []
  const toolCallEvents =
    state.finishReason === undefined && Object.keys(state.tools).length > 0
-      ? (yield* ToolStream.finishAll(ADAPTER, state.tools)).events
+      ? Effect.runSync(ToolStream.finishAll(ADAPTER, state.tools)).events
      : state.toolCallEvents
  const hasToolCalls = toolCallEvents.length > 0
  const reason = state.finishReason
@@ -1089,7 +868,7 @@ const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: Pars
        normalized:
          state.finishReason.normalized === "stop" && hasToolCalls ? "tool-calls" : state.finishReason.normalized,
      }
-    : { normalized: hasToolCalls ? ("tool-calls" as const) : ("stop" as const) }
+    : { normalized: hasToolCalls ? ("tool-calls" as const) : ("unknown" as const) }
  const metadata = reasoningMetadata(
    state.reasoningField,
    state.reasoningDetailsObserved ? state.reasoningDetails : undefined,
@@ -1103,7 +882,7 @@ const finishEvents = Effect.fn("OpenAIChat.finishEvents")(function* (state: Pars
  events.push(...toolCallEvents)
  Lifecycle.finish(lifecycle, events, { reason, usage: state.usage })
  return events
-})
+}

 // =============================================================================
 // Protocol And OpenAI Route
@@ -1132,7 +911,6 @@ export const protocol = Protocol.make({
      reasoningDetailsObserved: false,
      reasoningEmitted: false,
      nextToolIndex: 0,
-      requireFinishReason: request.model.compatibility?.requireFinishReason ?? true,
    }),
    step,
    onHalt: finishEvents,
@@ -17,7 +17,6 @@ export const route = Route.make({
  protocol: OpenResponses.protocol,
  endpoint: Endpoint.path(OpenResponses.PATH),
  transport: OpenResponses.httpTransport,
-  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
 })

 export * as OpenAICompatibleResponses from "./openai-compatible-responses.js"
@@ -7,7 +7,7 @@ import { Protocol } from "../route/protocol.js"
 import { HttpTransport } from "../route/transport/index.js"
 import { LLMRequest, type JsonSchema, type ToolDefinition } from "../schema/index.js"
 import { OpenResponses } from "./open-responses.js"
-import { JsonObject, optionalArray, optionalNull, ProviderShared } from "./shared.js"
+import { optionalArray, ProviderShared } from "./shared.js"
 import { OpenAIImage } from "./utils/openai-image.js"
 import { ResponsesHostedTools } from "./utils/responses-hosted-tools.js"
 import { ToolSchemaProjection } from "./utils/tool-schema.js"
@@ -32,40 +32,6 @@ const OpenAIResponsesImageGenerationTool = Schema.Struct({
  size: Schema.optional(OpenAIImage.Size),
 })

-const OpenAIResponsesHostedToolItem = Schema.Union([
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("computer_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      call_id: Schema.optional(Schema.String),
-      action: optionalNull(JsonObject),
-      pending_safety_checks: Schema.optional(Schema.Array(JsonObject)),
-    }),
-    [JsonObject],
-  ),
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("web_search_preview_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      action: optionalNull(JsonObject),
-    }),
-    [JsonObject],
-  ),
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("image_generation_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      result: optionalNull(Schema.String),
-      output_format: Schema.optional(Schema.Literals(["png", "jpeg", "webp"])),
-      revised_prompt: optionalNull(Schema.String),
-    }),
-    [JsonObject],
-  ),
-])
-
 const OpenAIResponsesTools = Schema.Union([OpenResponses.Tool, OpenAIResponsesImageGenerationTool])

 const OpenAIResponsesToolChoice = Schema.Union([
@@ -75,7 +41,6 @@ const OpenAIResponsesToolChoice = Schema.Union([

 const OpenAIResponsesCoreFields = {
  ...OpenResponses.coreFields,
-  input: Schema.Array(Schema.Union([OpenResponses.InputItem, OpenAIResponsesHostedToolItem])),
  tools: optionalArray(OpenAIResponsesTools),
  tool_choice: Schema.optional(OpenAIResponsesToolChoice),
 }
@@ -86,28 +51,9 @@ const OpenAIResponsesBody = Schema.Struct({
 })
 export type OpenAIResponsesBody = Schema.Schema.Type<typeof OpenAIResponsesBody>

-// Replayed items are paired with stored server state by id, so a foreign or
-// synthetic token can fail request validation even when `call_id` pairing is
-// intact. Only resend ids in each item kind's own grammar; hosted tool
-// items keep generic validation because every hosted tool mints its own
-// prefix. The same allowlist approach codex uses before resending history
-// (codex-rs core/src/client.rs, `prepare_response_items_for_request`).
-const ITEM_ID_PREFIXES: Record<OpenResponses.ItemKind, ReadonlyArray<string>> = {
-  message: ["msg_"],
-  reasoning: ["rs_"],
-  "function-call": ["fc_"],
-  // Every hosted tool mints its own id prefix, so items keep generic validation.
-  "hosted-tool": [],
-}
-
 const extension = {
  id: ADAPTER,
  name: NAME,
-  lowerHostedToolItem: (item: unknown) => (Schema.is(OpenAIResponsesHostedToolItem)(item) ? item : undefined),
-  acceptsItemID: (kind: OpenResponses.ItemKind, id: string) => {
-    const prefixes = ITEM_ID_PREFIXES[kind]
-    return prefixes.length === 0 || prefixes.some((prefix) => id.startsWith(prefix))
-  },
 } satisfies OpenResponses.Extension

 const nativeImageToolInput = (tool: ToolDefinition) => {
@@ -140,18 +86,14 @@ const lowerToolChoice = (toolChoice: NonNullable<LLMRequest["toolChoice"]>, tool
        : { type: "function" as const, name },
  })

-const decodeBody = ProviderShared.validateWith(Schema.decodeUnknownEffect(OpenAIResponsesBody))
-
 const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request: LLMRequest) {
  const body = yield* OpenResponses.fromRequestWithExtension(
    LLMRequest.update(request, { tools: [], toolChoice: undefined }),
    extension,
  )
  const toolSchemaCompatibility = request.model.compatibility?.toolSchema
-  const parallelToolCalls = OpenResponses.resolveParallelToolCalls(request)
-  return yield* decodeBody({
+  return {
    ...body,
-    ...(parallelToolCalls === undefined ? {} : { parallel_tool_calls: parallelToolCalls }),
    tools:
      request.tools.length === 0
        ? undefined
@@ -160,7 +102,7 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
          ),
    tool_choice:
      body.tool_choice ?? (request.toolChoice ? yield* lowerToolChoice(request.toolChoice, request.tools) : undefined),
-  })
+  } satisfies OpenAIResponsesBody
 })

 const hostedToolResult = Effect.fn("OpenAIResponses.hostedToolResult")(function* (item: ResponsesHostedTools.Item) {
@@ -201,11 +143,13 @@ const HOSTED_TOOLS = {
 } as const satisfies ResponsesHostedTools.Definitions

 const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
-  if (event.type === "response.reasoning_text.delta")
+  if (event.type === "response.reasoning_text.delta" || event.type === "response.reasoning_summary.delta")
    return event.item_id
-      ? Effect.succeed(
-          OpenResponses.onReasoningDelta(state, event, OpenResponses.outputItemID(state, event) ?? event.item_id),
-        )
+      ? Effect.succeed(OpenResponses.onReasoningDelta(state, event, event.item_id))
+      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
+  if (event.type === "response.reasoning_text.done" || event.type === "response.reasoning_summary.done")
+    return event.item_id
+      ? Effect.succeed(OpenResponses.onReasoningDone(state, event))
      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
  if (event.type === "response.output_item.done" && event.item && ResponsesHostedTools.isItem(event.item, HOSTED_TOOLS))
    return ResponsesHostedTools.onDone(state, event.item, HOSTED_TOOLS)
@@ -246,7 +190,7 @@ export const route = Route.make({
  endpoint,
  auth,
  transport,
-  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
+  defaults: { providerOptions: { store: false } },
 })

 export * as OpenAIResponses from "./openai-responses.js"
@@ -24,17 +24,6 @@ export const JsonObject = Schema.Record(Schema.String, Schema.Unknown)
 export const optionalArray = <const S extends Schema.Top>(schema: S) => Schema.optional(Schema.Array(schema))
 export const optionalNull = <const S extends Schema.Top>(schema: S) => Schema.optional(Schema.NullOr(schema))

-export const OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH = 64
-
-// OpenAI limits `prompt_cache_key` to 64 chars; DeepSeek and Zai inherit the same
-// limit via their OpenAI-compatible APIs. Clamp with unicode-aware slicing.
-export const promptCacheKey = (request: LLMRequest): string | undefined => {
-  if (request.cache === "none" || request.promptCacheKey === undefined) return undefined
-  const chars = Array.from(request.promptCacheKey)
-  if (chars.length <= OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH) return request.promptCacheKey
-  return chars.slice(0, OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH).join("")
-}
-
 /**
 * Streaming tool-call accumulator. Adapters that build a tool call across
 * multiple `tool-input-delta` chunks store the partial JSON input string here
@@ -1,64 +0,0 @@
-/*
- * Adapted from partial-json by the Promplate Dev Team:
- * https://github.com/promplate/partial-json-parser-js/blob/main/src/options.ts
- * Licensed under the MIT License; see partial-json.ts for the complete notice.
- */
-
-/**
- * allow partial strings like `"hello \u12` to be parsed as `"hello `
- */
-export const STR = 0b000000001
-
-/**
- * allow partial numbers like `123.` to be parsed as `123`
- */
-export const NUM = 0b000000010
-
-/**
- * allow partial arrays like `[1, 2,` to be parsed as `[1, 2]`
- */
-export const ARR = 0b000000100
-
-/**
- * allow partial objects like `{"a": 1, "b":` to be parsed as `{"a": 1}`
- */
-export const OBJ = 0b000001000
-
-/**
- * allow `nu` to be parsed as `null`
- */
-export const NULL = 0b000010000
-
-/**
- * allow `tr` to be parsed as `true`, and `fa` to be parsed as `false`
- */
-export const BOOL = 0b000100000
-
-/**
- * allow `Na` to be parsed as `NaN`
- */
-export const NAN = 0b001000000
-
-/**
- * allow `Inf` to be parsed as `Infinity`
- */
-export const INFINITY = 0b010000000
-
-/**
- * allow `-Inf` to be parsed as `-Infinity`
- */
-export const _INFINITY = 0b100000000
-
-export const INF = INFINITY | _INFINITY
-export const SPECIAL = NULL | BOOL | INF | NAN
-export const ATOM = STR | NUM | SPECIAL
-export const COLLECTION = ARR | OBJ
-export const ALL = ATOM | COLLECTION
-
-/**
- * Control what types you allow to be partially parsed.
- * The default is to allow all types to be partially parsed, which in most cases is the best option.
- */
-export const Allow = { STR, NUM, ARR, OBJ, NULL, BOOL, NAN, INFINITY, _INFINITY, INF, SPECIAL, ATOM, COLLECTION, ALL }
-
-export default Allow
@@ -1,282 +0,0 @@
-/*
- * Adapted from partial-json by the Promplate Dev Team:
- * https://github.com/promplate/partial-json-parser-js
- *
- * MIT License
- *
- * Copyright (c) 2023 Promplate Dev Team
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { Schema } from "effect"
-import { Allow } from "./partial-json-options.js"
-export * from "./partial-json-options.js"
-
-export class PartialJSON extends Error {}
-export class MalformedJSON extends Error {}
-
-const decodeJson = Schema.decodeUnknownSync(Schema.fromJsonString(Schema.Unknown))
-
-/** Parse complete or incomplete JSON, restricted by the supplied partial-value flags. */
-export function parseJSON(jsonString: string, allowPartial = Allow.ALL): unknown {
-  if (typeof jsonString !== "string") throw new TypeError(`expecting str, got ${typeof jsonString}`)
-  const input = jsonString.trim()
-  if (!input) throw new Error(`${jsonString} is empty`)
-  try {
-    return decodeJson(input)
-  } catch {}
-
-  const repaired = repairJSON(input)
-  if (repaired !== input) {
-    try {
-      return decodeJson(repaired)
-    } catch {}
-  }
-
-  try {
-    return _parseJSON(input, allowPartial)
-  } catch (error) {
-    if (repaired !== input) return _parseJSON(repaired, allowPartial)
-    throw error
-  }
-}
-
-const repairJSON = (input: string) => {
-  let repaired = ""
-  let quoted = false
-
-  for (let index = 0; index < input.length; index++) {
-    const character = input[index]
-    if (!quoted) {
-      repaired += character
-      if (character === '"') quoted = true
-      continue
-    }
-
-    if (character === '"') {
-      repaired += character
-      quoted = false
-      continue
-    }
-
-    if (character === "\\") {
-      const next = input[index + 1]
-      if (next === "u" && /^[0-9a-fA-F]{4}$/.test(input.slice(index + 2, index + 6))) {
-        repaired += input.slice(index, index + 6)
-        index += 5
-        continue
-      }
-      if (next !== undefined && '"\\/bfnrtu'.includes(next)) {
-        repaired += `\\${next}`
-        index++
-        continue
-      }
-      repaired += "\\\\"
-      continue
-    }
-
-    const code = character.charCodeAt(0)
-    repaired += code <= 0x1f ? `\\u${code.toString(16).padStart(4, "0")}` : character
-  }
-
-  return repaired
-}
-
-const _parseJSON = (jsonString: string, allow: number) => {
-  const length = jsonString.length
-  let index = 0
-
-  const markPartialJSON = (message: string): never => {
-    throw new PartialJSON(`${message} at position ${index}`)
-  }
-
-  const throwMalformedError = (message: string): never => {
-    throw new MalformedJSON(`${message} at position ${index}`)
-  }
-
-  const parseAny = (): unknown => {
-    skipBlank()
-    if (index >= length) markPartialJSON("Unexpected end of input")
-    if (jsonString[index] === '"') return parseStr()
-    if (jsonString[index] === "{") return parseObj()
-    if (jsonString[index] === "[") return parseArr()
-    if (
-      jsonString.substring(index, index + 4) === "null" ||
-      (Allow.NULL & allow && length - index < 4 && "null".startsWith(jsonString.substring(index)))
-    ) {
-      index += 4
-      return null
-    }
-    if (
-      jsonString.substring(index, index + 4) === "true" ||
-      (Allow.BOOL & allow && length - index < 4 && "true".startsWith(jsonString.substring(index)))
-    ) {
-      index += 4
-      return true
-    }
-    if (
-      jsonString.substring(index, index + 5) === "false" ||
-      (Allow.BOOL & allow && length - index < 5 && "false".startsWith(jsonString.substring(index)))
-    ) {
-      index += 5
-      return false
-    }
-    if (
-      jsonString.substring(index, index + 8) === "Infinity" ||
-      (Allow.INFINITY & allow && length - index < 8 && "Infinity".startsWith(jsonString.substring(index)))
-    ) {
-      index += 8
-      return Infinity
-    }
-    if (
-      jsonString.substring(index, index + 9) === "-Infinity" ||
-      (Allow._INFINITY & allow &&
-        1 < length - index &&
-        length - index < 9 &&
-        "-Infinity".startsWith(jsonString.substring(index)))
-    ) {
-      index += 9
-      return -Infinity
-    }
-    if (
-      jsonString.substring(index, index + 3) === "NaN" ||
-      (Allow.NAN & allow && length - index < 3 && "NaN".startsWith(jsonString.substring(index)))
-    ) {
-      index += 3
-      return NaN
-    }
-    return parseNum()
-  }
-
-  const parseStr = (): string => {
-    const start = index
-    let escape = false
-    index++
-    while (index < length && (jsonString[index] !== '"' || (escape && jsonString[index - 1] === "\\"))) {
-      escape = jsonString[index] === "\\" ? !escape : false
-      index++
-    }
-    if (jsonString.charAt(index) === '"') {
-      try {
-        return decodeJson(jsonString.substring(start, ++index - Number(escape))) as string
-      } catch (error) {
-        throwMalformedError(String(error))
-      }
-    }
-    if (Allow.STR & allow) {
-      try {
-        return decodeJson(`${jsonString.substring(start, index - Number(escape))}"`) as string
-      } catch {
-        return decodeJson(`${jsonString.substring(start, jsonString.lastIndexOf("\\"))}"`) as string
-      }
-    }
-    return markPartialJSON("Unterminated string literal")
-  }
-
-  const parseObj = (): Record<string, unknown> => {
-    index++
-    skipBlank()
-    const object: Record<string, unknown> = {}
-    try {
-      while (jsonString[index] !== "}") {
-        skipBlank()
-        if (index >= length && Allow.OBJ & allow) return object
-        const key = parseStr()
-        skipBlank()
-        index++
-        try {
-          Object.defineProperty(object, key, {
-            value: parseAny(),
-            enumerable: true,
-            configurable: true,
-            writable: true,
-          })
-        } catch (error) {
-          if (Allow.OBJ & allow) return object
-          throw error
-        }
-        skipBlank()
-        if (jsonString[index] === ",") index++
-      }
-    } catch {
-      if (Allow.OBJ & allow) return object
-      return markPartialJSON("Expected '}' at end of object")
-    }
-    index++
-    return object
-  }
-
-  const parseArr = (): unknown[] => {
-    index++
-    const array: unknown[] = []
-    try {
-      while (jsonString[index] !== "]") {
-        array.push(parseAny())
-        skipBlank()
-        if (jsonString[index] === ",") index++
-      }
-    } catch {
-      if (Allow.ARR & allow) return array
-      return markPartialJSON("Expected ']' at end of array")
-    }
-    index++
-    return array
-  }
-
-  const parseNum = (): unknown => {
-    if (index === 0) {
-      if (jsonString === "-") throwMalformedError("Not sure what '-' is")
-      try {
-        return decodeJson(jsonString)
-      } catch (error) {
-        if (Allow.NUM & allow) {
-          try {
-            return decodeJson(jsonString.substring(0, jsonString.lastIndexOf("e")))
-          } catch {}
-        }
-        throwMalformedError(String(error))
-      }
-    }
-
-    const start = index
-    if (jsonString[index] === "-") index++
-    while (jsonString[index] && !",]}".includes(jsonString[index])) index++
-    if (index === length && !(Allow.NUM & allow)) markPartialJSON("Unterminated number literal")
-
-    try {
-      return decodeJson(jsonString.substring(start, index))
-    } catch (error) {
-      if (jsonString.substring(start, index) === "-") markPartialJSON("Not sure what '-' is")
-      try {
-        return decodeJson(jsonString.substring(start, jsonString.lastIndexOf("e")))
-      } catch {
-        throwMalformedError(String(error))
-      }
-    }
-  }
-
-  const skipBlank = () => {
-    while (index < length && " \n\r\t".includes(jsonString[index])) index++
-  }
-
-  return parseAny()
-}
-
-export const parse = parseJSON
@@ -2,6 +2,20 @@ import type { JsonSchema, LanguageModelToolSchemaCompatibility } from "../../sch
 import { isRecord } from "../../utils/record.js"
 import { GeminiToolSchema } from "./gemini-tool-schema.js"

+const removeNullSchemas = (value: unknown): unknown => {
+  if (Array.isArray(value)) return value.map(removeNullSchemas)
+  if (!isRecord(value)) return value
+  const fields = Object.fromEntries(
+    Object.entries(value)
+      .filter(([key]) => key !== "anyOf")
+      .map(([key, field]) => [key, removeNullSchemas(field)]),
+  )
+  if (!Array.isArray(value.anyOf)) return fields
+  const variants = value.anyOf.filter((variant) => !isRecord(variant) || variant.type !== "null").map(removeNullSchemas)
+  if (variants.length === 1 && isRecord(variants[0])) return { ...fields, ...variants[0] }
+  return { ...fields, anyOf: variants }
+}
+
 const tupleItemsSchema = (items: ReadonlyArray<unknown>) => {
  const projected = items.map(moonshotNode)
  if (projected.length === 0) return {}
@@ -31,7 +45,24 @@ const moonshot = (schema: JsonSchema): JsonSchema => {
  return isRecord(projected) ? projected : {}
 }

-const openAI = (schema: JsonSchema): JsonSchema => schema
+const openAI = (schema: JsonSchema): JsonSchema => {
+  const variants = Array.isArray(schema.anyOf) ? schema.anyOf.filter(isRecord) : []
+  const flattened =
+    variants.length === 0
+      ? { ...schema, type: "object" }
+      : {
+          ...Object.fromEntries(Object.entries(schema).filter(([key]) => key !== "anyOf")),
+          type: "object",
+          properties: variants.reduce(
+            (properties, variant) => ({ ...(isRecord(variant.properties) ? variant.properties : {}), ...properties }),
+            {},
+          ),
+          additionalProperties: false,
+        }
+  const normalized = removeNullSchemas(flattened)
+  return isRecord(normalized) ? normalized : { type: "object" }
+}
+
 const responses = openAI

 const gemini = (schema: JsonSchema): JsonSchema => GeminiToolSchema.convert(schema) ?? {}
@@ -1,10 +1,8 @@
-import { Effect, Option } from "effect"
-import { AIError, LLMEvent, type ProviderMetadata, type ToolCall } from "../../schema/index.js"
+import { Effect } from "effect"
+import { AIError, LLMEvent, type ProviderMetadata, type ToolCall, type ToolInputError } from "../../schema/index.js"
 import { eventError, parseToolInput, type ToolAccumulator } from "../shared.js"
-import { parse } from "./partial-json.js"

 type StreamKey = string | number
-const parsePartialInput = Option.liftThrowable(parse)

 /**
 * One pending streamed tool call. Providers emit the tool identity and JSON
@@ -64,39 +62,38 @@ const inputDelta = (tool: PendingTool, text: string) =>
    id: tool.id,
    name: tool.name,
    text,
-    input: Option.getOrElse(parsePartialInput(tool.input), () => ({})),
  })

 const toolCall = (route: string, tool: PendingTool, inputOverride?: string) => {
  const raw = inputOverride ?? tool.input
  return parseToolInput(route, tool.name, raw).pipe(
+    Effect.map((input): ToolCall | ToolInputError =>
+      LLMEvent.toolCall({
+        id: tool.id,
+        name: tool.name,
+        input,
+        providerExecuted: tool.providerExecuted ? true : undefined,
+        providerMetadata: tool.providerMetadata,
+      }),
+    ),
    Effect.catch((error) =>
      tool.providerExecuted
        ? Effect.fail(error)
        : Effect.succeed(
-            Option.getOrElse(
-              Option.map(parsePartialInput(raw), (input) => input ?? {}),
-              () => ({}),
-            ),
+            LLMEvent.toolInputError({
+              id: tool.id,
+              name: tool.name,
+              raw,
+            }),
          ),
    ),
-    Effect.map(
-      (input): ToolCall =>
-        LLMEvent.toolCall({
-          id: tool.id,
-          name: tool.name,
-          input,
-          providerExecuted: tool.providerExecuted ? true : undefined,
-          providerMetadata: tool.providerMetadata,
-        }),
-    ),
  )
 }

-const finishEvents = (tool: PendingTool, event: ToolCall): ReadonlyArray<LLMEvent> => [
-  LLMEvent.toolInputEnd({ id: tool.id, name: tool.name, providerMetadata: tool.providerMetadata }),
-  event,
-]
+const finishEvents = (tool: PendingTool, event: ToolCall | ToolInputError): ReadonlyArray<LLMEvent> =>
+  event.type === "tool-input-error"
+    ? [event]
+    : [LLMEvent.toolInputEnd({ id: tool.id, name: tool.name, providerMetadata: tool.providerMetadata }), event]

 /** Store the updated tool and produce the optional public delta event. */
 const appendTool = <K extends StreamKey>(
@@ -179,7 +176,7 @@ export const appendExisting = <K extends StreamKey>(

 /**
 * Finalize one pending tool call: parse the accumulated raw JSON, remove it
- * from state, and recover incomplete local arguments when needed.
+ * from state, and return either a call or a non-executable local input error.
 * Missing keys are a no-op because some providers emit stop events for
 * non-tool content blocks.
 */
@@ -1,52 +1,17 @@
-import { Effect, Schema } from "effect"
+import { Effect } from "effect"
 import { Protocol } from "../route/protocol.js"
-import type { LLMRequest } from "../schema/index.js"
 import { OpenResponses } from "./open-responses.js"
-import { JsonObject, optionalNull, ProviderShared } from "./shared.js"
+import { ProviderShared } from "./shared.js"
 import { ResponsesHostedTools } from "./utils/responses-hosted-tools.js"

 const ADAPTER = "xai-responses"
 const NAME = "xAI Responses"

-const XAIResponsesHostedToolItem = Schema.Union([
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("x_search_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      action: optionalNull(JsonObject),
-    }),
-    [JsonObject],
-  ),
-  Schema.StructWithRest(
-    Schema.Struct({
-      type: Schema.tag("image_generation_call"),
-      id: Schema.String,
-      status: Schema.optional(Schema.String),
-      result: Schema.optional(Schema.Unknown),
-      error: Schema.optional(Schema.Unknown),
-    }),
-    [JsonObject],
-  ),
-])
-
-const XAIResponsesBody = Schema.Struct({
-  ...OpenResponses.coreFields,
-  input: Schema.Array(Schema.Union([OpenResponses.InputItem, XAIResponsesHostedToolItem])),
-  stream: Schema.Literal(true),
-})
-
 const extension = {
  id: ADAPTER,
  name: NAME,
-  lowerHostedToolItem: (item: unknown) => (Schema.is(XAIResponsesHostedToolItem)(item) ? item : undefined),
 } satisfies OpenResponses.Extension

-const decodeBody = ProviderShared.validateWith(Schema.decodeUnknownEffect(XAIResponsesBody))
-const fromRequest = Effect.fn("XAIResponses.fromRequest")(function* (request: LLMRequest) {
-  return yield* decodeBody(yield* OpenResponses.fromRequestWithExtension(request, extension))
-})
-
 const HOSTED_TOOLS = {
  web_search_call: { name: "web_search", input: (item) => item.action ?? {} },
  x_search_call: { name: "x_search", input: (item) => item.action ?? {} },
@@ -62,9 +27,15 @@ const HOSTED_TOOLS = {
  },
 } as const satisfies ResponsesHostedTools.Definitions

-// Grok speaks the standard Responses reasoning dialect (`reasoning_summary_text.*`,
-// handled by the baseline); only its hosted tool vocabulary differs.
 const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {
+  if (event.type === "response.reasoning_text.delta" || event.type === "response.reasoning_summary.delta")
+    return event.item_id
+      ? Effect.succeed(OpenResponses.onReasoningDelta(state, event, event.item_id))
+      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
+  if (event.type === "response.reasoning_text.done" || event.type === "response.reasoning_summary.done")
+    return event.item_id
+      ? Effect.succeed(OpenResponses.onReasoningDone(state, event))
+      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
  if (event.type === "response.output_item.done" && event.item && ResponsesHostedTools.isItem(event.item, HOSTED_TOOLS))
    return ResponsesHostedTools.onDone(state, event.item, HOSTED_TOOLS)
  return OpenResponses.step(state, event)
@@ -72,10 +43,7 @@ const step = (state: OpenResponses.ParserState, event: OpenResponses.Event) => {

 export const protocol = Protocol.make({
  id: ADAPTER,
-  body: {
-    schema: XAIResponsesBody,
-    from: fromRequest,
-  },
+  body: OpenResponses.protocol.body,
  stream: {
    event: OpenResponses.protocol.stream.event,
    initial: (request) => OpenResponses.initial(request, extension),
@@ -119,6 +119,7 @@ export const protocol = Protocol.make({
            ...body,
            messages,
            ...bodyOptions(request.providerOptions),
+            ...(request.promptCacheKey ? { prompt_cache_key: request.promptCacheKey } : {}),
          } as OpenRouterBody
        }),
      ),
@@ -42,7 +42,7 @@ const responsesRoute = Route.make({
    name: "xAI Responses",
    rotateAfterMs: RESPONSES_WEBSOCKET_ROTATE_AFTER_MS,
  }),
-  defaults: { providerOptions: { store: false, include: ["reasoning.encrypted_content"] } },
+  defaults: { providerOptions: { store: false } },
 })

 const chatRoute = Route.make({
@@ -7,7 +7,6 @@ import { HttpTransport } from "./transport/index.js"
 import type { HttpMiddleware, Transport, TransportRuntime, WebSocketChannelExecutor } from "./transport/index.js"
 import type { Protocol } from "./protocol.js"
 import { applyCachePolicy } from "../cache-policy.js"
-import { sanitizeSurrogates } from "../utils/sanitize.js"
 import * as ProviderShared from "../protocols/shared.js"
 import type { ProtocolID, ProviderOptions } from "../schema/index.js"
 import {
@@ -322,30 +321,12 @@ function makeFromTransport<Body, Prepared, Frame, Event, State>(
                Stream.mapEffect(decodeEvent(route)),
                protocol.stream.terminal ? Stream.takeUntil(protocol.stream.terminal) : (stream) => stream,
              )
-              const stream = Stream.suspend(() => {
-                let state = protocol.stream.initial(request)
-                const parsed = events.pipe(
-                  Stream.mapEffect((event) =>
-                    protocol.stream.step(state, event).pipe(
-                      Effect.map(([next, output]) => {
-                        state = next
-                        return output
-                      }),
-                    ),
-                  ),
-                  Stream.flatMap(Stream.fromIterable),
-                )
-                const onHalt = protocol.stream.onHalt
-                return onHalt
-                  ? parsed.pipe(
-                      Stream.concat(
-                        Stream.suspend(() =>
-                          Stream.unwrap(onHalt(state).pipe(Effect.map(Stream.fromIterable))),
-                        ),
-                      ),
-                    )
-                  : parsed
-              }).pipe(
+              const stream = events.pipe(
+                Stream.mapAccumEffect(
+                  () => protocol.stream.initial(request),
+                  protocol.stream.step,
+                  protocol.stream.onHalt ? { onHalt: protocol.stream.onHalt } : undefined,
+                ),
                Stream.catchCause((cause) => Stream.fail(streamError(route, `Failed to read ${route} stream`, cause))),
                requireTerminalEvent(route),
              )
@@ -401,8 +382,7 @@ export function make<Body, Prepared, Frame, Event, State>(
 }

 const compile = Effect.fn("LLM.compile")(function* (request: LLMRequest, options?: StreamOptions) {
-  const original = applyCachePolicy(resolveRequestOptions(request))
-  const resolved = LLMRequest.update(original, sanitizeSurrogates({ ...LLMRequest.input(original), model: undefined }))
+  const resolved = applyCachePolicy(resolveRequestOptions(request))
  const route = resolved.model.route

  const body = yield* route.body
@@ -59,8 +59,8 @@ export interface ProtocolStream<Frame, Event, State> {
  readonly step: (state: State, event: Event) => Effect.Effect<readonly [State, ReadonlyArray<LLMEvent>], AIError>
  /** Optional request-completion signal for transports that do not end naturally. */
  readonly terminal?: (event: Event) => boolean
-  /** Optional effectful flush emitted when the framed stream ends. */
-  readonly onHalt?: (state: State) => Effect.Effect<ReadonlyArray<LLMEvent>, AIError>
+  /** Optional flush emitted when the framed stream ends. */
+  readonly onHalt?: (state: State) => ReadonlyArray<LLMEvent>
 }

 /**
@@ -152,8 +152,6 @@ export const ToolInputDelta = Schema.Struct({
  id: ToolCallID,
  name: Schema.String,
  text: Schema.String,
-  /** Best-effort parse of all input fragments received through this delta. */
-  input: Schema.optional(Schema.Unknown),
 }).annotate({ identifier: "LLM.Event.ToolInputDelta" })
 export type ToolInputDelta = Schema.Schema.Type<typeof ToolInputDelta>

@@ -51,7 +51,6 @@ export const MediaPart = Schema.Struct({
  mediaType: Schema.String,
  data: Schema.Union([Schema.String, Schema.Uint8Array]),
  filename: Schema.optional(Schema.String),
-  cache: Schema.optional(CacheHint),
  metadata: Schema.optional(Schema.Record(Schema.String, Schema.Unknown)),
 }).annotate({ identifier: "LLM.Content.Media" })
 export type MediaPart = Schema.Schema.Type<typeof MediaPart>
@@ -256,7 +255,6 @@ export namespace ToolDefinition {
 export class ToolChoice extends Schema.Class<ToolChoice>("LLM.ToolChoice")({
  type: Schema.Literals(["auto", "none", "required", "tool"]),
  name: Schema.optional(Schema.String),
-  disableParallelToolUse: Schema.optional(Schema.Boolean),
 }) {}

 export namespace ToolChoice {
@@ -155,12 +155,6 @@ export class LanguageModelCompatibility extends Schema.Class<LanguageModelCompat
  reasoningField: Schema.optional(Schema.String),
  maxTokensField: Schema.optional(LanguageModelMaxTokensFieldCompatibility),
  requireFinishReason: Schema.optional(Schema.Boolean),
-  requireAssistantAfterTool: Schema.optional(Schema.Boolean),
-  supportsStore: Schema.optional(Schema.Boolean),
-  supportsUsageInStreaming: Schema.optional(Schema.Boolean),
-  supportsStrictMode: Schema.optional(Schema.Boolean),
-  zaiToolStream: Schema.optional(Schema.Boolean),
-  requireSignature: Schema.optional(Schema.Boolean),
 }) {}

 export namespace LanguageModelCompatibility {
@@ -1,12 +0,0 @@
-import { isRecord } from "./record.js"
-
-export const sanitizeSurrogates = <T>(value: T): T => {
-  if (typeof value === "string") return value.toWellFormed() as T
-  if (Array.isArray(value)) return value.map(sanitizeSurrogates) as T
-  if (value instanceof Uint8Array || value instanceof Error) return value
-  if (isRecord(value))
-    return Object.fromEntries(
-      Object.entries(value).map(([key, entry]) => [key.toWellFormed(), sanitizeSurrogates(entry)]),
-    ) as T
-  return value
-}
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test"
 import { Effect, Ref, Schema } from "effect"
 import { HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
-import { LLM, Message, ToolCallPart, mergeProviderOptions } from "../src/index.js"
+import { LLM, mergeProviderOptions } from "../src/index.js"
 import { AnthropicMessages, OpenAIChat } from "../src/protocols.js"
 import { Auth, LLMClient } from "../src/route.js"
 import { compileRequest } from "../src/route/client.js"
@@ -66,7 +66,7 @@ describe("request option precedence", () => {
      expect(prepared.body).toMatchObject({
        model: "gpt-4o-mini",
        stream: true,
-        max_completion_tokens: 30,
+        max_tokens: 30,
        temperature: 0.5,
        top_p: 0.9,
        frequency_penalty: 0.25,
@@ -247,73 +247,6 @@ describe("request option precedence", () => {
    }),
  )

-  it.effect("sanitizes outbound JSON without an HTTP overlay", () =>
-    LLMClient.generate(
-      LLM.request({
-        model: OpenAIChat.route
-          .with({ endpoint: { baseURL: "https://api.openai.test/v1/" }, auth: Auth.bearer("test") })
-          .model({ id: "gpt-4o-mini" }),
-        prompt: "hello \uD800 \u{1F600}",
-      }),
-    ).pipe(
-      Effect.provide(
-        dynamicResponse((input) =>
-          Effect.gen(function* () {
-            expect(decodeJson(input.text)).toMatchObject({
-              messages: [{ role: "user", content: "hello \uFFFD \u{1F600}" }],
-            })
-            return input.respond(sseEvents(deltaChunk({}, "stop")), {
-              headers: { "content-type": "text/event-stream" },
-            })
-          }),
-        ),
-      ),
-    ),
-  )
-
-  it.effect("sanitizes unpaired surrogates throughout outbound JSON", () =>
-    LLMClient.generate(
-      LLM.request({
-        model: OpenAIChat.route
-          .with({ endpoint: { baseURL: "https://api.openai.test/v1/" }, auth: Auth.bearer("test") })
-          .model({ id: "gpt-4o-mini" }),
-        system: "system \uD800 \u{1F600}",
-        messages: [
-          Message.user("user \uDC00"),
-          Message.assistant([
-            Message.text("assistant \uD800"),
-            ToolCallPart.make({ id: "call_1", name: "lookup", input: { query: "input \uDC00" } }),
-          ]),
-          Message.tool({ id: "call_1", name: "lookup", result: { output: "result \uD800" } }),
-        ],
-        http: { body: { metadata: { "key\uD800": ["overlay \uDC00", "valid \u{1F600}"] } } },
-      }),
-    ).pipe(
-      Effect.provide(
-        dynamicResponse((input) =>
-          Effect.gen(function* () {
-            expect(decodeJson(input.text)).toMatchObject({
-              messages: [
-                { role: "system", content: "system \uFFFD \u{1F600}" },
-                { role: "user", content: "user \uFFFD" },
-                {
-                  role: "assistant",
-                  content: "assistant \uFFFD",
-                  tool_calls: [{ function: { arguments: '{"query":"input \uFFFD"}' } }],
-                },
-                { role: "tool", content: '{"output":"result \uFFFD"}' },
-              ],
-              metadata: { "key\uFFFD": ["overlay \uFFFD", "valid \u{1F600}"] },
-            })
-            return input.respond(sseEvents(deltaChunk({}, "stop")), {
-              headers: { "content-type": "text/event-stream" },
-            })
-          }),
-        ),
-      ),
-    ),
-  )
-
  it.effect("applies raw body overlays after protocol lowering", () =>
    LLMClient.generate(
      LLM.request({
@@ -7,13 +7,7 @@
    "route": "cloudflare-workers-ai",
    "transport": "http",
    "model": "@cf/openai/gpt-oss-20b",
-    "tags": [
-      "prefix:cloudflare-workers-ai",
-      "provider:cloudflare-workers-ai",
-      "tool",
-      "tool-call",
-      "golden"
-    ]
+    "tags": ["prefix:cloudflare-workers-ai", "provider:cloudflare-workers-ai", "tool", "tool-call", "golden"]
  },
  "interactions": [
    {
@@ -24,7 +18,7 @@
        "headers": {
          "content-type": "application/json"
        },
-        "body": "{\"model\": \"@cf/openai/gpt-oss-20b\", \"messages\": [{\"role\": \"system\", \"content\": \"Call tools exactly as requested.\"}, {\"role\": \"user\", \"content\": \"Call get_weather with city exactly Paris.\"}], \"tools\": [{\"type\": \"function\", \"function\": {\"name\": \"get_weather\", \"description\": \"Get current weather for a city.\", \"parameters\": {\"type\": \"object\", \"properties\": {\"city\": {\"type\": \"string\"}}, \"required\": [\"city\"], \"additionalProperties\": false}, \"strict\": false}}], \"tool_choice\": {\"type\": \"function\", \"function\": {\"name\": \"get_weather\"}}, \"stream\": true, \"stream_options\": {\"include_usage\": true}, \"max_tokens\": 120, \"temperature\": 0}"
+        "body": "{\"model\":\"@cf/openai/gpt-oss-20b\",\"messages\":[{\"role\":\"system\",\"content\":\"Call tools exactly as requested.\"},{\"role\":\"user\",\"content\":\"Call get_weather with city exactly Paris.\"}],\"tools\":[{\"type\":\"function\",\"function\":{\"name\":\"get_weather\",\"description\":\"Get current weather for a city.\",\"parameters\":{\"type\":\"object\",\"properties\":{\"city\":{\"type\":\"string\"}},\"required\":[\"city\"],\"additionalProperties\":false}}}],\"tool_choice\":{\"type\":\"function\",\"function\":{\"name\":\"get_weather\"}},\"stream\":true,\"stream_options\":{\"include_usage\":true},\"max_tokens\":120,\"temperature\":0}"
      },
      "response": {
        "status": 200,
@@ -35,4 +29,4 @@
      }
    }
  ]
-}
+}
@@ -1,58 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { Allow, MalformedJSON, PartialJSON, parse } from "../src/protocols/utils/partial-json.js"
-
-describe("partial JSON", () => {
-  test("parses complete JSON", () => {
-    expect(parse('{"key":"value","items":[1,true,null]}')).toEqual({
-      key: "value",
-      items: [1, true, null],
-    })
-
-    const object = parse('{"__proto__":{"safe":true}}') as Record<string, unknown>
-    expect(Object.hasOwn(object, "__proto__")).toBe(true)
-  })
-
-  test("parses partial strings", () => {
-    expect(parse('"hello')).toBe("hello")
-    expect(parse('"hello \\u12')).toBe("hello ")
-    expect(() => parse('"hello', ~Allow.STR)).toThrow(PartialJSON)
-  })
-
-  test("repairs invalid escapes and raw control characters", () => {
-    expect(parse('{"path":"A\\H","text":"first\tsecond"}')).toEqual({
-      path: "A\\H",
-      text: "first\tsecond",
-    })
-  })
-
-  test("preserves prototype keys in partial objects", () => {
-    const object = parse('{"__proto__":{"safe":true}') as Record<string, unknown>
-
-    expect(Object.hasOwn(object, "__proto__")).toBe(true)
-    expect(Object.getPrototypeOf(object)).toBe(Object.prototype)
-    expect(object.__proto__).toEqual({ safe: true })
-  })
-
-  test("controls partial collection values independently", () => {
-    expect(parse('["', Allow.ARR)).toEqual([])
-    expect(parse('["', Allow.ARR | Allow.STR)).toEqual([""])
-    expect(parse('{"key":"', Allow.OBJ)).toEqual({})
-    expect(parse('{"key":"', Allow.OBJ | Allow.STR)).toEqual({ key: "" })
-  })
-
-  test("parses partial literals and numbers", () => {
-    expect(parse("nu", Allow.NULL)).toBeNull()
-    expect(parse("tr", Allow.BOOL)).toBe(true)
-    expect(parse("fa", Allow.BOOL)).toBe(false)
-    expect(parse("1e", Allow.NUM)).toBe(1)
-  })
-
-  test("distinguishes disallowed partial values from malformed values", () => {
-    expect(() => parse("[", Allow.STR)).toThrow(PartialJSON)
-    expect(() => parse("n", ~Allow.NULL)).toThrow(MalformedJSON)
-  })
-
-  test("rejects empty input", () => {
-    expect(() => parse("  ")).toThrow("is empty")
-  })
-})
@@ -95,11 +95,7 @@ describe("provider package entrypoints", () => {
    })
    expect(selected.route.defaults.headers).toEqual({ "x-application": "opencode" })
    expect(selected.route.defaults.http?.body).toEqual({ service_tier: "priority" })
-    expect(selected.route.defaults.providerOptions).toEqual({
-      reasoningEffort: "low",
-      store: true,
-      include: ["reasoning.encrypted_content"],
-    })
+    expect(selected.route.defaults.providerOptions).toEqual({ reasoningEffort: "low", store: true })
  })

  test("maps Anthropic-compatible settings onto the executable model", async () => {
@@ -289,10 +285,7 @@ describe("provider package entrypoints", () => {
      baseURL: "https://aiplatform.googleapis.com/v1/projects/vertex-project/locations/global/endpoints/openapi",
      path: "/responses",
    })
-    expect(responses.route.defaults.providerOptions).toEqual({
-      store: false,
-      include: ["reasoning.encrypted_content"],
-    })
+    expect(responses.route.defaults.providerOptions).toEqual({ store: false })
  })

  test("rejects conflicting Vertex auth settings at runtime", async () => {
@@ -18,15 +18,6 @@ const opus48 = AnthropicMessages.route
  .with({ endpoint: { baseURL: "https://api.anthropic.test/v1/" }, auth: Auth.header("x-api-key", "test") })
  .model({ id: "claude-opus-4-8" })

-const compileUnsignedReasoning = (model: LLMRequest["model"]) =>
-  compileRequest(
-    LLM.request({
-      model,
-      messages: [Message.assistant([{ type: "reasoning", text: "unsigned reasoning" }])],
-      cache: "none",
-    }),
-  )
-
 const request = LLM.request({
  id: "req_1",
  model,
@@ -573,65 +564,6 @@ describe("Anthropic Messages route", () => {
    }),
  )

-  it.effect("demotes unsigned reasoning when signatures are required", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileUnsignedReasoning(model)
-
-      expect(prepared.body.messages).toEqual([
-        { role: "assistant", content: [{ type: "text", text: "unsigned reasoning" }] },
-      ])
-    }),
-  )
-
-  it.effect("infers empty-signature compatibility across Kimi providers", () =>
-    Effect.gen(function* () {
-      const coding = AnthropicMessages.route.with({
-        provider: "kimi-for-coding",
-        endpoint: { baseURL: "https://compatible.test/v1/" },
-        auth: Auth.header("x-api-key", "test"),
-      })
-      const moonshot = AnthropicMessages.route
-        .with({
-          provider: "moonshotai",
-          endpoint: { baseURL: "https://api.moonshot.ai/anthropic" },
-          auth: Auth.bearer("test"),
-        })
-        .model({ id: "kimi-k2.6" })
-      const codingPrepared = yield* compileUnsignedReasoning(coding.model({ id: "k3" }))
-      const moonshotPrepared = yield* compileUnsignedReasoning(moonshot)
-
-      expect(codingPrepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [{ type: "thinking", thinking: "unsigned reasoning", signature: "" }],
-        },
-      ])
-      expect(moonshotPrepared.body.messages).toEqual([
-        {
-          role: "assistant",
-          content: [{ type: "thinking", thinking: "unsigned reasoning", signature: "" }],
-        },
-      ])
-    }),
-  )
-
-  it.effect("lets an explicit signature requirement override inference", () =>
-    Effect.gen(function* () {
-      const compatible = AnthropicMessages.route
-        .with({
-          provider: "kimi-for-coding",
-          endpoint: { baseURL: "https://api.kimi.com/coding/v1/" },
-          auth: Auth.header("x-api-key", "test"),
-        })
-        .model({ id: "k3", compatibility: { requireSignature: true } })
-      const prepared = yield* compileUnsignedReasoning(compatible)
-
-      expect(prepared.body.messages).toEqual([
-        { role: "assistant", content: [{ type: "text", text: "unsigned reasoning" }] },
-      ])
-    }),
-  )
-
  it.effect("round-trips redacted thinking as redacted_thinking blocks", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -770,108 +702,6 @@ describe("Anthropic Messages route", () => {
    }),
  )

-  it.effect("ignores unknown content block and delta variants", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "message_start", message: { usage: { input_tokens: 5 } } },
-              { type: "future_event", content_block: 42, delta: 42 },
-              { type: "content_block_start", index: 0, content_block: { type: "future_block", text: 42 } },
-              { type: "content_block_delta", index: 0, delta: { text: "ignored" } },
-              { type: "content_block_delta", index: 0, delta: { type: "future_delta", text: 42 } },
-              { type: "content_block_delta", index: 0, delta: { type: "text_delta", text: "hidden" } },
-              { type: "content_block_delta", index: 0, delta: { type: "thinking_delta", thinking: "hidden" } },
-              { type: "content_block_delta", index: 0, delta: { type: "signature_delta", signature: "hidden" } },
-              { type: "content_block_stop", index: 0 },
-              { type: "content_block_start", index: 1, content_block: { type: "text", text: "" } },
-              { type: "content_block_delta", index: 1, delta: { type: "text_delta", text: "Hello" } },
-              { type: "content_block_stop", index: 1 },
-              { type: "message_delta", delta: { stop_reason: "end_turn" }, usage: { output_tokens: 1 } },
-              { type: "message_stop" },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.message.content).toEqual([{ type: "text", text: "Hello" }])
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "end_turn" })
-    }),
-  )
-
-  it.effect("rejects malformed recognized content block variants", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "message_start", message: { usage: { input_tokens: 5 } } },
-              { type: "content_block_start", index: 0, content_block: { type: "text", text: 42 } },
-            ),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "InvalidProviderOutput",
-        message: "Invalid anthropic/anthropic-messages stream event",
-      })
-    }),
-  )
-
-  it.effect("rejects malformed recognized content delta variants", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "message_start", message: { usage: { input_tokens: 5 } } },
-              { type: "content_block_start", index: 0, content_block: { type: "text", text: "" } },
-              { type: "content_block_delta", index: 0, delta: { type: "text_delta", text: 42 } },
-            ),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "InvalidProviderOutput",
-        message: "Invalid anthropic/anthropic-messages stream event",
-      })
-    }),
-  )
-
-  it.effect("rejects malformed payloads on unrelated stream events", () =>
-    Effect.gen(function* () {
-      const events = [
-        { type: "message_start", message: { usage: { input_tokens: 1 } }, delta: 42 },
-        { type: "content_block_start", index: 0 },
-        { type: "content_block_delta", index: 0 },
-        { type: "content_block_stop", index: 0, content_block: { type: "text", text: 42 } },
-        { type: "message_delta" },
-        { type: "message_delta", delta: { stop_reason: 42 } },
-        { type: "message_stop", delta: { text: 42 } },
-        { type: "error", error: { type: "overloaded_error", message: "busy" }, content_block: 42 },
-      ]
-
-      yield* Effect.forEach(events, (event) =>
-        Effect.gen(function* () {
-          const error = yield* LLMClient.generate(request).pipe(
-            Effect.provide(fixedResponse(sseEvents(event))),
-            Effect.flip,
-          )
-
-          expect(error.reason).toMatchObject({
-            _tag: "InvalidProviderOutput",
-            message: "Invalid anthropic/anthropic-messages stream event",
-          })
-        }),
-      )
-    }),
-  )
-
  it.effect("rejects malformed recognized SSE events", () =>
    Effect.gen(function* () {
      const error = yield* LLMClient.generate(request).pipe(
@@ -1230,14 +1060,8 @@ describe("Anthropic Messages route", () => {
      expect(response.events).toEqual([
        { type: "step-start", index: 0 },
        { type: "tool-input-start", id: "call_1", name: "lookup" },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' },
        { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata: undefined },
        {
          type: "tool-call",
@@ -475,14 +475,8 @@ describe("Bedrock Converse route", () => {
      ])
      const events = response.events.filter((event) => event.type === "tool-input-delta")
      expect(events).toEqual([
-        { type: "tool-input-delta", id: "tool_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "tool_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "tool_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "tool_1", name: "lookup", text: ':"weather"}' },
      ])
      expect(response.events.at(-1)).toMatchObject({
        type: "finish",
@@ -491,7 +485,7 @@ describe("Bedrock Converse route", () => {
    }),
  )

-  it.effect("recovers incomplete tool input at finalization", () =>
+  it.effect("emits malformed tool input as an unexecuted tool error", () =>
    Effect.gen(function* () {
      const body = eventStreamBody(
        ["messageStart", { role: "assistant" }],
@@ -508,10 +502,10 @@ describe("Bedrock Converse route", () => {
      )
      const response = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body)))

-      expect(response.events.find((event) => event.type === "tool-call")).toMatchObject({
+      expect(response.events.find((event) => event.type === "tool-input-error")).toMatchObject({
        id: "tool_1",
        name: "lookup",
-        input: { query: "partial" },
+        raw: '{"query":"partial',
      })
      expect(response.finishReason).toEqual({ normalized: "tool-calls", raw: "end_turn" })
    }),
@@ -716,32 +710,6 @@ describe("Bedrock Converse route", () => {
    }),
  )

-  it.effect("ignores unknown normal stream events", () =>
-    Effect.gen(function* () {
-      const body = concat([
-        eventFrame("messageStart", { role: "assistant" }),
-        eventFrame("futureEvent", { message: "Ignore this" }),
-        eventFrame("messageStop", { stopReason: "end_turn" }),
-      ])
-      const response = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body)))
-
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "end_turn" })
-    }),
-  )
-
-  it.effect("fails unknown stream exceptions after message stop", () =>
-    Effect.gen(function* () {
-      const body = concat([
-        eventFrame("messageStart", { role: "assistant" }),
-        eventFrame("messageStop", { stopReason: "end_turn" }),
-        exceptionFrame("futureException", { message: "A future provider failure" }),
-      ])
-      const error = yield* LLMClient.generate(baseRequest).pipe(Effect.provide(fixedBytes(body)), Effect.flip)
-
-      expect(error.reason).toMatchObject({ _tag: "UnknownProvider", message: "A future provider failure" })
-    }),
-  )
-
  it.effect("classifies throttlingException as a rate limit", () =>
    Effect.gen(function* () {
      const body = concat([
@@ -6,7 +6,6 @@ import { AmazonBedrockMantle } from "../../src/providers.js"
 import { compileRequest, LLMClient } from "../../src/route/client.js"
 import { it } from "../lib/effect.js"
 import { dynamicResponse } from "../lib/http.js"
-import { sseEvents } from "../lib/sse.js"
 import { recordedTests } from "../recorded-test.js"

 const credentials = {
@@ -72,9 +71,7 @@ describe("Amazon Bedrock Mantle provider", () => {
            Effect.gen(function* () {
              const request = yield* HttpClientRequest.toWeb(input.request)
              seen.push({ url: request.url, authorization: request.headers.get("authorization") ?? undefined })
-              return input.respond(sseEvents({ choices: [{ delta: {}, finish_reason: "stop" }] }), {
-                headers: { "content-type": "text/event-stream" },
-              })
+              return input.respond("", { headers: { "content-type": "text/event-stream" } })
            }),
          ),
        ),
@@ -906,54 +906,6 @@ describe("Gemini route", () => {
    }),
  )

-  it.effect("ignores unknown response parts", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents({
-              candidates: [
-                {
-                  content: {
-                    role: "model",
-                    parts: [
-                      { text: "Hello " },
-                      { executableCode: { language: "PYTHON", code: "print('ignored')" } },
-                      { text: "world" },
-                    ],
-                  },
-                  finishReason: "STOP",
-                },
-              ],
-            }),
-          ),
-        ),
-      )
-
-      expect(response.text).toBe("Hello world")
-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "STOP" })
-    }),
-  )
-
-  it.effect("rejects malformed recognized response parts", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents({
-              candidates: [{ content: { role: "model", parts: [{ text: 42 }] } }],
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error).toBeInstanceOf(AIError)
-      expect(error.reason).toMatchObject({ _tag: "InvalidProviderOutput" })
-      expect(error.message).toContain("Invalid google/gemini stream event")
-    }),
-  )
-
  it.effect("preserves thoughtSignature for reasoning and tool-call continuation", () =>
    Effect.gen(function* () {
      const body = sseEvents({
@@ -237,7 +237,6 @@ describe("Google Vertex providers", () => {
              })
              return input.respond(
                sseEvents(
-                  { type: "response.output_item.added", item: { type: "message", id: "msg_1" } },
                  { type: "response.output_text.delta", item_id: "msg_1", delta: "Hello." },
                  { type: "response.completed", response: { id: "resp_1" } },
                ),
@@ -47,7 +47,7 @@ describe("OpenAI Chat route", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(request)

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "gpt-4o-mini",
        messages: [
          { role: "system", content: "You are concise." },
@@ -55,8 +55,7 @@ describe("OpenAI Chat route", () => {
        ],
        stream: true,
        stream_options: { include_usage: true },
-        store: false,
-        max_completion_tokens: 20,
+        max_tokens: 20,
        temperature: 0,
      })
    }),
@@ -85,28 +84,6 @@ describe("OpenAI Chat route", () => {
    }),
  )

-  it.effect("omits empty and whitespace-only assistant messages", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.user("Before."),
-            Message.assistant([]),
-            Message.assistant(""),
-            Message.assistant(" \n\t "),
-            Message.assistant("After."),
-          ],
-        }),
-      )
-
-      expect(prepared.body.messages).toEqual([
-        { role: "user", content: "Before." },
-        { role: "assistant", content: "After." },
-      ])
-    }),
-  )
-
  it.effect("replays canonical reasoning as OpenAI-compatible reasoning_content", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -214,21 +191,6 @@ describe("OpenAI Chat route", () => {
    }),
  )

-  it.effect("omits the prompt cache key when caching is disabled", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          prompt: "Hello",
-          promptCacheKey: "session_123",
-          cache: "none",
-        }),
-      )
-
-      expect(prepared.body).not.toHaveProperty("prompt_cache_key")
-    }),
-  )
-
  it.effect("maps the xAI Chat prompt cache key to conversation affinity", () =>
    LLMClient.generate(
      LLM.request({
@@ -363,7 +325,7 @@ describe("OpenAI Chat route", () => {
        }),
      )

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "gpt-4o-mini",
        messages: [
          { role: "user", content: "What is the weather?" },
@@ -383,40 +345,10 @@ describe("OpenAI Chat route", () => {
        tools: [],
        stream: true,
        stream_options: { include_usage: true },
-        store: false,
      })
    }),
  )

-  it.effect("limits OpenAI and Azure Chat tool call IDs to 40 characters", () =>
-    Effect.gen(function* () {
-      const id = `call_${"a".repeat(48)}`
-      const models = [
-        model,
-        Azure.configure({ baseURL: "https://opencode-test.openai.azure.com/openai/", apiKey: "test" }).chat("gpt-4o"),
-      ]
-
-      yield* Effect.forEach(models, (selected) =>
-        Effect.gen(function* () {
-          const prepared = yield* compileRequest(
-            LLM.request({
-              model: selected,
-              messages: [
-                Message.assistant([ToolCallPart.make({ id, name: "lookup", input: {} })]),
-                Message.tool({ id, name: "lookup", result: "Sunny" }),
-              ],
-            }),
-          )
-
-          expect(prepared.body.messages).toMatchObject([
-            { role: "assistant", tool_calls: [{ id: id.slice(0, 40) }] },
-            { role: "tool", tool_call_id: id.slice(0, 40) },
-          ])
-        }),
-      )
-    }),
-  )
-
  it.effect("preserves structured tool errors for the model", () =>
    Effect.gen(function* () {
      const error = { error: { type: "unknown", message: "Tool execution interrupted" } }
@@ -482,30 +414,6 @@ describe("OpenAI Chat route", () => {
    }),
  )

-  it.effect("bridges image tool results before their synthetic user message when required", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: LanguageModel.update(model, { compatibility: { requireAssistantAfterTool: true } }),
-          messages: [
-            Message.assistant([ToolCallPart.make({ id: "call_image", name: "read", input: {} })]),
-            Message.tool({
-              id: "call_image",
-              name: "read",
-              result: {
-                type: "content",
-                value: [{ type: "file", uri: "data:image/png;base64,AAECAw==", mime: "image/png", name: "pixel.png" }],
-              },
-            }),
-          ],
-        }),
-      )
-
-      expect(prepared.body.messages.map((message) => message.role)).toEqual(["assistant", "tool", "assistant", "user"])
-      expect(prepared.body.messages[2]).toEqual({ role: "assistant", content: "Done." })
-    }),
-  )
-
  it.effect("orders parallel tool responses before one aggregated vision message", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -1254,14 +1162,8 @@ describe("OpenAI Chat route", () => {
      expect(response.events).toEqual([
        { type: "step-start", index: 0 },
        { type: "tool-input-start", id: "call_1", name: "lookup", providerMetadata: undefined },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' },
        { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata: undefined },
        {
          type: "tool-call",
@@ -1341,11 +1243,6 @@ describe("OpenAI Chat route", () => {
      ).pipe(Effect.provide(fixedResponse(body)), Effect.flip)

      expect(error.message).toContain("OpenAI Chat tool call delta is missing id or name")
-      expect(error.reason._tag).toBe("InvalidProviderOutput")
-      if (error.reason._tag !== "InvalidProviderOutput") return
-      expect(decodeJson(error.reason.raw ?? "")).toMatchObject({
-        choices: [{ finish_reason: "tool_calls" }],
-      })
    }),
  )

@@ -1359,7 +1256,6 @@ describe("OpenAI Chat route", () => {
        deltaChunk({ tool_calls: [{ index: 0, function: { arguments: ':"weather"}' } }] }),
      )
      const input = LLMRequest.update(request, {
-        model: LanguageModel.update(model, { compatibility: { requireFinishReason: false } }),
        tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: { type: "object" } })],
      })
      const response = yield* LLMClient.generate(input).pipe(Effect.provide(fixedResponse(body)))
@@ -1367,14 +1263,8 @@ describe("OpenAI Chat route", () => {
      expect(response.events).toEqual([
        { type: "step-start", index: 0 },
        { type: "tool-input-start", id: "call_1", name: "lookup", providerMetadata: undefined },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: ':"weather"}',
-          input: { query: "weather" },
-        },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' },
        { type: "tool-input-end", id: "call_1", name: "lookup", providerMetadata: undefined },
        {
          type: "tool-call",
@@ -70,7 +70,7 @@ describe("OpenAI-compatible Chat route", () => {
        baseURL: "https://api.deepseek.test/v1/",
        query: { "api-version": "2026-01-01" },
      })
-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "deepseek-chat",
        messages: [
          { role: "system", content: "You are concise." },
@@ -79,7 +79,7 @@ describe("OpenAI-compatible Chat route", () => {
        tools: [
          {
            type: "function",
-            function: { name: "lookup", description: "Lookup data", parameters: { type: "object" }, strict: false },
+            function: { name: "lookup", description: "Lookup data", parameters: { type: "object" } },
          },
        ],
        tool_choice: "required",
@@ -130,7 +130,7 @@ describe("OpenAI-compatible Chat route", () => {
    Effect.gen(function* () {
      const prepared = yield* compileRequest(request)

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "deepseek-chat",
        messages: [
          { role: "system", content: "You are concise." },
@@ -158,29 +158,6 @@ describe("OpenAI-compatible Chat route", () => {
    }),
  )

-  it.effect("enables ZAI tool streaming except for GLM 4.5 models", () =>
-    Effect.gen(function* () {
-      const prepare = (provider: string, baseURL: string, id: string) =>
-        compileRequest(
-          LLM.request({
-            model: OpenAICompatibleChat.route.with({ provider, endpoint: { baseURL } }).model({ id }),
-            prompt: "Use a tool.",
-            tools: [ToolDefinition.make({ name: "lookup", description: "Lookup data", inputSchema: {} })],
-          }),
-        )
-
-      const current = yield* prepare("zai", "https://api.z.ai/api/paas/v4", "glm-4.7")
-      expect(current.body).toMatchObject({ tool_stream: true })
-
-      const legacy = yield* Effect.all(
-        ["glm-4.5", "glm-4.5-air", "glm-4.5-flash", "glm-4.5v"].map((id) =>
-          prepare("zhipuai", "https://open.bigmodel.cn/api/paas/v4", id),
-        ),
-      )
-      legacy.forEach((item) => expect(item.body).not.toHaveProperty("tool_stream"))
-    }),
-  )
-
  it.effect("matches AI SDK compatible tool request body fixture", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -203,7 +180,7 @@ describe("OpenAI-compatible Chat route", () => {
        }),
      )

-      expect(prepared.body).toMatchObject({
+      expect(prepared.body).toEqual({
        model: "deepseek-chat",
        messages: [
          { role: "user", content: "What is the weather?" },
@@ -227,7 +204,6 @@ describe("OpenAI-compatible Chat route", () => {
              name: "lookup",
              description: "Lookup data",
              parameters: { type: "object", properties: { query: { type: "string" } }, required: ["query"] },
-              strict: false,
            },
          },
        ],
@@ -238,85 +214,6 @@ describe("OpenAI-compatible Chat route", () => {
    }),
  )

-  it.effect("normalizes tool call IDs for the selected model family", () =>
-    Effect.gen(function* () {
-      const longID = `call_${"a".repeat(48)}`
-      const cases = [
-        { provider: "custom", model: "mistral-small", id: "toolu_01CBhTTz95qkd9LJMdC9sf8t", expected: "toolu01CB" },
-        { provider: "custom", model: "devstral-small", id: "abc", expected: "abc000000" },
-        { provider: "custom", model: "codestral-latest", id: "toolu_01CBhTTz95", expected: "toolu01CB" },
-        { provider: "custom", model: "pixtral-large", id: "toolu_01CBhTTz95", expected: "toolu01CB" },
-        { provider: "custom", model: "open-mixtral-8x22b", id: "toolu_01CBhTTz95", expected: "toolu01CB" },
-        { provider: "gateway", model: "anthropic/claude-sonnet-4", id: "call|item/+", expected: "call_item__" },
-        { provider: "gateway", model: "openai/gpt-4o", id: longID, expected: longID.slice(0, 40) },
-        { provider: "custom", model: "ordinary-model", id: "call|item/+", expected: "call|item/+" },
-        { provider: "mistral", model: "zai-glm-5-2", id: "call_long_identifier", expected: "call_long_identifier" },
-      ]
-
-      yield* Effect.forEach(cases, (item) =>
-        Effect.gen(function* () {
-          const prepared = yield* compileRequest(
-            LLM.request({
-              model: OpenAICompatibleChat.route
-                .with({ provider: item.provider, endpoint: { baseURL: "https://api.custom.test/v1" } })
-                .model({ id: item.model }),
-              messages: [
-                Message.assistant([ToolCallPart.make({ id: item.id, name: "lookup", input: {} })]),
-                Message.tool({ id: item.id, name: "lookup", result: { type: "content", value: [] } }),
-              ],
-            }),
-          )
-
-          expect(prepared.body.messages).toMatchObject([
-            { role: "assistant", tool_calls: [{ id: item.expected }] },
-            { role: "tool", tool_call_id: item.expected },
-          ])
-        }),
-      )
-    }),
-  )
-
-  it.effect("bridges tool results for Mistral-family models and honors compatibility overrides", () =>
-    Effect.gen(function* () {
-      const cases = [
-        { id: "mistral-small", bridge: true },
-        { id: "devstral-small", bridge: true },
-        { id: "codestral-latest", bridge: true },
-        { id: "pixtral-large", bridge: true },
-        { id: "open-mixtral-8x22b", bridge: true },
-        { id: "ordinary-model", bridge: false },
-        { id: "ordinary-model", override: true, bridge: true },
-        { id: "mistral-small", override: false, bridge: false },
-      ] as const
-
-      yield* Effect.forEach(cases, (item) =>
-        Effect.gen(function* () {
-          const selected = OpenAICompatibleChat.route
-            .with({ provider: "custom", endpoint: { baseURL: "https://api.custom.test/v1" } })
-            .model({
-              id: item.id,
-              compatibility: "override" in item ? { requireAssistantAfterTool: item.override } : undefined,
-            })
-          const prepared = yield* compileRequest(
-            LLM.request({
-              model: selected,
-              messages: [
-                Message.assistant([ToolCallPart.make({ id: "call_1", name: "lookup", input: {} })]),
-                Message.tool({ id: "call_1", name: "lookup", result: "Sunny" }),
-                Message.user("What next?"),
-              ],
-            }),
-          )
-
-          expect(prepared.body.messages.map((message) => message.role)).toEqual(
-            item.bridge ? ["assistant", "tool", "assistant", "user"] : ["assistant", "tool", "user"],
-          )
-          if (item.bridge) expect(prepared.body.messages[2]).toEqual({ role: "assistant", content: "Done." })
-        }),
-      )
-    }),
-  )
-
  it.effect("posts to the configured compatible endpoint and parses text usage", () =>
    Effect.gen(function* () {
      const response = yield* LLMClient.generate(request).pipe(
@@ -432,106 +329,13 @@ describe("OpenAI-compatible Chat route", () => {
    }),
  )

-  it.effect("rejects a stream without a required finish reason", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "")))),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "InvalidProviderOutput",
-        classification: "incomplete-stream",
-        message: "OpenAI Chat stream ended without finish_reason",
-      })
-    }),
-  )
-
-  it.effect("infers stop when finish reasons are optional", () =>
-    Effect.gen(function* () {
-      const compatible = OpenAICompatibleChat.route
-        .with({ provider: "custom", endpoint: { baseURL: "https://api.custom.test/v1" } })
-        .model({ id: "custom-model", compatibility: { requireFinishReason: false } })
-      const response = yield* LLMClient.generate(LLMRequest.update(request, { model: compatible })).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "")))),
-      )
-
-      expect(response.finishReason).toEqual({ normalized: "stop" })
-    }),
-  )
-
-  it.effect("normalizes the end finish reason to stop", () =>
+  it.effect("treats an empty finish reason as terminal", () =>
    Effect.gen(function* () {
      const response = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "end")))),
+        Effect.provide(fixedResponse(sseEvents(deltaChunk({ content: "Hello" }), deltaChunk({}, "")))),
      )

-      expect(response.finishReason).toEqual({ normalized: "stop", raw: "end" })
-    }),
-  )
-
-  it.effect("classifies provider error finish reasons", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "network_error")))),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({
-        _tag: "ProviderInternal",
-        message: "Provider reported a network error (finish_reason: network_error)",
-      })
-      expect(decodeJson(error.body ?? "")).toMatchObject({
-        id: "chatcmpl_fixture",
-        choices: [{ finish_reason: "network_error" }],
-      })
-
-      const generic = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "error")))),
-        Effect.flip,
-      )
-      expect(generic.reason).toMatchObject({
-        _tag: "UnknownProvider",
-        message: "Provider reported an error (finish_reason: error)",
-      })
-    }),
-  )
-
-  it.effect("preserves explicit provider error events", () =>
-    Effect.gen(function* () {
-      const error = yield* LLMClient.generate(request).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents({
-              id: "chatcmpl_error",
-              error: { code: 502, message: "Provider disconnected", details: { upstream: "vendor" } },
-              trace_id: "trace_1",
-            }),
-          ),
-        ),
-        Effect.flip,
-      )
-
-      expect(error.reason).toMatchObject({ _tag: "ProviderInternal", message: "Provider disconnected", status: 502 })
-      expect(decodeJson(error.body ?? "")).toMatchObject({
-        id: "chatcmpl_error",
-        error: { code: 502, message: "Provider disconnected", details: { upstream: "vendor" } },
-        trace_id: "trace_1",
-      })
-    }),
-  )
-
-  it.effect("preserves provider finish outcomes in the common reason algebra", () =>
-    Effect.gen(function* () {
-      const filtered = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "content_filter")))),
-      )
-      const future = yield* LLMClient.generate(request).pipe(
-        Effect.provide(fixedResponse(sseEvents(deltaChunk({}, "future_reason")))),
-      )
-
-      expect(filtered.finishReason).toEqual({ normalized: "content-filter", raw: "content_filter" })
-      expect(future.finishReason).toEqual({ normalized: "unknown", raw: "future_reason" })
+      expect(response.finishReason).toEqual({ normalized: "unknown", raw: "" })
    }),
  )

@@ -551,11 +355,6 @@ describe("OpenAI-compatible Chat route", () => {
      )

      expect(error.message).toContain("OpenAI Chat received content after the finish reason")
-      expect(error.reason._tag).toBe("InvalidProviderOutput")
-      if (error.reason._tag !== "InvalidProviderOutput") return
-      expect(decodeJson(error.reason.raw ?? "")).toMatchObject({
-        choices: [{ delta: { tool_calls: [{ id: "call_1" }] } }],
-      })
    }),
  )
 })
@@ -52,28 +52,10 @@ describe("Open Responses-compatible route", () => {
          { role: "user", content: [{ type: "input_text", text: "Say hello." }] },
        ],
        stream: true,
-        store: false,
-        include: ["reasoning.encrypted_content"],
      })
    }),
  )

-  it.effect("allows callers to override stateless encrypted reasoning defaults", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-        provider: "example",
-      }).model("example-model")
-      const prepared = yield* compileRequest(
-        LLM.request({ model, prompt: "Say hello.", providerOptions: { store: true, include: [] } }),
-      )
-
-      expect(prepared.body.store).toBe(true)
-      expect(prepared.body.include).toBeUndefined()
-    }),
-  )
-
  it.effect("lowers chronological system updates as standard developer messages", () =>
    Effect.gen(function* () {
      const model = configure({
@@ -150,249 +132,6 @@ describe("Open Responses-compatible route", () => {
    }),
  )

-  it.effect("lowers canonical parallel tool control", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          prompt: "Read the file.",
-          tools: [
-            ToolDefinition.make({
-              name: "read",
-              description: "Read a file.",
-              inputSchema: { type: "object" },
-            }),
-          ],
-          toolChoice: { type: "auto", disableParallelToolUse: true },
-        }),
-      )
-
-      expect(prepared.body.parallel_tool_calls).toBe(false)
-      expect(prepared.body.tools).toEqual([
-        {
-          type: "function",
-          name: "read",
-          description: "Read a file.",
-          parameters: { type: "object" },
-          strict: false,
-        },
-      ])
-    }),
-  )
-
-  it.effect("keeps foreign item id grammars but drops malformed ids", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.assistant([
-              // The baseline does not enforce a provider id grammar, so a
-              // non-OpenAI but well-formed token is resent as-is.
-              { type: "text", text: "Kept.", providerMetadata: { openresponses: { itemId: "history_1" } } },
-              // Shape violations are dropped even without a grammar policy.
-              {
-                type: "text",
-                text: "Dropped.",
-                providerMetadata: { openresponses: { itemId: `m${"a".repeat(64)}` } },
-              },
-            ]),
-          ],
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([
-        {
-          type: "message",
-          id: "history_1",
-          role: "assistant",
-          content: [{ type: "output_text", text: "Kept." }],
-        },
-        {
-          type: "message",
-          role: "assistant",
-          content: [{ type: "output_text", text: "Dropped." }],
-        },
-      ])
-    }),
-  )
-
-  it.effect("replays only shared hosted tool items", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-        provider: "example",
-      }).model("example-model")
-      const items = [
-        { type: "web_search_call", id: "ws_1", status: "completed" },
-        { type: "x_search_call", id: "x_search_1", status: "completed" },
-        { type: "future_call", id: "future_1", status: "completed" },
-        { type: "file_search_call", id: "fs_1", queries: "not-an-array" },
-      ]
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: items.map((item) =>
-            Message.assistant({
-              type: "tool-result",
-              id: item.id,
-              name: item.type,
-              result: { type: "json", value: item },
-              providerExecuted: true,
-              providerMetadata: { openresponses: { itemId: item.id } },
-            }),
-          ),
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([
-        items[0],
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[1]) }] },
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[2]) }] },
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[3]) }] },
-      ])
-    }),
-  )
-
-  it.effect("routes response deltas by output index", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Say hello." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              { type: "response.output_item.added", output_index: 2, item: { type: "message", id: "msg_1" } },
-              { type: "response.output_text.delta", output_index: 2, item_id: "wrong_message", delta: "Indexed" },
-              { type: "response.output_item.done", output_index: 2, item: { type: "message", id: "msg_1" } },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.message.content).toEqual([
-        { type: "text", text: "Indexed", providerMetadata: { openresponses: { itemId: "msg_1" } } },
-      ])
-    }),
-  )
-
-  it.effect("finalizes pending function calls from completed response output", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-        provider: "example",
-      }).model("example-model")
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Look it up." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                item: { type: "function_call", id: "item_1", call_id: "call_1", name: "lookup", arguments: "" },
-              },
-              { type: "response.function_call_arguments.delta", item_id: "item_1", delta: '{"query":"par' },
-              {
-                type: "response.completed",
-                response: {
-                  output: [
-                    {
-                      type: "function_call",
-                      id: "item_1",
-                      call_id: "call_1",
-                      name: "lookup",
-                      arguments: '{"query":"complete"}',
-                    },
-                  ],
-                },
-              },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({
-        input: { query: "complete" },
-        providerMetadata: { openresponses: { itemId: "item_1" } },
-      })
-    }),
-  )
-
-  it.effect("preserves terminal reasoning metadata when item completion is missing", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think it through." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                item: { type: "reasoning", id: "rs_raw", encrypted_content: null },
-              },
-              { type: "response.reasoning_summary_text.delta", item_id: "rs_raw", delta: "Thinking" },
-              {
-                type: "response.completed",
-                response: {
-                  output: [{ type: "reasoning", id: "rs_raw", encrypted_content: "raw-state" }],
-                },
-              },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.events.find((event) => event.type === "reasoning-end")).toMatchObject({
-        providerMetadata: { openresponses: { itemId: "rs_raw", reasoningEncryptedContent: "raw-state" } },
-      })
-    }),
-  )
-
-  it.effect("reconciles raw reasoning finals without streamed deltas", () =>
-    Effect.gen(function* () {
-      const model = configure({
-        apiKey: "test-key",
-        baseURL: "https://responses.example.test/v1",
-      }).model("example-model")
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think it through." })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                item: { type: "reasoning", id: "rs_raw", encrypted_content: null },
-              },
-              // Raw reasoning finals carry no summary index; they reconcile
-              // into the item's first block.
-              { type: "response.reasoning.done", item_id: "rs_raw", text: "Raw chain of thought." },
-              {
-                type: "response.output_item.done",
-                item: { type: "reasoning", id: "rs_raw", encrypted_content: "raw-state" },
-              },
-              { type: "response.completed", response: { id: "resp_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.reasoning).toBe("Raw chain of thought.")
-    }),
-  )
-
  it.effect("preserves nullable phases in the forgiving Open Responses baseline", () =>
    Effect.gen(function* () {
      const model = configure({
@@ -190,21 +190,6 @@ describe("OpenRouter", () => {
    }),
  )

-  it.effect("omits the prompt cache key when caching is disabled", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model: OpenRouter.configure({ apiKey: "test-key" }).model("openai/gpt-4o-mini"),
-          prompt: "Hello",
-          promptCacheKey: "session_123",
-          cache: "none",
-        }),
-      )
-
-      expect(prepared.body).not.toHaveProperty("prompt_cache_key")
-    }),
-  )
-
  it.effect("filters invalid known OpenRouter options while preserving extensions", () =>
    Effect.gen(function* () {
      const invalid: Record<string, unknown> = {
@@ -1,6 +1,6 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
-import { LLM, LLMEvent, Message } from "../../src/index.js"
+import { LLM, LLMEvent } from "../../src/index.js"
 import { XAI } from "../../src/providers.js"
 import { OpenResponses } from "../../src/protocols/open-responses.js"
 import { OpenAIResponses } from "../../src/protocols/openai-responses.js"
@@ -14,44 +14,24 @@ import { sseEvents } from "../lib/sse.js"
 const model = XAI.configure({ apiKey: "test", baseURL: "https://api.x.ai/v1" }).responses("grok-4.6")

 describe("xAI Responses route", () => {
-  it.effect("composes the Open Responses baseline with xAI extensions", () =>
+  it.effect("extends the Open Responses baseline directly", () =>
    Effect.gen(function* () {
-      expect(XAIResponses.protocol.body).not.toBe(OpenResponses.protocol.body)
+      expect(XAIResponses.protocol.body).toBe(OpenResponses.protocol.body)
      expect(XAIResponses.protocol.body).not.toBe(OpenAIResponses.protocol.body)

      const prepared = yield* compileRequest(LLM.request({ model, prompt: "Hello" }))
      expect(prepared.protocol).toBe("xai-responses")
-      expect(prepared.body.store).toBe(false)
-      expect(prepared.body.include).toEqual(["reasoning.encrypted_content"])
    }),
  )

-  it.effect("allows callers to opt out of encrypted reasoning", () =>
-    Effect.gen(function* () {
-      const prepared = yield* compileRequest(LLM.request({ model, prompt: "Hello", providerOptions: { include: [] } }))
-
-      expect(prepared.body.store).toBe(false)
-      expect(prepared.body.include).toBeUndefined()
-    }),
-  )
-
-  it.effect("parses xAI reasoning summaries", () =>
+  it.effect("parses xAI reasoning text events", () =>
    Effect.gen(function* () {
      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think" })).pipe(
        Effect.provide(
          fixedResponse(
            sseEvents(
-              {
-                type: "response.output_item.added",
-                item: { type: "reasoning", id: "reasoning_1" },
-              },
-              // Grok streams reasoning with the standard summary event name.
-              {
-                type: "response.reasoning_summary_text.delta",
-                item_id: "reasoning_1",
-                summary_index: 0,
-                delta: "Considering.",
-              },
+              { type: "response.reasoning_text.delta", item_id: "reasoning_1", delta: "Considering." },
+              { type: "response.reasoning_text.done", item_id: "reasoning_1" },
              {
                type: "response.output_item.done",
                item: { type: "reasoning", id: "reasoning_1", encrypted_content: "opaque" },
@@ -70,106 +50,16 @@ describe("xAI Responses route", () => {
    }),
  )

-  it.effect("routes xAI reasoning summaries by output index", () =>
-    Effect.gen(function* () {
-      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Think" })).pipe(
-        Effect.provide(
-          fixedResponse(
-            sseEvents(
-              {
-                type: "response.output_item.added",
-                output_index: 3,
-                item: { type: "reasoning", id: "reasoning_1" },
-              },
-              {
-                type: "response.reasoning_summary_text.delta",
-                output_index: 3,
-                item_id: "wrong_reasoning",
-                summary_index: 0,
-                delta: "Considering.",
-              },
-              {
-                type: "response.output_item.done",
-                output_index: 3,
-                item: { type: "reasoning", id: "reasoning_1", encrypted_content: "opaque" },
-              },
-              { type: "response.completed", response: { id: "response_1" } },
-            ),
-          ),
-        ),
-      )
-
-      expect(response.reasoning).toBe("Considering.")
-      expect(response.message.content.find((part) => part.type === "reasoning")).toMatchObject({
-        providerMetadata: { xai: { itemId: "reasoning_1", reasoningEncryptedContent: "opaque" } },
-      })
-    }),
-  )
-
-  it.effect("replays xAI hosted tool items when continuing with the same provider", () =>
-    Effect.gen(function* () {
-      const item = { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } }
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: [
-            Message.assistant([
-              {
-                type: "tool-result",
-                id: "x_search_1",
-                name: "x_search",
-                result: { type: "json", value: item },
-                providerExecuted: true,
-                providerMetadata: { xai: { itemId: "x_search_1" } },
-              },
-            ]),
-          ],
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([item])
-    }),
-  )
-
-  it.effect("replays shared and xAI hosted tool items but rejects OpenAI extensions", () =>
-    Effect.gen(function* () {
-      const items = [
-        { type: "web_search_call", id: "ws_1", status: "completed" },
-        { type: "image_generation_call", id: "ig_1", status: "completed", result: "AQID" },
-        { type: "computer_call", id: "computer_1", status: "completed" },
-      ]
-      const prepared = yield* compileRequest(
-        LLM.request({
-          model,
-          messages: items.map((item) =>
-            Message.assistant({
-              type: "tool-result",
-              id: item.id,
-              name: item.type,
-              result: { type: "json", value: item },
-              providerExecuted: true,
-              providerMetadata: { xai: { itemId: item.id } },
-            }),
-          ),
-        }),
-      )
-
-      expect(prepared.body.input).toEqual([
-        items[0],
-        items[1],
-        { role: "user", content: [{ type: "input_text", text: JSON.stringify(items[2]) }] },
-      ])
-    }),
-  )
-
  it.effect("parses xAI hosted tool items", () =>
    Effect.gen(function* () {
-      const item = { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } }
      const response = yield* LLMClient.generate(LLM.request({ model, prompt: "Search X" })).pipe(
        Effect.provide(
          fixedResponse(
            sseEvents(
-              { type: "response.output_item.done", item },
+              {
+                type: "response.output_item.done",
+                item: { type: "x_search_call", id: "x_search_1", status: "completed", action: { query: "news" } },
+              },
              { type: "response.completed", response: { id: "response_1" } },
            ),
          ),
@@ -181,11 +71,6 @@ describe("xAI Responses route", () => {
        name: "x_search",
        input: { query: "news" },
        providerExecuted: true,
-        providerMetadata: { xai: { itemId: "x_search_1" } },
-      })
-      expect(response.events.find(LLMEvent.is.toolResult)).toMatchObject({
-        result: { type: "json", value: item },
-        providerMetadata: { xai: { itemId: "x_search_1" } },
      })
    }),
  )
@@ -78,31 +78,6 @@ describe("Z.ai Images", () => {
    ),
  )

-  it.effect("sanitizes unpaired surrogates in outbound image requests", () =>
-    Image.generate({
-      model: ZAI.configure({ apiKey: "test", http: { body: { metadata: { source: "default\uDC00" } } } }).image("model"),
-      prompt: "A red circle \uD800 on a white background \u{1F600}",
-    }).pipe(
-      Effect.provide(
-        ImageClient.layer.pipe(
-          Layer.provide(
-            dynamicResponse((input) => {
-              expect(JSON.parse(input.text)).toMatchObject({
-                prompt: "A red circle \uFFFD on a white background \u{1F600}",
-                metadata: { source: "default\uFFFD" },
-              })
-              return Effect.succeed(
-                input.respond(JSON.stringify({ data: [{ url: "https://example.test/image.jpg" }] }), {
-                  headers: { "content-type": "application/json" },
-                }),
-              )
-            }),
-          ),
-        ),
-      ),
-    ),
-  )
-
  it.effect("lets raw native options override aliases", () =>
    Image.generate({
      model: ZAI.configure({ apiKey: "test" }).image("model"),
@@ -101,7 +101,7 @@ describe("LLMClient tools", () => {
      const messages = Reflect.get(second, "messages")
      const tools = Reflect.get(second, "tools")

-      expect(Reflect.get(second, "max_completion_tokens")).toBe(50)
+      expect(Reflect.get(second, "max_tokens")).toBe(50)
      expect(Reflect.get(second, "tool_choice")).toBe("auto")
      expect(tools).toHaveLength(1)
      expect(
@@ -50,7 +50,32 @@ describe("tool schema projections", () => {
    })
  })

-  it.effect("applies model compatibility without changing schema semantics", () =>
+  test("openai keeps one flat object top-level schema", () => {
+    expect(
+      ToolSchemaProjection.openAI({
+        anyOf: [
+          {
+            type: "object",
+            properties: {
+              path: { type: "string" },
+              maybe: { anyOf: [{ type: "string" }, { type: "null" }] },
+            },
+          },
+          { type: "object", properties: { resource: { type: "string" } } },
+        ],
+      }),
+    ).toEqual({
+      type: "object",
+      properties: {
+        path: { type: "string" },
+        maybe: { type: "string" },
+        resource: { type: "string" },
+      },
+      additionalProperties: false,
+    })
+  })
+
+  it.effect("applies model compatibility before protocol projection", () =>
    Effect.gen(function* () {
      const model = OpenAIChat.route
        .with({ endpoint: { baseURL: "https://api.openai.test/v1/" }, auth: Auth.bearer("test") })
@@ -82,15 +107,11 @@ describe("tool schema projections", () => {

      expect(prepared.body.tools?.[0]?.function.parameters).toEqual({
        type: "object",
-        anyOf: [
-          {
-            type: "object",
-            properties: {
-              tuple: { type: "array", items: { anyOf: [{ type: "string" }, { type: "number" }] } },
-              linked: { $ref: "#/$defs/Linked" },
-            },
-          },
-        ],
+        properties: {
+          tuple: { type: "array", items: { anyOf: [{ type: "string" }, { type: "number" }] } },
+          linked: { $ref: "#/$defs/Linked" },
+        },
+        additionalProperties: false,
      })
    }),
  )
@@ -23,11 +23,9 @@ describe("ToolStream", () => {

      expect(first.events).toEqual([
        { type: "tool-input-start", id: "call_1", name: "lookup" },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"', input: {} },
-      ])
-      expect(second.events).toEqual([
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}', input: { query: "weather" } },
+        { type: "tool-input-delta", id: "call_1", name: "lookup", text: '{"query"' },
      ])
+      expect(second.events).toEqual([{ type: "tool-input-delta", id: "call_1", name: "lookup", text: ':"weather"}' }])
      expect(finished).toEqual({
        tools: {},
        events: [
@@ -38,45 +36,6 @@ describe("ToolStream", () => {
    }),
  )

-  it.effect("exposes cumulative partial string values", () =>
-    Effect.gen(function* () {
-      const result = ToolStream.appendOrStart(
-        ADAPTER,
-        ToolStream.empty<number>(),
-        0,
-        { id: "call_1", name: "lookup", text: '{"query":"wea' },
-        "missing tool",
-      )
-      if (ToolStream.isError(result)) return yield* result
-
-      expect(result.events.at(-1)).toEqual({
-        type: "tool-input-delta",
-        id: "call_1",
-        name: "lookup",
-        text: '{"query":"wea',
-        input: { query: "wea" },
-      })
-    }),
-  )
-
-  it.effect("defaults partial input to an empty object when the accumulated value cannot be parsed", () =>
-    Effect.gen(function* () {
-      const result = ToolStream.appendOrStart(
-        ADAPTER,
-        ToolStream.empty<number>(),
-        0,
-        { id: "call_1", name: "lookup", text: "x" },
-        "missing tool",
-      )
-      if (ToolStream.isError(result)) return yield* result
-
-      expect(result.events).toEqual([
-        { type: "tool-input-start", id: "call_1", name: "lookup" },
-        { type: "tool-input-delta", id: "call_1", name: "lookup", text: "x", input: {} },
-      ])
-    }),
-  )
-
  it.effect("keeps accumulated identity when later deltas contain empty strings", () =>
    Effect.gen(function* () {
      const first = ToolStream.appendOrStart(
@@ -132,7 +91,7 @@ describe("ToolStream", () => {
    }),
  )

-  it.effect("finalizes incomplete local input using the partial JSON parser", () =>
+  it.effect("finalizes malformed local input as a non-executable tool error", () =>
    Effect.gen(function* () {
      const tools = ToolStream.start(ToolStream.empty<string>(), "item_1", {
        id: "call_1",
@@ -144,46 +103,18 @@ describe("ToolStream", () => {
      expect(finished).toEqual({
        tools: {},
        events: [
-          { type: "tool-input-end", id: "call_1", name: "lookup" },
-          { type: "tool-call", id: "call_1", name: "lookup", input: { query: "partial" } },
+          {
+            type: "tool-input-error",
+            id: "call_1",
+            name: "lookup",
+            raw: '{"query":"partial',
+          },
        ],
      })
    }),
  )

-  it.effect("repairs malformed string escapes in final local input", () =>
-    Effect.gen(function* () {
-      const tools = ToolStream.start(ToolStream.empty<string>(), "item_1", {
-        id: "call_1",
-        name: "lookup",
-        input: '{"path":"A\\H","text":"first\tsecond"}',
-      })
-      const finished = yield* ToolStream.finish(ADAPTER, tools, "item_1")
-
-      expect(finished.events).toEqual([
-        { type: "tool-input-end", id: "call_1", name: "lookup" },
-        { type: "tool-call", id: "call_1", name: "lookup", input: { path: "A\\H", text: "first\tsecond" } },
-      ])
-    }),
-  )
-
-  it.effect("defaults unrecoverable local input to an empty object", () =>
-    Effect.gen(function* () {
-      const tools = ToolStream.start(ToolStream.empty<string>(), "item_1", {
-        id: "call_1",
-        name: "lookup",
-        input: "invalid",
-      })
-      const finished = yield* ToolStream.finish(ADAPTER, tools, "item_1")
-
-      expect(finished.events).toEqual([
-        { type: "tool-input-end", id: "call_1", name: "lookup" },
-        { type: "tool-call", id: "call_1", name: "lookup", input: {} },
-      ])
-    }),
-  )
-
-  it.effect("recovers incomplete input alongside valid parallel tool calls", () =>
+  it.effect("preserves valid siblings when one parallel input is malformed", () =>
    Effect.gen(function* () {
      const valid = ToolStream.start(ToolStream.empty<number>(), 0, {
        id: "call_valid",
@@ -202,8 +133,12 @@ describe("ToolStream", () => {
        events: [
          { type: "tool-input-end", id: "call_valid", name: "lookup" },
          { type: "tool-call", id: "call_valid", name: "lookup", input: { query: "weather" } },
-          { type: "tool-input-end", id: "call_invalid", name: "lookup" },
-          { type: "tool-call", id: "call_invalid", name: "lookup", input: { query: "partial" } },
+          {
+            type: "tool-input-error",
+            id: "call_invalid",
+            name: "lookup",
+            raw: '{"query":"partial',
+          },
        ],
      })
    }),
@@ -899,26 +899,8 @@ function provider() {
        name: "OpenCode",
        models: { "claude-opus-4-6": { id: "claude-opus-4-6", name: "Claude Opus 4.6", limit: { context: 200_000 } } },
      },
-      {
-        id: "company-gateway",
-        name: "Company Gateway",
-        models: {
-          "fast-nano": {
-            id: "fast-nano",
-            api: { id: "openai/gpt-5.4-nano" },
-            name: "GPT-5.4 nano",
-            limit: { context: 128_000 },
-          },
-          "long-context": {
-            id: "long-context",
-            api: { id: "company/long-context" },
-            name: "Company Gateway Extra Long Context Model for Narrow Timeline Layouts",
-            limit: { context: 128_000 },
-          },
-        },
-      },
    ],
-    connected: ["opencode", "company-gateway"],
+    connected: ["opencode"],
    default: { providerID: "opencode", modelID: "claude-opus-4-6" },
  }
 }
@@ -1,106 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { fixture, pageMessages } from "../smoke/session-timeline.fixture"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-test("renames, exports, and deletes a home session from its context menu", async ({ page }) => {
-  const sessions = fixture.sessions.map((session) => ({ ...session }))
-  await mockOpenCodeServer(page, {
-    sessions,
-    provider: fixture.provider,
-    directory: fixture.directory,
-    project: fixture.project,
-    pageMessages,
-  })
-  await page.route("**/api/session/*/rename", async (route) => {
-    const sessionID = new URL(route.request().url()).pathname.split("/").at(-2)
-    const session = sessions.find((item) => item.id === sessionID)
-    const payload: unknown = route.request().postDataJSON()
-    if (!payload || typeof payload !== "object" || !("title" in payload) || typeof payload.title !== "string")
-      throw new Error("Invalid rename payload")
-    if (session) session.title = payload.title
-    await route.fulfill({ status: 204, headers: { "access-control-allow-origin": "*" } })
-  })
-  await page.addInitScript((directory) => {
-    localStorage.setItem(
-      "opencode.global.dat:server",
-      JSON.stringify({
-        projects: { local: [{ worktree: directory, expanded: true }] },
-        lastProject: { local: directory },
-      }),
-    )
-  }, fixture.directory)
-
-  await page.goto("/")
-  const row = page.locator('[data-component="home-session-row"]').filter({ hasText: fixture.expected.targetTitle })
-  await expect(row).toBeVisible()
-  const container = page.locator(`[data-component="home-session-row-container"][data-session-id="${fixture.targetID}"]`)
-  const titleBox = await container.locator('[data-component="home-session-title"]').boundingBox()
-  const avatarBox = await container.locator('[data-component="project-avatar-v2"]').boundingBox()
-  await expect(container.getByRole("button", { name: "More options" })).toHaveCount(0)
-
-  await row.focus()
-  await row.press("Shift+F10")
-  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeVisible()
-  await page.keyboard.press("Escape")
-  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeHidden()
-  await expect(row).toBeFocused()
-
-  const rowBox = await row.boundingBox()
-  await row.click({ button: "right", position: { x: 48, y: 12 } })
-  await expect(page).toHaveURL("/")
-  await expect(page.getByRole("menuitem", { name: "Rename" })).toBeVisible()
-  await expect(page.getByRole("menuitem", { name: "Export..." })).toBeVisible()
-  await expect(page.getByRole("menuitem", { name: "Delete..." })).toBeVisible()
-  const menuBox = await page.locator('[data-component="menu-v2-content"]').boundingBox()
-  expect(Math.abs((menuBox?.x ?? 0) - (rowBox?.x ?? 0) - 48)).toBeLessThan(4)
-
-  await page.getByRole("menuitem", { name: "Rename" }).click()
-  const title = page.locator('[data-component="home-session-rename"]')
-  await expect(title).toBeFocused()
-  await expect(title).toHaveValue(fixture.expected.targetTitle)
-  const editorBox = await title.boundingBox()
-  const editingAvatarBox = await container.locator('[data-component="project-avatar-v2"]').boundingBox()
-  expect(editorBox?.x).toBe(titleBox?.x)
-  expect(editingAvatarBox).toEqual(avatarBox)
-  expect(
-    await title.evaluate((element) => ({
-      outline: getComputedStyle(element).outlineStyle,
-      shadow: getComputedStyle(element).boxShadow,
-    })),
-  ).toEqual({ outline: "none", shadow: "none" })
-  expect(await container.evaluate((element) => getComputedStyle(element).outlineStyle)).toBe("none")
-  await title.fill("Renamed from Home")
-  const renamed = page.waitForRequest(
-    (request) => request.method() === "POST" && new URL(request.url()).pathname.endsWith("/rename"),
-  )
-  await title.press("Enter")
-  expect((await renamed).postDataJSON()).toEqual({ title: "Renamed from Home" })
-  let renamedRow = page.locator('[data-component="home-session-row"]').filter({ hasText: "Renamed from Home" })
-  await expect(renamedRow).toBeVisible()
-
-  await renamedRow.click()
-  await expect(page).toHaveURL(new RegExp(`/session/${fixture.targetID}$`))
-  await expect(page.locator('[data-slot="titlebar-tabs"] a').filter({ hasText: "Renamed from Home" })).toBeVisible()
-  await page.getByRole("button", { name: "Home" }).click()
-  await expect(page).toHaveURL("/")
-  renamedRow = page.locator('[data-component="home-session-row"]').filter({ hasText: "Renamed from Home" })
-  await expect(renamedRow).toBeVisible()
-
-  await renamedRow.click({ button: "right" })
-  const download = page.waitForEvent("download")
-  const exportItem = page.getByRole("menuitem", { name: "Export..." })
-  await exportItem.click()
-  expect((await download).suggestedFilename()).toBe("renamed-from-home.json")
-  await expect(exportItem).toBeHidden()
-
-  await renamedRow.click({ button: "right" })
-  await page.getByRole("menuitem", { name: "Delete..." }).click()
-  const dialog = page.getByRole("dialog")
-  await expect(dialog).toContainText('Delete session "Renamed from Home"?')
-  const removed = page.waitForRequest(
-    (request) => request.method() === "DELETE" && new URL(request.url()).pathname.endsWith(`/${fixture.targetID}`),
-  )
-  await dialog.getByRole("button", { name: "Delete session" }).click()
-  await removed
-  await expect(renamedRow).toBeHidden()
-})
@@ -1,53 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const draftID = "draft_new_session_workspace_branch"
-const directory = "C:/OpenCode/WorkspaceBranch"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test("selects a base branch for a new workspace", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_new_session_workspace_branch",
-      worktree: directory,
-      vcs: "git",
-      name: "workspace-branch",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [],
-    pageMessages: () => ({ items: [] }),
-    vcsBranches: ["feature/api", "main", "origin/release"],
-  })
-  await page.addInitScript(
-    ({ directory, draftID, server }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "draft", draftID, server, directory }]),
-      )
-    },
-    { directory, draftID, server },
-  )
-
-  await page.goto(`/new-session?draftId=${draftID}`)
-  await expectAppVisible(page.locator('[data-component="composer-editor"]'))
-  await page.getByRole("button", { name: "Local", exact: true }).click()
-  await page.getByRole("menuitem", { name: "New workspace", exact: true }).click()
-  await page.getByRole("button", { name: "from main", exact: true }).click()
-  await page.getByRole("menuitemradio", { name: "feature/api", exact: true }).click()
-
-  const selected = page.getByRole("button", { name: "from feature/api", exact: true })
-  await expect(selected).toBeVisible()
-  await selected.click()
-  await expect(page.getByRole("menuitemradio", { name: "feature/api", exact: true })).toBeChecked()
-})
@@ -13,14 +13,9 @@ const sessionB = session("ses_server_b", directoryB, "Server B session")

 test("session settings use the remote server context", async ({ page }) => {
  const permissionRequests: string[] = []
-  const permissionResponses: PermissionResponse[] = []
  await installSseTransport(page, { server: serverA })
  await installSseTransport(page, { server: serverB })
-  // Server A has no tab and is never visited: a pending request there proves
-  // one toggle sweeps every connected server, not just the focused one.
-  await mockServers(page, permissionRequests, permissionResponses, {
-    pending: { [serverA]: [pendingPermission("permission-pending-a", sessionA.id)] },
-  })
+  await mockServers(page, permissionRequests)
  await configureServers(page)

  await page.goto(`/server/${base64Encode(serverB)}/session/${sessionB.id}`)
@@ -43,17 +38,7 @@ test("session settings use the remote server context", async ({ page }) => {
      }),
    )
    .toBe(true)
-  await expect
-    .poll(() => permissionResponses)
-    .toEqual([
-      {
-        origin: serverA,
-        directory: undefined,
-        sessionID: sessionA.id,
-        permissionID: "permission-pending-a",
-        body: { reply: "once" },
-      },
-    ])
+  expect(permissionRequests.every((request) => new URL(request).origin === serverB)).toBe(true)

  await dialog.getByRole("tab", { name: "Models" }).click()
  await expect(dialog.getByRole("switch", { name: "Server B Model" })).toBeEnabled()
@@ -158,99 +143,6 @@ test("auto-accept responds for an unfocused server session", async ({ page }) =>
    ])
 })

-test("auto-accept sweeps again after a reconnect", async ({ page }) => {
-  const permissionRequests: string[] = []
-  const permissionResponses: PermissionResponse[] = []
-  const pendingA: MockPermission[] = []
-  const listFailures: Record<string, number> = {}
-  const sessionGets: string[] = []
-  await installSseTransport(page, { server: serverB })
-  const transport = await installSseTransport(page, { server: serverA, retry: 20 })
-  await mockServers(page, permissionRequests, permissionResponses, {
-    pending: { [serverA]: pendingA },
-    listFailures,
-    sessionGets,
-  })
-  await configureServers(page, [{ type: "session", server: serverA, sessionId: sessionA.id }])
-
-  await page.goto(`/server/${base64Encode(serverA)}/session/${sessionA.id}`)
-  await expect(page.getByRole("heading", { name: sessionA.title, exact: true })).toBeVisible()
-  const first = await transport.waitForConnection()
-
-  await page.keyboard.press("Control+,")
-  const autoAccept = page.locator(".settings-dialog").locator('[data-action="settings-auto-accept-permissions"]')
-  await autoAccept.locator('[data-slot="switch-control"]').click()
-  await expect(autoAccept.getByRole("switch")).toBeChecked()
-  await expect
-    .poll(() =>
-      permissionRequests.some((request) => {
-        const url = new URL(request)
-        return url.origin === serverA && url.searchParams.get("location[directory]") === directoryA
-      }),
-    )
-    .toBe(true)
-  await page.keyboard.press("Escape")
-
-  // This request is asked while the client is disconnected, so it is never
-  // delivered as an event and only a reconnect sweep can find it. The first
-  // listing after the reconnect fails, so only the bounded sweep retry can
-  // deliver the reply.
-  pendingA.push(pendingPermission("permission-offline-a", sessionA.id))
-  listFailures[serverA] = 1
-  const syncsBeforeReconnect = sessionGets.length
-  await transport.disconnect()
-  await transport.waitForConnection({ after: first.id })
-
-  await expect
-    .poll(() => permissionResponses)
-    .toEqual([
-      {
-        origin: serverA,
-        directory: undefined,
-        sessionID: sessionA.id,
-        permissionID: "permission-offline-a",
-        body: { reply: "once" },
-      },
-    ])
-  // The reconnect sweep must resync active sessions instead of trusting
-  // cached locations, since another client may have moved them meanwhile.
-  expect(sessionGets.slice(syncsBeforeReconnect)).toContain(sessionA.id)
-})
-
-test("auto-accept approves a request discovered by opening a session", async ({ page }) => {
-  const permissionRequests: string[] = []
-  const permissionResponses: PermissionResponse[] = []
-  await installSseTransport(page, { server: serverA })
-  await installSseTransport(page, { server: serverB })
-  // The request is only served from the per-session permission list, so it
-  // reaches the client through the store sync when the session view opens,
-  // never through a location sweep or an event.
-  await mockServers(page, permissionRequests, permissionResponses, {
-    sessionPending: { [sessionA.id]: [pendingPermission("permission-synced-a", sessionA.id)] },
-  })
-  await configureServers(page, [{ type: "session", server: serverA, sessionId: sessionA.id }])
-
-  await page.goto(`/server/${base64Encode(serverA)}/session/${sessionA.id}`)
-  await expect(page.getByRole("heading", { name: sessionA.title, exact: true })).toBeVisible()
-
-  await page.keyboard.press("Control+,")
-  const autoAccept = page.locator(".settings-dialog").locator('[data-action="settings-auto-accept-permissions"]')
-  await autoAccept.locator('[data-slot="switch-control"]').click()
-  await expect(autoAccept.getByRole("switch")).toBeChecked()
-
-  await expect
-    .poll(() => permissionResponses)
-    .toEqual([
-      {
-        origin: serverA,
-        directory: undefined,
-        sessionID: sessionA.id,
-        permissionID: "permission-synced-a",
-        body: { reply: "once" },
-      },
-    ])
-})
-
 type PermissionResponse = {
  origin: string
  directory?: string
@@ -259,19 +151,6 @@ type PermissionResponse = {
  body: unknown
 }

-type MockPermission = {
-  id: string
-  sessionID: string
-  action: string
-  resources: string[]
-  metadata: Record<string, unknown>
-  save: unknown[]
-}
-
-function pendingPermission(id: string, sessionID: string): MockPermission {
-  return { id, sessionID, action: "shell", resources: ["git status"], metadata: {}, save: [] }
-}
-
 async function configureServers(page: Page, tabs: { type: "session"; server: string; sessionId: string }[] = []) {
  await page.addInitScript(
    ({ serverB, tabs }) => {
@@ -282,23 +161,7 @@ async function configureServers(page: Page, tabs: { type: "session"; server: str
  )
 }

-type MockServerOptions = {
-  // Pending requests served from /api/permission/request, keyed by origin.
-  pending?: Record<string, MockPermission[]>
-  // Pending requests served from /api/session/:id/permission, keyed by session ID.
-  sessionPending?: Record<string, MockPermission[]>
-  // Counts of /api/permission/request calls to fail with a 500, keyed by origin.
-  listFailures?: Record<string, number>
-  // Records /api/session/:id GETs so tests can assert session resyncs.
-  sessionGets?: string[]
-}
-
-async function mockServers(
-  page: Page,
-  permissionRequests: string[],
-  permissionResponses: PermissionResponse[] = [],
-  options: MockServerOptions = {},
-) {
+async function mockServers(page: Page, permissionRequests: string[], permissionResponses: PermissionResponse[] = []) {
  await page.route("**/*", async (route) => {
    const url = new URL(route.request().url())
    if (url.origin !== serverA && url.origin !== serverB) return route.fallback()
@@ -315,12 +178,8 @@ async function mockServers(
        permissionID: response[2]!,
        body: route.request().postDataJSON(),
      })
-      // The generated client requires exactly 204 for a successful reply.
-      return route.fulfill({ status: 204, headers: { "access-control-allow-origin": "*" } })
+      return json(route, true)
    }
-    const sessionPermission = url.pathname.match(/^\/api\/session\/([^/]+)\/permission$/)
-    if (route.request().method() === "GET" && sessionPermission)
-      return json(route, { data: options.sessionPending?.[sessionPermission[1]!] ?? [] })
    if (requestDirectory && requestDirectory !== directory) return json(route, { name: "InvalidDirectory" }, 500)
    if (url.pathname === "/api/provider")
      return json(route, {
@@ -338,12 +197,7 @@ async function mockServers(
    if (url.pathname === "/api/agent") return json(route, { location: { directory }, data: [] })
    if (url.pathname === "/api/permission/request") {
      permissionRequests.push(url.toString())
-      const failures = options.listFailures?.[url.origin] ?? 0
-      if (failures > 0) {
-        options.listFailures![url.origin] = failures - 1
-        return json(route, { name: "Internal" }, 500)
-      }
-      return json(route, { location: { directory }, data: options.pending?.[url.origin] ?? [] })
+      return json(route, { location: { directory }, data: [] })
    }
    if (["/api/command", "/api/reference", "/api/question/request"].includes(url.pathname))
      return json(route, { location: { directory }, data: [] })
@@ -365,13 +219,9 @@ async function mockServers(
      return json(route, { id: remote ? sessionB.projectID : "project-server-a", directory, canonical: directory })
    if (url.pathname === "/api/session")
      return json(route, { data: sessions.map((session) => currentSession(session)), cursor: {} })
-    if (url.pathname === "/api/session/active")
-      return json(route, { data: Object.fromEntries(sessions.map((session) => [session.id, { type: "running" }])) })
+    if (url.pathname === "/api/session/active") return json(route, { data: {} })
    const currentSessionInfo = sessions.find((session) => url.pathname === `/api/session/${session.id}`)
-    if (currentSessionInfo) {
-      options.sessionGets?.push(currentSessionInfo.id)
-      return json(route, { data: currentSession(currentSessionInfo) })
-    }
+    if (currentSessionInfo) return json(route, { data: currentSession(currentSessionInfo) })
    if (sessions.some((session) => url.pathname === `/api/session/${session.id}/message`))
      return json(route, { data: [], cursor: {} })
    if (sessions.some((session) => url.pathname === `/api/session/${session.id}/inbox`))
@@ -20,47 +20,45 @@ const messages = [
  },
  { id: "msg_second", type: "user", text: "Second prompt", time: { created: 4 } },
 ] satisfies SessionMessageInfo[]
-const session = {
-  id: sessionID,
-  slug: "session-message-revert",
-  projectID,
-  directory,
-  title: "Session message revert",
-  agent: "build",
-  model: { id: "test", providerID: "opencode" },
-  version: "dev",
-  time: { created: 1, updated: 4 },
-}
-const fixture = {
-  directory,
-  project: {
-    id: projectID,
-    worktree: directory,
-    canonical: directory,
-    vcs: "git",
-    name: "session-message-revert",
-    time: { created: 1, updated: 1 },
-    sandboxes: [],
-  },
-  provider: {
-    all: [
-      {
-        id: "opencode",
-        name: "OpenCode",
-        models: { test: { id: "test", name: "Test", variants: {}, limit: { context: 200_000 } } },
-      },
-    ],
-    connected: ["opencode"],
-    default: { providerID: "opencode", modelID: "test" },
-  },
-  pageMessages: () => ({ items: messages }),
-}

 test("reverts directly to the selected user message", async ({ page }) => {
  const staged: { sessionID: string; messageID: string }[] = []
  await mockOpenCodeServer(page, {
-    ...fixture,
-    sessions: [session],
+    directory,
+    project: {
+      id: projectID,
+      worktree: directory,
+      canonical: directory,
+      vcs: "git",
+      name: "session-message-revert",
+      time: { created: 1, updated: 1 },
+      sandboxes: [],
+    },
+    provider: {
+      all: [
+        {
+          id: "opencode",
+          name: "OpenCode",
+          models: { test: { id: "test", name: "Test", variants: {}, limit: { context: 200_000 } } },
+        },
+      ],
+      connected: ["opencode"],
+      default: { providerID: "opencode", modelID: "test" },
+    },
+    sessions: [
+      {
+        id: sessionID,
+        slug: "session-message-revert",
+        projectID,
+        directory,
+        title: "Session message revert",
+        agent: "build",
+        model: { id: "test", providerID: "opencode" },
+        version: "dev",
+        time: { created: 1, updated: 4 },
+      },
+    ],
+    pageMessages: () => ({ items: messages }),
    onRevertStage: (input) => staged.push(input),
  })
  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
@@ -79,19 +77,3 @@ test("reverts directly to the selected user message", async ({ page }) => {
  await expect(page.getByRole("textbox", { name: "Prompt" })).toHaveText("Second prompt")
  expect(staged).toEqual([{ sessionID, messageID: "msg_second" }])
 })
-
-test("hides revert actions in a child session", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    ...fixture,
-    sessions: [
-      { ...session, id: "ses_parent", slug: "parent", title: "Parent session" },
-      { ...session, parentID: "ses_parent" },
-    ],
-  })
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  await expectSessionTitle(page, "Session message revert")
-
-  const message = page.locator('[data-message-id="msg_second"]')
-  await message.hover()
-  await expect(message.getByRole("button", { name: "Revert message" })).toHaveCount(0)
-})
@@ -1,226 +0,0 @@
-import { expect, test, type Page } from "@playwright/test"
-import type { OpenCodeEvent } from "@opencode-ai/client/promise"
-import { base64Encode } from "@opencode-ai/util/encode"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const directory = "C:/OpenCode/SessionQueueRegression"
-const projectID = "proj_session_queue_regression"
-const sessionID = "ses_session_queue_regression"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-type InboxRow = {
-  id: string
-  sessionID: string
-  timeCreated: number
-  type: "user"
-  payload: { text: string; metadata?: Record<string, unknown> }
-  delivery: "steer" | "queue"
-}
-
-function createQueueMock(seed: string[]) {
-  const rows: InboxRow[] = seed.map((text, index) => ({
-    id: `inb_seed_${index + 1}`,
-    sessionID,
-    timeCreated: 1700000000000 + index,
-    type: "user",
-    payload: { text },
-    delivery: "queue",
-  }))
-  const events: OpenCodeEvent[] = []
-  const prompts: Record<string, unknown>[] = []
-  const changes: { inboxID: string; action: "cancel" | "steer" }[] = []
-  const log: string[] = []
-  let sequence = 0
-  const emit = (type: OpenCodeEvent["type"], data: OpenCodeEvent["data"]) => {
-    sequence += 1
-    events.push({
-      id: `evt_queue_${sequence}`,
-      type,
-      created: Date.now(),
-      durable: { aggregateID: sessionID, seq: sequence, version: 1 },
-      data,
-    } as OpenCodeEvent)
-  }
-  return {
-    rows,
-    prompts,
-    changes,
-    log,
-    events: () => events.splice(0),
-    onPrompt: (input: { sessionID: string; body: Record<string, unknown> }) => {
-      prompts.push(input.body)
-      log.push(`prompt:${String(input.body.delivery ?? "steer")}`)
-      const row: InboxRow = {
-        id: typeof input.body.id === "string" ? input.body.id : `inb_mock_${sequence}`,
-        sessionID: input.sessionID,
-        timeCreated: Date.now(),
-        type: "user",
-        payload: {
-          text: typeof input.body.text === "string" ? input.body.text : "",
-          ...(input.body.metadata === undefined ? {} : { metadata: input.body.metadata as Record<string, unknown> }),
-        },
-        delivery: input.body.delivery === "queue" ? "queue" : "steer",
-      }
-      rows.push(row)
-      emit("session.inbox.enqueued", {
-        sessionID: input.sessionID,
-        inboxID: row.id,
-        item: { type: "user", payload: row.payload, delivery: row.delivery },
-      })
-    },
-    onInboxChange: (input: { sessionID: string; inboxID: string; action: "cancel" | "steer" }) => {
-      changes.push({ inboxID: input.inboxID, action: input.action })
-      log.push(`${input.action}:${input.inboxID}`)
-      const index = rows.findIndex((row) => row.id === input.inboxID)
-      const row = rows[index]
-      if (!row) return
-      if (input.action === "cancel") {
-        rows.splice(index, 1)
-        emit("session.inbox.cancelled", { sessionID: input.sessionID, inboxID: input.inboxID })
-        return
-      }
-      row.delivery = "steer"
-      emit("session.inbox.delivery.changed", {
-        sessionID: input.sessionID,
-        inboxID: input.inboxID,
-        delivery: "steer",
-      })
-    },
-  }
-}
-
-async function openSession(page: Page, mock: ReturnType<typeof createQueueMock>, followUpBehavior?: "queue" | "steer") {
-  if (followUpBehavior) {
-    await page.addInitScript(
-      (behavior) => localStorage.setItem("settings.v3", JSON.stringify({ general: { followUpBehavior: behavior } })),
-      followUpBehavior,
-    )
-  }
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      worktree: directory,
-      vcs: "git",
-      name: "session-queue-regression",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { "queue-model": { id: "queue-model", name: "Queue Model", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "queue-model" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        slug: "session-queue-regression",
-        projectID,
-        directory,
-        title: "Session queue regression",
-        version: "dev",
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    pageMessages: () => ({ items: [] }),
-    sessionStatus: () => ({ [sessionID]: { type: "running" } }),
-    inbox: () => mock.rows.map((row) => ({ ...row, payload: { ...row.payload } })),
-    onPrompt: mock.onPrompt,
-    onInboxChange: mock.onInboxChange,
-    events: mock.events,
-  })
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  const composer = page.locator('[data-component="composer"]')
-  await expectAppVisible(composer)
-  return {
-    composer,
-    input: composer.locator('[data-component="composer-editor"]'),
-    rows: page.locator('[data-component="session-queue-row"]'),
-  }
-}
-
-test("follow-up preference controls Enter while Mod+Enter uses the alternate delivery", async ({ page }) => {
-  const mock = createQueueMock([])
-  const view = await openSession(page, mock, "queue")
-
-  await view.input.fill("queue this follow-up")
-  await expect(view.composer.locator('[data-action="composer-alternate-delivery"]')).toContainText("Steer")
-  await view.input.press("Enter")
-  await expect(view.rows.getByText("queue this follow-up", { exact: true })).toBeVisible()
-
-  await view.input.fill("steer this correction")
-  await view.input.press("ControlOrMeta+Enter")
-  await expect.poll(() => mock.prompts.map((prompt) => prompt.delivery)).toEqual(["queue", "steer"])
-  await expect(view.input).toHaveText("")
-})
-
-test("dragging reorders queued prompts", async ({ page }) => {
-  const mock = createQueueMock(["first queued prompt", "second queued prompt", "third queued prompt"])
-  const view = await openSession(page, mock)
-  await expect(view.rows).toHaveCount(3)
-
-  const first = view.rows.filter({ hasText: "first queued prompt" })
-  const third = view.rows.filter({ hasText: "third queued prompt" })
-  await first.getByRole("button", { name: "Reorder queued prompt" }).hover()
-  await page.mouse.down()
-  const target = await third.boundingBox()
-  if (!target) throw new Error("The target queue row is not visible")
-  await page.mouse.move(target.x + target.width / 2, target.y + target.height / 2, { steps: 10 })
-  await page.mouse.up()
-
-  await expect(view.rows.locator('[data-action="session-queue-edit"]')).toHaveText([
-    "second queued prompt",
-    "third queued prompt",
-    "first queued prompt",
-  ])
-  expect(mock.prompts.map((prompt) => prompt.text)).toEqual([
-    "second queued prompt",
-    "third queued prompt",
-    "first queued prompt",
-  ])
-  expect(mock.changes).toEqual([
-    { inboxID: "inb_seed_1", action: "cancel" },
-    { inboxID: "inb_seed_2", action: "cancel" },
-    { inboxID: "inb_seed_3", action: "cancel" },
-  ])
-})
-
-test("editing restores the existing draft and replaces only the original queue position", async ({ page }) => {
-  const mock = createQueueMock(["first queued prompt", "tighten the error copy", "third queued prompt"])
-  const view = await openSession(page, mock)
-  const original = view.rows.getByText("tighten the error copy", { exact: true })
-  await expect(original).toBeVisible()
-
-  await view.input.fill("my in-progress draft")
-  await original.click()
-  await expect(view.input).toHaveText("tighten the error copy")
-  await view.input.press("Escape")
-  await expect(view.input).toHaveText("my in-progress draft")
-
-  await original.click()
-  await expect(view.input).toHaveText("tighten the error copy")
-  await view.input.fill("tighten the error copy and add a retry hint")
-  await view.input.press("Enter")
-
-  await expect(view.rows.locator('[data-action="session-queue-edit"]')).toHaveText([
-    "first queued prompt",
-    "tighten the error copy and add a retry hint",
-    "third queued prompt",
-  ])
-  await expect(view.input).toHaveText("my in-progress draft")
-  expect(mock.prompts.map((prompt) => prompt.text)).toEqual([
-    "tighten the error copy and add a retry hint",
-    "tighten the error copy and add a retry hint",
-    "third queued prompt",
-  ])
-  expect(mock.prompts.every((prompt) => prompt.delivery === "queue" && prompt.resume === false)).toBe(true)
-  expect(mock.changes.map((change) => change.action)).toEqual(["cancel", "cancel", "cancel"])
-  expect(mock.log[0]).toBe("prompt:queue")
-})
@@ -139,7 +139,7 @@ test.describe("regression: session timeline local row state", () => {
    expect(siblingProbe).toEqual({
      fileMarker: "before",
      frameMarker: "before",
-      rowKey: `assistant-part:file:part:${assistantMessageID}:${editPartID}`,
+      rowKey: `assistant-part:part:${assistantMessageID}:${editPartID}`,
      rowMarker: "before",
      shadowRoots: 0,
      toolMarker: "before",
@@ -59,12 +59,12 @@ test("transitions a streaming shell from writing through command execution", asy
  await expect(tool.locator('[data-slot="collapsible-trigger"]')).toHaveCSS("height", "28px")
  await expect(tool.locator('[data-component="tool-trigger"]')).toHaveCSS("gap", "6px")
  await expect(title).toHaveCSS("font-size", "13px")
-  await expect(title).toHaveCSS("font-family", /^Inter,/)
+  await expect(title).toHaveCSS("font-family", "Inter, sans-serif")
  await expect(title).toHaveCSS("font-weight", "530")
  await expect(title).toHaveCSS("line-height", "16px")
  await expect(title).toHaveCSS("color", "rgb(22, 22, 22)")
  await expect(subtitle).toHaveCSS("font-size", "13px")
-  await expect(subtitle).toHaveCSS("font-family", /^Inter,/)
+  await expect(subtitle).toHaveCSS("font-family", "Inter, sans-serif")
  await expect(subtitle).toHaveCSS("font-weight", "440")
  await expect(subtitle).toHaveCSS("line-height", "16px")
  await expect(subtitle).toHaveCSS("color", "rgb(92, 92, 92)")
@@ -250,43 +250,6 @@ test.describe("session timeline projection", () => {
    expect(rows).toEqual(["AssistantPart", "TurnDivider", "AssistantPart"])
  })

-  test("renders aliased and long custom model notices", async ({ page }) => {
-    const shortName = "GPT-5.4 nano"
-    const longName = "Company Gateway Extra Long Context Model for Narrow Timeline Layouts"
-    await setupTimeline(page, {
-      viewport: { width: 420, height: 700 },
-      sessionMessages: [
-        {
-          id: "msg_model_fast_nano",
-          type: "model-switched",
-          time: { created: 1700000000000 },
-          model: { providerID: "company-gateway", id: "fast-nano", variant: "xhigh" },
-        },
-        {
-          id: "msg_model_long_context",
-          type: "model-switched",
-          time: { created: 1700000001000 },
-          model: { providerID: "company-gateway", id: "long-context" },
-        },
-        userMessage(),
-        assistantMessage(),
-      ],
-    })
-
-    const shortNotice = page.locator('[data-slot="session-timeline-notice"]').filter({ hasText: shortName })
-    const longNotice = page.locator('[data-slot="session-timeline-notice"]').filter({ hasText: longName })
-    await expect(shortNotice).toBeVisible()
-    await expect(shortNotice.getByText(`Switched to ${shortName}`, { exact: true })).toBeVisible()
-    await expect(shortNotice.locator('[data-slot="session-timeline-notice-variant"]')).toHaveText("xhigh")
-    await expect(page.getByText("fast-nano", { exact: true })).toHaveCount(0)
-    await expect(shortNotice.locator('[data-component="provider-icon"]')).toBeVisible()
-    await expect(longNotice).toBeVisible()
-    await expect(longNotice.locator('[data-component="provider-icon"]')).toBeVisible()
-    await expect(longNotice.locator('[data-slot="session-timeline-notice-variant"]')).toHaveCount(0)
-    await expect(longNotice.locator("[title]")).toHaveAttribute("title", `Switched to ${longName}`)
-    await expect.poll(() => longNotice.evaluate((element) => element.scrollWidth <= element.clientWidth)).toBe(true)
-  })
-
  test("renders user image, file attachment, file reference, and agent reference", async ({ page }) => {
    const text = "Use @explore with @src/a.ts and inspect the attachments"
    const parts: PartSeed<"user">[] = [
@@ -64,76 +64,6 @@ test("transitions shell and question through running error outcomes", async ({ p
  await expect(page.locator(`[data-timeline-part-id="${questionID}"]`)).toContainText(/dismissed/i)
 })

-test("preserves surviving grouped patch state when its first patch fails", async ({ page }) => {
-  const failed = "prt_grouped_patch_failed"
-  const surviving = "prt_grouped_patch_surviving"
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage(
-        [
-          toolPart(failed, "patch", "running", { patchText: "Update src/failed.ts" }),
-          toolPart(
-            surviving,
-            "patch",
-            "running",
-            { patchText: "Update src/surviving.ts" },
-            {
-              metadata: {
-                files: [
-                  {
-                    file: "src/surviving.ts",
-                    status: "modified",
-                    patch: "@@ -1 +1 @@\n-export const value = 1\n+export const value = 2",
-                    additions: 1,
-                    deletions: 1,
-                  },
-                ],
-              },
-            },
-          ),
-        ],
-        { completed: false },
-      ),
-    ],
-  })
-
-  const group = page.locator(`[data-timeline-part-ids="${failed},${surviving}"]`)
-  const file = group.locator('[data-scope="apply-patch"] button')
-  await expect(file).toBeVisible()
-  await file.click()
-  await expect(file).toHaveAttribute("aria-expanded", "true")
-  await group.evaluate((element) => {
-    const row = element.closest<HTMLElement>("[data-timeline-key]")
-    if (row) row.dataset.groupIdentity = "preserved"
-  })
-
-  await timeline.send(
-    partUpdated(
-      toolPart(failed, "patch", "error", { patchText: "Update src/failed.ts" }, { error: "Patch failed visibly" }),
-    ),
-  )
-
-  const failedRow = page.locator("[data-timeline-key]", {
-    has: page.locator(`[data-timeline-part-id="${failed}"]`),
-  })
-  const survivingRow = page.locator("[data-timeline-key]", {
-    has: page.locator(`[data-timeline-part-id="${surviving}"]`),
-  })
-  await expect(failedRow).toHaveAttribute("data-timeline-key", /^assistant-part:part:/)
-  await expect(survivingRow).toHaveAttribute("data-timeline-key", /^assistant-part:file:/)
-  await expect(failedRow.getByText("Patch failed visibly")).toBeVisible()
-  await expect(survivingRow).toHaveAttribute("data-group-identity", "preserved")
-  await expect(survivingRow.locator('[data-scope="apply-patch"] button')).toHaveAttribute("aria-expanded", "true")
-  await expect
-    .poll(async () => {
-      const previous = await failedRow.boundingBox()
-      const next = await survivingRow.boundingBox()
-      return previous && next ? next.y - (previous.y + previous.height) : Number.NEGATIVE_INFINITY
-    })
-    .toBeGreaterThanOrEqual(-0.5)
-})
-
 test("labels all web search provider variants", async ({ page }) => {
  const parts = [
    toolPart(
@@ -68,41 +68,6 @@ test("keyboard navigation follows the visible tab order", async ({ page }) => {
  await expect(page).toHaveURL(new RegExp(`${hrefC.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
 })

-test("cramped tabs only show the close button for the active tab", async ({ page }) => {
-  await page.setViewportSize({ width: 360, height: 720 })
-  await mockServer(page)
-  await page.addInitScript(
-    ({ server, sessionA, sessionB, sessionC }) => {
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([
-          { type: "session", server, sessionId: sessionA },
-          { type: "session", server, sessionId: sessionB },
-          { type: "session", server, sessionId: sessionC },
-        ]),
-      )
-    },
-    { server, sessionA: sessionA.id, sessionB: sessionB.id, sessionC: sessionC.id },
-  )
-
-  const hrefA = `/server/${base64Encode(server)}/session/${sessionA.id}`
-  const hrefB = `/server/${base64Encode(server)}/session/${sessionB.id}`
-  await page.goto(hrefA)
-
-  const tabA = page.locator(`[data-titlebar-tab-slot]:has(a[href="${hrefA}"])`)
-  const tabB = page.locator(`[data-titlebar-tab-slot]:has(a[href="${hrefB}"])`)
-  await expect(tabA).toHaveAttribute("data-active", "true")
-  await expect(tabB).toBeVisible()
-  await expect(tabA.locator('[data-slot="tab-close"]')).toBeVisible()
-  await expect(tabB.locator('[data-slot="tab-close"]')).toBeHidden()
-
-  await tabB.locator(`a[href="${hrefB}"]`).click()
-
-  await expect(page).toHaveURL(new RegExp(`${hrefB.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}$`))
-  await expect(tabA.locator('[data-slot="tab-close"]')).toBeHidden()
-  await expect(tabB.locator('[data-slot="tab-close"]')).toBeVisible()
-})
-
 function session(id: string, title: string) {
  return {
    id,
@@ -126,8 +126,6 @@ test("routes typing to the composer unless the open terminal is focused", async

  const composer = page.locator('[data-component="composer-editor"]')
  const terminal = page.locator('[data-component="terminal"]')
-  await composer.click()
-  await expect(composer).toBeFocused()
  await page.keyboard.press("Control+Backquote")
  await expect(terminal).toBeVisible()
  await expect.poll(() => terminal.evaluate((element) => element.contains(document.activeElement))).toBe(true)
@@ -100,7 +100,6 @@ const Group = HttpApiGroup.make("mock")
  .add(HttpApiEndpoint.get("formRequests", "/api/form/request", { success: Json }))
  .add(HttpApiEndpoint.get("vcs", "/api/vcs", { success: Json }))
  .add(HttpApiEndpoint.get("vcsStatus", "/api/vcs/status", { success: Json }))
-  .add(HttpApiEndpoint.get("vcsBranches", "/api/vcs/branches", { success: Json }))
  .add(HttpApiEndpoint.get("vcsDiff", "/api/vcs/diff", { success: Json }))
  .add(HttpApiEndpoint.get("fsList", "/api/fs/list", { query: Query, success: Json }))
  .add(
@@ -175,39 +174,6 @@ const Group = HttpApiGroup.make("mock")
      success: Json,
    }),
  )
-  .add(
-    HttpApiEndpoint.post("sessionPrompt", "/api/session/:sessionID/prompt", {
-      params: SessionParams,
-      payload: JsonPayload,
-      success: Json,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.post("sessionSwitchAgent", "/api/session/:sessionID/agent", {
-      params: SessionParams,
-      payload: JsonPayload,
-      success: NoContent,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.post("sessionSwitchModel", "/api/session/:sessionID/model", {
-      params: SessionParams,
-      payload: JsonPayload,
-      success: NoContent,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.delete("sessionInboxCancel", "/api/session/:sessionID/inbox/:inboxID", {
-      params: { ...SessionParams, inboxID: Schema.String },
-      success: NoContent,
-    }),
-  )
-  .add(
-    HttpApiEndpoint.post("sessionInboxSteer", "/api/session/:sessionID/inbox/:inboxID/steer", {
-      params: { ...SessionParams, inboxID: Schema.String },
-      success: NoContent,
-    }),
-  )
  .add(
    HttpApiEndpoint.get("sessionPermission", "/api/session/:sessionID/permission", {
      params: SessionParams,
@@ -21,7 +21,6 @@ export interface MockServerConfig {
    cursor?: string
  }
  vcsDiff?: unknown[]
-  vcsBranches?: string[]
  messageDelay?: number
  beforeMessagesResponse?: (input: { sessionID: string; before?: string }) => Promise<void>
  onMessages?: (input: { sessionID: string; before?: string; phase: "start" | "end" }) => void
@@ -36,9 +35,6 @@ export interface MockServerConfig {
  fileContent?: (path: string) => unknown | Promise<unknown>
  findFiles?: (input: { query: string; dirs?: string; limit?: number }) => unknown
  sessionStatus?: Record<string, unknown> | (() => Record<string, unknown>)
-  inbox?: unknown[] | (() => unknown[])
-  onPrompt?: (input: { sessionID: string; body: Record<string, unknown> }) => void
-  onInboxChange?: (input: { sessionID: string; inboxID: string; action: "cancel" | "steer" }) => void
 }

 type MockStreamWindow = Window & {
@@ -297,7 +293,6 @@ function mockHandlers(config: MockServerConfig, state: { cursors: Map<string, st
        vcs: () =>
          Effect.succeed({ location: location(config), data: { branch: { current: "main", default: "main" } } }),
        vcsStatus: () => Effect.succeed({ location: location(config), data: [] }),
-        vcsBranches: () => Effect.succeed({ location: location(config), data: config.vcsBranches ?? ["main"] }),
        vcsDiff: () => Effect.succeed({ location: location(config), data: config.vcsDiff ?? [] }),
        fsList: (ctx) =>
          Effect.promise(() => Promise.resolve(config.fileList?.(ctx.query.path ?? ""))).pipe(
@@ -402,39 +397,7 @@ function mockHandlers(config: MockServerConfig, state: { cursors: Map<string, st
        sessionFormReply: () => noContent,
        sessionFormCancel: () => noContent,
        sessionBackground: () => noContent,
-        sessionInbox: () =>
-          Effect.sync(() => ({ data: typeof config.inbox === "function" ? config.inbox() : (config.inbox ?? []) })),
-        sessionPrompt: (ctx) =>
-          Effect.sync(() => {
-            const body = record(ctx.payload) ? ctx.payload : {}
-            config.onPrompt?.({ sessionID: ctx.params.sessionID, body })
-            return {
-              data: {
-                id: typeof body.id === "string" ? body.id : `inb_mock_${Date.now()}`,
-                sessionID: ctx.params.sessionID,
-                timeCreated: Date.now(),
-                type: "user",
-                payload: {
-                  text: typeof body.text === "string" ? body.text : "",
-                  ...(body.files === undefined ? {} : { files: body.files }),
-                  ...(body.agents === undefined ? {} : { agents: body.agents }),
-                  ...(body.skills === undefined ? {} : { skills: body.skills }),
-                  ...(body.metadata === undefined ? {} : { metadata: body.metadata }),
-                },
-                delivery: body.delivery === "queue" ? "queue" : "steer",
-              },
-            }
-          }),
-        sessionInboxCancel: (ctx) =>
-          Effect.sync(() =>
-            config.onInboxChange?.({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID, action: "cancel" }),
-          ).pipe(Effect.andThen(noContent)),
-        sessionInboxSteer: (ctx) =>
-          Effect.sync(() =>
-            config.onInboxChange?.({ sessionID: ctx.params.sessionID, inboxID: ctx.params.inboxID, action: "steer" }),
-          ).pipe(Effect.andThen(noContent)),
-        sessionSwitchAgent: () => noContent,
-        sessionSwitchModel: () => noContent,
+        sessionInbox: () => Effect.succeed({ data: [] }),
        sessionPermission: (ctx) => {
          const permissions =
            typeof config.permissions === "function" ? config.permissions() : (config.permissions ?? [])
@@ -538,7 +501,7 @@ function currentModels(value: unknown) {
        return [
          {
            id: model.id,
-            modelID: record(model.api) && typeof model.api.id === "string" ? model.api.id : model.id,
+            modelID: model.id,
            providerID: provider.id,
            name: model.name,
            capabilities: { tools: true, input: ["text"], output: ["text"] },
@@ -52,12 +52,12 @@
    "vite-plugin-solid": "2.11.14"
  },
  "dependencies": {
+    "@ibm/plex": "6.4.1",
    "@corvu/drawer": "catalog:",
    "@dnd-kit/abstract": "0.5.0",
    "@dnd-kit/dom": "0.5.0",
    "@dnd-kit/helpers": "0.5.0",
    "@dnd-kit/solid": "0.5.0",
-    "@ibm/plex": "6.4.1",
    "@kobalte/core": "catalog:",
    "@opencode-ai/client": "workspace:*",
    "@opencode-ai/schema": "workspace:*",
@@ -69,7 +69,6 @@
    "@solid-primitives/event-bus": "1.1.2",
    "@solid-primitives/event-listener": "2.4.5",
    "@solid-primitives/i18n": "2.2.1",
-    "@solid-primitives/keyed": "1.5.3",
    "@solid-primitives/media": "2.3.3",
    "@solid-primitives/resize-observer": "2.1.5",
    "@solid-primitives/scheduled": "1.5.3",
@@ -105,16 +105,14 @@ export function AppInterface(props: {
  // providers beneath it.
  const Root = (rootProps: ParentProps) => (
    <TabsProvider>
-      <GlobalProvider>
-        <BodyTypography />
-        <CommandProvider>
-          <DesktopCommands />
-          <HighlightsProvider>
-            {props.children}
-            {rootProps.children}
-          </HighlightsProvider>
-        </CommandProvider>
-      </GlobalProvider>
+      <BodyTypography />
+      <CommandProvider>
+        <DesktopCommands />
+        <HighlightsProvider>
+          {props.children}
+          {rootProps.children}
+        </HighlightsProvider>
+      </CommandProvider>
    </TabsProvider>
  )

@@ -125,9 +123,11 @@ export function AppInterface(props: {
      servers={props.servers}
    >
      <SettingsProvider>
-        <Dynamic component={props.router ?? Router} root={Root}>
-          <AppRoutes />
-        </Dynamic>
+        <GlobalProvider>
+          <Dynamic component={props.router ?? Router} root={Root}>
+            <AppRoutes />
+          </Dynamic>
+        </GlobalProvider>
      </SettingsProvider>
    </ServersProvider>
  )
@@ -39,26 +39,6 @@ export type ComposerSelection = {
  variant?: string
 }

-export type ComposerDelivery = "steer" | "queue"
-
-// Contract between the composer and the session prompt queue. The session
-// owns the queue (pending inbox items); the composer only asks which delivery
-// a submit should use and delegates edit confirmation while a queued prompt
-// is loaded in the editor.
-export type ComposerQueue = {
-  count: Accessor<number>
-  // Delivery a plain submit uses right now.
-  delivery: Accessor<ComposerDelivery>
-  // Delivery offered on Mod+Enter and the toolbar hint button; undefined hides the hint.
-  alternate: Accessor<ComposerDelivery | undefined>
-  // Inbox ID of the queued prompt currently loaded in the composer for editing.
-  editing: Accessor<string | undefined>
-  confirmEdit: (delivery: ComposerDelivery) => void
-  cancelEdit: () => void
-  // Loads the first queued prompt into the composer. Returns false when the queue is empty.
-  editFirst: () => boolean
-}
-
 export type ComposerSession = {
  id: string
  directory: string
@@ -8,7 +8,7 @@ import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { ComposerEditor } from "./editor/editor"
 import { ModelSelectorPopover } from "@/providers/models/select-dialog"
 import { DialogSelectModelUnpaid } from "@/providers/models/unpaid"
-import { formatKeybind, useCommand } from "@/shell/commands/command"
+import { useCommand } from "@/shell/commands/command"
 import { useLanguage } from "@/runtime/i18n/language"
 import type { ComposerModel } from "./model"

@@ -32,7 +32,6 @@ export function Composer(props: {
        modelControlsVisible={!props.model.model.loading}
        attachKeybind={command.keybindParts("file.attach")}
        attachShortcut={command.keybind("file.attach")}
-        alternateKeybind={[formatKeybind("mod", language.t), formatKeybind("enter", language.t)]}
        modelControl={
          <ComposerModelControl
            loading={props.model.model.loading}
@@ -1,8 +1,7 @@
-import { createEffect, createMemo, createSignal, For, Show, type JSX } from "solid-js"
+import { createEffect, createMemo, For, Show, type JSX } from "solid-js"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { createAnimatedPresence } from "@/runtime/animated-presence"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { useI18n } from "@opencode-ai/ui/context/i18n"
 import { Button } from "@opencode-ai/ui/button"
@@ -46,7 +45,6 @@ export type ComposerEditorProps = {
  modelControlsVisible?: boolean
  attachKeybind?: string[]
  attachShortcut?: string
-  alternateKeybind?: string[]
 }

 export function ComposerEditor(props: ComposerEditorProps) {
@@ -179,15 +177,10 @@ export function ComposerEditor(props: ComposerEditorProps) {
            }}
            onKeyDown={(event) => {
              if (props.controller.onKeyDown(event)) return
-              const mod = event.metaKey || event.ctrlKey
-              if (mod && event.key === "ArrowUp" && !event.shiftKey && !event.altKey) {
-                if (view.submit.queue?.editFirst()) event.preventDefault()
-                return
-              }
              if (event.key === "Enter" && !event.shiftKey && !event.isComposing) {
                event.preventDefault()
                if (event.repeat) return
-                props.controller.submit(mod ? { alternate: true } : undefined)
+                props.controller.submit()
              }
            }}
            onKeyUp={updateCursor}
@@ -255,12 +248,6 @@ export function ComposerEditor(props: ComposerEditorProps) {
              </Show>
            </Show>
          </div>
-          <Show when={state.mode === "normal"}>
-            <ComposerEditorAlternateDelivery
-              controller={props.controller}
-              keybind={props.alternateKeybind ?? ["Mod", "Enter"]}
-            />
-          </Show>
          <ComposerEditorSubmitButton
            mode={state.mode}
            stopping={view.submit.stopping()}
@@ -268,7 +255,7 @@ export function ComposerEditor(props: ComposerEditorProps) {
            accent={props.accentSubmit}
            sendLabel={i18n.t("ui.promptInput.send")}
            stopLabel={i18n.t("ui.promptInput.stop")}
-            onSubmit={() => props.controller.submit()}
+            onSubmit={props.controller.submit}
            onStop={props.controller.stop}
          />
        </div>
@@ -704,49 +691,6 @@ export function ComposerEditorPopover(props: {
  )
 }

-// "Steer ⌘⏎" / "Queue ⌘⏎" hint next to the submit button: submits with the
-// delivery opposite to what plain Enter does. Visible only while the queue
-// exposes an alternate (turn running and composer holding a value), so it
-// disappears on its own when the current turn ends.
-function ComposerEditorAlternateDelivery(props: { controller: ComposerEditorModel; keybind: string[] }) {
-  const i18n = useI18n()
-  const view = props.controller.view
-  const action = createMemo(() => {
-    const queue = view.submit.queue
-    if (!queue || !props.controller.canSubmit()) return undefined
-    if (queue.editing()) return "steer" as const
-    return queue.alternate()
-  })
-  const [button, setButton] = createSignal<HTMLButtonElement>()
-  const presence = createAnimatedPresence(action, () => button() ?? null)
-  return (
-    <Show when={presence.present() && presence.value()} keyed>
-      {(delivery) => (
-        <Tooltip placement="top" inactive={delivery !== "steer"} value={i18n.t("ui.promptInput.steerHint")}>
-          <Button
-            ref={setButton}
-            data-action="composer-alternate-delivery"
-            type="button"
-            variant="ghost-muted"
-            size="small"
-            class="me-3 gap-1.5 px-1.5 text-v2-text-text-muted ![font-weight:530] duration-150 motion-reduce:animate-none"
-            classList={{
-              "animate-in fade-in": presence.animate() && presence.show(),
-              "animate-out fade-out fill-mode-forwards": presence.animate() && !presence.show(),
-            }}
-            onClick={() => props.controller.submit({ alternate: true })}
-          >
-            {delivery === "steer" ? i18n.t("ui.promptInput.steer") : i18n.t("ui.promptInput.queue")}
-            <span class="hidden sm:block">
-              <Keybind keys={props.keybind} variant="neutral" />
-            </span>
-          </Button>
-        </Tooltip>
-      )}
-    </Show>
-  )
-}
-
 export function ComposerEditorSubmitButton(props: {
  mode: ComposerMode
  stopping: boolean
@@ -19,7 +19,6 @@ import {
  type ComposerInteractionEvent,
 } from "../suggestions/machine"
 import { clonePrompt, promptLength } from "../prompt-parts"
-import type { ComposerQueue } from "../adapter"

 export type ComposerSelectControl = {
  options: Accessor<ComposerOption[]>
@@ -38,8 +37,7 @@ export type ComposerEditorView = {
  submit: {
    stopping: Accessor<boolean>
    working?: Accessor<boolean>
-    queue?: ComposerQueue
-    onSubmit: (options?: { alternate?: boolean }) => void
+    onSubmit: () => void
    onStop: () => void
  }
  shell?: {
@@ -214,11 +212,6 @@ export function createComposerEditor(input: {
      )
    }
    if (handled) return true
-    if (event.key === "Escape" && input.view.submit.queue?.editing()) {
-      event.preventDefault()
-      input.view.submit.queue.cancelEdit()
-      return true
-    }
    const stop =
      input.view.submit.working?.() &&
      ((event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey && event.key.toLowerCase() === "g") ||
@@ -361,8 +354,8 @@ export function createComposerEditor(input: {
    openShell() {
      dispatch({ type: "mode.shell" })
    },
-    submit(options?: { alternate?: boolean }) {
-      input.view.submit.onSubmit(options)
+    submit() {
+      input.view.submit.onSubmit()
      dispatch({ type: "popover.close" })
    },
    stop() {
@@ -16,7 +16,7 @@ import { createSessionTabs } from "@/session/helpers"
 import { showToast } from "@/shell/notifications/toast"
 import { formatServerError } from "@/runtime/server/errors"
 import { Skill } from "@opencode-ai/schema/skill"
-import type { ComposerAdapter, ComposerControls, ComposerQueue } from "./adapter"
+import type { ComposerAdapter, ComposerControls } from "./adapter"
 import type { ImageAttachmentPart } from "./state"
 import type { PromptHistoryComment } from "./history/entry"
 import { createComposerHistory } from "./history/store"
@@ -27,7 +27,7 @@ export type ComposerModel = ComposerEditorModel & {
  readonly model: ComposerControls["model"]
 }

-export function createComposerModel(adapter: ComposerAdapter, options?: { queue?: ComposerQueue }): ComposerModel {
+export function createComposerModel(adapter: ComposerAdapter): ComposerModel {
  const sdk = useWorkspaceLocation()
  const data = useData()
  const files = useFile()
@@ -80,11 +80,7 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
  })
  const stopping = createMemo(() => adapter.working() && blank())
  const placeholder = () =>
-    composerPlaceholder(
-      mode(),
-      (key, params) => language.t(key as Parameters<typeof language.t>[0], params as never),
-      adapter.working() || (options?.queue?.count() ?? 0) > 0,
-    )
+    composerPlaceholder(mode(), (key, params) => language.t(key as Parameters<typeof language.t>[0], params as never))

  const historyComments = () => {
    const byID = new Map(comments.all().map((item) => [`${item.file}\n${item.id}`, item] as const))
@@ -257,11 +253,6 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
    resetHistory: () => controller.resetHistory(),
    setMode: (next) => controller.dispatch({ type: next === "shell" ? "mode.shell" : "mode.normal" }),
    closePopover: () => controller.dispatch({ type: "popover.close" }),
-    delivery: (alternate) => {
-      const queue = options?.queue
-      if (!queue) return "steer"
-      return (alternate ? queue.alternate() : queue.delivery()) ?? "steer"
-    },
    notify: {
      missingSelection: () =>
        showToast({
@@ -369,18 +360,7 @@ export function createComposerModel(adapter: ComposerAdapter, options?: { queue?
      submit: {
        stopping,
        working: adapter.working,
-        queue: options?.queue,
-        onSubmit: (submitOptions) => {
-          const queue = options?.queue
-          // Confirming an edit re-admits the queued prompt instead of sending
-          // the composer value as a new prompt. Enter keeps it queued in
-          // place; the alternate action sends it as a steer.
-          if (queue?.editing()) {
-            queue.confirmEdit(submitOptions?.alternate ? "steer" : "queue")
-            return
-          }
-          void submission.submit(new Event("submit"), submitOptions)
-        },
+        onSubmit: () => void submission.submit(new Event("submit")),
        onStop: () => void submission.stop(),
      },
    },
@@ -12,12 +12,4 @@ describe("Composer placeholder", () => {
  test("uses the command and context hint in normal mode", () => {
    expect(composerPlaceholder("normal", t)).toBe("ui.promptInput.placeholder.normal/@")
  })
-
-  test("uses the follow-up copy while a turn runs or prompts are queued", () => {
-    expect(composerPlaceholder("normal", t, true)).toBe("ui.promptInput.placeholder.followUp/@")
-  })
-
-  test("keeps the shell placeholder while a turn runs", () => {
-    expect(composerPlaceholder("shell", t, true)).toBe("prompt.placeholder.shell:git status")
-  })
 })
@@ -1,9 +1,7 @@
 export function composerPlaceholder(
  mode: "normal" | "shell",
  t: (key: string, params?: Record<string, string>) => string,
-  followUp?: boolean,
 ) {
  if (mode === "shell") return t("prompt.placeholder.shell", { example: "git status" })
-  if (followUp) return t("ui.promptInput.placeholder.followUp", { slash: "/", at: "@" })
  return t("ui.promptInput.placeholder.normal", { slash: "/", at: "@" })
 }
@@ -5,7 +5,7 @@ import type { Accessor } from "solid-js"
 import type { PromptHistoryComment } from "./history/entry"
 import type { ImageAttachmentPart, Prompt } from "./state"
 import { clonePrompt, promptLength } from "./prompt-parts"
-import type { ComposerAdapter, ComposerDelivery, ComposerSelection, ComposerSession } from "./adapter"
+import type { ComposerAdapter, ComposerSelection, ComposerSession } from "./adapter"
 import { createComposerSubmission } from "./submission-state"
 import { buildPromptRequest } from "./request"
 import { setCursorPosition } from "./editor/dom"
@@ -21,7 +21,7 @@ type ComposerSubmission = {
  text: string
  images: ImageAttachmentPart[]
  selection: ComposerSelection
-  delivery: ComposerDelivery
+  delivery: "steer"
 }

 type ComposerSubmitInput = {
@@ -33,7 +33,6 @@ type ComposerSubmitInput = {
  resetHistory: () => void
  setMode: (mode: "normal" | "shell") => void
  closePopover: () => void
-  delivery?: (alternate: boolean) => ComposerDelivery
  notify: {
    missingSelection: () => void
    failed: (kind: "shell" | "command" | "prompt", error: unknown) => void
@@ -46,7 +45,7 @@ type ComposerSubmitInput = {
 }

 export function createComposerSubmit(input: ComposerSubmitInput) {
-  const submit = async (event: globalThis.Event, options?: { alternate?: boolean }) => {
+  const submit = async (event: globalThis.Event) => {
    event.preventDefault()

    const submission = createComposerSubmission({
@@ -57,7 +56,7 @@ export function createComposerSubmit(input: ComposerSubmitInput) {
        selection: item.selection ? { ...item.selection } : undefined,
      })),
    })
-    const value = readSubmission(input, submission.prompt, submission.context, options?.alternate ?? false)
+    const value = readSubmission(input, submission.prompt, submission.context)
    if (!value) {
      if (input.adapter.working() && input.adapter.kind === "active-session") void input.adapter.interrupt()
      return
@@ -114,10 +113,7 @@ export function createComposerSubmit(input: ComposerSubmitInput) {

      if (command) {
        clearSubmission(input, submission)
-        // Commands always steer: the server applies a command's configured
-        // agent and model immediately at admission, so queueing one would
-        // reconfigure the turn it is supposed to wait behind.
-        void sendCommand(session, { ...value, delivery: "steer" }, command).catch((error) =>
+        void sendCommand(session, value, command).catch((error) =>
          failSubmission(input, session, "command", error, restore, value.id),
        )
        return
@@ -161,7 +157,6 @@ function readSubmission(
  input: ComposerSubmitInput,
  prompt: Prompt,
  context: ComposerSubmission["context"],
-  alternate: boolean,
 ): ComposerSubmission | undefined {
  const text = prompt.map((part) => ("content" in part ? part.content : "")).join("")
  const mode = input.mode()
@@ -200,7 +195,7 @@ function readSubmission(
      model: { modelID: model.id, providerID: model.provider.id },
      variant,
    },
-    delivery: input.delivery?.(alternate) ?? "steer",
+    delivery: "steer",
  }
 }

@@ -279,8 +274,15 @@ async function sendCommand(
  const request = await buildSubmissionRequest(session, value)
  await session.api.command({
    sessionID: session.id,
+    id: value.id,
    command: command.command,
-    text: command.arguments,
+    arguments: command.arguments,
+    agent: value.selection.agent,
+    model: {
+      id: value.selection.model.modelID,
+      providerID: value.selection.model.providerID,
+      variant: value.selection.variant,
+    },
    files: request.files.map((file) => ({ uri: file.uri, name: file.name, mention: file.mention })),
    agents: request.agents,
    skills: request.skills,
@@ -290,30 +292,23 @@ async function sendCommand(

 async function sendPrompt(session: ComposerSession, value: ComposerSubmission) {
  const request = await buildSubmissionRequest(session, value)
-  // Switching agent or model reconfigures the session immediately, and with it
-  // the remainder of a running turn. A steer targets that turn, so its
-  // selection applies now; a queued follow-up must not reconfigure the turn it
-  // waits behind, so it runs with the session selection at delivery time (the
-  // intended selection stays recorded in its metadata).
-  if (value.delivery === "steer") {
-    const current = session.current()
-    if (current?.agent !== value.selection.agent) {
-      await session.api.switchAgent({ sessionID: session.id, agent: value.selection.agent })
-    }
-    if (
-      current?.model?.providerID !== value.selection.model.providerID ||
-      current.model.id !== value.selection.model.modelID ||
-      (current.model.variant ?? "default") !== (value.selection.variant ?? "default")
-    ) {
-      await session.api.switchModel({
-        sessionID: session.id,
-        model: {
-          id: value.selection.model.modelID,
-          providerID: value.selection.model.providerID,
-          variant: value.selection.variant,
-        },
-      })
-    }
+  const current = session.current()
+  if (current?.agent !== value.selection.agent) {
+    await session.api.switchAgent({ sessionID: session.id, agent: value.selection.agent })
+  }
+  if (
+    current?.model?.providerID !== value.selection.model.providerID ||
+    current.model.id !== value.selection.model.modelID ||
+    (current.model.variant ?? "default") !== (value.selection.variant ?? "default")
+  ) {
+    await session.api.switchModel({
+      sessionID: session.id,
+      model: {
+        id: value.selection.model.modelID,
+        providerID: value.selection.model.providerID,
+        variant: value.selection.variant,
+      },
+    })
  }

  const admission = {
@@ -1,18 +1,19 @@
 import { useGlobal, useServerCtx } from "@/runtime/server/runtime"
 import { type HomeProjectSelection, useLayout } from "@/shell/state/layout"
-import { ServerConnection, useServers } from "@/runtime/server/registry"
+import { ServerConnection } from "@/runtime/server/registry"
 import { useTabs } from "@/shell/tabs/tabs"
 import { toggleHomeProjectSelection } from "@/shell/layout/helpers"
-import { createEffect, createMemo } from "solid-js"
+import { createEffect, createMemo, startTransition } from "solid-js"

 export function createHomeController() {
  const layout = useLayout()
  const global = useGlobal()
-  const servers = useServers()
  const tabs = useTabs()
  const selection = layout.home.selection
  const focusedServer = createMemo<ServerConnection.Any | undefined>(
-    () => servers.visible.find((conn) => ServerConnection.key(conn) === selection().server) ?? servers.visible[0],
+    () =>
+      global.servers.list().find((conn) => ServerConnection.key(conn) === selection().server) ??
+      global.servers.list()[0],
  )
  const focusedServerCtx = useServerCtx(focusedServer)
  const focusedSync = () => focusedServerCtx()?.sync
@@ -28,7 +29,7 @@ export function createHomeController() {
  )

  createEffect(() => {
-    const list = servers.visible
+    const list = global.servers.list()
    if (list.some((conn) => ServerConnection.key(conn) === selection().server)) return
    const conn = list[0]
    if (conn) setSelection({ server: ServerConnection.key(conn) })
@@ -49,10 +50,11 @@ export function createHomeController() {
    selection: {
      value: selection,
      set: setSelection,
-      focusServer: (conn: ServerConnection.Any) => setSelection({ server: ServerConnection.key(conn) }),
+      focusServer: (conn: ServerConnection.Any) =>
+        void startTransition(() => setSelection({ server: ServerConnection.key(conn) })),
    },
    server: {
-      list: () => servers.visible,
+      list: global.servers.list,
      health: (conn: ServerConnection.Any) => global.servers.health[ServerConnection.key(conn)],
      context: (conn: ServerConnection.Any) => global.ensureServerCtx(conn),
      focused: focusedServer,
@@ -61,8 +61,6 @@ export function createHomeProjectsController(home: HomeController) {
        serverManagement.defaults.set(conn ? ServerConnection.key(conn) : null),
      canRemove: (conn: ServerConnection.Any) => serverManagement.connection.canRemove(ServerConnection.key(conn)),
      remove: (conn: ServerConnection.Any) => serverManagement.connection.remove(ServerConnection.key(conn)),
-      canHide: (conn: ServerConnection.Any) => serverManagement.connection.canHide(ServerConnection.key(conn)),
-      hide: (conn: ServerConnection.Any) => serverManagement.connection.setHidden(ServerConnection.key(conn), true),
      edit: (conn: ServerConnection.Http) => {
        void import("@/servers/connect/dialog").then(({ DialogServer }) => {
          void dialog.show(() => <DialogServer mode="edit" server={conn} />)
@@ -26,8 +26,6 @@ export function HomeProjects(props: { projects: HomeProjectsController; scroll:
      onSetDefaultServer={props.projects.server.setDefault}
      canRemoveServer={props.projects.server.canRemove}
      onRemoveServer={props.projects.server.remove}
-      canHideServer={props.projects.server.canHide}
-      onHideServer={props.projects.server.hide}
      onMoveProject={props.projects.project.move}
      onSelectProject={props.projects.project.select}
      onAddProjects={props.projects.project.add}
@@ -49,8 +49,6 @@ export type HomeProjectsViewProps = {
  onSetDefaultServer: (server: ServerConnection.Any | undefined) => void
  canRemoveServer: (server: ServerConnection.Any) => boolean
  onRemoveServer: (server: ServerConnection.Any) => void
-  canHideServer: (server: ServerConnection.Any) => boolean
-  onHideServer: (server: ServerConnection.Any) => void
  onMoveProject: (server: ServerConnection.Any, worktree: string, index: number) => void
  onSelectProject: (server: ServerConnection.Any, directory: string) => void
  onAddProjects: (server: ServerConnection.Any, directories: string[]) => void
@@ -190,8 +188,6 @@ function HomeServerRow(props: {
  onSetDefaultServer: HomeProjectsViewProps["onSetDefaultServer"]
  canRemoveServer: HomeProjectsViewProps["canRemoveServer"]
  onRemoveServer: HomeProjectsViewProps["onRemoveServer"]
-  canHideServer: HomeProjectsViewProps["canHideServer"]
-  onHideServer: HomeProjectsViewProps["onHideServer"]
  onSetContextMenuOpen: HomeProjectsContextMenuProps["onSetContextMenuOpen"]
  onChooseProject: HomeProjectsViewProps["onChooseProject"]
  server: ServerConnection.Any
@@ -216,11 +212,11 @@ function HomeServerRow(props: {
      value={props.language.t("server.row.incompatible", { version: props.health?.version ?? "1" })}
    >
      <div class="group/server relative flex h-7 w-full min-w-0 items-center rounded-[6px]">
-        <HomeProjectNavButton
-          type="button"
-          class="pr-16"
-          classList={{ "opacity-60": !healthy() && !incompatible() }}
-          data-selected={props.selected ? "" : undefined}
+      <HomeProjectNavButton
+        type="button"
+        class="pr-16"
+        classList={{ "opacity-60": !healthy() && !incompatible() }}
+        data-selected={props.selected ? "" : undefined}
          disabled={!healthy()}
          onClick={() => props.onFocusServer(props.server)}
        >
@@ -288,12 +284,10 @@ function HomeServerRow(props: {
            canDefault={props.canDefaultServer}
            isDefault={props.defaultServerKey === ServerConnection.key(props.server)}
            canRemove={props.canRemoveServer(props.server)}
-            canHide={props.canHideServer(props.server)}
            onEdit={props.onEditServer}
            onSetDefault={() => props.onSetDefaultServer(props.server)}
            onRemoveDefault={() => props.onSetDefaultServer(undefined)}
            onRemove={() => props.onRemoveServer(props.server)}
-            onHide={() => props.onHideServer(props.server)}
            open={props.contextMenuOpen(contextMenuID())}
            onOpenChange={(open) => props.onSetContextMenuOpen(contextMenuID(), open)}
          />
@@ -1,11 +1,8 @@
 import type { SessionInfo } from "@opencode-ai/client/promise"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { Button } from "@opencode-ai/ui/button"
-import { DialogFooter, DialogHeader, DialogTitleGroup, Dialog } from "@opencode-ai/ui/dialog"
-import { skipToken, useQuery, useQueryClient } from "@tanstack/solid-query"
+import { skipToken, useQuery } from "@tanstack/solid-query"
 import { DateTime } from "luxon"
 import { type Accessor, createEffect, createMemo, type JSX, startTransition, untrack } from "solid-js"
-import { notifySessionTabsRemoved } from "@/shell/titlebar/session-events"
 import { useCommand } from "@/shell/commands/command"
 import { loadHomeSessionIndex, mergeHomeSessionIndex, retainHomeSessions } from "@/home/sessions/index"
 import type { LocalProject } from "@/shell/state/layout"
@@ -14,10 +11,7 @@ import { ServerConnection } from "@/runtime/server/registry"
 import { sessionHasOpenTab, useTabs } from "@/shell/tabs/tabs"
 import { errorMessage } from "@/shell/layout/helpers"
 import { useSessionTabAvatarState } from "@/shell/layout/project-avatar-state"
-import { removedSessionIDs } from "@/session/session-domain"
 import { pathKey } from "@/workspaces/path-key"
-import { downloadSessionExport, fetchSessionExport, sessionExportFilename } from "@/session/commands/export"
-import { sessionLabel, sessionTitle } from "@/session/title"
 import { showToast } from "@/shell/notifications/toast"
 import { archiveHomeSession } from "./archive"
 import type { HomeController } from "../model"
@@ -41,7 +35,6 @@ export function createHomeSessionsController(home: HomeController) {
  const command = useCommand()
  const dialog = useDialog()
  const language = useLanguage()
-  const queryClient = useQueryClient()
  const projectDirectories = createMemo(() => {
    const selected = home.selection.value().directory
    if (!selected) return
@@ -66,12 +59,9 @@ export function createHomeSessionsController(home: HomeController) {
  })
  const indexedSessions = createMemo(() => {
    const ctx = home.server.focusedContext()
-    const conn = home.server.focused()
-    if (!ctx || !conn) return []
+    if (!ctx) return []
    return retainHomeSessions(
-      ctx.data.session.apply(
-        mergeHomeSessionIndex(sessionLoad.isPending ? [] : (sessionLoad.data?.() ?? []), ctx.data.session.list()),
-      ),
+      mergeHomeSessionIndex(sessionLoad.data?.() ?? [], ctx.data.session.list()),
      HOME_SESSION_LIMIT,
      Date.now(),
    )
@@ -133,110 +123,6 @@ export function createHomeSessionsController(home: HomeController) {
    },
  ])

-  const rename = async (server: ServerConnection.Key, session: SessionInfo, title: string) => {
-    const conn = home.server.list().find((item) => ServerConnection.key(item) === server)
-    const ctx = conn ? home.server.context(conn) : undefined
-    if (!conn || !ctx) return false
-    const next = title.trim()
-    if (!next || next === sessionLabel(session)) return true
-    return ctx.sdk.api.session
-      .rename({ sessionID: session.id, title: next })
-      .then(() => {
-        ctx.data.session.remember({ ...(ctx.data.session.get(session.id) ?? session), title: next })
-        // Rename advances time.updated server-side; re-sync the canonical
-        // record so date grouping and ordering do not go stale.
-        ctx.data.session.invalidate(session.id)
-        void ctx.data.session.sync(session.id).catch(() => {})
-        queryClient.setQueryData<SessionInfo[]>(["home-sessions", conn], (current) =>
-          current?.map((item) => (item.id === session.id ? { ...item, title: next } : item)),
-        )
-        return true
-      })
-      .catch((cause) => {
-        showToast({
-          title: language.t("common.requestFailed"),
-          description: errorMessage(cause, language.t("common.requestFailed")),
-        })
-        return false
-      })
-  }
-
-  const exportSession = async (server: ServerConnection.Key, session: SessionInfo) => {
-    const conn = home.server.list().find((item) => ServerConnection.key(item) === server)
-    const ctx = conn ? home.server.context(conn) : undefined
-    if (!ctx) return
-    try {
-      const data = await fetchSessionExport({ sessionID: session.id, api: ctx.sdk.api })
-      const filename = sessionExportFilename(data.info)
-      downloadSessionExport(filename, data)
-      showToast({
-        variant: "success",
-        icon: "circle-check",
-        title: language.t("toast.session.export.success.title"),
-        description: language.t("toast.session.export.success.description", { filename }),
-      })
-    } catch (cause) {
-      showToast({
-        variant: "error",
-        title: language.t("toast.session.export.failed.title"),
-        description: cause instanceof Error ? cause.message : language.t("toast.session.export.failed.description"),
-      })
-    }
-  }
-
-  const remove = async (server: ServerConnection.Key, session: SessionInfo) => {
-    const conn = home.server.list().find((item) => ServerConnection.key(item) === server)
-    const ctx = conn ? home.server.context(conn) : undefined
-    if (!conn || !ctx) return false
-    const ids = [...removedSessionIDs(ctx.data.session.list(), session.id)]
-    return ctx.data.session
-      .remove(session.id)
-      .then(() => {
-        notifySessionTabsRemoved({
-          server: ServerConnection.key(conn),
-          directory: session.location.directory,
-          sessionIDs: ids,
-        })
-        return true
-      })
-      .catch((cause) => {
-        showToast({
-          title: language.t("session.delete.failed.title"),
-          description: errorMessage(cause, language.t("session.delete.failed.title")),
-        })
-        return false
-      })
-      .finally(() => {
-        void queryClient.invalidateQueries({ queryKey: ["home-sessions", conn], exact: true })
-      })
-  }
-
-  function DeleteDialog(props: { server: ServerConnection.Key; session: SessionInfo }) {
-    const name = () => sessionTitle(props.session.title) ?? language.t("command.session.new")
-    const confirm = async () => {
-      await remove(props.server, props.session)
-      dialog.close()
-    }
-    return (
-      <Dialog fit>
-        <DialogHeader hideClose>
-          <DialogTitleGroup
-            title={language.t("session.delete.title")}
-            description={language.t("session.delete.confirm", { name: name() })}
-          />
-        </DialogHeader>
-        <DialogFooter>
-          <Button variant="ghost" onClick={() => dialog.close()}>
-            {language.t("common.cancel")}
-          </Button>
-          <Button variant="danger" onClick={confirm}>
-            {language.t("session.delete.button")}
-          </Button>
-        </DialogFooter>
-      </Dialog>
-    )
-  }
-
  return {
    copy: {
      language,
@@ -244,7 +130,7 @@ export function createHomeSessionsController(home: HomeController) {
    data: {
      records,
      groups,
-      loading: () => sessionLoad.isPending,
+      loading: () => sessionLoad.isLoading,
      searchRecords: allRecords,
    },
    session: {
@@ -307,10 +193,6 @@ export function createHomeSessionsController(home: HomeController) {
            }),
        })
      },
-      rename,
-      export: exportSession,
-      showDelete: (server: ServerConnection.Key, session: SessionInfo) =>
-        dialog.show(() => <DeleteDialog server={server} session={session} />),
    },
    tab: {
      isOpen: (record: HomeSessionRecord) =>
@@ -361,6 +243,7 @@ export function HomeSessionStatusController(props: {
 }) {
  const avatar = useSessionTabAvatarState(
    () => props.server,
+    () => props.record.session.location.directory,
    () => props.record.session.id,
    () => true,
  )
@@ -12,7 +12,6 @@ export function HomeSessions(props: {
    <HomeSessionsView
      language={props.sessions.copy.language}
      groups={props.sessions.data.groups()}
-      loading={props.sessions.data.loading()}
      showProjectName={props.sessions.session.showProjectName()}
      server={props.sessions.session.server()}
      canCreateSession={props.sessions.session.canCreate()}
@@ -28,9 +27,6 @@ export function HomeSessions(props: {
      onCreateSession={props.sessions.session.create}
      onOpenSession={props.sessions.session.open}
      onArchiveSession={props.sessions.session.archive}
-      onRenameSession={props.sessions.session.rename}
-      onExportSession={props.sessions.session.export}
-      onDeleteSession={props.sessions.session.showDelete}
      onSetHoverTarget={props.scroll.viewport.setHoverTarget}
      onSetThumbTrack={props.scroll.viewport.setThumbTrack}
      onSetContent={props.scroll.header.setContent}
@@ -1,14 +1,10 @@
 import type { SessionInfo } from "@opencode-ai/client/promise"
-import { Key } from "@solid-primitives/keyed"
-import { createMemo, For, Index, onCleanup, Show } from "solid-js"
-import { createStore, type SetStoreFunction } from "solid-js/store"
-import { InlineInput } from "@opencode-ai/ui/inline-input"
+import { createMemo, For, Show, Suspense } from "solid-js"
 import { Spinner } from "@opencode-ai/ui/spinner"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
 import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Menu } from "@opencode-ai/ui/menu"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { useLanguage } from "@/runtime/i18n/language"
 import { ServerConnection } from "@/runtime/server/registry"
@@ -26,7 +22,6 @@ import {
 const SHOW_HOME_SESSION_ARCHIVE = false
 const HOME_SECTION_LABEL = "text-v2-text-text-muted [font-weight:440]"
 const HOME_SESSION_SEARCH_RESULTS_ID = "home-session-search-results"
-const HOME_SESSION_LONG_PRESS_MS = 500

 // Middle-click or Cmd+click on macOS (Ctrl+click elsewhere) opens a session
 // tab in the background without navigating, matching browser conventions.
@@ -44,7 +39,6 @@ function isBackgroundOpen(event: MouseEvent) {
 export type HomeSessionsViewProps = {
  language: ReturnType<typeof useLanguage>
  groups: HomeSessionGroup[]
-  loading: boolean
  showProjectName: boolean
  server: ServerConnection.Key
  canCreateSession: boolean
@@ -60,9 +54,6 @@ export type HomeSessionsViewProps = {
  onCreateSession: () => void
  onOpenSession: (session: SessionInfo, options?: OpenSessionOptions) => void
  onArchiveSession: (session: SessionInfo) => Promise<void>
-  onRenameSession: (server: ServerConnection.Key, session: SessionInfo, title: string) => Promise<boolean>
-  onExportSession: (server: ServerConnection.Key, session: SessionInfo) => Promise<void>
-  onDeleteSession: (server: ServerConnection.Key, session: SessionInfo) => void
  onSetHoverTarget: (element: HTMLElement) => void
  onSetThumbTrack: (element: HTMLDivElement) => void
  onSetContent: (element: HTMLDivElement) => void
@@ -80,16 +71,7 @@ export type HomeSessionsViewProps = {
  onSearchSelect: (record: HomeSessionRecord, options?: OpenSessionOptions) => void
 }

-// Session store updates recreate row components, so row-local state would
-// close an open context menu or drop an in-progress rename. Keep both keyed
-// by session ID at the view root, like the projects list does.
-type HomeSessionRowUI = {
-  menu: { id: string; x: number; y: number } | undefined
-  editor: { id: string; draft: string; renaming: boolean } | undefined
-}
-
 export function HomeSessionsView(props: HomeSessionsViewProps) {
-  const [rowUI, setRowUI] = createStore<HomeSessionRowUI>({ menu: undefined, editor: undefined })
  return (
    <section
      ref={props.onSetHoverTarget}
@@ -98,20 +80,22 @@ export function HomeSessionsView(props: HomeSessionsViewProps) {
    >
      <div class="sticky top-0 z-30 shrink-0 bg-v2-background-bg-base pb-3 pt-6 lg:pt-12" onWheel={props.onWheel}>
        <HomeSessionSearch {...props} />
-        <Show when={props.groups.length > 0 && props.canCreateSession}>
-          <div class="pointer-events-none absolute right-0 top-[84px] z-20 flex lg:top-[108px]">
-            <Button
-              data-action="home-new-session"
-              variant="ghost-muted"
-              size="normal"
-              icon="edit"
-              class="pointer-events-auto h-7 px-2 [font-weight:530]"
-              onClick={props.onCreateSession}
-            >
-              {props.language.t("command.session.new")}
-            </Button>
-          </div>
-        </Show>
+        <Suspense>
+          <Show when={props.groups.length > 0 && props.canCreateSession}>
+            <div class="pointer-events-none absolute right-0 top-[84px] z-20 flex lg:top-[108px]">
+              <Button
+                data-action="home-new-session"
+                variant="ghost-muted"
+                size="normal"
+                icon="edit"
+                class="pointer-events-auto h-7 px-2 [font-weight:530]"
+                onClick={props.onCreateSession}
+              >
+                {props.language.t("command.session.new")}
+              </Button>
+            </div>
+          </Show>
+        </Suspense>
      </div>
      <div class="pointer-events-none sticky top-[84px] z-40 h-0 -mr-3 lg:top-[108px]">
        <div
@@ -121,8 +105,7 @@ export function HomeSessionsView(props: HomeSessionsViewProps) {
        />
      </div>
      <div class="-mr-3 min-h-[calc(100cqh-72px)] lg:min-h-[calc(100cqh-96px)]">
-        <Show
-          when={!props.loading}
+        <Suspense
          fallback={
            <div class="pt-3">
              <HomeSessionSkeleton label={props.language.t("common.loading")} />
@@ -139,32 +122,26 @@ export function HomeSessionsView(props: HomeSessionsViewProps) {
            }
          >
            <div ref={props.onSetContent} class="flex flex-col pt-3 pr-3 pb-16">
-              {/* Index keeps group subtrees mounted when the group arrays are
-                  rebuilt, so store updates cannot recreate rows mid-gesture. */}
-              <Index each={props.groups}>
+              <For each={props.groups}>
                {(group, index) => (
                  <>
                    <HomeSessionGroupHeader
-                      title={group().title}
-                      titleOpacity={props.titleOpacity(group().id)}
-                      onSetRef={(element) => props.onSetHeader(group().id, element)}
-                      elevated={index === 0}
+                      title={group.title}
+                      titleOpacity={props.titleOpacity(group.id)}
+                      onSetRef={(element) => props.onSetHeader(group.id, element)}
+                      elevated={index() === 0}
                    />
-                    <div class={`flex min-w-0 flex-col gap-px pt-4 ${index === props.groups.length - 1 ? "" : "mb-6"}`}>
-                      {/* Rows key by session ID: session.sync replaces the
-                          stored session object wholesale, so reference-keyed
-                          rows would be disposed mid-interaction whenever a
-                          sync response lands. */}
-                      <Key each={group().sessions} by={(record) => record.session.id}>
-                        {(record) => <HomeSessionRow {...props} record={record()} rowUI={rowUI} setRowUI={setRowUI} />}
-                      </Key>
+                    <div
+                      class={`flex min-w-0 flex-col gap-px pt-4 ${index() === props.groups.length - 1 ? "" : "mb-6"}`}
+                    >
+                      <For each={group.sessions}>{(record) => <HomeSessionRow {...props} record={record} />}</For>
                    </div>
                  </>
                )}
-              </Index>
+              </For>
            </div>
          </Show>
-        </Show>
+        </Suspense>
      </div>
    </section>
  )
@@ -435,263 +412,45 @@ function HomeSessionGroupHeader(props: {
  )
 }

-function HomeSessionRow(
-  props: HomeSessionsViewProps & {
-    record: HomeSessionRecord
-    rowUI: HomeSessionRowUI
-    setRowUI: SetStoreFunction<HomeSessionRowUI>
-  },
-) {
+function HomeSessionRow(props: HomeSessionsViewProps & { record: HomeSessionRecord }) {
  const title = createMemo(() => sessionLabel(props.record.session))
  const showProjectName = () => props.showProjectName && props.record.projectName
-  const sessionID = () => props.record.session.id
-  const menu = () => (props.rowUI.menu?.id === sessionID() ? props.rowUI.menu : undefined)
-  const editor = () => (props.rowUI.editor?.id === sessionID() ? props.rowUI.editor : undefined)
-  let longPressTimer: ReturnType<typeof setTimeout> | undefined
-  let longPressStart: { x: number; y: number } | undefined
-  let suppressClick = false
-  let menuInteractedOutside = false
-
-  // Focus targets are looked up by session ID: session store updates recreate
-  // row components, so instance refs can point at detached nodes by the time
-  // deferred focus runs.
-  const rowSelector = () => `[data-component="home-session-row-container"][data-session-id="${sessionID()}"]`
-  const rowButton = () =>
-    document.querySelector<HTMLButtonElement>(`${rowSelector()} [data-component="home-session-row"]`)
-  const renameInput = () =>
-    document.querySelector<HTMLInputElement>(`${rowSelector()} [data-component="home-session-rename"]`)
-
-  const clearLongPress = () => {
-    if (longPressTimer !== undefined) clearTimeout(longPressTimer)
-    longPressTimer = undefined
-    longPressStart = undefined
-  }
-  onCleanup(clearLongPress)
-
-  const openMenu = (element: HTMLElement, clientX: number, clientY: number) => {
-    const bounds = element.getBoundingClientRect()
-    props.setRowUI("menu", { id: sessionID(), x: clientX - bounds.left, y: clientY - bounds.top })
-  }
-
-  const openEditor = () => {
-    props.setRowUI("editor", { id: sessionID(), draft: title(), renaming: false })
-    requestAnimationFrame(() => {
-      const input = renameInput()
-      input?.focus()
-      input?.select()
-    })
-  }
-  const closeEditor = () => {
-    if (editor()?.renaming) return
-    props.setRowUI("editor", (value) => (value?.id === sessionID() ? undefined : value))
-  }
-  const saveEditor = async () => {
-    const current = editor()
-    if (!current || current.renaming) return
-    props.setRowUI("editor", { ...current, renaming: true })
-    const saved = await props.onRenameSession(props.server, props.record.session, current.draft)
-    // Disabling the input during the request drops focus to the body; restore
-    // it unless the user focused another control while the rename was pending.
-    const restore = document.activeElement === document.body || document.activeElement === renameInput()
-    props.setRowUI("editor", (value) => {
-      if (value?.id !== sessionID()) return value
-      return saved ? undefined : { ...value, renaming: false }
-    })
-    if (!restore) return
-    requestAnimationFrame(() => {
-      if (saved) {
-        rowButton()?.focus()
-        return
-      }
-      renameInput()?.focus()
-    })
-  }

  return (
    <div
-      data-component="home-session-row-container"
-      data-session-id={props.record.session.id}
-      class="group/session relative flex h-10 min-w-0 items-center rounded-[6px] outline-none focus:outline-none focus-visible:outline-none"
+      class="group/session relative flex h-10 min-w-0 items-center rounded-[6px]"
      classList={{ group: !!showProjectName() }}
-      onContextMenu={(event) => {
-        // While renaming, keep the native menu so paste and spelling work.
-        if (editor()) return
-        event.preventDefault()
-        openMenu(event.currentTarget, event.clientX, event.clientY)
-      }}
    >
-      <Show
-        when={!editor()}
-        fallback={
-          <div class="flex h-10 min-w-0 w-full flex-1 items-center gap-2 py-3 pl-3 pr-10">
-            <HomeSessionLeadingController
-              server={props.server}
-              isOpenTab={props.isOpenTab}
-              record={props.record}
-              revealProjectOnHover={false}
-            />
-            <InlineInput
-              data-component="home-session-rename"
-              aria-label={props.language.t("common.rename")}
-              dir="auto"
-              value={editor()?.draft ?? ""}
-              disabled={editor()?.renaming ?? false}
-              class={`
-                block min-w-0 overflow-hidden text-ellipsis whitespace-nowrap text-v2-text-text-base
-                [font-weight:530] field-sizing-content outline-none focus:outline-none focus-visible:outline-none
-                ${showProjectName() ? "max-w-[min(70%,480px)] flex-[0_1_auto]" : "flex-[1_1_auto]"}
-              `}
-              style={{ "--inline-input-shadow": "none", "text-align": "start" }}
-              onInput={(event) => {
-                const draft = event.currentTarget.value
-                props.setRowUI("editor", (value) => (value?.id === sessionID() ? { ...value, draft } : value))
-              }}
-              onKeyDown={(event) => {
-                event.stopPropagation()
-                // Enter and Escape during IME composition commit or cancel
-                // the composition, not the rename. Safari can report the
-                // composition-confirming keydown with isComposing false but
-                // keyCode 229.
-                if (event.isComposing || event.keyCode === 229) return
-                if (event.key === "Enter") {
-                  event.preventDefault()
-                  void saveEditor()
-                  return
-                }
-                if (event.key !== "Escape") return
-                event.preventDefault()
-                closeEditor()
-                requestAnimationFrame(() => rowButton()?.focus())
-              }}
-              onBlur={closeEditor}
-            />
-            <Show when={showProjectName()}>
-              <HomeSessionProjectName name={props.record.projectName} />
-            </Show>
-          </div>
-        }
-      >
-        <button
-          type="button"
-          data-component="home-session-row"
-          aria-haspopup="menu"
-          aria-expanded={!!menu()}
-          class={`
-            flex h-10 min-w-0 w-full flex-1 shrink-0 cursor-default items-center gap-2 rounded-[6px] border-0
-            bg-transparent py-3 pl-3 pr-10 text-left text-v2-text-text-muted [font-weight:530]
-            transition-[background-color,color,box-shadow] duration-[120ms] ease-in-out
-            hover:bg-v2-overlay-simple-overlay-hover focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:outline-none
-          `}
-          onMouseDown={(event) => {
-            if (event.button === 1) event.preventDefault()
-          }}
-          onPointerDown={(event) => {
-            suppressClick = false
-            if (event.pointerType !== "touch") return
-            clearLongPress()
-            const element = event.currentTarget
-            const x = event.clientX
-            const y = event.clientY
-            longPressStart = { x, y }
-            longPressTimer = setTimeout(() => {
-              suppressClick = true
-              clearLongPress()
-              openMenu(element, x, y)
-            }, HOME_SESSION_LONG_PRESS_MS)
-          }}
-          onPointerMove={(event) => {
-            if (!longPressStart) return
-            if (Math.abs(event.clientX - longPressStart.x) <= 8 && Math.abs(event.clientY - longPressStart.y) <= 8)
-              return
-            clearLongPress()
-          }}
-          onPointerUp={clearLongPress}
-          onPointerCancel={() => {
-            clearLongPress()
-            suppressClick = false
-          }}
-          onKeyDown={(event) => {
-            if (event.key !== "ContextMenu" && (event.key !== "F10" || !event.shiftKey)) return
-            event.preventDefault()
-            const bounds = event.currentTarget.getBoundingClientRect()
-            openMenu(event.currentTarget, bounds.left + 12, bounds.bottom)
-          }}
-          onClick={(event) => {
-            // The flag stays set until the long-press compatibility click
-            // arrives, however delayed; keyboard activation (detail 0) is
-            // never that click and passes through.
-            if (suppressClick) {
-              suppressClick = false
-              if (event.detail !== 0) {
-                event.preventDefault()
-                return
-              }
-            }
-            props.onOpenSession(props.record.session, { background: isBackgroundOpen(event) })
-          }}
-          onAuxClick={(event) => {
-            if (!isBackgroundOpen(event)) return
-            event.preventDefault()
-            props.onOpenSession(props.record.session, { background: true })
-          }}
-        >
-          <HomeSessionLeadingController
-            server={props.server}
-            isOpenTab={props.isOpenTab}
-            record={props.record}
-            revealProjectOnHover={!!showProjectName()}
-          />
-          <HomeSessionTitle title={title()} showProjectName={!!showProjectName()} />
-          <Show when={showProjectName()}>
-            <HomeSessionProjectName name={props.record.projectName} />
-          </Show>
-        </button>
-      </Show>
-      <Menu
-        modal={false}
-        placement="bottom-start"
-        gutter={2}
-        open={!!menu()}
-        onOpenChange={(open) => {
-          if (open) return
-          props.setRowUI("menu", (value) => (value?.id === sessionID() ? undefined : value))
+      <button
+        type="button"
+        data-component="home-session-row"
+        class={`
+          flex h-10 min-w-0 w-full flex-1 shrink-0 cursor-default items-center gap-2 rounded-[6px] border-0
+          bg-transparent py-3 pl-3 pr-10 text-left text-v2-text-text-muted [font-weight:530]
+          transition-[background-color,color,box-shadow] duration-[120ms] ease-in-out
+          hover:bg-v2-overlay-simple-overlay-hover focus-visible:bg-v2-overlay-simple-overlay-hover focus-visible:outline-none
+        `}
+        onMouseDown={(event) => {
+          if (event.button === 1) event.preventDefault()
+        }}
+        onClick={(event) => props.onOpenSession(props.record.session, { background: isBackgroundOpen(event) })}
+        onAuxClick={(event) => {
+          if (!isBackgroundOpen(event)) return
+          event.preventDefault()
+          props.onOpenSession(props.record.session, { background: true })
        }}
      >
-        <Menu.Trigger
-          as="span"
-          aria-hidden="true"
-          tabIndex={-1}
-          class="pointer-events-none absolute size-px"
-          style={{ left: `${menu()?.x ?? 0}px`, top: `${menu()?.y ?? 0}px` }}
+        <HomeSessionLeadingController
+          server={props.server}
+          isOpenTab={props.isOpenTab}
+          record={props.record}
+          revealProjectOnHover={!!showProjectName()}
        />
-        <Menu.Portal>
-          <Menu.Content
-            onInteractOutside={() => {
-              menuInteractedOutside = true
-            }}
-            onCloseAutoFocus={(event) => {
-              // The trigger is an invisible positioning span, so Kobalte's
-              // default close focus restore has no useful target. Skip the
-              // row focus when the rename editor owns focus or the user
-              // dismissed the menu by interacting elsewhere.
-              event.preventDefault()
-              const outside = menuInteractedOutside
-              menuInteractedOutside = false
-              if (outside || editor()) return
-              requestAnimationFrame(() => rowButton()?.focus())
-            }}
-          >
-            <Menu.Item onSelect={openEditor}>{props.language.t("common.rename")}</Menu.Item>
-            <Menu.Item onSelect={() => void props.onExportSession(props.server, props.record.session)}>
-              {props.language.t("common.export")}...
-            </Menu.Item>
-            <Menu.Separator />
-            <Menu.Item onSelect={() => props.onDeleteSession(props.server, props.record.session)}>
-              {props.language.t("common.delete")}...
-            </Menu.Item>
-          </Menu.Content>
-        </Menu.Portal>
-      </Menu>
+        <HomeSessionTitle title={title()} showProjectName={!!showProjectName()} />
+        <Show when={showProjectName()}>
+          <HomeSessionProjectName name={props.record.projectName} />
+        </Show>
+      </button>
      <Show when={SHOW_HOME_SESSION_ARCHIVE}>
        <div
          class={`
@@ -722,7 +481,6 @@ function HomeSessionRow(
 function HomeSessionTitle(props: { title: string; showProjectName: boolean; search?: boolean }) {
  return (
    <span
-      data-component="home-session-title"
      class="min-w-0 overflow-hidden text-ellipsis whitespace-nowrap text-v2-text-text-base [font-weight:530]"
      classList={{
        "text-[13px] leading-4 tracking-[-0.04px]": !!props.search,
@@ -8,6 +8,7 @@ import { createComposerControls, createComposerModelSelection } from "@/composer
 import { createComposerProjectControls } from "./project/controller"
 import { useLanguage } from "@/runtime/i18n/language"
 import { useLocal } from "@/providers/models/selection"
+import { usePermission } from "@/session/requests/permission"
 import { useData, useServer } from "@/runtime/server/current"
 import { type ServerSDK, useServerSDK } from "@/runtime/server/client"
 import { useTabs } from "@/shell/tabs/tabs"
@@ -20,7 +21,6 @@ import { clearSessionMessageHandoff, setSessionMessageHandoff } from "@/session/
 export function createNewSessionComposerAdapter(props: {
  draftID: string
  worktree: () => string
-  branch: () => string | undefined
  submitted: () => void
 }) {
  const route = useSessionKey()
@@ -30,6 +30,7 @@ export function createNewSessionComposerAdapter(props: {
  const data = useData()
  const server = useServer()
  const serverSDK = useServerSDK()
+  const permission = usePermission()
  const tabs = useTabs()
  const location = useWorkspaceLocation()
  const language = useLanguage()
@@ -49,7 +50,6 @@ export function createNewSessionComposerAdapter(props: {
      const sessionDirectory = await resolveSessionDirectory({
        projectDirectory,
        worktree,
-        branch: props.branch(),
        data,
        serverSDK,
        language,
@@ -75,7 +75,7 @@ export function createNewSessionComposerAdapter(props: {
          return { ok: false as const, error }
        },
      )
-      const afterCreation = async <T>(run: () => Promise<T>) => {
+      const afterCreation = async <T,>(run: () => Promise<T>) => {
        const result = await creation
        if (!result.ok) throw result.error
        return run()
@@ -85,7 +85,10 @@ export function createNewSessionComposerAdapter(props: {
        SessionRouteKey.fromRoute(base64Encode(sessionDirectory), created.id),
      )
      const cleanupReady = startTransition(() => {
-        tabs.updateDraft(props.draftID, { worktree: undefined, branch: undefined })
+        tabs.updateDraft(props.draftID, { worktree: undefined })
+        if (permission.isAutoAcceptingDirectory(projectDirectory)) {
+          permission.enableAutoAccept(created.id, sessionDirectory)
+        }
        local.session.promote(sessionDirectory, created.id, {
          agent: selection.agent,
          model: selection.model,
@@ -163,7 +166,6 @@ function createMessageHandoff(key: string, sessionID: string, event: ServerSDK["
 async function resolveSessionDirectory(input: {
  projectDirectory: string
  worktree: string
-  branch?: string
  data: ReturnType<typeof useData>
  serverSDK: ReturnType<typeof useServerSDK>
  language: ReturnType<typeof useLanguage>
@@ -175,7 +177,6 @@ async function resolveSessionDirectory(input: {
    .create({
      projectID: input.data.location.info({ directory: input.projectDirectory })?.project.id ?? "",
      strategy: "git",
-      branch: input.branch,
      directory: getDirectory(
        input.data.location.info({ directory: input.projectDirectory })?.project.directory ?? input.projectDirectory,
      ),
@@ -39,7 +39,6 @@ export function createComposerProjectControls(props: { draftId: string }) {
      server: ServerConnection.key(connection),
      directory: worktree,
      worktree: undefined,
-      branch: undefined,
    })
  }
  const addProject = (title: string, serverKey?: string) => {
@@ -421,7 +421,7 @@ export function PromptProjectSelector(props: {
                  <span class="min-w-0 flex-1 truncate leading-5">{props.controller.labels.add()}</span>
                </Menu.SubTrigger>
                <Menu.Portal>
-                  <Menu.SubContent class="max-h-[224px] min-w-[180px] overflow-y-auto rounded-md border-0 bg-v2-background-bg-layer-01 shadow-[var(--v2-elevation-floating)] focus:outline-none">
+                  <Menu.SubContent class="min-w-[180px] overflow-hidden rounded-md border-0 bg-v2-background-bg-layer-01 shadow-[var(--v2-elevation-floating)] focus:outline-none">
                    <For each={props.controller.servers()}>
                      {(server) => <ServerAction server={server!} onSelect={selectAction} />}
                    </For>
@@ -21,20 +21,15 @@ export default function NewSessionPage(props: { draftId: string }) {
    tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === search.draftId),
  )
  const workspace = createNewSessionWorkspaceController({
-    selectedWorktree: () => draftTab()?.worktree,
-    selectedBranch: () => draftTab()?.branch,
-    setSelectedWorktree: (worktree) => {
+    selected: () => draftTab()?.worktree,
+    setSelected: (worktree) => {
      if (search.draftId) tabs.updateDraft(search.draftId, { worktree })
    },
-    setSelectedBranch: (branch) => {
-      if (search.draftId) tabs.updateDraft(search.draftId, { branch })
-    },
    onViewAll: openWorkspaces,
  })
  const composer = createNewSessionComposerAdapter({
    draftID: props.draftId,
    worktree: workspace.selection.value,
-    branch: workspace.bar.branch,
    submitted: workspace.selection.remember,
  })
  const model = createComposerModel(composer.adapter)
@@ -69,12 +69,9 @@ export function NewSessionView(props: {
                      value={props.workspace.selection.value()}
                      projectRoot={props.workspace.project.root()}
                      workspaces={props.workspace.project.workspaces()}
-                      branches={props.workspace.project.branches()}
                      branch={props.workspace.bar.branch()}
                      onboarding={onboardingReady() && !onboarding.used}
                      onChange={select}
-                      onCreate={props.workspace.selection.create}
-                      onSearch={props.workspace.project.searchBranches}
                      onDone={props.composer.restoreFocus}
                      onViewAll={props.workspace.project.openAll}
                    />
@@ -18,23 +18,13 @@ describe("new session workspace selection", () => {
    ).toBe("main")
  })

-  test("uses the saved destination instead of the current worktree", () => {
+  test("derives an existing worktree from the current directory", () => {
    expect(
-      resolveNewSessionWorktree({
-        enabled: true,
-        directory: "/project/feature",
-        projectWorktree: "/project",
-        fallback: "create",
-      }),
-    ).toBe("create")
-    expect(
-      resolveNewSessionWorktree({
-        enabled: true,
-        directory: "/project/feature",
-        projectWorktree: "/project",
-        fallback: "main",
-      }),
-    ).toBe("/project")
+      resolveNewSessionWorktree({ enabled: true, directory: "/project/feature", projectWorktree: "/project" }),
+    ).toBe("/project/feature")
+    expect(resolveNewSessionWorktree({ enabled: true, directory: "/project", projectWorktree: "/project" })).toBe(
+      "main",
+    )
  })

  test("normalizes main to the project root outside the main worktree", () => {
@@ -43,9 +33,9 @@ describe("new session workspace selection", () => {
  })

  test("treats equivalent Windows roots as the main worktree", () => {
-    expect(
-      resolveNewSessionWorktree({ enabled: true, directory: "C:\\Repo\\", projectWorktree: "c:/repo" }),
-    ).toBe("main")
+    expect(resolveNewSessionWorktree({ enabled: true, directory: "C:\\Repo\\", projectWorktree: "c:/repo" })).toBe(
+      "main",
+    )
    expect(normalizeNewSessionWorktree("main", "C:\\Repo\\", "c:/repo")).toBe("main")
  })

@@ -65,17 +55,6 @@ describe("new session workspace selection", () => {
    ).toBe(undefined)
  })

-  test("uses a selected branch for a new workspace", () => {
-    expect(
-      resolveNewSessionBranch({
-        worktree: "create",
-        directory: "/project/feature",
-        createBranch: "release",
-        worktreeBranch: () => "feature",
-      }),
-    ).toBe("release")
-  })
-
  test("uses location VCS state when the project inventory is stale", () => {
    expect(resolveNewSessionGit({ branch: "dev" })).toBe(true)
    expect(resolveNewSessionGit({ projectVcs: "git" })).toBe(true)
@@ -1,6 +1,4 @@
-import { debounce } from "@solid-primitives/scheduled"
-import { createEffect, createMemo, createResource } from "solid-js"
-import { createStore } from "solid-js/store"
+import { createEffect, createMemo } from "solid-js"
 import { useWorkspaceLocation } from "@/workspaces/location"
 import { useServerSDK } from "@/runtime/server/client"
 import { useData } from "@/runtime/server/current"
@@ -23,7 +21,8 @@ export function resolveNewSessionWorktree(input: {
 }) {
  if (!input.enabled) return "main"
  if (input.selected) return input.selected
-  return normalizeNewSessionWorktree(input.fallback ?? "main", input.directory, input.projectWorktree)
+  if (input.projectWorktree && !sameDirectory(input.directory, input.projectWorktree)) return input.directory
+  return input.fallback ?? "main"
 }

 export function normalizeNewSessionWorktree(value: string, directory: string, projectWorktree?: string) {
@@ -34,10 +33,8 @@ export function normalizeNewSessionWorktree(value: string, directory: string, pr
 export function resolveNewSessionBranch(input: {
  worktree: string
  directory: string
-  createBranch?: string
  worktreeBranch: (worktree: string) => string | undefined
 }) {
-  if (input.worktree === "create" && input.createBranch) return input.createBranch
  const directory = input.worktree === "main" || input.worktree === "create" ? input.directory : input.worktree
  return input.worktreeBranch(directory)
 }
@@ -47,18 +44,14 @@ export function resolveNewSessionGit(input: { projectVcs?: string; branch?: stri
 }

 export function createNewSessionWorkspaceController(input: {
-  selectedWorktree: () => string | undefined
-  selectedBranch: () => string | undefined
-  setSelectedWorktree: (worktree: string | undefined) => void
-  setSelectedBranch: (branch: string | undefined) => void
+  selected: () => string | undefined
+  setSelected: (worktree: string | undefined) => void
  onViewAll: () => void
 }) {
  const sdk = useWorkspaceLocation()
  const serverSDK = useServerSDK()
  const data = useData()
  const settings = useSettings()
-  const [state, setState] = createStore({ search: "" })
-  const searchBranches = debounce((search: string) => setState("search", search.trim()), 100)
  const currentProject = createMemo(() => {
    const projectID = data.location.info({ directory: sdk().directory })?.project.id
    const current = projectID ? data.project.get(projectID) : undefined
@@ -72,7 +65,7 @@ export function createNewSessionWorkspaceController(input: {
  )
  const selected = createMemo(() => {
    const project = currentProject()
-    const worktree = input.selectedWorktree()
+    const worktree = input.selected()
    if (!project || !worktree) return
    return isWorkspaceSelection(project, worktree) ? worktree : undefined
  })
@@ -94,14 +87,6 @@ export function createNewSessionWorkspaceController(input: {
    }),
  )
  const projectRoot = createMemo(() => currentProject()?.worktree ?? sdk().directory)
-  const [branches] = createResource(
-    () => (visible() ? { directory: projectRoot(), search: state.search } : undefined),
-    ({ directory, search }) =>
-      serverSDK.api.vcs
-        .branches({ location: { directory }, search, limit: 50 })
-        .then((response) => ({ directory, search, data: response.data }))
-        .catch(() => ({ directory, search, data: [] })),
-  )
  createEffect(() => {
    void Promise.all([data.location.syncInfo({ directory: sdk().directory }), data.project.sync()]).catch(
      () => undefined,
@@ -114,7 +99,6 @@ export function createNewSessionWorkspaceController(input: {
    resolveNewSessionBranch({
      worktree: value(),
      directory: sdk().directory,
-      createBranch: input.selectedBranch(),
      worktreeBranch: (worktree) => data.location.vcs.info({ directory: worktree })?.branch.current,
    }),
  )
@@ -133,19 +117,11 @@ export function createNewSessionWorkspaceController(input: {
        const current = value()
        return current === "create" || (!!project && isWorkspaceDirectory(project, current))
      }),
-      reset: () => {
-        input.setSelectedWorktree(undefined)
-        input.setSelectedBranch(undefined)
-      },
+      reset: () => input.setSelected(undefined),
      remember,
      set: (worktree: string) => {
-        input.setSelectedBranch(undefined)
-        input.setSelectedWorktree(normalizeNewSessionWorktree(worktree, sdk().directory, currentProject()?.worktree))
-      },
-      create: (branch: string) => {
-        input.setSelectedBranch(branch)
-        input.setSelectedWorktree("create")
-        remember("create")
+        input.setSelected(normalizeNewSessionWorktree(worktree, sdk().directory, currentProject()?.worktree))
+        remember(worktree)
      },
    },
    project: {
@@ -155,15 +131,6 @@ export function createNewSessionWorkspaceController(input: {
        return project ? workspaceDirectories(project) : []
      },
      git: visible,
-      branches: () => {
-        const current = data.location.vcs.info({ directory: sdk().directory })?.branch.current
-        const loaded = branches.latest
-        const list = loaded?.directory === projectRoot() ? loaded.data : []
-        return [
-          ...new Set([...list, ...(current && current.toLowerCase().includes(state.search.toLowerCase()) ? [current] : [])]),
-        ].slice(0, 50)
-      },
-      searchBranches,
      openAll: input.onViewAll,
    },
    bar: {
@@ -1,5 +1,4 @@
-import { createMemo, For, Show } from "solid-js"
-import { createStore } from "solid-js/store"
+import { createMemo, createSignal, For, Show } from "solid-js"
 import { Menu } from "@opencode-ai/ui/menu"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -11,24 +10,20 @@ export function PromptWorkspaceSelector(props: {
  value: string
  projectRoot: string
  workspaces: string[]
-  branches: string[]
  branch?: string
  onboarding?: boolean
  onChange: (value: string) => void
-  onCreate: (branch: string) => void
-  onSearch: (search: string) => void
  onDone: () => void
  onViewAll: () => void
 }) {
  const language = useLanguage()
-  const [search, setSearch] = createStore({ workspaces: "", branches: "" })
+  const [search, setSearch] = createSignal("")
  let searchInput: HTMLInputElement | undefined
-  let branchSearchInput: HTMLInputElement | undefined
  let focusSearch = false
-  let pending: { type: "select"; value: string } | { type: "create"; branch: string } | { type: "viewAll" } | undefined
+  let pending: { type: "select"; value: string } | { type: "viewAll" } | undefined
  const selected = () => (sameDirectory(props.value, props.projectRoot) ? "main" : props.value)
  const workspaces = createMemo(() => {
-    const query = search.workspaces.trim().toLowerCase()
+    const query = search().trim().toLowerCase()
    if (!query) return props.workspaces
    return props.workspaces.filter((workspace) => getFilename(workspace).toLowerCase().includes(query))
  })
@@ -42,14 +37,12 @@ export function PromptWorkspaceSelector(props: {
  }
  const onOpenChange = (open: boolean) => {
    if (open) {
-      setSearch({ workspaces: "", branches: "" })
-      props.onSearch("")
+      setSearch("")
      return
    }
    const action = pending
    pending = undefined
    if (action?.type === "select") props.onChange(action.value)
-    if (action?.type === "create") props.onCreate(action.branch)
    if (action?.type === "viewAll") {
      props.onViewAll()
      return
@@ -127,7 +120,21 @@ export function PromptWorkspaceSelector(props: {
                </Menu.Item>
                <Menu.Item onSelect={() => select("create")}>
                  <Icon name="workspace-new" />
-                  <span class="min-w-0 flex-1 truncate">{language.t("workspace.new")}</span>
+                  <Tooltip
+                    placement="right"
+                    openDelay={800}
+                    value={
+                      <span class="flex flex-col gap-0.5">
+                        <span>{language.t("workspace.new")}</span>
+                        <span class="font-[440] text-v2-text-text-muted">
+                          {language.t("session.new.workspace.new.tooltip")}
+                        </span>
+                      </span>
+                    }
+                    class="min-w-0 flex-1"
+                  >
+                    <span class="min-w-0 truncate">{language.t("workspace.new")}</span>
+                  </Tooltip>
                  <Show when={selected() === "create"}>
                    <Icon name="check" size="small" class="shrink-0" />
                  </Show>
@@ -184,11 +191,11 @@ export function PromptWorkspaceSelector(props: {
                            ref={(element) => {
                              searchInput = element
                            }}
-                            value={search.workspaces}
+                            value={search()}
                            placeholder={language.t("session.new.workspace.search.placeholder")}
                            aria-label={language.t("session.new.workspace.search.placeholder")}
                            class="h-7 min-w-0 flex-1 border-0 bg-transparent text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base outline-none placeholder:text-v2-text-text-faint"
-                            onInput={(event) => setSearch("workspaces", event.currentTarget.value)}
+                            onInput={(event) => setSearch(event.currentTarget.value)}
                            onKeyDown={(event) => {
                              if (
                                event.key === "Escape" ||
@@ -225,94 +232,7 @@ export function PromptWorkspaceSelector(props: {
          </Menu.Portal>
        </Menu>
      </Tooltip>
-      <Show
-        when={selected() === "create" && props.branch}
-        fallback={<PromptGitStatus branch={props.branch} from={selected() === "create"} class="ms-1" />}
-      >
-        <Tooltip
-          placement="top"
-          value={language.t("session.new.workspace.fromBranch", { branch: props.branch! })}
-          class="ms-1 min-w-0 max-w-[220px]"
-          contentClass="max-w-[calc(100vw-32px)] break-all"
-        >
-          <Menu
-            placement="bottom"
-            gutter={4}
-            onOpenChange={(open) => {
-              onOpenChange(open)
-              if (open) requestAnimationFrame(() => branchSearchInput?.focus())
-            }}
-          >
-            <Menu.Trigger class="flex h-6 min-w-0 max-w-[220px] items-center gap-1.5 rounded-full bg-v2-background-bg-layer-02 px-2.5 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-faint transition-colors hover:bg-v2-background-bg-layer-03 hover:text-v2-text-text-muted focus-visible:bg-v2-background-bg-layer-03 focus-visible:text-v2-text-text-muted focus-visible:outline-none data-[expanded]:bg-v2-background-bg-layer-03 data-[expanded]:text-v2-text-text-muted">
-              <Icon name="branch-out" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-              <span class="min-w-0 truncate">
-                {language.t("session.new.workspace.fromBranch", { branch: props.branch! })}
-              </span>
-              <Icon name="chevron-down" size="small" class="shrink-0 text-v2-icon-icon-muted" />
-            </Menu.Trigger>
-            <Menu.Portal>
-              <Menu.Content class="w-[243px] overflow-hidden rounded-md border-0 bg-v2-background-bg-layer-01 shadow-[var(--v2-elevation-floating)] focus:outline-none">
-                <div class="flex h-7 shrink-0 items-center gap-2 rounded-sm pl-3 pr-2.5 text-v2-icon-icon-muted">
-                  <Icon name="magnifying-glass" size="small" class="shrink-0" />
-                  <input
-                    ref={(element) => {
-                      branchSearchInput = element
-                    }}
-                    value={search.branches}
-                    placeholder={language.t("session.new.workspace.branch.search.placeholder")}
-                    aria-label={language.t("session.new.workspace.branch.search.placeholder")}
-                    class="h-7 min-w-0 flex-1 border-0 bg-transparent text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base outline-none placeholder:text-v2-text-text-faint"
-                    onInput={(event) => {
-                      setSearch("branches", event.currentTarget.value)
-                      props.onSearch(event.currentTarget.value)
-                    }}
-                    onKeyDown={(event) => {
-                      if (
-                        event.key === "Escape" ||
-                        event.key === "ArrowDown" ||
-                        event.key === "ArrowUp" ||
-                        event.key === "Enter"
-                      )
-                        return
-                      event.stopPropagation()
-                    }}
-                  />
-                  <Show when={search.branches.trim()}>
-                    <button
-                      type="button"
-                      class="flex size-5 items-center justify-center rounded-sm text-v2-icon-icon-muted hover:bg-v2-overlay-simple-overlay-hover"
-                      onPointerDown={(event) => event.preventDefault()}
-                      onClick={() => {
-                        setSearch("branches", "")
-                        props.onSearch("")
-                      }}
-                      aria-label={language.t("common.clear")}
-                    >
-                      <Icon name="close-small" size="small" />
-                    </button>
-                  </Show>
-                </div>
-                <div class="max-h-[224px] overflow-y-auto">
-                  <Menu.RadioGroup value={props.branch}>
-                    <For each={props.branches}>
-                      {(branch) => (
-                        <Menu.RadioItem
-                          value={branch}
-                          class="h-7 gap-2 rounded-sm px-3 text-[13px] font-[440] leading-5 tracking-[-0.04px] text-v2-text-text-base [font-family:var(--v2-font-family-sans)] data-[highlighted]:!bg-v2-overlay-simple-overlay-hover"
-                          closeOnSelect
-                          onSelect={() => (pending = { type: "create", branch })}
-                        >
-                          <span class="min-w-0 truncate leading-5">{branch}</span>
-                        </Menu.RadioItem>
-                      )}
-                    </For>
-                  </Menu.RadioGroup>
-                </div>
-              </Menu.Content>
-            </Menu.Portal>
-          </Menu>
-        </Tooltip>
-      </Show>
+      <PromptGitStatus branch={props.branch} from={selected() === "create"} class="ms-1" />
    </>
  )
 }
@@ -1,21 +0,0 @@
-import { createMemo, type Accessor } from "solid-js"
-import createPresence from "solid-presence"
-
-export function createAnimatedPresence<T>(value: Accessor<T | undefined>, element: Accessor<HTMLElement | null>) {
-  const animation = createMemo<{ show: boolean; animate: boolean; value: T | undefined }>((previous) => {
-    const current = value()
-    const show = current !== undefined
-    return {
-      show,
-      animate: previous !== undefined && (previous.animate || previous.show !== show),
-      value: current ?? previous?.value,
-    }
-  })
-  const presence = createPresence({ show: () => animation().show, element })
-  return {
-    ...presence,
-    show: () => animation().show,
-    animate: () => animation().animate,
-    value: () => animation().value,
-  }
-}
@@ -374,8 +374,6 @@ export const dict = {
  "dialog.server.menu.default": "Set as default",
  "dialog.server.menu.defaultRemove": "Remove default",
  "dialog.server.menu.delete": "Delete",
-  "dialog.server.menu.hide": "Hide from project list",
-  "dialog.server.menu.show": "Show in project list",
  "dialog.server.current": "Current Server",
  "dialog.server.status.default": "Default",
  "wsl.server.add": "Add WSL server",
@@ -460,8 +458,7 @@ export const dict = {
  "dialog.project.edit.color": "Color",
  "dialog.project.edit.color.select": "Select {{color}} color",
  "dialog.project.edit.worktree.startup": "Workspace startup script",
-  "dialog.project.edit.worktree.startup.description":
-    "Runs after creating a new workspace (worktree). Use $OPENCODE_WORKTREE_BASE for the base worktree and $OPENCODE_WORKTREE_PATH for the new worktree.",
+  "dialog.project.edit.worktree.startup.description": "Runs after creating a new workspace (worktree).",
  "dialog.project.edit.worktree.startup.placeholder": "e.g. bun install",

  "dialog.releaseNotes.action.getStarted": "Get started",
@@ -500,7 +497,7 @@ export const dict = {
  "context.stats.lastActivity": "Last Activity",

  "context.usage.tokens": "Tokens",
-  "context.usage.usage": "Context Usage",
+  "context.usage.usage": "Usage",
  "context.usage.cost": "Cost",
  "context.usage.clickToView": "Click to view context",
  "context.usage.view": "View context usage",
@@ -678,14 +675,6 @@ export const dict = {
  "session.background.subagent.one": "{{count}} subagent",
  "session.background.subagent.other": "{{count}} subagents",
  "command.session.background": "Move to background",
-  "session.queue.count.one": "{{count}} queued",
-  "session.queue.count.other": "{{count}} queued",
-  "session.queue.steer": "Steer",
-  "session.queue.send": "Send",
-  "session.queue.steerTooltip": "Send without interrupting",
-  "session.queue.remove": "Remove",
-  "session.queue.reorder": "Reorder queued prompt",
-  "session.queue.attachments": "+ attachments",
  "session.timeline.notice.finished": "{{actor}} finished",
  "session.timeline.notice.failed": "{{actor}} failed",
  "session.timeline.notice.cancelled": "{{actor}} cancelled",
@@ -970,11 +959,6 @@ export const dict = {
  "settings.general.row.showCustomAgents.title": "Show agent",
  "settings.general.row.showCustomAgents.description":
    "Switch between agents in the composer. When hidden, defaults to Build agent.",
-  "settings.general.row.followUpBehavior.title": "Follow-up behavior",
-  "settings.general.row.followUpBehavior.description":
-    "Choose whether to queue follow-ups or steer the current turn. Use {{keybind}} to switch.",
-  "settings.general.row.followUpBehavior.queue": "Queue",
-  "settings.general.row.followUpBehavior.steer": "Steer",
  "settings.general.row.reasoningSummaries.title": "Show reasoning summaries",
  "settings.general.row.reasoningSummaries.description": "Display model reasoning summaries in the timeline",
  "settings.general.row.shellToolPartsExpanded.title": "Expand shell tool parts",
@@ -1152,8 +1136,6 @@ export const dict = {
  "session.new.workspace.local.tooltip": "Use current checkout",
  "session.new.workspace.new.tooltip": "Create isolated checkout",
  "session.new.workspace.fromBranch": "from {{branch}}",
-  "session.new.workspace.createFrom": "Create from branch",
-  "session.new.workspace.branch.search.placeholder": "Search branches",
  "session.new.workspace.trigger.tooltip": "Select where to run session",
  "session.new.workspace.search.placeholder": "Search workspaces",
  "settings.tab.workspaces": "Workspaces",
--- a/Show More
+++ b/Show More