fix(plugin): own effect plugin runtime

2026-08-25 19:16:15 +00:00 · 2026-08-24 09:17:45 -04:00
303 changed files with 3409 additions and 14917 deletions
@@ -0,0 +1,5 @@
+---
+"@opencode-ai/plugin": patch
+---
+
+Export the Effect runtime used by Effect plugins and safely adapt its tool schemas across host module instances.
@@ -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!

@@ -89,12 +89,6 @@ jobs:
        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()
        timeout-minutes: 10
@@ -430,7 +430,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 +595,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": [
@@ -1091,9 +1090,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",
@@ -1611,8 +1610,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=="],
@@ -2221,27 +2218,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=="],

@@ -6135,8 +6132,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=="],
@@ -6961,10 +6956,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=="],
@@ -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-rIg+QSwF0kmPRnlPrpV7IlPTrHAxvoBOjdtoFOcUnKc=",
-    "aarch64-linux": "sha256-74rMnqiGy7gAUDWr9HWBc6Sn3kxh/hDfm5kp+I4fjok=",
-    "aarch64-darwin": "sha256-ImASKYxUQDHzH/UuwXUBsMNkitAH5wDYESlevEy9qeA=",
-    "x86_64-darwin": "sha256-txPhXfZOSoQdNXPfddKSdKqdjEWrb9GkBb38h+pZIuo="
+    "x86_64-linux": "sha256-LvDHCOm8OAZfvb0I0L6AbdOevRoQmEJnnqrSgAiNHv8=",
+    "aarch64-linux": "sha256-O0L0iHjb4cwl9xWHIna8VFHyQzoAKzfY8oMpVNayMOg=",
+    "aarch64-darwin": "sha256-ETP8FE71NqufYDUbR7tBdsMEOVQ44wLmsZBeZiSRBRY=",
+    "x86_64-darwin": "sha256-WUcoLldDriT3QxcdlnBQhuPrxDNub0EDvvZXk/pDMpY="
  }
 }
@@ -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",
@@ -1,5 +1,5 @@
 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"
@@ -157,7 +157,7 @@ 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),
 })

@@ -361,8 +361,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 +371,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
@@ -705,26 +701,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.
@@ -831,30 +807,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
        }
@@ -1110,7 +1071,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,10 +1098,7 @@ 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]

@@ -1231,12 +1189,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 +1202,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 +1214,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 +1266,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,49 +1321,11 @@ 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") {
+    const block = event.content_block
+    if (block && (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)
@@ -1419,22 +1333,11 @@ const step = (state: ParserState, event: AnthropicEvent) => {
          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 })
+    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])
@@ -716,7 +716,7 @@ export const protocol = Protocol.make({
      reasoningSignatures: {},
    }),
    step,
-    onHalt: (state) => Effect.succeed(onHalt(state)),
+    onHalt,
  },
 })

@@ -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,
  },
 })

@@ -285,7 +285,6 @@ 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),
    summary_index: Schema.optional(Schema.Number),
@@ -666,8 +665,7 @@ const lowerMessages = Effect.fn("OpenResponses.lowerMessages")(function* (reques

 const lowerOptions = (request: LLMRequest) => {
  const options = OpenResponsesOptions.resolve(request)
-  const cacheKey = ProviderShared.promptCacheKey(request)
-  const parallelToolCalls = resolveParallelToolCalls(request)
+  const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
  return {
    ...(options.instructions ? { instructions: options.instructions } : {}),
    ...(options.store !== undefined ? { store: options.store } : {}),
@@ -685,18 +683,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
@@ -997,24 +988,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 || !state.tools[event.item_id]) 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
@@ -1207,6 +1186,7 @@ export const step = (state: ParserState, event: Event) => {
  if (
    event.type === "response.reasoning.done" ||
    event.type === "response.reasoning_summary_text.done" ||
+    event.type === "response.reasoning_summary.done" ||
    event.type === "response.reasoning_text.done"
  ) {
    if (!event.item_id) return ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
@@ -1225,7 +1205,7 @@ export const step = (state: ParserState, event: Event) => {
      return ProviderShared.eventError(state.id, `${event.type} message is missing id`)
    return Effect.succeed(onOutputItemAdded(state, event))
  }
-  if (event.type === "response.function_call_arguments.delta" || event.type === "response.function_call_arguments.done")
+  if (event.type === "response.function_call_arguments.delta")
    return event.item_id
      ? onFunctionCallArgumentsDelta(state, event)
      : ProviderShared.eventError(state.id, `${event.type} is missing item_id`)
@@ -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
 }

 // =============================================================================
@@ -280,18 +264,12 @@ interface LoweringOptions {
  ) => Schema.Schema.Type<typeof OpenAIChatCacheControl> | undefined
 }

-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 } : {}),
  },
  cache_control: options.cacheControl?.(tool.cache),
 })
@@ -550,122 +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)
+  const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
  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 } : {}),
+    ...(options.store !== undefined ? { store: options.store } : {}),
    ...(cacheKey ? { prompt_cache_key: cacheKey } : {}),
    ...(options.reasoningEffort ? { reasoning_effort: options.reasoningEffort } : {}),
  }
@@ -684,19 +551,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),
@@ -710,13 +566,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 }),
@@ -726,7 +580,7 @@ export const fromRequest = Effect.fn("OpenAIChat.fromRequest")(function* (
    presence_penalty: generation?.presencePenalty,
    seed: generation?.seed,
    stop: generation?.stop,
-    ...lowerOptions(request, supportsStore),
+    ...lowerOptions(request),
  }
 })

@@ -736,40 +590,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
@@ -882,20 +710,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
@@ -904,11 +728,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 ?? []
@@ -928,11 +749,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
    }

@@ -1004,19 +821,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.
@@ -1039,27 +851,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
@@ -1068,7 +869,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,
@@ -1082,7 +883,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
@@ -1111,7 +912,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"
@@ -111,10 +111,8 @@ const fromRequest = Effect.fn("OpenAIResponses.fromRequest")(function* (request:
    extension,
  )
  const toolSchemaCompatibility = request.model.compatibility?.toolSchema
-  const parallelToolCalls = OpenResponses.resolveParallelToolCalls(request)
  return {
    ...body,
-    ...(parallelToolCalls === undefined ? {} : { parallel_tool_calls: parallelToolCalls }),
    tools:
      request.tools.length === 0
        ? undefined
@@ -164,7 +162,7 @@ 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, event.item_id))
      : ProviderShared.eventError(ADAPTER, `${event.type} is missing item_id`)
@@ -207,7 +205,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"
@@ -28,10 +28,10 @@ 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
+export const clampPromptCacheKey = (key: string | undefined): string | undefined => {
+  if (key === undefined) return undefined
+  const chars = Array.from(key)
+  if (chars.length <= OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH) return key
  return chars.slice(0, OPENAI_PROMPT_CACHE_KEY_MAX_LENGTH).join("")
 }

@@ -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
@@ -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.
 */
@@ -9,7 +9,7 @@ import type { ProviderPackage } from "../provider-package.js"
 import * as OpenAICompatibleProfiles from "./openai-compatible-profile.js"
 import * as OpenAIChat from "../protocols/openai-chat.js"
 import { newBreakpoints, ttlBucket } from "../protocols/utils/cache.js"
-import { isRecord } from "../protocols/shared.js"
+import { isRecord, ProviderShared } from "../protocols/shared.js"

 export const profile = OpenAICompatibleProfiles.profiles.openrouter
 export const id = ProviderID.make(profile.provider)
@@ -115,10 +115,12 @@ export const protocol = Protocol.make({
              reasoning_details: reasoningDetails,
            }
          })
+          const cacheKey = ProviderShared.clampPromptCacheKey(request.promptCacheKey)
          return {
            ...body,
            messages,
            ...bodyOptions(request.providerOptions),
+            ...(cacheKey ? { prompt_cache_key: cacheKey } : {}),
          } 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({
@@ -321,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),
              )
@@ -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>

@@ -155,11 +155,6 @@ export class LanguageModelCompatibility extends Schema.Class<LanguageModelCompat
  reasoningField: Schema.optional(Schema.String),
  maxTokensField: Schema.optional(LanguageModelMaxTokensFieldCompatibility),
  requireFinishReason: 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 {
@@ -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,
@@ -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" })
    }),
@@ -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({
@@ -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,
      })
    }),
@@ -192,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({
@@ -341,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?" },
@@ -361,7 +345,6 @@ describe("OpenAI Chat route", () => {
        tools: [],
        stream: true,
        stream_options: { include_usage: true },
-        store: false,
      })
    }),
  )
@@ -1179,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",
@@ -1266,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" }],
-      })
    }),
  )

@@ -1284,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)))
@@ -1292,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,
            },
          },
        ],
@@ -353,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: "" })
    }),
  )

@@ -472,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,40 +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({
@@ -117,7 +117,6 @@ describe("OpenAI Responses route", () => {
          { role: "user", content: [{ type: "input_text", text: "Say hello." }] },
        ],
        store: false,
-        include: ["reasoning.encrypted_content"],
        stream: true,
        max_output_tokens: 20,
        temperature: 0,
@@ -259,31 +258,6 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("maps the canonical parallel tool setting with provider-option precedence", () =>
-    Effect.gen(function* () {
-      const disabled = yield* compileRequest(
-        LLMRequest.update(request, {
-          toolChoice: { type: "auto", disableParallelToolUse: true },
-        }),
-      )
-      const enabled = yield* compileRequest(
-        LLMRequest.update(request, {
-          toolChoice: { type: "auto", disableParallelToolUse: false },
-        }),
-      )
-      const overridden = yield* compileRequest(
-        LLMRequest.update(request, {
-          toolChoice: { type: "auto", disableParallelToolUse: true },
-          providerOptions: { parallelToolCalls: true },
-        }),
-      )
-
-      expect(disabled.body.parallel_tool_calls).toBe(false)
-      expect(enabled.body.parallel_tool_calls).toBe(true)
-      expect(overridden.body.parallel_tool_calls).toBe(true)
-    }),
-  )
-
  it.effect("lowers chronological system updates to developer messages in order", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(
@@ -314,12 +288,7 @@ describe("OpenAI Responses route", () => {
      expect(prepared.route).toBe("openai-responses")
      expect(prepared.protocol).toBe("openai-responses")
      expect(prepared.metadata).toEqual({ transport: "http-json" })
-      expect(prepared.body).toMatchObject({
-        model: "gpt-4.1-mini",
-        store: false,
-        include: ["reasoning.encrypted_content"],
-        stream: true,
-      })
+      expect(prepared.body).toMatchObject({ model: "gpt-4.1-mini", store: false, stream: true })
    }),
  )

@@ -391,7 +360,6 @@ describe("OpenAI Responses route", () => {
        model: "gpt-4.1-mini",
        input: [{ role: "user", content: [{ type: "input_text", text: "Say hello." }] }],
        store: false,
-        include: ["reasoning.encrypted_content"],
      })
    }),
  )
@@ -1196,7 +1164,6 @@ describe("OpenAI Responses route", () => {
          { type: "function_call_output", call_id: "call_1", output: '{"forecast":"sunny"}' },
        ],
        store: false,
-        include: ["reasoning.encrypted_content"],
        stream: true,
        max_output_tokens: undefined,
        temperature: undefined,
@@ -1641,11 +1608,11 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("requests encrypted reasoning by default", () =>
+  it.effect("omits include when no include is set", () =>
    Effect.gen(function* () {
      const prepared = yield* compileRequest(LLM.request({ model, prompt: "hi", providerOptions: { store: false } }))

-      expect(prepared.body.include).toEqual(["reasoning.encrypted_content"])
+      expect(prepared.body.include).toBeUndefined()
    }),
  )

@@ -1699,21 +1666,6 @@ describe("OpenAI Responses 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: "request_cache",
-          cache: "none",
-        }),
-      )
-
-      expect(prepared.body).not.toHaveProperty("prompt_cache_key")
-    }),
-  )
-
  it.effect("parses text and usage stream fixtures", () =>
    Effect.gen(function* () {
      const body = sseEvents(
@@ -2009,11 +1961,6 @@ describe("OpenAI Responses route", () => {
                item_id: "fc_missing",
                delta: '{"orphaned":true}',
              },
-              {
-                type: "response.function_call_arguments.done",
-                item_id: "fc_missing",
-                arguments: '{"orphaned":true}',
-              },
              { type: "response.completed", response: { id: "resp_1" } },
            ),
          ),
@@ -2026,22 +1973,22 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("rejects function argument events without the spec-required item id", () =>
+  it.effect("rejects function argument deltas without the spec-required item id", () =>
    Effect.gen(function* () {
-      const events = [
-        { type: "response.function_call_arguments.delta", delta: "{}" },
-        { type: "response.function_call_arguments.done", arguments: "{}" },
-      ]
+      const error = yield* LLMClient.generate(request).pipe(
+        Effect.provide(
+          fixedResponse(
+            sseEvents(
+              { type: "response.function_call_arguments.delta", delta: "{}" },
+              { type: "response.completed", response: { id: "resp_1" } },
+            ),
+          ),
+        ),
+        Effect.flip,
+      )

-      for (const event of events) {
-        const error = yield* LLMClient.generate(request).pipe(
-          Effect.provide(fixedResponse(sseEvents(event, { type: "response.completed", response: { id: "resp_1" } }))),
-          Effect.flip,
-        )
-
-        expect(error.reason._tag).toBe("InvalidProviderOutput")
-        expect(error.message).toContain(`${event.type} is missing item_id`)
-      }
+      expect(error.reason._tag).toBe("InvalidProviderOutput")
+      expect(error.message).toContain("response.function_call_arguments.delta is missing item_id")
    }),
  )

@@ -2834,14 +2781,12 @@ describe("OpenAI Responses route", () => {
          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-end",
@@ -2885,172 +2830,6 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("emits only missing function arguments from the arguments done event", () =>
-    Effect.gen(function* () {
-      const body = sseEvents(
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", id: "fc_item_1", call_id: "call_1", name: "lookup", arguments: "" },
-        },
-        { type: "response.function_call_arguments.delta", item_id: "fc_item_1", delta: '{"query"' },
-        {
-          type: "response.function_call_arguments.done",
-          item_id: "fc_item_1",
-          arguments: '{"query":"weather"}',
-        },
-        {
-          type: "response.output_item.done",
-          item: {
-            type: "function_call",
-            id: "fc_item_1",
-            call_id: "call_1",
-            name: "lookup",
-            arguments: '{"query":"weather"}',
-          },
-        },
-        { type: "response.completed", response: { id: "resp_1" } },
-      )
-      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.events.filter((event) => event.type === "tool-input-delta")).toEqual([
-        { 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" } },
-      ])
-      expect(response.events.filter(LLMEvent.is.toolInputEnd)).toHaveLength(1)
-      expect(response.events.filter(LLMEvent.is.toolCall)).toEqual([
-        {
-          type: "tool-call",
-          id: "call_1",
-          name: "lookup",
-          input: { query: "weather" },
-          providerExecuted: undefined,
-          providerMetadata: { openai: { itemId: "fc_item_1" } },
-        },
-      ])
-    }),
-  )
-
-  it.effect("streams complete function arguments supplied only by the arguments done event", () =>
-    Effect.gen(function* () {
-      const body = sseEvents(
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", id: "fc_item_1", call_id: "call_1", name: "lookup", arguments: "" },
-        },
-        {
-          type: "response.function_call_arguments.done",
-          item_id: "fc_item_1",
-          arguments: '{"query":"weather"}',
-        },
-        { type: "response.completed", response: { id: "resp_1" } },
-      )
-      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.events.filter((event) => event.type === "tool-input-delta")).toEqual([
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: '{"query":"weather"}',
-          input: { query: "weather" },
-        },
-      ])
-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({ input: { query: "weather" } })
-      expect(response.finishReason.normalized).toBe("tool-calls")
-    }),
-  )
-
-  it.effect("does not repeat function arguments already supplied by deltas", () =>
-    Effect.gen(function* () {
-      const body = sseEvents(
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", id: "fc_item_1", call_id: "call_1", name: "lookup", arguments: "" },
-        },
-        {
-          type: "response.function_call_arguments.delta",
-          item_id: "fc_item_1",
-          delta: '{"query":"weather"}',
-        },
-        {
-          type: "response.function_call_arguments.done",
-          item_id: "fc_item_1",
-          arguments: '{"query":"weather"}',
-        },
-        { type: "response.completed", response: { id: "resp_1" } },
-      )
-      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.events.filter((event) => event.type === "tool-input-delta")).toHaveLength(1)
-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({ input: { query: "weather" } })
-    }),
-  )
-
-  it.effect("uses authoritative arguments done input without emitting a mismatched delta", () =>
-    Effect.gen(function* () {
-      const body = sseEvents(
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", id: "fc_item_1", call_id: "call_1", name: "lookup", arguments: "" },
-        },
-        {
-          type: "response.function_call_arguments.delta",
-          item_id: "fc_item_1",
-          delta: '{"query":"streamed"}',
-        },
-        {
-          type: "response.function_call_arguments.done",
-          item_id: "fc_item_1",
-          arguments: '{"query":"final"}',
-        },
-        { type: "response.completed", response: { id: "resp_1" } },
-      )
-      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.events.filter((event) => event.type === "tool-input-delta")).toEqual([
-        {
-          type: "tool-input-delta",
-          id: "call_1",
-          name: "lookup",
-          text: '{"query":"streamed"}',
-          input: { query: "streamed" },
-        },
-      ])
-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({ input: { query: "final" } })
-    }),
-  )
-
-  it.effect("lets completed output item arguments override the arguments done event", () =>
-    Effect.gen(function* () {
-      const body = sseEvents(
-        {
-          type: "response.output_item.added",
-          item: { type: "function_call", id: "fc_item_1", call_id: "call_1", name: "lookup", arguments: "" },
-        },
-        {
-          type: "response.function_call_arguments.done",
-          item_id: "fc_item_1",
-          arguments: '{"query":"arguments-done"}',
-        },
-        {
-          type: "response.output_item.done",
-          item: {
-            type: "function_call",
-            id: "fc_item_1",
-            call_id: "call_1",
-            name: "lookup",
-            arguments: '{"query":"output-item-done"}',
-          },
-        },
-        { type: "response.completed", response: { id: "resp_1" } },
-      )
-      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))
-
-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({ input: { query: "output-item-done" } })
-      expect(response.events.filter(LLMEvent.is.toolCall)).toHaveLength(1)
-    }),
-  )
-
  it.effect("finalizes a pending function call at response completion", () =>
    Effect.gen(function* () {
      const body = sseEvents(
@@ -3084,7 +2863,7 @@ describe("OpenAI Responses route", () => {
    }),
  )

-  it.effect("recovers authoritative incomplete final function arguments", () =>
+  it.effect("emits malformed final function arguments as an unexecuted tool error", () =>
    Effect.gen(function* () {
      const body = sseEvents(
        {
@@ -3110,17 +2889,18 @@ describe("OpenAI Responses route", () => {
        }),
      ).pipe(Effect.provide(fixedResponse(body)))

-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({
+      expect(response.events.find(LLMEvent.is.toolInputError)).toEqual({
+        type: "tool-input-error",
        id: "call_1",
        name: "lookup",
-        input: { query: "partial" },
+        raw: '{"query":"partial',
      })
      expect(response.finishReason.normalized).toBe("tool-calls")
-      expect(response.events.some(LLMEvent.is.toolInputError)).toBeFalse()
+      expect(response.events.some(LLMEvent.is.toolCall)).toBeFalse()
    }),
  )

-  it.effect("recovers incomplete function arguments when output_item.added is absent", () =>
+  it.effect("settles malformed function arguments when output_item.added is absent", () =>
    Effect.gen(function* () {
      const body = sseEvents(
        {
@@ -3137,10 +2917,10 @@ describe("OpenAI Responses route", () => {
      )
      const response = yield* LLMClient.generate(request).pipe(Effect.provide(fixedResponse(body)))

-      expect(response.events.find(LLMEvent.is.toolCall)).toMatchObject({
+      expect(response.events.find(LLMEvent.is.toolInputError)).toMatchObject({
        id: "call_1",
        name: "lookup",
-        input: { query: "partial" },
+        raw: '{"query":"partial',
      })
      expect(response.finishReason.normalized).toBe("tool-calls")
    }),
@@ -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> = {
@@ -21,17 +21,6 @@ describe("xAI Responses route", () => {

      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()
    }),
  )

@@ -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(
@@ -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',
+          },
        ],
      })
    }),
@@ -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)")
@@ -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(
@@ -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)
@@ -174,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,
@@ -35,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 & {
@@ -400,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 ?? [])
@@ -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 = {
@@ -3,7 +3,7 @@ import { type HomeProjectSelection, useLayout } from "@/shell/state/layout"
 import { ServerConnection, useServers } 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()
@@ -49,7 +49,8 @@ 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,
@@ -72,7 +72,7 @@ export function createHomeSessionsController(home: HomeController) {
    if (!ctx || !conn) return []
    const server = ServerConnection.key(conn)
    return retainHomeSessions(
-      mergeHomeSessionIndex(sessionLoad.isPending ? [] : (sessionLoad.data?.() ?? []), ctx.data.session.list()).filter(
+      mergeHomeSessionIndex(sessionLoad.data?.() ?? [], ctx.data.session.list()).filter(
        (session) => !removed.keys.includes(`${server}\0${session.id}`),
      ),
      HOME_SESSION_LIMIT,
@@ -256,7 +256,7 @@ export function createHomeSessionsController(home: HomeController) {
    data: {
      records,
      groups,
-      loading: () => sessionLoad.isPending,
+      loading: () => sessionLoad.isLoading,
      searchRecords: allRecords,
    },
    session: {
@@ -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()}
@@ -1,6 +1,6 @@
 import type { SessionInfo } from "@opencode-ai/client/promise"
 import { Key } from "@solid-primitives/keyed"
-import { createMemo, For, Index, onCleanup, Show } from "solid-js"
+import { createMemo, For, Index, onCleanup, Show, Suspense } from "solid-js"
 import { createStore, type SetStoreFunction } from "solid-js/store"
 import { InlineInput } from "@opencode-ai/ui/inline-input"
 import { Spinner } from "@opencode-ai/ui/spinner"
@@ -44,7 +44,6 @@ function isBackgroundOpen(event: MouseEvent) {
 export type HomeSessionsViewProps = {
  language: ReturnType<typeof useLanguage>
  groups: HomeSessionGroup[]
-  loading: boolean
  showProjectName: boolean
  server: ServerConnection.Key
  canCreateSession: boolean
@@ -98,20 +97,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 +122,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")} />
@@ -164,7 +164,7 @@ export function HomeSessionsView(props: HomeSessionsViewProps) {
              </Index>
            </div>
          </Show>
-        </Show>
+        </Suspense>
      </div>
    </section>
  )
@@ -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>
@@ -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,
-  }
-}
@@ -677,14 +677,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",
@@ -969,11 +961,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",
@@ -66,11 +66,11 @@ export function createServerSyncContextInner(serverSDK: ServerSDK, data: Data) {
    provider_auth: {},
    get path() {
      const EMPTY = { state: "", config: "", worktree: "", directory: "", home: "" }
-      if (pathQuery.isPending) return EMPTY
+      if (pathQuery.isLoading) return EMPTY
      return pathQuery.data ?? EMPTY
    },
    get config() {
-      if (configQuery.isPending) return {}
+      if (configQuery.isLoading) return {}
      return configQuery.data ?? {}
    },
    get reload() {
@@ -193,9 +193,9 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
  }

  const openTerminal = () => {
-    actions.session.layout.view().terminal.open()
    if (terminal.all().length > 0) terminal.new({ focus: true })
    if (terminal.all().length === 0) terminal.requestFocus()
+    actions.session.layout.view().terminal.open()
  }

  const closeTerminal = () => {
@@ -361,8 +361,8 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
          actions.session.layout.view().terminal.close()
          return
        }
-        actions.session.layout.view().terminal.open()
        terminal.requestFocus(terminal.active())
+        actions.session.layout.view().terminal.open()
      },
    }),
    viewCommand({
@@ -37,11 +37,7 @@ export function createActiveComposerAdapter(input: {
      current: () => data.session.get(id),
      admitted: (messageID) => data.session.input.has(id, messageID) || !!data.session.message.get(id, messageID),
    }),
-    interrupt: () =>
-      server.api.session
-        .interrupt({ sessionID: id, continue: true })
-        .then(() => undefined)
-        .catch(() => undefined),
+    interrupt: () => server.api.session.interrupt({ sessionID: id, continue: true }).catch(() => undefined),
  }
  return adapter
 }
@@ -1,186 +0,0 @@
-import { createMemo, For, Show } from "solid-js"
-import { DragDropProvider, PointerSensor } from "@dnd-kit/solid"
-import { isSortable, useSortable } from "@dnd-kit/solid/sortable"
-import { AutoScroller, Feedback, PointerActivationConstraints } from "@dnd-kit/dom"
-import { RestrictToVerticalAxis } from "@dnd-kit/abstract/modifiers"
-import { RestrictToElement } from "@dnd-kit/dom/modifiers"
-import { arrayMove } from "@dnd-kit/helpers"
-import { Button } from "@opencode-ai/ui/button"
-import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { useLanguage } from "@/runtime/i18n/language"
-import type { SessionQueueView } from "./queue"
-
-// Pullout above the composer listing the prompts queued behind the current
-// turn. The panel slides under the composer card (negative margin, opaque
-// composer background) so the two read as one attached surface.
-export function SessionQueuePanel(props: { queue: SessionQueueView }) {
-  const language = useLanguage()
-  const count = () => props.queue.rows().length
-  let listRef!: HTMLDivElement
-  return (
-    <Show when={count() > 0}>
-      <div
-        data-component="session-queue-panel"
-        class="relative z-0 -mb-3 rounded-xl bg-v2-background-bg-base px-1.5 pt-1.5 pb-[18px] shadow-[inset_0_0_0_0.5px_var(--v2-border-border-base)]"
-      >
-        <Show when={count() > 3}>
-          <div class="px-1.5 pb-px text-[11px] font-[530] uppercase leading-[var(--line-height-tight)] tracking-[0.05px] text-v2-text-text-muted [font-variant-numeric:tabular-nums]">
-            {language.plural("session.queue.count", count())}
-          </div>
-        </Show>
-        <DragDropProvider
-          sensors={(defaults) => [
-            ...defaults.filter((sensor) => sensor !== PointerSensor),
-            PointerSensor.configure({
-              activationConstraints: [new PointerActivationConstraints.Distance({ value: 4 })],
-            }),
-          ]}
-          modifiers={[RestrictToVerticalAxis, RestrictToElement.configure({ element: () => listRef })]}
-          plugins={(defaults) => [
-            ...defaults.filter((plugin) => plugin !== AutoScroller && plugin !== Feedback),
-            AutoScroller.configure({ acceleration: 8, threshold: { x: 0, y: 0.05 } }),
-            Feedback.configure({ dropAnimation: null }),
-          ]}
-          onDragEnd={(event) => {
-            const source = event.operation.source
-            if (event.canceled || !isSortable(source)) return
-            if (source.initialIndex === source.index) return
-            void props.queue.reorder(
-              arrayMove(
-                props.queue.rows().map((row) => row.id),
-                source.initialIndex,
-                source.index,
-              ),
-            )
-          }}
-        >
-          {/* Keyed on row IDs so store updates move row elements instead of
-              remounting them, which would kill an in-flight drag. */}
-          <div
-            ref={listRef}
-            class="flex flex-col gap-px"
-            classList={{ "max-h-[131px] overflow-y-auto": count() > 3 }}
-          >
-            <For each={props.queue.rows().map((row) => row.id)}>
-              {(id, index) => <SessionQueueRow queue={props.queue} id={id} index={index()} />}
-            </For>
-          </div>
-        </DragDropProvider>
-      </div>
-    </Show>
-  )
-}
-
-function SessionQueueRow(props: { queue: SessionQueueView; id: string; index: number }) {
-  const language = useLanguage()
-  const row = createMemo(() => props.queue.rows().find((entry) => entry.id === props.id))
-  const editing = () => props.queue.editing() === props.id
-  // While the turn is stopped the queue stays parked, so the first prompt
-  // shows its actions without hover and its label reads Send: that is how a
-  // parked queue resumes.
-  const active = () => !props.queue.working() && props.index === 0
-  const sortable = useSortable({
-    get id() {
-      return props.id
-    },
-    get index() {
-      return props.index
-    },
-    get disabled() {
-      return props.queue.busy()
-    },
-  })
-  return (
-    <Show when={row()} keyed>
-      {(entry) => (
-        <div
-          ref={sortable.ref}
-          data-component="session-queue-row"
-          class="group/queue-row flex items-center justify-between gap-2 rounded-md py-1 ps-1 pe-2"
-          classList={{
-            "bg-v2-overlay-simple-overlay-hover": editing(),
-            "opacity-60": sortable.isDragSource(),
-          }}
-        >
-          <div class="flex min-w-0 flex-1 items-center gap-2">
-            <button
-              ref={sortable.handleRef}
-              type="button"
-              class="grid shrink-0 cursor-grab touch-none grid-cols-2 gap-x-[2px] gap-y-[2.25px] p-1"
-              aria-label={language.t("session.queue.reorder")}
-            >
-              <For each={Array.from({ length: 6 })}>
-                {() => <span class="size-[2px] bg-v2-background-bg-layer-04" />}
-              </For>
-            </button>
-            <div class="flex min-w-0 flex-col">
-              <button
-                type="button"
-                data-action="session-queue-edit"
-                dir="auto"
-                disabled={props.queue.busy()}
-                class="max-w-full min-w-0 self-start truncate rounded-sm text-start text-[13px] font-[440] leading-[var(--line-height-compact)]"
-                classList={{
-                  "text-v2-text-text-faint": editing(),
-                  "cursor-text text-v2-text-text-base hover:bg-v2-overlay-simple-overlay-hover": !editing(),
-                }}
-                onClick={() => props.queue.edit(props.id)}
-              >
-                {entry.text || (entry.attachments ? language.t("session.queue.attachments") : "")}
-              </button>
-              <Show when={entry.attachments && entry.text}>
-                <span class="text-[13px] font-[440] leading-[var(--line-height-compact)] text-v2-text-text-muted">
-                  {language.t("session.queue.attachments")}
-                </span>
-              </Show>
-            </div>
-          </div>
-          <div
-            data-slot="session-queue-actions"
-            class="flex shrink-0 items-center gap-1.5"
-            classList={{
-              "opacity-0 focus-within:opacity-100 group-hover/queue-row:opacity-100 [@media(hover:none)]:opacity-100":
-                !active() && !editing(),
-              "pointer-events-none": props.queue.busy(),
-            }}
-          >
-            <Show when={!editing()}>
-              <Tooltip
-                placement="top"
-                inactive={!props.queue.working()}
-                value={language.t("session.queue.steerTooltip")}
-              >
-                <Button
-                  data-action="session-queue-steer"
-                  type="button"
-                  size="small"
-                  variant="ghost-muted"
-                  icon="arrow-up"
-                  disabled={props.queue.busy()}
-                  class="text-v2-text-text-muted ![font-weight:530]"
-                  onClick={() => void props.queue.steer(props.id)}
-                >
-                  {props.queue.working() ? language.t("session.queue.steer") : language.t("session.queue.send")}
-                </Button>
-              </Tooltip>
-            </Show>
-            <Tooltip placement="top" value={language.t("session.queue.remove")}>
-              <IconButton
-                data-action="session-queue-remove"
-                type="button"
-                size="small"
-                variant="ghost-muted"
-                icon={<Icon name="outline-xmark" />}
-                disabled={props.queue.busy()}
-                aria-label={language.t("session.queue.remove")}
-                onClick={() => void props.queue.remove(props.id)}
-              />
-            </Tooltip>
-          </div>
-        </div>
-      )}
-    </Show>
-  )
-}
@@ -1,275 +0,0 @@
-import { createEffect, createMemo, onCleanup, type Accessor } from "solid-js"
-import { createStore } from "solid-js/store"
-import type { SessionInboxInfo } from "@opencode-ai/client/promise"
-import type { ComposerDelivery } from "@/composer/adapter"
-import type { ComposerModel } from "@/composer/model"
-import type { ComposerStateTarget } from "@/composer/submission-state"
-import type { ImageAttachmentPart, Prompt } from "@/composer/state"
-import { clonePrompt, promptLength } from "@/composer/prompt-parts"
-import { buildPromptRequest } from "@/composer/request"
-import { blobDataUrl } from "@/runtime/persistence/drafts"
-import { useData } from "@/runtime/server/current"
-import { useServerSDK } from "@/runtime/server/client"
-import { useWorkspaceLocation } from "@/workspaces/location"
-import { useLanguage } from "@/runtime/i18n/language"
-import { showToast } from "@/shell/notifications/toast"
-
-export type QueuedPrompt = Extract<SessionInboxInfo, { type: "user" }>
-
-type EditStash = {
-  prompt: Prompt
-  cursor: number
-  mode: "normal" | "shell"
-  retry: ReturnType<ComposerStateTarget["retry"]["current"]>
-}
-
-export function createSessionQueue(input: {
-  sessionID: string
-  draft: ComposerStateTarget
-  working: Accessor<boolean>
-  behavior: Accessor<ComposerDelivery>
-  composer: Accessor<ComposerModel | undefined>
-}) {
-  const data = useData()
-  const server = useServerSDK()
-  const location = useWorkspaceLocation()
-  const language = useLanguage()
-  const [state, setState] = createStore<{ editing?: { id: string; stash: EditStash }; busy: boolean }>({ busy: false })
-
-  const queued = createMemo(() =>
-    data.session.pending
-      .list(input.sessionID)
-      .filter((item): item is QueuedPrompt => item.type === "user" && item.delivery === "queue"),
-  )
-  const rows = createMemo(() =>
-    queued().map((item) => ({
-      id: item.id,
-      text: queuedPromptText(item),
-      attachments: (item.payload.files?.length ?? 0) > 0,
-    })),
-  )
-
-  createEffect(() => {
-    const editing = state.editing
-    if (!editing || state.busy || queued().some((item) => item.id === editing.id)) return
-    setState("editing", undefined)
-  })
-  onCleanup(() => cancelEdit())
-
-  const notify = () => showToast({ title: language.t("common.requestFailed") })
-  const run = (work: () => Promise<unknown>) => {
-    setState("busy", true)
-    return work()
-      .catch(() => notify())
-      .finally(async () => {
-        await data.session.pending.sync(input.sessionID).catch(() => undefined)
-        setState("busy", false)
-      })
-  }
-
-  const rewrite = async (inboxIDs: string[]) => {
-    const pending = await server.api.session.inbox.list({ sessionID: input.sessionID })
-    if (pending.some((item) => item.delivery === "queue" && item.type !== "user"))
-      throw new Error("Queued control items block reordering")
-    const current = pending.filter((item): item is QueuedPrompt => item.type === "user" && item.delivery === "queue")
-    const ordered = inboxIDs.flatMap((id) => current.filter((item) => item.id === id))
-    if (ordered.length !== current.length) throw new Error("Queued prompts changed before reordering")
-    const changed = ordered.findIndex((item, index) => item.id !== current[index]?.id)
-    if (changed < 0) return
-
-    // Existing inbox APIs cannot reorder rows, so replace only the changed suffix.
-    for (const item of ordered.slice(changed)) {
-      await data.session.prompt({
-        sessionID: input.sessionID,
-        text: item.payload.text,
-        files: item.payload.files?.map((file) => ({
-          uri: `data:${file.mime};base64,${file.data}`,
-          name: file.name,
-          description: file.description,
-          mention: file.mention,
-        })),
-        agents: item.payload.agents,
-        skills: item.payload.skills,
-        metadata: item.payload.metadata,
-        delivery: "queue",
-        resume: false,
-      })
-    }
-    for (const item of current.slice(changed)) {
-      await server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: item.id })
-    }
-  }
-  const steer = (id: string) => {
-    if (state.editing?.id === id) cancelEdit()
-    return server.api.session.inbox.steer({ sessionID: input.sessionID, inboxID: id }).catch(() => notify())
-  }
-  const remove = (id: string) => {
-    if (state.editing?.id === id) cancelEdit()
-    return server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: id }).catch(() => notify())
-  }
-  const reorder = (inboxIDs: string[]) => {
-    if (state.busy) return Promise.resolve()
-    return run(() => rewrite(inboxIDs))
-  }
-
-  const edit = (id: string) => {
-    if (state.busy) return false
-    if (state.editing?.id === id) return true
-    const item = queued().find((entry) => entry.id === id)
-    if (!item) return false
-    if (state.editing) cancelEdit()
-    const draft = input.draft.current()
-    setState("editing", {
-      id,
-      stash: {
-        prompt: clonePrompt(draft),
-        cursor: input.draft.cursor() ?? promptLength(draft),
-        mode: input.draft.mode.current(),
-        retry: input.draft.retry.current(),
-      },
-    })
-    const text = queuedPromptText(item)
-    input.composer()?.dispatch({ type: "mode.normal" })
-    input.draft.set([{ type: "text", content: text, start: 0, end: text.length }], text.length)
-    input.composer()?.restoreFocus(text.length)
-    return true
-  }
-  const cancelEdit = () => {
-    const editing = state.editing
-    if (!editing) return
-    setState("editing", undefined)
-    // Mode first, then prompt, then retry: mode and prompt writes both clear
-    // the retry marker.
-    input.composer()?.dispatch({ type: editing.stash.mode === "shell" ? "mode.shell" : "mode.normal" })
-    input.draft.set(editing.stash.prompt, editing.stash.cursor)
-    if (editing.stash.retry) input.draft.retry.set(editing.stash.retry)
-    input.composer()?.restoreFocus(editing.stash.cursor)
-  }
-  const confirmEdit = (delivery: ComposerDelivery) => {
-    const editing = state.editing
-    if (!editing || state.busy) return
-    const prompt = clonePrompt(input.draft.current())
-    const text = prompt.map((part) => ("content" in part ? part.content : "")).join("")
-    if (!text.trim() && !prompt.some((part) => part.type === "image")) return cancelEdit()
-    const item = queued().find((entry) => entry.id === editing.id)
-    const pristine = item && text.trim() === queuedPromptText(item) && !prompt.some((part) => part.type === "image")
-    if (pristine && delivery === "queue") return cancelEdit()
-    const inboxIDs = queued().map((entry) => entry.id)
-    void run(async () => {
-      const replacement = await editedPromptInput(input.sessionID, location().directory, item, prompt, text)
-      // Admit before cancelling so a failed replacement never discards the original.
-      const admitted = await data.session.prompt({
-        ...replacement,
-        delivery,
-        ...(delivery === "queue" ? { resume: false } : {}),
-      })
-      await server.api.session.inbox.cancel({ sessionID: input.sessionID, inboxID: editing.id })
-      cancelEdit()
-      if (delivery === "queue") await rewrite(inboxIDs.map((id) => (id === editing.id ? admitted.id : id)))
-    })
-  }
-  const editFirst = () => {
-    const first = queued()[0]
-    if (!first) return false
-    return edit(first.id)
-  }
-
-  return {
-    count: () => queued().length,
-    delivery: () => (input.working() ? input.behavior() : "steer"),
-    alternate: () => {
-      if (state.editing) return "steer"
-      if (!input.working()) return undefined
-      return input.behavior() === "queue" ? "steer" : "queue"
-    },
-    editing: () => state.editing?.id,
-    confirmEdit,
-    cancelEdit,
-    editFirst,
-    rows,
-    busy: () => state.busy,
-    working: input.working,
-    steer,
-    remove,
-    edit,
-    reorder,
-  }
-}
-
-export type SessionQueue = ReturnType<typeof createSessionQueue>
-
-// The slice of the queue the panel renders and drives.
-export type SessionQueueView = Pick<
-  SessionQueue,
-  "rows" | "editing" | "working" | "busy" | "steer" | "remove" | "edit" | "reorder"
->
-
-export function queuedPromptText(item: QueuedPrompt) {
-  const display = item.payload.metadata?.["displayText"]
-  return typeof display === "string" && display.length > 0 ? display : item.payload.text
-}
-
-// Confirming an edit submits the current composer content as the replacement:
-// mentions and images added during the edit are parsed like a normal
-// submission, the original's stored attachments are preserved, and the
-// review-comment notes appended to the original's model-visible text survive.
-// Ambient composer context (open review comments) stays out: it belongs to
-// the next fresh prompt, not to a queued edit.
-async function editedPromptInput(
-  sessionID: string,
-  directory: string,
-  item: QueuedPrompt | undefined,
-  prompt: Prompt,
-  text: string,
-) {
-  const images = await Promise.all(
-    prompt
-      .filter((part): part is ImageAttachmentPart => part.type === "image")
-      .map(async (part) => ({ ...part, dataUrl: await blobDataUrl(part.blob, part.mime) })),
-  )
-  const request = buildPromptRequest({ prompt, context: [], images, text, sessionDirectory: directory })
-  const payload = item?.payload
-  const display = item ? queuedPromptText(item) : ""
-  const notes = payload && display && payload.text.startsWith(display) ? payload.text.slice(display.length) : ""
-  const mention = (value: { start: number; end: number; text: string } | undefined) => {
-    if (!value) return undefined
-    const start = text.indexOf(value.text)
-    if (start < 0) return undefined
-    return { text: value.text, start, end: start + value.text.length }
-  }
-  // Structured mentions degrade to plain text in the editor, so an original
-  // agent or skill reference survives the edit as long as its mention text
-  // still appears; newly typed structured mentions come from the request.
-  const agents = [
-    ...(payload?.agents?.filter(
-      (agent) =>
-        agent.mention &&
-        text.includes(agent.mention.text) &&
-        !request.agents.some((entry) => entry.name === agent.name),
-    ) ?? []),
-    ...request.agents,
-  ]
-  const skills = [
-    ...(payload?.skills?.filter(
-      (skill) =>
-        skill.mention && text.includes(skill.mention.text) && !request.skills.some((entry) => entry.id === skill.id),
-    ) ?? []),
-    ...request.skills,
-  ]
-  return {
-    sessionID,
-    text: request.text + notes,
-    files: [
-      ...(payload?.files?.map((file) => ({
-        uri: `data:${file.mime};base64,${file.data}`,
-        name: file.name,
-        description: file.description,
-        mention: mention(file.mention),
-      })) ?? []),
-      ...request.files.map((file) => ({ uri: file.uri, name: file.name, mention: file.mention })),
-    ],
-    agents: agents.map((agent) => ({ name: agent.name, mention: mention(agent.mention) })),
-    skills: skills.map((skill) => ({ id: skill.id, mention: mention(skill.mention) })),
-    metadata: { ...payload?.metadata, displayText: request.displayText },
-  }
-}
@@ -6,7 +6,7 @@ import { makeEventListener } from "@solid-primitives/event-listener"
 import { useNavigate } from "@solidjs/router"
 import { createEffect, on, onMount } from "solid-js"
 import { Composer } from "@/composer/composer"
-import { createComposerModel, type ComposerModel } from "@/composer/model"
+import { createComposerModel } from "@/composer/model"
 import { useComposerState } from "@/composer/persistence"
 import { createComposerControls } from "@/composer/selection"
 import { setCursorPosition } from "@/composer/editor/dom"
@@ -27,11 +27,8 @@ import { createSessionRevert } from "../revert"
 import { SessionComposerRegion } from "./session-composer-region"
 import { createSessionComposerRegionController } from "./session-composer-region-controller"
 import { createActiveComposerAdapter } from "./adapter"
-import { createSessionQueue } from "./queue"
-import { SessionQueuePanel } from "./queue-panel"
 import { resolveSessionComposerSelection } from "./selection"
 import { createSessionRequestModel } from "../requests/model"
-import { useSettings } from "@/settings/model"

 export function createActiveSessionRegion(input: {
  session: SessionModel
@@ -159,7 +156,6 @@ export function createActiveSessionRegion(input: {
    session: input.session,
    setActiveMessage: input.timeline.actions.setActiveMessage,
  })
-  const revertMessage: NonNullable<SessionUserActions["revert"]> = ({ messageID }) => revert.to(messageID)
  useComposerCommands()
  useSessionCommands({
    session: input.session,
@@ -182,13 +178,7 @@ export function createActiveSessionRegion(input: {

  return {
    actions: {
-      timeline: {
-        get revert() {
-          if (input.session.data.isChild()) return
-          return revertMessage
-        },
-        openAttachment,
-      } satisfies SessionUserActions,
+      timeline: { revert: ({ messageID }) => revert.to(messageID), openAttachment } satisfies SessionUserActions,
    },
    region: {
      centered: input.screen.centered,
@@ -219,7 +209,6 @@ export function ActiveSessionComposerRegion(props: {
  accentSubmit: boolean
  onResponseSubmit: () => void
 }) {
-  const settings = useSettings()
  const region = createSessionComposerRegionController({
    state: props.model.region.state,
    parentID: props.session.data.parentID,
@@ -235,32 +224,11 @@ export function ActiveSessionComposerRegion(props: {
    submitted: props.model.submitted,
    setEditor: props.model.input.setPromptRef,
  })
-  let composer: ComposerModel | undefined
-  const queue = createSessionQueue({
-    sessionID: requireSessionID(props.session),
-    draft: adapter.state,
-    working: adapter.working,
-    behavior: settings.general.followUpBehavior,
-    composer: () => composer,
-  })
-  composer = createComposerModel(adapter, { queue })
+  const composer = createComposerModel(adapter)
  return (
    <SessionComposerRegion
      controller={region}
-      composer={
-        <div class="relative">
-          <SessionQueuePanel queue={queue} />
-          <div class="relative z-10">
-            <Composer model={composer} borderUnderlay accentSubmit={props.accentSubmit} />
-          </div>
-        </div>
-      }
+      composer={<Composer model={composer} borderUnderlay accentSubmit={props.accentSubmit} />}
    />
  )
 }
-
-function requireSessionID(session: SessionModel) {
-  const id = session.identity.params.id
-  if (!id) throw new Error("Active Composer requires a Session ID")
-  return id
-}
@@ -55,28 +55,6 @@ export function createSessionRevert(input: {
      await server.api.session.interrupt({ sessionID }).catch(() => undefined)
    }
    if (!(await request(() => server.api.session.revert.stage({ sessionID, messageID: message.id })))) return
-    // Reverting to a previous prompt discards the pending queue (and pending
-    // steers): they were written against the history being rewound. Cancel
-    // the authoritative inbox merged with the local snapshot, fire-and-forget
-    // so a slow request cannot delay restoring the composer. The cutoff keeps
-    // the asynchronous sweep away from prompts admitted after the revert; an
-    // old admission still in flight when the list is fetched can survive it,
-    // and fully closing that race needs a server-side revert-discards-inbox
-    // rule.
-    const cutoff = Date.now()
-    const local = data.session.pending
-      .list(sessionID)
-      .filter((item) => item.type === "user")
-      .map((item) => item.id)
-    void server.api.session.inbox
-      .list({ sessionID })
-      .then((rows) => rows.filter((row) => row.type === "user" && row.timeCreated <= cutoff).map((row) => row.id))
-      .catch(() => [])
-      .then((authoritative) => {
-        new Set([...local, ...authoritative]).forEach(
-          (inboxID) => void server.api.session.inbox.cancel({ sessionID, inboxID }).catch(() => undefined),
-        )
-      })
    restore(target, message)
    owner.run(() => input.setActiveMessage(previous))
  }
@@ -1,6 +1,6 @@
 import { createEffect, createMemo, createSignal, For, on, Show, type Accessor, type JSX } from "solid-js"
+import createPresence from "solid-presence"
 import { createStore } from "solid-js/store"
-import { createAnimatedPresence } from "@/runtime/animated-presence"
 import type { SessionUserActions } from "@opencode-ai/session-ui/actions"
 import { Badge } from "@opencode-ai/ui/badge"
 import { DiffChanges } from "@opencode-ai/ui/diff-changes"
@@ -479,7 +479,17 @@ function MessageTimelineView(
    return row.group.ref.partID
  })
  const [backgroundHintRef, setBackgroundHintRef] = createSignal<HTMLDivElement>()
-  const backgroundHintPresence = createAnimatedPresence(backgroundHintPartID, () => backgroundHintRef() ?? null)
+  const backgroundHintVisibility = createMemo<{ show: boolean; animate: boolean }>(
+    (previous) => {
+      const show = backgroundHintPartID() !== undefined
+      return { show, animate: previous.animate || previous.show !== show }
+    },
+    { show: backgroundHintPartID() !== undefined, animate: false },
+  )
+  const backgroundHintPresence = createPresence({
+    show: () => backgroundHintVisibility().show,
+    element: () => backgroundHintRef() ?? null,
+  })
  return (
    <VirtualizedTimeline
      workspaceSession={workspaceSession}
@@ -497,9 +507,9 @@ function MessageTimelineView(
              class="duration-150 motion-reduce:animate-none"
              classList={{
                [`flex h-9 items-start pt-3 ${turnPadding()}`]: true,
-                "animate-in fade-in": backgroundHintPresence.animate() && backgroundHintPresence.show(),
+                "animate-in fade-in": backgroundHintVisibility().animate && backgroundHintVisibility().show,
                "animate-out fade-out fill-mode-forwards":
-                  backgroundHintPresence.animate() && !backgroundHintPresence.show(),
+                  backgroundHintVisibility().animate && !backgroundHintVisibility().show,
              }}
            >
              <BackgroundMoveHint />
@@ -7,13 +7,7 @@ import { TextInput } from "@opencode-ai/ui/text-input"
 import { useLanguage } from "@/runtime/i18n/language"
 import { usePlatform } from "@/runtime/platform/platform"
 import { useUpdaterAction } from "@/shell/updates/action"
-import {
-  type FollowUpBehavior,
-  type TerminalPlacement,
-  type WorkspaceDefaultDestination,
-  useSettings,
-} from "@/settings/model"
-import { formatKeybind } from "@/shell/commands/command"
+import { type TerminalPlacement, type WorkspaceDefaultDestination, useSettings } from "@/settings/model"
 import { ExternalLink } from "@/runtime/platform/external-link"
 import { SettingsList } from "@/settings/list"
 import { SettingsRow } from "@/settings/row"
@@ -154,35 +148,6 @@ const TerminalPlacementSetting: Component = () => {
  )
 }

-const FollowUpBehaviorSetting: Component = () => {
-  const language = useLanguage()
-  const settings = useSettings()
-  const options = createMemo((): { value: FollowUpBehavior; label: string }[] => [
-    { value: "queue", label: language.t("settings.general.row.followUpBehavior.queue") },
-    { value: "steer", label: language.t("settings.general.row.followUpBehavior.steer") },
-  ])
-
-  return (
-    <SettingsRow
-      title={language.t("settings.general.row.followUpBehavior.title")}
-      description={language.t("settings.general.row.followUpBehavior.description", {
-        keybind: formatKeybind("mod+enter", language.t),
-      })}
-    >
-      <Select
-        data-action="settings-follow-up-behavior"
-        options={options()}
-        current={options().find((option) => option.value === settings.general.followUpBehavior())}
-        value={(option) => option.value}
-        label={(option) => option.label}
-        placement="bottom-end"
-        gutter={6}
-        onSelect={(option) => option && settings.general.setFollowUpBehavior(option.value)}
-      />
-    </SettingsRow>
-  )
-}
-
 const AppearanceSection: Component<{ controller: AppearanceSettingsController }> = (props) => {
  const language = useLanguage()
  return (
@@ -329,7 +294,6 @@ export const SettingsGeneral: Component<{

        <ShellSetting controller={shell} />
        <TerminalPlacementSetting />
-        <FollowUpBehaviorSetting />

        <SettingsRow
          title={language.t("settings.general.row.reasoningSummaries.title")}
@@ -1,30 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { monoDefault, monoFontFamily, sansDefault, sansFontFamily, terminalFontFamily } from "./model"
-
-describe("settings font families", () => {
-  test("defaults normal text to Inter", () => {
-    expect(sansDefault).toBe("Inter")
-    expect(sansFontFamily(undefined)).toStartWith('"Inter", ')
-    expect(sansFontFamily("")).toStartWith('"Inter", ')
-    expect(sansFontFamily("   ")).toStartWith('"Inter", ')
-  })
-
-  test("keeps custom normal fonts ahead of the default", () => {
-    expect(sansFontFamily("Custom Sans")).toStartWith('"Custom Sans", "Inter", ')
-  })
-
-  test("defaults monospace text to IBM Plex Mono", () => {
-    expect(monoDefault).toBe("IBM Plex Mono")
-    expect(monoFontFamily(undefined)).toStartWith('"IBM Plex Mono", ')
-    expect(monoFontFamily("")).toStartWith('"IBM Plex Mono", ')
-    expect(monoFontFamily("   ")).toStartWith('"IBM Plex Mono", ')
-  })
-
-  test("keeps custom monospace fonts ahead of the default", () => {
-    expect(monoFontFamily("Custom Mono")).toStartWith('"Custom Mono", "IBM Plex Mono", ')
-  })
-
-  test("preserves the separate terminal font default", () => {
-    expect(terminalFontFamily(undefined)).toStartWith('"JetBrainsMono Nerd Font Mono", ')
-  })
-})
@@ -7,7 +7,6 @@ import { ScopedKey, type ServerScope } from "@/runtime/server/scope"
 export type WorkspaceDefaultDestination = "last-used" | "local" | "new"
 export type WorkspaceLastUsed = "local" | "workspace"
 export type TerminalPlacement = "side" | "bottom"
-export type FollowUpBehavior = "queue" | "steer"

 export interface NotificationSettings {
  agent: boolean
@@ -40,7 +39,6 @@ export interface Settings {
    showCustomAgents: boolean
    mobileTitlebarPosition: "top" | "bottom"
    terminalPlacement: TerminalPlacement
-    followUpBehavior: FollowUpBehavior
  }
  appearance: {
    fontSize: number
@@ -60,12 +58,12 @@ export interface Settings {
  sounds: SoundSettings
 }

-export const monoDefault = "IBM Plex Mono"
-export const sansDefault = "Inter"
+export const monoDefault = "System Mono"
+export const sansDefault = "System Sans"
 export const terminalDefault = "JetBrainsMono Nerd Font Mono"
 const monoFallback =
-  '"IBM Plex Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'
-const sansFallback = '"Inter", ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif'
+  'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'
+const sansFallback = 'ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif'
 const terminalFallback =
  '"JetBrainsMono Nerd Font Mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace'

@@ -128,7 +126,6 @@ const defaultSettings: Settings = {
    showCustomAgents: false,
    mobileTitlebarPosition: "top",
    terminalPlacement: "side",
-    followUpBehavior: "steer",
  },
  appearance: {
    fontSize: 14,
@@ -259,10 +256,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setTerminalPlacement(value: TerminalPlacement) {
          setStore("general", "terminalPlacement", value)
        },
-        followUpBehavior: withFallback(() => store.general?.followUpBehavior, defaultSettings.general.followUpBehavior),
-        setFollowUpBehavior(value: FollowUpBehavior) {
-          setStore("general", "followUpBehavior", value)
-        },
      },
      visibility: {
        fileTree: showFileTree,
@@ -1,26 +0,0 @@
-import { expect, test } from "bun:test"
-import type { ServerConnection } from "@/runtime/server/registry"
-import type { Tab } from "@/shell/tabs/tabs"
-import { openNotificationSession } from "./notification"
-
-test("opens notification sessions through the tab router", () => {
-  const server = "local\nhttp://localhost:4096" as ServerConnection.Key
-  const tab = { type: "session" as const, server, sessionId: "session-1" }
-  const calls: string[] = []
-  const tabs = {
-    addSessionTab: (input: Omit<typeof tab, "type">) => {
-      calls.push(`add:${input.sessionId}`)
-      return tab
-    },
-    rememberSessionRoute: (_tab: typeof tab, sessionID: string) => {
-      calls.push(`route:${sessionID}`)
-    },
-    select: (input: Tab) => {
-      calls.push(`select:${input.type === "session" ? input.sessionId : input.draftID}`)
-    },
-  }
-
-  openNotificationSession(tabs, server, "session-1")
-
-  expect(calls).toEqual(["add:session-1", "route:session-1", "select:session-1"])
-})
@@ -51,19 +51,6 @@ type NotificationIndex = {
  }
 }

-type NotificationTabs = Pick<ReturnType<typeof useTabs>, "addSessionTab" | "rememberSessionRoute" | "select">
-
-export function openNotificationSession(
-  tabs: NotificationTabs,
-  server: ServerConnection.Key,
-  sessionID: string,
-) {
-  const tab = tabs.addSessionTab({ server, sessionId: sessionID })
-  if (tab.type !== "session") return
-  tabs.rememberSessionRoute(tab, sessionID)
-  tabs.select(tab)
-}
-
 const MAX_NOTIFICATIONS = 500
 const NOTIFICATION_TTL_MS = 1000 * 60 * 60 * 24 * 30

@@ -224,6 +211,11 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
    return typeof location !== "undefined" && location.pathname === sessionHref(input.key, sessionID)
  }

+  const navigate = (href: string) => {
+    history.pushState(null, "", href)
+    dispatchEvent(new PopStateEvent("popstate"))
+  }
+
  const handleSessionIdle = (sessionID: string, eventID: string, time: number) => {
    void lookup(sessionID).then((session) => {
      if (meta.disposed) return
@@ -245,9 +237,10 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
        session: sessionID,
      })

+      const href = sessionHref(input.key, sessionID)
      if (settings.notifications.agent()) {
        void platform.notify(language.t("notification.session.responseReady.title"), session.title ?? sessionID, () =>
-          openNotificationSession(tabs, input.key, sessionID),
+          navigate(href),
        )
      }
    })
@@ -281,10 +274,9 @@ export function createServerNotificationState(input: { sdk: ServerSDK; data: Dat
      const description =
        session?.title ??
        (typeof error === "string" ? error : language.t("notification.session.error.fallbackDescription"))
+      const href = sessionHref(input.key, sessionID)
      if (settings.notifications.errors()) {
-        void platform.notify(language.t("notification.session.error.title"), description, () =>
-          openNotificationSession(tabs, input.key, sessionID),
-        )
+        void platform.notify(language.t("notification.session.error.title"), description, () => navigate(href))
      }
    })
  }
@@ -1,49 +0,0 @@
-import { expect, test } from "bun:test"
-import { createAnimatedPresence } from "../src/runtime/animated-presence"
-import { createRoot, createSignal } from "solid-js"
-
-test("animates visibility changes without animating initial presence", () => {
-  createRoot((dispose) => {
-    const [value, setValue] = createSignal<string | undefined>("steer")
-    const presence = createAnimatedPresence(value, () => null)
-
-    expect(presence.show()).toBe(true)
-    expect(presence.animate()).toBe(false)
-    expect(presence.value()).toBe("steer")
-    expect(presence.present()).toBe(true)
-
-    setValue("queue")
-    expect(presence.animate()).toBe(false)
-    expect(presence.value()).toBe("queue")
-
-    setValue(undefined)
-    expect(presence.show()).toBe(false)
-    expect(presence.animate()).toBe(true)
-    expect(presence.value()).toBe("queue")
-
-    setValue("steer")
-    expect(presence.show()).toBe(true)
-    expect(presence.animate()).toBe(true)
-    expect(presence.value()).toBe("steer")
-
-    dispose()
-  })
-})
-
-test("animates the first appearance when initially hidden", () => {
-  createRoot((dispose) => {
-    const [value, setValue] = createSignal<string | undefined>()
-    const presence = createAnimatedPresence(value, () => null)
-
-    expect(presence.show()).toBe(false)
-    expect(presence.animate()).toBe(false)
-    expect(presence.present()).toBe(false)
-
-    setValue("steer")
-    expect(presence.show()).toBe(true)
-    expect(presence.animate()).toBe(true)
-    expect(presence.value()).toBe("steer")
-
-    dispose()
-  })
-})
@@ -76,7 +76,6 @@ export async function streamTurn(input: {
  readonly cwd: string
  readonly start: TurnStart
  readonly writeTextFile: boolean
-  readonly action?: boolean
  readonly submit: (signal: AbortSignal) => Promise<unknown>
  readonly control: TurnControl
  readonly childSessionUpdate?: (update: ChildSessionUpdate) => Promise<void>
@@ -346,11 +345,6 @@ export async function streamTurn(input: {
    await input.submit(control.admission.signal).catch((error) => {
      if (!control.cancelled) throw error
    })
-    if (input.action) {
-      streamController.abort()
-      await completed.catch(() => {})
-      return response(undefined, undefined, "succeeded", control.cancelled, undefined)
-    }
    if (control.cancelled) {
      await input.client.session.interrupt({ sessionID: input.sessionID }).catch(() => {})
      if (!started) {
@@ -326,7 +326,6 @@ export function make(input: { readonly client: OpenCodeClient; readonly connecti
        cwd: state.cwd,
        start: prepared.start,
        writeTextFile: capabilities.writeTextFile,
-        action: prepared.command !== undefined,
        control,
        connectionSignal: input.connection.signal,
        sessionSignal: state.abort.signal,
@@ -378,8 +377,9 @@ async function submitPrompt(client: OpenCodeClient, session: Attached, prompt: P
    return client.session.command(
      {
        sessionID: session.id,
+        id: prompt.start.id,
        command: prompt.command.name,
-        text: prompt.slash?.args ?? "",
+        arguments: prompt.slash?.args,
        files: prompt.files,
        delivery: "steer",
      },
@@ -1,14 +1,7 @@
-import { Argument, Flag, GlobalFlag } from "effect/unstable/cli"
+import { Argument, Flag } from "effect/unstable/cli"
 import { Schema } from "effect"
 import { Spec } from "../framework/spec"

-export const PrintLogs = GlobalFlag.setting("print-logs")({
-  flag: Flag.boolean("print-logs").pipe(
-    Flag.withDescription("Print logs to stderr (server logs require --standalone)"),
-    Flag.withDefault(false),
-  ),
-})
-
 declare const OPENCODE_CLI_NAME: string | undefined

 const ServerParams = {
@@ -1,6 +1,5 @@
 import { Effect, FileSystem, Scope } from "effect"
 import { Command } from "effect/unstable/cli"
-import { PrintLogs } from "../commands/commands"
 import { Spec } from "./spec"
 import { Global } from "@opencode-ai/util/global"
 import { Updater } from "../services/updater"
@@ -78,11 +77,7 @@ export function handlers<const Root extends Spec.Any>(root: Root, handlers: Hand
 }

 export function run(commands: Spec.Any, handlers: ReadonlyArray<LazyHandler>, options: { readonly version: string }) {
-  return Command.run(provide(commands, handlers).pipe(Command.withGlobalFlags([PrintLogs])), options) as Effect.Effect<
-    void,
-    unknown,
-    Command.Environment
-  >
+  return Command.run(provide(commands, handlers), options) as Effect.Effect<void, unknown, Command.Environment>
 }

 function provide(node: Spec.Any, handlers: ReadonlyArray<LazyHandler>): ProvidedCommand {
@@ -91,7 +86,6 @@ function provide(node: Spec.Any, handlers: ReadonlyArray<LazyHandler>): Provided
    ? node.spec.pipe(
        Command.withHandler((input) =>
          Effect.gen(function* () {
-            if (yield* PrintLogs) process.env.OPENCODE_PRINT_LOGS = "1"
            const module = yield* Effect.promise(handler.load)
            return yield* module.default(input)
          }),
@@ -3,12 +3,16 @@ import {
  Command,
  Connection,
  Credential,
+  Effect,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
+  Schema,
  Skill,
+  WebSearch,
 } from "@opencode-ai/plugin/effect"
 import { Tool } from "@opencode-ai/schema/tool"

@@ -18,11 +22,15 @@ const key = Symbol.for("opencode.plugin.v2.effect")
  Command,
  Connection,
  Credential,
+  Effect,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
+  Schema,
  Skill,
+  WebSearch,
  Tool: { Error: Tool.Error },
 }
@@ -4,11 +4,13 @@ import {
  Connection,
  Credential,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
  Skill,
+  WebSearch,
 } from "@opencode-ai/plugin"

 const key = Symbol.for("opencode.plugin.v2.promise")
@@ -18,9 +20,11 @@ const key = Symbol.for("opencode.plugin.v2.promise")
  Connection,
  Credential,
  Integration,
+  Mcp,
  Model,
  Plugin,
  Provider,
  Reference,
  Skill,
+  WebSearch,
 }
@@ -27,7 +27,7 @@ function command(password: string, options: Options) {
    // The server treats EOF on this pipe as the end of its ownership lease.
    // The OS closes it even when the TUI is killed before Effect finalizers run.
    stdin: "pipe",
-    stderr: process.env.OPENCODE_PRINT_LOGS === "1" ? "inherit" : "ignore",
+    stderr: "ignore",
    killSignal: "SIGTERM",
    forceKillAfter: "3 seconds",
  })
@@ -1,5 +1,5 @@
 export type Policy = boolean | "notify"
-export type Action = "none" | "notify" | "upgrade"
+export type Action = "none" | "upgrade"

 const maximumComponent = "9007199254740991"
 const versionPattern =
@@ -12,7 +12,7 @@ export function action(current: string, latest: string, policy: Policy): Action
  if (!currentVersion || !latestVersion || sameRelease(currentVersion, latestVersion)) return "none"
  // Major upgrades are never installed automatically.
  if (currentVersion.major !== latestVersion.major) return "none"
-  return policy === "notify" ? "notify" : "upgrade"
+  return "upgrade"
 }

 function parseReleaseVersion(input: string) {
@@ -12,12 +12,8 @@ describe("updater", () => {
  test("automatically updates patches and minors", () => {
    expect(action("1.2.3", "1.2.4", true)).toBe("upgrade")
    expect(action("1.2.3", "1.3.0", true)).toBe("upgrade")
-  })
-
-  test("reports patches and minors without automatically installing them", () => {
-    expect(action("1.2.3", "1.2.4", "notify")).toBe("notify")
-    expect(action("1.2.3", "1.3.0", "notify")).toBe("notify")
-    expect(action("1.2.3", "1.2.3", "notify")).toBe("none")
+    expect(action("1.2.3", "1.2.4", "notify")).toBe("upgrade")
+    expect(action("1.2.3", "1.3.0", "notify")).toBe("upgrade")
  })

  test("skips when autoupdate is disabled", () => {
@@ -162,8 +162,6 @@ export const layer = Layer.effect(
          })
          const next = action(OPENCODE_VERSION, version, policy)
          if (next === "none") return yield* Effect.logInfo("update check done", { action: "up-to-date" })
-          if (next === "notify")
-            return yield* Effect.logInfo("OpenCode update available", { current: OPENCODE_VERSION, latest: version })
          const detected = yield* method()
          if (!detected) return yield* Effect.logWarning("automatic update skipped: installation method not found")
          yield* upgrade(detected, version)
@@ -601,7 +601,6 @@ describe("acp event behavior", () => {
      },
      onInterrupt({ sessionID, send }) {
        send(durableEvent("session.execution.interrupted", { sessionID, reason: "user" }))
-        return true
      },
    })
    const result = streamTurn({
@@ -625,7 +624,7 @@ describe("acp event behavior", () => {
      await withTimeout(submitted.promise, "cancel test prompt was not admitted")
      control.cancelled = true
      control.admission.abort()
-      expect(await fixture.client.session.interrupt({ sessionID: "ses_cancel" })).toEqual({ interrupted: true })
+      await fixture.client.session.interrupt({ sessionID: "ses_cancel" })

      const response = await withTimeout(result, "cancelled turn did not terminate")
      expect(response).toMatchObject({ stopReason: "cancelled" })
@@ -121,42 +121,3 @@ test("acp prompt resolves after ordered turn updates", async () => {
    controller.enqueue(encoder.encode(`data: ${JSON.stringify(event)}\n\n`))
  }
 })
-
-test("acp action resolves without prompt lifecycle events", async () => {
-  const encoder = new TextEncoder()
-  const server = Bun.serve({
-    port: 0,
-    fetch(request) {
-      if (new URL(request.url).pathname !== "/api/event") return new Response(null, { status: 404 })
-      return new Response(
-        new ReadableStream<Uint8Array>({
-          start(controller) {
-            controller.enqueue(encoder.encode(`data: ${JSON.stringify({ type: "server.connected", data: {} })}\n\n`))
-          },
-        }),
-        { headers: { "content-type": "text/event-stream" } },
-      )
-    },
-  })
-
-  try {
-    const response = await streamTurn({
-      client: OpenCode.make({ baseUrl: server.url.toString() }),
-      connection: {
-        sessionUpdate: async () => {},
-        requestPermission: async () => ({ outcome: { outcome: "cancelled" } }),
-      },
-      sessionID: "ses_test",
-      cwd: "/workspace",
-      start: { type: "input", id: "msg_action" },
-      writeTextFile: false,
-      action: true,
-      control: { cancelled: false, admission: new AbortController() },
-      submit: async () => {},
-    })
-
-    expect(response).toMatchObject({ stopReason: "end_turn" })
-  } finally {
-    await server.stop(true)
-  }
-})
@@ -87,6 +87,7 @@ export const planAgent = {
 export const reviewCommand = {
  name: "review",
  description: "Review changes",
+  template: "",
 } satisfies CommandInfo

 export const verifySkill = {
@@ -12,7 +12,13 @@ describe("acp service prompt routing and usage", () => {
          return Response.json({ data: makeSession("ses_routes") })
        }
        if (request.method === "POST" && request.path === "/api/session/ses_routes/command") {
-          return new Response(null, { status: 204 })
+          const id = requestID(request)
+          completeTurn(context, "ses_routes", {
+            id: `evt_${id}`,
+            type: "session.inbox.delivered",
+            data: { sessionID: "ses_routes", inboxID: id },
+          })
+          return Response.json({ data: {} })
        }
        if (request.method === "POST" && request.path === "/api/session/ses_routes/skill") {
          const id = requestID(request)
@@ -59,8 +65,9 @@ describe("acp service prompt routing and usage", () => {
    const skill = fixture.requests.find((request) => request.path === "/api/session/ses_routes/skill")
    const compact = fixture.requests.find((request) => request.path === "/api/session/ses_routes/compact")
    expect(command?.body).toMatchObject({
+      id: expect.any(String),
      command: "review",
-      text: "now",
+      arguments: "now",
      files: [],
      delivery: "steer",
    })
@@ -20,7 +20,7 @@ type FixtureOptions = {
  readonly onInterrupt?: (input: {
    readonly sessionID: string
    readonly send: (event: unknown) => void
-  }) => boolean | Promise<boolean>
+  }) => void | Promise<void>
  readonly onPermissionReply?: (input: {
    readonly sessionID: string
    readonly requestID: string
@@ -152,9 +152,8 @@ export function createSseFixture(options: FixtureOptions = {}) {

      const interrupt = /^\/api\/session\/([^/]+)\/interrupt$/.exec(url.pathname)
      if (interrupt?.[1]) {
-        const interrupted =
-          (await options.onInterrupt?.({ sessionID: decodeURIComponent(interrupt[1]), send })) ?? false
-        return Response.json({ interrupted })
+        await options.onInterrupt?.({ sessionID: decodeURIComponent(interrupt[1]), send })
+        return new Response(null, { status: 204 })
      }

      return new Response(null, { status: 404 })
--- a/Show More
+++ b/Show More